Skip to content

Commit b601bcf

Browse files
committed
polish
Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
1 parent 84a148d commit b601bcf

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/stream/stream/merge.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::task::{Context, Poll};
33

44
use futures_core::Stream;
55

6-
/// A stream merging two streams.
6+
/// A stream that merges two other streams into a single stream.
77
///
88
/// This stream is returned by [`Stream::merge`].
99
///
10-
/// [`Stream::merge`]:
10+
/// [`Stream::merge`]: trait.Stream.html#method.merge
1111
#[derive(Debug)]
1212
pub struct Merge<L, R> {
1313
left: L,

src/stream/stream/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ mod for_each;
3434
mod fuse;
3535
mod inspect;
3636
mod map;
37-
mod merge;
3837
mod min_by;
3938
mod next;
4039
mod nth;
@@ -88,6 +87,8 @@ cfg_if! {
8887

8988
cfg_if! {
9089
if #[cfg(any(feature = "unstable", feature = "docs"))] {
90+
mod merge;
91+
9192
use std::pin::Pin;
9293

9394
use crate::future::Future;

0 commit comments

Comments
 (0)