Skip to content

Commit

Permalink
Bump tokio to 0.2.13
Browse files Browse the repository at this point in the history
Summary:
This is needed because the tonic crate (see the diff stack) relies on tokio ^0.2.13

We can't go to a newer version because a bug that affects mononoke was introduced on 0.2.14 (discussion started on T65261126). The issue was reported upstream tokio-rs/tokio#2390

This diff simply changed the version number on `fbsource/third-party/rust/Cargo.toml` and ran `fbsource/third-party/rust/reindeer/vendor`.

Also ran `buck run //common/rust/cargo_from_buck:cargo_from_buck` to fix the tokio version on generated cargo files

Reviewed By: krallin

Differential Revision: D21043344

fbshipit-source-id: e61797317a581aa87a8a54e9e2ae22655f22fb97
  • Loading branch information
Gabriel Russo authored and facebook-github-bot committed Apr 15, 2020
1 parent 6078dad commit 03d4e52
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion eden/mononoke/blobrepo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ futures-util = "0.3"
maplit = "1.0"
slog = { version="2.5", features=["max_level_debug"] }
thiserror = "1.0"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
uuid = { version = "0.8.1", features=["v4"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/blobstore/cacheblob/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ bytes = { version = "0.5", features = ["serde"] }
futures = { version = "0.3", features = ["async-await", "compat"] }
futures-old = { package = "futures", version = "0.1" }
slog = { version="2.5", features=["max_level_debug"] }
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-compat = "0.1"
tokio-old = { package = "tokio", version = "0.1" }
tokio-timer = "0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ futures_ext = { git = "https://github.com/facebookexperimental/rust-shed.git", b
anyhow = "1.0"
futures = { version = "0.3", features = ["async-await", "compat"] }
scopeguard = "1.0.0"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }

[dev-dependencies]
scuba_ext = { path = "../../common/scuba_ext" }
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/blobstore/delayblob/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ futures-old = { package = "futures", version = "0.1" }
futures-util = "0.3"
rand = { version = "0.7", features = ["small_rng"] }
rand_distr = "0.2"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-compat = "0.1"
2 changes: 1 addition & 1 deletion eden/mononoke/bonsai_git_mapping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ thiserror = "1.0"
mononoke_types-mocks = { path = "../mononoke_types/mocks" }
fbinit = { git = "https://github.com/facebookexperimental/rust-shed.git", branch = "master" }
assert_matches = "1.3"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
2 changes: 1 addition & 1 deletion eden/mononoke/bonsai_globalrev_mapping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ mercurial_types-mocks = { path = "../mercurial/types/mocks" }
mononoke_types-mocks = { path = "../mononoke_types/mocks" }
fbinit = { git = "https://github.com/facebookexperimental/rust-shed.git", branch = "master" }
assert_matches = "1.3"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ tests_utils = { path = "../../tests/utils" }
fbinit = { git = "https://github.com/facebookexperimental/rust-shed.git", branch = "master" }
maplit = "1.0"
rand = { version = "0.7", features = ["small_rng"] }
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-compat = "0.1"
2 changes: 1 addition & 1 deletion eden/mononoke/bookmarks/warm_bookmarks_cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ futures = { version = "0.3", features = ["async-await", "compat"] }
futures-old = { package = "futures", version = "0.1" }
itertools = "0.8"
slog = { version="2.5", features=["max_level_debug"] }
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }

[dev-dependencies]
blobstore = { path = "../../blobstore" }
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/cmdlib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ log = "0.4.8"
serde = { version = "1.0", features = ["derive", "rc"] }
slog = { version="2.5", features=["max_level_debug"] }
slog-term = "2.4.2"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-compat = "0.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/common/async_limiter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ futures = { version = "0.3", features = ["async-await", "compat"] }
futures-util = "0.3"
ratelimit_meter = "5"
thiserror = "1.0"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-old = { package = "tokio", version = "0.1" }

[dev-dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ chrono = { version="0.4", features=["serde"] }
futures-util = "0.3"
nonzero_ext = "0.2"
ratelimit_meter = "5"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
2 changes: 1 addition & 1 deletion eden/mononoke/common/bounded_traversal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ lock_ext = { git = "https://github.com/facebookexperimental/rust-shed.git", bran
anyhow = "1.0"
maplit = "1.0"
pretty_assertions = "0.6"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
2 changes: 1 addition & 1 deletion eden/mononoke/derived_data/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ regex = "1.0"
scopeguard = "1.0.0"
slog = { version="2.5", features=["max_level_debug"] }
thiserror = "1.0"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-compat = "0.1"
tokio-old = { package = "tokio", version = "0.1" }

Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/derived_data/fastlog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pretty_assertions = "0.6"
rand = { version = "0.7", features = ["small_rng"] }
rand_xorshift = "0.2"
thiserror = "1.0"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-compat = "0.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/manifest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ fbinit = { git = "https://github.com/facebookexperimental/rust-shed.git", branch
lock_ext = { git = "https://github.com/facebookexperimental/rust-shed.git", branch = "master" }
pretty_assertions = "0.6"
serde_cbor = "0.11"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-compat = "0.1"
2 changes: 1 addition & 1 deletion eden/mononoke/newfilenodes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ itertools = "0.8"
rand = { version = "0.7", features = ["small_rng"] }
scopeguard = "1.0.0"
thiserror = "1.0"
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }

[dev-dependencies]
mercurial_types-mocks = { path = "../mercurial/types/mocks" }
Expand Down
2 changes: 1 addition & 1 deletion eden/mononoke/pushrebase/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ async_unit = { git = "https://github.com/facebookexperimental/rust-shed.git", br
fbinit = { git = "https://github.com/facebookexperimental/rust-shed.git", branch = "master" }
itertools = "0.8"
rand = { version = "0.7", features = ["small_rng"] }
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }
tokio-compat = "0.1"
2 changes: 1 addition & 1 deletion eden/mononoke/server/context/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ chrono = { version="0.4", features=["serde"] }
futures = "0.1"
rand = { version = "0.7", features = ["small_rng"] }
slog = { version="2.5", features=["max_level_debug"] }
tokio = { version = "=0.2.11", features = ["full"] }
tokio = { version = "=0.2.13", features = ["full"] }

0 comments on commit 03d4e52

Please sign in to comment.