Reduce top-level re-exports

Author: taiki-e

futures-core/src/lib.rs

@@ -20,14 +20,13 @@ compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feat
 extern crate alloc;
 
 pub mod future;
-#[doc(hidden)] pub use self::future::{Future, FusedFuture, TryFuture};
 
 pub mod stream;
-#[doc(hidden)] pub use self::stream::{Stream, FusedStream, TryStream};
 
 #[macro_use]
 pub mod task;
 
+// Not public API.
 #[doc(hidden)]
 pub mod core_reexport {
     #[doc(hidden)]

futures-util/src/compat/compat01as03.rs

@@ -8,7 +8,7 @@ use futures_01::{
 };
 #[cfg(feature = "sink")]
 use futures_01::{AsyncSink as AsyncSink01, Sink as Sink01};
-use futures_core::{task as task03, Future as Future03, Stream as Stream03};
+use futures_core::{task as task03, future::Future as Future03, stream::Stream as Stream03};
 use std::pin::Pin;
 use std::task::Context;
 #[cfg(feature = "sink")]

futures-util/src/compat/compat03as01.rs

@@ -8,8 +8,8 @@ use futures_01::{
 };
 use futures_core::{
     task::{RawWaker, RawWakerVTable},
-    TryFuture as TryFuture03,
-    TryStream as TryStream03,
+    future::TryFuture as TryFuture03,
+    stream::TryStream as TryStream03,
 };
 #[cfg(feature = "sink")]
 use futures_sink::Sink as Sink03;

futures-util/src/lib.rs

@@ -29,6 +29,7 @@ extern crate futures_core;
 pub use futures_core::ready;
 pub use pin_utils::pin_mut;
 
+// Not public API.
 #[cfg(feature = "std")]
 #[cfg(feature = "async-await")]
 #[macro_use]
@@ -39,6 +40,7 @@ pub mod async_await;
 #[doc(hidden)]
 pub use self::async_await::*;
 
+// Not public API.
 #[doc(hidden)]
 pub use futures_core::core_reexport;
 
@@ -105,7 +107,6 @@ pub mod sink;
 pub mod task;
 
 pub mod never;
-#[doc(hidden)] pub use crate::never::Never;
 
 #[cfg(feature = "compat")]
 pub mod compat;

futures/src/lib.rs

@@ -40,8 +40,6 @@ compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feat
 #[cfg(all(feature = "bilock", not(feature = "unstable")))]
 compile_error!("The `bilock` feature requires the `unstable` feature as an explicit opt-in to unstable features");
 
-#[doc(hidden)] pub use futures_core::core_reexport;
-
 #[doc(hidden)] pub use futures_core::future::Future;
 #[doc(hidden)] pub use futures_core::future::TryFuture;
 #[doc(hidden)] pub use futures_util::future::FutureExt;
@@ -60,8 +58,6 @@ compile_error!("The `bilock` feature requires the `unstable` feature as an expli
 #[cfg(feature = "std")]
 #[doc(hidden)] pub use futures_util::{AsyncReadExt, AsyncWriteExt, AsyncSeekExt, AsyncBufReadExt};
 
-#[doc(hidden)] pub use futures_util::never::Never;
-
 // Macro reexports
 pub use futures_core::ready; // Readiness propagation
 pub use futures_util::pin_mut;
@@ -522,11 +518,17 @@ pub mod never {
 
 // proc-macro re-export --------------------------------------
 
+// Not public API.
+#[doc(hidden)]
+pub use futures_core::core_reexport;
+
+// Not public API.
 #[cfg(feature = "std")]
 #[cfg(feature = "async-await")]
 #[doc(hidden)]
 pub use futures_util::async_await;
 
+// Not public API.
 #[cfg(feature = "std")]
 #[cfg(feature = "async-await")]
 #[doc(hidden)]