Skip to content

Commit b345084

Browse files
authored
chore(deps): un-patch tokio (console-rs#51)
now that Tokio 1.7 (including waker instrumentation) has been published, we can remove the patch. Signed-off-by: Eliza Weisman <eliza@buoyant.io>
1 parent 20b08be commit b345084

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

Cargo.toml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,4 @@ members = [
44
"console-subscriber",
55
"console-api"
66
]
7-
resolver = "2"
8-
9-
# Patch the dependency on tokio to get waker instrumentation while developing.
10-
# This can be un-patched when the following commits are released:
11-
# - https://github.com/tokio-rs/tokio/commit/e7d74b3119178b9b86f7b547774b6b121de2239a
12-
# - https://github.com/tokio-rs/tokio/commit/f55b77aaddaed8e48a8c0d81c66da82f12433087
13-
[patch.crates-io.tokio]
14-
git = "https://github.com/tokio-rs/tokio"
15-
rev = "f55b77aaddaed8e48a8c0d81c66da82f12433087"
16-
features = ["full", "rt-multi-thread"]
7+
resolver = "2"

console-subscriber/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2018"
88

99
[dependencies]
1010

11-
tokio = { version = "^1.5", features = ["sync", "time", "macros", "tracing"]}
11+
tokio = { version = "^1.7", features = ["sync", "time", "macros", "tracing"]}
1212
tokio-stream = "0.1"
1313
tonic = { version = "0.4", features = ["transport"] }
1414
console-api = { path = "../console-api", features = ["transport"]}
@@ -19,8 +19,7 @@ futures = { version = "0.3", default-features = false }
1919

2020
[dev-dependencies]
2121

22-
tokio = { version = "^1.5", features = ["full", "rt-multi-thread"]}
22+
tokio = { version = "^1.7", features = ["full", "rt-multi-thread"]}
2323
futures = "0.3"
2424

2525
tracing-subscriber = { version = "0.2.17", features = ["fmt", "registry", "env-filter"] }
26-

0 commit comments

Comments
 (0)