Merge pull request #272 from GabrielMajeri/fix-clippy

workingjubilee · web-flow · commit 065021d33d0f · 2020-09-23T12:54:10.000-07:00
Fix Clippy lints
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,9 +21,9 @@ is-it-maintained-open-issues = { repository = "rust-lang-nursery/packed_simd" }
 maintenance = { status = "experimental" }
 
 [dependencies]
-cfg-if = "^0.1.6"
-core_arch = { version = "^0.1.4", optional = true }
-libm = "0.1.2"
+cfg-if = "0.1.10"
+core_arch = { version = "0.1.5", optional = true }
+libm = "0.1.4"
 
 [features]
 default = []
@@ -35,7 +35,7 @@ paste = "^0.1.3"
 arrayvec = { version = "^0.5", default-features = false }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies.sleef-sys]
-version = "^0.1.2"
+version = "0.1.2"
 optional = true
 
 [target.wasm32-unknown-unknown.dev-dependencies]
diff --git a/examples/aobench/benchmark.sh b/examples/aobench/benchmark.sh
@@ -34,7 +34,7 @@ fi
 
 for alg in "${ALGS[@]}"
 do
-    hyperfine "target/release/aobench ${WIDTH} ${HEIGHT} --algo ${alg}"
+    hyperfine "../target/release/aobench ${WIDTH} ${HEIGHT} --algo ${alg}"
 done
 
 echo "Benchmark 128-bit wide vectors"
@@ -43,5 +43,5 @@ RUSTFLAGS="-C target-cpu=native ${RUSTFLAGS}" \
          --features="${FEATURES}"
 for alg in "${ALGS[@]}"
 do
-    hyperfine "target/release/aobench ${WIDTH} ${HEIGHT} --algo ${alg}"
+    hyperfine "../target/release/aobench ${WIDTH} ${HEIGHT} --algo ${alg}"
 done
diff --git a/examples/aobench/src/image.rs b/examples/aobench/src/image.rs
@@ -48,7 +48,6 @@ impl Image {
             i as u8
         }
 
-        use png::HasParameters;
         use std::fs::File;
         use std::io::BufWriter;
 
@@ -60,7 +59,8 @@ impl Image {
             self.height as u32,
         );
 
-        encoder.set(png::ColorType::RGB).set(png::BitDepth::Eight);
+        encoder.set_color(png::ColorType::RGB);
+        encoder.set_depth(png::BitDepth::Eight);
         let mut writer = encoder.write_header().unwrap();
 
         if soa {
diff --git a/examples/aobench/src/intersection/ray_plane.rs b/examples/aobench/src/intersection/ray_plane.rs
@@ -53,7 +53,8 @@ impl Intersect<Plane> for RayxN {
             }
         }
 
-        debug_assert!({
+        #[cfg(debug_assertions)]
+        {
             // Check that the vector and the scalar version produce the same results
             // for the same inputs in debug builds
             for i in 0..f32xN::lanes() {
@@ -62,8 +63,7 @@ impl Intersect<Plane> for RayxN {
                 let isect_i = ray_i.intersect(plane, old_isect_i);
                 assert!(isect_i.almost_eq(&isect.get(i)), "{:?} !~= {:?}\n\nplane: {:?}\n\nold_isect: {:?}\n\nrays: {:?}\n\ni: {:?}\nold_isect_i: {:?}\nray_i: {:?}\n\n", isect_i, isect.get(i), plane, old_isect, self, i, old_isect_i, ray_i);
             }
-            true
-        });
+        }
 
         isect
     }
diff --git a/examples/aobench/src/intersection/ray_sphere.rs b/examples/aobench/src/intersection/ray_sphere.rs
@@ -59,7 +59,8 @@ impl Intersect<Sphere> for RayxN {
             }
         }
 
