refactor: make crate 1.34.0 compatible

src/compression.rs

@@ -2,6 +2,7 @@
 
 use std::fmt;
 
+#[allow(deprecated)]
 /// Compression methods for the contents of a ZIP file.
 #[derive(Copy, Clone, PartialEq, Debug)]
 pub enum CompressionMethod {
@@ -28,13 +29,14 @@ impl CompressionMethod {
         note = "implementation details are being removed from the public API"
     )]
     pub fn from_u16(val: u16) -> CompressionMethod {
+        #[allow(deprecated)]
         match val {
             0 => CompressionMethod::Stored,
             #[cfg(feature = "deflate")]
             8 => CompressionMethod::Deflated,
             #[cfg(feature = "bzip2")]
             12 => CompressionMethod::Bzip2,
-            #[allow(deprecated)]
+
             v => CompressionMethod::Unsupported(v),
         }
     }
@@ -45,13 +47,13 @@ impl CompressionMethod {
         note = "implementation details are being removed from the public API"
     )]
     pub fn to_u16(self) -> u16 {
+        #[allow(deprecated)]
         match self {
             CompressionMethod::Stored => 0,
             #[cfg(feature = "deflate")]
             CompressionMethod::Deflated => 8,
             #[cfg(feature = "bzip2")]
             CompressionMethod::Bzip2 => 12,
-            #[allow(deprecated)]
             CompressionMethod::Unsupported(v) => v,
         }
     }

src/write.rs

@@ -397,20 +397,22 @@ impl<W: Write + io::Seek> GenericZipWriter<W> {
             }
         };
 
-        *self = match compression {
+        *self = {
-            CompressionMethod::Stored => GenericZipWriter::Storer(bare),
-            #[cfg(feature = "deflate")]
-            CompressionMethod::Deflated => GenericZipWriter::Deflater(DeflateEncoder::new(
-                bare,
-                flate2::Compression::default(),
-            )),
-            #[cfg(feature = "bzip2")]
-            CompressionMethod::Bzip2 => {
-                GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::Default))
-            }
             #[allow(deprecated)]
-            CompressionMethod::Unsupported(..) => {
+            match compression {
-                return Err(ZipError::UnsupportedArchive("Unsupported compression"))
+                CompressionMethod::Stored => GenericZipWriter::Storer(bare),
+                #[cfg(feature = "deflate")]
+                CompressionMethod::Deflated => GenericZipWriter::Deflater(DeflateEncoder::new(
+                    bare,
+                    flate2::Compression::default(),
+                )),
+                #[cfg(feature = "bzip2")]
+                CompressionMethod::Bzip2 => {
+                    GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::Default))
+                }
+                CompressionMethod::Unsupported(..) => {
+                    return Err(ZipError::UnsupportedArchive("Unsupported compression"))
+                }
             }
         };
 

tests/end_to_end.rs

@@ -39,7 +39,7 @@ fn read_zip_file(zip_file: &mut Cursor<Vec<u8>>) -> zip::result::ZipResult<Strin
     let mut archive = zip::ZipArchive::new(zip_file).unwrap();
 
     let expected_file_names = ["test/", "test/☃.txt", "test/lorem_ipsum.txt"];
-    let expected_file_names = HashSet::from_iter(expected_file_names.iter().copied());
+    let expected_file_names = HashSet::from_iter(expected_file_names.iter().map(|&v| v));
     let file_names = archive.file_names().collect::<HashSet<_>>();
     assert_eq!(file_names, expected_file_names);