diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-02-20 00:37:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 00:37:21 +0100 |
| commit | 7977af5975cfe90c16da2abf9701daca00e17201 (patch) | |
| tree | 733b900938d026de87ddd82de7542315e8282293 | |
| parent | 3b348d932aa5c9884310d025cf7c516023fd0d9a (diff) | |
| parent | c05276ae7b5996049be7b34e497021e3e28156cd (diff) | |
| download | rust-7977af5975cfe90c16da2abf9701daca00e17201.tar.gz rust-7977af5975cfe90c16da2abf9701daca00e17201.zip | |
Rollup merge of #93580 - m-ou-se:stabilize-pin-static-ref, r=scottmcm
Stabilize pin_static_ref. FCP finished here: https://github.com/rust-lang/rust/issues/78186#issuecomment-1024987221 Closes #78186
| -rw-r--r-- | library/core/src/pin.rs | 4 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/library/core/src/pin.rs b/library/core/src/pin.rs index dec1b5270d5..ebfd12d1533 100644 --- a/library/core/src/pin.rs +++ b/library/core/src/pin.rs @@ -805,7 +805,7 @@ impl<T: ?Sized> Pin<&'static T> { /// /// This is safe, because `T` is borrowed for the `'static` lifetime, which /// never ends. - #[unstable(feature = "pin_static_ref", issue = "78186")] + #[stable(feature = "pin_static_ref", since = "1.60.0")] #[rustc_const_unstable(feature = "const_pin", issue = "76654")] pub const fn static_ref(r: &'static T) -> Pin<&'static T> { // SAFETY: The 'static borrow guarantees the data will not be @@ -858,7 +858,7 @@ impl<T: ?Sized> Pin<&'static mut T> { /// /// This is safe, because `T` is borrowed for the `'static` lifetime, which /// never ends. - #[unstable(feature = "pin_static_ref", issue = "78186")] + #[stable(feature = "pin_static_ref", since = "1.60.0")] #[rustc_const_unstable(feature = "const_pin", issue = "76654")] pub const fn static_mut(r: &'static mut T) -> Pin<&'static mut T> { // SAFETY: The 'static borrow guarantees the data will not be diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 8c38db9b62c..919bc3496c4 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -311,7 +311,6 @@ #![feature(panic_internals)] #![feature(panic_can_unwind)] #![feature(panic_unwind)] -#![feature(pin_static_ref)] #![feature(platform_intrinsics)] #![feature(portable_simd)] #![feature(prelude_import)] |