Fix clippy warnings

Mnwa · Aug 17, 2024 · 5279c81 · 5279c81
1 parent a879812
commit 5279c81
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 73 deletions.
diff --git a/css-minifier/src/main.rs b/css-minifier/src/main.rs
@@ -46,7 +46,7 @@ fn main() {
     let size_rate = ((size_diff as f64) / (input_file.len() as f64) * 100f64) as i64;
     let mut prefix = "bytes";
     if size_diff > 1024 {
-        size_diff = size_diff / 1024;
+        size_diff /= 1024;
         prefix = "kilobytes"
     }
     println!("You saved: {}% ({} {})", size_rate, size_diff, prefix);

diff --git a/css-minify/Cargo.toml b/css-minify/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "css-minify"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Mnwa <[email protected]>"]
 edition = "2018"
 description = "CSS parser and minificator based on nom"

diff --git a/css-minify/src/optimizations/color.rs b/css-minify/src/optimizations/color.rs
@@ -11,21 +11,20 @@ use nom::IResult;
 pub struct Color(String);
 
 pub fn optimize_color(input: &str) -> Color {
-    let color = alt((parse_hex, parse_rgb))(input)
+    alt((parse_hex, parse_rgb))(input)
         .map(|(postfix, mut color)| {
             if postfix.trim() == "!important" {
                 color.0 += "!important"
             }
             color
         })
-        .unwrap_or_else(|_| Color(input.into()));
-    color
+        .unwrap_or_else(|_| Color(input.into()))
 }
 
 pub fn parse_hex(input: &str) -> IResult<&str, Color> {
     map(recognize(preceded(tag("#"), hex_digit1)), |color: &str| {
         if color.len() > 3 && color[1..4] == color[4..] {
-            return Color((&color[..4]).to_lowercase());
+            return Color(color[..4].to_lowercase());
         }
         Color(color.to_lowercase())
     })(input)
@@ -44,13 +43,13 @@ pub fn parse_rgb(input: &str) -> IResult<&str, Color> {
                 |(red, green, blue): (&str, &str, &str)| {
                     let color = format!(
                         "#{:02X}{:02X}{:02X}",
-                        u8::from_str_radix(red, 10).unwrap(),
-                        u8::from_str_radix(green, 10).unwrap(),
-                        u8::from_str_radix(blue, 10).unwrap(),
+                        str::parse::<u8>(red).unwrap(),
+                        str::parse::<u8>(green).unwrap(),
+                        str::parse::<u8>(blue).unwrap(),
                     );
 
                     if color[1..4] == color[4..] {
-                        return Color((&color[..4]).to_lowercase());
+                        return Color(color[..4].to_lowercase());
                     }
                     Color(color.to_lowercase())
                 },

diff --git a/css-minify/src/optimizations/font.rs b/css-minify/src/optimizations/font.rs
@@ -29,37 +29,30 @@ mod test {
     #[test]
     fn test_blocks() {
         assert_eq!(
-            FontTransformer::default().transform_many(CssEntities(vec![
-                CssEntity::Block(Block {
-                    selectors: vec![SelectorWithPseudoClasses(
-                        Some(Selector::Class("test".into())),
-                        vec![],
-                    )]
-                        .into(),
-                    parameters: {
-                        let mut tmp = IndexMap::new();
-                        tmp.insert(
-                            "font-weight".into(),
-                            "bold".into(),
-                        );
-                        tmp.into()
-                    },
-                }),
-            ])),
-            CssEntities(vec![
-                CssEntity::Block(Block {
-                    selectors: vec![SelectorWithPseudoClasses(
-                        Some(Selector::Class("test".into())),
-                        vec![],
-                    )]
-                        .into(),
-                    parameters: {
-                        let mut tmp = IndexMap::new();
-                        tmp.insert("font-weight".into(), "700".into());
-                        tmp.into()
-                    },
-                }),
-            ])
+            FontTransformer::default().transform_many(CssEntities(vec![CssEntity::Block(Block {
+                selectors: vec![SelectorWithPseudoClasses(
+                    Some(Selector::Class("test".into())),
+                    vec![],
+                )]
+                .into(),
+                parameters: {
+                    let mut tmp = IndexMap::new();
+                    tmp.insert("font-weight".into(), "bold".into());
+                    tmp.into()
+                },
+            }),])),
+            CssEntities(vec![CssEntity::Block(Block {
+                selectors: vec![SelectorWithPseudoClasses(
+                    Some(Selector::Class("test".into())),
+                    vec![],
+                )]
+                .into(),
+                parameters: {
+                    let mut tmp = IndexMap::new();
+                    tmp.insert("font-weight".into(), "700".into());
+                    tmp.into()
+                },
+            }),])
         )
     }
 }
diff --git a/css-minify/src/optimizations/mod.rs b/css-minify/src/optimizations/mod.rs
@@ -90,11 +90,11 @@ impl Default for Minifier {
             name.to_lowercase()
         })));
 
