diff options
| author | bors <bors@rust-lang.org> | 2019-01-13 14:35:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-13 14:35:40 +0000 |
| commit | 1c561d9b55aabc7df484f8faba24430421aee998 (patch) | |
| tree | f93e38739dcace495e00cd3edcf35b06e59e3f96 | |
| parent | d45bef9db62a0797c6dd3b06e21db1a0acd8cfe7 (diff) | |
| parent | 6d7a4a6e4c9e7e6fb2d61bdbd38ce11354652273 (diff) | |
| download | rust-upper-tuple.tar.gz | |
Auto merge of #57567 - Centril:stabilize-transpose, r=alexregupper-tuple
Stabilize `transpose_result` in 1.33
fixes https://github.com/rust-lang/rust/issues/47338.
FCP completed: https://github.com/rust-lang/rust/issues/47338#issuecomment-453762236
r? @alexreg
| -rw-r--r-- | src/libcore/option.rs | 4 | ||||
| -rw-r--r-- | src/libcore/result.rs | 4 | ||||
| -rw-r--r-- | src/librustc/lib.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/result-opt-conversions.rs | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 6d4f4be1a17..0e54397db02 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -1013,8 +1013,6 @@ impl<T, E> Option<Result<T, E>> { /// # Examples /// /// ``` - /// #![feature(transpose_result)] - /// /// #[derive(Debug, Eq, PartialEq)] /// struct SomeErr; /// @@ -1023,7 +1021,7 @@ impl<T, E> Option<Result<T, E>> { /// assert_eq!(x, y.transpose()); /// ``` #[inline] - #[unstable(feature = "transpose_result", issue = "47338")] + #[stable(feature = "transpose_result", since = "1.33.0")] pub fn transpose(self) -> Result<Option<T>, E> { match self { Some(Ok(x)) => Ok(Some(x)), diff --git a/src/libcore/result.rs b/src/libcore/result.rs index b10d767efb2..1ebf0714e23 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -972,8 +972,6 @@ impl<T, E> Result<Option<T>, E> { /// # Examples /// /// ``` - /// #![feature(transpose_result)] - /// /// #[derive(Debug, Eq, PartialEq)] /// struct SomeErr; /// @@ -982,7 +980,7 @@ impl<T, E> Result<Option<T>, E> { /// assert_eq!(x.transpose(), y); /// ``` #[inline] - #[unstable(feature = "transpose_result", issue = "47338")] + #[stable(feature = "transpose_result", since = "1.33.0")] pub fn transpose(self) -> Option<Result<T, E>> { match self { Ok(Some(x)) => Some(Ok(x)), diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index b2a924ac198..fba9b852767 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -60,7 +60,6 @@ #![feature(test)] #![feature(in_band_lifetimes)] #![feature(crate_visibility_modifier)] -#![feature(transpose_result)] #![recursion_limit="512"] diff --git a/src/test/run-pass/result-opt-conversions.rs b/src/test/run-pass/result-opt-conversions.rs index a817ac73663..14b562160df 100644 --- a/src/test/run-pass/result-opt-conversions.rs +++ b/src/test/run-pass/result-opt-conversions.rs @@ -1,5 +1,3 @@ -#![feature(transpose_result)] - #[derive(Copy, Clone, Debug, PartialEq)] struct BadNumErr; |