Clippy fixes

examples/corpus-bench.rs

@@ -59,7 +59,7 @@ fn run_encode(
         _ => png::AdaptiveFilterType::NonAdaptive,
     });
     let mut encoder = encoder.write_header().unwrap();
-    encoder.write_image_data(&image).unwrap();
+    encoder.write_image_data(image).unwrap();
     encoder.finish().unwrap();
     reencoded
 }

examples/show.rs

@@ -133,8 +133,8 @@ where
     let src_rect = Rect {
         left: 0,
         bottom: 0,
-        width: src_dim.0 as u32,
-        height: src_dim.1 as u32,
+        width: src_dim.0,
+        height: src_dim.1,
     };
     let target_dim = target.get_dimensions();
     let target_rect = BlitTarget {

src/decoder/stream.rs

@@ -571,8 +571,8 @@ impl StreamingDecoder {
         Ok((len - buf.len(), Decoded::Nothing))
     }
 
-    fn next_state<'a>(
-        &'a mut self,
+    fn next_state(
+        &mut self,
         buf: &[u8],
         image_data: &mut Vec<u8>,
     ) -> Result<(usize, Decoded), DecodingError> {
@@ -1691,7 +1691,7 @@ mod tests {
         let mut data = Vec::new();
         data.write_u32::<byteorder::BigEndian>(sequence_number)
             .unwrap();
-        data.write_all(&image_data).unwrap();
+        data.write_all(image_data).unwrap();
         write_chunk(w, b"fdAT", &data);
     }
 

src/encoder.rs

@@ -1673,6 +1673,25 @@ impl<W: Write> Drop for StreamWriter<'_, W> {
     }
 }
 
+/// Mod to encapsulate the converters depending on the `deflate` crate.
+///
+/// Since this only contains trait impls, there is no need to make this public, they are simply
+/// available when the mod is compiled as well.
+impl Compression {
+    fn to_options(self) -> flate2::Compression {
+        #[allow(deprecated)]
+        match self {
+            Compression::Default => flate2::Compression::default(),
+            Compression::Fast => flate2::Compression::fast(),
+            Compression::Best => flate2::Compression::best(),
+            #[allow(deprecated)]
+            Compression::Huffman => flate2::Compression::none(),
+            #[allow(deprecated)]
+            Compression::Rle => flate2::Compression::none(),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -2374,22 +2393,3 @@ mod tests {
         }
     }
 }
-
-/// Mod to encapsulate the converters depending on the `deflate` crate.
-///
-/// Since this only contains trait impls, there is no need to make this public, they are simply
-/// available when the mod is compiled as well.
-impl Compression {
-    fn to_options(self) -> flate2::Compression {
-        #[allow(deprecated)]
-        match self {
-            Compression::Default => flate2::Compression::default(),
-            Compression::Fast => flate2::Compression::fast(),
-            Compression::Best => flate2::Compression::best(),
-            #[allow(deprecated)]
-            Compression::Huffman => flate2::Compression::none(),
-            #[allow(deprecated)]
-            Compression::Rle => flate2::Compression::none(),
-        }
-    }
-}

src/test_utils.rs

@@ -80,13 +80,11 @@ pub fn generate_rgba8_with_width(width: u32) -> Vec<u8> {
         let mut row = Vec::new();
         row.write_u8(0).unwrap(); // filter = no filter
 
-        let row_pixels = (0..width)
-            .map(|i| {
-                let color: u8 = (i * 255 / width) as u8;
-                let alpha: u8 = 0xff;
-                [color, 255 - color, color / 2, alpha]
-            })
-            .flatten();
+        let row_pixels = (0..width).flat_map(|i| {
+            let color: u8 = (i * 255 / width) as u8;
+            let alpha: u8 = 0xff;
+            [color, 255 - color, color / 2, alpha]
+        });
         row.extend(row_pixels);
 
         std::iter::repeat(row)

src/utils.rs

@@ -316,7 +316,7 @@ fn test_expand_adam7_bits() {
             expected(start, 8, 4)
         );
 
-        let start = (8 * line_no + 4) as usize * width as usize;
+        let start = (8 * line_no + 4) * width;
 
         assert_eq!(
             expand_adam7_bits(3, width, line_no, bits_pp).collect::<Vec<_>>(),