Skip to content

Commit cca65d3

Browse files
github-actions[bot]rocurleyRalfJunghkBstjoshtriplett
authored
Merge subtree update for toolchain nightly-2025-07-31 (model-checking#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 <[email protected]> Signed-off-by: Ayush Singh <[email protected]> Co-authored-by: Roger Curley <[email protected]> Co-authored-by: Ralf Jung <[email protected]> Co-authored-by: Marijn Schouten <[email protected]> Co-authored-by: Josh Triplett <[email protected]> Co-authored-by: Matthias Krüger <[email protected]> Co-authored-by: Folkert de Vries <[email protected]> Co-authored-by: okaneco <[email protected]> Co-authored-by: Folkert de Vries <[email protected]> Co-authored-by: Sayantan Chakraborty <[email protected]> Co-authored-by: nazo6 <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Jakub Beránek <[email protected]> Co-authored-by: Orson Peters <[email protected]> Co-authored-by: León Orell Valerian Liehr <[email protected]> Co-authored-by: xizheyin <[email protected]> Co-authored-by: Deadbeef <[email protected]> Co-authored-by: René Kijewski <[email protected]> Co-authored-by: Nik Revenco <[email protected]> Co-authored-by: The Miri Cronjob Bot <[email protected]> Co-authored-by: Tim (Theemathas) Chirananthavat <[email protected]> Co-authored-by: Chris Denton <[email protected]> Co-authored-by: Samuel Tardieu <[email protected]> Co-authored-by: Travis Cross <[email protected]> Co-authored-by: Amanieu d'Antras <[email protected]> Co-authored-by: Oli Scherer <[email protected]> Co-authored-by: David Mládek <[email protected]> Co-authored-by: SunkenPotato <[email protected]> Co-authored-by: Cameron Steffen <[email protected]> Co-authored-by: Martin Ombura Jr <[email protected]> Co-authored-by: Madhav Madhusoodanan <[email protected]> Co-authored-by: sayantn <[email protected]> Co-authored-by: Trevor Gross <[email protected]> Co-authored-by: WANG Rui <[email protected]> Co-authored-by: Luigi Sartor Piucco <[email protected]> Co-authored-by: Julien THILLARD <[email protected]> Co-authored-by: The rustc-josh-sync Cronjob Bot <[email protected]> Co-authored-by: usamoi <[email protected]> Co-authored-by: Rémy Rakic <[email protected]> Co-authored-by: Nurzhan Sakén <[email protected]> Co-authored-by: ltdk <[email protected]> Co-authored-by: bjorn3 <[email protected]> Co-authored-by: Guillaume Gomez <[email protected]> Co-authored-by: Evgenii Zheltonozhskii <[email protected]> Co-authored-by: roblabla <[email protected]> Co-authored-by: 许杰友 Jieyou Xu (Joe) <[email protected]> Co-authored-by: Ayush Singh <[email protected]> Co-authored-by: Kornel <[email protected]> Co-authored-by: Jonas Platte <[email protected]> Co-authored-by: Alex Crichton <[email protected]> Co-authored-by: Zachary S <[email protected]> Co-authored-by: Jeremy Smart <[email protected]> Co-authored-by: Ivan Tadeu Ferreira Antunes Filho <[email protected]> Co-authored-by: Alisa Sireneva <[email protected]> Co-authored-by: Trevor Gross <[email protected]> Co-authored-by: Jacob Pratt <[email protected]> Co-authored-by: Scott McMurray <[email protected]> Co-authored-by: xonx <[email protected]> Co-authored-by: Yosh <[email protected]> Co-authored-by: joboet <[email protected]> Co-authored-by: Stuart Cook <[email protected]> Co-authored-by: Connor Tsui <[email protected]> Co-authored-by: Aandreba <[email protected]> Co-authored-by: Lucas Werkmeister <[email protected]> Co-authored-by: gitbot <git@bot>
1 parent 177d0fd commit cca65d3

File tree

7 files changed

+125
-5
lines changed

7 files changed

+125
-5
lines changed

‎library/core/src/panic/location.rs

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
use crate::cmp::Ordering;
12
use crate::ffi::CStr;
23
use crate::fmt;
4+
use crate::hash::{Hash, Hasher};
35
use crate::marker::PhantomData;
46
use crate::ptr::NonNull;
57

@@ -32,7 +34,7 @@ use crate::ptr::NonNull;
3234
/// Files are compared as strings, not `Path`, which could be unexpected.
3335
/// See [`Location::file`]'s documentation for more discussion.
3436
#[lang = "panic_location"]
35-
#[derive(Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
37+
#[derive(Copy, Clone)]
3638
#[stable(feature = "panic_hooks", since = "1.10.0")]
3739
pub struct Location<'a> {
3840
// 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> {
4446
_filename: PhantomData<&'a str>,
4547
}
4648

