diff options
| author | bors <bors@rust-lang.org> | 2024-09-27 17:28:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-27 17:28:47 +0000 |
| commit | fa724e5d8cbbdfbd1e53c4c656121af01b694406 (patch) | |
| tree | cb03957ec3e5050d456cb76445a55c146af42ce6 /library | |
| parent | a3f76a26e045a760bb1163b7eab36872985242d5 (diff) | |
| parent | 966a0b76bc21ba65071b4d50dfb0536e0581604f (diff) | |
Auto merge of #130934 - matthiaskrgr:rollup-4puticr, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #129087 (Stabilize `option_get_or_insert_default`) - #130435 (Move Apple linker args from `rustc_target` to `rustc_codegen_ssa`) - #130459 (delete sub build directory "debug" to not delete the change-id file) - #130873 (rustc_target: Add powerpc64 atomic-related features) - #130916 (Use `&raw` in the compiler) - #130917 (Fix error span if arg to `asm!()` is a macro call) - #130927 (update outdated comments) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library')
| -rw-r--r-- | library/core/src/option.rs | 4 |
1 files changed, 1 insertions, 3 deletions
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, |