eater/async-std
1
0
Fork 0
forked from mirror/async-std
Code Issues Pull requests Releases Wiki Activity

Improved the code with some minor changes

Browse source
This commit is contained in:
razican 2019-11-19 21:14:56 +01:00
parent f6829859fe
commit 72ca2c1a24
No known key found for this signature in database
GPG key ID: 76E895FB1EDE827C
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/stream/stream/merge.rs
View file

@ -62,12 +62,11 @@ where
S: Stream<Item = I>, S: Stream<Item = I>,
{ {
match first.poll_next(cx) { match first.poll_next(cx) {
Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
Poll::Ready(None) => second.poll_next(cx), Poll::Ready(None) => second.poll_next(cx),
Poll::Ready(item) => Poll::Ready(item),
Poll::Pending => match second.poll_next(cx) { Poll::Pending => match second.poll_next(cx) {
Poll::Ready(Some(item)) => Poll::Ready(Some(item)), Poll::Ready(None) | Poll::Pending => Poll::Pending,
Poll::Ready(None) => Poll::Pending, Poll::Ready(item) => Poll::Ready(item),
Poll::Pending => Poll::Pending,
}, },
} }
} }

10
src/stream/stream/mod.rs
View file

@ -1663,18 +1663,14 @@ extension_trait! {
``` ```
# async_std::task::block_on(async { # async_std::task::block_on(async {
use async_std::prelude::*; use async_std::prelude::*;
use async_std::stream; use async_std::stream::{self, FromStream};
let a = stream::once(1u8); let a = stream::once(1u8);
let b = stream::once(2u8); let b = stream::once(2u8);
let c = stream::once(3u8); let c = stream::once(3u8);
let mut s = a.merge(b).merge(c); let s = a.merge(b).merge(c);
let mut lst = Vec::new(); let mut lst = Vec::from_stream(s).await;
while let Some(n) = s.next().await {
lst.push(n)
}
lst.sort_unstable(); lst.sort_unstable();
assert_eq!(&lst, &[1u8, 2u8, 3u8]); assert_eq!(&lst, &[1u8, 2u8, 3u8]);