refactor(cmn): 🎨 refactoring code and removal of xtask

Author: sebastienrousseau

Cargo.toml

@@ -79,12 +79,12 @@ rustdoc-args = ["--generate-link-to-definition"]
 
 ## Warn
 # box_pointers = "warn"
-# missing_copy_implementations = "warn"
-# missing_docs = "warn"
-# unstable_features = "warn"
+missing_copy_implementations = "warn"
+missing_docs = "warn"
+unstable_features = "warn"
 # unused_crate_dependencies = "warn"
-# unused_extern_crates = "warn"
-# unused_results = "warn"
+unused_extern_crates = "warn"
+unused_results = "warn"
 
 ## Allow
 bare_trait_objects = "allow"

benches/criterion.rs

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 //! Benchmarks for the Common (CMN) library.
+
 #![allow(missing_docs)]
+
 use criterion::{
     black_box, criterion_group, criterion_main, Criterion,
 };
@@ -20,20 +22,22 @@ fn bench_cmn(c: &mut Criterion) {
         });
     });
 }
+
 fn bench_words(c: &mut Criterion) {
     c.bench_function("Words::new", |b| {
         b.iter(|| {
             let words = black_box(Words::new());
             let _ = black_box(words.words_list());
         })
     });
+
     c.bench_function("Words::default", |b| {
         b.iter(|| {
-            let words = black_box(Words {});
+            let words = black_box(Words::default());
             let _ = black_box(words.words_list());
         })
     });
 }
 
 criterion_group!(benches, bench_cmn, bench_words);
-criterion_main!(benches);
+criterion_main!(benches);

src/constants.rs

@@ -1,9 +1,6 @@
 // Copyright © 2023 Common (CMN) library. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-// Copyright © 2023 Common (CMN) library. All rights reserved.
-// SPDX-License-Identifier: Apache-2.0 OR MIT
-
 use serde::{Deserialize, Serialize};
 
 /// Contains several commonly used mathematical and cryptographic constants.

src/lib.rs

@@ -75,16 +75,19 @@
 //! extern crate cmn;
 //! use cmn::Constants;
 //! use cmn::Words;
+//! use cmn::words::WORD_LIST;
 //!
 //! // Constants
 //! let constants = Constants::new();
 //! let constant = constants.constant("EULER");
 //! assert_eq!(constant.unwrap().name, "EULER");
 //!
 //! // Words
-//! let words = Words::new();
+//! let words = Words::default();
 //! let words_list = words.words_list();
-//! assert_eq!(words_list[0], "aboard");
+//! // Checking the first three elements to verify correct initialization and ordering
+//! assert_eq!(words_list.len(), WORD_LIST.len(), "Default words list length should match WORD_LIST length.");
+//! assert_eq!(words_list[0], "aboard", "Check that words list is sorted and starts with the first word.");
 //!
 //! ```
 //! ## License
@@ -110,6 +113,8 @@
 #![crate_name = "cmn"]
 #![crate_type = "lib"]
 
+use std::collections::HashSet;
+
 /// The `serde` crate provides the `Serialize` and `Deserialize` traits
 /// that are used to serialize and deserialize the data.
 use serde::{Deserialize, Serialize};
@@ -158,15 +163,44 @@ impl Common {
     }
     /// Returns a new instance of the `Words` structure.
     pub fn words(&self) -> Words {
-        Words::new()
+        let words_data = self
+            .fields
+            .get("words")
+            .expect("Words data not found in JSON")
+            .as_array()
+            .expect("Words data is not an array")
+            .iter()
+            .map(|word_value| word_value.as_str().unwrap().to_string())
+            .collect::<Vec<String>>(); // Add type annotation here
+
+        Words {
+            words: HashSet::from_iter(words_data),
+        }
     }
     /// Parses a string of JSON data and returns a new instance of the
     /// `Common` structure.
-    pub fn parse(
-        input: &str,
-    ) -> Result<Self, Box<dyn std::error::Error>> {
-        let common: Common = serde_json::from_str(input)?;
-        Ok(common)
+    pub fn parse(input: &str) -> Result<Self, serde_json::Error> {
+        match serde_json::from_str(input) {
+            Ok(common) => Ok(common),
+            Err(e) => {
+                // Handle the JSON parsing error
+                match e.classify() {
+                    serde_json::error::Category::Io => {
+                        eprintln!("I/O error occurred: {}", e);
+                    }
+                    serde_json::error::Category::Syntax => {
+                        eprintln!("JSON syntax error: {}", e);
+                    }
+                    serde_json::error::Category::Data => {
+                        eprintln!("Invalid JSON data: {}", e);
+                    }
+                    serde_json::error::Category::Eof => {
+                        eprintln!("Unexpected end of JSON input");
+                    }
+                }
+                Err(e)
+            }
+        }
     }
 }