From e863001f5409590d2d08f150409170bc101afb6e Mon Sep 17 00:00:00 2001 From: konstin Date: Wed, 4 Jun 2025 15:40:16 +0200 Subject: [PATCH 1/3] Downgrade reqwest and hyper-util https://github.com/astral-sh/uv/issues/13831 --- Cargo.lock | 75 ++++++++++++++++++++---------------------------------- Cargo.toml | 7 +++-- 2 files changed, 33 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac897265ff399..01d03968b233e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1675,7 +1675,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 0.26.8", + "webpki-roots", ] [[package]] @@ -1684,7 +1684,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8" dependencies = [ - "base64 0.22.1", "bytes", "futures-channel", "futures-core", @@ -1692,9 +1691,7 @@ dependencies = [ "http", "http-body", "hyper", - "ipnet", "libc", - "percent-encoding", "pin-project-lite", "socket2", "tokio", @@ -1937,16 +1934,6 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" -[[package]] -name = "iri-string" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "is-terminal" version = "0.4.15" @@ -3098,9 +3085,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.18" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff6b0dbbe4d5a37318f433d4fc82babd21631f194d370409ceb2e40b2f0b5" +checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" dependencies = [ "async-compression", "base64 0.22.1", @@ -3126,6 +3113,7 @@ dependencies = [ "quinn", "rustls", "rustls-native-certs", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -3136,14 +3124,14 @@ dependencies = [ "tokio-socks", "tokio-util", "tower", - "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 1.0.0", + "webpki-roots", + "windows-registry 0.4.0", ] [[package]] @@ -3389,6 +3377,15 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" version = "1.11.0" @@ -4284,24 +4281,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "tower-http" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e" -dependencies = [ - "bitflags 2.9.1", - "bytes", - "futures-util", - "http", - "http-body", - "iri-string", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.3" @@ -5665,7 +5644,7 @@ dependencies = [ "uv-trampoline-builder", "uv-warnings", "which", - "windows-registry", + "windows-registry 0.5.2", "windows-result 0.3.4", "windows-sys 0.59.0", ] @@ -5867,7 +5846,7 @@ dependencies = [ "tracing", "uv-fs", "uv-static", - "windows-registry", + "windows-registry 0.5.2", "windows-result 0.3.4", "windows-sys 0.59.0", ] @@ -6246,15 +6225,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "weezl" version = "0.1.8" @@ -6483,6 +6453,17 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" +dependencies = [ + "windows-result 0.3.4", + "windows-strings 0.3.1", + "windows-targets 0.53.0", +] + [[package]] name = "windows-registry" version = "0.5.2" diff --git a/Cargo.toml b/Cargo.toml index 4d369bc9e4d7b..23fd1a7ce265e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -142,7 +142,7 @@ ref-cast = { version = "1.0.24" } reflink-copy = { version = "0.1.19" } regex = { version = "1.10.6" } regex-automata = { version = "0.4.8", default-features = false, features = ["dfa-build", "dfa-search", "perf", "std", "syntax"] } -reqwest = { version = "0.12.7", default-features = false, features = ["json", "gzip", "stream", "rustls-tls", "rustls-tls-native-roots", "socks", "multipart", "http2", "blocking"] } +reqwest = { version = "=0.12.15", default-features = false, features = ["json", "gzip", "stream", "rustls-tls", "rustls-tls-native-roots", "socks", "multipart", "http2", "blocking"] } reqwest-middleware = { version = "0.4.0", features = ["multipart"] } reqwest-retry = { version = "0.7.0" } rkyv = { version = "0.8.8", features = ["bytecheck"] } @@ -193,8 +193,11 @@ wiremock = { version = "0.6.2" } xz2 = { version = "0.1.7" } zip = { version = "2.2.3", default-features = false, features = ["deflate", "zstd", "bzip2", "lzma", "xz"] } +# https://github.com/astral-sh/uv/issues/13831 +hyper-util = "=0.1.12" + [workspace.metadata.cargo-shear] -ignored = ["flate2", "xz2"] +ignored = ["flate2", "xz2", "hyper-util"] [workspace.lints.rust] unsafe_code = "warn" From fe65c5aa25fdadbeb4042481c5f62add50ddb33a Mon Sep 17 00:00:00 2001 From: konstin Date: Wed, 4 Jun 2025 17:14:41 +0200 Subject: [PATCH 2/3] Revert "Update Rust crate hyper-util to v0.1.13 (#13767)" This reverts commit 9423f05ca7f1a0ae4d111660e70adc5f6027af57. --- Cargo.lock | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 01d03968b233e..0dcf1613fa441 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1680,13 +1680,12 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.13" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8" +checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", From 8afeef6169802fa8513291930c83e90534502df1 Mon Sep 17 00:00:00 2001 From: konstin Date: Wed, 4 Jun 2025 18:24:20 +0200 Subject: [PATCH 3/3] Drop noop bound It didn't take effect for the transitive dependency --- Cargo.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 23fd1a7ce265e..368dc0442deac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -193,11 +193,8 @@ wiremock = { version = "0.6.2" } xz2 = { version = "0.1.7" } zip = { version = "2.2.3", default-features = false, features = ["deflate", "zstd", "bzip2", "lzma", "xz"] } -# https://github.com/astral-sh/uv/issues/13831 -hyper-util = "=0.1.12" - [workspace.metadata.cargo-shear] -ignored = ["flate2", "xz2", "hyper-util"] +ignored = ["flate2", "xz2"] [workspace.lints.rust] unsafe_code = "warn"