rename stream::join to stream::merge

yoshuawuyts · yoshuawuyts · commit a2baa1d8e099 · 2019-10-13T21:12:05.000+02:00
Signed-off-by: Yoshua Wuyts &lt;yoshuawuyts@gmail.com&gt;
diff --git 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};
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@ cfg_if! {`
`48`	`48`
`49`	`49`	`#[cfg_attr(feature = "docs", doc(cfg(unstable)))]`
`50`	`50`	`#[doc(inline)]`
`51`		`- pub use async_macros::{join_stream as join, JoinStream as Join};`
	`51`	`+ pub use async_macros::{join_stream as merge, JoinStream as Merge};`
`52`	`52`	`}`
`53`	`53`	`}`