Merge subtree update for toolchain nightly-2025-07-31 (#437)

This is an automated PR to merge library subtree updates from 2025-07-30
(rust-lang/rust@ba7e63b) to 2025-07-31
(rust-lang/rust@3048886), inclusive.
This is a clean merge, no conflicts were detected. **Do not remove or
edit the following annotations:**
git-subtree-dir: library
git-subtree-split: af745a4

---------

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
Signed-off-by: Ayush Singh <ayush@beagleboard.org>
Co-authored-by: Roger Curley <rocurley@gmail.com>
Co-authored-by: Ralf Jung <post@ralfj.de>
Co-authored-by: Marijn Schouten <mhkbst@gmail.com>
Co-authored-by: Josh Triplett <josh@joshtriplett.org>
Co-authored-by: Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com>
Co-authored-by: Folkert de Vries <flokkievids@gmail.com>
Co-authored-by: okaneco <47607823+okaneco@users.noreply.github.com>
Co-authored-by: Folkert de Vries <folkert@folkertdev.nl>
Co-authored-by: Sayantan Chakraborty <142906350+sayantn@users.noreply.github.com>
Co-authored-by: nazo6 <git@nazo6.dev>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: Jakub Beránek <berykubik@gmail.com>
Co-authored-by: Orson Peters <orsonpeters@gmail.com>
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
Co-authored-by: xizheyin <xizheyin@smail.nju.edu.cn>
Co-authored-by: Deadbeef <ent3rm4n@gmail.com>
Co-authored-by: René Kijewski <rene.kijewski@fu-berlin.de>
Co-authored-by: Nik Revenco <pm@nikrev.com>
Co-authored-by: The Miri Cronjob Bot <miri@cron.bot>
Co-authored-by: Tim (Theemathas) Chirananthavat <theemathas@gmail.com>
Co-authored-by: Chris Denton <chris@chrisdenton.dev>
Co-authored-by: Samuel Tardieu <sam@rfc1149.net>
Co-authored-by: Travis Cross <tc@traviscross.com>
Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
Co-authored-by: Oli Scherer <github333195615777966@oli-obk.de>
Co-authored-by: David Mládek <david.mladek.cz@gmail.com>
Co-authored-by: SunkenPotato <3.14radius02@gmail.com>
Co-authored-by: Cameron Steffen <cam.steffen94@gmail.com>
Co-authored-by: Martin Ombura Jr <8682597+martinomburajr@users.noreply.github.com>
Co-authored-by: Madhav Madhusoodanan <madhavmadhusoodanan@gmail.com>
Co-authored-by: sayantn <sayantn05@gmail.com>
Co-authored-by: Trevor Gross <tmgross@umich.edu>
Co-authored-by: WANG Rui <wangrui@loongson.cn>
Co-authored-by: Luigi Sartor Piucco <luigipiucco@gmail.com>
Co-authored-by: Julien THILLARD <54775010+supersurviveur@users.noreply.github.com>
Co-authored-by: The rustc-josh-sync Cronjob Bot <github-actions@github.com>
Co-authored-by: usamoi <usamoi@outlook.com>
Co-authored-by: Rémy Rakic <remy.rakic+github@gmail.com>
Co-authored-by: Nurzhan Sakén <nurzhan.sakenov@gmail.com>
Co-authored-by: ltdk <usr@ltdk.xyz>
Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>
Co-authored-by: Evgenii Zheltonozhskii <zheltonozhskiy@gmail.com>
Co-authored-by: roblabla <unfiltered@roblab.la>
Co-authored-by: 许杰友 Jieyou Xu (Joe) <39484203+jieyouxu@users.noreply.github.com>
Co-authored-by: Ayush Singh <ayush@beagleboard.org>
Co-authored-by: Kornel <kornel@geekhood.net>
Co-authored-by: Jonas Platte <jplatte+git@posteo.de>
Co-authored-by: Alex Crichton <alex@alexcrichton.com>
Co-authored-by: Zachary S <zasample18+github@gmail.com>
Co-authored-by: Jeremy Smart <jeremy3141592@gmail.com>
Co-authored-by: Ivan Tadeu Ferreira Antunes Filho <itadeufa@gmail.com>
Co-authored-by: Alisa Sireneva <me@purplesyringa.moe>
Co-authored-by: Trevor Gross <t.gross35@gmail.com>
Co-authored-by: Jacob Pratt <jacob@jhpratt.dev>
Co-authored-by: Scott McMurray <scottmcm@users.noreply.github.com>
Co-authored-by: xonx <119700621+xonx4l@users.noreply.github.com>
Co-authored-by: Yosh <github@yosh.is>
Co-authored-by: joboet <jonasboettiger@icloud.com>
Co-authored-by: Stuart Cook <Zalathar@users.noreply.github.com>
Co-authored-by: Connor Tsui <connor.tsui20@gmail.com>
Co-authored-by: Aandreba <aandreba@gmail.com>
Co-authored-by: Lucas Werkmeister <mail@lucaswerkmeister.de>
Co-authored-by: gitbot <git@bot>

Author: 62 people

library/core/src/panic/location.rs

@@ -1,5 +1,7 @@
+use crate::cmp::Ordering;
 use crate::ffi::CStr;
 use crate::fmt;
+use crate::hash::{Hash, Hasher};
 use crate::marker::PhantomData;
 use crate::ptr::NonNull;
 
@@ -32,7 +34,7 @@ use crate::ptr::NonNull;
 /// Files are compared as strings, not `Path`, which could be unexpected.
 /// See [`Location::file`]'s documentation for more discussion.
 #[lang = "panic_location"]
-#[derive(Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[derive(Copy, Clone)]
 #[stable(feature = "panic_hooks", since = "1.10.0")]
 pub struct Location<'a> {
     // A raw pointer is used rather than a reference because the pointer is valid for one more byte
@@ -44,6 +46,44 @@ pub struct Location<'a> {
     _filename: PhantomData<&'a str>,
 }
 
