make zip-cli/te mirror the named features on the zip crate

Author: cosmicexplorer

cli/Cargo.toml

@@ -1,55 +1,57 @@
 [package]
-name = "zip-cli"
-version = "0.0.1"
-authors = [
+name                    = "zip-cli"
+version                 = "0.0.1"
+authors                 = [
     "Danny McClanahan <[email protected]>",
 ]
-license = "MIT"
-repository = "https://github.com/zip-rs/zip2.git"
-keywords = ["zip", "archive", "compression", "cli"]
-categories = ["command-line-utilities", "compression", "filesystem", "development-tools::build-utils"]
+license                 = "MIT"
+repository              = "https:    //github.com/zip-rs/zip2.git"
+keywords                = ["zip", "archive", "compression", "cli"]
+categories              = ["command-line-utilities", "compression", "filesystem", "development-tools::build-utils"]
 # This field is not as important as in the top-level library API, but as there:
 # Any change to rust-version must be reflected also in `README.md` and `.github/workflows/ci.yaml`.
 # The MSRV policy is documented in `README.md`.
-rust-version = "1.83.0"
-description = """
+rust-version            = "1.83.0"
+description             = """
 Binary for creation and manipulation of zip files.
 
 This package can enable or disable certain dependencies during the build and install process with
 cargo features.
 """
-edition = "2021"
+edition                 = "2021"
 
 # Prevent this from interfering with workspaces
 [workspace]
-members = ["."]
+members                 = ["."]
 
 [lib]
 
 [[bin]]
-name = "zip-cli"
+name                    = "zip-cli"
 
 [dependencies.zip]
-path = ".."
-default-features = false
+path                    = ".."
+default-features        = false
 
 [features]
-aes-crypto = ["zip/aes-crypto"]
-bzip2 = ["zip/bzip2"]
-chrono = ["zip/chrono"]
-deflate64 = ["zip/deflate64"]
-deflate = ["zip/deflate"]
-deflate-flate2 = ["zip/deflate-flate2"]
-deflate-flate2-zlib-rs = ["zip/deflate-flate2-zlib-rs"]
-deflate-flate2-zlib = ["zip/deflate-flate2-zlib"]
-deflate-zopfli = ["zip/deflate-zopfli"]
-lzma = ["zip/lzma"]
-ppmd = ["zip/ppmd"]
-time = ["zip/time"]
-xz = ["zip/xz"]
-zstd = ["zip/zstd"]
+aes-crypto              = ["zip/aes-crypto"]
+bzip2                   = ["zip/bzip2"]
+chrono                  = ["zip/chrono"]
+_deflate-any            = ["zip/_deflate-any"]
+deflate64               = ["zip/deflate64"]
+deflate                 = ["zip/deflate"]
+deflate-flate2          = ["zip/deflate-flate2"]
+deflate-flate2-zlib-rs  = ["zip/deflate-flate2-zlib-rs"]
+deflate-flate2-zlib     = ["zip/deflate-flate2-zlib"]
+deflate-zopfli          = ["zip/deflate-zopfli"]
+lzma                    = ["zip/lzma"]
+ppmd                    = ["zip/ppmd"]
+time                    = ["zip/time"]
+xz                      = ["zip/xz"]
+zstd                    = ["zip/zstd"]
 
-default = [
+# Generate a highly featureful binary by default.
+default                 = [
     "aes-crypto",
     "bzip2",
     "deflate64",
@@ -62,7 +64,7 @@ default = [
 ]
 
 [profile.release]
-strip = true
-lto = true
-opt-level = 3
-codegen-units = 1
+strip                   = true
+lto                     = true
+opt-level               = 3
+codegen-units           = 1

cli/clite/Cargo.toml

@@ -1,51 +1,66 @@
 [package]
-name = "zip-clite"
-version = "0.0.1"
-authors = [
+name                    = "zip-clite"
+version                 = "0.0.1"
+authors                 = [
     "Danny McClanahan <[email protected]>",
 ]
-license = "MIT"
-repository = "https://github.com/zip-rs/zip2.git"
-keywords = ["zip", "archive", "compression", "cli"]
-categories = ["command-line-utilities", "compression", "filesystem", "development-tools::build-utils"]
+license                 = "MIT"
+repository              = "https://github.com/zip-rs/zip2.git"
+keywords                = ["zip", "archive", "compression", "cli"]
+categories              = ["command-line-utilities", "compression", "filesystem", "development-tools::build-utils"]
 # This field is not as important as in the top-level library API, but as there:
 # Any change to rust-version must be reflected also in `README.md` and `.github/workflows/ci.yaml`.
 # The MSRV policy is documented in `README.md`.
-rust-version = "1.83.0"
-description = """
+rust-version            = "1.83.0"
+description             = """
 Binary for creation and manipulation of zip files.
 
 This distribution is created to be intentionally very small and easy to audit. It has reduced
 functionality, builds to optimize for size, and only bundles in support for a Rust
 DEFLATE implementation.
 """
-edition = "2021"
+edition                 = "2021"
 
 # Prevent this from interfering with workspaces
 [workspace]
-members = ["."]
+members                 = ["."]
 
 [[bin]]
-name = "zip-clite"
+name                    = "zip-clite"
 
 # NB: This is not a dependency on the top-level `zip` crate, but the `zip-cli` crate (which mirrors
 #     the declared features from `zip`). We do not use its `main.rs` entry point, but rely upon
 #     `lib.rs`, which was specifically designed to minimize the amount of code specific to
 #     `zip-clite`.
 [dependencies.zip-cli]
-path = ".."
-default-features = false
-features = [
-    "deflate-flate2",
-    "deflate-flate2-zlib-rs",
-]
+path                    = ".."
+default-features        = false
 
-# No features, no options, no decisions! We're just making it explicit.
 [features]
-default = []
+aes-crypto              = ["zip-cli/aes-crypto"]
+bzip2                   = ["zip-cli/bzip2"]
+chrono                  = ["zip-cli/chrono"]
+_deflate-any            = ["zip-cli/_deflate-any"]
+deflate64               = ["zip-cli/deflate64"]
+deflate                 = ["zip-cli/deflate"]
+deflate-flate2          = ["zip-cli/deflate-flate2"]
+deflate-flate2-zlib-rs  = ["zip-cli/deflate-flate2-zlib-rs"]
+deflate-flate2-zlib     = ["zip-cli/deflate-flate2-zlib"]
+deflate-zopfli          = ["zip-cli/deflate-zopfli"]
+lzma                    = ["zip-cli/lzma"]
+ppmd                    = ["zip-cli/ppmd"]
+time                    = ["zip-cli/time"]
+xz                      = ["zip-cli/xz"]
+zstd                    = ["zip-cli/zstd"]
+
+# Only bring in the pure-Rust DEFLATE implementation by default.
+default                 = [
+  "deflate-flate2",
+  "deflate-flate2-zlib-rs",
+]
 
 [profile.release]
-strip = true
-lto = true
-opt-level = "s"
-codegen-units = 1
+strip                   = true
+lto                     = true
+opt-level               = "s"
+codegen-units           = 1

cli/src/lib.rs

@@ -106,9 +106,12 @@ fn compress(this: String, mut args: VecDeque<ffi::OsString>) -> ! {
     };
 
     let stored = SimpleFileOptions::default().compression_method(CompressionMethod::Stored);
-    let compressed = SimpleFileOptions::default()
-        .compression_method(CompressionMethod::Deflated)
-        .compression_level(Some(9));
+    let compressed = zip::cfg_if_expr! {
+        #[cfg(feature = "_deflate-any")] => SimpleFileOptions::default()
+            .compression_method(CompressionMethod::Deflated)
+            .compression_level(Some(9)),
+        _ => stored,
+    };
     for line in io::stdin().lines() {
         let line = line.unwrap();
         let p = path::Path::new(&line);