Stabilize Stream::merge

4 years ago · d8dcedf815
parent 14bbacd76a
commit d8dcedf815
2 changed files with 0 additions and 3 deletions
--- a/src/stream/mod.rs
+++ b/src/stream/mod.rs
@ -339,7 +339,6 @@ cfg_unstable! {
    pub use into_stream::IntoStream;
    pub use pending::{pending, Pending};
    pub use product::Product;
-    pub use stream::Merge;
    pub use successors::{successors, Successors};
    pub use sum::Sum;
 }
--- a/src/stream/stream/merge.rs
+++ b/src/stream/stream/merge.rs
@ -16,8 +16,6 @@ pin_project! {
    ///
    /// [`merge`]: trait.Stream.html#method.merge
    /// [`Stream`]: trait.Stream.html
-    #[cfg(feature = "unstable")]
-    #[cfg_attr(feature = "docs", doc(cfg(unstable)))]
    #[derive(Debug)]
    pub struct Merge<L, R> {
        #[pin]