summaryrefslogtreecommitdiffstats
path: root/tokio/src/prelude.rs
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2019-08-03 21:08:29 -0700
committerGitHub <noreply@github.com>2019-08-03 21:08:29 -0700
commit337646b97fc4583351ae47e4db13a5e51346afdc (patch)
tree96884c5abed67293e0e55e104750467a3055e0a6 /tokio/src/prelude.rs
parent0bb015588a28a2f7cfd505d611975bfb2123d044 (diff)
tokio: re-export future/stream utils (#1387)
Diffstat (limited to 'tokio/src/prelude.rs')
-rw-r--r--tokio/src/prelude.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/tokio/src/prelude.rs b/tokio/src/prelude.rs
index 48b1e790..1593294d 100644
--- a/tokio/src/prelude.rs
+++ b/tokio/src/prelude.rs
@@ -10,9 +10,13 @@
//!
//! The prelude may grow over time as additional items see ubiquitous use.
-pub use crate::util::FutureExt;
+pub use crate::future::FutureExt as _;
+pub use futures_util::future::FutureExt as _;
pub use std::future::Future;
+pub use crate::stream::{Stream, StreamExt as _};
+pub use futures_util::stream::StreamExt as _;
+
#[cfg(feature = "io")]
pub use tokio_io::{
AsyncBufRead, AsyncBufReadExt as _, AsyncRead, AsyncReadExt as _, AsyncWrite,