Skip to content

Commit

Permalink
Merge pull request #428 from Shnatsel/upgrade-zlib-rs
Browse files Browse the repository at this point in the history
Upgrade zlib-rs to 0.3.0 to get multiple bugfixes
  • Loading branch information
Byron authored Sep 26, 2024
2 parents eeee4c6 + da5c8cf commit 2c29780
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "flate2"
authors = ["Alex Crichton <alex@alexcrichton.com>", "Josh Triplett <josh@joshtriplett.org>"]
version = "1.0.33"
version = "1.0.34"
edition = "2018"
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand All @@ -21,7 +21,8 @@ exclude = [".*"]
[dependencies]
libz-sys = { version = "1.1.20", optional = true, default-features = false }
libz-ng-sys = { version = "1.1.16", optional = true }
libz-rs-sys = { version = "0.2.1", optional = true, default-features = false, features = ["std", "rust-allocator"] }
# this matches the default features, but we don't want to depend on the default features staying the same
libz-rs-sys = { version = "0.3.0", optional = true, default-features = false, features = ["std", "rust-allocator"] }
cloudflare-zlib-sys = { version = "0.3.0", optional = true }
miniz_oxide = { version = "0.8.0", optional = true, default-features = false, features = ["with-alloc"] }
crc32fast = "1.2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/ffi/c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ mod c_backend {
#[cfg(feature = "zlib-ng")]
const ZLIB_VERSION: &'static str = "2.1.0.devel\0";
#[cfg(all(not(feature = "zlib-ng"), feature = "zlib-rs"))]
const ZLIB_VERSION: &'static str = "0.1.0\0";
const ZLIB_VERSION: &'static str = "1.3.0-zlib-rs-0.3.0\0";
#[cfg(not(any(feature = "zlib-ng", feature = "zlib-rs")))]
const ZLIB_VERSION: &'static str = "1.2.8\0";

Expand Down

0 comments on commit 2c29780

Please sign in to comment.