diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 6d4f4be1a1782..0e54397db0247 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -1013,8 +1013,6 @@ impl Option> { /// # Examples /// /// ``` - /// #![feature(transpose_result)] - /// /// #[derive(Debug, Eq, PartialEq)] /// struct SomeErr; /// @@ -1023,7 +1021,7 @@ impl Option> { /// 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, E> { match self { Some(Ok(x)) => Ok(Some(x)), diff --git a/src/libcore/result.rs b/src/libcore/result.rs index b10d767efb24e..1ebf0714e23e4 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -972,8 +972,6 @@ impl Result, E> { /// # Examples /// /// ``` - /// #![feature(transpose_result)] - /// /// #[derive(Debug, Eq, PartialEq)] /// struct SomeErr; /// @@ -982,7 +980,7 @@ impl Result, 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> { match self { Ok(Some(x)) => Some(Ok(x)), diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index b2a924ac19895..fba9b8527677c 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 a817ac736632e..14b562160dfed 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;