eater/async-std
1
0
Fork 0
forked from mirror/async-std
Code Issues Pull requests Releases Wiki Activity

rebase on master

Browse source 
Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
This commit is contained in:
Yoshua Wuyts 2019-09-10 14:10:42 +02:00
parent 4b535d4ada
commit 1ad339a19e
No known key found for this signature in database
GPG key ID: 24EA8164F96777ED
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/future/mod.rs
View file

@ -5,10 +5,6 @@ pub use std::future::Future;
use cfg_if::cfg_if; 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 pending::pending;
pub use poll_fn::poll_fn; pub use poll_fn::poll_fn;
pub use ready::ready; pub use ready::ready;

4
src/task/mod.rs
View file

@ -25,6 +25,10 @@
pub use std::task::{Context, Poll, Waker}; pub use std::task::{Context, Poll, Waker};
pub use block_on::block_on; 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 local::{AccessError, LocalKey};
pub use pool::{current, spawn, Builder}; pub use pool::{current, spawn, Builder};
pub use sleep::sleep; pub use sleep::sleep;