From 1c70420c5a1346d2162155ad0782bf86786b4767 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Fri, 11 Mar 2022 12:24:15 +1100
Subject: [PATCH] Move the base trait re-export outside of `extension_trait`.

---
 src/future/future/mod.rs | 2 ++
 src/io/buf_read/mod.rs   | 2 ++
 src/io/read/mod.rs       | 2 ++
 src/io/seek/mod.rs       | 2 ++
 src/io/write/mod.rs      | 2 ++
 src/stream/stream/mod.rs | 2 ++
 src/utils.rs             | 3 ---
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/future/future/mod.rs b/src/future/future/mod.rs
index 05d099b05..d6c4d7e0f 100644
--- a/src/future/future/mod.rs
+++ b/src/future/future/mod.rs
@@ -20,6 +20,8 @@ cfg_unstable_default! {
     use crate::future::timeout::TimeoutFuture;
 }
 
+pub use core::future::Future as Future;
+
 extension_trait! {
     pub trait Future {}
 
diff --git a/src/io/buf_read/mod.rs b/src/io/buf_read/mod.rs
index 1314dc9f9..829171568 100644
--- a/src/io/buf_read/mod.rs
+++ b/src/io/buf_read/mod.rs
@@ -15,6 +15,8 @@ use std::pin::Pin;
 use crate::io;
 use crate::task::{Context, Poll};
 
+pub use futures_io::AsyncBufRead as BufRead;
+
 extension_trait! {
     pub trait BufRead {}
 
diff --git a/src/io/read/mod.rs b/src/io/read/mod.rs
index 9b5b9644e..b8855886c 100644
--- a/src/io/read/mod.rs
+++ b/src/io/read/mod.rs
@@ -21,6 +21,8 @@ pub use bytes::Bytes;
 pub use chain::Chain;
 pub use take::Take;
 
+pub use futures_io::AsyncRead as Read;
+
 extension_trait! {
     pub trait Read {}
 
diff --git a/src/io/seek/mod.rs b/src/io/seek/mod.rs
index 33ba25e3c..cafbfe626 100644
--- a/src/io/seek/mod.rs
+++ b/src/io/seek/mod.rs
@@ -4,6 +4,8 @@ use seek::SeekFuture;
 
 use crate::io::SeekFrom;
 
+pub use futures_io::AsyncSeek as Seek;
+
 extension_trait! {
     pub trait Seek {}
 
diff --git a/src/io/write/mod.rs b/src/io/write/mod.rs
index 3463d282d..6e9a574f5 100644
--- a/src/io/write/mod.rs
+++ b/src/io/write/mod.rs
@@ -12,6 +12,8 @@ use write_vectored::WriteVectoredFuture;
 
 use crate::io::{self, IoSlice};
 
+pub use futures_io::AsyncWrite as Write;
+
 extension_trait! {
     pub trait Write {}
 
diff --git a/src/stream/stream/mod.rs b/src/stream/stream/mod.rs
index 279a83699..48fdbb22f 100644
--- a/src/stream/stream/mod.rs
+++ b/src/stream/stream/mod.rs
@@ -143,6 +143,8 @@ cfg_unstable! {
     mod unzip;
 }
 
+pub use futures_core::stream::Stream as Stream;
+
 extension_trait! {
     pub trait Stream {}
 
diff --git a/src/utils.rs b/src/utils.rs
index 51b2fb0c7..d662e17f4 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -257,9 +257,6 @@ macro_rules! extension_trait {
             $($body_ext:tt)*
         }
     ) => {
-        // Re-export the base trait from the futures crate.
-        pub use $base as $name;
-
         // The extension trait that adds methods to any type implementing the base trait.
         #[doc = $doc_ext]
         pub trait $ext: $name {