diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-09-27 19:07:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-27 19:07:58 +0200 |
| commit | e76eb96a002fbae4a69324b609692e0cba5c949b (patch) | |
| tree | 5c0b72cac3ac3d4393819effd83d171e967344df | |
| parent | a3f76a26e045a760bb1163b7eab36872985242d5 (diff) | |
| parent | aec911675788dff017429f616968bc12b5c88adf (diff) | |
| download | rust-e76eb96a002fbae4a69324b609692e0cba5c949b.tar.gz rust-e76eb96a002fbae4a69324b609692e0cba5c949b.zip | |
Rollup merge of #129087 - slanterns:option_get_or_insert_default, r=dtolnay
Stabilize `option_get_or_insert_default` Closes: https://github.com/rust-lang/rust/issues/82901. `@rustbot` label: +T-libs-api r? libs-api
| -rw-r--r-- | compiler/rustc_session/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/core/src/option.rs | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/compiler/rustc_session/src/lib.rs b/compiler/rustc_session/src/lib.rs index 7e059a88c27..0b4470b2b0f 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)] #![warn(unreachable_pub)] // tidy-alphabetical-end diff --git a/library/core/src/option.rs b/library/core/src/option.rs index 30c667e2494..a66ef16e3ca 100644 --- a/library/core/src/option.rs +++ b/library/core/src/option.rs @@ -1639,8 +1639,6 @@ impl<T> Option<T> { /// # Examples /// /// ``` - /// #![feature(option_get_or_insert_default)] - /// /// let mut x = None; /// /// { @@ -1653,7 +1651,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, |