mirror of
https://github.com/async-rs/async-std.git
synced 2025-10-21 20:06:36 +00:00
Stabilize Stream::merge
This commit is contained in:
parent
14bbacd76a
commit
d8dcedf815
2 changed files with 0 additions and 3 deletions
|
@ -339,7 +339,6 @@ cfg_unstable! {
|
||||||
pub use into_stream::IntoStream;
|
pub use into_stream::IntoStream;
|
||||||
pub use pending::{pending, Pending};
|
pub use pending::{pending, Pending};
|
||||||
pub use product::Product;
|
pub use product::Product;
|
||||||
pub use stream::Merge;
|
|
||||||
pub use successors::{successors, Successors};
|
pub use successors::{successors, Successors};
|
||||||
pub use sum::Sum;
|
pub use sum::Sum;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,6 @@ pin_project! {
|
||||||
///
|
///
|
||||||
/// [`merge`]: trait.Stream.html#method.merge
|
/// [`merge`]: trait.Stream.html#method.merge
|
||||||
/// [`Stream`]: trait.Stream.html
|
/// [`Stream`]: trait.Stream.html
|
||||||
#[cfg(feature = "unstable")]
|
|
||||||
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Merge<L, R> {
|
pub struct Merge<L, R> {
|
||||||
#[pin]
|
#[pin]
|
||||||
|
|
Loading…
Reference in a new issue