diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2018-10-10 15:59:23 -0700 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2018-10-10 15:59:23 -0700 |
| commit | ff3e4d9f1c4b8e4faecd2bf95e2f52abb9380250 (patch) | |
| tree | 9504e4b26a5c5c81137bf00d0ba67748bd048938 /src/libcore | |
| parent | e1e628ec87b22b3df661d257255fd198651a1801 (diff) | |
| parent | c232ea12763b82ae8d4b616df649c23c4961d0fb (diff) | |
| download | rust-ff3e4d9f1c4b8e4faecd2bf95e2f52abb9380250.tar.gz rust-ff3e4d9f1c4b8e4faecd2bf95e2f52abb9380250.zip | |
Rollup merge of #54904 - Kerollmops:stabilize-option-replace, r=Centril
Fixes #47311. r? @nrc
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/option.rs | 4 | ||||
| -rw-r--r-- | src/libcore/tests/lib.rs | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 0255f7a0885..cf1c77041b9 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.31.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)] |