leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge_streams: shorten the code a tiny bit

Browse source
This commit is contained in:
Igor Katson 2024-09-16 23:11:01 +01:00
parent d9a56acacb
commit decf29a910
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/librqbit/src/merge_streams.rs
View file

@ -36,11 +36,7 @@ fn poll_two<I, S1: Stream<Item = I> + Unpin, S2: Stream<Item = I> + Unpin>(
let s1p = s1.poll_next_unpin(cx); let s1p = s1.poll_next_unpin(cx);
match s1p { match s1p {
Poll::Ready(Some(v)) => Poll::Ready(Some(v)), Poll::Ready(Some(v)) => Poll::Ready(Some(v)),
Poll::Ready(None) => match s2.poll_next_unpin(cx) { Poll::Ready(None) => s2.poll_next_unpin(cx),
Poll::Ready(Some(v)) => Poll::Ready(Some(v)),
Poll::Ready(None) => Poll::Ready(None),
Poll::Pending => Poll::Pending,
},
Poll::Pending => match s2.poll_next_unpin(cx) { Poll::Pending => match s2.poll_next_unpin(cx) {
Poll::Ready(Some(v)) => Poll::Ready(Some(v)), Poll::Ready(Some(v)) => Poll::Ready(Some(v)),
Poll::Ready(None) | Poll::Pending => Poll::Pending, Poll::Ready(None) | Poll::Pending => Poll::Pending,