enable most Clippy lints and fix all of the resulting errors; notably, replace impl trait arguments with explicit generics and improve the spectral distribution interface

Author: apparebit

Cargo.lock

@@ -1,3 +1,79 @@
 [workspace]
 resolver = "2"
 members = ["crates/*"]
+
+[workspace.lints.clippy]
+impl_trait_in_params = "deny"
+inefficient_to_string = "deny"
+manual_instant_elapsed = "deny"
+manual_is_variant_and = "deny"
+manual_let_else = "deny"
+map_unwrap_or = "deny"
+map_with_unused_argument_over_ranges = "deny"
+match_bool = "deny"
+mismatching_type_param_order = "deny"
+missing_assert_message = "deny"
+missing_asserts_for_indexing = "deny"
+missing_panics_doc = "deny"
+multiple_unsafe_ops_per_block = "deny"
+# must_use_candidate = "deny" # definitely too aggressive
+needless_bitwise_bool = "deny"
+needless_collect = "deny"
+needless_continue = "deny"
+needless_for_each = "deny"
+needless_pass_by_ref_mut = "deny"
+needless_pass_by_value = "deny"
+needless_raw_string_hashes = "deny"
+needless_raw_strings = "deny"
+non_send_fields_in_send_ty = "deny"
+non_zero_suggestions = "deny"
+option_if_let_else = "deny"
+option_option = "deny"
+or_fun_call = "deny"
+pattern_type_mismatch = "deny"
+# precedence_bits = "deny" # Rust 1.86
+print_stderr = "deny"
+print_stdout = "deny"
+ptr_as_ptr = "deny"
+ptr_cast_constness = "deny"
+range_minus_one = "deny"
+range_plus_one = "deny"
+rc_buffer = "deny"
+rc_mutex = "deny"
+redundant_clone = "deny"
+redundant_closure_for_method_calls = "deny"
+ref_as_ptr = "deny"
+ref_binding_to_reference = "deny"
+ref_option = "deny"
+ref_option_ref = "deny"
+return_self_not_must_use = "deny"
+single_match_else = "deny"
+std_instead_of_alloc = "deny"
+std_instead_of_core = "deny"
+str_split_at_newline = "deny"
+string_add = "deny"
+string_add_assign = "deny"
+string_extend_chars = "deny"
+string_lit_as_bytes = "deny"
+string_lit_chars_any = "deny"
+string_to_string = "deny"
+suboptimal_flops = "deny"
+trait_duplication_in_bounds = "deny"
+transmute_ptr_to_ptr = "deny"
+transmute_undefined_repr = "deny"
+tuple_array_conversions = "deny"
+type_repetition_in_bounds = "deny"
+unchecked_duration_subtraction = "deny"
+undocumented_unsafe_blocks = "deny"
+uninhabited_references = "deny"
+unnecessary_box_returns = "deny"
+unnecessary_join = "deny"
+unnecessary_literal_bound = "deny"
+unseparated_literal_suffix = "deny"
+unwrap_used = "deny"
+# use_self = "deny" # seems to be too aggressive
+useless_let_if_seq = "deny"
+verbose_bit_mask = "deny"
+verbose_file_reads = "deny"
+while_float = "deny"
+

Cargo.toml

@@ -1,5 +1,16 @@
 # Changelog
 
+## Prettypretty v0.12.0 (????-??-??)
+
+The interface to spectral distributions has been improved: The new `get()`
+method now returns an optional value, whereas the updated `at()` returns the
+unwrapped value, panicking upon out-of-distribution wavelengths.
+
+Many small code improvements, including the use of more accurate floating point
+operations throughout. All impl trait arguments have been replaced by explicit
+generic types bound by those same traits.
+
+
 ## Prettypretty v0.11.1 (2025-01-31)
 
 Move `pretty.css` styles back into prettypretty and fix all plumbing so that it

crates/prettypretty/CHANGELOG.md

@@ -8,13 +8,13 @@ version = "0.11.1"
 repository = "https://github.com/apparebit/prettypretty"
 documentation = "https://docs.rs/prettypretty/latest/prettypretty/"
 homepage = "https://crates.io/crates/prettypretty"
-rust-version = "1.79"
+rust-version = "1.82"
 edition = "2021"
 license = "Apache-2.0"
 
 
 [dependencies]
-pyo3 = { version = "0.23.3", features = ["extension-module", "abi3", "abi3-py311"], optional = true }
+pyo3 = { version = "0.23.4", features = ["extension-module", "abi3", "abi3-py311"], optional = true }
 prettytty = { version = "0.3.0", path = "../prettytty", optional = true }
 
 [dev-dependencies]
@@ -34,6 +34,10 @@ name = "prettypretty"
 crate-type = ["lib", "cdylib"]
 
 
