File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -3,11 +3,11 @@ use std::task::{Context, Poll};
3
3
4
4
use futures_core:: Stream ;
5
5
6
- /// A stream merging two streams.
6
+ /// A stream that merges two other streams into a single stream .
7
7
///
8
8
/// This stream is returned by [`Stream::merge`].
9
9
///
10
- /// [`Stream::merge`]:
10
+ /// [`Stream::merge`]: trait.Stream.html#method.merge
11
11
#[ derive( Debug ) ]
12
12
pub struct Merge < L , R > {
13
13
left : L ,
Original file line number Diff line number Diff line change @@ -34,7 +34,6 @@ mod for_each;
34
34
mod fuse;
35
35
mod inspect;
36
36
mod map;
37
- mod merge;
38
37
mod min_by;
39
38
mod next;
40
39
mod nth;
@@ -88,6 +87,8 @@ cfg_if! {
88
87
89
88
cfg_if ! {
90
89
if #[ cfg( any( feature = "unstable" , feature = "docs" ) ) ] {
90
+ mod merge;
91
+
91
92
use std:: pin:: Pin ;
92
93
93
94
use crate :: future:: Future ;
You can’t perform that action at this time.
0 commit comments