magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add map_expect for stream

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-11-02 04:54:28 +00:00
parent 8742437036
commit f191b4bad4
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/utils/result/map_expect.rs
View file

@ -2,14 +2,14 @@ use std::fmt::Debug;
use super::Result; use super::Result;
pub trait MapExpect<T> { pub trait MapExpect<'a, T> {
/// Calls expect(msg) on the mapped Result value. This is similar to /// Calls expect(msg) on the mapped Result value. This is similar to
/// map(Result::unwrap) but composes an expect call and message without /// map(Result::unwrap) but composes an expect call and message without
/// requiring a closure. /// requiring a closure.
fn map_expect(self, msg: &str) -> Option<T>; fn map_expect(self, msg: &'a str) -> T;
} }
impl<T, E: Debug> MapExpect<T> for Option<Result<T, E>> { impl<'a, T, E: Debug> MapExpect<'a, Option<T>> for Option<Result<T, E>> {
#[inline] #[inline]
fn map_expect(self, msg: &str) -> Option<T> { self.map(|result| result.expect(msg)) } fn map_expect(self, msg: &'a str) -> Option<T> { self.map(|result| result.expect(msg)) }
} }

11
src/core/utils/stream/expect.rs
View file

@ -4,14 +4,19 @@ use crate::Result;
pub trait TryExpect<'a, Item> { pub trait TryExpect<'a, Item> {
fn expect_ok(self) -> impl Stream<Item = Item> + Send + 'a; fn expect_ok(self) -> impl Stream<Item = Item> + Send + 'a;
fn map_expect(self, msg: &'a str) -> impl Stream<Item = Item> + Send + 'a;
} }
impl<'a, T, Item> TryExpect<'a, Item> for T impl<'a, T, Item> TryExpect<'a, Item> for T
where where
T: Stream<Item = Result<Item>> + TryStream + Send + 'a, T: Stream<Item = Result<Item>> + TryStream + Send + 'a,
Item: 'a,
{ {
#[inline] #[inline]
fn expect_ok(self: T) -> impl Stream<Item = Item> + Send + 'a { fn expect_ok(self: T) -> impl Stream<Item = Item> + Send + 'a { self.map_expect("stream expectation failure") }
self.map(|res| res.expect("stream expectation failure"))
} //TODO: move to impl MapExpect
#[inline]
fn map_expect(self, msg: &'a str) -> impl Stream<Item = Item> + Send + 'a { self.map(|res| res.expect(msg)) }
} }