Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions vortex-error/src/ext.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
use crate::VortexResult;

/// Extension trait for VortexResult
pub trait ResultExt<T>: private::Sealed {
/// Flatten a nested [`VortexResult`]. Helper function until <https://github.com/rust-lang/rust/issues/70142> is stabilized.
fn flatten(self) -> VortexResult<T>;
}

mod private {
use crate::VortexResult;

pub trait Sealed {}

impl<T> Sealed for VortexResult<VortexResult<T>> {}
}

impl<T> ResultExt<T> for VortexResult<VortexResult<T>> {
fn flatten(self) -> VortexResult<T> {
match self {
Ok(Ok(v)) => Ok(v),
Ok(Err(e)) | Err(e) => Err(e),
}
}
}
4 changes: 4 additions & 0 deletions vortex-error/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#[cfg(feature = "python")]
pub mod python;

mod ext;

use std::backtrace::Backtrace;
use std::borrow::Cow;
use std::convert::Infallible;
Expand All @@ -16,6 +18,8 @@ use std::num::TryFromIntError;
use std::ops::Deref;
use std::{env, fmt, io};

pub use ext::*;

/// A string that can be used as an error message.
#[derive(Debug)]
pub struct ErrString(Cow<'static, str>);
Expand Down