diff --git a/tests/test_chunks.rs b/tests/test_chunks.rs index d465140..f752f64 100644 --- a/tests/test_chunks.rs +++ b/tests/test_chunks.rs @@ -21,7 +21,7 @@ where let pixels_raw = cast_slice::<_, u8>(pixels); let encoded = encode_to_vec(pixels_raw, pixels.len() as _, 1).unwrap(); let decoded = decode_to_vec(&encoded).unwrap().1; - assert_eq!(pixels_raw, decoded.as_slice(), "roundtrip failed (encoded={:?}))", encoded); + assert_eq!(pixels_raw, decoded.as_slice(), "roundtrip failed (encoded={encoded:?}))"); assert!(encoded.len() >= expected.len() + QOI_HEADER_SIZE + QOI_PADDING_SIZE); assert_eq!(&encoded[QOI_HEADER_SIZE..][..expected.len()], expected); } diff --git a/tests/test_gen.rs b/tests/test_gen.rs index fd015c5..c40c78d 100644 --- a/tests/test_gen.rs +++ b/tests/test_gen.rs @@ -36,8 +36,8 @@ impl GenState { } pub fn write(&mut self, px: [u8; N]) { self.index[hash(px) as usize] = px; - for i in 0..N { - self.pixels.push(px[i]); + for px in px.into_iter().take(N) { + self.pixels.push(px); } self.prev = px; self.len += 1; diff --git a/tests/test_ref.rs b/tests/test_ref.rs index fbfaa56..d78dc08 100644 --- a/tests/test_ref.rs +++ b/tests/test_ref.rs @@ -62,27 +62,25 @@ impl Image { fn compare_slices(name: &str, desc: &str, result: &[u8], expected: &[u8]) -> Result<()> { if result == expected { Ok(()) + } else if let Some(i) = + (0..result.len().min(expected.len())).position(|i| result[i] != expected[i]) + { + panic!( + "{}: {} mismatch at byte {}: expected {:?}, got {:?}", + name, + desc, + i, + &expected[i..(i + 4).min(expected.len())], + &result[i..(i + 4).min(result.len())], + ); } else { - if let Some(i) = - (0..result.len().min(expected.len())).position(|i| result[i] != expected[i]) - { - panic!( - "{}: {} mismatch at byte {}: expected {:?}, got {:?}", - name, - desc, - i, - &expected[i..(i + 4).min(expected.len())], - &result[i..(i + 4).min(result.len())], - ); - } else { - panic!( - "{}: {} length mismatch: expected {}, got {}", - name, - desc, - expected.len(), - result.len() - ); - } + panic!( + "{}: {} length mismatch: expected {}, got {}", + name, + desc, + expected.len(), + result.len() + ); } }