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

Rewrote Results implementation using take_while and filter_map

Browse source
This commit is contained in:
Oleg Nosov 2020-01-17 17:13:52 +03:00
parent ed248017b4
commit ed7ddacb28
No known key found for this signature in database
GPG key ID: DE90B83800644E24
3 changed files with 70 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/result/from_stream.rs
View file

@ -17,26 +17,34 @@ where
let stream = stream.into_stream(); let stream = stream.into_stream();
Box::pin(async move { Box::pin(async move {
// Using `scan` here because it is able to stop the stream early // Using `take_while` here because it is able to stop the stream early
// if a failure occurs // if a failure occurs
let mut is_error = false;
let mut found_error = None; let mut found_error = None;
let out: V = stream let out: V = stream
.scan(&mut found_error, |error, elem| { .take_while(|elem| {
match elem { // Stop processing the stream on `Err`
Ok(elem) => Some(elem), !is_error
Err(err) => { && (elem.is_ok() || {
**error = Some(err); is_error = true;
// Stop processing the stream on error // Capture first `Err`
None true
} })
})
.filter_map(|elem| match elem {
Ok(value) => Some(value),
Err(err) => {
found_error = Some(err);
None
} }
}) })
.collect() .collect()
.await; .await;
match found_error { if is_error {
Some(err) => Err(err), Err(found_error.unwrap())
None => Ok(out), } else {
Ok(out)
} }
}) })
} }

39
src/result/product.rs
View file

@ -40,24 +40,35 @@ where
S: Stream<Item = Result<U, E>> + 'a, S: Stream<Item = Result<U, E>> + 'a,
{ {
Box::pin(async move { Box::pin(async move {
// Using `scan` here because it is able to stop the stream early // Using `take_while` here because it is able to stop the stream early
// if a failure occurs // if a failure occurs
let mut is_error = false;
let mut found_error = None; let mut found_error = None;
let out = <T as Product<U>>::product(stream.scan(&mut found_error, |error, elem| { let out = <T as Product<U>>::product(
match elem { stream
Ok(elem) => Some(elem), .take_while(|elem| {
Err(err) => { // Stop processing the stream on `Err`
**error = Some(err); !is_error
// Stop processing the stream on error && (elem.is_ok() || {
None is_error = true;
} // Capture first `Err`
} true
})) })
})
.filter_map(|elem| match elem {
Ok(value) => Some(value),
Err(err) => {
found_error = Some(err);
None
}
}),
)
.await; .await;
match found_error { if is_error {
Some(err) => Err(err), Err(found_error.unwrap())
None => Ok(out), } else {
Ok(out)
} }
}) })
} }

39
src/result/sum.rs
View file

@ -40,24 +40,35 @@ where
S: Stream<Item = Result<U, E>> + 'a, S: Stream<Item = Result<U, E>> + 'a,
{ {
Box::pin(async move { Box::pin(async move {
// Using `scan` here because it is able to stop the stream early // Using `take_while` here because it is able to stop the stream early
// if a failure occurs // if a failure occurs
let mut is_error = false;
let mut found_error = None; let mut found_error = None;
let out = <T as Sum<U>>::sum(stream.scan(&mut found_error, |error, elem| { let out = <T as Sum<U>>::sum(
match elem { stream
Ok(elem) => Some(elem), .take_while(|elem| {
Err(err) => { // Stop processing the stream on `Err`
**error = Some(err); !is_error
// Stop processing the stream on error && (elem.is_ok() || {
None is_error = true;
} // Capture first `Err`
} true
})) })
})
.filter_map(|elem| match elem {
Ok(value) => Some(value),
Err(err) => {
found_error = Some(err);
None
}
}),
)
.await; .await;
match found_error { if is_error {
Some(err) => Err(err), Err(found_error.unwrap())
None => Ok(out), } else {
Ok(out)
} }
}) })
} }