From 1ad339a19eac5ffce133e34115a6993e9e7fca29 Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Tue, 10 Sep 2019 14:10:42 +0200 Subject: [PATCH] rebase on master Signed-off-by: Yoshua Wuyts --- src/future/mod.rs | 4 ---- src/task/mod.rs | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/future/mod.rs b/src/future/mod.rs index 67554f9..7d88b90 100644 --- a/src/future/mod.rs +++ b/src/future/mod.rs @@ -5,10 +5,6 @@ pub use std::future::Future; use cfg_if::cfg_if; -// Re-export the `ready!` definition from an external crate to expose it from -// this submodule. -pub use futures::ready; - pub use pending::pending; pub use poll_fn::poll_fn; pub use ready::ready; diff --git a/src/task/mod.rs b/src/task/mod.rs index eef7284..faab696 100644 --- a/src/task/mod.rs +++ b/src/task/mod.rs @@ -25,6 +25,10 @@ pub use std::task::{Context, Poll, Waker}; pub use block_on::block_on; +// Re-export the `ready!` definition from an external crate to expose it from +// this submodule. +pub use futures_core::ready; + pub use local::{AccessError, LocalKey}; pub use pool::{current, spawn, Builder}; pub use sleep::sleep;