Continue work on types

Cargo.lock

@@ -281,6 +281,7 @@ name = "this_algoritm"
 version = "0.1.0"
 dependencies = [
  "s2",
+ "serde",
 ]
 
 [[package]]

Cargo.toml

@@ -12,4 +12,5 @@ members = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+serde="1"
 s2="0.0.12"

types/Cargo.lock

@@ -1,7 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "types"
-version = "0.1.0"

types/build.rs

@@ -22,58 +22,63 @@ fn main() {
         .unwrap();
 
     // Write it to an array containing all words
-    writeln!(
+    {
-        &mut file,
+        writeln!(
-        r#"/// Static array of `Word`
+            &mut file,
-        pub const WORDS: &[Word] = &["#
+            r#"/// Static array of `Word`
-    )
+pub const WORDS: &[Word] = &["#
-    .unwrap();
+        )
+        .unwrap();
 
-    for result in words.iter() {
+        for result in words.iter() {
-        writeln!(&mut file, "{result:?},").unwrap();
+            writeln!(&mut file, "\n{result:?},").unwrap();
+        }
     }
-
     writeln!(&mut file, "];\n").unwrap();
 
     // Make a mapping of all caps word to a reference to the `Word` entry
-    let mut word_map = phf_codegen::Map::new();
+    {
-    for (idx, word) in words.iter().enumerate() {
+        let mut word_map = phf_codegen::Map::new();
-        let idx_str = format!("&WORDS[{idx}]");
+        for (idx, word) in words.iter().enumerate() {
-        word_map.entry(word.word.to_uppercase(), &idx_str);
+            let idx_str = format!("&WORDS[{idx}]");
-    }
+            word_map.entry(word.word.to_uppercase(), &idx_str);
-    writeln!(
+        }
-        &mut file,
+        writeln!(
-        r#"/// Mapping from all caps `&str` to `&'static Word`
+            &mut file,
+            r#"/// Mapping from all caps `&str` to `&'static Word`
             pub static WORD_MAP: phf::Map<&'static str, &'static Word> =
                 {};"#,
-        word_map.build()
+            word_map.build()
-    )
+        )
+    }
     .unwrap();
 
     // Make a mapping of numbers to `Word`s
-    let word_number_to_idx = words
-        .iter()
-        .enumerate()
-        .map(|(idx, w)| (w.number, idx))
-        .collect::<Vec<(u16, usize)>>();
-
-    writeln!(
-        &mut file,
-        "pub const NUMBER_TO_WORD: &[&[&'static Word]] = &["
-    )
-    .unwrap();
-    for entry in word_number_to_idx
-        .as_slice()
-        .group_by(|(number1, _idx1), (number2, _idx2)| number1 == number2)
     {
-        write!(&mut file, "\t&[",).unwrap();
+        let word_number_to_idx = words
+            .iter()
+            .enumerate()
+            .map(|(idx, w)| (w.number, idx))
+            .collect::<Vec<(u16, usize)>>();
 
-        for idx in entry.iter().map(|(_w, idx)| idx) {
+        writeln!(
-            write!(&mut file, "&WORDS[{idx}],").unwrap();
+            &mut file,
+            "pub const NUMBER_TO_WORD: &[&[&'static Word]] = &["
+        )
+        .unwrap();
+        for entry in word_number_to_idx
+            .as_slice()
+            .group_by(|(number1, _idx1), (number2, _idx2)| number1 == number2)
+        {
+            write!(&mut file, "\t&[",).unwrap();
+
+            for idx in entry.iter().map(|(_w, idx)| idx) {
+                write!(&mut file, "&WORDS[{idx}],").unwrap();
+            }
+            writeln!(&mut file, "],").unwrap();
         }
-        writeln!(&mut file, "],").unwrap();
+        writeln!(&mut file, "];\n").unwrap();
     }
-    writeln!(&mut file, "];\n").unwrap();
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]