-        debug_assert!({
+        #[cfg(debug_assertions)]
+        {
             // Check that the vector and the scalar version produce the same results
             // for the same inputs in debug builds
             for i in 0..f32xN::lanes() {
@@ -68,8 +69,7 @@ impl Intersect<Sphere> for RayxN {
                 let isect_i = ray_i.intersect(sphere, old_isect_i);
                 assert!(isect_i.almost_eq(&isect.get(i)), "{:?} !~= {:?}\n\nsphere: {:?}\n\nold_isect: {:?}\n\nrays: {:?}\n\ni: {:?}\nold_isect_i: {:?}\nray_i: {:?}\n\n", isect_i, isect.get(i), sphere, old_isect, self, i, old_isect_i, ray_i);
             }
-            true
-        });
+        }
 
         isect
     }
diff --git a/examples/aobench/src/lib.rs b/examples/aobench/src/lib.rs
@@ -12,7 +12,8 @@
     clippy::cast_possible_truncation,
     clippy::cast_sign_loss,
     clippy::identity_op,
-    clippy::erasing_op
+    clippy::erasing_op,
+    clippy::must_use_candidate
 )]
 
 pub mod ambient_occlusion;
diff --git a/examples/aobench/src/random.rs b/examples/aobench/src/random.rs
@@ -67,7 +67,7 @@ pub mod scalar {
 
     pub fn thread_rng() -> RngH {
         RngH {
-            rng: THREAD_RNG_KEY.with(|t| t.clone()),
+            rng: THREAD_RNG_KEY.with(Clone::clone),
         }
     }
 }
@@ -134,7 +134,7 @@ pub mod vector {
 
     pub fn thread_rng() -> RngH {
         RngH {
-            rng: THREAD_RNG_KEY.with(|t| t.clone()),
+            rng: THREAD_RNG_KEY.with(Clone::clone),
         }
     }
 }
diff --git a/examples/dot_product/src/lib.rs b/examples/dot_product/src/lib.rs
@@ -1,6 +1,7 @@
 //! Vector dot product
 #![deny(warnings, rust_2018_idioms)]
 #![feature(custom_inner_attributes)]
+#![allow(clippy::must_use_candidate)]
 
 pub mod scalar;
 pub mod simd;
diff --git a/examples/fannkuch_redux/src/lib.rs b/examples/fannkuch_redux/src/lib.rs
@@ -6,7 +6,8 @@
     clippy::many_single_char_names,
     clippy::cast_possible_truncation,
     clippy::cast_sign_loss,
-    clippy::cast_possible_wrap
+    clippy::cast_possible_wrap,
+    clippy::must_use_candidate
 )]
 
 pub mod scalar;
diff --git a/examples/mandelbrot/Cargo.toml b/examples/mandelbrot/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 packed_simd = { path = "../.." }
 rayon = "^1.0"
 ispc = { version = "^1.0.4", optional = true }
-structopt = "0.3.0"
+structopt = { version = "0.3.0", features = ["color"] }
 
 [build-dependencies]
 ispc = { version = "^1.0.4", optional = true }
diff --git a/examples/mandelbrot/benchmark.sh b/examples/mandelbrot/benchmark.sh
@@ -27,9 +27,9 @@ if [[ "${NORUN}" == "1" ]]; then
     exit 0
 fi
 
-hyperfine "target/release/mandelbrot ${WIDTH} ${HEIGHT} --algo scalar"
-hyperfine "target/release/mandelbrot ${WIDTH} ${HEIGHT} --algo simd"
+hyperfine "../target/release/mandelbrot ${WIDTH} ${HEIGHT} --algo scalar"
+hyperfine "../target/release/mandelbrot ${WIDTH} ${HEIGHT} --algo simd"
 
 if echo "$FEATURES" | grep -q "ispc"; then
-    hyperfine "target/release/mandelbrot ${WIDTH} ${HEIGHT} --algo ispc"
+    hyperfine "../target/release/mandelbrot ${WIDTH} ${HEIGHT} --algo ispc"
 fi
diff --git a/examples/mandelbrot/src/lib.rs b/examples/mandelbrot/src/lib.rs
@@ -6,7 +6,8 @@
 #![allow(
     clippy::cast_precision_loss,
     clippy::cast_sign_loss,
