deps: Replace lzma-rs with liblzma

Author: Pr0methean

Cargo.toml

@@ -30,15 +30,15 @@ time = { version = "0.3.37", default-features = false }
 aes = { version = "0.8", optional = true }
 bzip2 = { version = "0.5.0", optional = true }
 chrono = { version = "0.4", optional = true }
-constant_time_eq = { version = "0.3", optional = true }
+constant_time_eq = { version = "0.4.2", optional = true }
 crc32fast = "1.4"
 flate2 = { version = "1.1.1", default-features = false, optional = true }
 getrandom = { version = "0.3.1", features = ["wasm_js", "std"], optional = true}
 hmac = { version = "0.12", optional = true, features = ["reset"] }
 indexmap = "2"
 jiff = { version = "0.2.4", optional = true }
 memchr = "2.7"
-nt-time = { version = "0.10.6", default-features = false, optional = true }
+nt-time = { version = "0.11.1", default-features = false, optional = true }
 pbkdf2 = { version = "0.12", optional = true }
 sha1 = { version = "0.10", optional = true }
 time = { workspace = true, optional = true, features = [
@@ -48,7 +48,6 @@ zeroize = { version = "1.8", optional = true, features = ["zeroize_derive"] }
 zstd = { version = "0.13", optional = true, default-features = false }
 zopfli = { version = "0.8", optional = true }
 deflate64 = { version = "0.1.9", optional = true }
-lzma-rs = { version = "0.3", default-features = false, optional = true }
 liblzma = { version = "0.4.1", optional = true }
 
 [target.'cfg(fuzzing)'.dependencies]
@@ -78,7 +77,7 @@ deflate-flate2-zlib = ["deflate-flate2", "flate2/zlib"]
 deflate-zopfli = ["zopfli", "_deflate-any"]
 jiff-02 = ["dep:jiff"]
 nt-time = ["dep:nt-time"]
-lzma = ["lzma-rs/stream"]
+lzma = ["dep:liblzma"]
 unreserved = []
 xz = ["dep:liblzma"]
 default = [

src/compression.rs

@@ -202,7 +202,7 @@ pub(crate) enum Decompressor<R: io::BufRead> {
     #[cfg(feature = "zstd")]
     Zstd(zstd::Decoder<'static, R>),
     #[cfg(feature = "lzma")]
-    Lzma(Box<crate::read::lzma::LzmaDecoder<R>>),
+    Lzma(liblzma::bufread::XzDecoder<R>),
     #[cfg(feature = "xz")]
     Xz(liblzma::bufread::XzDecoder<R>),
 }
@@ -245,7 +245,8 @@ impl<R: io::BufRead> Decompressor<R> {
             CompressionMethod::Zstd => Decompressor::Zstd(zstd::Decoder::with_buffer(reader)?),
             #[cfg(feature = "lzma")]
             CompressionMethod::Lzma => {
-                Decompressor::Lzma(Box::new(crate::read::lzma::LzmaDecoder::new(reader)))
+                Decompressor::Lzma(liblzma::bufread::XzDecoder::new_stream(reader,
+                        liblzma::stream::Stream::new_lzma_decoder(0).unwrap()))
             }
             #[cfg(feature = "xz")]
             CompressionMethod::Xz => Decompressor::Xz(liblzma::bufread::XzDecoder::new(reader)),

src/read.rs

@@ -35,9 +35,6 @@ pub use config::*;
 /// Provides high level API for reading from a stream.
 pub(crate) mod stream;
 
-#[cfg(feature = "lzma")]
-pub(crate) mod lzma;
-
 pub(crate) mod magic_finder;
 
 // Put the struct declaration in a private module to convince rustdoc to display ZipArchive nicely
@@ -2160,10 +2157,10 @@ mod test {
     fn test_is_symlink() -> std::io::Result<()> {
         let mut v = Vec::new();
         v.extend_from_slice(include_bytes!("../tests/data/symlink.zip"));
-        let mut reader = ZipArchive::new(Cursor::new(v)).unwrap();
-        assert!(reader.by_index(0).unwrap().is_symlink());
+        let mut reader = ZipArchive::new(Cursor::new(v))?;
+        assert!(reader.by_index(0)?.is_symlink());
         let tempdir = TempDir::with_prefix("test_is_symlink")?;
-        reader.extract(&tempdir).unwrap();
+        reader.extract(&tempdir)?;
         assert!(tempdir.path().join("bar").is_symlink());
         Ok(())
     }
@@ -2234,7 +2231,7 @@ mod test {
         writer.start_file("symlink/dest-file", SimpleFileOptions::default())?;
         let mut reader = writer.finish_into_readable()?;
         let dest_parent =
-            TempDir::with_prefix("read__test_cannot_symlink_outside_destination").unwrap();
+            TempDir::with_prefix("read__test_cannot_symlink_outside_destination")?;
         let dest_sibling = dest_parent.path().join("dest-sibling");
         create_dir(&dest_sibling)?;
         let dest = dest_parent.path().join("dest");
@@ -2249,7 +2246,7 @@ mod test {
         let mut v = Vec::new();
         v.extend_from_slice(include_bytes!("../tests/data/mimetype.zip"));
         let mut reader = ZipArchive::new(Cursor::new(v))?;
-        let dest = TempDir::with_prefix("read__test_can_create_destination").unwrap();
+        let dest = TempDir::with_prefix("read__test_can_create_destination")?;
         reader.extract(&dest)?;
         assert!(dest.path().join("mimetype").exists());
         Ok(())