diff options
| author | Clément Renault <renault.cle@gmail.com> | 2018-10-08 10:06:45 +0200 |
|---|---|---|
| committer | Clément Renault <renault.cle@gmail.com> | 2018-10-08 10:06:45 +0200 |
| commit | 8c01c225ce1fd2b28817f6ea72d29e218f0f8a6d (patch) | |
| tree | 95e1f5f54b7665fe56c276e8c504a86bb316e644 | |
| parent | ef5c00d0ca027f8ef4b41fecd53177e105daa6a8 (diff) | |
| download | rust-8c01c225ce1fd2b28817f6ea72d29e218f0f8a6d.tar.gz rust-8c01c225ce1fd2b28817f6ea72d29e218f0f8a6d.zip | |
Stabilize the `Option::replace` method
| -rw-r--r-- | src/libcore/option.rs | 4 | ||||
| -rw-r--r-- | src/libcore/tests/lib.rs | 1 | ||||
| -rw-r--r-- | src/librustc_driver/lib.rs | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 0255f7a0885..ee313cd6e8e 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -867,8 +867,6 @@ impl<T> Option<T> { /// # Examples /// /// ``` - /// #![feature(option_replace)] - /// /// let mut x = Some(2); /// let old = x.replace(5); /// assert_eq!(x, Some(5)); @@ -880,7 +878,7 @@ impl<T> Option<T> { /// assert_eq!(old, None); /// ``` #[inline] - #[unstable(feature = "option_replace", issue = "51998")] + #[stable(feature = "option_replace", since = "1.30.0")] pub fn replace(&mut self, value: T) -> Option<T> { mem::replace(self, Some(value)) } diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index ada61d8dfd8..0beb60a1270 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -39,7 +39,6 @@ #![feature(reverse_bits)] #![feature(inner_deref)] #![feature(slice_internals)] -#![feature(option_replace)] #![feature(slice_partition_dedup)] #![feature(copy_within)] diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index 4405c0aef90..0514bd20c98 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -21,7 +21,6 @@ #![feature(box_syntax)] #![cfg_attr(unix, feature(libc))] #![feature(nll)] -#![feature(option_replace)] #![feature(quote)] #![feature(rustc_diagnostic_macros)] #![feature(slice_sort_by_cached_key)] |