-    clippy::cast_possible_truncation
+    clippy::cast_possible_truncation,
+    clippy::must_use_candidate
 )]
 
 use rayon::prelude::*;
diff --git a/examples/mandelbrot/src/main.rs b/examples/mandelbrot/src/main.rs
@@ -12,7 +12,6 @@ use structopt::StructOpt;
 ///
 /// Output is printed to `stdout`.
 #[derive(StructOpt)]
-#[structopt(raw(setting = "structopt::clap::AppSettings::ColoredHelp"))]
 struct Opt {
     /// Image width.
     width: usize,
diff --git a/examples/mandelbrot/src/simd_par.rs b/examples/mandelbrot/src/simd_par.rs
@@ -145,10 +145,11 @@ pub fn generate(dims: Dimensions, xr: Range, yr: Range) -> Vec<u32> {
         });
     });
 
+    // This is safe, we're transmuting from a more-aligned type to a
+    // less-aligned one.
+    #[allow(clippy::unsound_collection_transmute)]
     unsafe {
         let mut out: Vec<u32> = std::mem::transmute(out);
-        // This is safe, we're transmuting from a more-aligned type to a
-        // less-aligned one.
         out.set_len(width * height);
         out
     }
diff --git a/examples/matrix_inverse/src/lib.rs b/examples/matrix_inverse/src/lib.rs
@@ -1,6 +1,7 @@
 //! 4x4 matrix inverse
 #![feature(custom_inner_attributes)]
 #![deny(warnings, rust_2018_idioms)]
+#![allow(clippy::must_use_candidate)]
 
 pub mod scalar;
 pub mod simd;
diff --git a/examples/nbody/src/lib.rs b/examples/nbody/src/lib.rs
@@ -2,7 +2,11 @@
 //!
 //! [bg]: https://benchmarksgame-team.pages.debian.net/benchmarksgame/description/nbody.html#nbody
 #![deny(warnings, rust_2018_idioms)]
-#![allow(clippy::similar_names, clippy::excessive_precision)]
+#![allow(
+    clippy::similar_names,
+    clippy::excessive_precision,
+    clippy::must_use_candidate
+)]
 
 pub mod scalar;
 pub mod simd;
diff --git a/examples/options_pricing/benchmark.sh b/examples/options_pricing/benchmark.sh
@@ -27,7 +27,7 @@ fi
 
 #for alg in "${ALGS[@]}"
 #do
-#    hyperfine "target/release/options_pricing ${NUM_OPTIONS_BLACK_SCHOLES} ${alg}"
+#    hyperfine "../target/release/options_pricing ${NUM_OPTIONS_BLACK_SCHOLES} ${alg}"
 #done
 
 # Binomial put:
@@ -40,5 +40,5 @@ NUM_OPTIONS_BINOMIAL_PUT=500000
 
 for alg in "${ALGS[@]}"
 do
-    hyperfine "target/release/options_pricing ${NUM_OPTIONS_BINOMIAL_PUT} ${alg}"
+    hyperfine "../target/release/options_pricing ${NUM_OPTIONS_BINOMIAL_PUT} ${alg}"
 done
diff --git a/examples/options_pricing/src/lib.rs b/examples/options_pricing/src/lib.rs
@@ -6,6 +6,7 @@
     clippy::cast_precision_loss,
     clippy::cast_possible_truncation,
     clippy::cast_possible_wrap,
+    clippy::must_use_candidate,
     clippy::too_many_arguments
 )]
 
diff --git a/examples/slice_sum/src/main.rs b/examples/slice_sum/src/main.rs
@@ -23,7 +23,7 @@ fn sum_hor(x: &[f32]) -> f32 {
 
     x.chunks_exact(f32s::lanes())
         .map(f32s::from_slice_unaligned)
-        .map(|vec| vec.sum())
+        .map(f32s::sum)
         .sum()
 }
 
diff --git a/examples/spectral_norm/src/lib.rs b/examples/spectral_norm/src/lib.rs
@@ -1,7 +1,10 @@
 //! Spectral Norm
 #![deny(warnings, rust_2018_idioms)]
 #![allow(non_snake_case, non_camel_case_types)]
