Remove TODOs and = version pinning

Author: gshuflin

src/rust/engine/Cargo.toml

@@ -125,8 +125,7 @@ store = { path = "fs/store" }
 task_executor = { path = "task_executor" }
 tempfile = "3"
 time = "0.1.40"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-threaded"] }
+tokio = { version = "0.2.22", features = ["rt-threaded"] }
 ui = { path = "ui" }
 url = "2.1"
 uuid = { version = "0.7", features = ["v4"] }

src/rust/engine/async_semaphore/Cargo.toml

@@ -7,10 +7,8 @@ publish = false
 
 [dependencies]
 parking_lot = "0.11"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["sync"] }
+tokio = { version = "0.2.22", features = ["sync"] }
 
 [dev-dependencies]
 futures = "0.3"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-core", "macros", "time"] }
+tokio = { version = "0.2.22", features = ["rt-core", "macros", "time"] }

src/rust/engine/fs/Cargo.toml

@@ -21,5 +21,4 @@ task_executor = { path = "../task_executor" }
 [dev-dependencies]
 tempfile = "3"
 testutil = { path = "../testutil" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-core", "macros"] }
+tokio = { version = "0.2.22", features = ["rt-core", "macros"] }

src/rust/engine/fs/brfs/Cargo.toml

@@ -22,8 +22,7 @@ serverset = { path = "../../serverset" }
 store = { path = "../store" }
 task_executor = { path = "../../task_executor" }
 time = "0.1.39"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-threaded", "macros", "signal", "stream"] }
+tokio = { version = "0.2.22", features = ["rt-threaded", "macros", "signal", "stream"] }
 workunit_store = { path = "../../workunit_store" }
 
 [dev-dependencies]

src/rust/engine/fs/fs_util/Cargo.toml

@@ -22,6 +22,5 @@ serde_json = "1.0"
 serde_derive = "1.0"
 store = { path = "../store" }
 task_executor = { path = "../../task_executor" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-threaded", "macros"] }
+tokio = { version = "0.2.22", features = ["rt-threaded", "macros"] }
 workunit_store = { path = "../../workunit_store" }

src/rust/engine/fs/store/Cargo.toml

@@ -36,8 +36,7 @@ workunit_store = {path = "../../workunit_store" }
 maplit = "*"
 mock = { path = "../../testutil/mock" }
 testutil = { path = "../../testutil" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-core", "macros"] }
+tokio = { version = "0.2.22", features = ["rt-core", "macros"] }
 walkdir = "2"
 criterion = "0.3"
 

src/rust/engine/graph/Cargo.toml

@@ -12,11 +12,9 @@ futures = "0.3"
 log = "0.4"
 parking_lot = "0.11"
 petgraph = "0.4.5"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["time"] }
+tokio = { version = "0.2.22", features = ["time"] }
 
 [dev-dependencies]
 rand = "0.6"
 env_logger = "0.5.4"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["macros", "rt-threaded", "time"] }
+tokio = { version = "0.2.22", features = ["macros", "rt-threaded", "time"] }

src/rust/engine/logging/Cargo.toml

@@ -12,7 +12,7 @@ lazy_static = "1"
 log = "0.4"
 num_enum = "0.4"
 parking_lot = "0.11"
-tokio = { version = "=0.2.22", features = ["rt-util"] } # TODO: see https://github.com/pantsbuild/pants/issues/10291
+tokio = { version = "0.2.22", features = ["rt-util"] }
 uuid = { version = "0.7", features = ["v4"] }
 
 [build-dependencies]

src/rust/engine/nailgun/Cargo.toml

@@ -12,9 +12,7 @@ log = "0.4"
 nails = "0.6.0"
 os_pipe = "0.9"
 task_executor = { path = "../task_executor" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["tcp", "fs", "sync"] }
+tokio = { version = "0.2.22", features = ["tcp", "fs", "sync"] }
 
 [dev-dependencies]
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["dns", "rt-threaded", "macros"] }
+tokio = { version = "0.2.22", features = ["dns", "rt-threaded", "macros"] }

src/rust/engine/process_execution/Cargo.toml

@@ -30,8 +30,7 @@ store = { path = "../fs/store" }
 task_executor = { path = "../task_executor" }
 tempfile = "3"
 concrete_time = { path = "../concrete_time" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["process", "rt-threaded", "sync", "tcp", "time"] }
+tokio = { version = "0.2.22", features = ["process", "rt-threaded", "sync", "tcp", "time"] }
 tokio-util = { version = "0.2", features = ["codec"] }
 uname = "0.1.1"
 workunit_store = { path = "../workunit_store" }
@@ -51,5 +50,4 @@ parking_lot = "0.11"
 spectral = "0.6.0"
 tempfile = "3"
 testutil = { path = "../testutil" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["macros"] }
+tokio = { version = "0.2.22", features = ["macros"] }

src/rust/engine/process_executor/Cargo.toml

@@ -16,6 +16,5 @@ log = "0.4"
 process_execution = { path = "../process_execution" }
 store = { path = "../fs/store" }
 task_executor = { path = "../task_executor" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-threaded", "macros"] }
+tokio = { version = "0.2.22", features = ["rt-threaded", "macros"] }
 workunit_store = { path = "../workunit_store"}

src/rust/engine/serverset/Cargo.toml

@@ -8,11 +8,9 @@ publish = false
 [dependencies]
 futures = "0.3"
 parking_lot = "0.11"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["time"] }
+tokio = { version = "0.2.22", features = ["time"] }
 
 [dev-dependencies]
 maplit = "1"
 testutil = { path = "../testutil" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-core", "macros"] }
+tokio = { version = "0.2.22", features = ["rt-core", "macros"] }

src/rust/engine/task_executor/Cargo.toml

@@ -9,6 +9,5 @@ publish = false
 futures = "0.3"
 logging = { path = "../logging" }
 num_cpus = "1"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["blocking", "rt-threaded"] }
+tokio = { version = "0.2.22", features = ["blocking", "rt-threaded"] }
 workunit_store = { path = "../workunit_store" }

src/rust/engine/testutil/mock/Cargo.toml

@@ -16,5 +16,4 @@ hashing = { path = "../../hashing" }
 parking_lot = "0.11"
 protobuf = { version = "2.0.6", features = ["with-bytes"] }
 testutil = { path = ".." }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["time"] }
+tokio = { version = "0.2.22", features = ["time"] }

src/rust/engine/watch/Cargo.toml

@@ -20,5 +20,4 @@ task_executor = { path = "../task_executor" }
 [dev-dependencies]
 tempfile = "3"
 testutil = { path = "../testutil" }
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-core", "macros"] }
+tokio = { version = "0.2.22", features = ["rt-core", "macros"] }

src/rust/engine/workunit_store/Cargo.toml

@@ -10,7 +10,6 @@ concrete_time = { path = "../concrete_time" }
 hashing = { path = "../hashing" }
 parking_lot = "0.11"
 rand = "0.6"
-# TODO: See #10291.
-tokio = { version = "=0.2.22", features = ["rt-util"] }
+tokio = { version = "0.2.22", features = ["rt-util"] }
 petgraph = "0.4.5"
 log = "0.4"