Skip to content

Commit 2c29780

Browse files
authored
Merge pull request #428 from Shnatsel/upgrade-zlib-rs
Upgrade zlib-rs to 0.3.0 to get multiple bugfixes
2 parents eeee4c6 + da5c8cf commit 2c29780

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "flate2"
33
authors = ["Alex Crichton <[email protected]>", "Josh Triplett <[email protected]>"]
4-
version = "1.0.33"
4+
version = "1.0.34"
55
edition = "2018"
66
license = "MIT OR Apache-2.0"
77
readme = "README.md"
@@ -21,7 +21,8 @@ exclude = [".*"]
2121
[dependencies]
2222
libz-sys = { version = "1.1.20", optional = true, default-features = false }
2323
libz-ng-sys = { version = "1.1.16", optional = true }
24-
libz-rs-sys = { version = "0.2.1", optional = true, default-features = false, features = ["std", "rust-allocator"] }
24+
# this matches the default features, but we don't want to depend on the default features staying the same
25+
libz-rs-sys = { version = "0.3.0", optional = true, default-features = false, features = ["std", "rust-allocator"] }
2526
cloudflare-zlib-sys = { version = "0.3.0", optional = true }
2627
miniz_oxide = { version = "0.8.0", optional = true, default-features = false, features = ["with-alloc"] }
2728
crc32fast = "1.2.0"

src/ffi/c.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ mod c_backend {
447447
#[cfg(feature = "zlib-ng")]
448448
const ZLIB_VERSION: &'static str = "2.1.0.devel\0";
449449
#[cfg(all(not(feature = "zlib-ng"), feature = "zlib-rs"))]
450-
const ZLIB_VERSION: &'static str = "0.1.0\0";
450+
const ZLIB_VERSION: &'static str = "1.3.0-zlib-rs-0.3.0\0";
451451
#[cfg(not(any(feature = "zlib-ng", feature = "zlib-rs")))]
452452
const ZLIB_VERSION: &'static str = "1.2.8\0";
453453

0 commit comments

Comments
 (0)