Skip to content

Commit

Permalink
Rollup merge of rust-lang#70140 - Nemo157:result-flatten, r=Amanieu
Browse files Browse the repository at this point in the history
Add Result<Result<T, E>, E>::flatten -> Result<T, E>

This PR makes this possible (modulo type inference):

```rust
assert_eq!(Ok(6), Ok(Ok(6)).flatten());
```

Tracking issue: rust-lang#70142

<sub>largely cribbed directly from <https://github.com/rust-lang/rust/pull/60256></sub>
  • Loading branch information
Centril committed Mar 29, 2020
2 parents 8ab82b8 + 6fe7867 commit 8212a1c
Showing 1 changed file with 33 additions and 1 deletion.
34 changes: 33 additions & 1 deletion src/libcore/result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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`]).
///
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit 8212a1c

Please sign in to comment.