49+
#[stable(feature = "panic_hooks", since = "1.10.0")]
50+
impl PartialEq for Location<'_> {
51+
fn eq(&self, other: &Self) -> bool {
52+
// Compare col / line first as they're cheaper to compare and more likely to differ,
53+
// while not impacting the result.
54+
self.col == other.col && self.line == other.line && self.file() == other.file()
55+
}
56+
}
57+
58+
#[stable(feature = "panic_hooks", since = "1.10.0")]
59+
impl Eq for Location<'_> {}
60+
61+
#[stable(feature = "panic_hooks", since = "1.10.0")]
62+
impl Ord for Location<'_> {
63+
fn cmp(&self, other: &Self) -> Ordering {
64+
self.file()
65+
.cmp(other.file())
66+
.then_with(|| self.line.cmp(&other.line))
67+
.then_with(|| self.col.cmp(&other.col))
68+
}
69+
}
70+
71+
#[stable(feature = "panic_hooks", since = "1.10.0")]
72+
impl PartialOrd for Location<'_> {
73+
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
74+
Some(self.cmp(other))
75+
}
76+
}
77+
78+
#[stable(feature = "panic_hooks", since = "1.10.0")]
79+
impl Hash for Location<'_> {
80+
fn hash<H: Hasher>(&self, state: &mut H) {
81+
self.file().hash(state);
82+
self.line.hash(state);
83+
self.col.hash(state);
84+
}
85+
}
86+
4787
#[stable(feature = "panic_hooks", since = "1.10.0")]
4888
impl fmt::Debug for Location<'_> {
4989
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

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

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@ use core::panic::Location;
33
// Note: Some of the following tests depend on the source location,
44
// so please be careful when editing this file.
55

6+
mod file_a;
7+
mod file_b;
8+
mod file_c;
9+
10+
// A small shuffled set of locations for testing, along with their true order.
11+
const LOCATIONS: [(usize, &'static Location<'_>); 9] = [
12+
(7, file_c::two()),
13+
(0, file_a::one()),
14+
(3, file_b::one()),
15+
(5, file_b::three()),
16+
(8, file_c::three()),
17+
(6, file_c::one()),
18+
(2, file_a::three()),
19+
(4, file_b::two()),
20+
(1, file_a::two()),
21+
];
22+
623
#[test]
724
fn location_const_caller() {
825
const _CALLER_REFERENCE: &Location<'static> = Location::caller();
@@ -20,7 +37,7 @@ fn location_const_file() {
2037
fn location_const_line() {
2138
const CALLER: &Location<'static> = Location::caller();
2239
const LINE: u32 = CALLER.line();
23-
assert_eq!(LINE, 21);
40+
assert_eq!(LINE, 38);
2441
}
2542

2643
#[test]
@@ -34,6 +51,28 @@ fn location_const_column() {
3451
fn location_debug() {
3552
let f = format!("{:?}", Location::caller());
3653
assert!(f.contains(&format!("{:?}", file!())));
37-
assert!(f.contains("35"));
54+
assert!(f.contains("52"));
3855
assert!(f.contains("29"));
3956
}
57+
58+
#[test]
59+
fn location_eq() {
60+
for (i, a) in LOCATIONS {
61+
for (j, b) in LOCATIONS {
62+
if i == j {
63+
assert_eq!(a, b);
64+
} else {
65+
assert_ne!(a, b);
66+
}
67+
}
68+
}
69+
}
70+
71+
#[test]
72+
fn location_ord() {
73+
let mut locations = LOCATIONS.clone();
74+
locations.sort_by_key(|(_o, l)| **l);
75+
for (correct, (order, _l)) in locations.iter().enumerate() {
76+
assert_eq!(correct, *order);
77+
}
78+
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
use core::panic::Location;
2+
3+
// Used for test super::location_{ord, eq}. Must be in a dedicated file.
4+
5+
pub const fn one() -> &'static Location<'static> {
6+
Location::caller()
7+
}
8+
9+
pub const fn two() -> &'static Location<'static> {
10+
Location::caller()
11+
}
12+
13+
pub const fn three() -> &'static Location<'static> {
14+
Location::caller()
15+
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
use core::panic::Location;
2+
3+
// Used for test super::location_{ord, eq}. Must be in a dedicated file.
4+
5+
pub const fn one() -> &'static Location<'static> {
6+
Location::caller()
7+
}
8+
9+
pub const fn two() -> &'static Location<'static> {
10+
Location::caller()
11+
}
12+
13+
pub const fn three() -> &'static Location<'static> {
14+
Location::caller()
15+
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Used for test super::location_{ord, eq}. Must be in a dedicated file.
2+
3+
// This is used for testing column ordering of Location, hence this ugly one-liner.
4+
// We must fmt skip the entire containing module or else tidy will still complain.
5+
#[rustfmt::skip]
6+
mod no_fmt {
7+
use core::panic::Location;
8+
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() }
9+
}
10+
11+
pub use no_fmt::*;

‎rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# standard library we currently track.
33

44
[toolchain]
5-
channel = "nightly-2025-07-30"
5+
channel = "nightly-2025-07-31"
66
components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

‎tool_config/kani-version.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# incompatible with the verify-std repo.
33

44
[kani]
5-
commit = "1954c10d033221e8085d597464bc413865152e27"
5+
commit = "f76e668b5f86daad11e51d78ab10998426da943b"

0 commit comments

Comments
 (0)