mirror/async-std
2
0
Fork 1
mirror of https://github.com/async-rs/async-std.git synced 2025-06-19 12:41:36 +00:00
Code Issues Releases Wiki Activity

rename stream::join to stream::merge

Browse source 
Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
This commit is contained in:
Yoshua Wuyts 2019-10-13 21:12:05 +02:00
parent 33da049717
commit a2baa1d8e0
No known key found for this signature in database
GPG key ID: 24EA8164F96777ED
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/stream/mod.rs
View file

@ -48,6 +48,6 @@ cfg_if! {
#[cfg_attr(feature = "docs", doc(cfg(unstable)))] #[cfg_attr(feature = "docs", doc(cfg(unstable)))]
#[doc(inline)] #[doc(inline)]
pub use async_macros::{join_stream as join, JoinStream as Join}; pub use async_macros::{join_stream as merge, JoinStream as Merge};
} }
} }