-        let merge_m_n_p = Merge::default();
-        let merge_shorthand = MergeShortHand::default();
-        let media = MergeMedia::default();
-        let blocks = MergeBlocks::default();
-        let font = FontTransformer::default();
+        let merge_m_n_p = Merge;
+        let merge_shorthand = MergeShortHand;
+        let media = MergeMedia;
+        let blocks = MergeBlocks;
+        let font = FontTransformer;
 
         Minifier {
             merge_m_n_p,

diff --git a/css-minify/src/parsers/parameters.rs b/css-minify/src/parsers/parameters.rs
@@ -2,8 +2,8 @@ use crate::parsers::utils::{between, is_not_block_ending, non_useless, space};
 use crate::structure::{Name, Parameters, Value};
 use indexmap::map::IndexMap;
 use nom::branch::alt;
-use nom::bytes::complete::{is_not};
-use nom::character::complete::{char};
+use nom::bytes::complete::is_not;
+use nom::character::complete::char;
 use nom::combinator::{map, peek, recognize};
 use nom::multi::{many0, many1};
 use nom::sequence::{separated_pair, terminated};
@@ -19,11 +19,7 @@ pub fn parse_parameters(input: &str) -> IResult<&str, Parameters> {
 pub fn parse_parameter(input: &str) -> IResult<&str, (Name, Value)> {
     map(
         terminated(
-            separated_pair(
-                parse_key,
-                char(':'),
-                parse_value,
-            ),
+            separated_pair(parse_key, char(':'), parse_value),
             alt((char(';'), peek(char('}')))),
         ),
         |(name, value)| (name.trim().into(), value.trim().into()),
@@ -40,7 +36,7 @@ fn parse_value(input: &str) -> IResult<&str, &str> {
         between("'", "'"),
         between("(", ")"),
         space,
-        is_not("\"'();}")
+        is_not("\"'();}"),
     )))))(input)
 }
 
@@ -106,7 +102,7 @@ mod test {
                 font-size: 16px;
                 "
             )
-                .is_err(),
+            .is_err(),
             true
         )
     }

diff --git a/css-minify/src/parsers/selector.rs b/css-minify/src/parsers/selector.rs
@@ -43,7 +43,12 @@ pub fn parse_pseudo_class(input: &str) -> IResult<&str, PseudoClass> {
                 i.map(|i| i.to_string())
             }),
         ),
-        |(((prefix, name), params), next)| PseudoClass { prefix, name, params, next },
+        |(((prefix, name), params), next)| PseudoClass {
+            prefix,
+            name,
+            params,
+            next,
+        },
     )(input)
 }
 
@@ -112,7 +117,7 @@ mod test {
                     SelectorWithPseudoClasses(Some(Selector::Class("some_class".into())), vec![]),
                     SelectorWithPseudoClasses(Some(Selector::Tag("input".into())), vec![]),
                 ]
-                    .into()
+                .into()
             ))
         );
     }
@@ -131,8 +136,8 @@ mod test {
                         params: None,
                         next: None,
                     }],
-                ), ]
-                    .into()
+                ),]
+                .into()
             ))
         );
     }
@@ -151,8 +156,8 @@ mod test {
                         params: Some("4n".to_string()),
                         next: None,
                     }],
-                ), ]
-                    .into()
+                ),]
+                .into()
             ))
         );
     }
@@ -171,8 +176,8 @@ mod test {
                         params: Some("nav, .posts".to_string()),
                         next: None,
                     }],
-                ), ]
-                    .into()
+                ),]
+                .into()
             ))
         );
     }
@@ -191,8 +196,8 @@ mod test {
                         params: Some(".test".to_string()),
                         next: Some("a".to_string()),
                     }],
-                ), ]
-                    .into()
+                ),]
+                .into()
             ))
         );
     }
@@ -211,8 +216,8 @@ mod test {
                         params: Some(".test".to_string()),
                         next: Some("a".to_string()),
                     }],
-                ), ]
-                    .into()
+                ),]
+                .into()
             ))
         );
     }
@@ -239,8 +244,8 @@ mod test {
                             next: None,
                         },
                     ],
-                ), ]
-                    .into()
+                ),]
+                .into()
             ))
         );
     }

diff --git a/css-minify/src/parsers/utils.rs b/css-minify/src/parsers/utils.rs
@@ -70,7 +70,10 @@ pub fn space(s: &str) -> IResult<&str, &str> {
     is_a(" \t\r\n")(s)
 }
 
-pub fn between<'a>(opener: &'a str, closer: &'a str) -> impl FnMut(&'a str) -> IResult<&'a str, &'a str> + 'a {
+pub fn between<'a>(
+    opener: &'a str,
+    closer: &'a str,
+) -> impl FnMut(&'a str) -> IResult<&'a str, &'a str> + 'a {
     delimited(tag(opener), take_until(closer), tag(closer))
 }
 

diff --git a/css-minify/src/structure.rs b/css-minify/src/structure.rs
@@ -356,7 +356,7 @@ mod test {
                     SelectorWithPseudoClasses(Some(Selector::Id("some_id".into())), vec![]),
                     SelectorWithPseudoClasses(Some(Selector::Tag("input".into())), vec![]),
                 ]
-                    .into(),
+                .into(),
                 parameters: {
                     let mut tmp = IndexMap::new();
                     tmp.insert("padding".into(), "5px 3px".into());
@@ -369,7 +369,7 @@ mod test {
                     SelectorWithPseudoClasses(Some(Selector::Id("some_id_2".into())), vec![]),
                     SelectorWithPseudoClasses(Some(Selector::Class("class".into())), vec![]),
                 ]
-                    .into(),
+                .into(),
                 parameters: {
                     let mut tmp = IndexMap::new();
                     tmp.insert("padding".into(), "5px 4px".into());
@@ -378,7 +378,7 @@ mod test {
                 },
             },
         ]
-            .into();
+        .into();
         assert_eq!(format!("{}", blocks), "#some_id,input{padding:5px 3px;color:white}#some_id_2,.class{padding:5px 4px;color:black}")
     }
 }