From 6e0905d3caf10848cf3bab90485c5df9579907f2 Mon Sep 17 00:00:00 2001
From: Yoshua Wuyts <yoshuawuyts+github@gmail.com>
Date: Wed, 16 Oct 2019 14:13:35 +0200
Subject: [PATCH] correctly mark stream::Merge as unstable (#352)

Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
---
 src/stream/interval.rs     | 1 +
 src/stream/stream/merge.rs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/stream/interval.rs b/src/stream/interval.rs
index 271cd81..21ac032 100644
--- a/src/stream/interval.rs
+++ b/src/stream/interval.rs
@@ -43,6 +43,7 @@ use futures_timer::Delay;
 /// #
 /// # Ok(()) }) }
 /// ```
+#[cfg(any(feature = "unstable", feature = "docs"))]
 #[cfg_attr(feature = "docs", doc(cfg(unstable)))]
 #[doc(inline)]
 pub fn interval(dur: Duration) -> Interval {
diff --git a/src/stream/stream/merge.rs b/src/stream/stream/merge.rs
index 5e7b226..ab97d2c 100644
--- a/src/stream/stream/merge.rs
+++ b/src/stream/stream/merge.rs
@@ -8,6 +8,8 @@ use futures_core::Stream;
 /// This stream is returned by [`Stream::merge`].
 ///
 /// [`Stream::merge`]: trait.Stream.html#method.merge
+#[cfg(any(feature = "unstable", feature = "docs"))]
+#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
 #[derive(Debug)]
 pub struct Merge<L, R> {
     left: L,