From 0aaa6ba5bed936ffb762719b10ca576dc4d15c98 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Mon, 18 Nov 2024 10:45:14 -0500 Subject: [PATCH] Migrate to `zlib-rs` (#9184) ## Summary I've tried this a few times; just curious if it passes tests. --- Cargo.lock | 27 ++++++++----------- .../uv-performance-flate2-backend/Cargo.toml | 4 +-- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1475765d7..ddda22b96 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -631,15 +631,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" -[[package]] -name = "cmake" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" -dependencies = [ - "cc", -] - [[package]] name = "codspeed" version = "2.7.2" @@ -1104,7 +1095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "libz-ng-sys", + "libz-rs-sys", "miniz_oxide", ] @@ -1983,13 +1974,12 @@ dependencies = [ ] [[package]] -name = "libz-ng-sys" -version = "1.1.16" +name = "libz-rs-sys" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4436751a01da56f1277f323c80d584ffad94a3d14aecd959dd0dff75aa73a438" +checksum = "39cc71ac688c22a9f5730a38171ac94795c071ac81d1a0ab5537f6ef164fff30" dependencies = [ - "cmake", - "libc", + "zlib-rs", ] [[package]] @@ -5190,7 +5180,6 @@ name = "uv-performance-flate2-backend" version = "0.1.0" dependencies = [ "flate2", - "libz-ng-sys", ] [[package]] @@ -6388,6 +6377,12 @@ dependencies = [ "flate2", ] +[[package]] +name = "zlib-rs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ca4a9dc6566c9224cc161dedc5577bd81f4a9ee0f9fbe80592756d096b07ee5" + [[package]] name = "zstd" version = "0.13.2" diff --git a/crates/uv-performance-flate2-backend/Cargo.toml b/crates/uv-performance-flate2-backend/Cargo.toml index 660cf44ce..0e2d9bc28 100644 --- a/crates/uv-performance-flate2-backend/Cargo.toml +++ b/crates/uv-performance-flate2-backend/Cargo.toml @@ -8,9 +8,7 @@ edition = "2021" doctest = false [target.'cfg(not(any(target_arch = "s390x", target_arch = "powerpc64", target_os = "freebsd")))'.dependencies] -flate2 = { version = "1.0.28", default-features = false, features = ["zlib-ng"] } -# See: https://github.com/rust-lang/libz-sys/issues/225 -libz-ng-sys = { version = "<1.1.20" } +flate2 = { version = "1.0.28", default-features = false, features = ["zlib-rs"] } [target.'cfg(any(target_arch = "s390x", target_arch = "powerpc64", target_os = "freebsd"))'.dependencies] flate2 = { version = "1.0.28", default-features = false, features = ["rust_backend"] }