+#[stable(feature = "panic_hooks", since = "1.10.0")]
+impl PartialEq for Location<'_> {
+    fn eq(&self, other: &Self) -> bool {
+        // Compare col / line first as they're cheaper to compare and more likely to differ,
+        // while not impacting the result.
+        self.col == other.col && self.line == other.line && self.file() == other.file()
+    }
+}
+
+#[stable(feature = "panic_hooks", since = "1.10.0")]
+impl Eq for Location<'_> {}
+
+#[stable(feature = "panic_hooks", since = "1.10.0")]
+impl Ord for Location<'_> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.file()
+            .cmp(other.file())
+            .then_with(|| self.line.cmp(&other.line))
+            .then_with(|| self.col.cmp(&other.col))
+    }
+}
+
+#[stable(feature = "panic_hooks", since = "1.10.0")]
+impl PartialOrd for Location<'_> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+#[stable(feature = "panic_hooks", since = "1.10.0")]
+impl Hash for Location<'_> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.file().hash(state);
+        self.line.hash(state);
+        self.col.hash(state);
+    }
+}
+
 #[stable(feature = "panic_hooks", since = "1.10.0")]
 impl fmt::Debug for Location<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

library/coretests/tests/panic/location.rs

@@ -3,6 +3,23 @@ use core::panic::Location;
 // Note: Some of the following tests depend on the source location,
 // so please be careful when editing this file.
 
+mod file_a;
+mod file_b;
+mod file_c;
+
+// A small shuffled set of locations for testing, along with their true order.
+const LOCATIONS: [(usize, &'static Location<'_>); 9] = [
+    (7, file_c::two()),
+    (0, file_a::one()),
+    (3, file_b::one()),
+    (5, file_b::three()),
+    (8, file_c::three()),
+    (6, file_c::one()),
+    (2, file_a::three()),
+    (4, file_b::two()),
+    (1, file_a::two()),
+];
+
 #[test]
 fn location_const_caller() {
     const _CALLER_REFERENCE: &Location<'static> = Location::caller();
@@ -20,7 +37,7 @@ fn location_const_file() {
 fn location_const_line() {
     const CALLER: &Location<'static> = Location::caller();
     const LINE: u32 = CALLER.line();
-    assert_eq!(LINE, 21);
+    assert_eq!(LINE, 38);
 }
 
 #[test]
@@ -34,6 +51,28 @@ fn location_const_column() {
 fn location_debug() {
     let f = format!("{:?}", Location::caller());
     assert!(f.contains(&format!("{:?}", file!())));
-    assert!(f.contains("35"));
+    assert!(f.contains("52"));
     assert!(f.contains("29"));
 }
+
+#[test]
+fn location_eq() {
+    for (i, a) in LOCATIONS {
+        for (j, b) in LOCATIONS {
+            if i == j {
+                assert_eq!(a, b);
+            } else {
+                assert_ne!(a, b);
+            }
+        }
+    }
+}
+
+#[test]
+fn location_ord() {
+    let mut locations = LOCATIONS.clone();
+    locations.sort_by_key(|(_o, l)| **l);
+    for (correct, (order, _l)) in locations.iter().enumerate() {
+        assert_eq!(correct, *order);
+    }
+}

library/coretests/tests/panic/location/file_a.rs

@@ -0,0 +1,15 @@
+use core::panic::Location;
+
+// Used for test super::location_{ord, eq}. Must be in a dedicated file.
+
+pub const fn one() -> &'static Location<'static> {
+    Location::caller()
+}
+
+pub const fn two() -> &'static Location<'static> {
+    Location::caller()
+}
+
+pub const fn three() -> &'static Location<'static> {
+    Location::caller()
+}

library/coretests/tests/panic/location/file_b.rs

@@ -0,0 +1,15 @@
+use core::panic::Location;
+
+// Used for test super::location_{ord, eq}. Must be in a dedicated file.
+
+pub const fn one() -> &'static Location<'static> {
+    Location::caller()
+}
+
+pub const fn two() -> &'static Location<'static> {
+    Location::caller()
+}
+
+pub const fn three() -> &'static Location<'static> {
+    Location::caller()
+}

library/coretests/tests/panic/location/file_c.rs

@@ -0,0 +1,11 @@
+// Used for test super::location_{ord, eq}. Must be in a dedicated file.
+
+// This is used for testing column ordering of Location, hence this ugly one-liner.
+// We must fmt skip the entire containing module or else tidy will still complain.
+#[rustfmt::skip]
+mod no_fmt {
+    use core::panic::Location;
+    pub const fn one() -> &'static Location<'static> { Location::caller() }    pub const fn two() -> &'static Location<'static> { Location::caller() }    pub const fn three() -> &'static Location<'static> { Location::caller() }
+}
+
+pub use no_fmt::*;

rust-toolchain.toml

@@ -2,5 +2,5 @@
 # standard library we currently track.
 
 [toolchain]
-channel = "nightly-2025-07-30"
+channel = "nightly-2025-07-31"
 components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

tool_config/kani-version.toml

@@ -2,4 +2,4 @@
 # incompatible with the verify-std repo.
 
 [kani]
-commit = "1954c10d033221e8085d597464bc413865152e27"
+commit = "f76e668b5f86daad11e51d78ab10998426da943b"