Move the base trait re-export outside of extension_trait.

Author: nnethercote

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 {}
 

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 {}
 

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 {}
 

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 {}
 

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 {}
 

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 {}
 

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 {