Merge pull request #4607 from rust-lang/rustup-2025-09-28

oli-obk · web-flow · commit 01cd56f44e1f · 2025-09-28T05:27:01.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-b733736ea2feb7798c99cbb9a769bce74be108df
+848e6746fe03dfd703075c5077312b63877d51d6
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,3 @@
-#![cfg_attr(bootstrap, feature(strict_overflow_ops))]
 #![feature(abort_unwind)]
 #![feature(cfg_select)]
 #![feature(rustc_private)]
diff --git a/tests/panic/mir-validation.rs b/tests/panic/mir-validation.rs
@@ -9,11 +9,6 @@
 // and we don't even get a regular panic; rustc aborts with a different exit code instead.
 //@ignore-host: windows
 
-// FIXME: this tests a crash in rustc. For stage1, rustc is built with the downloaded standard
-// library which doesn't yet print the thread ID. Normalization can be removed at the stage bump.
-// For the grep: cfg(bootstrap)
-//@normalize-stderr-test: "thread 'rustc' panicked" -> "thread 'rustc' ($$TID) panicked"
-
 #![feature(custom_mir, core_intrinsics)]
 use core::intrinsics::mir::*;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#![cfg_attr(bootstrap, feature(strict_overflow_ops))]`
`2`	`1`	`#![feature(abort_unwind)]`
`3`	`2`	`#![feature(cfg_select)]`
`4`	`3`	`#![feature(rustc_private)]`