Merge subtree update for toolchain nightly-2025-04-21 (model-checking#336)

This is an automated PR to merge library subtree updates from 2025-04-07
(rust-lang/rust@2fa8b11) to 2025-04-21
(rust-lang/rust@b8c54d6) (inclusive)
into main. `git merge` resulted in conflicts, which require manual
resolution. Files were commited with merge conflict markers. **Do not
remove or edit the following annotations:**
git-subtree-dir: library
git-subtree-split: 2ab28f3

---------

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
Signed-off-by: Ayush Singh <ayush@beagleboard.org>
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
Co-authored-by: Ralf Jung <post@ralfj.de>
Co-authored-by: Chris Denton <chris@chrisdenton.dev>
Co-authored-by: Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: Jacob Pratt <jacob@jhpratt.dev>
Co-authored-by: beetrees <b@beetr.ee>
Co-authored-by: Thalia Archibald <thalia@archibald.dev>
Co-authored-by: Mads Marquart <mads@marquart.dk>
Co-authored-by: Christopher Durham <cad97@cad97.com>
Co-authored-by: James Wainwright <james.wainwright@lowrisc.org>
Co-authored-by: joboet <jonasboettiger@icloud.com>
Co-authored-by: Mara Bos <m-ou.se@m-ou.se>
Co-authored-by: Rafael Bachmann <rafael.bachmann.93@gmail.com>
Co-authored-by: xizheyin <xizheyin@smail.nju.edu.cn>
Co-authored-by: Benoît du Garreau <benoit@dugarreau.fr>
Co-authored-by: Nikolai Kuklin <nickkuklin@gmail.com>
Co-authored-by: Frank King <frankking1729@gmail.com>
Co-authored-by: Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>
Co-authored-by: Scott McMurray <scottmcm@users.noreply.github.com>
Co-authored-by: mejrs <59372212+mejrs@users.noreply.github.com>
Co-authored-by: okaneco <47607823+okaneco@users.noreply.github.com>
Co-authored-by: clubby789 <jamie@hill-daniel.co.uk>
Co-authored-by: Takayuki Maeda <takoyaki0316@gmail.com>
Co-authored-by: Daniel Bloom <daniel@wormholelabs.xyz>
Co-authored-by: Trevor Gross <tmgross@umich.edu>
Co-authored-by: Jake Wharton <jw@squareup.com>
Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>
Co-authored-by: Kornel <kornel@geekhood.net>
Co-authored-by: Calder Coalson <caldercoalson@gmail.com>
Co-authored-by: Stuart Cook <Zalathar@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: izarma <phuckuhh@gmail.com>
Co-authored-by: Bennet Bleßmann <bb-github@t-online.de>
Co-authored-by: Celina G. Val <celinval@amazon.com>
Co-authored-by: Jonathan Gruner <jogru0@gmail.com>
Co-authored-by: Stan Manilov <stanislav.manilov@gmail.com>
Co-authored-by: Gabriel Bjørnager Jensen <gabriel@achernar.io>
Co-authored-by: lincot <lincot@disroot.org>
Co-authored-by: timesince <seekseat@icloud.com>
Co-authored-by: Boxy <rust@boxyuwu.dev>
Co-authored-by: oyvindln <oyvindln@users.noreply.github.com>
Co-authored-by: Alice Ryhl <aliceryhl@google.com>
Co-authored-by: Folkert de Vries <folkert@folkertdev.nl>
Co-authored-by: Bastian Kersting <bkersting@google.com>
Co-authored-by: Petros Angelatos <petrosagg@gmail.com>
Co-authored-by: Jesus Checa Hidalgo <jchecahi@redhat.com>
Co-authored-by: Michael Howell <michael@notriddle.com>
Co-authored-by: Ricardo Fernández Serrata <76864299+Rudxain@users.noreply.github.com>
Co-authored-by: GenYuLi <witherslin@synology.com>
Co-authored-by: Chris Denton <christophersdenton@gmail.com>
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
Co-authored-by: Sky <sky@sky9.dev>
Co-authored-by: Huang Qi <huangqi3@xiaomi.com>
Co-authored-by: Ayush Singh <ayush@beagleboard.org>
Co-authored-by: 0x79de <0x79de@gmail.com>
Co-authored-by: binarycat <binarycat@envs.net>
Co-authored-by: Glyn Normington <glyn.normington@gmail.com>
Co-authored-by: Tamir Duberstein <tamird@gmail.com>
Co-authored-by: Josh Triplett <josh@joshtriplett.org>
Co-authored-by: Bastian Kersting <bastian@cmbt.de>
Co-authored-by: Lyndon Brown <jnqnfe@gmail.com>
Co-authored-by: Patrick Mooney <pmooney@pfmooney.com>
Co-authored-by: gitbot <git@bot>
Co-authored-by: Michael Tautschnig <tautschn@amazon.com>

Author: 65 people

library/Cargo.lock

@@ -16,7 +16,7 @@ bench = false
 
 [dependencies]
 core = { path = "../core", public = true }
-compiler_builtins = { version = "=0.1.152", features = ['rustc-dep-of-std'] }
+compiler_builtins = { version = "=0.1.155", features = ['rustc-dep-of-std'] }
 safety = { path = "../contracts/safety" }
 
 [features]

library/alloc/Cargo.toml

@@ -16,22 +16,22 @@ unsafe extern "Rust" {
     // otherwise.
     #[rustc_allocator]
     #[rustc_nounwind]
-    #[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
+    #[rustc_std_internal_symbol]
     fn __rust_alloc(size: usize, align: usize) -> *mut u8;
     #[rustc_deallocator]
     #[rustc_nounwind]
-    #[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
+    #[rustc_std_internal_symbol]
     fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize);
     #[rustc_reallocator]
     #[rustc_nounwind]
-    #[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
+    #[rustc_std_internal_symbol]
     fn __rust_realloc(ptr: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8;
     #[rustc_allocator_zeroed]
     #[rustc_nounwind]
-    #[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
+    #[rustc_std_internal_symbol]
     fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8;
 
-    #[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
+    #[rustc_std_internal_symbol]
     static __rust_no_alloc_shim_is_unstable: u8;
 }
 
@@ -360,7 +360,7 @@ unsafe extern "Rust" {
     // This is the magic symbol to call the global alloc error handler. rustc generates
     // it to call `__rg_oom` if there is a `#[alloc_error_handler]`, or to call the
     // default implementations below (`__rdl_oom`) otherwise.
-    #[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
+    #[rustc_std_internal_symbol]
     fn __rust_alloc_error_handler(size: usize, align: usize) -> !;
 }
 
@@ -427,7 +427,7 @@ pub mod __alloc_error_handler {
         unsafe extern "Rust" {
             // This symbol is emitted by rustc next to __rust_alloc_error_handler.
             // Its value depends on the -Zoom={panic,abort} compiler option.
-            #[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
+            #[rustc_std_internal_symbol]
             static __rust_alloc_error_handler_should_panic: u8;
         }
 

library/alloc/src/alloc.rs

@@ -952,7 +952,7 @@ impl<T, A: Allocator> Box<mem::MaybeUninit<T>, A> {
     ///     assert_eq!(*x, i);
     /// }
     /// ```
-    #[stable(feature = "box_uninit_write", since = "CURRENT_RUSTC_VERSION")]
+    #[stable(feature = "box_uninit_write", since = "1.87.0")]
     #[inline]
     pub fn write(mut boxed: Self, value: T) -> Box<T, A> {
         unsafe {

library/alloc/src/boxed.rs

@@ -9,7 +9,7 @@ pub(super) struct SetValZST;
 /// Returns `true` only for type `SetValZST`, `false` for all other types (blanket implementation).
 /// `TypeId` requires a `'static` lifetime, use of this trait avoids that restriction.
 ///
-/// [`TypeId`]: std::any::TypeId
+/// [`TypeId`]: core::any::TypeId
 pub(super) trait IsSetVal {
     fn is_set_val() -> bool;
 }

library/alloc/src/collections/btree/set_val.rs

@@ -1151,7 +1151,7 @@ impl<T, A: Allocator> LinkedList<T, A> {
     /// assert_eq!(evens.into_iter().collect::<Vec<_>>(), vec![2, 4, 6, 8, 14]);
     /// assert_eq!(odds.into_iter().collect::<Vec<_>>(), vec![1, 3, 5, 9, 11, 13, 15]);
     /// ```
-    #[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
+    #[stable(feature = "extract_if", since = "1.87.0")]
     pub fn extract_if<F>(&mut self, filter: F) -> ExtractIf<'_, T, F, A>
     where
         F: FnMut(&mut T) -> bool,
@@ -1931,7 +1931,7 @@ impl<'a, T, A: Allocator> CursorMut<'a, T, A> {
 }
 
 /// An iterator produced by calling `extract_if` on LinkedList.
-#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
+#[stable(feature = "extract_if", since = "1.87.0")]
 #[must_use = "iterators are lazy and do nothing unless consumed"]
 pub struct ExtractIf<
     'a,
@@ -1946,7 +1946,7 @@ pub struct ExtractIf<
     old_len: usize,
 }
 
-#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
+#[stable(feature = "extract_if", since = "1.87.0")]
 impl<T, F, A: Allocator> Iterator for ExtractIf<'_, T, F, A>
 where
     F: FnMut(&mut T) -> bool,
@@ -1975,7 +1975,7 @@ where
     }
 }
 
-#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
+#[stable(feature = "extract_if", since = "1.87.0")]
 impl<T: fmt::Debug, F> fmt::Debug for ExtractIf<'_, T, F> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_tuple("ExtractIf").field(&self.list).finish()

library/alloc/src/collections/linked_list.rs

@@ -1116,7 +1116,7 @@ impl CStr {
     /// with the corresponding <code>&[str]</code> slice. Otherwise, it will
     /// replace any invalid UTF-8 sequences with
     /// [`U+FFFD REPLACEMENT CHARACTER`][U+FFFD] and return a
-    /// <code>[Cow]::[Owned]\(&[str])</code> with the result.
+    /// <code>[Cow]::[Owned]\([String])</code> with the result.
     ///
     /// [str]: prim@str "str"
     /// [Borrowed]: Cow::Borrowed

library/alloc/src/ffi/c_str.rs

@@ -109,7 +109,7 @@
 //! parameters (corresponding to `format_spec` in [the syntax](#syntax)). These
 //! parameters affect the string representation of what's being formatted.
 //!
-//! The colon `:` in format syntax divides indentifier of the input data and
+//! The colon `:` in format syntax divides identifier of the input data and
 //! the formatting options, the colon itself does not change anything, only
 //! introduces the options.
 //!

library/alloc/src/fmt.rs

@@ -105,6 +105,7 @@
 #![feature(async_iterator)]
 #![feature(bstr)]
 #![feature(bstr_internals)]
+#![feature(char_internals)]
 #![feature(char_max_len)]
 #![feature(clone_to_uninit)]
 #![feature(coerce_unsized)]
@@ -136,6 +137,7 @@
 #![feature(pattern)]
 #![feature(pin_coerce_unsized_trait)]
 #![feature(pointer_like_trait)]
+#![feature(ptr_alignment_type)]
 #![feature(ptr_internals)]
 #![feature(ptr_metadata)]
 #![feature(set_ptr_value)]

library/alloc/src/lib.rs

@@ -6,7 +6,7 @@
 
 use core::marker::PhantomData;
 use core::mem::{ManuallyDrop, MaybeUninit, SizedTypeProperties};
-use core::ptr::{self, NonNull, Unique};
+use core::ptr::{self, Alignment, NonNull, Unique};
 use core::{cmp, hint};
 
 #[cfg(not(no_global_oom_handling))]
@@ -177,7 +177,7 @@ impl<T, A: Allocator> RawVec<T, A> {
     /// the returned `RawVec`.
     #[inline]
     pub(crate) const fn new_in(alloc: A) -> Self {
-        Self { inner: RawVecInner::new_in(alloc, align_of::<T>()), _marker: PhantomData }
+        Self { inner: RawVecInner::new_in(alloc, Alignment::of::<T>()), _marker: PhantomData }
     }
 
     /// Like `with_capacity`, but parameterized over the choice of
@@ -409,8 +409,8 @@ unsafe impl<#[may_dangle] T, A: Allocator> Drop for RawVec<T, A> {
 
 impl<A: Allocator> RawVecInner<A> {
     #[inline]
-    const fn new_in(alloc: A, align: usize) -> Self {
-        let ptr = unsafe { core::mem::transmute(align) };
+    const fn new_in(alloc: A, align: Alignment) -> Self {
+        let ptr = Unique::from_non_null(NonNull::without_provenance(align.as_nonzero()));
         // `cap: 0` means "unallocated". zero-sized types are ignored.
         Self { ptr, cap: ZERO_CAP, alloc }
     }
@@ -465,7 +465,7 @@ impl<A: Allocator> RawVecInner<A> {
 
         // Don't allocate here because `Drop` will not deallocate when `capacity` is 0.
         if layout.size() == 0 {
-            return Ok(Self::new_in(alloc, elem_layout.align()));
+            return Ok(Self::new_in(alloc, elem_layout.alignment()));
         }
 
         if let Err(err) = alloc_guard(layout.size()) {