Merge subtree update for toolchain nightly-2025-07-02 (model-checking#407)

This is an automated PR to merge library subtree updates from 2025-06-17
(rust-lang/rust@45acf54) to 2025-07-02
(rust-lang/rust@71e4c00) (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: 46c01c8

---------

Signed-off-by: xizheyin <[email protected]>
Co-authored-by: Trevor Gross <[email protected]>
Co-authored-by: Folkert de Vries <[email protected]>
Co-authored-by: León Orell Valerian Liehr <[email protected]>
Co-authored-by: Gray Olson <[email protected]>
Co-authored-by: Pascal S. de Kloe <[email protected]>
Co-authored-by: David Carlier <[email protected]>
Co-authored-by: bors <[email protected]>
Co-authored-by: Shun Sakai <[email protected]>
Co-authored-by: Deven T. Corzine <[email protected]>
Co-authored-by: Amanieu d'Antras <[email protected]>
Co-authored-by: Boxy <[email protected]>
Co-authored-by: Mara Bos <[email protected]>
Co-authored-by: github-actions <[email protected]>
Co-authored-by: Jeremy Smart <[email protected]>
Co-authored-by: Urgau <[email protected]>
Co-authored-by: Jakub Beránek <[email protected]>
Co-authored-by: xizheyin <[email protected]>
Co-authored-by: Ralf Jung <[email protected]>
Co-authored-by: Tamir Duberstein <[email protected]>
Co-authored-by: Matthias Krüger <[email protected]>
Co-authored-by: mejrs <[email protected]>
Co-authored-by: qinghon <[email protected]>
Co-authored-by: Chris Denton <[email protected]>
Co-authored-by: Sasha Pourcelot <[email protected]>
Co-authored-by: Soveu <[email protected]>
Co-authored-by: David Tolnay <[email protected]>
Co-authored-by: Jubilee <[email protected]>
Co-authored-by: Mu001999 <[email protected]>
Co-authored-by: bjorn3 <[email protected]>
Co-authored-by: sayantn <[email protected]>
Co-authored-by: Christopher Berner <[email protected]>
Co-authored-by: Markus Reiter <[email protected]>
Co-authored-by: The 8472 <[email protected]>
Co-authored-by: 王宇逸 <[email protected]>
Co-authored-by: Marijn Schouten <[email protected]>
Co-authored-by: Michał Łowicki <[email protected]>
Co-authored-by: Yotam Ofek <[email protected]>
Co-authored-by: Guillaume Gomez <[email protected]>
Co-authored-by: David Wood <[email protected]>
Co-authored-by: Neal <[email protected]>
Co-authored-by: Tomoaki Kobayashi <[email protected]>
Co-authored-by: Daniel Paoliello <[email protected]>
Co-authored-by: Marijn Schouten <[email protected]>
Co-authored-by: Benoît du Garreau <[email protected]>
Co-authored-by: Aniket Mishra <[email protected]>
Co-authored-by: satiscugcat <[email protected]>
Co-authored-by: Jacob Pratt <[email protected]>
Co-authored-by: Urgau <[email protected]>
Co-authored-by: Zachary S <[email protected]>
Co-authored-by: Trevor Gross <[email protected]>
Co-authored-by: Tim (Theemathas) Chirananthavat <[email protected]>
Co-authored-by: Alice Ryhl <[email protected]>
Co-authored-by: Kornel <[email protected]>
Co-authored-by: Daniel Bloom <[email protected]>
Co-authored-by: Ed Page <[email protected]>
Co-authored-by: The Miri Cronjob Bot <[email protected]>
Co-authored-by: Chai T. Rex <[email protected]>
Co-authored-by: Valdemar Erk <[email protected]>
Co-authored-by: Samuel Tardieu <[email protected]>
Co-authored-by: binarycat <[email protected]>
Co-authored-by: Tshepang Mbambo <[email protected]>
Co-authored-by: Laine Taffin Altman <[email protected]>
Co-authored-by: Oli Scherer <[email protected]>
Co-authored-by: MetaNova <[email protected]>
Co-authored-by: Kurt Heiritz (pseudo) <[email protected]>
Co-authored-by: krikera <[email protected]>
Co-authored-by: Pavel Grigorenko <[email protected]>
Co-authored-by: Michael Goulet <[email protected]>
Co-authored-by: Bastian Kersting <[email protected]>
Co-authored-by: Deadbeef <[email protected]>
Co-authored-by: Cheng Xu <[email protected]>
Co-authored-by: наб <[email protected]>
Co-authored-by: kilavvy <[email protected]>
Co-authored-by: zachs18 <[email protected]>
Co-authored-by: dianqk <[email protected]>
Co-authored-by: gitbot <git@bot>
Co-authored-by: Michael Tautschnig <[email protected]>

Author: 73 people

.github/workflows/goto-transcoder.yml

@@ -27,8 +27,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Apply stdarch patch
-        run: cd library/stdarch && patch -p1 < ../../stdarch.patch
 
       # Step 2: Generate contracts programs
       - name: Generate contracts

.github/workflows/kani-metrics.yml

@@ -25,9 +25,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Apply stdarch patch
-      run: cd library/stdarch && patch -p1 < ../../stdarch.patch
-
+    
     # The Kani metrics collection uses a Python script (kani_std_analysis.py), so make sure Python is installed
     - name: Set up Python
       uses: actions/setup-python@v4

.github/workflows/kani.yml

@@ -51,9 +51,7 @@ jobs:
         with:
           path: head
           submodules: true
-      - name: Apply stdarch patch
-        run: cd head/library/stdarch && patch -p1 < ../../stdarch.patch
-
+      
       # Step 2: Install jq
       - name: Install jq
         if: matrix.os == 'ubuntu-latest'
@@ -90,8 +88,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Apply stdarch patch
-        run: cd library/stdarch && patch -p1 < ../../stdarch.patch
 
       # Step 2: Run Kani autoharness on the std library for selected functions.
       # Uses "--include-pattern" to make sure we do not try to run across all
@@ -102,8 +98,6 @@ jobs:
       # - We use >::disjoint_bitor (and >::unchecked_disjoint_bitor) as pattern
       #   as whitespace is not supported, cf.
       #   https://github.com/model-checking/kani/issues/4046
-      # - core_arch::x86::__m128d::as_f64x2 is just one example of hundreds of
-      #   core_arch::x86:: functions that are known to verify successfully.
       - name: Run Kani Verification
         run: |
           scripts/run-kani.sh --run autoharness --kani-args \
@@ -113,7 +107,6 @@ jobs:
             --include-pattern alloc::layout::Layout::from_size_align \
             --include-pattern ascii::ascii_char::AsciiChar::from_u8 \
             --include-pattern char::convert::from_u32_unchecked \
-            --include-pattern core_arch::x86::__m128d::as_f64x2 \
             --include-pattern "num::nonzero::NonZero::<i8>::count_ones" \
             --include-pattern "num::nonzero::NonZero::<i16>::count_ones" \
             --include-pattern "num::nonzero::NonZero::<i32>::count_ones" \
@@ -295,8 +288,6 @@ jobs:
         with:
           path: head
           submodules: true
-      - name: Apply stdarch patch
-        run: cd head/library/stdarch && patch -p1 < ../../stdarch.patch
 
       # Step 2: Run list on the std library
       - name: Run Kani List
@@ -329,8 +320,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Apply stdarch patch
-        run: cd library/stdarch && patch -p1 < ../../stdarch.patch
 
       # Step 2: Run autoharness analyzer on the std library
       - name: Run Autoharness Analyzer

library/Cargo.lock

@@ -1,3 +1,5 @@
+cargo-features = ["profile-rustflags"]
+
 [workspace]
 resolver = "1"
 members = [
@@ -44,9 +46,16 @@ object.debug = 0
 rustc-demangle.debug = 0
 rustc-demangle.opt-level = "s"
 
+# panic_abort must always be compiled with panic=abort, even when the rest of the
+# sysroot is panic=unwind.
+[profile.dev.package.panic_abort]
+rustflags = ["-Cpanic=abort"]
+
+[profile.release.package.panic_abort]
+rustflags = ["-Cpanic=abort"]
+
 [patch.crates-io]
-# See comments in `library/rustc-std-workspace-core/README.md` for what's going on
-# here
+# See comments in `library/rustc-std-workspace-core/README.md` for what's going on here
 rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }

library/Cargo.toml

@@ -31,8 +31,9 @@ unsafe extern "Rust" {
     #[rustc_std_internal_symbol]
     fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8;
 
+    #[rustc_nounwind]
     #[rustc_std_internal_symbol]
-    static __rust_no_alloc_shim_is_unstable: u8;
+    fn __rust_no_alloc_shim_is_unstable_v2();
 }
 
 /// The global memory allocator.
@@ -88,7 +89,7 @@ pub unsafe fn alloc(layout: Layout) -> *mut u8 {
     unsafe {
         // Make sure we don't accidentally allow omitting the allocator shim in
         // stable code until it is actually stabilized.
-        core::ptr::read_volatile(&__rust_no_alloc_shim_is_unstable);
+        __rust_no_alloc_shim_is_unstable_v2();
 
         __rust_alloc(layout.size(), layout.align())
     }
@@ -171,7 +172,7 @@ pub unsafe fn alloc_zeroed(layout: Layout) -> *mut u8 {
     unsafe {
         // Make sure we don't accidentally allow omitting the allocator shim in
         // stable code until it is actually stabilized.
-        core::ptr::read_volatile(&__rust_no_alloc_shim_is_unstable);
+        __rust_no_alloc_shim_is_unstable_v2();
 
         __rust_alloc_zeroed(layout.size(), layout.align())
     }

library/alloc/src/alloc.rs

@@ -1517,9 +1517,7 @@ impl<T: Ord, const N: usize> From<[T; N]> for BTreeSet<T> {
 
         // use stable sort to preserve the insertion order.
         arr.sort();
-        let iter = IntoIterator::into_iter(arr).map(|k| (k, SetValZST::default()));
-        let map = BTreeMap::bulk_build_from_sorted_iter(iter, Global);
-        BTreeSet { map }
+        BTreeSet::from_sorted_iter(IntoIterator::into_iter(arr), Global)
     }
 }