From a731f2a4c67d0490352f435713935bf52684bb05 Mon Sep 17 00:00:00 2001
From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>
Date: Mon, 20 May 2024 18:02:30 -0700
Subject: [PATCH] refactor: Merge the hidden deflate-flate2 flag into the
 public one

---
 Cargo.toml   | 12 +++++-------
 src/write.rs |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 770b802a..7b707fe8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,15 +67,13 @@ tempdir = "0.3.7"
 aes-crypto = ["aes", "constant_time_eq", "hmac", "pbkdf2", "sha1", "rand", "zeroize"]
 chrono = ["chrono/default"]
 _deflate-any = []
-_deflate-flate2 = ["_deflate-any"]
 _all-features = [] # Detect when --all-features is used
-deflate = ["flate2/rust_backend", "_deflate-flate2"]
-
+deflate = ["flate2/rust_backend", "deflate-flate2"]
+deflate-flate2 = ["flate2/any_impl", "_deflate-any"]
 # DEPRECATED: previously enabled `flate2/miniz_oxide` which is equivalent to `flate2/rust_backend`
-deflate-miniz = ["deflate", "_deflate-flate2"]
-
-deflate-zlib = ["flate2/zlib", "_deflate-flate2"]
-deflate-zlib-ng = ["flate2/zlib-ng", "_deflate-flate2"]
+deflate-miniz = ["deflate", "deflate-flate2"]
+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 6c3dc2d8..5e6bf206 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -1516,7 +1516,7 @@ impl<W: Write + Seek> GenericZipWriter<W> {
                 }
                 #[cfg(feature = "_deflate-any")]
                 CompressionMethod::Deflated => {
-                    let default = if cfg!(all(feature = "deflate-zopfli", not(feature = "_deflate-flate2"))) {
+                    let default = if cfg!(all(feature = "deflate-zopfli", not(feature = "deflate-flate2"))) {
                         24
                     } else {
                         Compression::default().level() as i64
@@ -1694,7 +1694,7 @@ impl<W: Write + Seek> GenericZipWriter<W> {
 
 #[cfg(feature = "_deflate-any")]
 fn deflate_compression_level_range() -> std::ops::RangeInclusive<i64> {
-    let min = if cfg!(feature = "_deflate-flate2")
+    let min = if cfg!(feature = "deflate-flate2")
     {
         Compression::fast().level() as i64
     } else {