From 4cddc8571f488dd1a000f98f3acbffbbf2306d84 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Sun, 13 Jun 2021 18:44:16 -0700 Subject: [PATCH] panic/foramt lint --- rtiow/renderer/src/bvh.rs | 4 ++-- rtiow/renderer/src/kdtree.rs | 4 ++-- rtiow/renderer/src/texture/image.rs | 8 ++++---- rtiow/renderer/src/texture/mandelbrot.rs | 2 +- rtiow/renderer/src/vec3.rs | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rtiow/renderer/src/bvh.rs b/rtiow/renderer/src/bvh.rs index 23796d9..93c2490 100644 --- a/rtiow/renderer/src/bvh.rs +++ b/rtiow/renderer/src/bvh.rs @@ -78,10 +78,10 @@ fn box_z_compare(ah: &Box, bh: &Box) -> std::cmp::Ordering { // returns a reference.) fn vec_first_into(v: Vec) -> T { if v.len() != 1 { - panic!(format!( + panic!( "vec_first_into called for vector length != 1, length {}", v.len() - )); + ); } v.into_iter().next().unwrap() } diff --git a/rtiow/renderer/src/kdtree.rs b/rtiow/renderer/src/kdtree.rs index c5663da..34b4604 100644 --- a/rtiow/renderer/src/kdtree.rs +++ b/rtiow/renderer/src/kdtree.rs @@ -22,10 +22,10 @@ pub enum KDTree { // returns a reference.) fn vec_first_into(v: Vec) -> T { if v.len() != 1 { - panic!(format!( + panic!( "vec_first_into called for vector length != 1, length {}", v.len() - )); + ); } v.into_iter().next().unwrap() } diff --git a/rtiow/renderer/src/texture/image.rs b/rtiow/renderer/src/texture/image.rs index 7d72e95..bc9c39c 100644 --- a/rtiow/renderer/src/texture/image.rs +++ b/rtiow/renderer/src/texture/image.rs @@ -27,16 +27,16 @@ impl Texture for ImageTexture { let x = (u % 1. * (self.width - 1.)) as u32; let y = ((1. - v % 1.) * (self.height - 1.)) as u32; if x >= self.width as u32 { - panic!(format!( + panic!( "u {} v {} x {} y {} w {} h {}", u, v, x, y, self.width, self.height - )); + ); } if y >= self.height as u32 { - panic!(format!( + panic!( "u {} v {} x {} y {} w {} h {}", u, v, x, y, self.width, self.height - )); + ); } let pixel = self.img.get_pixel(x, y); Vec3::new( diff --git a/rtiow/renderer/src/texture/mandelbrot.rs b/rtiow/renderer/src/texture/mandelbrot.rs index 7bbc5df..e0585f0 100644 --- a/rtiow/renderer/src/texture/mandelbrot.rs +++ b/rtiow/renderer/src/texture/mandelbrot.rs @@ -27,7 +27,7 @@ fn hsv_to_rgb(h: f32, s: f32, v: f32) -> Vec3 { 3 => Vec3::new(p, q, v), 4 => Vec3::new(t, p, v), 5 => Vec3::new(v, p, q), - _ => panic!(format!("Unknown H value {}", h_i)), + _ => panic!("Unknown H value {}", h_i), } } diff --git a/rtiow/renderer/src/vec3.rs b/rtiow/renderer/src/vec3.rs index 0887353..6be9c07 100644 --- a/rtiow/renderer/src/vec3.rs +++ b/rtiow/renderer/src/vec3.rs @@ -144,7 +144,7 @@ impl Index for Vec3 { 0 => &self.x, 1 => &self.y, 2 => &self.z, - _ => panic!(format!("idx {} out of range for vec3", idx)), + _ => panic!("idx {} out of range for vec3", idx), } } }