fix(dictgen)!: Allow case-sensitive ordered maps

crates/codespell-dict/src/dict_codegen.rs

@@ -1,6 +1,7 @@
 // This file is @generated crates/codespell-dict/tests/codegen.rs
 
-pub static WORD_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
+pub static WORD_DICTIONARY: dictgen::OrderedMap<dictgen::InsensitiveStr<'static>, &[&str]> =
+    dictgen::OrderedMap {
         keys: &[
             dictgen::InsensitiveStr::Ascii("1nd"),
             dictgen::InsensitiveStr::Ascii("2rd"),
@@ -84256,4 +84257,4 @@ pub static WORD_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
             &["contains"],
         ],
         range: 2..=34,
-};
+    };

crates/dictgen/src/insensitive.rs

@@ -51,6 +51,18 @@ impl<'s2> PartialEq<InsensitiveStr<'s2>> for InsensitiveStr<'_> {
 
 impl Eq for InsensitiveStr<'_> {}
 
+impl PartialOrd for InsensitiveStr<'_> {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for InsensitiveStr<'_> {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.convert().cmp(&other.convert())
+    }
+}
+
 impl core::hash::Hash for InsensitiveStr<'_> {
     #[inline]
     fn hash<H: core::hash::Hasher>(&self, hasher: &mut H) {

crates/dictgen/src/ordered_map.rs

@@ -14,6 +14,7 @@ impl OrderedMapGen<'_> {
         data.sort_unstable_by_key(|v| unicase::UniCase::new(v.0));
 
         let name = self.gen.name;
+        let key_type = "dictgen::InsensitiveStr<'static>";
         let value_type = self.gen.value_type;
 
         let mut smallest = usize::MAX;
@@ -21,7 +22,7 @@ impl OrderedMapGen<'_> {
 
         writeln!(
             file,
-            "pub static {name}: dictgen::OrderedMap<{value_type}> = dictgen::OrderedMap {{"
+            "pub static {name}: dictgen::OrderedMap<{key_type}, {value_type}> = dictgen::OrderedMap {{"
         )?;
         writeln!(file, "    keys: &[")?;
         for (key, _value) in data.iter() {
@@ -52,13 +53,13 @@ impl OrderedMapGen<'_> {
     }
 }
 
-pub struct OrderedMap<V: 'static> {
+pub struct OrderedMap<K: 'static, V: 'static> {
-    pub keys: &'static [crate::InsensitiveStr<'static>],
+    pub keys: &'static [K],
     pub values: &'static [V],
     pub range: core::ops::RangeInclusive<usize>,
 }
 
-impl<V> OrderedMap<V> {
+impl<V> OrderedMap<crate::InsensitiveStr<'_>, V> {
     #[inline]
     pub fn find(&self, word: &'_ unicase::UniCase<&str>) -> Option<&'static V> {
         if self.range.contains(&word.len()) {
@@ -71,3 +72,14 @@ impl<V> OrderedMap<V> {
         }
     }
 }
+
+impl<V> OrderedMap<&str, V> {
+    #[inline]
+    pub fn find(&self, word: &'_ &str) -> Option<&'static V> {
+        if self.range.contains(&word.len()) {
+            self.keys.binary_search(word).map(|i| &self.values[i]).ok()
+        } else {
+            None
+        }
+    }
+}

crates/dictgen/src/trie.rs

@@ -27,7 +27,7 @@ impl TrieGen<'_> {
 
 pub struct Trie<V: 'static> {
     pub root: &'static TrieNode<V>,
-    pub unicode: &'static crate::OrderedMap<V>,
+    pub unicode: &'static crate::OrderedMap<crate::InsensitiveStr<'static>, V>,
     pub range: core::ops::RangeInclusive<usize>,
 }
 
@@ -91,7 +91,7 @@ pub struct TrieNode<V: 'static> {
 
 pub enum TrieChild<V: 'static> {
     Nested(&'static [Option<&'static TrieNode<V>>; 26]),
-    Flat(&'static crate::OrderedMap<V>),
+    Flat(&'static crate::OrderedMap<crate::InsensitiveStr<'static>, V>),
 }
 
 #[cfg(feature = "codegen")]

crates/misspell-dict/src/dict_codegen.rs

@@ -1,6 +1,7 @@
 // This file is @generated by crates/misspell-dict/tests/codegen.rs
 
-pub static MAIN_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
+pub static MAIN_DICTIONARY: dictgen::OrderedMap<dictgen::InsensitiveStr<'static>, &[&str]> =
+    dictgen::OrderedMap {
         keys: &[
             dictgen::InsensitiveStr::Ascii("abandenment"),
             dictgen::InsensitiveStr::Ascii("abandining"),
@@ -56100,8 +56101,9 @@ pub static MAIN_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
             &["zionists"],
         ],
         range: 3..=19,
-};
+    };
-pub static AMERICAN_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
+pub static AMERICAN_DICTIONARY: dictgen::OrderedMap<dictgen::InsensitiveStr<'static>, &[&str]> =
+    dictgen::OrderedMap {
         keys: &[
             dictgen::InsensitiveStr::Ascii("accessorise"),
             dictgen::InsensitiveStr::Ascii("accessorised"),
@@ -59345,8 +59347,9 @@ pub static AMERICAN_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedM
             &["yogurts"],
         ],
         range: 4..=20,
-};
+    };
-pub static BRITISH_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
+pub static BRITISH_DICTIONARY: dictgen::OrderedMap<dictgen::InsensitiveStr<'static>, &[&str]> =
+    dictgen::OrderedMap {
         keys: &[
             dictgen::InsensitiveStr::Ascii("accessorize"),
             dictgen::InsensitiveStr::Ascii("accessorized"),
@@ -62306,4 +62309,4 @@ pub static BRITISH_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMa
             &["yodelling"],
         ],
         range: 4..=20,
-};
+    };

crates/typos-dict/benches/benches/ordered_map_codegen.rs

@@ -2,7 +2,8 @@
 #![allow(clippy::unreadable_literal)]
 #![allow(unreachable_pub)]
 
-pub static WORD: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
+pub static WORD: dictgen::OrderedMap<dictgen::InsensitiveStr<'static>, &[&str]> =
+    dictgen::OrderedMap {
         keys: &[
             dictgen::InsensitiveStr::Ascii("aaccess"),
             dictgen::InsensitiveStr::Ascii("aaccessibility"),
@@ -138034,4 +138035,4 @@ pub static WORD: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
             &["contains"],
         ],
         range: 2..=34,
-};
+    };

crates/wikipedia-dict/src/dict_codegen.rs

@@ -1,6 +1,7 @@
 // This file is @generated by crates/wikipedia-dict/tests/codegen.rs
 
-pub static WORD_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
+pub static WORD_DICTIONARY: dictgen::OrderedMap<dictgen::InsensitiveStr<'static>, &[&str]> =
+    dictgen::OrderedMap {
         keys: &[
             dictgen::InsensitiveStr::Ascii("abandonned"),
             dictgen::InsensitiveStr::Ascii("abbout"),
@@ -8588,4 +8589,4 @@ pub static WORD_DICTIONARY: dictgen::OrderedMap<&[&str]> = dictgen::OrderedMap {
             &["zebra"],
         ],
         range: 3..=19,
-};
+    };