Skip to content

Commit 2f3569b

Browse files
authored
Rollup merge of rust-lang#54904 - Kerollmops:stabilize-option-replace, r=Centril
Stabilize the `Option::replace` method This PR stabilize the `Option::replace` method propose in rust-lang#51998.
2 parents e602205 + c232ea1 commit 2f3569b

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

src/libcore/option.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -867,8 +867,6 @@ impl<T> Option<T> {
867867
/// # Examples
868868
///
869869
/// ```
870-
/// #![feature(option_replace)]
871-
///
872870
/// let mut x = Some(2);
873871
/// let old = x.replace(5);
874872
/// assert_eq!(x, Some(5));
@@ -880,7 +878,7 @@ impl<T> Option<T> {
880878
/// assert_eq!(old, None);
881879
/// ```
882880
#[inline]
883-
#[unstable(feature = "option_replace", issue = "51998")]
881+
#[stable(feature = "option_replace", since = "1.31.0")]
884882
pub fn replace(&mut self, value: T) -> Option<T> {
885883
mem::replace(self, Some(value))
886884
}

src/libcore/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#![feature(reverse_bits)]
4040
#![feature(inner_deref)]
4141
#![feature(slice_internals)]
42-
#![feature(option_replace)]
4342
#![feature(slice_partition_dedup)]
4443
#![feature(copy_within)]
4544

src/librustc_driver/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#![feature(box_syntax)]
2222
#![cfg_attr(unix, feature(libc))]
2323
#![feature(nll)]
24-
#![feature(option_replace)]
2524
#![feature(quote)]
2625
#![feature(rustc_diagnostic_macros)]
2726
#![feature(slice_sort_by_cached_key)]

0 commit comments

Comments
 (0)