Merge branch 'master' into remove-byteorder-zip2

zip-rs · May 2, 2024 · 1d223e7 · 1d223e7
2 parents be9b4d4 + 5fbc991
commit 1d223e7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/read.rs b/src/read.rs
@@ -28,7 +28,7 @@ use flate2::read::DeflateDecoder;
 use deflate64::Deflate64Decoder;
 
 #[cfg(feature = "bzip2")]
-use bzip2::read::BzDecoder;
+use bzip2_rs::decoder::DecoderReader;
 
 #[cfg(feature = "zstd")]
 use zstd::stream::read::Decoder as ZstdDecoder;
@@ -144,7 +144,7 @@ pub(crate) enum ZipFileReader<'a> {
     #[cfg(feature = "deflate64")]
     Deflate64(Crc32Reader<Deflate64Decoder<io::BufReader<CryptoReader<'a>>>>),
     #[cfg(feature = "bzip2")]
-    Bzip2(Crc32Reader<BzDecoder<CryptoReader<'a>>>),
+    Bzip2(Crc32Reader<DecoderReader<CryptoReader<'a>>>),
     #[cfg(feature = "zstd")]
     Zstd(Crc32Reader<ZstdDecoder<'a, io::BufReader<CryptoReader<'a>>>>),
     #[cfg(feature = "lzma")]
@@ -305,7 +305,7 @@ pub(crate) fn make_reader(
         }
         #[cfg(feature = "bzip2")]
         CompressionMethod::Bzip2 => {
-            let bzip2_reader = BzDecoder::new(reader);
+            let bzip2_reader = DecoderReader::new(reader);
             ZipFileReader::Bzip2(Crc32Reader::new(bzip2_reader, crc32, ae2_encrypted))
         }
         #[cfg(feature = "zstd")]