Skip to content

Commit

Permalink
Update to tokio 1.28.0 (pantsbuild#18874)
Browse files Browse the repository at this point in the history
fixes `reject_remote_clients` Configuration corruption
https://rustsec.org/advisories/RUSTSEC-2023-0001
  • Loading branch information
asherf authored May 1, 2023
1 parent 0c673b9 commit 4e39b72
Show file tree
Hide file tree
Showing 25 changed files with 118 additions and 68 deletions.
116 changes: 83 additions & 33 deletions src/rust/engine/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/rust/engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ task_executor = { path = "task_executor" }
tempfile = "3.5.0"
testutil_mock = { package = "mock", path = "testutil/mock" }
time = "0.3.20"
tokio = { version = "1.21", features = ["macros", "rt", "rt-multi-thread"] }
tokio = { version = "1.28", features = ["macros", "rt", "rt-multi-thread"] }
tokio-retry = "0.3"
tokio-util = { version = "0.7", features = ["io"] }
tryfuture = { path = "tryfuture" }
Expand Down
4 changes: 2 additions & 2 deletions src/rust/engine/async_latch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false

[dependencies]
parking_lot = "0.12"
tokio = { version = "1.21", features = ["sync"] }
tokio = { version = "1.28", features = ["sync"] }

[dev-dependencies]
tokio = { version = "1.21", features = ["rt", "macros", "time"] }
tokio = { version = "1.28", features = ["rt", "macros", "time"] }
4 changes: 2 additions & 2 deletions src/rust/engine/async_value/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false

[dependencies]
futures = "0.3"
tokio = { version = "1.21", features = ["macros", "sync"] }
tokio = { version = "1.28", features = ["macros", "sync"] }

[dev-dependencies]
tokio = { version = "1.21", features = ["macros", "rt", "sync", "time"] }
tokio = { version = "1.28", features = ["macros", "rt", "sync", "time"] }
2 changes: 1 addition & 1 deletion src/rust/engine/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sha2 = "0.10"
strum = "0.24"
strum_macros = "0.24"
sysinfo = "0.20.0"
tokio = { version = "1.21", features = ["rt-multi-thread", "macros", "net", "io-std", "io-util"] }
tokio = { version = "1.28", features = ["rt-multi-thread", "macros", "net", "io-std", "io-util"] }
uname = "0.1"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions src/rust/engine/fs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ protos = { path = "../protos" }
rlimit = "0.8"
serde = "1.0.136"
task_executor = { path = "../task_executor" }
tokio = { version = "1.21", features = ["fs"] }
tokio = { version = "1.28", features = ["fs"] }
workunit_store = { path = "../workunit_store" }

[dev-dependencies]
tempfile = "3.5.0"
testutil = { path = "../testutil" }
tokio = { version = "1.21", features = ["rt", "macros"] }
tokio = { version = "1.28", features = ["rt", "macros"] }
2 changes: 1 addition & 1 deletion src/rust/engine/fs/brfs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ parking_lot = "0.12"
store = { path = "../store" }
task_executor = { path = "../../task_executor" }
time = "0.3.20"
tokio = { version = "1.21", features = ["rt-multi-thread", "macros", "signal"] }
tokio = { version = "1.28", features = ["rt-multi-thread", "macros", "signal"] }
tokio-stream = { version = "0.1", features = ["signal"] }
workunit_store = { path = "../../workunit_store" }

Expand Down
2 changes: 1 addition & 1 deletion src/rust/engine/fs/fs_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ serde_json = "1.0"
serde_derive = "1.0"
store = { path = "../store" }
task_executor = { path = "../../task_executor" }
tokio = { version = "1.21", features = ["rt-multi-thread", "macros"] }
tokio = { version = "1.28", features = ["rt-multi-thread", "macros"] }
workunit_store = { path = "../../workunit_store" }
4 changes: 2 additions & 2 deletions src/rust/engine/fs/store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sharded_lmdb = { path = "../../sharded_lmdb" }
task_executor = { path = "../../task_executor" }
tempfile = "3.5.0"
tokio-rustls = "0.23"
tokio = { version = "1.21", features = ["fs"] }
tokio = { version = "1.28", features = ["fs"] }
tonic = { version = "0.6", features = ["transport", "codegen", "tls", "tls-roots", "prost"] }
tower-service = "0.3"
tryfuture = { path = "../../tryfuture" }
Expand All @@ -48,7 +48,7 @@ criterion = "0.4"
mock = { path = "../../testutil/mock" }
num_cpus = "1"
testutil = { path = "../../testutil" }
tokio = { version = "1.21", features = ["rt", "macros"] }
tokio = { version = "1.28", features = ["rt", "macros"] }
walkdir = "2"

[[bench]]
Expand Down
4 changes: 2 additions & 2 deletions src/rust/engine/graph/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ log = "0.4"
parking_lot = "0.12"
petgraph = "0.6"
task_executor = { path = "../task_executor" }
tokio = { version = "1.21", features = ["time", "parking_lot"] }
tokio = { version = "1.28", features = ["time", "parking_lot"] }
workunit_store = { path = "../workunit_store" }

[dev-dependencies]
rand = "0.8"
env_logger = "0.10.0"
tokio = { version = "1.21", features = ["macros", "rt-multi-thread", "time"] }
tokio = { version = "1.28", features = ["macros", "rt-multi-thread", "time"] }
2 changes: 1 addition & 1 deletion src/rust/engine/grpc_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ prost = "0.9"
rand = "0.8"
rustls = { version = "0.19", features = ["dangerous_configuration"] }
rustls-pemfile = "0.2"
tokio = { version = "1.21", features = ["net", "process", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1.28", features = ["net", "process", "rt-multi-thread", "sync", "time"] }
tokio-rustls = "0.22"
tokio-util = { version = "0.6", features = ["codec"] }
tonic = { version = "0.6", features = ["transport", "codegen", "tls", "tls-roots", "prost"] }
Expand Down
2 changes: 1 addition & 1 deletion src/rust/engine/hashing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ generic-array = "0.14"
hex = "0.4.3"
serde = { version = "1.0", features = ["derive"] }
sha2 = "0.10"
tokio = { version = "1.21", features = ["io-util"] }
tokio = { version = "1.28", features = ["io-util"] }

[dev-dependencies]
serde_test = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/rust/engine/logging/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ num_enum = "0.5"
parking_lot = "0.12"
regex = "1"
stdio = { path = "../stdio" }
tokio = { version = "1.21" }
tokio = { version = "1.28" }
uuid = { version = "1.1", features = ["v4"] }

[build-dependencies]
Expand Down
Loading

0 comments on commit 4e39b72

Please sign in to comment.