Skip to content

Commit 6e0905d

Browse files
yoshuawuytsStjepan Glavina
authored and
Stjepan Glavina
committed
correctly mark stream::Merge as unstable (#352)
Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
1 parent aaa1b6c commit 6e0905d

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

src/stream/interval.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ use futures_timer::Delay;
4343
/// #
4444
/// # Ok(()) }) }
4545
/// ```
46+
#[cfg(any(feature = "unstable", feature = "docs"))]
4647
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
4748
#[doc(inline)]
4849
pub fn interval(dur: Duration) -> Interval {

src/stream/stream/merge.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use futures_core::Stream;
88
/// This stream is returned by [`Stream::merge`].
99
///
1010
/// [`Stream::merge`]: trait.Stream.html#method.merge
11+
#[cfg(any(feature = "unstable", feature = "docs"))]
12+
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
1113
#[derive(Debug)]
1214
pub struct Merge<L, R> {
1315
left: L,

0 commit comments

Comments
 (0)