-#![allow(clippy::cast_precision_loss)]
+#![allow(
+    clippy::cast_precision_loss,
+    clippy::must_use_candidate
+)]
 
 pub mod scalar;
 pub mod simd;
diff --git a/examples/stencil/benchmark.sh b/examples/stencil/benchmark.sh
@@ -30,5 +30,5 @@ fi
 
 for alg in "${algs[@]}"
 do
-    hyperfine "target/release/stencil ${alg}"
+    hyperfine "../target/release/stencil ${alg}"
 done
diff --git a/examples/stencil/src/lib.rs b/examples/stencil/src/lib.rs
@@ -7,7 +7,8 @@
     clippy::too_many_arguments,
     clippy::cast_possible_wrap,
     clippy::cast_possible_truncation,
-    clippy::inline_always
+    clippy::inline_always,
+    clippy::must_use_candidate
 )]
 
 #[cfg(feature = "ispc")]
diff --git a/examples/triangle_xform/src/lib.rs b/examples/triangle_xform/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::must_use_candidate)]
+
 /// Simple matrix type.
 /// The memory layout is the same as the one for Direct3D/OpenGL: fourth vector
 /// represents the translation vector `[x, y, z]`.
diff --git a/src/api/minimal/ptr.rs b/src/api/minimal/ptr.rs
@@ -68,7 +68,7 @@ macro_rules! impl_minimal_p {
 
             /// Extracts the value at `index`.
             ///
-            /// # Precondition
+            /// # Safety
             ///
             /// If `index >= Self::lanes()` the behavior is undefined.
             #[inline]
@@ -96,7 +96,7 @@ macro_rules! impl_minimal_p {
 
             /// Returns a new vector where the value at `index` is replaced by `new_value`.
             ///
-            /// # Precondition
+            /// # Safety
             ///
             /// If `index >= Self::lanes()` the behavior is undefined.
             #[inline]
@@ -215,7 +215,7 @@ macro_rules! impl_minimal_p {
                     f,
                     "{}<{}>(",
                     stringify!($id),
-                    unsafe { crate::intrinsics::type_name::<T>() }
+                    crate::intrinsics::type_name::<T>()
                 )?;
                 for i in 0..$elem_count {
                     if i > 0 {
@@ -611,7 +611,7 @@ macro_rules! impl_minimal_p {
 
             /// Instantiates a new vector with the values of the `slice`.
             ///
-            /// # Precondition
+            /// # Safety
             ///
             /// If `slice.len() < Self::lanes()` or `&slice[0]` is not aligned
             /// to an `align_of::<Self>()` boundary, the behavior is undefined.
@@ -624,7 +624,7 @@ macro_rules! impl_minimal_p {
 
             /// Instantiates a new vector with the values of the `slice`.
             ///
-            /// # Precondition
+            /// # Safety
             ///
             /// If `slice.len() < Self::lanes()` the behavior is undefined.
             #[inline]
@@ -827,7 +827,7 @@ macro_rules! impl_minimal_p {
 
             /// Writes the values of the vector to the `slice`.
             ///
-            /// # Precondition
+            /// # Safety
             ///
             /// If `slice.len() < Self::lanes()` or `&slice[0]` is not
             /// aligned to an `align_of::<Self>()` boundary, the behavior is
@@ -843,7 +843,7 @@ macro_rules! impl_minimal_p {
 
             /// Writes the values of the vector to the `slice`.
             ///
-            /// # Precondition
+            /// # Safety
             ///
             /// If `slice.len() < Self::lanes()` the behavior is undefined.
             #[inline]
@@ -1151,7 +1151,7 @@ macro_rules! impl_minimal_p {
             /// As such, memory acquired directly from allocators or memory
             /// mapped files may be too large to handle with this function.
             ///
-            /// Consider using wrapping_offset_from instead if these constraints
+            /// Consider using `wrapping_offset_from` instead if these constraints
             /// are difficult to satisfy. The only advantage of this method is
             /// that it enables more aggressive compiler optimizations.
             #[inline]
diff --git a/src/lib.rs b/src/lib.rs
@@ -217,9 +217,12 @@
          clippy::cast_lossless,
          clippy::cast_possible_wrap,
          clippy::cast_precision_loss,
+         // TODO: manually add the `#[must_use]` attribute where appropiate
+         clippy::must_use_candidate,
          // This lint is currently broken for generic code
          // See https://github.com/rust-lang/rust-clippy/issues/3410
-         clippy::use_self
+         clippy::use_self,
+         clippy::wrong_self_convention
 )]
 #![cfg_attr(test, feature(hashmap_internals))]
 #![deny(rust_2018_idioms, clippy::missing_inline_in_public_items)]
diff --git a/src/masks.rs b/src/masks.rs
@@ -8,6 +8,7 @@ macro_rules! impl_mask_ty {
 
         impl crate::sealed::Seal for $id {}
         impl crate::sealed::Mask for $id {
+            #[inline]
             fn test(&self) -> bool {
                 $id::test(self)
             }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ impl Intersect<Plane> for RayxN {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- debug_assert!({`
	`56`	`+ #[cfg(debug_assertions)]`
	`57`	`+ {`
`57`	`58`	`// Check that the vector and the scalar version produce the same results`
`58`	`59`	`// for the same inputs in debug builds`
`59`	`60`	`for i in 0..f32xN::lanes() {`
`@@ -62,8 +63,7 @@ impl Intersect<Plane> for RayxN {`
`62`	`63`	`let isect_i = ray_i.intersect(plane, old_isect_i);`
`63`	`64`	`assert!(isect_i.almost_eq(&isect.get(i)), "{:?} !~= {:?}\n\nplane: {:?}\n\nold_isect: {:?}\n\nrays: {:?}\n\ni: {:?}\nold_isect_i: {:?}\nray_i: {:?}\n\n", isect_i, isect.get(i), plane, old_isect, self, i, old_isect_i, ray_i);`
`64`	`65`	`}`
`65`		`- true`
`66`		`- });`
	`66`	`+ }`
`67`	`67`
`68`	`68`	`isect`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ impl Intersect<Sphere> for RayxN {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- debug_assert!({`
	`62`	`+ #[cfg(debug_assertions)]`
	`63`	`+ {`
`63`	`64`	`// Check that the vector and the scalar version produce the same results`
`64`	`65`	`// for the same inputs in debug builds`
`65`	`66`	`for i in 0..f32xN::lanes() {`
`@@ -68,8 +69,7 @@ impl Intersect<Sphere> for RayxN {`
`68`	`69`	`let isect_i = ray_i.intersect(sphere, old_isect_i);`
`69`	`70`	`assert!(isect_i.almost_eq(&isect.get(i)), "{:?} !~= {:?}\n\nsphere: {:?}\n\nold_isect: {:?}\n\nrays: {:?}\n\ni: {:?}\nold_isect_i: {:?}\nray_i: {:?}\n\n", isect_i, isect.get(i), sphere, old_isect, self, i, old_isect_i, ray_i);`
`70`	`71`	`}`
`71`		`- true`
`72`		`- });`
	`72`	`+ }`
`73`	`73`
`74`	`74`	`isect`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ pub mod scalar {`
`67`	`67`
`68`	`68`	`pub fn thread_rng() -> RngH {`
`69`	`69`	`RngH {`
`70`		`- rng: THREAD_RNG_KEY.with(\|t\| t.clone()),`
	`70`	`+ rng: THREAD_RNG_KEY.with(Clone::clone),`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -134,7 +134,7 @@ pub mod vector {`
`134`	`134`
`135`	`135`	`pub fn thread_rng() -> RngH {`
`136`	`136`	`RngH {`
`137`		`- rng: THREAD_RNG_KEY.with(\|t\| t.clone()),`
	`137`	`+ rng: THREAD_RNG_KEY.with(Clone::clone),`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`