forked from mirror/async-std
Merge #174
174: adds stream::find_map combinator r=yoshuawuyts a=montekki Adds a `stream::find_map` combinator --- Stdlib: https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.find_map Ref: #129 Co-authored-by: Fedor Sakharov <fedor.sakharov@gmail.com>
This commit is contained in:
commit
6f9ec665a2
2 changed files with 77 additions and 0 deletions
50
src/stream/stream/find_map.rs
Normal file
50
src/stream/stream/find_map.rs
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
use std::marker::PhantomData;
|
||||||
|
use std::pin::Pin;
|
||||||
|
use std::task::{Context, Poll};
|
||||||
|
|
||||||
|
#[allow(missing_debug_implementations)]
|
||||||
|
pub struct FindMapFuture<'a, S, F, T, B> {
|
||||||
|
stream: &'a mut S,
|
||||||
|
f: F,
|
||||||
|
__b: PhantomData<B>,
|
||||||
|
__t: PhantomData<T>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a, S, B, F, T> FindMapFuture<'a, S, F, T, B> {
|
||||||
|
pin_utils::unsafe_pinned!(stream: &'a mut S);
|
||||||
|
pin_utils::unsafe_unpinned!(f: F);
|
||||||
|
|
||||||
|
pub(super) fn new(stream: &'a mut S, f: F) -> Self {
|
||||||
|
FindMapFuture {
|
||||||
|
stream,
|
||||||
|
f,
|
||||||
|
__b: PhantomData,
|
||||||
|
__t: PhantomData,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a, S, B, F> futures_core::future::Future for FindMapFuture<'a, S, F, S::Item, B>
|
||||||
|
where
|
||||||
|
S: futures_core::stream::Stream + Unpin + Sized,
|
||||||
|
F: FnMut(S::Item) -> Option<B>,
|
||||||
|
{
|
||||||
|
type Output = Option<B>;
|
||||||
|
|
||||||
|
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
|
||||||
|
use futures_core::stream::Stream;
|
||||||
|
|
||||||
|
let item = futures_core::ready!(self.as_mut().stream().poll_next(cx));
|
||||||
|
|
||||||
|
match item {
|
||||||
|
Some(v) => match (self.as_mut().f())(v) {
|
||||||
|
Some(v) => Poll::Ready(Some(v)),
|
||||||
|
None => {
|
||||||
|
cx.waker().wake_by_ref();
|
||||||
|
Poll::Pending
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None => Poll::Ready(None),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -24,6 +24,7 @@
|
||||||
mod all;
|
mod all;
|
||||||
mod any;
|
mod any;
|
||||||
mod filter_map;
|
mod filter_map;
|
||||||
|
mod find_map;
|
||||||
mod min_by;
|
mod min_by;
|
||||||
mod next;
|
mod next;
|
||||||
mod nth;
|
mod nth;
|
||||||
|
@ -34,6 +35,7 @@ pub use take::Take;
|
||||||
use all::AllFuture;
|
use all::AllFuture;
|
||||||
use any::AnyFuture;
|
use any::AnyFuture;
|
||||||
use filter_map::FilterMap;
|
use filter_map::FilterMap;
|
||||||
|
use find_map::FindMapFuture;
|
||||||
use min_by::MinByFuture;
|
use min_by::MinByFuture;
|
||||||
use next::NextFuture;
|
use next::NextFuture;
|
||||||
use nth::NthFuture;
|
use nth::NthFuture;
|
||||||
|
@ -52,6 +54,7 @@ cfg_if! {
|
||||||
($a:lifetime, $f:tt, $o:ty) => (ImplFuture<$a, $o>);
|
($a:lifetime, $f:tt, $o:ty) => (ImplFuture<$a, $o>);
|
||||||
($a:lifetime, $f:tt, $o:ty, $t1:ty) => (ImplFuture<$a, $o>);
|
($a:lifetime, $f:tt, $o:ty, $t1:ty) => (ImplFuture<$a, $o>);
|
||||||
($a:lifetime, $f:tt, $o:ty, $t1:ty, $t2:ty) => (ImplFuture<$a, $o>);
|
($a:lifetime, $f:tt, $o:ty, $t1:ty, $t2:ty) => (ImplFuture<$a, $o>);
|
||||||
|
($a:lifetime, $f:tt, $o:ty, $t1:ty, $t2:ty, $t3:ty) => (ImplFuture<$a, $o>);
|
||||||
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -59,6 +62,7 @@ cfg_if! {
|
||||||
($a:lifetime, $f:tt, $o:ty) => ($f<$a, Self>);
|
($a:lifetime, $f:tt, $o:ty) => ($f<$a, Self>);
|
||||||
($a:lifetime, $f:tt, $o:ty, $t1:ty) => ($f<$a, Self, $t1>);
|
($a:lifetime, $f:tt, $o:ty, $t1:ty) => ($f<$a, Self, $t1>);
|
||||||
($a:lifetime, $f:tt, $o:ty, $t1:ty, $t2:ty) => ($f<$a, Self, $t1, $t2>);
|
($a:lifetime, $f:tt, $o:ty, $t1:ty, $t2:ty) => ($f<$a, Self, $t1, $t2>);
|
||||||
|
($a:lifetime, $f:tt, $o:ty, $t1:ty, $t2:ty, $t3:ty) => ($f<$a, Self, $t1, $t2, $t3>);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -317,6 +321,29 @@ pub trait Stream {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Applies function to the elements of stream and returns the first non-none result.
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// # fn main() { async_std::task::block_on(async {
|
||||||
|
/// #
|
||||||
|
/// use async_std::prelude::*;
|
||||||
|
/// use std::collections::VecDeque;
|
||||||
|
///
|
||||||
|
/// let mut s: VecDeque<&str> = vec!["lol", "NaN", "2", "5"].into_iter().collect();
|
||||||
|
/// let first_number = s.find_map(|s| s.parse().ok()).await;
|
||||||
|
///
|
||||||
|
/// assert_eq!(first_number, Some(2));
|
||||||
|
/// #
|
||||||
|
/// # }) }
|
||||||
|
/// ```
|
||||||
|
fn find_map<F, B>(&mut self, f: F) -> ret!('_, FindMapFuture, Option<B>, F, Self::Item, B)
|
||||||
|
where
|
||||||
|
Self: Sized,
|
||||||
|
F: FnMut(Self::Item) -> Option<B>,
|
||||||
|
{
|
||||||
|
FindMapFuture::new(self, f)
|
||||||
|
}
|
||||||
|
|
||||||
/// Tests if any element of the stream matches a predicate.
|
/// Tests if any element of the stream matches a predicate.
|
||||||
///
|
///
|
||||||
/// `any()` takes a closure that returns `true` or `false`. It applies
|
/// `any()` takes a closure that returns `true` or `false`. It applies
|
||||||
|
|
Loading…
Reference in a new issue