summaryrefslogtreecommitdiffstats
path: root/tokio
diff options
context:
space:
mode:
authorTaiki Endo <te316e89@gmail.com>2019-08-11 06:09:28 +0900
committerCarl Lerche <me@carllerche.com>2019-08-10 14:09:28 -0700
commit930cce86771d318c640a16483b8b27d48844a8d7 (patch)
tree4df45dc6e062a955b14fe886516dd0d3c6d09b20 /tokio
parent6a125082e48c6e2334d64e4ebc5b6a988cf27b3f (diff)
chore: update futures-preview to 0.3.0-alpha.18 (#1427)
Diffstat (limited to 'tokio')
-rw-r--r--tokio/Cargo.toml10
-rw-r--r--tokio/tests/reactor.rs4
2 files changed, 7 insertions, 7 deletions
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index fe22855e..e576802d 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -58,9 +58,9 @@ udp = ["tokio-udp"]
uds = ["tokio-uds"]
[dependencies]
-futures-core-preview = "=0.3.0-alpha.17"
-futures-sink-preview = "=0.3.0-alpha.17"
-futures-util-preview = { version = "=0.3.0-alpha.17", features = ["sink"] }
+futures-core-preview = "=0.3.0-alpha.18"
+futures-sink-preview = "=0.3.0-alpha.18"
+futures-util-preview = { version = "=0.3.0-alpha.18", features = ["sink"] }
# Everything else is optional...
bytes = { version = "0.4", optional = true }
@@ -85,8 +85,8 @@ tokio-uds = { version = "=0.3.0-alpha.1", optional = true, path = "../tokio-uds"
[dev-dependencies]
tokio-test = { version = "=0.2.0-alpha.1", path = "../tokio-test" }
-futures-preview = "=0.3.0-alpha.17"
-futures-util-preview = "=0.3.0-alpha.17"
+futures-preview = "=0.3.0-alpha.18"
+futures-util-preview = "=0.3.0-alpha.18"
pin-utils = "=0.1.0-alpha.4"
env_logger = { version = "0.6", default-features = false }
flate2 = { version = "1", features = ["tokio"] }
diff --git a/tokio/tests/reactor.rs b/tokio/tests/reactor.rs
index 43c82c37..95159fc1 100644
--- a/tokio/tests/reactor.rs
+++ b/tokio/tests/reactor.rs
@@ -6,7 +6,7 @@ use tokio_reactor::Reactor;
use tokio_tcp::TcpListener;
use tokio_test::{assert_ok, assert_pending};
-use futures_util::task::ArcWake;
+use futures_util::task::{waker_ref, ArcWake};
use std::future::Future;
use std::net::TcpStream;
use std::pin::Pin;
@@ -67,7 +67,7 @@ fn test_drop_on_notify() {
let _enter = tokio_executor::enter().unwrap();
tokio_reactor::with_default(&reactor.handle(), || {
- let waker = task.clone().into_waker();
+ let waker = waker_ref(&task);
let mut cx = Context::from_waker(&waker);
assert_pending!(task.future.lock().unwrap().as_mut().poll(&mut cx));
});