diff options
| author | Wim Looman <wim@nemo157.com> | 2020-03-19 09:57:37 +0100 |
|---|---|---|
| committer | Wim Looman <wim@nemo157.com> | 2020-03-19 11:21:50 +0100 |
| commit | 6fe7867ea6f5f912346d75459499fca88f6ae563 (patch) | |
| tree | 705c13541941a8a275139802c465f1694939e3b0 /src/libcore | |
| parent | 7760cd0fbbbf2c59a625e075a5bdfa88b8e30f8a (diff) | |
| download | rust-6fe7867ea6f5f912346d75459499fca88f6ae563.tar.gz rust-6fe7867ea6f5f912346d75459499fca88f6ae563.zip | |
Add Result<Result<T, E>, E>::flatten -> Result<T, E>
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/result.rs | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 0bc29e1bc66..0087b92f1f2 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -230,9 +230,9 @@ #![stable(feature = "rust1", since = "1.0.0")] -use crate::fmt; use crate::iter::{self, FromIterator, FusedIterator, TrustedLen}; use crate::ops::{self, Deref, DerefMut}; +use crate::{convert, fmt}; /// `Result` is a type that represents either success ([`Ok`]) or failure ([`Err`]). /// @@ -1214,6 +1214,38 @@ impl<T, E> Result<Option<T>, E> { } } +impl<T, E> Result<Result<T, E>, E> { + /// Converts from `Result<Result<T, E>, E>` to `Result<T, E>` + /// + /// # Examples + /// Basic usage: + /// ``` + /// #![feature(result_flattening)] + /// let x: Result<Result<&'static str, u32>, u32> = Ok(Ok("hello")); + /// assert_eq!(Ok("hello"), x.flatten()); + /// + /// let x: Result<Result<&'static str, u32>, u32> = Ok(Err(6)); + /// assert_eq!(Err(6), x.flatten()); + /// + /// let x: Result<Result<&'static str, u32>, u32> = Err(6); + /// assert_eq!(Err(6), x.flatten()); + /// ``` + /// + /// Flattening once only removes one level of nesting: + /// + /// ``` + /// #![feature(result_flattening)] + /// let x: Result<Result<Result<&'static str, u32>, u32>, u32> = Ok(Ok(Ok("hello"))); + /// assert_eq!(Ok(Ok("hello")), x.flatten()); + /// assert_eq!(Ok("hello"), x.flatten().flatten()); + /// ``` + #[inline] + #[unstable(feature = "result_flattening", issue = "70142")] + pub fn flatten(self) -> Result<T, E> { + self.and_then(convert::identity) + } +} + // This is a separate function to reduce the code size of the methods #[inline(never)] #[cold] |
