Move .tar, .tar.bz2 and .tar.xz behind a off-by-default deprecated-formats feature flag

Author: messense

Cargo.toml

@@ -12,11 +12,14 @@ repository = "https://github.com/messense/python-pkginfo-rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bzip2 = "0.4.2"
+bzip2 = { version = "0.4.2", optional = true }
 flate2 = "1.0.20"
 fs-err = "2.6.0"
 mailparse = "0.13.4"
 serde = { version = "1.0.126", features = ["derive"], optional = true }
 tar = "0.4.35"
-xz = "0.1.0"
+xz = { version = "0.1.0", optional = true }
 zip = "0.5.12"
+
+[features]
+deprecated-formats = ["bzip2", "xz"]

src/distribution.rs

@@ -3,8 +3,10 @@ use std::io::{BufReader, Read};
 use std::path::Path;
 use std::str::FromStr;
 
+#[cfg(feature = "bzip2")]
 use bzip2::read::BzDecoder;
 use flate2::read::GzDecoder;
+#[cfg(feature = "xz")]
 use xz::read::XzDecoder;
 use zip::ZipArchive;
 
@@ -24,9 +26,12 @@ pub enum DistributionType {
 #[derive(Debug, Clone, Copy)]
 enum SDistType {
     Zip,
-    Tar,
     GzTar,
+    #[cfg(feature = "deprecated-formats")]
+    Tar,
+    #[cfg(feature = "bzip2")]
     BzTar,
+    #[cfg(feature = "xz")]
     XzTar,
 }
 
@@ -54,9 +59,12 @@ impl FromStr for SDistType {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let dist_type = match s {
             "zip" => SDistType::Zip,
-            "tar" => SDistType::Tar,
             "gz" => SDistType::GzTar,
+            #[cfg(feature = "deprecated-formats")]
+            "tar" => SDistType::Tar,
+            #[cfg(feature = "bzip2")]
             "bz2" => SDistType::BzTar,
+            #[cfg(feature = "xz")]
             "xz" => SDistType::XzTar,
             _ => return Err(Error::UnknownDistributionType),
         };
@@ -70,9 +78,15 @@ impl Distribution {
         let path = path.as_ref();
         if let Some(ext) = path.extension().and_then(|ext| ext.to_str()) {
             let dist_type = match ext {
-                "zip" | "tar" | "gz" | "bz2" | "xz" => DistributionType::SDist,
+                "zip" | "gz" => DistributionType::SDist,
                 "egg" => DistributionType::Egg,
                 "whl" => DistributionType::Wheel,
+                #[cfg(feature = "deprecated-formats")]
+                "tar" => DistributionType::SDist,
+                #[cfg(feature = "bzip2")]
+                "bz2" => DistributionType::SDist,
+                #[cfg(feature = "xz")]
+                "xz" => DistributionType::SDist,
                 _ => return Err(Error::UnknownDistributionType),
             };
             let (metadata, python_version) = match dist_type {
@@ -141,10 +155,13 @@ impl Distribution {
             SDistType::GzTar => {
                 Self::parse_tar(GzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
             }
+            #[cfg(feature = "deprecated-formats")]
             SDistType::Tar => Self::parse_tar(BufReader::new(fs_err::File::open(path)?)),
+            #[cfg(feature = "bzip2")]
             SDistType::BzTar => {
                 Self::parse_tar(BzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
             }
+            #[cfg(feature = "xz")]
             SDistType::XzTar => {
                 Self::parse_tar(XzDecoder::new(BufReader::new(fs_err::File::open(path)?)))
             }

tests/test_distribution.rs

@@ -36,6 +36,7 @@ fn test_parse_sdist_zip() {
     assert_eq!(dist.python_version(), "source");
 }
 
+#[cfg(feature = "deprecated-formats")]
 #[test]
 fn test_parse_sdist_tar() {
     let dist = Distribution::new("tests/fixtures/build-0.4.0.tar").unwrap();
@@ -59,6 +60,7 @@ fn test_parse_sdist_tar_gz() {
     assert_eq!(dist.python_version(), "source");
 }
 
+#[cfg(feature = "bzip2")]
 #[test]
 fn test_parse_sdist_tar_bz2() {
     let dist = Distribution::new("tests/fixtures/build-0.4.0.tar.bz2").unwrap();
@@ -71,6 +73,7 @@ fn test_parse_sdist_tar_bz2() {
     assert_eq!(dist.python_version(), "source");
 }
 
+#[cfg(feature = "xz")]
 #[test]
 fn test_parse_sdist_tar_xz() {
     let dist = Distribution::new("tests/fixtures/build-0.4.0.tar.xz").unwrap();