mirror of
				https://github.com/async-rs/async-std.git
				synced 2025-11-03 18:26:38 +00:00 
			
		
		
		
	rename stream::join to stream::merge
Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
This commit is contained in:
		
							parent
							
								
									33da049717
								
							
						
					
					
						commit
						a2baa1d8e0
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -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};
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue