Add #[rustc_significant_interior_mutable_type] to core and std types

Author: Urgau

library/core/src/cell.rs

@@ -308,6 +308,7 @@ pub use once::OnceCell;
 #[stable(feature = "rust1", since = "1.0.0")]
 #[repr(transparent)]
 #[rustc_pub_transparent]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct Cell<T: ?Sized> {
     value: UnsafeCell<T>,
 }
@@ -718,6 +719,7 @@ impl<T, const N: usize> Cell<[T; N]> {
 /// See the [module-level documentation](self) for more.
 #[rustc_diagnostic_item = "RefCell"]
 #[stable(feature = "rust1", since = "1.0.0")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct RefCell<T: ?Sized> {
     borrow: Cell<BorrowFlag>,
     // Stores the location of the earliest currently active borrow.
@@ -2067,6 +2069,7 @@ impl<T: ?Sized + fmt::Display> fmt::Display for RefMut<'_, T> {
 #[stable(feature = "rust1", since = "1.0.0")]
 #[repr(transparent)]
 #[rustc_pub_transparent]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct UnsafeCell<T: ?Sized> {
     value: T,
 }

library/core/src/cell/lazy.rs

@@ -35,6 +35,7 @@ enum State<T, F> {
 /// //   92
 /// ```
 #[stable(feature = "lazy_cell", since = "1.80.0")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct LazyCell<T, F = fn() -> T> {
     state: UnsafeCell<State<T, F>>,
 }

library/core/src/cell/once.rs

@@ -32,6 +32,7 @@ use crate::{fmt, mem};
 /// assert!(cell.get().is_some());
 /// ```
 #[stable(feature = "once_cell", since = "1.70.0")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct OnceCell<T> {
     // Invariant: written to at most once.
     inner: UnsafeCell<Option<T>>,

library/core/src/sync/atomic.rs

@@ -361,6 +361,7 @@ const EMULATE_ATOMIC_BOOL: bool =
 #[cfg(target_has_atomic_load_store = "8")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_diagnostic_item = "AtomicBool"]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 #[repr(C, align(1))]
 pub struct AtomicBool {
     v: UnsafeCell<u8>,
@@ -390,6 +391,7 @@ unsafe impl Sync for AtomicBool {}
 #[cfg(target_has_atomic_load_store = "ptr")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_diagnostic_item = "AtomicPtr"]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 #[cfg_attr(target_pointer_width = "16", repr(C, align(2)))]
 #[cfg_attr(target_pointer_width = "32", repr(C, align(4)))]
 #[cfg_attr(target_pointer_width = "64", repr(C, align(8)))]
@@ -2484,6 +2486,7 @@ macro_rules! atomic_int {
      $const_stable_new:meta,
      $const_stable_into_inner:meta,
      $diagnostic_item:meta,
+     $interior_mut_item:meta,
      $s_int_type:literal,
      $extra_feature:expr,
      $min_fn:ident, $max_fn:ident,
@@ -2521,6 +2524,7 @@ macro_rules! atomic_int {
         /// [module-level documentation]: crate::sync::atomic
         #[$stable]
         #[$diagnostic_item]
+        #[$interior_mut_item]
         #[repr(C, align($align))]
         pub struct $atomic_type {
             v: UnsafeCell<$int_type>,
@@ -3544,6 +3548,7 @@ atomic_int! {
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
     rustc_diagnostic_item = "AtomicI8",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "i8",
     "",
     atomic_min, atomic_max,
@@ -3563,6 +3568,7 @@ atomic_int! {
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
     rustc_diagnostic_item = "AtomicU8",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "u8",
     "",
     atomic_umin, atomic_umax,
@@ -3582,6 +3588,7 @@ atomic_int! {
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
     rustc_diagnostic_item = "AtomicI16",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "i16",
     "",
     atomic_min, atomic_max,
@@ -3601,6 +3608,7 @@ atomic_int! {
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
     rustc_diagnostic_item = "AtomicU16",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "u16",
     "",
     atomic_umin, atomic_umax,
@@ -3620,6 +3628,7 @@ atomic_int! {
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
     rustc_diagnostic_item = "AtomicI32",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "i32",
     "",
     atomic_min, atomic_max,
@@ -3639,6 +3648,7 @@ atomic_int! {
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
     rustc_diagnostic_item = "AtomicU32",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "u32",
     "",
     atomic_umin, atomic_umax,
@@ -3658,6 +3668,7 @@ atomic_int! {
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
     rustc_diagnostic_item = "AtomicI64",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "i64",
     "",
     atomic_min, atomic_max,
@@ -3677,6 +3688,7 @@ atomic_int! {
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
     rustc_diagnostic_item = "AtomicU64",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "u64",
     "",
     atomic_umin, atomic_umax,
@@ -3696,6 +3708,7 @@ atomic_int! {
     rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
     rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
     rustc_diagnostic_item = "AtomicI128",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "i128",
     "#![feature(integer_atomics)]\n\n",
     atomic_min, atomic_max,
@@ -3715,6 +3728,7 @@ atomic_int! {
     rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
     rustc_const_unstable(feature = "integer_atomics", issue = "99069"),
     rustc_diagnostic_item = "AtomicU128",
+    cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
     "u128",
     "#![feature(integer_atomics)]\n\n",
     atomic_umin, atomic_umax,
@@ -3738,6 +3752,7 @@ macro_rules! atomic_int_ptr_sized {
             rustc_const_stable(feature = "const_ptr_sized_atomics", since = "1.24.0"),
             rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
             rustc_diagnostic_item = "AtomicIsize",
+            cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
             "isize",
             "",
             atomic_min, atomic_max,
@@ -3757,6 +3772,7 @@ macro_rules! atomic_int_ptr_sized {
             rustc_const_stable(feature = "const_ptr_sized_atomics", since = "1.24.0"),
             rustc_const_stable(feature = "const_atomic_into_inner", since = "1.79.0"),
             rustc_diagnostic_item = "AtomicUsize",
+            cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type),
             "usize",
             "",
             atomic_umin, atomic_umax,

library/std/src/sync/barrier.rs

@@ -26,6 +26,7 @@ use crate::sync::{Condvar, Mutex};
 /// });
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct Barrier {
     lock: Mutex<BarrierState>,
     cvar: Condvar,

library/std/src/sync/lazy_lock.rs

@@ -62,6 +62,7 @@ union Data<T, F> {
 /// }
 /// ```
 #[stable(feature = "lazy_cell", since = "1.80.0")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct LazyLock<T, F = fn() -> T> {
     // FIXME(nonpoison_once): if possible, switch to nonpoison version once it is available
     once: Once,

library/std/src/sync/once_lock.rs

@@ -103,6 +103,7 @@ use crate::sync::Once;
 ///
 /// ```
 #[stable(feature = "once_cell", since = "1.70.0")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct OnceLock<T> {
     // FIXME(nonpoison_once): switch to nonpoison version once it is available
     once: Once,

library/std/src/sync/poison/condvar.rs

@@ -106,6 +106,7 @@ impl WaitTimeoutResult {
 /// }
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct Condvar {
     inner: sys::Condvar,
 }

library/std/src/sync/poison/mutex.rs

@@ -172,6 +172,7 @@ use crate::sys::sync as sys;
 ///
 #[stable(feature = "rust1", since = "1.0.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "Mutex")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct Mutex<T: ?Sized> {
     inner: sys::Mutex,
     poison: poison::Flag,

library/std/src/sync/poison/once.rs

@@ -32,6 +32,7 @@ use crate::sys::sync as sys;
 /// [`OnceLock<T>`]: crate::sync::OnceLock
 /// [`LazyLock<T, F>`]: crate::sync::LazyLock
 #[stable(feature = "rust1", since = "1.0.0")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct Once {
     inner: sys::Once,
 }

library/std/src/sync/poison/rwlock.rs

@@ -77,6 +77,7 @@ use crate::sys::sync as sys;
 /// [`Mutex`]: super::Mutex
 #[stable(feature = "rust1", since = "1.0.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "RwLock")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct RwLock<T: ?Sized> {
     inner: sys::RwLock,
     poison: poison::Flag,

library/std/src/sync/reentrant_lock.rs

@@ -80,6 +80,7 @@ use crate::thread::{ThreadId, current_id};
 // we don't need to further synchronize the TID accesses, so they can be regular 64-bit
 // non-atomic accesses.
 #[unstable(feature = "reentrant_lock", issue = "121440")]
+#[cfg_attr(not(bootstrap), rustc_significant_interior_mutable_type)]
 pub struct ReentrantLock<T: ?Sized> {
     mutex: sys::Mutex,
     owner: Tid,