feat(varcon): Make all types hashable

This commit is contained in:
Ed Page committed 2020-07-04 20:52:47 -05:00
1 parent 94bc42eb07
commit 4ae8f91436
2 files changed
+9 -9

No files matched your search

+5 -5
View File
@@ -2,7 +2,7 @@ mod parser;
pub use parser::ClusterIter;
#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Cluster {
pub header: Option<String>,
pub entries: Vec<Entry>,
@@ -17,7 +17,7 @@ impl Cluster {
}
}
#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Entry {
pub variants: Vec<Variant>,
pub pos: Option<Pos>,
@@ -66,13 +66,13 @@ fn imply(variants: &mut Vec<Variant>, required: Category, missing: Category) {
}
}
#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Variant {
pub types: Vec<Type>,
pub word: String,
}
#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Type {
pub category: Category,
pub tag: Option<Tag>,
@@ -89,7 +89,7 @@ pub enum Category {
Other,
}
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
pub enum Tag {
Eq,
Variant,
+4 -4
View File
@@ -2,14 +2,14 @@ mod codegen;
pub use codegen::*;
#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Cluster {
pub header: Option<&'static str>,
pub entries: &'static [Entry],
pub notes: &'static [&'static str],
}
#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Entry {
pub variants: &'static [Variant],
pub pos: Option<Pos>,
@@ -19,13 +19,13 @@ pub struct Entry {
pub comment: Option<&'static str>,
}
#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Variant {
pub types: &'static [Type],
pub word: &'static str,
}
#[derive(Clone, PartialEq, Eq, Debug)]
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
pub struct Type {
pub category: Category,
pub tag: Option<Tag>,