rename stream::join to stream::merge

Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
5 years ago · a2baa1d8e0
parent 33da049717
commit a2baa1d8e0
1 changed files with 1 additions and 1 deletions
--- a/src/stream/mod.rs
+++ b/src/stream/mod.rs
@ -48,6 +48,6 @@ cfg_if! {

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