From 296b8a712b1d15c0605a374dd9abf349d59fd5f9 Mon Sep 17 00:00:00 2001 From: Sebastian Holmin Date: Wed, 2 Oct 2024 10:17:19 +0200 Subject: [PATCH] Bump `tower` --- Cargo.lock | 45 ++++++++++++++++++++++++++++++++------------- Cargo.toml | 2 +- test/Cargo.lock | 42 +++++++++++++++++++++++++++++++----------- test/Cargo.toml | 2 +- 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index deb7582af8f8..cf1455226f2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -244,8 +244,8 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", - "tower", + "sync_wrapper 1.0.1", + "tower 0.4.13", "tower-layer", "tower-service", ] @@ -265,7 +265,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", ] @@ -2424,7 +2424,7 @@ dependencies = [ "talpid-types", "tokio", "tonic", - "tower", + "tower 0.5.1", "tunnel-obfuscation", ] @@ -2468,7 +2468,7 @@ dependencies = [ "tokio", "tonic", "tonic-build", - "tower", + "tower 0.5.1", ] [[package]] @@ -4054,6 +4054,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "sync_wrapper" version = "1.0.1" @@ -4221,7 +4227,7 @@ dependencies = [ "tokio", "tonic", "tonic-build", - "tower", + "tower 0.5.1", "winapi", "windows-sys 0.52.0", "winres", @@ -4303,7 +4309,7 @@ dependencies = [ "tokio", "tonic", "tonic-build", - "tower", + "tower 0.5.1", "windows-sys 0.52.0", "zeroize", ] @@ -4613,7 +4619,7 @@ dependencies = [ "socket2", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -4652,17 +4658,31 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[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" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4670,7 +4690,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", diff --git a/Cargo.toml b/Cargo.toml index 37b1e4fe9ede..634d78fb2b66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,7 @@ futures = "0.3.15" # Tonic and related crates tonic = "0.12.3" tonic-build = { version = "0.10.0", default-features = false } -tower = "0.4" +tower = { version = "0.5.1", features = ["util"] } prost = "0.13.3" prost-types = "0.13.3" hyper-util = {version = "0.1.8", features = ["client", "client-legacy", "http2"]} diff --git a/test/Cargo.lock b/test/Cargo.lock index 8d8a43ad827c..1ded38758fa3 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -227,8 +227,8 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", - "tower", + "sync_wrapper 1.0.1", + "tower 0.4.13", "tower-layer", "tower-service", ] @@ -248,7 +248,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", ] @@ -1899,7 +1899,7 @@ dependencies = [ "tokio", "tonic", "tonic-build", - "tower", + "tower 0.5.1", ] [[package]] @@ -2735,7 +2735,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tokio-rustls", "tower-service", @@ -3223,6 +3223,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "sync_wrapper" version = "1.0.1" @@ -3367,7 +3373,7 @@ dependencies = [ "tokio-serial", "tokio-util", "tonic", - "tower", + "tower 0.5.1", "tun", "uuid", ] @@ -3673,7 +3679,7 @@ dependencies = [ "socket2 0.5.6", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -3712,17 +3718,31 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[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" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" diff --git a/test/Cargo.toml b/test/Cargo.toml index 52b2e0a5da65..8c691719ecaf 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -56,7 +56,7 @@ tokio-serde = { version = "0.8.0", features = ["json"] } # Tonic and related crates tonic = "0.12.3" tonic-build = { version = "0.10.0", default-features = false } -tower = "0.4" +tower = "0.5.1" prost = "0.13.3" prost-types = "0.13.3" tarpc = { version = "0.30", features = ["tokio1", "serde-transport", "serde1"] }