From b2c382f7c1f6949c007cd95248cdcaa9ec3dd559 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Tue, 5 Aug 2025 12:55:58 +0100 Subject: [PATCH] Revert h2 upgrade (#15079) ## Summary While we figure out what's going on in https://github.com/hyperium/h2/issues/856. Closes https://github.com/astral-sh/uv/issues/15056. --- Cargo.lock | 25 +++++++++++++------------ Cargo.toml | 3 ++- crates/uv/Cargo.toml | 2 ++ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 16caeecdb..66291c884 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -749,7 +749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1148,7 +1148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -1514,9 +1514,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.11" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -1715,7 +1715,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.0", "tokio", "tower-service", "tracing", @@ -1941,7 +1941,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2001,7 +2001,7 @@ dependencies = [ "portable-atomic", "portable-atomic-util", "serde", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2872,7 +2872,7 @@ dependencies = [ "once_cell", "socket2 0.5.10", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3339,7 +3339,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3352,7 +3352,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.9.4", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -3943,7 +3943,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix 1.0.8", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4674,6 +4674,7 @@ dependencies = [ "flate2", "fs-err", "futures", + "h2", "http", "ignore", "indexmap", @@ -6366,7 +6367,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6e9742bc8..7df21ebf7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -112,6 +112,7 @@ glob = { version = "0.3.1" } globset = { version = "0.4.15" } globwalk = { version = "0.9.1" } goblin = { version = "0.10.0", default-features = false, features = ["std", "elf32", "elf64", "endian_fd"] } +h2 = { version = "<=0.4.7" } hashbrown = { version = "0.15.1" } hex = { version = "0.4.3" } home = { version = "0.5.9" } @@ -213,7 +214,7 @@ test-log = { version = "0.2.16", features = ["trace"], default-features = false whoami = { version = "1.6.0" } [workspace.metadata.cargo-shear] -ignored = ["flate2", "xz2"] +ignored = ["flate2", "xz2", "h2"] [workspace.lints.rust] unsafe_code = "warn" diff --git a/crates/uv/Cargo.toml b/crates/uv/Cargo.toml index e188ecdf6..22d5d7cc5 100644 --- a/crates/uv/Cargo.toml +++ b/crates/uv/Cargo.toml @@ -85,6 +85,7 @@ owo-colors = { workspace = true } petgraph = { workspace = true } regex = { workspace = true } reqwest = { workspace = true } +h2 = { workspace = true } rkyv = { workspace = true } rustc-hash = { workspace = true } serde = { workspace = true } @@ -138,6 +139,7 @@ nix = { workspace = true } [package.metadata.cargo-shear] ignored = [ "flate2", + "h2", "uv-performance-memory-allocator", ]