Merge pull request #273 from linkmauve/fix-clippy-warnings

Fix some more clippy warnings
image-rs · Oct 21, 2023 · 4d38958 · 4d38958
2 parents bb26dc7 + cfd8ecb
commit 4d38958
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/decoder.rs b/src/decoder.rs
@@ -417,7 +417,7 @@ impl<R: Read> Decoder<R> {
                         for (i, plane) in data
                             .into_iter()
                             .enumerate()
-                            .filter(|&(_, ref plane)| !plane.is_empty())
+                            .filter(|(_, plane)| !plane.is_empty())
                         {
                             planes_u16[i] = plane;
                         }
@@ -466,7 +466,7 @@ impl<R: Read> Decoder<R> {
                             for (i, plane) in data
                                 .into_iter()
                                 .enumerate()
-                                .filter(|&(_, ref plane)| !plane.is_empty())
+                                .filter(|(_, plane)| !plane.is_empty())
                             {
                                 if self.coefficients_finished[i] == !0 {
                                     planes[i] = plane;
@@ -505,14 +505,14 @@ impl<R: Read> Decoder<R> {
                     let current_dc_tables = mem::take(&mut self.dc_huffman_tables);
                     self.dc_huffman_tables = dc_tables
                         .into_iter()
-                        .zip(current_dc_tables.into_iter())
+                        .zip(current_dc_tables)
                         .map(|(a, b)| a.or(b))
                         .collect();
 
                     let current_ac_tables = mem::take(&mut self.ac_huffman_tables);
                     self.ac_huffman_tables = ac_tables
                         .into_iter()
-                        .zip(current_ac_tables.into_iter())
+                        .zip(current_ac_tables)
                         .map(|(a, b)| a.or(b))
                         .collect();
                 }

diff --git a/src/worker/rayon.rs b/src/worker/rayon.rs
@@ -95,7 +95,7 @@ impl ImmediateWorker {
             dequantize_and_idct_block(
                 dct_scale,
                 coefficients,
-                &*quantization_table,
+                &quantization_table,
                 8,
                 &mut output_buffer,
             );

diff --git a/tests/rayon-2.rs b/tests/rayon-2.rs
@@ -13,7 +13,6 @@ fn decoding_in_global_pool() {
 
     let _: Vec<_> = (0..1024)
         .map(|_| {
-            let path = path.clone();
             std::thread::spawn(move || {
                 let mut decoder = Decoder::new(File::open(&path).unwrap());
                 let _ = decoder.decode().unwrap();