From db4917803e0b64fe89fce21be5ca78240cd001be Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Thu, 4 Mar 2021 06:40:30 -0800 Subject: [PATCH] third-party/rust: update futures Summary: Those newer versions of Futures have compatibility improvements with Tokio, notably: - https://github.com/rust-lang/futures-rs/pull/2333 - https://github.com/rust-lang/futures-rs/pull/2358 Reviewed By: farnz Differential Revision: D26778794 fbshipit-source-id: 5a9dc002083e5edfa5c614d8d2242e586a93fcf6 --- shed/async_compression/Cargo.toml | 2 +- shed/async_unit/Cargo.toml | 4 ++-- shed/facet/Cargo.toml | 2 +- shed/failure_ext/Cargo.toml | 2 +- shed/fbinit/fbinit-tokio-02/Cargo.toml | 2 +- shed/fbinit/fbinit-tokio/Cargo.toml | 2 +- shed/fbthrift_ext/framed/Cargo.toml | 2 +- shed/fbthrift_ext/socket/Cargo.toml | 2 +- shed/fbthrift_ext/tcp/Cargo.toml | 2 +- shed/futures_01_ext/Cargo.toml | 2 +- shed/futures_ext/Cargo.toml | 2 +- shed/futures_stats/Cargo.toml | 4 ++-- shed/limited_async_read/Cargo.toml | 2 +- shed/memcache_stub/common/Cargo.toml | 2 +- shed/sql/Cargo.toml | 2 +- shed/sql/common/Cargo.toml | 4 ++-- shed/stats/Cargo.toml | 2 +- shed/tokio_shim/Cargo.toml | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/shed/async_compression/Cargo.toml b/shed/async_compression/Cargo.toml index 63abd619f..cc2dcbbb3 100644 --- a/shed/async_compression/Cargo.toml +++ b/shed/async_compression/Cargo.toml @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0" bytes = { version = "0.4", features = ["serde"] } bzip2 = { version = "0.3", features = ["tokio"] } flate2 = { version = "1.0", features = ["rust_backend", "tokio"], default-features = false } -futures = "0.1.30" +futures = "0.1.31" tokio-io = "0.1" zstd = "=0.5.3+zstd.1.4.5" diff --git a/shed/async_unit/Cargo.toml b/shed/async_unit/Cargo.toml index df8fcafca..80ad87e09 100644 --- a/shed/async_unit/Cargo.toml +++ b/shed/async_unit/Cargo.toml @@ -9,10 +9,10 @@ repository = "https://github.com/facebookexperimental/rust-shed/" license = "MIT OR Apache-2.0" [dependencies] -futures-preview = { package = "futures", version = "0.3.5", features = ["async-await", "compat"] } +futures-preview = { package = "futures", version = "0.3.13", features = ["async-await", "compat"] } tokio-compat = "0.1" [dev-dependencies] -futures = "0.1.30" +futures = "0.1.31" tokio = { version = "0.2.25", features = ["full", "test-util"] } tokio-old = { package = "tokio", version = "0.1" } diff --git a/shed/facet/Cargo.toml b/shed/facet/Cargo.toml index ebf86873d..003d7eaf2 100644 --- a/shed/facet/Cargo.toml +++ b/shed/facet/Cargo.toml @@ -35,7 +35,7 @@ path = "test/static_test.rs" anyhow = "1.0" async-trait = "0.1.29" facet_proc_macros = { version = "0.1.0", path = "proc_macros" } -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } thiserror = "1.0" [dev-dependencies] diff --git a/shed/failure_ext/Cargo.toml b/shed/failure_ext/Cargo.toml index dff0242a7..8af240b90 100644 --- a/shed/failure_ext/Cargo.toml +++ b/shed/failure_ext/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0" [dependencies] anyhow = "1.0" failure = "0.1" -futures = "0.1.30" +futures = "0.1.31" slog = { version = "2.5", features = ["max_level_debug"] } [dev-dependencies] diff --git a/shed/fbinit/fbinit-tokio-02/Cargo.toml b/shed/fbinit/fbinit-tokio-02/Cargo.toml index e3fbb9e9d..868328d22 100644 --- a/shed/fbinit/fbinit-tokio-02/Cargo.toml +++ b/shed/fbinit/fbinit-tokio-02/Cargo.toml @@ -13,5 +13,5 @@ path = "lib.rs" doc = false [dependencies] -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } tokio = { version = "0.2.25", features = ["full", "test-util"] } diff --git a/shed/fbinit/fbinit-tokio/Cargo.toml b/shed/fbinit/fbinit-tokio/Cargo.toml index 60b295467..d745a4e25 100644 --- a/shed/fbinit/fbinit-tokio/Cargo.toml +++ b/shed/fbinit/fbinit-tokio/Cargo.toml @@ -11,5 +11,5 @@ license = "MIT OR Apache-2.0" path = "lib.rs" [dependencies] -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } tokio = { version = "1", features = ["full", "test-util"] } diff --git a/shed/fbthrift_ext/framed/Cargo.toml b/shed/fbthrift_ext/framed/Cargo.toml index f976a16e4..4218fe878 100644 --- a/shed/fbthrift_ext/framed/Cargo.toml +++ b/shed/fbthrift_ext/framed/Cargo.toml @@ -17,5 +17,5 @@ bytes = { version = "0.5", features = ["serde"] } tokio-util = { version = "0.3", features = ["codec", "udp"] } [dev-dependencies] -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } tokio = { version = "0.2.25", features = ["full", "test-util"] } diff --git a/shed/fbthrift_ext/socket/Cargo.toml b/shed/fbthrift_ext/socket/Cargo.toml index 7adea448c..62d48631a 100644 --- a/shed/fbthrift_ext/socket/Cargo.toml +++ b/shed/fbthrift_ext/socket/Cargo.toml @@ -17,7 +17,7 @@ bytes = { version = "0.5", features = ["serde"] } fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "master" } fbthrift_framed = { version = "0.1.0", path = "../framed" } fbthrift_util = { version = "0.1.0", path = "../util" } -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } tokio = { version = "0.2.25", features = ["full", "test-util"] } tokio-tower = "0.4" tokio-util = { version = "0.3", features = ["codec", "udp"] } diff --git a/shed/fbthrift_ext/tcp/Cargo.toml b/shed/fbthrift_ext/tcp/Cargo.toml index a0ad8fcd0..9ec13bde9 100644 --- a/shed/fbthrift_ext/tcp/Cargo.toml +++ b/shed/fbthrift_ext/tcp/Cargo.toml @@ -17,7 +17,7 @@ bytes = { version = "0.5", features = ["serde"] } fbthrift = { version = "0.0.1+unstable", git = "https://github.com/facebook/fbthrift.git", branch = "master" } fbthrift_framed = { version = "0.1.0", path = "../framed" } fbthrift_util = { version = "0.1.0", path = "../util" } -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } tokio = { version = "0.2.25", features = ["full", "test-util"] } tokio-tower = "0.4" tokio-util = { version = "0.3", features = ["codec", "udp"] } diff --git a/shed/futures_01_ext/Cargo.toml b/shed/futures_01_ext/Cargo.toml index 8a9c1937f..ef85e514f 100644 --- a/shed/futures_01_ext/Cargo.toml +++ b/shed/futures_01_ext/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" [dependencies] bytes-old = { package = "bytes", version = "0.4", features = ["serde"] } -futures = "0.1.30" +futures = "0.1.31" tokio-io = "0.1" [dev-dependencies] diff --git a/shed/futures_ext/Cargo.toml b/shed/futures_ext/Cargo.toml index a61056217..1490de5b4 100644 --- a/shed/futures_ext/Cargo.toml +++ b/shed/futures_ext/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" [dependencies] anyhow = "1.0" -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } pin-project = "0.4" shared_error = { version = "0.1.0", path = "../shared_error" } thiserror = "1.0" diff --git a/shed/futures_stats/Cargo.toml b/shed/futures_stats/Cargo.toml index 056a5d2de..b32d43a3f 100644 --- a/shed/futures_stats/Cargo.toml +++ b/shed/futures_stats/Cargo.toml @@ -13,8 +13,8 @@ name = "futures_stats_test" path = "test/main.rs" [dependencies] -futures = { version = "0.3.5", features = ["async-await", "compat"] } -futures-old = { package = "futures", version = "0.1.30" } +futures = { version = "0.3.13", features = ["async-await", "compat"] } +futures-old = { package = "futures", version = "0.1.31" } futures_ext = { package = "futures_01_ext", version = "0.1.0", path = "../futures_01_ext" } tokio-old = { package = "tokio", version = "0.1" } diff --git a/shed/limited_async_read/Cargo.toml b/shed/limited_async_read/Cargo.toml index 786bc70e7..10a53c821 100644 --- a/shed/limited_async_read/Cargo.toml +++ b/shed/limited_async_read/Cargo.toml @@ -12,4 +12,4 @@ license = "MIT OR Apache-2.0" tokio-io = "0.1" [dev-dependencies] -futures = "0.1.30" +futures = "0.1.31" diff --git a/shed/memcache_stub/common/Cargo.toml b/shed/memcache_stub/common/Cargo.toml index 4b38803a5..8453fef1e 100644 --- a/shed/memcache_stub/common/Cargo.toml +++ b/shed/memcache_stub/common/Cargo.toml @@ -14,4 +14,4 @@ path = "lib.rs" anyhow = "1.0" bytes = { version = "0.5", features = ["serde"] } fbinit = { version = "0.1.0", path = "../../fbinit" } -futures = "0.1.30" +futures = "0.1.31" diff --git a/shed/sql/Cargo.toml b/shed/sql/Cargo.toml index ae79c52b2..54c3b132c 100644 --- a/shed/sql/Cargo.toml +++ b/shed/sql/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0" [dependencies] anyhow = "1.0" cloned = { version = "0.1.0", path = "../cloned" } -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } futures-util = "0.3.7" futures_ext = { version = "0.1.0", path = "../futures_ext" } mysql_async = "0.23" diff --git a/shed/sql/common/Cargo.toml b/shed/sql/common/Cargo.toml index a6e16632b..27066011b 100644 --- a/shed/sql/common/Cargo.toml +++ b/shed/sql/common/Cargo.toml @@ -15,8 +15,8 @@ path = "lib.rs" anyhow = "1.0" auto_impl = "0.4" failure_ext = { version = "0.1.0", path = "../../failure_ext" } -futures = { version = "0.3.5", features = ["async-await", "compat"] } -futures-old = { package = "futures", version = "0.1.30" } +futures = { version = "0.3.13", features = ["async-await", "compat"] } +futures-old = { package = "futures", version = "0.1.31" } futures_ext = { package = "futures_01_ext", version = "0.1.0", path = "../../futures_01_ext" } futures_stats = { version = "0.1.0", path = "../../futures_stats" } lazy_static = "1.0" diff --git a/shed/stats/Cargo.toml b/shed/stats/Cargo.toml index 0646e1e06..3bd5c8def 100644 --- a/shed/stats/Cargo.toml +++ b/shed/stats/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" [dependencies] fbinit = { version = "0.1.0", path = "../fbinit" } -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } lazy_static = "1.0" perthread = { version = "0.1.0", path = "../perthread" } stats_traits = { version = "0.1.0", path = "traits" } diff --git a/shed/tokio_shim/Cargo.toml b/shed/tokio_shim/Cargo.toml index de097cee9..0fc683594 100644 --- a/shed/tokio_shim/Cargo.toml +++ b/shed/tokio_shim/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" [dependencies] anyhow = "1.0" -futures = { version = "0.3.5", features = ["async-await", "compat"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } pin-project = "0.4" thiserror = "1.0" tokio_02 = { package = "tokio", version = "0.2.25", features = ["full", "test-util"] }