initial design

Author: folkertdev

Cargo.toml

@@ -23,6 +23,7 @@ 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
 libz-rs-sys = { version = "0.5.1", optional = true, default-features = false, features = ["std", "rust-allocator"] }
+zlib-rs = { version = "0.5.1", optional = true, default-features = false, features = ["std", "rust-allocator"] }
 cloudflare-zlib-sys = { version = "0.3.6", optional = true }
 miniz_oxide = { version = "0.8.5", optional = true, default-features = false, features = ["with-alloc", "simd"] }
 crc32fast = "1.2.0"
@@ -43,7 +44,7 @@ zlib = ["any_zlib", "libz-sys"]
 zlib-default = ["any_zlib", "libz-sys/default"]
 zlib-ng-compat = ["zlib", "libz-sys/zlib-ng"]
 zlib-ng = ["any_zlib", "libz-ng-sys"]
-zlib-rs = ["any_zlib", "libz-rs-sys"]
+zlib-rs = ["any_impl", "dep:zlib-rs", "dep:libz-rs-sys"]
 cloudflare_zlib = ["any_zlib", "cloudflare-zlib-sys"]
 rust_backend = ["miniz_oxide", "any_impl"]
 miniz-sys = ["rust_backend"] # For backwards compatibility

src/ffi/c.rs

@@ -9,7 +9,7 @@ use super::*;
 use crate::mem;
 
 #[derive(Clone, Default)]
-pub struct ErrorMessage(Option<&'static str>);
+pub struct ErrorMessage(pub(crate) Option<&'static str>);
 
 impl ErrorMessage {
     pub fn get(&self) -> Option<&str> {
@@ -55,34 +55,27 @@ impl Default for StreamWrapper {
                     // zlib-ng
                     feature = "zlib-ng",
                     // libz-sys
-                    all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng"), not(feature = "zlib-rs"))
+                    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"), not(feature = "zlib-rs"))
+                    all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng"))
                 ))]
                 zfree: allocator::zfree,
 
                 #[cfg(
                     // cloudflare-zlib
-                    all(feature = "cloudflare_zlib", not(feature = "zlib-rs"), not(feature = "zlib-ng")),
+                    all(feature = "cloudflare_zlib", not(feature = "zlib-ng")),
                 )]
                 zalloc: Some(allocator::zalloc),
                 #[cfg(
                     // cloudflare-zlib
-                    all(feature = "cloudflare_zlib", not(feature = "zlib-rs"), not(feature = "zlib-ng")),
+                    all(feature = "cloudflare_zlib", not(feature = "zlib-ng")),
                 )]
                 zfree: Some(allocator::zfree),
-
-                // for zlib-rs, it is most efficient to have it provide the allocator.
-                // The libz-rs-sys dependency is configured to use the rust system allocator
-                #[cfg(all(feature = "zlib-rs", not(feature = "zlib-ng")))]
-                zalloc: None,
-                #[cfg(all(feature = "zlib-rs", not(feature = "zlib-ng")))]
-                zfree: None,
             })),
         }
     }
@@ -102,9 +95,9 @@ impl Drop for StreamWrapper {
     // zlib-ng
     feature = "zlib-ng",
     // cloudflare-zlib
-    all(feature = "cloudflare_zlib", not(feature = "zlib-rs"), not(feature = "zlib-ng")),
+    all(feature = "cloudflare_zlib", not(feature = "zlib-ng")),
     // libz-sys
-    all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng"), not(feature = "zlib-rs")),
+    all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng")),
 ))]
 mod allocator {
     use super::*;
@@ -462,18 +455,18 @@ mod c_backend {
     #[cfg(feature = "zlib-ng")]
     use libz_ng_sys as libz;
 
-    #[cfg(all(feature = "zlib-rs", not(feature = "zlib-ng")))]
+    #[cfg(not(feature = "zlib-ng"))]
     use libz_rs_sys as libz;
 
     #[cfg(
         // cloudflare-zlib
-        all(feature = "cloudflare_zlib", not(feature = "zlib-rs"), not(feature = "zlib-ng")),
+        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"), not(feature = "zlib-rs")),
+        all(not(feature = "cloudflare_zlib"), not(feature = "zlib-ng")),
     )]
     use libz_sys as libz;
 

src/ffi/rust.rs renamed to src/ffi/miniz_oxide.rs

@@ -146,7 +146,7 @@ impl From<FlushCompress> for MZFlush {
 impl DeflateBackend for Deflate {
     fn make(level: Compression, zlib_header: bool, _window_bits: u8) -> Self {
         // Check in case the integer value changes at some point.
-        debug_assert!(level.level() <= 10);
+        debug_assert!(level.level() <= 9);
 
         let mut inner: Box<CompressorOxide> = Box::default();
         let format = format_from_bool(zlib_header);

src/ffi/mod.rs

@@ -65,10 +65,15 @@ mod c;
 #[cfg(feature = "any_zlib")]
 pub use self::c::*;
 
+#[cfg(all(feature = "zlib-rs"))]
+mod zlib_rs;
+#[cfg(all(feature = "zlib-rs"))]
+pub use self::zlib_rs::*;
+
 #[cfg(all(not(feature = "any_zlib"), feature = "miniz_oxide"))]
-mod rust;
+mod miniz_oxide;
 #[cfg(all(not(feature = "any_zlib"), feature = "miniz_oxide"))]
-pub use self::rust::*;
+pub use self::miniz_oxide::*;
 
 impl std::fmt::Debug for ErrorMessage {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {