about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSlanterns <slanterns.w@gmail.com>2024-08-14 18:35:58 +0800
committerSlanterns <slanterns.w@gmail.com>2024-08-14 18:35:58 +0800
commitaec911675788dff017429f616968bc12b5c88adf (patch)
tree6f552cd056caeaaa078f815091058e941a53ce44
parent9859bf27fd9892f48725c59b56aeee2be1d2fbad (diff)
downloadrust-aec911675788dff017429f616968bc12b5c88adf.tar.gz
rust-aec911675788dff017429f616968bc12b5c88adf.zip
stabilize `option_get_or_insert_default`
-rw-r--r--compiler/rustc_mir_transform/src/lib.rs1
-rw-r--r--compiler/rustc_session/src/lib.rs1
-rw-r--r--library/core/src/option.rs4
3 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs
index 1f214bc42cb..386c9e07efa 100644
--- a/compiler/rustc_mir_transform/src/lib.rs
+++ b/compiler/rustc_mir_transform/src/lib.rs
@@ -9,7 +9,6 @@
 #![feature(let_chains)]
 #![feature(map_try_insert)]
 #![feature(never_type)]
-#![feature(option_get_or_insert_default)]
 #![feature(round_char_boundary)]
 #![feature(try_blocks)]
 #![feature(yeet_expr)]
diff --git a/compiler/rustc_session/src/lib.rs b/compiler/rustc_session/src/lib.rs
index d93b3eac080..c3199043c13 100644
--- a/compiler/rustc_session/src/lib.rs
+++ b/compiler/rustc_session/src/lib.rs
@@ -3,7 +3,6 @@
 #![feature(iter_intersperse)]
 #![feature(let_chains)]
 #![feature(map_many_mut)]
-#![feature(option_get_or_insert_default)]
 #![feature(rustc_attrs)]
 // tidy-alphabetical-end
 
diff --git a/library/core/src/option.rs b/library/core/src/option.rs
index 6c89c810180..69f0d716cc7 100644
--- a/library/core/src/option.rs
+++ b/library/core/src/option.rs
@@ -1650,8 +1650,6 @@ impl<T> Option<T> {
     /// # Examples
     ///
     /// ```
-    /// #![feature(option_get_or_insert_default)]
-    ///
     /// let mut x = None;
     ///
     /// {
@@ -1664,7 +1662,7 @@ impl<T> Option<T> {
     /// assert_eq!(x, Some(7));
     /// ```
     #[inline]
-    #[unstable(feature = "option_get_or_insert_default", issue = "82901")]
+    #[stable(feature = "option_get_or_insert_default", since = "CURRENT_RUSTC_VERSION")]
     pub fn get_or_insert_default(&mut self) -> &mut T
     where
         T: Default,