rebase on master

Signed-off-by: Yoshua Wuyts <[email protected]>

Author: yoshuawuyts

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;

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;