From 393f733b3105001c6d2edc15fd2908697f70c0b7 Mon Sep 17 00:00:00 2001
From: Taylor Cramer <cramertj@google.com>
Date: Thu, 2 Aug 2018 10:11:46 -0700
Subject: [PATCH] Use $crate::core_reexport::future::Future rather than
 reexporting separately

---
 futures-util/src/async_await/join.rs   | 13 +++++++------
 futures-util/src/async_await/select.rs |  2 +-
 futures-util/src/future/mod.rs         |  2 +-
 futures-util/src/sink/mod.rs           |  2 +-
 futures-util/src/stream/mod.rs         |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/futures-util/src/async_await/join.rs b/futures-util/src/async_await/join.rs
index 45c9a7f52f..06883d6991 100644
--- a/futures-util/src/async_await/join.rs
+++ b/futures-util/src/async_await/join.rs
@@ -31,7 +31,7 @@ macro_rules! join {
         await!($crate::future::poll_fn(move |cx| {
             let mut all_done = true;
             $(
-                if $crate::future::Future::poll($fut.reborrow(), cx).is_pending() {
+                if $crate::core_reexport::future::Future::poll($fut.reborrow(), cx).is_pending() {
                     all_done = false;
                 }
             )*
@@ -96,7 +96,7 @@ macro_rules! try_join {
         let res: $crate::core_reexport::result::Result<_, _> = await!($crate::future::poll_fn(move |cx| {
             let mut all_done = true;
             $(
-                if $crate::future::Future::poll($fut.reborrow(), cx).is_pending() {
+                if $crate::core_reexport::future::Future::poll($fut.reborrow(), cx).is_pending() {
                     all_done = false;
                 } else if $fut.reborrow().output_mut().unwrap().is_err() {
                     // `.err().unwrap()` rather than `.unwrap_err()` so that we don't introduce
@@ -111,10 +111,11 @@ macro_rules! try_join {
             if all_done {
                 $crate::core_reexport::task::Poll::Ready(
                     $crate::core_reexport::result::Result::Ok(($(
-                    // `.ok().unwrap()` rather than `.unwrap()` so that we don't introduce
-                    // an `E: Debug` bound.
-                    $fut.reborrow().take_output().unwrap().ok().unwrap(),
-                )*)))
+                        // `.ok().unwrap()` rather than `.unwrap()` so that we don't introduce
+                        // an `E: Debug` bound.
+                        $fut.reborrow().take_output().unwrap().ok().unwrap(),
+                    )*))
+                )
             } else {
                 $crate::core_reexport::task::Poll::Pending
             }
diff --git a/futures-util/src/async_await/select.rs b/futures-util/src/async_await/select.rs
index 85fb617b87..8b84d2fd5d 100644
--- a/futures-util/src/async_await/select.rs
+++ b/futures-util/src/async_await/select.rs
@@ -49,7 +49,7 @@ macro_rules! select {
 
         let __priv_res = await!($crate::future::poll_fn(|cx| {
             $(
-                match $crate::future::Future::poll(
+                match $crate::core_reexport::future::Future::poll(
                     $crate::core_reexport::mem::PinMut::new(&mut $name), cx)
                 {
                     $crate::core_reexport::task::Poll::Ready(x) =>
diff --git a/futures-util/src/future/mod.rs b/futures-util/src/future/mod.rs
index a0afe5968a..6ef478c9e7 100644
--- a/futures-util/src/future/mod.rs
+++ b/futures-util/src/future/mod.rs
@@ -5,7 +5,7 @@
 
 use core::marker::Unpin;
 use core::mem::PinMut;
-pub use futures_core::future::Future;
+use futures_core::future::Future;
 use futures_core::stream::Stream;
 use futures_core::task::{self, Poll, Executor};
 
diff --git a/futures-util/src/sink/mod.rs b/futures-util/src/sink/mod.rs
index 18c7a04dc8..965cbf4080 100644
--- a/futures-util/src/sink/mod.rs
+++ b/futures-util/src/sink/mod.rs
@@ -7,7 +7,7 @@ use core::marker::Unpin;
 use either::Either;
 use futures_core::future::Future;
 use futures_core::stream::Stream;
-pub use futures_sink::Sink;
+use futures_sink::Sink;
 
 mod close;
 pub use self::close::Close;
diff --git a/futures-util/src/stream/mod.rs b/futures-util/src/stream/mod.rs
index ebc169c490..83f0c414b9 100644
--- a/futures-util/src/stream/mod.rs
+++ b/futures-util/src/stream/mod.rs
@@ -7,7 +7,7 @@ use core::marker::Unpin;
 use core::mem::PinMut;
 use either::Either;
 use futures_core::future::Future;
-pub use futures_core::stream::Stream;
+use futures_core::stream::Stream;
 use futures_core::task::{self, Poll};
 use futures_sink::Sink;