Skip to content

Commit

Permalink
tower: update tokio-util to v0.7 (#638)
Browse files Browse the repository at this point in the history
This PR updates `tokio-util` to v0.7.

It also updates the minimum `tokio` dependency to v1.6.0.
This is because `tokio-util` requires at least `tokio` v1.6.0 for
`mpsc::Sender::reserve_owned`, but it only specifies a minimum version
of v1.0.0. This is incorrect and should be considered an upstream bug,
but updating our tokio dep fixes this, so that should at least unbreak
`tower`'s build for now.

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
  • Loading branch information
hawkw committed Feb 11, 2022
1 parent db43c07 commit 386de64
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tower/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ hdrhistogram = { version = "7.0", optional = true }
indexmap = { version = "1.0.2", optional = true }
rand = { version = "0.8", features = ["small_rng"], optional = true }
slab = { version = "0.4", optional = true }
tokio = { version = "1", optional = true, features = ["sync"] }
tokio = { version = "1.6", optional = true, features = ["sync"] }
tokio-stream = { version = "0.1.0", optional = true }
tokio-util = { version = "0.6.3", default-features = false, optional = true }
tokio-util = { version = "0.7.0", default-features = false, optional = true }
tracing = { version = "0.1.2", default-features = false, features = ["std"], optional = true }
pin-project = { version = "1", optional = true }
pin-project-lite = { version = "0.2.7", optional = true }
Expand All @@ -85,7 +85,7 @@ pin-project-lite = { version = "0.2.7", optional = true }
futures = "0.3"
hdrhistogram = "7.0"
pin-project-lite = "0.2.7"
tokio = { version = "1", features = ["macros", "sync", "test-util", "rt-multi-thread"] }
tokio = { version = "1.6", features = ["macros", "sync", "test-util", "rt-multi-thread"] }
tokio-stream = "0.1"
tokio-test = "0.4"
tower-test = { version = "0.4", path = "../tower-test" }
Expand Down

0 comments on commit 386de64

Please sign in to comment.