Merge pull request #292 from workingjubilee/go-green

Clear stage 1

Author: workingjubilee

ci/all.sh

@@ -21,7 +21,7 @@ cargo_fmt() {
 }
 
 cargo_clippy() {
-    cargo clippy --all -- -D clippy::pedantic
+    cargo clippy --all -- -D clippy::perf
 }
 
 CMD="-1"

examples/aobench/benches/ambient_occlusion.rs

@@ -4,10 +4,10 @@
 use aobench_lib::*;
 use criterion::*;
 use intersection::Isect;
-use scene::Test;
+use aobench_lib::scene::Test;
 
 fn hit_scalar(c: &mut Criterion) {
-    let mut scene = Test::new();
+    let mut scene = Test::default();
     c.bench(
         "scalar",
         Benchmark::new("ao_hit", move |b| {
@@ -24,7 +24,7 @@ fn hit_scalar(c: &mut Criterion) {
 }
 
 fn hit_vector(c: &mut Criterion) {
-    let mut scene = Test::new();
+    let mut scene = Test::default();
 
     c.bench(
         "vector",

examples/aobench/benches/isec_plane.rs

@@ -132,7 +132,7 @@ fn hit_vector(c: &mut Criterion) {
                 assert_eq!(v.hit.all(), true);
             })
         })
-        .throughput(Throughput::Elements(f32xN::lanes() as u32)),
+        .throughput(Throughput::Elements(f32xN::lanes() as u64)),
     );
 }
 
@@ -175,7 +175,7 @@ fn miss_vector(c: &mut Criterion) {
                 assert_eq!(v.hit.any(), false);
             })
         })
-        .throughput(Throughput::Elements(f32xN::lanes() as u32)),
+        .throughput(Throughput::Elements(f32xN::lanes() as u64)),
     );
 }
 

examples/aobench/benches/isec_sphere.rs

@@ -5,7 +5,6 @@ use crate::geometry::{f32xN, Ray, RayxN, Sphere, V3DxN, V3D};
 use crate::intersection::{Intersect, Isect, IsectxN};
 use aobench_lib::*;
 use criterion::*;
-use test::*;
 
 fn hit_scalar(c: &mut Criterion) {
     let mut s = Sphere {
@@ -121,7 +120,7 @@ fn hit_vector(c: &mut Criterion) {
                 assert_eq!(v.hit.all(), true);
             })
         })
-        .throughput(Throughput::Elements(f32xN::lanes() as u32)),
+        .throughput(Throughput::Elements(f32xN::lanes() as u64)),
     );
 }
 
@@ -160,7 +159,7 @@ fn miss_vector(c: &mut Criterion) {
                 assert_eq!(v.hit.any(), false);
             })
         })
-        .throughput(Throughput::Elements(f32xN::lanes() as u32)),
+        .throughput(Throughput::Elements(f32xN::lanes() as u64)),
     );
 }
 

examples/aobench/benches/random.rs

@@ -27,7 +27,7 @@ fn random_vector(c: &mut Criterion) {
                 black_box(rng.gen());
             })
         })
-        .throughput(Throughput::Elements(f32xN::lanes() as u32)),
+        .throughput(Throughput::Elements(f32xN::lanes() as u64)),
     );
 }
 

examples/aobench/src/image.rs

@@ -1,7 +1,8 @@
 //! Image utilities
 
 use failure::Error;
-use png;
+#[allow(unused)]
+use png::{BitDepth, ColorType, Encoder};
 use std::path::Path;
 
 /// PNG image in RGB format
@@ -53,14 +54,14 @@ impl Image {
 
         let file = File::create(output)?;
         let buf_writer = &mut BufWriter::new(file);
-        let mut encoder = png::Encoder::new(
+        let mut encoder = Encoder::new(
             buf_writer,
             self.width as u32,
             self.height as u32,
         );
 
-        encoder.set_color(png::ColorType::RGB);
-        encoder.set_depth(png::BitDepth::Eight);
+        encoder.set_color(ColorType::RGB);
+        encoder.set_depth(BitDepth::Eight);
         let mut writer = encoder.write_header().unwrap();
 
         if soa {

examples/aobench/src/intersection/ray_plane.rs

@@ -38,7 +38,7 @@ impl Intersect<Plane> for RayxN {
         let d = -plane.p.dot(plane.n);
         let v = ray.dir.dot(plane.n);
 
-        let old_isect = isect;
+        let _old_isect = isect;
 
         let m = v.abs().ge(f32xN::splat(1e-17));
         if m.any() {
@@ -58,10 +58,10 @@ impl Intersect<Plane> for RayxN {
             // 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() {
-                let old_isect_i = old_isect.get(i);
+                let old_isect_i = _old_isect.get(i);
                 let ray_i = self.get(i);
                 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);
+                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);
             }
         }
 

examples/aobench/src/intersection/ray_sphere.rs

@@ -43,7 +43,7 @@ impl Intersect<Sphere> for RayxN {
         let c = radius.mul_adde(-radius, rs.dot(rs));
         let d = b.mul_adde(b, -c);
 
-        let old_isect = isect;
+        let _old_isect = isect;
 
         let m = d.gt(f32xN::splat(0.));
         if m.any() {
@@ -64,10 +64,10 @@ impl Intersect<Sphere> for RayxN {
             // 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() {
-                let old_isect_i = old_isect.get(i);
+                let old_isect_i = _old_isect.get(i);
                 let ray_i = self.get(i);
                 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);
+                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);
             }
         }
 

examples/aobench/src/lib.rs

@@ -13,7 +13,8 @@
     clippy::cast_sign_loss,
     clippy::identity_op,
     clippy::erasing_op,
-    clippy::must_use_candidate
+    clippy::must_use_candidate,
+    clippy::float_cmp
 )]
 
 pub mod ambient_occlusion;

examples/dot_product/src/lib.rs

@@ -1,7 +1,7 @@
 //! Vector dot product
 #![deny(warnings, rust_2018_idioms)]
 #![feature(custom_inner_attributes)]
-#![allow(clippy::must_use_candidate)]
+#![allow(clippy::must_use_candidate, clippy::float_cmp)]
 
 pub mod scalar;
 pub mod simd;