From 870f915bc567a239e0f95547bd83240228cf028f Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Mon, 20 May 2024 12:02:05 -0700 Subject: [PATCH] refactor: Rename _deflate-non-zopfli to _deflate-flate2 --- Cargo.toml | 10 +++++----- src/write.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 24cda90c..770b802a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,15 +67,15 @@ tempdir = "0.3.7" aes-crypto = ["aes", "constant_time_eq", "hmac", "pbkdf2", "sha1", "rand", "zeroize"] chrono = ["chrono/default"] _deflate-any = [] -_deflate-non-zopfli = ["_deflate-any"] +_deflate-flate2 = ["_deflate-any"] _all-features = [] # Detect when --all-features is used -deflate = ["flate2/rust_backend", "_deflate-non-zopfli"] +deflate = ["flate2/rust_backend", "_deflate-flate2"] # DEPRECATED: previously enabled `flate2/miniz_oxide` which is equivalent to `flate2/rust_backend` -deflate-miniz = ["deflate", "_deflate-non-zopfli"] +deflate-miniz = ["deflate", "_deflate-flate2"] -deflate-zlib = ["flate2/zlib", "_deflate-non-zopfli"] -deflate-zlib-ng = ["flate2/zlib-ng", "_deflate-non-zopfli"] +deflate-zlib = ["flate2/zlib", "_deflate-flate2"] +deflate-zlib-ng = ["flate2/zlib-ng", "_deflate-flate2"] deflate-zopfli = ["zopfli", "_deflate-any"] lzma = ["lzma-rs/stream"] unreserved = [] diff --git a/src/write.rs b/src/write.rs index 93251672..6c3dc2d8 100644 --- a/src/write.rs +++ b/src/write.rs @@ -1516,7 +1516,7 @@ impl GenericZipWriter { } #[cfg(feature = "_deflate-any")] CompressionMethod::Deflated => { - let default = if cfg!(all(feature = "deflate-zopfli", not(feature = "_deflate-non-zopfli"))) { + let default = if cfg!(all(feature = "deflate-zopfli", not(feature = "_deflate-flate2"))) { 24 } else { Compression::default().level() as i64 @@ -1694,9 +1694,9 @@ impl GenericZipWriter { #[cfg(feature = "_deflate-any")] fn deflate_compression_level_range() -> std::ops::RangeInclusive { - let min = if cfg!(feature = "_deflate-non-zopfli") + let min = if cfg!(feature = "_deflate-flate2") { - Compression::none().level() as i64 + Compression::fast().level() as i64 } else { Compression::best().level() as i64 + 1 };