Some clippy fixes.

kaj · Oct 7, 2024 · 0a625cb · 0a625cb
1 parent 5a1ab7c
commit 0a625cb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/rsass/src/sass/functions/color/other.rs b/rsass/src/sass/functions/color/other.rs
@@ -65,7 +65,9 @@ pub fn register(f: &mut Scope) {
                     sat,
                     lum,
                     opt_add(hsla.alpha(), a_adj),
-                    hsla.hsla_format || sat > 1. || lum > 1. || lum < 0.,
+                    hsla.hsla_format
+                        || sat > 1.
+                        || !(0. ..=1.).contains(&lum),
                 )
                 .into())
             } else {

diff --git a/rsass/src/value/colors/hsla.rs b/rsass/src/value/colors/hsla.rs
@@ -26,6 +26,7 @@ impl Hsla {
             hue: deg_mod(hue),
             sat: sat.clamp(0., f64::INFINITY),
             lum,
+            #[allow(clippy::manual_clamp)] // to get correct NaN handling
             alpha: alpha.max(0.).min(1.),
             hsla_format,
         }

diff --git a/rsass/src/value/colors/hwba.rs b/rsass/src/value/colors/hwba.rs
@@ -19,19 +19,14 @@ impl Hwba {
     /// Hue is modulo 360 degrees.  Other inputs will be clamped to
     /// their ranges.
     pub fn new(hue: f64, w: f64, b: f64, alpha: f64) -> Self {
-        let mut w = w;
-        let mut b = b;
         let wbsum = w + b;
-        if !(wbsum < 1.) {
-            w /= wbsum;
-            b /= wbsum;
-        }
-        Self {
-            hue,
-            w,
-            b,
-            alpha: alpha.clamp(0., 1.),
-        }
+        let (w, b) = if wbsum > 1. {
+            (w / wbsum, b / wbsum)
+        } else {
+            (w, b)
+        };
+        let alpha = alpha.clamp(0., 1.);
+        Self { hue, w, b, alpha }
     }
 
     /// Get the hue of this color.

diff --git a/rsass/src/variablescope.rs b/rsass/src/variablescope.rs
@@ -519,9 +519,8 @@ impl Scope {
         let module = module.with_forwarded();
         match as_n {
             UseAs::KeepName => {
-                let name = name
-                    .rfind(|c| c == ':' || c == '/')
-                    .map_or(name, |i| &name[i + 1..]);
+                let name =
+                    name.rfind([':', '/']).map_or(name, |i| &name[i + 1..]);
                 self.define_module(name.into(), module.expose(expose));
             }
             UseAs::Star => {