From 168c19857ef1d1d555f9ffa6ca3be121a11d62c7 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 17 Nov 2023 09:24:30 -0800 Subject: [PATCH] Run clippy on tests --- .github/workflows/build.yml | 4 ++-- src/pool/boxed.rs | 3 --- src/spsc.rs | 36 ++++++++++++++++++------------------ src/string.rs | 16 ++++++---------- src/vec.rs | 2 +- tests/tsan.rs | 20 +++++++------------- 6 files changed, 34 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 186a8a4a35..a52faff223 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -110,8 +110,8 @@ jobs: uses: dtolnay/rust-toolchain@stable with: components: clippy - targets: i686-unknown-linux-gnu - - run: cargo clippy --all --target i686-unknown-linux-gnu -- --deny warnings + targets: i686-unknown-linux-musl + - run: cargo clippy --all --target i686-unknown-linux-musl --all-targets -- --deny warnings # Compilation check check: diff --git a/src/pool/boxed.rs b/src/pool/boxed.rs index cb92a3efa3..aafad2466c 100644 --- a/src/pool/boxed.rs +++ b/src/pool/boxed.rs @@ -446,7 +446,6 @@ mod tests { assert_eq!(0, raw as usize % 4096); } - #[allow(clippy::redundant_clone)] #[test] fn can_clone_if_pool_is_not_exhausted() { static STRUCT_CLONE_WAS_CALLED: AtomicBool = AtomicBool::new(false); @@ -480,7 +479,6 @@ mod tests { assert!(is_oom); } - #[allow(clippy::redundant_clone)] #[test] fn clone_panics_if_pool_exhausted() { static STRUCT_CLONE_WAS_CALLED: AtomicBool = AtomicBool::new(false); @@ -515,7 +513,6 @@ mod tests { // assert!(!STRUCT_CLONE_WAS_CALLED.load(Ordering::Relaxed)); } - #[allow(clippy::redundant_clone)] #[test] fn panicking_clone_does_not_leak_memory() { static STRUCT_CLONE_WAS_CALLED: AtomicBool = AtomicBool::new(false); diff --git a/src/spsc.rs b/src/spsc.rs index 0222d31d26..b6b9c9b6d9 100644 --- a/src/spsc.rs +++ b/src/spsc.rs @@ -635,26 +635,26 @@ mod tests { fn full() { let mut rb: Queue = Queue::new(); - assert_eq!(rb.is_full(), false); + assert!(!rb.is_full()); rb.enqueue(1).unwrap(); - assert_eq!(rb.is_full(), false); + assert!(!rb.is_full()); rb.enqueue(2).unwrap(); - assert_eq!(rb.is_full(), true); + assert!(rb.is_full()); } #[test] fn empty() { let mut rb: Queue = Queue::new(); - assert_eq!(rb.is_empty(), true); + assert!(rb.is_empty()); rb.enqueue(1).unwrap(); - assert_eq!(rb.is_empty(), false); + assert!(!rb.is_empty()); rb.enqueue(2).unwrap(); - assert_eq!(rb.is_empty(), false); + assert!(!rb.is_empty()); } #[test] @@ -703,9 +703,9 @@ mod tests { let (mut p, mut c) = rb.split(); - assert_eq!(p.ready(), true); + assert!(p.ready()); - assert_eq!(c.ready(), false); + assert!(!c.ready()); assert_eq!(c.dequeue(), None); @@ -848,28 +848,28 @@ mod tests { fn ready_flag() { let mut rb: Queue = Queue::new(); let (mut p, mut c) = rb.split(); - assert_eq!(c.ready(), false); - assert_eq!(p.ready(), true); + assert!(!c.ready()); + assert!(p.ready()); p.enqueue(0).unwrap(); - assert_eq!(c.ready(), true); - assert_eq!(p.ready(), true); + assert!(c.ready()); + assert!(p.ready()); p.enqueue(1).unwrap(); - assert_eq!(c.ready(), true); - assert_eq!(p.ready(), false); + assert!(c.ready()); + assert!(!p.ready()); c.dequeue().unwrap(); - assert_eq!(c.ready(), true); - assert_eq!(p.ready(), true); + assert!(c.ready()); + assert!(p.ready()); c.dequeue().unwrap(); - assert_eq!(c.ready(), false); - assert_eq!(p.ready(), true); + assert!(!c.ready()); + assert!(p.ready()); } #[test] diff --git a/src/string.rs b/src/string.rs index be3456348e..24bbdff714 100644 --- a/src/string.rs +++ b/src/string.rs @@ -664,8 +664,7 @@ mod tests { assert!(s.len() == 3); assert_eq!(s, "123"); - let e: () = String::<2>::try_from("123").unwrap_err(); - assert_eq!(e, ()); + let _: () = String::<2>::try_from("123").unwrap_err(); } #[test] @@ -676,8 +675,7 @@ mod tests { assert!(s.len() == 3); assert_eq!(s, "123"); - let e: () = String::<2>::from_str("123").unwrap_err(); - assert_eq!(e, ()); + let _: () = String::<2>::from_str("123").unwrap_err(); } #[test] @@ -702,11 +700,10 @@ mod tests { #[test] fn try_from_num() { - let v: String<20> = String::try_from(18446744073709551615 as u64).unwrap(); + let v: String<20> = String::try_from(18446744073709551615_u64).unwrap(); assert_eq!(v, "18446744073709551615"); - let e: () = String::<2>::try_from(18446744073709551615 as u64).unwrap_err(); - assert_eq!(e, ()); + let _: () = String::<2>::try_from(18446744073709551615_u64).unwrap_err(); } #[test] @@ -714,7 +711,7 @@ mod tests { let s: String<4> = String::try_from("ab").unwrap(); let b: Vec = s.into_bytes(); assert_eq!(b.len(), 2); - assert_eq!(&['a' as u8, 'b' as u8], &b[..]); + assert_eq!(&[b'a', b'b'], &b[..]); } #[test] @@ -790,9 +787,8 @@ mod tests { Some(c) => { assert_eq!(s.len(), 1); assert_eq!(c, '\u{0301}'); // accute accent of e - () } - None => assert!(false), + None => panic!(), }; } diff --git a/src/vec.rs b/src/vec.rs index 6fb27cc57d..495f912eee 100644 --- a/src/vec.rs +++ b/src/vec.rs @@ -1436,7 +1436,7 @@ mod tests { v.resize(0, 0).unwrap(); v.resize(4, 0).unwrap(); - v.resize(5, 0).err().expect("full"); + v.resize(5, 0).expect_err("full"); } #[test] diff --git a/tests/tsan.rs b/tests/tsan.rs index 043c24578e..4df023de43 100644 --- a/tests/tsan.rs +++ b/tests/tsan.rs @@ -99,12 +99,9 @@ fn contention() { for _ in 0..(2 * N) { loop { - match c.dequeue() { - Some(v) => { - sum = sum.wrapping_add(v as u32); - break; - } - _ => {} + if let Some(v) = c.dequeue() { + sum = sum.wrapping_add(v as u32); + break; } } } @@ -149,13 +146,10 @@ fn mpmc_contention() { for _ in 0..(16 * N) { loop { - match Q.dequeue() { - Some(v) => { - sum = sum.wrapping_add(v); - println!("dequeue {}", v); - break; - } - _ => {} + if let Some(v) = Q.dequeue() { + sum = sum.wrapping_add(v); + println!("dequeue {}", v); + break; } } }