From 930cce86771d318c640a16483b8b27d48844a8d7 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sun, 11 Aug 2019 06:09:28 +0900 Subject: [PATCH] chore: update futures-preview to 0.3.0-alpha.18 (#1427) --- tokio-codec/Cargo.toml | 6 +++--- tokio-executor/Cargo.toml | 2 +- tokio-fs/Cargo.toml | 4 ++-- tokio-io/Cargo.toml | 4 ++-- tokio-process/Cargo.toml | 4 ++-- tokio-reactor/Cargo.toml | 2 +- tokio-signal/Cargo.toml | 4 ++-- tokio-sync/Cargo.toml | 8 ++++---- tokio-tcp/Cargo.toml | 4 ++-- tokio-test/Cargo.toml | 4 ++-- tokio-threadpool/Cargo.toml | 4 ++-- tokio-threadpool/src/task/mod.rs | 4 ++-- tokio-timer/Cargo.toml | 4 ++-- tokio-tls/Cargo.toml | 2 +- tokio-udp/Cargo.toml | 4 ++-- tokio-uds/Cargo.toml | 6 +++--- tokio/Cargo.toml | 10 +++++----- tokio/tests/reactor.rs | 4 ++-- 18 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tokio-codec/Cargo.toml b/tokio-codec/Cargo.toml index b5cfc7cd9..98c96a38a 100644 --- a/tokio-codec/Cargo.toml +++ b/tokio-codec/Cargo.toml @@ -23,12 +23,12 @@ categories = ["asynchronous"] tokio-io = { version = "=0.2.0-alpha.1", path = "../tokio-io" } bytes = "0.4.7" -futures-core-preview = "=0.3.0-alpha.17" -futures-sink-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-sink-preview = "=0.3.0-alpha.18" log = "0.4" [dev-dependencies] tokio = { version = "=0.2.0-alpha.1", path = "../tokio" } tokio-test = { version = "=0.2.0-alpha.1", path = "../tokio-test" } -futures-util-preview = "=0.3.0-alpha.17" +futures-util-preview = "=0.3.0-alpha.18" diff --git a/tokio-executor/Cargo.toml b/tokio-executor/Cargo.toml index 24d71f91a..5c9ad4077 100644 --- a/tokio-executor/Cargo.toml +++ b/tokio-executor/Cargo.toml @@ -25,4 +25,4 @@ categories = ["concurrency", "asynchronous"] [dev-dependencies] tokio = { version = "=0.2.0-alpha.1", path = "../tokio" } -futures-core-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" diff --git a/tokio-fs/Cargo.toml b/tokio-fs/Cargo.toml index 24aaffffb..91cd1058d 100644 --- a/tokio-fs/Cargo.toml +++ b/tokio-fs/Cargo.toml @@ -25,8 +25,8 @@ categories = ["asynchronous", "network-programming", "filesystem"] tokio-io = { version = "=0.2.0-alpha.1", features = ["util"], path = "../tokio-io" } tokio-threadpool = { version = "=0.2.0-alpha.1", path = "../tokio-threadpool" } -futures-core-preview = "=0.3.0-alpha.17" -futures-util-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-util-preview = "=0.3.0-alpha.18" [dev-dependencies] tokio = { version = "=0.2.0-alpha.1", path = "../tokio" } diff --git a/tokio-io/Cargo.toml b/tokio-io/Cargo.toml index 5033ce743..8a350a906 100644 --- a/tokio-io/Cargo.toml +++ b/tokio-io/Cargo.toml @@ -25,11 +25,11 @@ util = ["memchr"] [dependencies] bytes = "0.4.7" log = "0.4" -futures-core-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" memchr = { version = "2.2", optional = true } [dev-dependencies] tokio = { version = "=0.2.0-alpha.1", path = "../tokio" } tokio-test = { version = "=0.2.0-alpha.1", path = "../tokio-test" } -futures-util-preview = "=0.3.0-alpha.17" +futures-util-preview = "=0.3.0-alpha.18" diff --git a/tokio-process/Cargo.toml b/tokio-process/Cargo.toml index 86103d9e6..14ec1e7ce 100644 --- a/tokio-process/Cargo.toml +++ b/tokio-process/Cargo.toml @@ -20,8 +20,8 @@ An implementation of an asynchronous process management backed futures. categories = ["asynchronous"] [dependencies] -futures-core-preview = "=0.3.0-alpha.17" -futures-util-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-util-preview = "=0.3.0-alpha.18" log = "0.4" tokio-io = { version = "=0.2.0-alpha.1", path = "../tokio-io", features = ["util"] } tokio-reactor = { version = "=0.2.0-alpha.1", path = "../tokio-reactor" } diff --git a/tokio-reactor/Cargo.toml b/tokio-reactor/Cargo.toml index 21e73ab19..28431b58a 100644 --- a/tokio-reactor/Cargo.toml +++ b/tokio-reactor/Cargo.toml @@ -31,7 +31,7 @@ slab = "0.4.0" tokio-executor = { version = "=0.2.0-alpha.1", path = "../tokio-executor" } tokio-io = { version = "=0.2.0-alpha.1", path = "../tokio-io" } tokio-sync = { version = "=0.2.0-alpha.1", path = "../tokio-sync" } -futures-core-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" [dev-dependencies] num_cpus = "1.8.0" diff --git a/tokio-signal/Cargo.toml b/tokio-signal/Cargo.toml index 984e37e7d..0c0633f41 100644 --- a/tokio-signal/Cargo.toml +++ b/tokio-signal/Cargo.toml @@ -20,8 +20,8 @@ An implementation of an asynchronous Unix signal handling backed futures. categories = ["asynchronous"] [dependencies] -futures-core-preview = "=0.3.0-alpha.17" -futures-util-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-util-preview = "=0.3.0-alpha.18" lazy_static = "1" tokio-reactor = { version = "=0.2.0-alpha.1", path = "../tokio-reactor" } tokio-executor = { version = "=0.2.0-alpha.1", path = "../tokio-executor" } diff --git a/tokio-sync/Cargo.toml b/tokio-sync/Cargo.toml index b29e2a025..0c0597eb9 100644 --- a/tokio-sync/Cargo.toml +++ b/tokio-sync/Cargo.toml @@ -24,13 +24,13 @@ async-traits = ["futures-sink-preview"] [dependencies] fnv = "1.0.6" -futures-core-preview = { version = "=0.3.0-alpha.17" } -futures-sink-preview = { version = "=0.3.0-alpha.17", optional = true } -futures-util-preview = { version = "=0.3.0-alpha.17" } +futures-core-preview = { version = "=0.3.0-alpha.18" } +futures-sink-preview = { version = "=0.3.0-alpha.18", optional = true } +futures-util-preview = { version = "=0.3.0-alpha.18" } [dev-dependencies] tokio = { version = "=0.2.0-alpha.1", path = "../tokio" } tokio-test = { version = "=0.2.0-alpha.1", path = "../tokio-test" } env_logger = { version = "0.6", default-features = false } -loom = { version = "0.2.0", features = ["futures"] } +loom = { version = "0.2.1", features = ["futures"] } diff --git a/tokio-tcp/Cargo.toml b/tokio-tcp/Cargo.toml index 9a7d65936..af7d9e965 100644 --- a/tokio-tcp/Cargo.toml +++ b/tokio-tcp/Cargo.toml @@ -26,8 +26,8 @@ async-traits = [] tokio-io = { version = "=0.2.0-alpha.1", path = "../tokio-io" } tokio-reactor = { version = "=0.2.0-alpha.1", path = "../tokio-reactor" } -futures-core-preview = "=0.3.0-alpha.17" -futures-util-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-util-preview = "=0.3.0-alpha.18" bytes = "0.4" mio = "0.6.14" iovec = "0.1" diff --git a/tokio-test/Cargo.toml b/tokio-test/Cargo.toml index fb9bb92f7..28d394c40 100644 --- a/tokio-test/Cargo.toml +++ b/tokio-test/Cargo.toml @@ -25,10 +25,10 @@ tokio-io = { version = "=0.2.0-alpha.1", path = "../tokio-io" } tokio-sync = { version = "=0.2.0-alpha.1", path = "../tokio-sync" } tokio-timer = { version = "=0.3.0-alpha.1", path = "../tokio-timer" } -futures-core-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" pin-convert = "0.1.0" [dev-dependencies] tokio = { version = "=0.2.0-alpha.1", path = "../tokio" } -futures-util-preview = "=0.3.0-alpha.17" +futures-util-preview = "=0.3.0-alpha.18" diff --git a/tokio-threadpool/Cargo.toml b/tokio-threadpool/Cargo.toml index 9af101016..740fc30e0 100644 --- a/tokio-threadpool/Cargo.toml +++ b/tokio-threadpool/Cargo.toml @@ -24,8 +24,8 @@ categories = ["concurrency", "asynchronous"] [dependencies] tokio-executor = { version = "=0.2.0-alpha.1", path = "../tokio-executor" } tokio-sync = { version = "=0.2.0-alpha.1", path = "../tokio-sync" } -futures-core-preview = "=0.3.0-alpha.17" -futures-util-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-util-preview = "=0.3.0-alpha.18" crossbeam-deque = "0.7.0" crossbeam-queue = "0.1.0" diff --git a/tokio-threadpool/src/task/mod.rs b/tokio-threadpool/src/task/mod.rs index 480152bbe..2b7d5bff9 100644 --- a/tokio-threadpool/src/task/mod.rs +++ b/tokio-threadpool/src/task/mod.rs @@ -8,7 +8,7 @@ use self::state::State; use crate::pool::Pool; use crate::waker::Waker; -use futures_util::task::ArcWake; +use futures_util::task; use log::trace; use std::cell::{Cell, UnsafeCell}; use std::future::Future; @@ -135,7 +135,7 @@ impl Task { let mut g = Guard(fut, true); - let waker = ArcWake::into_waker(Arc::new(Waker { + let waker = task::waker(Arc::new(Waker { task: me.clone(), pool: pool.clone(), })); diff --git a/tokio-timer/Cargo.toml b/tokio-timer/Cargo.toml index e18ec6830..55f7e3658 100644 --- a/tokio-timer/Cargo.toml +++ b/tokio-timer/Cargo.toml @@ -27,8 +27,8 @@ async-traits = [] tokio-executor = { version = "=0.2.0-alpha.1", path = "../tokio-executor" } tokio-sync = { version = "=0.2.0-alpha.1", path = "../tokio-sync" } -futures-core-preview = "=0.3.0-alpha.17" -futures-util-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-util-preview = "=0.3.0-alpha.18" crossbeam-utils = "0.6.0" # Backs `DelayQueue` diff --git a/tokio-tls/Cargo.toml b/tokio-tls/Cargo.toml index c9c789771..4ce76eec6 100644 --- a/tokio-tls/Cargo.toml +++ b/tokio-tls/Cargo.toml @@ -34,7 +34,7 @@ tokio-tcp = { version = "=0.2.0-alpha.1", path = "../tokio-tcp", features = ["as cfg-if = "0.1" env_logger = { version = "0.6", default-features = false } -futures-preview = { version = "=0.3.0-alpha.17", features = ["async-await", "nightly"] } +futures-preview = { version = "=0.3.0-alpha.18", features = ["async-await", "nightly"] } [target.'cfg(all(not(target_os = "macos"), not(windows), not(target_os = "ios")))'.dev-dependencies] openssl = "0.10" diff --git a/tokio-udp/Cargo.toml b/tokio-udp/Cargo.toml index ad9d9afbf..b33b3c000 100644 --- a/tokio-udp/Cargo.toml +++ b/tokio-udp/Cargo.toml @@ -24,8 +24,8 @@ tokio-reactor = { version = "=0.2.0-alpha.1", path = "../tokio-reactor" } mio = "0.6.14" log = "0.4" -futures-core-preview = "=0.3.0-alpha.17" -futures-util-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-util-preview = "=0.3.0-alpha.18" [dev-dependencies] tokio = { version = "=0.2.0-alpha.1", path = "../tokio", default-features = false, features = ["rt-full"] } diff --git a/tokio-uds/Cargo.toml b/tokio-uds/Cargo.toml index 47db88556..96851226d 100644 --- a/tokio-uds/Cargo.toml +++ b/tokio-uds/Cargo.toml @@ -30,8 +30,8 @@ tokio-io = { version = "=0.2.0-alpha.1", path = "../tokio-io" } bytes = "0.4.8" mio = "0.6.14" mio-uds = "0.6.5" -futures-core-preview = "=0.3.0-alpha.17" -futures-util-preview = "=0.3.0-alpha.17" +futures-core-preview = "=0.3.0-alpha.18" +futures-util-preview = "=0.3.0-alpha.18" iovec = "0.1.2" libc = "0.2.42" log = "0.4.2" @@ -40,4 +40,4 @@ log = "0.4.2" tokio = { version = "=0.2.0-alpha.1", path = "../tokio" } tempfile = "3" -futures-preview = "=0.3.0-alpha.17" +futures-preview = "=0.3.0-alpha.18" diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index fe22855ed..e576802d9 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 43c82c376..95159fc12 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)); });