Merge pull request #539 from kornelski/cf-zlib

Drop cloudflare-zlib feature support

Author: jongiddy

Cargo.toml

@@ -23,7 +23,6 @@ libz-sys = { version = "1.1.20", optional = true, default-features = false }
 libz-ng-sys = { version = "1.1.16", optional = true }
 # this matches the default features, but we don't want to depend on the default features staying the same
 zlib-rs = { version = "0.6.0", optional = true, default-features = false, features = ["std", "rust-allocator"] }
-cloudflare-zlib-sys = { version = "0.3.6", optional = true }
 ## This implementation uses only safe Rust code and doesn't require a C compiler.
 ## It provides good performance for most use cases while being completely portable.
 miniz_oxide = { version = "0.8.5", optional = true, default-features = false, features = ["with-alloc", "simd"] }
@@ -46,7 +45,7 @@ default = ["rust_backend"]
 #! ### User-Facing Backend Features
 #! Choose one of these features to select the compression backend.
 #! Only one backend should be enabled at a time, or else one will see an unstable order which is currently
-#! `zlib-ng`, `zlib-rs`, `cloudflare_zlib`, `miniz_oxide` and which may change at any time.
+#! `zlib-ng`, `zlib-rs`, `miniz_oxide` and which may change at any time.
 
 ## Use the pure Rust `miniz_oxide` backend (default).
 ## This implementation uses only safe Rust code and doesn't require a C compiler.
@@ -88,11 +87,9 @@ zlib-ng-compat = ["zlib", "libz-sys/zlib-ng", "dep:crc32fast"]
 ## other dependencies use zlib. Requires a C compiler.
 zlib-ng = ["any_c_zlib", "libz-ng-sys", "dep:crc32fast"]
 
-## Use Cloudflare's optimized zlib implementation.
-## This provides better performance than stock zlib on x86-64 (with SSE 4.2) and ARM64 (with NEON & CRC).
-## * ⚠ Does not support 32-bit CPUs and is incompatible with mingw.
-## * ⚠ May cause conflicts if other crates use different zlib versions.
-cloudflare_zlib = ["any_c_zlib", "cloudflare-zlib-sys", "dep:crc32fast"]
+## Cloudflare-zlib is no longer supported.
+## Falls back to `libz-sys`, but we recommend switching to `zlib-rs` instead.
+cloudflare_zlib = ["zlib"]
 
 ## Deprecated alias for `rust_backend`, provided for backwards compatibility.
 ## Use `rust_backend` instead.
@@ -103,12 +100,12 @@ miniz-sys = ["rust_backend"]
 #! They are documented here to aid with maintenance.
 
 ## **Internal:** Marker feature indicating that any zlib-based C backend is enabled.
-## This is automatically enabled by `zlib-rs`, `zlib`, `zlib-ng`, `zlib-ng-compat`, and `cloudflare_zlib`.
+## This is automatically enabled by `zlib-rs`, `zlib`, `zlib-ng`, and `zlib-ng-compat`.
 ## Do not enable this feature directly; instead, choose a specific backend feature.
 any_zlib = ["any_impl"]
 
 ## **Internal:** Marker feature indicating that any C based fully zlib compatible backend is enabled.
-## This is automatically enabled by `zlib`, `zlib-ng`, `zlib-ng-compat`, and `cloudflare_zlib`.
+## This is automatically enabled by `zlib`, `zlib-ng`, and `zlib-ng-compat`.
 ## Do not enable this feature directly; instead, choose a specific backend feature.
 any_c_zlib = ["any_zlib"]
 

README.md

@@ -114,15 +114,6 @@ See [the libz-sys
 README](https://github.com/rust-lang/libz-sys/blob/main/README.md) for details.
 To avoid that, use the `"zlib-ng"` feature instead.
 
-For compatibility with previous versions of `flate2`, the Cloudflare optimized
-version of zlib is available, via the `cloudflare_zlib` feature. It's not as
-fast as zlib-ng, but it's faster than stock zlib. It requires an x86-64 CPU with
-SSE 4.2 or ARM64 with NEON & CRC. It does not support 32-bit CPUs at all and is
-incompatible with mingw. For more information check the [crate
-documentation](https://crates.io/crates/cloudflare-zlib-sys). Note that
-`cloudflare_zlib` will cause breakage if any other crate in your crate graph
-uses another version of zlib/libz.
-
 # License
 
 This project is licensed under either of

src/ffi/c.rs

@@ -51,31 +51,8 @@ impl Default for StreamWrapper {
                 opaque: ptr::null_mut(),
                 state: ptr::null_mut(),
 
-                #[cfg(any(
-                    // zlib-ng
-                    feature = "zlib-ng",
-                    // libz-sys
-                    all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng"))
-                ))]
                 zalloc: allocator::zalloc,
-                #[cfg(any(
-                    // zlib-ng
-                    feature = "zlib-ng",
-                    // libz-sys
-                    all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng"))
-                ))]
                 zfree: allocator::zfree,
-
-                #[cfg(
-                    // cloudflare-zlib
-                    all(feature = "cloudflare_zlib", not(feature = "zlib-ng")),
-                )]
-                zalloc: Some(allocator::zalloc),
-                #[cfg(
-                    // cloudflare-zlib
-                    all(feature = "cloudflare_zlib", not(feature = "zlib-ng")),
-                )]
-                zfree: Some(allocator::zfree),
             })),
         }
     }
@@ -91,14 +68,6 @@ impl Drop for StreamWrapper {
     }
 }
 
-#[cfg(any(
-    // zlib-ng
-    feature = "zlib-ng",
-    // cloudflare-zlib
-    all(feature = "cloudflare_zlib", not(feature = "zlib-ng")),
-    // libz-sys
-    all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng")),
-))]
 mod allocator {
     use super::*;
 
@@ -455,16 +424,7 @@ mod c_backend {
     #[cfg(feature = "zlib-ng")]
     use libz_ng_sys as libz;
 
-    #[cfg(
-        // cloudflare-zlib
-        all(feature = "cloudflare_zlib", not(feature = "zlib-ng")),
-    )]
-    use cloudflare_zlib_sys as libz;
-
-    #[cfg(
-        // libz-sys
-        all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng")),
-    )]
+    #[cfg(not(feature = "zlib-ng"))]
     use libz_sys as libz;
 
     pub use libz::deflate as mz_deflate;

src/lib.rs

@@ -47,7 +47,6 @@
 //!
 //! * zlib-ng
 //! * zlib-rs
-//! * cloudflare_zlib
 //! * miniz_oxide
 //!
 //! # Organization