From 3cd2b0b7b4b6180fb92b2734d2a414433286c13a Mon Sep 17 00:00:00 2001 From: konstin Date: Mon, 2 Jun 2025 13:27:43 +0200 Subject: [PATCH] Update async-compression to 0.4.23 Our manual usage of the `xz2/static` blocks updates of async-compression as they switched from the unmaintained lzma-sys to liblzma-sys. --- Cargo.lock | 62 +++++++++++++++++------------------- Cargo.toml | 6 ++-- crates/uv-extract/Cargo.toml | 6 ++-- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 70ca9d7bd..e453a3f53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,18 +192,18 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.18" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" +checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07" dependencies = [ "bzip2", "flate2", "futures-core", "futures-io", + "liblzma", "memchr", "pin-project-lite", "tokio", - "xz2", "zstd", "zstd-safe", ] @@ -472,22 +472,20 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bzip2" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47" dependencies = [ "bzip2-sys", - "libc", ] [[package]] name = "bzip2-sys" -version = "0.1.11+1.0.8" +version = "0.1.13+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -728,7 +726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -2084,6 +2082,26 @@ version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +[[package]] +name = "liblzma" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66352d7a8ac12d4877b6e6ea5a9b7650ee094257dc40889955bea5bc5b08c1d0" +dependencies = [ + "liblzma-sys", +] + +[[package]] +name = "liblzma-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5839bad90c3cc2e0b8c4ed8296b80e86040240f81d46b9c0e9bc8dd51ddd3af1" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "libmimalloc-sys" version = "0.1.39" @@ -2154,17 +2172,6 @@ version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "mailparse" version = "0.16.1" @@ -5201,6 +5208,7 @@ dependencies = [ "blake2", "fs-err 3.1.0", "futures", + "liblzma-sys", "md-5", "rayon", "reqwest", @@ -5213,7 +5221,6 @@ dependencies = [ "uv-configuration", "uv-distribution-filename", "uv-pypi-types", - "xz2", "zip", ] @@ -6238,7 +6245,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -6643,15 +6650,6 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - [[package]] name = "yansi" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 127f71dd4..a227d129d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,7 @@ anyhow = { version = "1.0.89" } arcstr = { version = "1.2.0" } astral-tokio-tar = { version = "0.5.1" } async-channel = { version = "2.3.1" } -async-compression = { version = "0.4.12", features = ["bzip2", "gzip", "xz", "zstd"] } +async-compression = { version = "0.4.23", features = ["bzip2", "gzip", "xz", "zstd"] } async-trait = { version = "0.1.82" } async_http_range_reader = { version = "0.9.1" } async_zip = { git = "https://github.com/charliermarsh/rs-async-zip", rev = "c909fda63fcafe4af496a07bfda28a5aae97e58d", features = ["bzip2", "deflate", "lzma", "tokio", "xz", "zstd"] } @@ -121,6 +121,7 @@ indoc = { version = "2.0.5" } itertools = { version = "0.14.0" } jiff = { version = "0.2.0", features = ["serde"] } junction = { version = "1.2.0" } +liblzma-sys = { version = "0.4.3" } mailparse = { version = "0.16.0" } md-5 = { version = "0.10.6" } memchr = { version = "2.7.4" } @@ -189,11 +190,10 @@ windows-result = { version = "0.3.0" } windows-sys = { version = "0.59.0", features = ["Win32_Foundation", "Win32_Security", "Win32_Storage_FileSystem", "Win32_System_Ioctl", "Win32_System_IO", "Win32_System_Registry"] } winsafe = { version = "0.0.24", features = ["kernel"] } wiremock = { version = "0.6.2" } -xz2 = { version = "0.1.7" } zip = { version = "2.2.3", default-features = false, features = ["deflate"] } [workspace.metadata.cargo-shear] -ignored = ["flate2", "xz2"] +ignored = ["flate2", "liblzma-sys"] [workspace.lints.rust] unsafe_code = "warn" diff --git a/crates/uv-extract/Cargo.toml b/crates/uv-extract/Cargo.toml index c25c2677d..aa119f2b3 100644 --- a/crates/uv-extract/Cargo.toml +++ b/crates/uv-extract/Cargo.toml @@ -26,6 +26,7 @@ async_zip = { workspace = true } blake2 = { workspace = true } fs-err = { workspace = true, features = ["tokio"] } futures = { workspace = true } +liblzma-sys = { workspace = true } md-5 = { workspace = true } rayon = { workspace = true } reqwest = { workspace = true } @@ -35,13 +36,12 @@ thiserror = { workspace = true } tokio = { workspace = true } tokio-util = { workspace = true, features = ["compat"] } tracing = { workspace = true } -xz2 = { workspace = true } zip = { workspace = true } [features] default = [] # Avoid a liblzma.so dependency -static = ["xz2/static"] +static = ["liblzma-sys/static"] [package.metadata.cargo-shear] -ignored = ["xz2"] +ignored = ["liblzma-sys"]