diff --git a/Cargo.lock b/Cargo.lock index e9b25909521..cadf5761646 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1140,12 +1140,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc" +checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" dependencies = [ "crc32fast", - "libz-sys", + "libz-rs-sys", "miniz_oxide", ] @@ -2600,6 +2600,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libz-rs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a" +dependencies = [ + "zlib-rs", +] + [[package]] name = "libz-sys" version = "1.1.21" @@ -4805,3 +4814,9 @@ dependencies = [ "quote", "syn 2.0.98", ] + +[[package]] +name = "zlib-rs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8" diff --git a/Cargo.toml b/Cargo.toml index e7ecb6614ca..c06ac80fa40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ criterion = { version = "0.5.1", features = ["html_reports"] } curl = "0.4.47" curl-sys = "0.4.79" filetime = "0.2.25" -flate2 = { version = "1.0.35", default-features = false, features = ["zlib"] } +flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] } git2 = "0.20.0" git2-curl = "0.21.0" gix = { version = "0.70.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } diff --git a/README.md b/README.md index 9d4bc977348..74f16b0c3b7 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ The build will automatically use vendored versions of the following libraries. H * [`libcurl`](https://curl.se/libcurl/) — Used for network transfers. * [`libgit2`](https://libgit2.org/) — Used for fetching git dependencies. * [`libssh2`](https://www.libssh2.org/) — Used for SSH access to git repositories. -* [`libz`](https://zlib.net/) (aka zlib) — Used for data compression. +* [`libz`](https://zlib.net/) (AKA zlib) — Used by the above C libraries for data compression. (Rust code uses [`zlib-rs`](https://github.com/trifectatechfoundation/zlib-rs) instead.) It is recommended to use the vendored versions as they are the versions that are tested to work with Cargo. diff --git a/src/doc/src/reference/features.md b/src/doc/src/reference/features.md index 1f85229bb86..bf746df4629 100644 --- a/src/doc/src/reference/features.md +++ b/src/doc/src/reference/features.md @@ -187,7 +187,7 @@ The [`default` features](#the-default-feature) can be disabled using ```toml [dependencies] -flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } +flate2 = { version = "1.0.3", default-features = false, features = ["zlib-rs"] } ``` > **Note**: This may not ensure the default features are disabled. If another