chore: Update enumflags2

Author: Ed Page

Cargo.lock

@@ -20,7 +20,7 @@ flags = ["enumflags2"]
 
 [dependencies]
 nom = { version = "6", optional = true }
-enumflags2 = { version = "0.6", optional = true }
+enumflags2 = { version = "0.7", optional = true }
 
 [package.metadata.docs.rs]
 features = [ "parser", "flags" ]

crates/varcon-core/Cargo.toml

@@ -83,8 +83,8 @@ pub struct Type {
     pub num: Option<usize>,
 }
 
+#[cfg_attr(feature = "flags", enumflags2::bitflags)]
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-#[cfg_attr(feature = "flags", derive(enumflags2::BitFlags))]
 #[repr(u8)]
 pub enum Category {
     American = 0x01,
@@ -98,8 +98,8 @@ pub enum Category {
 #[cfg(feature = "flags")]
 pub type CategorySet = enumflags2::BitFlags<Category>;
 
+#[cfg_attr(feature = "flags", enumflags2::bitflags)]
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
-#[cfg_attr(feature = "flags", derive(enumflags2::BitFlags))]
 #[repr(u8)]
 pub enum Tag {
     Eq = 0x01,
@@ -112,8 +112,8 @@ pub enum Tag {
 #[cfg(feature = "flags")]
 pub type TagSet = enumflags2::BitFlags<Tag>;
 
+#[cfg_attr(feature = "flags", enumflags2::bitflags)]
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-#[cfg_attr(feature = "flags", derive(enumflags2::BitFlags))]
 #[repr(u8)]
 pub enum Pos {
     Noun = 0x01,

crates/varcon-core/src/lib.rs

@@ -84,7 +84,7 @@ impl BuiltIn {
         let var = vars[0];
         let var_categories = unsafe {
             // Code-genned from a checked category-set, so known to be safe
-            typos_vars::CategorySet::new(var.0)
+            typos_vars::CategorySet::from_bits_unchecked(var.0)
         };
         if let Some(locale) = self.locale {
             if var_categories.contains(locale) {