From 337646b97fc4583351ae47e4db13a5e51346afdc Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Sat, 3 Aug 2019 21:08:29 -0700
Subject: tokio: re-export future/stream utils (#1387)

---
 tokio/src/prelude.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tokio/src/prelude.rs')

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,
-- 
cgit v1.2.3