itsscb/tower
1
0
Fork 0
mirror of https://github.com/tower-rs/tower.git synced 2025-10-02 15:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

spawn_ready: put back poll_closed (#481)

Browse Source 
Tokio put this method back in 0.3.2, so we can use it again.

Closes #478
This commit is contained in:
Eliza Weisman 2020-10-28 12:15:56 -07:00 committed by GitHub
parent 43c44922af
commit 450fa3d2be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tower/Cargo.toml
View File

@ -55,13 +55,13 @@ hdrhistogram = { version = "6.0", optional = true }
indexmap = { version = "1.0.2", optional = true } indexmap = { version = "1.0.2", optional = true }
rand = { version = "0.7", features = ["small_rng"], optional = true } rand = { version = "0.7", features = ["small_rng"], optional = true }
slab = { version = "0.4", optional = true } slab = { version = "0.4", optional = true }
tokio = { version = "0.3", optional = true, features = ["sync"] } tokio = { version = "0.3.2", optional = true, features = ["sync"] }
[dev-dependencies] [dev-dependencies]
futures-util = { version = "0.3", default-features = false, features = ["alloc", "async-await"] } futures-util = { version = "0.3", default-features = false, features = ["alloc", "async-await"] }
hdrhistogram = "6.0" hdrhistogram = "6.0"
quickcheck = { version = "0.9", default-features = false } quickcheck = { version = "0.9", default-features = false }
tokio = { version = "0.3", features = ["macros", "stream", "sync", "test-util", "rt-multi-thread"] } tokio = { version = "0.3.2", features = ["macros", "stream", "sync", "test-util", "rt-multi-thread"] }
tokio-test = "0.3" tokio-test = "0.3"
tower-test = { version = "0.4", path = "../tower-test" } tower-test = { version = "0.4", path = "../tower-test" }
tracing-subscriber = "0.2.14" tracing-subscriber = "0.2.14"

9
tower/src/spawn_ready/future.rs
View File

@ -53,14 +53,7 @@ where
// Note that we must actually poll the sender's closed future here, // Note that we must actually poll the sender's closed future here,
// rather than just calling `is_closed` on it, since we want to be // rather than just calling `is_closed` on it, since we want to be
// notified if the receiver is dropped. // notified if the receiver is dropped.
let closed = { if let Poll::Ready(_) = this.tx.as_mut().expect("illegal state").poll_closed(cx) {
// TODO(eliza): once `tokio` 0.3.2 is released, we can change this back
// to just using `Sender::poll_closed`, which is being re-added.
let closed = this.tx.as_mut().expect("illegal state").closed();
tokio::pin!(closed);
closed.poll(cx)
};
if let Poll::Ready(_) = closed {
return Poll::Ready(()); return Poll::Ready(());
} }