diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-01-13 04:34:32 +0100 |
|---|---|---|
| committer | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-01-13 06:15:44 +0100 |
| commit | 6d7a4a6e4c9e7e6fb2d61bdbd38ce11354652273 (patch) | |
| tree | a34f810681d3354cdef2f893da21c00e85dd6880 /src/libcore | |
| parent | 75a369c5b11459baa6bf7734eeb6135998a0a7de (diff) | |
| download | rust-6d7a4a6e4c9e7e6fb2d61bdbd38ce11354652273.tar.gz rust-6d7a4a6e4c9e7e6fb2d61bdbd38ce11354652273.zip | |
stabilize transpose_result in 1.33
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/option.rs | 4 | ||||
| -rw-r--r-- | src/libcore/result.rs | 4 |
2 files changed, 2 insertions, 6 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)), |