From 8ae3b8cbcbb7cc435f402bccde00b0ec60d686af Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Sat, 28 Jan 2023 11:01:31 +0100 Subject: [PATCH] Fix new clippy lints Mostly switching to inline formatting. --- narcissus-core/src/arena.rs | 2 +- narcissus-core/src/fixed_vec.rs | 12 +++++------- narcissus-core/src/obj.rs | 2 +- narcissus-core/src/virtual_mem.rs | 2 +- narcissus-maths/src/lib.rs | 2 +- narcissus-maths/src/mat2.rs | 2 +- narcissus-maths/src/mat3.rs | 2 +- narcissus-maths/src/mat4.rs | 2 +- narcissus-maths/tests/exhaustive_f32.rs | 6 +++--- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/narcissus-core/src/arena.rs b/narcissus-core/src/arena.rs index a3c25e3..9d23d21 100644 --- a/narcissus-core/src/arena.rs +++ b/narcissus-core/src/arena.rs @@ -7,7 +7,7 @@ pub struct AllocError; impl std::fmt::Display for AllocError { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self) + write!(f, "{self:?}") } } diff --git a/narcissus-core/src/fixed_vec.rs b/narcissus-core/src/fixed_vec.rs index c9d3304..d76fcd6 100644 --- a/narcissus-core/src/fixed_vec.rs +++ b/narcissus-core/src/fixed_vec.rs @@ -109,8 +109,7 @@ impl FixedVec { #[inline(never)] fn assert_failed(index: usize, len: usize) -> ! { panic!( - "swap_remove index (is {}) should be < len (is {})", - index, len + "swap_remove index (is {index}) should be < len (is {len})" ); } @@ -135,8 +134,7 @@ impl FixedVec { #[inline(never)] fn assert_failed(index: usize, len: usize) -> ! { panic!( - "insertion index (is {}) should be <= len (is {})", - index, len + "insertion index (is {index}) should be <= len (is {len})" ); } @@ -147,7 +145,7 @@ impl FixedVec { // space for the new element if len == CAP { - panic!("buffer is full (capacity is {})", CAP); + panic!("buffer is full (capacity is {CAP})"); } unsafe { @@ -172,7 +170,7 @@ impl FixedVec { #[inline(never)] #[track_caller] fn assert_failed(index: usize, len: usize) -> ! { - panic!("removal index (is {}) should be < len (is {})", index, len); + panic!("removal index (is {index}) should be < len (is {len})"); } let len = self.len(); @@ -439,7 +437,7 @@ impl FixedVec { #[inline] pub fn push(&mut self, value: T) { if self.len == CAP { - panic!("capacity overflow (is {})", CAP); + panic!("capacity overflow (is {CAP})"); } unsafe { let end = self.as_mut_ptr().add(self.len); diff --git a/narcissus-core/src/obj.rs b/narcissus-core/src/obj.rs index 5d9e80f..836d51e 100644 --- a/narcissus-core/src/obj.rs +++ b/narcissus-core/src/obj.rs @@ -12,7 +12,7 @@ pub enum Error { impl std::fmt::Display for Error { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self) + write!(f, "{self:?}") } } diff --git a/narcissus-core/src/virtual_mem.rs b/narcissus-core/src/virtual_mem.rs index ac72a46..9b66001 100644 --- a/narcissus-core/src/virtual_mem.rs +++ b/narcissus-core/src/virtual_mem.rs @@ -7,7 +7,7 @@ pub enum MapError { impl std::fmt::Display for MapError { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self) + write!(f, "{self:?}") } } diff --git a/narcissus-maths/src/lib.rs b/narcissus-maths/src/lib.rs index 6934e74..cb88a6f 100644 --- a/narcissus-maths/src/lib.rs +++ b/narcissus-maths/src/lib.rs @@ -182,7 +182,7 @@ fn round_ties_to_even(x: f32) -> f32 { use std::arch::x86_64::{ _mm_load_ss, _mm_round_ss, _MM_FROUND_NO_EXC, _MM_FROUND_TO_NEAREST_INT, }; - const ROUNDING: i32 = (_MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC) as i32; + const ROUNDING: i32 = _MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC; let x = _mm_load_ss(&x); let x = _mm_round_ss::(x, x); std::arch::x86_64::_mm_cvtss_f32(x) diff --git a/narcissus-maths/src/mat2.rs b/narcissus-maths/src/mat2.rs index c6d1b1b..196bea7 100644 --- a/narcissus-maths/src/mat2.rs +++ b/narcissus-maths/src/mat2.rs @@ -10,7 +10,7 @@ impl std::fmt::Debug for Mat2 { if f.alternate() { writeln!(f, "Mat2 [")?; for row in self.as_rows() { - writeln!(f, "\t{:?}", row)?; + writeln!(f, "\t{row:?}")?; } writeln!(f, "]") } else { diff --git a/narcissus-maths/src/mat3.rs b/narcissus-maths/src/mat3.rs index af44149..520eadd 100644 --- a/narcissus-maths/src/mat3.rs +++ b/narcissus-maths/src/mat3.rs @@ -10,7 +10,7 @@ impl std::fmt::Debug for Mat3 { if f.alternate() { writeln!(f, "Mat3 [")?; for row in self.as_rows() { - writeln!(f, "\t{:?}", row)?; + writeln!(f, "\t{row:?}")?; } writeln!(f, "]") } else { diff --git a/narcissus-maths/src/mat4.rs b/narcissus-maths/src/mat4.rs index afa7104..9a8409e 100644 --- a/narcissus-maths/src/mat4.rs +++ b/narcissus-maths/src/mat4.rs @@ -12,7 +12,7 @@ impl std::fmt::Debug for Mat4 { if f.alternate() { writeln!(f, "Mat4 [")?; for row in self.as_rows() { - writeln!(f, "\t{:?}", row)?; + writeln!(f, "\t{row:?}")?; } writeln!(f, "]") } else { diff --git a/narcissus-maths/tests/exhaustive_f32.rs b/narcissus-maths/tests/exhaustive_f32.rs index 0fcc12f..a522a54 100644 --- a/narcissus-maths/tests/exhaustive_f32.rs +++ b/narcissus-maths/tests/exhaustive_f32.rs @@ -422,7 +422,7 @@ fn ref_tan_pi_f32(x: &mut Float, pi: &Float) -> i32 { #[ignore] pub fn exhaustive_sin_pi() { let errors = check_exhaustive_f32(ref_sin_pi_f32, |a| sin_cos_pi_f32(a).0, false); - println!("SIN: {:?}", errors); + println!("SIN: {errors:?}"); assert_eq!(errors.max_error_ulp, 1); assert_eq!(errors.num_errors, 55_943_962); } @@ -431,7 +431,7 @@ pub fn exhaustive_sin_pi() { #[ignore] pub fn exhaustive_cos_pi() { let errors = check_exhaustive_f32(ref_cos_pi_f32, |a| sin_cos_pi_f32(a).1, false); - println!("COS: {:?}", errors); + println!("COS: {errors:?}"); assert_eq!(errors.num_errors, 45_896_848); assert_eq!(errors.max_error_ulp, 1); } @@ -440,7 +440,7 @@ pub fn exhaustive_cos_pi() { #[ignore] pub fn exhaustive_tan_pi() { let errors = check_exhaustive_f32(ref_tan_pi_f32, tan_pi_f32, true); - println!("TAN: {:?}", errors); + println!("TAN: {errors:?}"); assert_eq!(errors.num_errors, 100_555_422); assert_eq!(errors.max_error_ulp, 2); } -- 2.49.0