+[lints]
+workspace = true
+
+
 [package.metadata.docs.rs]
 features = ["f64", "gamut", "tty"]
 rustdoc-args = ["-e", "./docs/pretty.css"]

crates/prettypretty/Cargo.toml

@@ -21,15 +21,17 @@ mod test {
         for illuminant in [&CIE_ILLUMINANT_D50, &CIE_ILLUMINANT_D65] {
             let mut sum = Sum::new();
             for wavelength in illuminant.range() {
-                sum += illuminant.at(wavelength).unwrap();
+                assert_eq!(*illuminant.at(wavelength), illuminant[wavelength]);
+                sum += illuminant[wavelength];
             }
             assert_eq!(sum.value(), illuminant.checksum());
         }
 
         for observer in [&CIE_OBSERVER_2DEG_1931, &CIE_OBSERVER_10DEG_1964] {
             let mut sum = ThreeSum::new();
             for wavelength in observer.range() {
-                sum += observer.at(wavelength).unwrap();
+                assert_eq!(*observer.at(wavelength), observer[wavelength]);
+                sum += observer[wavelength];
             }
             assert_eq!(sum.value(), observer.checksum());
         }
@@ -60,11 +62,12 @@ mod test {
             // Check results of range overlap computation
             assert_eq!(table.start(), 360);
             assert_eq!(table.end(), 831);
+            assert_eq!(table.range(), table.start()..table.end());
 
             // Compute sum for tristimulus
             let mut sum = ThreeSum::new();
-            for index in table.start()..table.end() {
-                sum += table.at(index).unwrap();
+            for index in table.range() {
+                sum += table[index];
             }
 
             // Scale to tristimulus and compare to expected value

crates/prettypretty/src/cie/mod.rs

@@ -28,7 +28,7 @@ pub(crate) fn to_24bit(space: ColorSpace, coordinates: &[Float; 3]) -> [u8; 3] {
 /// new 3-element vector.
 #[inline]
 fn multiply(matrix: &[[Float; 3]; 3], vector: &[Float; 3]) -> [Float; 3] {
-    let [row1, row2, row3] = matrix;
+    let [ref row1, ref row2, ref row3] = *matrix;
 
     [
         row1[0].mul_add(vector[0], row1[1].mul_add(vector[1], row1[2] * vector[2])),
@@ -175,7 +175,7 @@ mod rec2020 {
             if value < BETA {
                 value * 4.5
             } else {
-                ALPHA * value.powf(0.45) - (ALPHA - 1.0)
+                ALPHA.mul_add(value.powf(0.45), -(ALPHA - 1.0))
             }
         }
 

crates/prettypretty/src/core/conversion.rs

@@ -7,8 +7,8 @@ use crate::Float;
 /// Compute Delta-E for Oklab or Oklrab.
 #[allow(non_snake_case)]
 pub(crate) fn delta_e_ok(coordinates1: &[Float; 3], coordinates2: &[Float; 3]) -> Float {
-    let [L1, a1, b1] = coordinates1;
-    let [L2, a2, b2] = coordinates2;
+    let [ref L1, ref a1, ref b1] = *coordinates1;
+    let [ref L2, ref a2, ref b2] = *coordinates2;
 
     let ΔL = L1 - L2;
     let Δa = a1 - a2;
@@ -229,8 +229,8 @@ pub(crate) fn interpolate(
     coordinates2: &[Float; 3],
 ) -> [Float; 3] {
     [
-        coordinates1[0] + fraction * (coordinates2[0] - coordinates1[0]),
-        coordinates1[1] + fraction * (coordinates2[1] - coordinates1[1]),
-        coordinates1[2] + fraction * (coordinates2[2] - coordinates1[2]),
+        fraction.mul_add(coordinates2[0] - coordinates1[0], coordinates1[0]),
+        fraction.mul_add(coordinates2[1] - coordinates1[1], coordinates1[1]),
+        fraction.mul_add(coordinates2[2] - coordinates1[2], coordinates1[2]),
     ]
 }

crates/prettypretty/src/core/difference.rs

@@ -19,7 +19,7 @@ pub(crate) fn in_gamut(space: ColorSpace, coordinates: &[Float; 3]) -> bool {
 /// Clip the coordinates to the gamut of their color space.
 pub(crate) fn clip(space: ColorSpace, coordinates: &[Float; 3]) -> [Float; 3] {
     if space.is_rgb() {
-        let [r, g, b] = coordinates;
+        let [ref r, ref g, ref b] = *coordinates;
         [r.clamp(0.0, 1.0), g.clamp(0.0, 1.0), b.clamp(0.0, 1.0)]
     } else {
         *coordinates
@@ -81,6 +81,7 @@ pub(crate) fn to_gamut(space: ColorSpace, coordinates: &[Float; 3]) -> [Float; 3
     let mut max = origin_as_oklch[1];
     let mut min_in_gamut = true;
 
+    #[allow(clippy::while_float)]
     while EPSILON < max - min {
         let chroma = (min + max) / 2.0;
         current_as_oklch = [current_as_oklch[0], chroma, current_as_oklch[2]];
@@ -142,17 +143,17 @@ pub enum GamutTraversalStep {
 impl GamutTraversalStep {
     /// Get this step's color.
     pub fn color(&self) -> Color {
-        match self {
-            Self::MoveTo(color) => color.clone(),
-            Self::LineTo(color) => color.clone(),
-            Self::CloseWith(color) => color.clone(),
+        match *self {
+            Self::MoveTo(ref color) => color.clone(),
+            Self::LineTo(ref color) => color.clone(),
+            Self::CloseWith(ref color) => color.clone(),
         }
     }
 
     /// Get a debug representation. <i class=python-only>Python only!</i>
     #[cfg(feature = "pyffi")]
     pub fn __repr__(&self) -> String {
-        match self {
+        match *self {
             Self::MoveTo(ref color) => format!("GamutTraversalStep.MoveTo({:?}", color),
             Self::LineTo(ref color) => format!("GamutTraversalStep.LineTo({:?}", color),
             Self::CloseWith(ref color) => format!("GamutTraversalStep.CloseWith({:?}", color),
@@ -448,14 +449,14 @@ impl Iterator for GamutTraversal {
 }
 
 #[cfg(feature = "gamut")]
-impl std::iter::ExactSizeIterator for GamutTraversal {
+impl ExactSizeIterator for GamutTraversal {
     fn len(&self) -> usize {
         self.remaining
     }
 }
 
 #[cfg(feature = "gamut")]
-impl std::iter::FusedIterator for GamutTraversal {}
+impl core::iter::FusedIterator for GamutTraversal {}
 
 #[cfg(all(feature = "gamut", feature = "pyffi"))]
 #[pymethods]

crates/prettypretty/src/core/gamut.rs

@@ -50,7 +50,7 @@ pub(crate) mod sum {
         }
     }
 
-    impl std::ops::Add<Float> for Sum {
+    impl core::ops::Add<Float> for Sum {
         type Output = Sum;
 
         /// Add a number to this sum.
@@ -64,7 +64,7 @@ pub(crate) mod sum {
         }
     }
 
-    impl std::ops::AddAssign<Float> for Sum {
+    impl core::ops::AddAssign<Float> for Sum {
         fn add_assign(&mut self, rhs: Float) {
             let t = self.sum + rhs;
             if rhs.abs() < self.sum.abs() {
@@ -76,7 +76,7 @@ pub(crate) mod sum {
         }
     }
 
-    impl std::iter::Sum<Float> for Sum {
+    impl core::iter::Sum<Float> for Sum {
         fn sum<I: Iterator<Item = Float>>(iter: I) -> Self {
             let mut sum = Sum::new();
             for num in iter {
@@ -113,7 +113,7 @@ pub(crate) mod sum {
         }
     }
 
-    impl std::ops::Add<[Float; 3]> for ThreeSum {
+    impl core::ops::Add<[Float; 3]> for ThreeSum {
         type Output = ThreeSum;
 
         fn add(self, rhs: [Float; 3]) -> Self::Output {
@@ -123,7 +123,7 @@ pub(crate) mod sum {
         }
     }
 
-    impl std::ops::AddAssign<[Float; 3]> for ThreeSum {
+    impl core::ops::AddAssign<[Float; 3]> for ThreeSum {
         fn add_assign(&mut self, rhs: [Float; 3]) {
             let [a, b, c] = rhs;
             self.a += a;
@@ -132,7 +132,7 @@ pub(crate) mod sum {
         }
     }
 
-    impl std::iter::Sum<[Float; 3]> for ThreeSum {
+    impl core::iter::Sum<[Float; 3]> for ThreeSum {
         fn sum<I: Iterator<Item = [Float; 3]>>(iter: I) -> Self {
             let mut sum = ThreeSum::new();
             for triple in iter {

crates/prettypretty/src/core/math.rs

@@ -127,7 +127,7 @@ impl ColorSpace {
 
     /// Determine whether this color space is XYZ.
     pub const fn is_xyz(&self) -> bool {
-        matches!(self, Self::Xyz)
+        matches!(self, &Self::Xyz)
     }
 
     /// Determine whether this color space is RGB.
@@ -187,11 +187,11 @@ impl ColorSpace {
     }
 }
 
-impl std::fmt::Display for ColorSpace {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+impl core::fmt::Display for ColorSpace {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         use ColorSpace::*;
 
-        let s = match self {
+        let s = match *self {
             Srgb => "sRGB",
             LinearSrgb => "linear sRGB",
             DisplayP3 => "Display P3",