Skip to content

Commit

Permalink
build(deps): update tokio-util to v0.7
Browse files Browse the repository at this point in the history
This branch updates `tokio-util` to v0.7.0.

The dependabot-generated PR for this update doesn't work, because this
is a breaking API change. The only update that was necessary here was
changing the use of `tokio_util::sync::PollSender` in
`linkerd-proxy-discover` to use the updated method names.

Closes #240
  • Loading branch information
hawkw committed Feb 11, 2022
1 parent 2ca9b28 commit bea527a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
26 changes: 20 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ dependencies = [
"indexmap",
"slab",
"tokio",
"tokio-util",
"tokio-util 0.6.9",
"tracing",
]

Expand Down Expand Up @@ -1169,7 +1169,7 @@ dependencies = [
"pin-project",
"tokio",
"tokio-test",
"tokio-util",
"tokio-util 0.7.0",
]

[[package]]
Expand Down Expand Up @@ -1304,7 +1304,7 @@ dependencies = [
"linkerd-stack",
"pin-project",
"tokio",
"tokio-util",
"tokio-util 0.6.9",
"tower",
"tracing",
]
Expand Down Expand Up @@ -2460,7 +2460,7 @@ dependencies = [
"futures-core",
"pin-project-lite",
"tokio",
"tokio-util",
"tokio-util 0.6.9",
]

[[package]]
Expand Down Expand Up @@ -2490,6 +2490,20 @@ dependencies = [
"tokio",
]

[[package]]
name = "tokio-util"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
"log",
"pin-project-lite",
"tokio",
]

[[package]]
name = "tonic"
version = "0.6.2"
Expand All @@ -2513,7 +2527,7 @@ dependencies = [
"prost-derive",
"tokio",
"tokio-stream",
"tokio-util",
"tokio-util 0.6.9",
"tower",
"tower-layer",
"tower-service",
Expand Down Expand Up @@ -2548,7 +2562,7 @@ dependencies = [
"slab",
"tokio",
"tokio-stream",
"tokio-util",
"tokio-util 0.6.9",
"tower-layer",
"tower-service",
"tracing",
Expand Down
2 changes: 1 addition & 1 deletion linkerd/io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bytes = "1"
linkerd-errno = { path = "../errno" }
tokio = { version = "1", features = ["io-util", "net"] }
tokio-test = { version = "0.4", optional = true }
tokio-util = { version = "0.6", features = ["io"] }
tokio-util = { version = "0.7", features = ["io"] }
pin-project = "1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/discover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ linkerd-error = { path = "../../error" }
linkerd-proxy-core = { path = "../core" }
linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["rt", "sync", "time"] }
tokio-util = "0.6.9"
tokio-util = "0.7"
tower = { version = "0.4.11", features = ["discover"] }
tracing = "0.1.30"
pin-project = "1"
Expand Down

0 comments on commit bea527a

Please sign in to comment.