summaryrefslogtreecommitdiffstats
path: root/tokio/src/prelude.rs
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2019-06-24 12:34:30 -0700
committerGitHub <noreply@github.com>2019-06-24 12:34:30 -0700
commit06c473e62842d257ed275497ce906710ea3f8e19 (patch)
tree4ca6d337a892aa23266a761b35dc61e988e57954 /tokio/src/prelude.rs
parentaa99950b9c983b842bd2107bb771c277d09d495d (diff)
Update Tokio to use `std::future`. (#1120)
A first pass at updating Tokio to use `std::future`. Implementations of `Future` from the futures crate are updated to implement `Future` from std. Implementations of `Stream` are moved to a feature flag. This commits disables a number of crates that have not yet been updated.
Diffstat (limited to 'tokio/src/prelude.rs')
-rw-r--r--tokio/src/prelude.rs13
1 files changed, 3 insertions, 10 deletions
diff --git a/tokio/src/prelude.rs b/tokio/src/prelude.rs
index e364e8bf..000a680c 100644
--- a/tokio/src/prelude.rs
+++ b/tokio/src/prelude.rs
@@ -10,15 +10,8 @@
//!
//! The prelude may grow over time as additional items see ubiquitous use.
-pub use crate::util::{FutureExt, StreamExt};
-pub use futures::{future, stream, task, Async, AsyncSink, Future, IntoFuture, Poll, Sink, Stream};
-pub use std::io::{Read, Write};
-#[cfg(feature = "async-await-preview")]
-#[doc(inline)]
-pub use tokio_futures::{
- io::{AsyncReadExt, AsyncWriteExt},
- sink::SinkExt,
- stream::StreamExt as StreamAsyncExt,
-};
+pub use std::future::Future;
+pub use std::task::{self, Poll};
+//pub use crate::util::{FutureExt, StreamExt};
#[cfg(feature = "io")]
pub use tokio_io::{AsyncRead, AsyncWrite};