Fix Clippy warnings

Author: jdahlstrom

benches/fill.rs

@@ -56,10 +56,8 @@ fn gouraud(b: Bencher, sz: f32) {
         });
     });
 
-    let buf = Buf2::new_from(
-        (1024, 1024),
-        buf.data().into_iter().map(|c| c.to_color3()),
-    );
+    let buf =
+        Buf2::new_from((1024, 1024), buf.data().iter().map(|c| c.to_color3()));
     save_ppm("benches_fill_color.ppm", buf).unwrap();
 }
 

core/examples/hello_tri.rs

@@ -1,5 +1,5 @@
+use retrofire_core::prelude::*;
 use retrofire_core::render::{Model, render, shader};
-use retrofire_core::{prelude::*, util::*};
 
 fn main() {
     let verts = [
@@ -53,6 +53,7 @@ fn main() {
     }
     #[cfg(feature = "std")]
     {
+        use retrofire_core::util::pnm;
         pnm::save_ppm("triangle.ppm", framebuf).unwrap();
     }
 }

core/src/geom/prim.rs

@@ -720,7 +720,7 @@ impl<B> Line2<B> {
 
     /// Returns the coefficients [a, b, c] of the line equation ax + by = c.
     pub const fn coeffs(&self) -> [f32; 3] {
-        return self.0.0;
+        self.0.0
     }
 }
 

core/src/math.rs

@@ -1,7 +1,7 @@
 //! Linear algebra and other useful mathematics.
 //!
 //! Includes [vectors][self::vec], [matrices][mat], [colors][color],
-//! [angles][angle], [Bezier splines][spline] and [pseudo-random numbers][rand],
+//! [angles][angle], [splines][spline] and [pseudo-random numbers][rand],
 //! as well as support for custom [varying][vary] types and utilities such as
 //! approximate equality comparisons.
 //!

core/src/math/angle.rs

@@ -432,8 +432,8 @@ impl<B> Vec3<B> {
     /// * `r` equals `self.len()`
     /// * `az`is the angle between `self` and the xy-plane in the range
     ///   (-180°, 180°] such that positive `z` maps to *negative* `az`, and
-    /// * `alt` is the angle between `self` and the xz-plane in the
-    /// range [-90°, 90°] such that positive `y` maps to positive `alt`.
+    /// * `alt` is the angle between `self` and the xz-plane in the range
+    ///   [-90°, 90°] such that positive `y` maps to positive `alt`.
     ///
     /// # Examples
     /// ```

core/src/math/mat.rs

@@ -279,7 +279,7 @@ where
             array::from_fn(|j| array::from_fn(|i| dot(&lhs[j], &rhs[i])))
         }
 
-        let mut other = other.0.clone();
+        let mut other = other.0;
         transpose(&mut other);
         do_compose(&self.0, &other).into()
     }

core/src/math/spline.rs

@@ -1,4 +1,7 @@
 //! Bézier curves and splines.
+
+#![allow(clippy::just_underscores_and_digits)]
+
 use alloc::vec::Vec;
 use core::{array::from_fn, fmt::Debug, marker::PhantomData};
 
@@ -369,7 +372,7 @@ where
         // = (1 - b2) * p0 + b2 * p1
         // = p0 + b2 * (p1 - p0)
 
-        p0.add(&p1.sub(&p0).mul(b2)) // Affine part
+        p0.add(&p1.sub(p0).mul(b2)) // Affine part
             .add(&d0.mul(b1).add(&d1.mul(b3))) // Linear part
     }
 
@@ -401,7 +404,7 @@ where
 
         // Only vectors as expected:
         // b2·(p1 - p0) + b1·d0 + b3·d1
-        p1.sub(&p0)
+        p1.sub(p0)
             .mul(b2)
             .add(&d0.mul(b1).add(&d1.mul(b3)))
     }
@@ -445,7 +448,7 @@ where
             .into_iter()
             .flat_map(|Ray(p, d)| [p.add(&d.neg()), p.clone(), p.add(&d)])
             .collect();
-        Self::new(pts[1..pts.len() - 1].into_iter().cloned())
+        Self::new(pts[1..pts.len() - 1].iter().cloned())
     }
 
     /// Returns the point of `self` at the given *t* value.
@@ -607,9 +610,9 @@ where
         // = P0 - b1·P0 - b2·P0 - b3·P0 + b1·P1 + b2·P2 + b3·P3
         // = P0 + b1·(P1 - P0) + b2·(P2 - P0) + b3·(P3 - P0)
 
