Merge subtree update for toolchain nightly-2025-06-17 (#392)

This is an automated PR to merge library subtree updates from 2025-06-03
(rust-lang/rust@5d707b0) to 2025-06-17
(rust-lang/rust@45acf54) (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: 3b96c9b

---------

Signed-off-by: xizheyin <[email protected]>
Signed-off-by: onur-ozkan <[email protected]>
Co-authored-by: Trevor Gross <[email protected]>
Co-authored-by: bors <[email protected]>
Co-authored-by: Matthias Krüger <[email protected]>
Co-authored-by: Orson Peters <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Scott McMurray <[email protected]>
Co-authored-by: Jubilee <[email protected]>
Co-authored-by: xizheyin <[email protected]>
Co-authored-by: The Miri Cronjob Bot <[email protected]>
Co-authored-by: Ruan Comelli <[email protected]>
Co-authored-by: Ralf Jung <[email protected]>
Co-authored-by: Jacob Pratt <[email protected]>
Co-authored-by: zacryol <[email protected]>
Co-authored-by: Guillaume Gomez <[email protected]>
Co-authored-by: neeko-cat <[email protected]>
Co-authored-by: usamoi <[email protected]>
Co-authored-by: Jakub Beránek <[email protected]>
Co-authored-by: Eric Huss <[email protected]>
Co-authored-by: Sidney Cammeresi <[email protected]>
Co-authored-by: Josh Stone <[email protected]>
Co-authored-by: Jeremy Smart <[email protected]>
Co-authored-by: zachs18 <[email protected]>
Co-authored-by: onur-ozkan <[email protected]>
Co-authored-by: sayantn <[email protected]>
Co-authored-by: LorrensP-2158466 <[email protected]>
Co-authored-by: Oli Scherer <[email protected]>
Co-authored-by: Oli Scherer <[email protected]>
Co-authored-by: Jieyou Xu <[email protected]>
Co-authored-by: Travis Cross <[email protected]>
Co-authored-by: Josh Triplett <[email protected]>
Co-authored-by: Taylor Cramer <[email protected]>
Co-authored-by: Paolo Barbolini <[email protected]>
Co-authored-by: Tobias Bucher <[email protected]>
Co-authored-by: Thalia Archibald <[email protected]>
Co-authored-by: WANG Rui <[email protected]>
Co-authored-by: Tshepang Mbambo <[email protected]>
Co-authored-by: schvv31n <[email protected]>
Co-authored-by: Marijn Schouten <[email protected]>
Co-authored-by: Urgau <[email protected]>
Co-authored-by: Trevor Gross <[email protected]>
Co-authored-by: binarycat <[email protected]>
Co-authored-by: Alona Enraght-Moony <[email protected]>
Co-authored-by: Ed Page <[email protected]>
Co-authored-by: kiseitai3 <[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: Shun Sakai <[email protected]>
Co-authored-by: Mara Bos <[email protected]>
Co-authored-by: github-actions <[email protected]>
Co-authored-by: Tamir Duberstein <[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: David Tolnay <[email protected]>
Co-authored-by: bjorn3 <[email protected]>
Co-authored-by: Christopher Berner <[email protected]>
Co-authored-by: Yotam Ofek <[email protected]>
Co-authored-by: gitbot <git@bot>
Co-authored-by: Carolyn Zech <[email protected]>
Co-authored-by: Michael Tautschnig <[email protected]>

Author: 61 people

.github/workflows/kani.yml

@@ -282,6 +282,13 @@ jobs:
     name: Kani List
     runs-on: ubuntu-latest
     steps:
+      - name: Remove unnecessary software to free up disk space
+        run: |
+          # inspired by https://github.com/easimon/maximize-build-space/blob/master/action.yml
+          df -h
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /usr/local/.ghcup
+          df -h
+
       # Step 1: Check out the repository
       - name: Checkout Repository
         uses: actions/checkout@v4

library/Cargo.lock

@@ -50,3 +50,4 @@ rustc-demangle.opt-level = "s"
 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' }
+compiler_builtins = { path = "compiler-builtins/compiler-builtins" }

library/Cargo.toml

@@ -16,8 +16,8 @@ bench = false
 
 [dependencies]
 core = { path = "../core", public = true }
+compiler_builtins = { path = "../compiler-builtins/compiler-builtins", features = ["rustc-dep-of-std"] }
 safety = { path = "../contracts/safety" }
-compiler_builtins = { version = "=0.1.160", features = ['rustc-dep-of-std'] }
 
 [features]
 compiler-builtins-mem = ['compiler_builtins/mem']
@@ -33,7 +33,6 @@ optimize_for_size = ["core/optimize_for_size"]
 [lints.rust.unexpected_cfgs]
 level = "warn"
 check-cfg = [
-    'cfg(bootstrap)',
     'cfg(no_global_oom_handling)',
     'cfg(no_rc)',
     'cfg(no_sync)',

library/alloc/Cargo.toml

@@ -1416,18 +1416,18 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
     ///
     /// # Examples
     ///
-    /// Splitting a map into even and odd keys, reusing the original map:
-    ///
     /// ```
     /// #![feature(btree_extract_if)]
     /// use std::collections::BTreeMap;
     ///
+    /// // Splitting a map into even and odd keys, reusing the original map:
     /// let mut map: BTreeMap<i32, i32> = (0..8).map(|x| (x, x)).collect();
     /// let evens: BTreeMap<_, _> = map.extract_if(.., |k, _v| k % 2 == 0).collect();
     /// let odds = map;
     /// assert_eq!(evens.keys().copied().collect::<Vec<_>>(), [0, 2, 4, 6]);
     /// assert_eq!(odds.keys().copied().collect::<Vec<_>>(), [1, 3, 5, 7]);
     ///
+    /// // Splitting a map into low and high halves, reusing the original map:
     /// let mut map: BTreeMap<i32, i32> = (0..8).map(|x| (x, x)).collect();
     /// let low: BTreeMap<_, _> = map.extract_if(0..4, |_k, _v| true).collect();
     /// let high = map;

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

@@ -1201,30 +1201,30 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {
     /// [`retain`]: BTreeSet::retain
     /// # Examples
     ///
-    /// Splitting a set into even and odd values, reusing the original set:
-    ///
     /// ```
     /// #![feature(btree_extract_if)]
     /// use std::collections::BTreeSet;
     ///
+    /// // Splitting a set into even and odd values, reusing the original set:
     /// let mut set: BTreeSet<i32> = (0..8).collect();
     /// let evens: BTreeSet<_> = set.extract_if(.., |v| v % 2 == 0).collect();
     /// let odds = set;
     /// assert_eq!(evens.into_iter().collect::<Vec<_>>(), vec![0, 2, 4, 6]);
     /// assert_eq!(odds.into_iter().collect::<Vec<_>>(), vec![1, 3, 5, 7]);
     ///
-    /// let mut map: BTreeSet<i32> = (0..8).collect();
-    /// let low: BTreeSet<_> = map.extract_if(0..4, |_v| true).collect();
-    /// let high = map;
+    /// // Splitting a set into low and high halves, reusing the original set:
+    /// let mut set: BTreeSet<i32> = (0..8).collect();
+    /// let low: BTreeSet<_> = set.extract_if(0..4, |_v| true).collect();
+    /// let high = set;
     /// assert_eq!(low.into_iter().collect::<Vec<_>>(), [0, 1, 2, 3]);
     /// assert_eq!(high.into_iter().collect::<Vec<_>>(), [4, 5, 6, 7]);
     /// ```
     #[unstable(feature = "btree_extract_if", issue = "70530")]
-    pub fn extract_if<'a, F, R>(&'a mut self, range: R, pred: F) -> ExtractIf<'a, T, R, F, A>
+    pub fn extract_if<F, R>(&mut self, range: R, pred: F) -> ExtractIf<'_, T, R, F, A>
     where
         T: Ord,
         R: RangeBounds<T>,
-        F: 'a + FnMut(&T) -> bool,
+        F: FnMut(&T) -> bool,
     {
         let (inner, alloc) = self.map.extract_if_inner(range);
         ExtractIf { pred, inner, alloc }
@@ -1585,11 +1585,11 @@ where
 }
 
 #[unstable(feature = "btree_extract_if", issue = "70530")]
-impl<'a, T, R, F, A: Allocator + Clone> Iterator for ExtractIf<'_, T, R, F, A>
+impl<T, R, F, A: Allocator + Clone> Iterator for ExtractIf<'_, T, R, F, A>
 where
     T: PartialOrd,
     R: RangeBounds<T>,
-    F: 'a + FnMut(&T) -> bool,
+    F: FnMut(&T) -> bool,
 {
     type Item = T;
 

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

@@ -714,6 +714,8 @@ impl ops::Deref for CString {
     }
 }
 
+/// Delegates to the [`CStr`] implementation of [`fmt::Debug`],
+/// showing invalid UTF-8 as hex escapes.
 #[stable(feature = "rust1", since = "1.0.0")]
 impl fmt::Debug for CString {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

library/alloc/src/ffi/c_str.rs

@@ -66,7 +66,6 @@
 )]
 #![doc(cfg_hide(
     not(test),
-    not(any(test, bootstrap)),
     no_global_oom_handling,
     not(no_global_oom_handling),
     not(no_rc),
@@ -133,7 +132,6 @@
 #![feature(local_waker)]
 #![feature(maybe_uninit_slice)]
 #![feature(maybe_uninit_uninit_array_transpose)]
-#![feature(nonnull_provenance)]
 #![feature(panic_internals)]
 #![feature(pattern)]
 #![feature(pin_coerce_unsized_trait)]

library/alloc/src/lib.rs

@@ -493,8 +493,6 @@ impl<T> [T] {
     ///
     /// # Examples
     ///
-    /// Basic usage:
-    ///
     /// ```
     /// assert_eq!([1, 2].repeat(3), vec![1, 2, 1, 2, 1, 2]);
     /// ```

library/alloc/src/slice.rs

@@ -246,8 +246,6 @@ impl str {
     ///
     /// # Examples
     ///
-    /// Basic usage:
-    ///
     /// ```
     /// let s = "this is old";
     ///
@@ -303,8 +301,6 @@ impl str {
     ///
     /// # Examples
     ///
-    /// Basic usage:
-    ///
     /// ```
     /// let s = "foo foo 123 foo";
     /// assert_eq!("new new 123 foo", s.replacen("foo", "new", 2));