Migrate from unmaintained xz2 to liblzma

Author: xbjfk

Cargo.toml

@@ -24,8 +24,8 @@ all-algorithms = ["brotli", "bzip2", "deflate", "gzip", "lzma", "xz", "zlib", "z
 # algorithms
 deflate = ["flate2"]
 gzip = ["flate2"]
-lzma = ["xz2"]
-xz = ["xz2"]
+lzma = ["liblzma"]
+xz = ["liblzma"]
 zlib = ["flate2"]
 zstd = ["libzstd", "zstd-safe"]
 zstdmt = ["zstd", "zstd-safe/zstdmt"]
@@ -41,7 +41,7 @@ libzstd = { package = "zstd", version = "0.13.1", optional = true, default-featu
 memchr = "2"
 pin-project-lite = "0.2"
 tokio = { version = "1.24.2", optional = true, default-features = false }
-xz2 = { version = "0.1.6", optional = true }
+liblzma = { version = "0.3.2", optional = true }
 zstd-safe = { version = "7", optional = true, default-features = false }
 deflate64 = { version = "0.1.5", optional = true }
 

src/codec/mod.rs

@@ -17,7 +17,7 @@ mod gzip;
 mod lzma;
 #[cfg(feature = "xz")]
 mod xz;
-#[cfg(feature = "xz2")]
+#[cfg(feature = "liblzma")]
 mod xz2;
 #[cfg(feature = "zlib")]
 mod zlib;
@@ -40,7 +40,7 @@ pub(crate) use self::gzip::{GzipDecoder, GzipEncoder};
 pub(crate) use self::lzma::{LzmaDecoder, LzmaEncoder};
 #[cfg(feature = "xz")]
 pub(crate) use self::xz::{XzDecoder, XzEncoder};
-#[cfg(feature = "xz2")]
+#[cfg(feature = "liblzma")]
 pub(crate) use self::xz2::{Xz2Decoder, Xz2Encoder, Xz2FileFormat};
 #[cfg(feature = "zlib")]
 pub(crate) use self::zlib::{ZlibDecoder, ZlibEncoder};

src/codec/xz2/decoder.rs

@@ -1,6 +1,6 @@
 use std::{fmt, io};
 
-use xz2::stream::{Action, Status, Stream};
+use liblzma::stream::{Action, Status, Stream};
 
 use crate::{codec::Decode, util::PartialBuffer};
 

src/codec/xz2/encoder.rs

@@ -1,6 +1,6 @@
 use std::{fmt, io};
 
-use xz2::stream::{Action, Check, LzmaOptions, Status, Stream};
+use liblzma::stream::{Action, Check, LzmaOptions, Status, Stream};
 
 use crate::{
     codec::{Encode, Xz2FileFormat},

src/lib.rs

@@ -139,7 +139,7 @@
 )]
 #![cfg_attr(not(all), allow(unused))]
 
-#[cfg(any(feature = "bzip2", feature = "flate2", feature = "xz2"))]
+#[cfg(any(feature = "bzip2", feature = "flate2", feature = "liblzma"))]
 use std::convert::TryInto;
 
 #[macro_use]
@@ -241,7 +241,7 @@ impl Level {
         }
     }
 
-    #[cfg(feature = "xz2")]
+    #[cfg(feature = "liblzma")]
     fn into_xz2(self) -> u32 {
         match self {
             Self::Fastest => 0,

tests/artifacts/lib.rs

@@ -130,7 +130,7 @@
 )]
 #![cfg_attr(not(all), allow(unused))]
 
-#[cfg(any(feature = "bzip2", feature = "flate2", feature = "xz2"))]
+#[cfg(any(feature = "bzip2", feature = "flate2", feature = "liblzma"))]
 use std::convert::TryInto;
 
 #[macro_use]
@@ -225,7 +225,7 @@ impl Level {
         }
     }
 
-    #[cfg(feature = "xz2")]
+    #[cfg(feature = "liblzma")]
     fn into_xz2(self) -> u32 {
         match self {
             Self::Fastest => 0,

tests/utils/algos.rs

@@ -169,13 +169,13 @@ algos! {
             pub use crate::utils::impls::sync::to_vec;
 
             pub fn compress(bytes: &[u8]) -> Vec<u8> {
-                use xz2::bufread::XzEncoder;
+                use liblzma::bufread::XzEncoder;
 
                 to_vec(XzEncoder::new(bytes, 0))
             }
 
             pub fn decompress(bytes: &[u8]) -> Vec<u8> {
-                use xz2::bufread::XzDecoder;
+                use liblzma::bufread::XzDecoder;
 
                 to_vec(XzDecoder::new(bytes))
             }
@@ -187,8 +187,8 @@ algos! {
             pub use crate::utils::impls::sync::to_vec;
 
             pub fn compress(bytes: &[u8]) -> Vec<u8> {
-                use xz2::bufread::XzEncoder;
-                use xz2::stream::{LzmaOptions, Stream};
+                use liblzma::bufread::XzEncoder;
+                use liblzma::stream::{LzmaOptions, Stream};
 
                 to_vec(XzEncoder::new_stream(
                     bytes,
@@ -197,8 +197,8 @@ algos! {
             }
 
             pub fn decompress(bytes: &[u8]) -> Vec<u8> {
-                use xz2::bufread::XzDecoder;
-                use xz2::stream::Stream;
+                use liblzma::bufread::XzDecoder;
+                use liblzma::stream::Stream;
 
                 to_vec(XzDecoder::new_stream(
                     bytes,