diff --git a/Cargo.lock b/Cargo.lock index 7d67907ba9..67663aa634 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "drain" -version = "0.0.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bace0faf279ba51822e2f4518eb311636d0e3198adbf7f55f496dc6ac96ac558" +checksum = "9701380e51dff309f25d5b3d6639aa757d940821f7bc966faa58b65b5b7e4a18" dependencies = [ "futures", "tokio", @@ -280,19 +280,6 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" -[[package]] -name = "futures-macro" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" -dependencies = [ - "autocfg", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "futures-sink" version = "0.3.15" @@ -315,14 +302,11 @@ dependencies = [ "futures-channel", "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -1728,18 +1712,6 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" version = "1.0.24" diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml index b69d44c460..b6a9811bc2 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -14,7 +14,7 @@ independently of the inbound and outbound proxy logic. [dependencies] bytes = "1" -drain = { version = "0.0.1", features = ["retain"] } +drain = { version = "0.1.0", features = ["retain"] } http = "0.2" http-body = "0.4" hyper = { version = "0.14.2", features = ["http1", "http2"] } diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index 659d2ceef5..e40432eaec 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -18,7 +18,7 @@ rustfmt = ["linkerd2-proxy-api/rustfmt"] [dependencies] bytes = "1" -futures = { version = "0.3", default-features = false } +futures = { version = "0.3", default-features = false, features = ["executor"] } h2 = "0.3" http = "0.2" http-body = "0.4" diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml index 710cc00a13..85b276afc5 100644 --- a/linkerd/proxy/http/Cargo.toml +++ b/linkerd/proxy/http/Cargo.toml @@ -14,7 +14,7 @@ This should probably be decomposed into smaller, decoupled crates. [dependencies] async-trait = "0.1" bytes = "1" -drain = "0.0.1" +drain = "0.1.0" futures = { version = "0.3", default-features = false } h2 = "0.3" http = "0.2"