Skip to content

Commit 341d1eb

Browse files
committed
Stabilize 'atomic_from_ptr', move const gate to 'const_atomic_from_ptr'
1 parent 91ec61f commit 341d1eb

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

library/core/src/sync/atomic.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ impl AtomicBool {
319319
/// # Examples
320320
///
321321
/// ```
322-
/// #![feature(atomic_from_ptr, pointer_is_aligned)]
322+
/// #![feature(pointer_is_aligned)]
323323
/// use std::sync::atomic::{self, AtomicBool};
324324
/// use std::mem::align_of;
325325
///
@@ -351,8 +351,8 @@ impl AtomicBool {
351351
/// * The value behind `ptr` must not be accessed through non-atomic operations for the whole lifetime `'a`.
352352
///
353353
/// [valid]: crate::ptr#safety
354-
#[unstable(feature = "atomic_from_ptr", issue = "108652")]
355-
#[rustc_const_unstable(feature = "atomic_from_ptr", issue = "108652")]
354+
#[stable(feature = "atomic_from_ptr", since = "CURRENT_RUSTC_VERSION")]
355+
#[rustc_const_unstable(feature = "const_atomic_from_ptr", issue = "108652")]
356356
pub const unsafe fn from_ptr<'a>(ptr: *mut bool) -> &'a AtomicBool {
357357
// SAFETY: guaranteed by the caller
358358
unsafe { &*ptr.cast() }
@@ -1112,7 +1112,7 @@ impl<T> AtomicPtr<T> {
11121112
/// # Examples
11131113
///
11141114
/// ```
1115-
/// #![feature(atomic_from_ptr, pointer_is_aligned)]
1115+
/// #![feature(pointer_is_aligned)]
11161116
/// use std::sync::atomic::{self, AtomicPtr};
11171117
/// use std::mem::align_of;
11181118
///
@@ -1144,8 +1144,8 @@ impl<T> AtomicPtr<T> {
11441144
/// * The value behind `ptr` must not be accessed through non-atomic operations for the whole lifetime `'a`.
11451145
///
11461146
/// [valid]: crate::ptr#safety
1147-
#[unstable(feature = "atomic_from_ptr", issue = "108652")]
1148-
#[rustc_const_unstable(feature = "atomic_from_ptr", issue = "108652")]
1147+
#[stable(feature = "atomic_from_ptr", since = "CURRENT_RUSTC_VERSION")]
1148+
#[rustc_const_unstable(feature = "const_atomic_from_ptr", issue = "108652")]
11491149
pub const unsafe fn from_ptr<'a>(ptr: *mut *mut T) -> &'a AtomicPtr<T> {
11501150
// SAFETY: guaranteed by the caller
11511151
unsafe { &*ptr.cast() }
@@ -2081,7 +2081,7 @@ macro_rules! atomic_int {
20812081
/// # Examples
20822082
///
20832083
/// ```
2084-
/// #![feature(atomic_from_ptr, pointer_is_aligned)]
2084+
/// #![feature(pointer_is_aligned)]
20852085
#[doc = concat!($extra_feature, "use std::sync::atomic::{self, ", stringify!($atomic_type), "};")]
20862086
/// use std::mem::align_of;
20872087
///
@@ -2114,8 +2114,8 @@ macro_rules! atomic_int {
21142114
/// * The value behind `ptr` must not be accessed through non-atomic operations for the whole lifetime `'a`.
21152115
///
21162116
/// [valid]: crate::ptr#safety
2117-
#[unstable(feature = "atomic_from_ptr", issue = "108652")]
2118-
#[rustc_const_unstable(feature = "atomic_from_ptr", issue = "108652")]
2117+
#[stable(feature = "atomic_from_ptr", since = "CURRENT_RUSTC_VERSION")]
2118+
#[rustc_const_unstable(feature = "const_atomic_from_ptr", issue = "108652")]
21192119
pub const unsafe fn from_ptr<'a>(ptr: *mut $int_type) -> &'a $atomic_type {
21202120
// SAFETY: guaranteed by the caller
21212121
unsafe { &*ptr.cast() }

0 commit comments

Comments
 (0)