From b601bcfcb870023f7fda353109fe8b50be81c718 Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Sun, 13 Oct 2019 21:55:19 +0200 Subject: [PATCH] polish Signed-off-by: Yoshua Wuyts --- src/stream/stream/merge.rs | 4 ++-- src/stream/stream/mod.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/stream/stream/merge.rs b/src/stream/stream/merge.rs index 6c213f2..5e7b226 100644 --- a/src/stream/stream/merge.rs +++ b/src/stream/stream/merge.rs @@ -3,11 +3,11 @@ use std::task::{Context, Poll}; use futures_core::Stream; -/// A stream merging two streams. +/// A stream that merges two other streams into a single stream. /// /// This stream is returned by [`Stream::merge`]. /// -/// [`Stream::merge`]: +/// [`Stream::merge`]: trait.Stream.html#method.merge #[derive(Debug)] pub struct Merge { left: L, diff --git a/src/stream/stream/mod.rs b/src/stream/stream/mod.rs index 22ceabb..cf0eea1 100644 --- a/src/stream/stream/mod.rs +++ b/src/stream/stream/mod.rs @@ -34,7 +34,6 @@ mod for_each; mod fuse; mod inspect; mod map; -mod merge; mod min_by; mod next; mod nth; @@ -88,6 +87,8 @@ cfg_if! { cfg_if! { if #[cfg(any(feature = "unstable", feature = "docs"))] { + mod merge; + use std::pin::Pin; use crate::future::Future;