-        let v01 = p1.sub(&p0).mul(b1);
-        let v02 = &p2.sub(&p0).mul(b2);
-        let v03 = p3.sub(&p0).mul(b3);
+        let v01 = p1.sub(p0).mul(b1);
+        let v02 = p2.sub(p0).mul(b2);
+        let v03 = p3.sub(p0).mul(b3);
         p0.add(&v01.add(&v02).add(&v03).mul(1.0 / 2.0))
     }
 
@@ -637,9 +640,9 @@ where
         // = b1·P1 + b2·P2 + b3·P3 - b1·P0 - b2·P0 - b3·P0
         // = b1·(P1 - P0) + b2·(P2 - P0) + b3·(P3 - P0)
 
-        let v01 = p1.sub(&p0).mul(b1);
-        let v02 = p2.sub(&p0).mul(b2);
-        let v03 = p3.sub(&p0).mul(b3);
+        let v01 = p1.sub(p0).mul(b1);
+        let v02 = p2.sub(p0).mul(b2);
+        let v03 = p3.sub(p0).mul(b3);
         v01.add(&v02).add(&v03).mul(1.0 / 2.0)
     }
 }
@@ -678,9 +681,9 @@ where
         let b2 = 1.0 + 3.0 * t1 + 3.0 * t2 - 3.0 * t3;
         let b3 = t3;
 
-        let v01 = p1.sub(&p0).mul(b1);
-        let v02 = p2.sub(&p0).mul(b2);
-        let v03 = p3.sub(&p0).mul(b3);
+        let v01 = p1.sub(p0).mul(b1);
+        let v02 = p2.sub(p0).mul(b2);
+        let v03 = p3.sub(p0).mul(b3);
         p0.add(&v01.add(&v02).add(&v03).mul(1.0 / 6.0))
     }
 
@@ -708,9 +711,9 @@ where
         // = b1·P1 + b2·P2 + b3·P3 - b1·P0 - b2·P0 - b3·P0
         // = b1·(P1 - P0) + b2·(P2 - P0) + b3·(P3 - P0)
 
-        let v01 = p1.sub(&p0).mul(b1);
-        let v02 = p2.sub(&p0).mul(b2);
-        let v03 = p3.sub(&p0).mul(b3);
+        let v01 = p1.sub(p0).mul(b1);
+        let v02 = p2.sub(p0).mul(b2);
+        let v03 = p3.sub(p0).mul(b3);
         v01.add(&v02).add(&v03).mul(1.0 / 6.0)
     }
 }

core/src/math/vec.rs

@@ -1,13 +1,9 @@
 //! Real and projective vectors.
 //!
 //! TODO
+//!
+//!
 
-use super::{
-    Affine, ApproxEq, Linear, Point,
-    space::{Proj3, Real},
-    vary::ZDiv,
-};
-use crate::math::space::Hom;
 use core::{
     array,
     fmt::{Debug, Formatter},
@@ -17,15 +13,21 @@ use core::{
     ops::{AddAssign, DivAssign, MulAssign, SubAssign},
 };
 
+use super::{
+    Affine, ApproxEq, Linear, Point,
+    space::{Hom, Proj3, Real},
+    vary::ZDiv,
+};
+
 //
 // Types
 //
 
 /// A generic vector type. Represents an element of a vector space.
 ///
-/// or a module,
-/// a generalization of a vector space where the scalars can be integers
-/// (technically, the scalar type can be any *ring*-like type).
+// or a module,
+// a generalization of a vector space where the scalars can be integers
+// (technically, the scalar type can be any *ring*-like type).
 ///
 /// # Type parameters
 /// * `Repr`: Representation of the scalar components of the vector,

core/src/render/cam.rs

@@ -226,6 +226,7 @@ impl<T: Transform> Camera<T> {
     }
 
     /// Renders the given geometry from the viewpoint of this camera.
+    #[allow(clippy::too_many_arguments)]
     pub fn render<B, Prim, Vtx: Clone, Var: Vary, Uni: Copy, Shd>(
         &self,
         prims: impl AsRef<[Prim]>,

core/src/render/clip.rs

@@ -444,7 +444,7 @@ mod tests {
         //  32  16  8   4   2   1
 
         // Outside near == 1
-        assert_eq!(outcode(&vec(0.0, 0.0, -1.5)), 0b00_0_01);
+        assert_eq!(outcode(&vec(0.0, 0.0, -1.5)), 0b00_00_01);
         // Outside right == 8
         assert_eq!(outcode(&vec(2.0, 0.0, 0.0)), 0b00_10_00);
         // Outside bottom == 16