From 6d7a4a6e4c9e7e6fb2d61bdbd38ce11354652273 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Sun, 13 Jan 2019 04:34:32 +0100
Subject: [PATCH] stabilize transpose_result in 1.33

---
 src/libcore/option.rs                       | 4 +---
 src/libcore/result.rs                       | 4 +---
 src/librustc/lib.rs                         | 1 -
 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 6d4f4be1a1782..0e54397db0247 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 b10d767efb24e..1ebf0714e23e4 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 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;