Merge pull request #223 from greyblake/fix-clippy-rustc-1.89

Fix clippy

Author: greyblake

nutype_macros/src/common/parse/mod.rs

@@ -129,11 +129,11 @@ where
         } else {
             // HACK: we want to propagate the original error in case if it was `regex` attribute.
             // Most likely it was not parsed, because `regex` feature was not enabled.
-            if let Ok(ident) = input.fork().parse::<Ident>() {
-                if ident == "regex" {
-                    // Parse again and return the original error
-                    input.fork().parse::<Validator>()?;
-                }
+            if let Ok(ident) = input.fork().parse::<Ident>()
+                && ident == "regex"
+            {
+                // Parse again and return the original error
+                input.fork().parse::<Validator>()?;
             }
 
             let possible_values: String = <Validator as Kinded>::Kind::all()

nutype_macros/src/common/validate.rs

@@ -127,25 +127,26 @@ where
     }
 
     // less VS greater
-    if let (Some(lower), Some(upper)) = (maybe_greater.clone(), maybe_less.clone()) {
-        if lower.item >= upper.item {
-            let msg = "The lower bound (`greater`) cannot be equal or higher than the upper bound (`less`).";
-            let err = syn::Error::new(upper.span(), msg);
-            return Err(err);
-        }
+    if let (Some(lower), Some(upper)) = (maybe_greater.clone(), maybe_less.clone())
+        && lower.item >= upper.item
+    {
+        let msg =
+            "The lower bound (`greater`) cannot be equal or higher than the upper bound (`less`).";
+        let err = syn::Error::new(upper.span(), msg);
+        return Err(err);
     }
 
     let maybe_lower_bound = maybe_greater.or(maybe_greater_or_equal);
     let maybe_upper_bound = maybe_less.or(maybe_less_or_equal);
 
     // less_or_equal VS greater_or_equal
     //
-    if let (Some(lower), Some(upper)) = (maybe_lower_bound, maybe_upper_bound) {
-        if lower.item > upper.item {
-            let msg = "The lower bound (`greater` or `greater_or_equal`) cannot be greater than the upper bound (`less or `less_or_equal`).\nSometimes we all need a little break.";
-            let err = syn::Error::new(upper.span(), msg);
-            return Err(err);
-        }
+    if let (Some(lower), Some(upper)) = (maybe_lower_bound, maybe_upper_bound)
+        && lower.item > upper.item
+    {
+        let msg = "The lower bound (`greater` or `greater_or_equal`) cannot be greater than the upper bound (`less or `less_or_equal`).\nSometimes we all need a little break.";
+        let err = syn::Error::new(upper.span(), msg);
+        return Err(err);
     }
 
     Ok(())

nutype_macros/src/string/validate.rs

@@ -54,12 +54,12 @@ fn validate_validators(
         .next();
     if let (Some((_, len_char_min)), Some((len_char_max_span, len_char_max))) =
         (maybe_len_char_min, maybe_len_char_max)
+        && len_char_min > len_char_max
     {
-        if len_char_min > len_char_max {
-            let msg = "`len_char_min` cannot be greater than `len_char_max`.\nDon't you find this obvious?";
-            let err = syn::Error::new(len_char_max_span, msg);
-            return Err(err);
-        }
+        let msg =
+            "`len_char_min` cannot be greater than `len_char_max`.\nDon't you find this obvious?";
+        let err = syn::Error::new(len_char_max_span, msg);
+        return Err(err);
     }
 
     // Validate regex