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

Fixed deduplication of code

Browse source
This commit is contained in:
Razican 2019-11-18 16:39:21 +01:00
parent 5d558ca213
commit f6829859fe
No known key found for this signature in database
GPG key ID: 4437BF72D677D89C
1 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,25 +45,29 @@ where
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
let this = self.project();
if utils::random(1) == 1 {
match this.left.poll_next(cx) {
Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
Poll::Ready(None) => this.right.poll_next(cx),
Poll::Pending => match this.right.poll_next(cx) {
Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
Poll::Ready(None) => Poll::Pending,
Poll::Pending => Poll::Pending,
},
}
poll_next_in_order(this.left, this.right, cx)
} else {
match this.right.poll_next(cx) {
Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
Poll::Ready(None) => this.left.poll_next(cx),
Poll::Pending => match this.left.poll_next(cx) {
Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
Poll::Ready(None) => Poll::Pending,
Poll::Pending => Poll::Pending,
},
}
poll_next_in_order(this.right, this.left, cx)
}
}
}
fn poll_next_in_order<F, S, I>(
first: Pin<&mut F>,
second: Pin<&mut S>,
cx: &mut Context<'_>,
) -> Poll<Option<I>>
where
F: Stream<Item = I>,
S: Stream<Item = I>,
{
match first.poll_next(cx) {
Poll::Ready(Some(item)) => Poll::Ready(Some(item)),
Poll::Ready(None) => 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::Pending,
},
}
}