Fix lint

Author: owjs3901

bindings/devup-ui-wasm/src/lib.rs

@@ -285,7 +285,7 @@ pub fn get_default_theme() -> Result<Option<String>, JsValue> {
 #[wasm_bindgen(js_name = "getCss")]
 pub fn get_css(file_num: Option<usize>) -> Result<String, JsValue> {
     let sheet = GLOBAL_STYLE_SHEET.lock().unwrap();
-    Ok(sheet.create_css(file_num.map(|num| get_filename_by_file_num(num)).as_deref()))
+    Ok(sheet.create_css(file_num.map(get_filename_by_file_num).as_deref()))
 }
 
 #[wasm_bindgen(js_name = "getThemeInterface")]

libs/css/src/file_map.rs

@@ -25,7 +25,7 @@ pub fn get_file_num_by_filename(filename: &str) -> usize {
     let mut map = GLOBAL_FILE_MAP.lock().unwrap();
     let len = map.len();
     if !map.contains_left(filename) {
-        map.insert(filename.to_string(), len as usize);
+        map.insert(filename.to_string(), len);
     }
     *map.get_by_left(filename).unwrap()
 }

libs/css/src/lib.rs

@@ -11,7 +11,6 @@ mod selector_separator;
 pub mod style_selector;
 pub mod utils;
 
-use std::collections::HashMap;
 use std::hash::{DefaultHasher, Hash, Hasher};
 
 use crate::class_map::GLOBAL_CLASS_MAP;
@@ -75,14 +74,14 @@ pub fn keyframes_to_keyframes_name(keyframes: &str, filename: Option<&str>) -> S
         let filename = filename.unwrap_or_default().to_string();
         let class_num = map
             .entry(filename.to_string())
-            .or_insert_with(HashMap::new)
+            .or_default()
             .get(&key)
-            .map(|v| format!("{}", num_to_nm_base(*v)))
+            .map(|v| num_to_nm_base(*v).to_string())
             .unwrap_or_else(|| {
-                let m = map.entry(filename.to_string()).or_insert_with(HashMap::new);
+                let m = map.entry(filename.to_string()).or_default();
                 let len = m.len();
                 m.insert(key, len);
-                format!("{}", num_to_nm_base(len))
+                num_to_nm_base(len).to_string()
             });
         if !filename.is_empty() {
             format!(
@@ -139,11 +138,11 @@ pub fn sheet_to_classname(
         let filename = filename.map(|v| v.to_string()).unwrap_or_default();
         let clas_num = map
             .entry(filename.to_string())
-            .or_insert_with(HashMap::new)
+            .or_default()
             .get(&key)
             .map(|v| num_to_nm_base(*v))
             .unwrap_or_else(|| {
-                let m = map.entry(filename.to_string()).or_insert_with(HashMap::new);
+                let m = map.entry(filename.to_string()).or_default();
                 let len = m.len();
                 m.insert(key, len);
                 num_to_nm_base(len)
@@ -184,11 +183,11 @@ pub fn sheet_to_variable_name(property: &str, level: u8, selector: Option<&str>)
         );
         let mut map = GLOBAL_CLASS_MAP.lock().unwrap();
         map.entry("".to_string())
-            .or_insert_with(HashMap::new)
+            .or_default()
             .get(&key)
             .map(|v| format!("--{}", num_to_nm_base(*v)))
             .unwrap_or_else(|| {
-                let m = map.entry("".to_string()).or_insert_with(HashMap::new);
+                let m = map.entry("".to_string()).or_default();
                 let len = m.len();
                 m.insert(key, len);
                 format!("--{}", num_to_nm_base(len))

libs/sheet/src/lib.rs

@@ -101,6 +101,7 @@ impl ExtractStyle for StyleSheetCss {
 }
 
 type PropertyMap = BTreeMap<u8, BTreeMap<u8, HashSet<StyleSheetProperty>>>;
+type KeyframesMap = BTreeMap<String, BTreeMap<String, BTreeMap<String, Vec<(String, String)>>>>;
 
 fn deserialize_btree_map_u8<'de, D>(
     deserializer: D,
@@ -135,7 +136,7 @@ pub struct StyleSheet {
     pub properties: BTreeMap<String, PropertyMap>,
     pub css: BTreeMap<String, BTreeSet<StyleSheetCss>>,
     #[serde(default)]
-    pub keyframes: BTreeMap<String, BTreeMap<String, BTreeMap<String, Vec<(String, String)>>>>,
+    pub keyframes: KeyframesMap,
     #[serde(default)]
     pub global_css_files: BTreeSet<String>,
     #[serde(default)]
@@ -147,6 +148,7 @@ pub struct StyleSheet {
 }
 
 impl StyleSheet {
+    #[allow(clippy::too_many_arguments)]
     pub fn add_property(
         &mut self,
         class_name: &str,
@@ -341,10 +343,7 @@ impl StyleSheet {
             css.push_str("@import \"./devup-ui.css\";");
         }
 
-        if let Some(keyframes) = self
-            .keyframes
-            .get(&filename.unwrap_or_default().to_string())
-        {
+        if let Some(keyframes) = self.keyframes.get(filename.unwrap_or_default()) {
             for (name, map) in keyframes {
                 css.push_str(&format!(
                     "@keyframes {name}{{{}}}",
@@ -363,10 +362,7 @@ impl StyleSheet {
         }
 
         // order
-        if let Some(maps) = self
-            .properties
-            .get(&filename.unwrap_or_default().to_string())
-        {
+        if let Some(maps) = self.properties.get(filename.unwrap_or_default()) {
             for (_, map) in maps.iter() {
                 for (level, props) in map.iter() {
                     let (mut global_props, rest): (Vec<_>, Vec<_>) =