Run clippy on tests

This commit is contained in:
Alex Martens 2023-11-17 09:24:30 -08:00
parent d9b06bd487
commit 168c19857e
6 changed files with 34 additions and 47 deletions

View File

@ -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:

View File

@ -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);

View File

@ -635,26 +635,26 @@ mod tests {
fn full() {
let mut rb: Queue<i32, 3> = 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<i32, 3> = 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<i32, 3> = 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]

View File

@ -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<u8, 4> = 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!(),
};
}

View File

@ -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]

View File

@ -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;
}
}
}