refactor: remove import-compressed feature

With bzip2-rs replacing the bzip2 crate, all of the dependencies for
dealing with compressed import files are pure-rust. This obviates the main
reason for guarding this capability with a feature (i.e. to avoid dynamic
link dependencies).

Author: jpgrayson

Cargo.toml

@@ -21,6 +21,7 @@ name = "stg"
 anyhow = "1.0"
 anstyle = { version = "1.0", features = ["std"] }
 bstr = { version = "1.0", default-features = false, features = ["std"] }
+bzip2-rs = "0.1"
 clap = { version = "~4.2", default-features = false, features = [
   "color",
   "help",
@@ -32,26 +33,24 @@ clap = { version = "~4.2", default-features = false, features = [
 ] }
 ctrlc = "3.2"
 encoding_rs = "0.8"
+flate2 = "1"
 gix = { version = "0.44", default-features = false, features = [] }
 indexmap = "1.9"
 is-terminal = "0.4"
 nom = { version = "7", default_features = false, features = [ "std" ] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 strsim = "0.10"
+tar = "0.4"
 tempfile = "3"
 termcolor = "1.1"
 thiserror = "~1.0"
 time = { version = "0.3.21", default-features = false, features = ["local-offset", "formatting", "macros", "parsing"] }
 
-bzip2-rs = { version = "0.1", optional = true }
 curl = { version = "0.4", optional = true }
-flate2 = { version = "1", optional = true }
-tar = { version = "0.4", optional = true }
 
 [features]
-default = ["import-compressed", "import-url"]
-import-compressed = ["dep:bzip2-rs", "dep:flate2", "dep:tar"]
+default = ["import-url"]
 import-url = ["dep:curl"]
 
 [profile.for-pkg]

src/cmd/import.rs

@@ -312,7 +312,6 @@ fn import_url(stack: Stack, matches: &clap::ArgMatches) -> Result<()> {
     }
 }
 
-#[cfg(feature = "import-compressed")]
 fn import_tgz_series(stack: Stack, matches: &clap::ArgMatches, source_path: &Path) -> Result<()> {
     let source_file = std::fs::File::open(source_path)?;
     let mut archive = tar::Archive::new(flate2::read::GzDecoder::new(source_file));
@@ -322,7 +321,6 @@ fn import_tgz_series(stack: Stack, matches: &clap::ArgMatches, source_path: &Pat
     return import_series(stack, matches, Some(series_path.as_path()));
 }
 
-#[cfg(feature = "import-compressed")]
 fn import_tbz2_series(stack: Stack, matches: &clap::ArgMatches, source_path: &Path) -> Result<()> {
     let source_file = std::fs::File::open(source_path)?;
     let mut archive = tar::Archive::new(bzip2_rs::DecoderReader::new(source_file));
@@ -332,7 +330,6 @@ fn import_tbz2_series(stack: Stack, matches: &clap::ArgMatches, source_path: &Pa
     return import_series(stack, matches, Some(series_path.as_path()));
 }
 
-#[cfg(feature = "import-compressed")]
 fn import_tar_series(stack: Stack, matches: &clap::ArgMatches, source_path: &Path) -> Result<()> {
     let source_file = std::fs::File::open(source_path)?;
     let mut archive = tar::Archive::new(source_file);
@@ -342,27 +339,6 @@ fn import_tar_series(stack: Stack, matches: &clap::ArgMatches, source_path: &Pat
     return import_series(stack, matches, Some(series_path.as_path()));
 }
 
-#[cfg(not(feature = "import-compressed"))]
-fn import_tgz_series(_: Stack, _: &clap::ArgMatches, _: &Path) -> Result<()> {
-    Err(anyhow!(
-        "StGit not built with support for compressed series"
-    ))
-}
-
-#[cfg(not(feature = "import-compressed"))]
-fn import_tbz2_series(_: Stack, _: &clap::ArgMatches, _: &Path) -> Result<()> {
-    Err(anyhow!(
-        "StGit not built with support for compressed series"
-    ))
-}
-
-#[cfg(not(feature = "import-compressed"))]
-fn import_tar_series(_: Stack, _: &clap::ArgMatches, _: &Path) -> Result<()> {
-    Err(anyhow!(
-        "StGit not built with support for compressed series"
-    ))
-}
-
 fn import_series(
     stack: Stack,
     matches: &clap::ArgMatches,
@@ -433,7 +409,6 @@ fn import_series(
     Ok(())
 }
 
-#[cfg(feature = "import-compressed")]
 fn find_series_path(base: &Path) -> Result<PathBuf> {
     for entry in base.read_dir()? {
         let entry = entry?;
@@ -479,32 +454,16 @@ fn import_mail(stack: Stack, matches: &clap::ArgMatches, source_path: Option<&Pa
     Ok(())
 }
 
-#[cfg(feature = "import-compressed")]
 fn read_gz(source_file: std::fs::File, content: &mut Vec<u8>) -> Result<()> {
     flate2::read::GzDecoder::new(source_file).read_to_end(content)?;
     Ok(())
 }
 
-#[cfg(not(feature = "import-compressed"))]
-fn read_gz(_source_file: std::fs::File, _content: &mut Vec<u8>) -> Result<()> {
-    Err(anyhow!(
-        "StGit not built with support for compressed patches"
-    ))
-}
-
-#[cfg(feature = "import-compressed")]
 fn read_bz2(source_file: std::fs::File, content: &mut Vec<u8>) -> Result<()> {
     bzip2_rs::DecoderReader::new(source_file).read_to_end(content)?;
     Ok(())
 }
 
-#[cfg(not(feature = "import-compressed"))]
-fn read_bz2(_source_file: std::fs::File, _content: &mut Vec<u8>) -> Result<()> {
-    Err(anyhow!(
-        "StGit not built with support for compressed patches"
-    ))
-}
-
 fn import_file<'repo>(
     stack: Stack<'repo>,
     matches: &clap::ArgMatches,