From 87fd0610828e6a821bd163a1ad6c00fdbc07fd59 Mon Sep 17 00:00:00 2001 From: Yusuke Tanaka Date: Mon, 23 Sep 2024 01:50:56 +0900 Subject: [PATCH 1/2] patch tower-http --- Cargo.lock | 9 ++++----- Cargo.toml | 6 +++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f514abb1a688b9..fc194c1f92ecaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7541,9 +7541,8 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +version = "0.6.0" +source = "git+https://github.com/magurotuna/tower-http.git?rev=d84e6c0b0d1427edb366704b9a3bfd7e48f9d3d4#d84e6c0b0d1427edb366704b9a3bfd7e48f9d3d4" dependencies = [ "async-compression", "bitflags 2.6.0", @@ -7561,9 +7560,9 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" diff --git a/Cargo.toml b/Cargo.toml index f020812ad8e55a..57e1fa0f9c5bc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -185,7 +185,7 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["ring tokio-socks = "0.5.1" tokio-util = "0.7.4" tower = { version = "0.4.13", default-features = false, features = ["util"] } -tower-http = { version = "0.5.2", features = ["decompression-br", "decompression-gzip"] } +tower-http = { version = "0.6.0", features = ["decompression-br", "decompression-gzip"] } tower-lsp = { package = "deno_tower_lsp", version = "0.1.0", features = ["proposed"] } tower-service = "0.3.2" twox-hash = "=1.6.3" @@ -398,3 +398,7 @@ opt-level = 3 opt-level = 3 [profile.release.package.zstd-sys] opt-level = 3 + +[patch.crates-io] +# Until https://github.com/tower-rs/tower-http/pull/521 is merged and released +tower-http = { git = "https://github.com/magurotuna/tower-http.git", rev = "d84e6c0b0d1427edb366704b9a3bfd7e48f9d3d4" } From f55b190fc6ca329caefb897c477eb9102a1ad0d2 Mon Sep 17 00:00:00 2001 From: Yusuke Tanaka Date: Tue, 24 Sep 2024 01:10:45 +0900 Subject: [PATCH 2/2] use tower-http 0.6.1 --- Cargo.lock | 5 +++-- Cargo.toml | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc194c1f92ecaf..7014ae86770817 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7541,8 +7541,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.0" -source = "git+https://github.com/magurotuna/tower-http.git?rev=d84e6c0b0d1427edb366704b9a3bfd7e48f9d3d4#d84e6c0b0d1427edb366704b9a3bfd7e48f9d3d4" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" dependencies = [ "async-compression", "bitflags 2.6.0", diff --git a/Cargo.toml b/Cargo.toml index 57e1fa0f9c5bc3..81cbf8b4c6a449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -185,7 +185,7 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["ring tokio-socks = "0.5.1" tokio-util = "0.7.4" tower = { version = "0.4.13", default-features = false, features = ["util"] } -tower-http = { version = "0.6.0", features = ["decompression-br", "decompression-gzip"] } +tower-http = { version = "0.6.1", features = ["decompression-br", "decompression-gzip"] } tower-lsp = { package = "deno_tower_lsp", version = "0.1.0", features = ["proposed"] } tower-service = "0.3.2" twox-hash = "=1.6.3" @@ -398,7 +398,3 @@ opt-level = 3 opt-level = 3 [profile.release.package.zstd-sys] opt-level = 3 - -[patch.crates-io] -# Until https://github.com/tower-rs/tower-http/pull/521 is merged and released -tower-http = { git = "https://github.com/magurotuna/tower-http.git", rev = "d84e6c0b0d1427edb366704b9a3bfd7e48f9d3d4" }