Commit 61cb1e97fcf954c37d0a457a8084ed9ad8b3cb82 | rust

author	bors <bors@rust-lang.org> 2025-08-07 02:32:55 UTC
committer	bors <bors@rust-lang.org> 2025-08-07 02:32:55 UTC
log	61cb1e97fcf954c37d0a457a8084ed9ad8b3cb82
tree	107887d30f4041adae19af258f83ca2dc0fb5d93
parent	6bcdcc73bd11568fd85f5a38b58e1eda054ad1cd
parent	289fe36d373c5a13fa7f1b93f39ff88425ab2351

Auto merge of #115746 - tgross35:unnamed-threads-panic-message, r=cuviper

Print thread ID in panic message

`panic!` does not print any identifying information for threads that are
unnamed. However, in many cases, the thread ID can be determined.

This changes the panic message from something like this:

    thread '<unnamed>' panicked at src/main.rs:3:5:
    explicit panic

To something like this:

    thread '<unnamed>' (12345) panicked at src/main.rs:3:5:
    explicit panic

Stack overflow messages are updated as well.

This change applies to both named and unnamed threads. The ID printed is
the OS integer thread ID rather than the Rust thread ID, which should
also be what debuggers print.

try-job: aarch64-apple
try-job: aarch64-gnu
try-job: dist-apple-various
try-job: dist-various-*
try-job: dist-x86_64-freebsd
try-job: dist-x86_64-illumos
try-job: dist-x86_64-netbsd
try-job: dist-x86_64-solaris
try-job: test-various
try-job: x86_64-gnu
try-job: x86_64-mingw-1
try-job: x86_64-msvc-1

124 files changed, 318 insertions(+), 169 deletions(-)

library/std/src/panicking.rs+2-1

...	...	@@ -269,6 +269,7 @@ fn default_hook(info: &PanicHookInfo<'_>) {
269	269
270	270	thread::with_current_name(\|name\| {
271	271	let name = name.unwrap_or("<unnamed>");
	272	let tid = thread::current_os_id();
272	273
273	274	// Try to write the panic message to a buffer first to prevent other concurrent outputs
274	275	// interleaving with it.
...	...	@@ -277,7 +278,7 @@ fn default_hook(info: &PanicHookInfo<'_>) {
277	278
278	279	let write_msg = \|dst: &mut dyn crate::io::Write\| {
279	280	// We add a newline to ensure the panic message appears at the start of a line.
280		writeln!(dst, "\nthread '{name}' panicked at {location}:\n{msg}")
	281	writeln!(dst, "\nthread '{name}' ({tid}) panicked at {location}:\n{msg}")
281	282	};
282	283
283	284	if write_msg(&mut cursor).is_ok() {

library/std/src/sys/pal/hermit/thread.rs+4

...	...	@@ -115,6 +115,10 @@ impl Thread {
115	115	}
116	116	}
117	117
	118	pub(crate) fn current_os_id() -> Option<u64> {
	119	None
	120	}
	121
118	122	pub fn available_parallelism() -> io::Result<NonZero<usize>> {
119	123	unsafe { Ok(NonZero::new_unchecked(hermit_abi::available_parallelism())) }
120	124	}

library/std/src/sys/pal/itron/thread.rs+4

...	...	@@ -361,6 +361,10 @@ unsafe fn terminate_and_delete_current_task() -> ! {
361	361	unsafe { crate::hint::unreachable_unchecked() };
362	362	}
363	363
	364	pub(crate) fn current_os_id() -> Option<u64> {
	365	None
	366	}
	367
364	368	pub fn available_parallelism() -> io::Result<NonZero<usize>> {
365	369	super::unsupported()
366	370	}

library/std/src/sys/pal/sgx/thread.rs+5-1

...	...	@@ -1,6 +1,6 @@
1	1	#![cfg_attr(test, allow(dead_code))] // why is this necessary?
2	2
3		use super::abi::usercalls;
	3	use super::abi::{thread, usercalls};
4	4	use super::unsupported;
5	5	use crate::ffi::CStr;
6	6	use crate::io;
...	...	@@ -149,6 +149,10 @@ impl Thread {
149	149	}
150	150	}
151	151
	152	pub(crate) fn current_os_id() -> Option<u64> {
	153	Some(thread::current().addr().get() as u64)
	154	}
	155
152	156	pub fn available_parallelism() -> io::Result<NonZero<usize>> {
153	157	unsupported()
154	158	}

library/std/src/sys/pal/teeos/thread.rs+4

...	...	@@ -144,6 +144,10 @@ impl Drop for Thread {
144	144	}
145	145	}
146	146
	147	pub(crate) fn current_os_id() -> Option<u64> {
	148	None
	149	}
	150
147	151	// Note: Both `sched_getaffinity` and `sysconf` are available but not functional on
148	152	// teeos, so this function always returns an Error!
149	153	pub fn available_parallelism() -> io::Result<NonZero<usize>> {

library/std/src/sys/pal/uefi/thread.rs+4

...	...	@@ -56,6 +56,10 @@ impl Thread {
56	56	}
57	57	}
58	58
	59	pub(crate) fn current_os_id() -> Option<u64> {
	60	None
	61	}
	62
59	63	pub fn available_parallelism() -> io::Result<NonZero<usize>> {
60	64	// UEFI is single threaded
61	65	Ok(NonZero::new(1).unwrap())

library/std/src/sys/pal/unix/stack_overflow.rs+4-2

...	...	@@ -119,7 +119,8 @@ mod imp {
119	119	&& thread_info.guard_page_range.contains(&fault_addr)
120	120	{
121	121	let name = thread_info.thread_name.as_deref().unwrap_or("<unknown>");
122		rtprintpanic!("\nthread '{name}' has overflowed its stack\n");
	122	let tid = crate::thread::current_os_id();
	123	rtprintpanic!("\nthread '{name}' ({tid}) has overflowed its stack\n");
123	124	rtabort!("stack overflow");
124	125	}
125	126	})
...	...	@@ -696,7 +697,8 @@ mod imp {
696	697	if code == c::EXCEPTION_STACK_OVERFLOW {
697	698	crate::thread::with_current_name(\|name\| {
698	699	let name = name.unwrap_or("<unknown>");
699		rtprintpanic!("\nthread '{name}' has overflowed its stack\n");
	700	let tid = crate::thread::current_os_id();
	701	rtprintpanic!("\nthread '{name}' ({tid}) has overflowed its stack\n");
700	702	});
701	703	}
702	704	c::EXCEPTION_CONTINUE_SEARCH

library/std/src/sys/pal/unix/thread.rs+56

...	...	@@ -398,6 +398,62 @@ impl Drop for Thread {
398	398	}
399	399	}
400	400
	401	pub(crate) fn current_os_id() -> Option<u64> {
	402	// Most Unix platforms have a way to query an integer ID of the current thread, all with
	403	// slightly different spellings.
	404	//
	405	// The OS thread ID is used rather than `pthread_self` so as to match what will be displayed
	406	// for process inspection (debuggers, trace, `top`, etc.).
	407	cfg_if::cfg_if! {
	408	// Most platforms have a function returning a `pid_t` or int, which is an `i32`.
	409	if #[cfg(any(target_os = "android", target_os = "linux"))] {
	410	use crate::sys::weak::syscall;
	411
	412	// `libc::gettid` is only available on glibc 2.30+, but the syscall is available
	413	// since Linux 2.4.11.
	414	syscall!(fn gettid() -> libc::pid_t;);
	415
	416	// SAFETY: FFI call with no preconditions.
	417	let id: libc::pid_t = unsafe { gettid() };
	418	Some(id as u64)
	419	} else if #[cfg(target_os = "nto")] {
	420	// SAFETY: FFI call with no preconditions.
	421	let id: libc::pid_t = unsafe { libc::gettid() };
	422	Some(id as u64)
	423	} else if #[cfg(target_os = "openbsd")] {
	424	// SAFETY: FFI call with no preconditions.
	425	let id: libc::pid_t = unsafe { libc::getthrid() };
	426	Some(id as u64)
	427	} else if #[cfg(target_os = "freebsd")] {
	428	// SAFETY: FFI call with no preconditions.
	429	let id: libc::c_int = unsafe { libc::pthread_getthreadid_np() };
	430	Some(id as u64)
	431	} else if #[cfg(target_os = "netbsd")] {
	432	// SAFETY: FFI call with no preconditions.
	433	let id: libc::lwpid_t = unsafe { libc::_lwp_self() };
	434	Some(id as u64)
	435	} else if #[cfg(any(target_os = "illumos", target_os = "solaris"))] {
	436	// On Illumos and Solaris, the `pthread_t` is the same as the OS thread ID.
	437	// SAFETY: FFI call with no preconditions.
	438	let id: libc::pthread_t = unsafe { libc::pthread_self() };
	439	Some(id as u64)
	440	} else if #[cfg(target_vendor = "apple")] {
	441	// Apple allows querying arbitrary thread IDs, `thread=NULL` queries the current thread.
	442	let mut id = 0u64;
	443	// SAFETY: `thread_id` is a valid pointer, no other preconditions.
	444	let status: libc::c_int = unsafe { libc::pthread_threadid_np(0, &mut id) };
	445	if status == 0 {
	446	Some(id)
	447	} else {
	448	None
	449	}
	450	} else {
	451	// Other platforms don't have an OS thread ID or don't have a way to access it.
	452	None
	453	}
	454	}
	455	}
	456
401	457	#[cfg(any(
402	458	target_os = "linux",
403	459	target_os = "nto",

library/std/src/sys/pal/unsupported/thread.rs+4

...	...	@@ -39,6 +39,10 @@ impl Thread {
39	39	}
40	40	}
41	41
	42	pub(crate) fn current_os_id() -> Option<u64> {
	43	None
	44	}
	45
42	46	pub fn available_parallelism() -> io::Result<NonZero<usize>> {
43	47	unsupported()
44	48	}

library/std/src/sys/pal/wasi/thread.rs+4

...	...	@@ -194,6 +194,10 @@ impl Thread {
194	194	}
195	195	}
196	196
	197	pub(crate) fn current_os_id() -> Option<u64> {
	198	None
	199	}
	200
197	201	pub fn available_parallelism() -> io::Result<NonZero<usize>> {
198	202	cfg_if::cfg_if! {
199	203	if #[cfg(target_feature = "atomics")] {

library/std/src/sys/pal/windows/c/bindings.txt+1

...	...	@@ -2185,6 +2185,7 @@ GetSystemInfo
2185	2185	GetSystemTimeAsFileTime
2186	2186	GetSystemTimePreciseAsFileTime
2187	2187	GetTempPathW
	2188	GetThreadId
2188	2189	GetUserProfileDirectoryW
2189	2190	GetWindowsDirectoryW
2190	2191	HANDLE

library/std/src/sys/pal/windows/c/windows_sys.rs+1

...	...	@@ -61,6 +61,7 @@ windows_targets::link!("kernel32.dll" "system" fn GetSystemInfo(lpsysteminfo : *
61	61	windows_targets::link!("kernel32.dll" "system" fn GetSystemTimeAsFileTime(lpsystemtimeasfiletime : *mut FILETIME));
62	62	windows_targets::link!("kernel32.dll" "system" fn GetSystemTimePreciseAsFileTime(lpsystemtimeasfiletime : *mut FILETIME));
63	63	windows_targets::link!("kernel32.dll" "system" fn GetTempPathW(nbufferlength : u32, lpbuffer : PWSTR) -> u32);
	64	windows_targets::link!("kernel32.dll" "system" fn GetThreadId(thread : HANDLE) -> u32);
64	65	windows_targets::link!("userenv.dll" "system" fn GetUserProfileDirectoryW(htoken : HANDLE, lpprofiledir : PWSTR, lpcchsize : *mut u32) -> BOOL);
65	66	windows_targets::link!("kernel32.dll" "system" fn GetWindowsDirectoryW(lpbuffer : PWSTR, usize : u32) -> u32);
66	67	windows_targets::link!("kernel32.dll" "system" fn InitOnceBeginInitialize(lpinitonce : mut INIT_ONCE, dwflags : u32, fpending : mut BOOL, lpcontext : mut mut core::ffi::c_void) -> BOOL);

library/std/src/sys/pal/windows/stack_overflow.rs+2-1

...	...	@@ -20,7 +20,8 @@ unsafe extern "system" fn vectored_handler(ExceptionInfo: *mut c::EXCEPTION_POIN
20	20	if code == c::EXCEPTION_STACK_OVERFLOW {
21	21	thread::with_current_name(\|name\| {
22	22	let name = name.unwrap_or("<unknown>");
23		rtprintpanic!("\nthread '{name}' has overflowed its stack\n");
	23	let tid = thread::current_os_id();
	24	rtprintpanic!("\nthread '{name}' ({tid}) has overflowed its stack\n");
24	25	});
25	26	}
26	27	c::EXCEPTION_CONTINUE_SEARCH

library/std/src/sys/pal/windows/thread.rs+8

...	...	@@ -127,6 +127,14 @@ impl Thread {
127	127	}
128	128	}
129	129
	130	pub(crate) fn current_os_id() -> Option<u64> {
	131	// SAFETY: FFI call with no preconditions.
	132	let id: u32 = unsafe { c::GetThreadId(c::GetCurrentThread()) };
	133
	134	// A return value of 0 indicates failed lookup.
	135	if id == 0 { None } else { Some(id.into()) }
	136	}
	137
130	138	pub fn available_parallelism() -> io::Result<NonZero<usize>> {
131	139	let res = unsafe {
132	140	let mut sysinfo: c::SYSTEM_INFO = crate::mem::zeroed();

library/std/src/sys/pal/xous/thread.rs+4

...	...	@@ -145,6 +145,10 @@ impl Thread {
145	145	}
146	146	}
147	147
	148	pub(crate) fn current_os_id() -> Option<u64> {
	149	None
	150	}
	151
148	152	pub fn available_parallelism() -> io::Result<NonZero<usize>> {
149	153	// We're unicore right now.
150	154	Ok(unsafe { NonZero::new_unchecked(1) })

library/std/src/thread/current.rs+12-1

...	...	@@ -1,4 +1,4 @@
1		use super::{Thread, ThreadId};
	1	use super::{Thread, ThreadId, imp};
2	2	use crate::mem::ManuallyDrop;
3	3	use crate::ptr;
4	4	use crate::sys::thread_local::local_pointer;
...	...	@@ -148,6 +148,17 @@ pub(crate) fn current_id() -> ThreadId {
148	148	id::get_or_init()
149	149	}
150	150
	151	/// Gets the OS thread ID of the thread that invokes it, if available. If not, return the Rust
	152	/// thread ID.
	153	///
	154	/// We use a `u64` to all possible platform IDs without excess `cfg`; most use `int`, some use a
	155	/// pointer, and Apple uses `uint64_t`. This is a "best effort" approach for diagnostics and is
	156	/// allowed to fall back to a non-OS ID (such as the Rust thread ID) or a non-unique ID (such as a
	157	/// PID) if the thread ID cannot be retrieved.
	158	pub(crate) fn current_os_id() -> u64 {
	159	imp::current_os_id().unwrap_or_else(\|\| current_id().as_u64().get())
	160	}
	161
151	162	/// Gets a reference to the handle of the thread that invokes it, if the handle
152	163	/// has been initialized.
153	164	pub(super) fn try_with_current<F, R>(f: F) -> R

library/std/src/thread/mod.rs+1-1

...	...	@@ -183,7 +183,7 @@ mod current;
183	183
184	184	#[stable(feature = "rust1", since = "1.0.0")]
185	185	pub use current::current;
186		pub(crate) use current::{current_id, current_or_unnamed, drop_current};
	186	pub(crate) use current::{current_id, current_or_unnamed, current_os_id, drop_current};
187	187	use current::{set_current, try_with_current};
188	188
189	189	mod spawnhook;

library/std/src/thread/tests.rs+7

...	...	@@ -346,6 +346,13 @@ fn test_thread_id_not_equal() {
346	346	assert!(thread::current().id() != spawned_id);
347	347	}
348	348
	349	#[test]
	350	fn test_thread_os_id_not_equal() {
	351	let spawned_id = thread::spawn(\|\| thread::current_os_id()).join().unwrap();
	352	let current_id = thread::current_os_id();
	353	assert!(current_id != spawned_id);
	354	}
	355
349	356	#[test]
350	357	fn test_scoped_threads_drop_result_before_join() {
351	358	let actually_finished = &AtomicBool::new(false);

src/tools/compiletest/src/runtest.rs+5

...	...	@@ -2567,6 +2567,11 @@ impl<'test> TestCx<'test> {
2567	2567	})
2568	2568	.into_owned();
2569	2569
	2570	// Normalize thread IDs in panic messages
	2571	normalized = static_regex!(r"thread '(?P<name>.*?)' $(rtid )?\d+$ panicked")
	2572	.replace_all(&normalized, "thread '$name' ($$TID) panicked")
	2573	.into_owned();
	2574
2570	2575	normalized = normalized.replace("\t", "\\t"); // makes tabs visible
2571	2576
2572	2577	// Remove test annotations like `//~ ERROR text` from the output,

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind1.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/function_calls/exported_symbol_bad_unwind1.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/function_calls/exported_symbol_bad_unwind1.rs:LL:CC:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr+2-2

...	...	@@ -1,10 +1,10 @@
1	1
2		thread 'main' panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6
7		thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
	7	thread 'main' ($TID) panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
8	8	panic in a function that cannot unwind
9	9	stack backtrace:
10	10	thread caused non-unwinding panic. aborting.

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr+2-2

...	...	@@ -1,10 +1,10 @@
1	1
2		thread 'main' panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6
7		thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
	7	thread 'main' ($TID) panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
8	8	panic in a function that cannot unwind
9	9	stack backtrace:
10	10	thread caused non-unwinding panic. aborting.

src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.extern_block.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/fail/function_calls/return_pointer_on_unwind.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/function_calls/return_pointer_on_unwind.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/function_calls/return_pointer_on_unwind.rs:LL:CC:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/fail/panic/abort_unwind.stderr+2-2

...	...	@@ -1,10 +1,10 @@
1	1
2		thread 'main' panicked at tests/fail/panic/abort_unwind.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/panic/abort_unwind.rs:LL:CC:
3	3	PANIC!!!
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6
7		thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
	7	thread 'main' ($TID) panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
8	8	panic in a function that cannot unwind
9	9	stack backtrace:
10	10	thread caused non-unwinding panic. aborting.

src/tools/miri/tests/fail/panic/bad_unwind.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/panic/bad_unwind.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/panic/bad_unwind.rs:LL:CC:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/fail/panic/double_panic.stderr+3-3

...	...	@@ -1,14 +1,14 @@
1	1
2		thread 'main' panicked at tests/fail/panic/double_panic.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/panic/double_panic.rs:LL:CC:
3	3	first
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6
7		thread 'main' panicked at tests/fail/panic/double_panic.rs:LL:CC:
	7	thread 'main' ($TID) panicked at tests/fail/panic/double_panic.rs:LL:CC:
8	8	second
9	9	stack backtrace:
10	10
11		thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
	11	thread 'main' ($TID) panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
12	12	panic in a destructor during cleanup
13	13	thread caused non-unwinding panic. aborting.
14	14	error: abnormal termination: the program aborted execution

src/tools/miri/tests/fail/panic/panic_abort1.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/panic/panic_abort1.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/panic/panic_abort1.rs:LL:CC:
3	3	panicking from libstd
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/fail/panic/panic_abort2.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/panic/panic_abort2.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/panic/panic_abort2.rs:LL:CC:
3	3	42-panicking from libstd
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/fail/panic/panic_abort3.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/panic/panic_abort3.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/panic/panic_abort3.rs:LL:CC:
3	3	panicking from libcore
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/fail/panic/panic_abort4.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/panic/panic_abort4.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/panic/panic_abort4.rs:LL:CC:
3	3	42-panicking from libcore
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/fail/panic/tls_macro_const_drop_panic.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread $NAME panicked at tests/fail/panic/tls_macro_const_drop_panic.rs:LL:CC:
	2	thread $NAME ($TID) panicked at tests/fail/panic/tls_macro_const_drop_panic.rs:LL:CC:
3	3	ow
4	4	fatal runtime error: thread local panicked on drop, aborting
5	5	error: abnormal termination: the program aborted execution

src/tools/miri/tests/fail/panic/tls_macro_drop_panic.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread $NAME panicked at tests/fail/panic/tls_macro_drop_panic.rs:LL:CC:
	2	thread $NAME ($TID) panicked at tests/fail/panic/tls_macro_drop_panic.rs:LL:CC:
3	3	ow
4	4	fatal runtime error: thread local panicked on drop, aborting
5	5	error: abnormal termination: the program aborted execution

src/tools/miri/tests/fail/ptr_swap_nonoverlapping.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/fail/ptr_swap_nonoverlapping.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/ptr_swap_nonoverlapping.rs:LL:CC:
3	3	unsafe precondition(s) violated: ptr::swap_nonoverlapping requires that both pointer arguments are aligned and non-null and the specified memory ranges do not overlap
4	4
5	5	This indicates a bug in the program. This Undefined Behavior check is optional, and cannot be relied on for safety.

src/tools/miri/tests/fail/terminate-terminator.stderr+2-2

...	...	@@ -1,12 +1,12 @@
1	1	warning: You have explicitly enabled MIR optimizations, overriding Miri's default which is to completely disable them. Any optimizations may hide UB that Miri would otherwise detect, and it is not necessarily possible to predict what kind of UB will be missed. If you are enabling optimizations to make Miri run faster, we advise using cfg(miri) to shrink your workload instead. The performance benefit of enabling MIR optimizations is usually marginal at best.
2	2
3	3
4		thread 'main' panicked at tests/fail/terminate-terminator.rs:LL:CC:
	4	thread 'main' ($TID) panicked at tests/fail/terminate-terminator.rs:LL:CC:
5	5	explicit panic
6	6	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
7	7	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
8	8
9		thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
	9	thread 'main' ($TID) panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
10	10	panic in a function that cannot unwind
11	11	stack backtrace:
12	12	thread caused non-unwinding panic. aborting.

src/tools/miri/tests/fail/unwind-action-terminate.stderr+2-2

...	...	@@ -1,10 +1,10 @@
1	1
2		thread 'main' panicked at tests/fail/unwind-action-terminate.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/fail/unwind-action-terminate.rs:LL:CC:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6
7		thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
	7	thread 'main' ($TID) panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
8	8	panic in a function that cannot unwind
9	9	stack backtrace:
10	10	thread caused non-unwinding panic. aborting.

src/tools/miri/tests/panic/alloc_error_handler_hook.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/alloc_error_handler_hook.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/alloc_error_handler_hook.rs:LL:CC:
3	3	alloc error hook called
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/alloc_error_handler_panic.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at RUSTLIB/std/src/alloc.rs:LL:CC:
	2	thread 'main' ($TID) panicked at RUSTLIB/std/src/alloc.rs:LL:CC:
3	3	memory allocation of 4 bytes failed
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/div-by-zero-2.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/div-by-zero-2.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/div-by-zero-2.rs:LL:CC:
3	3	attempt to divide by zero
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/function_calls/exported_symbol_good_unwind.stderr+3-3

...	...	@@ -1,11 +1,11 @@
1	1
2		thread 'main' panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6
7		thread 'main' panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:
	7	thread 'main' ($TID) panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:
8	8	explicit panic
9	9
10		thread 'main' panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:
	10	thread 'main' ($TID) panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:
11	11	explicit panic

src/tools/miri/tests/panic/mir-validation.rs+6

...	...	@@ -8,6 +8,12 @@
8	8	// Somehow on rustc Windows CI, the "Miri caused an ICE" message is not shown
9	9	// and we don't even get a regular panic; rustc aborts with a different exit code instead.
10	10	//@ignore-host: windows
	11
	12	// FIXME: this tests a crash in rustc. For stage1, rustc is built with the downloaded standard
	13	// library which doesn't yet print the thread ID. Normalization can be removed at the stage bump.
	14	// For the grep: cfg(bootstrap)
	15	//@normalize-stderr-test: "thread 'rustc' panicked" -> "thread 'rustc' ($$TID) panicked"
	16
11	17	#![feature(custom_mir, core_intrinsics)]
12	18	use core::intrinsics::mir::*;
13	19

src/tools/miri/tests/panic/mir-validation.stderr+1-1

...	...	@@ -6,7 +6,7 @@ LL \| *(tuple.0) = 1;
6	6	\| ^^^^^^^^^^^^^^
7	7
8	8
9		thread 'rustc' panicked at compiler/rustc_mir_transform/src/validate.rs:LL:CC:
	9	thread 'rustc' ($TID) panicked at compiler/rustc_mir_transform/src/validate.rs:LL:CC:
10	10	Box<dyn Any>
11	11	stack backtrace:
12	12

src/tools/miri/tests/panic/oob_subslice.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/oob_subslice.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/oob_subslice.rs:LL:CC:
3	3	range end index 5 out of range for slice of length 4
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/overflowing-lsh-neg.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/overflowing-lsh-neg.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/overflowing-lsh-neg.rs:LL:CC:
3	3	attempt to shift left with overflow
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/overflowing-rsh-1.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/overflowing-rsh-1.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/overflowing-rsh-1.rs:LL:CC:
3	3	attempt to shift right with overflow
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/overflowing-rsh-2.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/overflowing-rsh-2.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/overflowing-rsh-2.rs:LL:CC:
3	3	attempt to shift right with overflow
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/panic1.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/panic1.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/panic1.rs:LL:CC:
3	3	panicking from libstd
4	4	stack backtrace:
5	5	0: std::panicking::begin_panic_handler

src/tools/miri/tests/panic/panic2.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/panic2.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/panic2.rs:LL:CC:
3	3	42-panicking from libstd
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/panic3.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/panic3.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/panic3.rs:LL:CC:
3	3	panicking from libcore
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/panic4.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/panic4.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/panic4.rs:LL:CC:
3	3	42-panicking from libcore
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/panic/transmute_fat2.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at tests/panic/transmute_fat2.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/panic/transmute_fat2.rs:LL:CC:
3	3	index out of bounds: the len is 0 but the index is 0
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

src/tools/miri/tests/pass/panic/catch_panic.stderr+11-11

...	...	@@ -1,47 +1,47 @@
1	1
2		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
3	3	Hello from std::panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6	Caught panic message (&str): Hello from std::panic
7	7
8		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	8	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
9	9	Hello from std::panic: 1
10	10	Caught panic message (String): Hello from std::panic: 1
11	11
12		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	12	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
13	13	Hello from std::panic_any: 2
14	14	Caught panic message (String): Hello from std::panic_any: 2
15	15
16		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	16	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
17	17	Box<dyn Any>
18	18	Failed to get caught panic message.
19	19
20		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	20	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
21	21	Hello from core::panic
22	22	Caught panic message (&str): Hello from core::panic
23	23
24		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	24	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
25	25	Hello from core::panic: 5
26	26	Caught panic message (String): Hello from core::panic: 5
27	27
28		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	28	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
29	29	index out of bounds: the len is 3 but the index is 4
30	30	Caught panic message (String): index out of bounds: the len is 3 but the index is 4
31	31
32		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	32	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
33	33	attempt to divide by zero
34	34	Caught panic message (&str): attempt to divide by zero
35	35
36		thread 'main' panicked at RUSTLIB/core/src/ptr/const_ptr.rs:LL:CC:
	36	thread 'main' ($TID) panicked at RUSTLIB/core/src/ptr/const_ptr.rs:LL:CC:
37	37	align_offset: align is not a power-of-two
38	38	Caught panic message (&str): align_offset: align is not a power-of-two
39	39
40		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	40	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
41	41	assertion failed: false
42	42	Caught panic message (&str): assertion failed: false
43	43
44		thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
	44	thread 'main' ($TID) panicked at tests/pass/panic/catch_panic.rs:LL:CC:
45	45	assertion failed: false
46	46	Caught panic message (&str): assertion failed: false
47	47	Success!

src/tools/miri/tests/pass/panic/concurrent-panic.stderr+2-2

...	...	@@ -1,7 +1,7 @@
1	1	Thread 1 starting, will block on mutex
2	2	Thread 1 reported it has started
3	3
4		thread '<unnamed>' panicked at tests/pass/panic/concurrent-panic.rs:LL:CC:
	4	thread '<unnamed>' ($TID) panicked at tests/pass/panic/concurrent-panic.rs:LL:CC:
5	5	panic in thread 2
6	6	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
7	7	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
...	...	@@ -9,7 +9,7 @@ Thread 2 blocking on thread 1
9	9	Thread 2 reported it has started
10	10	Unlocking mutex
11	11
12		thread '<unnamed>' panicked at tests/pass/panic/concurrent-panic.rs:LL:CC:
	12	thread '<unnamed>' ($TID) panicked at tests/pass/panic/concurrent-panic.rs:LL:CC:
13	13	panic in thread 1
14	14	Thread 1 has exited
15	15	Thread 2 has exited

src/tools/miri/tests/pass/panic/nested_panic_caught.stderr+2-2

...	...	@@ -1,9 +1,9 @@
1	1
2		thread 'main' panicked at tests/pass/panic/nested_panic_caught.rs:LL:CC:
	2	thread 'main' ($TID) panicked at tests/pass/panic/nested_panic_caught.rs:LL:CC:
3	3	once
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6
7		thread 'main' panicked at tests/pass/panic/nested_panic_caught.rs:LL:CC:
	7	thread 'main' ($TID) panicked at tests/pass/panic/nested_panic_caught.rs:LL:CC:
8	8	twice
9	9	stack backtrace:

src/tools/miri/tests/pass/panic/thread_panic.stderr+2-2

...	...	@@ -1,8 +1,8 @@
1	1
2		thread '<unnamed>' panicked at tests/pass/panic/thread_panic.rs:LL:CC:
	2	thread '<unnamed>' ($TID) panicked at tests/pass/panic/thread_panic.rs:LL:CC:
3	3	Hello!
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
6	6
7		thread 'childthread' panicked at tests/pass/panic/thread_panic.rs:LL:CC:
	7	thread 'childthread' ($TID) panicked at tests/pass/panic/thread_panic.rs:LL:CC:
8	8	Hello, world!

src/tools/miri/tests/ui.rs+2-1

...	...	@@ -248,7 +248,8 @@ regexes! {
248	248	// erase alloc ids
249	249	"alloc[0-9]+" => "ALLOC",
250	250	// erase thread ids
251		r"unnamed-[0-9]+" => "unnamed-ID",
	251	r"unnamed-[0-9]+" => "unnamed-ID",
	252	r"thread '(?P<name>.*?)' $\d+$ panicked" => "thread '$name' ($$TID) panicked",
252	253	// erase borrow tags
253	254	"<[0-9]+>" => "<TAG>",
254	255	"<[0-9]+=" => "<TAG=",

src/tools/rustfmt/tests/rustfmt/main.rs+2-1

...	...	@@ -185,10 +185,11 @@ fn dont_emit_ICE() {
185	185	"tests/target/issue-6105.rs",
186	186	];
187	187
	188	let panic_re = regex::Regex::new("thread.*panicked").unwrap();
188	189	for file in files {
189	190	let args = [file];
190	191	let (_stdout, stderr) = rustfmt(&args);
191		assert!(!stderr.contains("thread 'main' panicked"));
	192	assert!(!panic_re.is_match(&stderr));
192	193	}
193	194	}
194	195

tests/run-make/libtest-json/output-default.json+1-1

...	...	@@ -2,7 +2,7 @@
2	2	{ "type": "test", "event": "started", "name": "a" }
3	3	{ "type": "test", "name": "a", "event": "ok" }
4	4	{ "type": "test", "event": "started", "name": "b" }
5		{ "type": "test", "name": "b", "event": "failed", "stdout": "\nthread 'b' panicked at f.rs:9:5:\nassertion failed: false\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n" }
	5	{ "type": "test", "name": "b", "event": "failed", "stdout": "\nthread 'b' ($TID) panicked at f.rs:9:5:\nassertion failed: false\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n" }
6	6	{ "type": "test", "event": "started", "name": "c" }
7	7	{ "type": "test", "name": "c", "event": "ok" }
8	8	{ "type": "test", "event": "started", "name": "d" }

tests/run-make/libtest-json/output-stdout-success.json+2-2

...	...	@@ -2,9 +2,9 @@
2	2	{ "type": "test", "event": "started", "name": "a" }
3	3	{ "type": "test", "name": "a", "event": "ok", "stdout": "print from successful test\n" }
4	4	{ "type": "test", "event": "started", "name": "b" }
5		{ "type": "test", "name": "b", "event": "failed", "stdout": "\nthread 'b' panicked at f.rs:9:5:\nassertion failed: false\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n" }
	5	{ "type": "test", "name": "b", "event": "failed", "stdout": "\nthread 'b' ($TID) panicked at f.rs:9:5:\nassertion failed: false\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n" }
6	6	{ "type": "test", "event": "started", "name": "c" }
7		{ "type": "test", "name": "c", "event": "ok", "stdout": "\nthread 'c' panicked at f.rs:15:5:\nassertion failed: false\n" }
	7	{ "type": "test", "name": "c", "event": "ok", "stdout": "\nthread 'c' ($TID) panicked at f.rs:15:5:\nassertion failed: false\n" }
8	8	{ "type": "test", "event": "started", "name": "d" }
9	9	{ "type": "test", "name": "d", "event": "ignored", "message": "msg" }
10	10	{ "type": "suite", "event": "failed", "passed": 2, "failed": 1, "ignored": 1, "measured": 0, "filtered_out": 0, "exec_time": "$EXEC_TIME" }

tests/run-make/libtest-json/rmake.rs+1

...	...	@@ -38,5 +38,6 @@ fn run_tests(extra_args: &[&str], expected_file: &str) {
38	38	.expected_file(expected_file)
39	39	.actual_text("stdout", test_stdout)
40	40	.normalize(r#"(?<prefix>"exec_time": )[0-9.]+"#, r#"${prefix}"$$EXEC_TIME""#)
	41	.normalize(r"thread '(?P<name>.*?)' $\d+$ panicked", "thread '$name' ($$TID) panicked")
41	42	.run();
42	43	}

tests/run-make/libtest-junit/output-default.xml+1-1

...	...	@@ -1 +1 @@
1		<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="1" tests="4" skipped="1" ><testcase classname="unknown" name="a" time="$TIME"/><testcase classname="unknown" name="b" time="$TIME"><failure type="assert"/><system-out><![CDATA[print from failing test]]> <![CDATA[thread 'b' panicked at f.rs:10:5:]]> <![CDATA[assertion failed: false]]> <![CDATA[note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace]]> <![CDATA[]]></system-out></testcase><testcase classname="unknown" name="c" time="$TIME"/><system-out/><system-err/></testsuite></testsuites>
	1	<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="1" tests="4" skipped="1" ><testcase classname="unknown" name="a" time="$TIME"/><testcase classname="unknown" name="b" time="$TIME"><failure type="assert"/><system-out><![CDATA[print from failing test]]> <![CDATA[thread 'b' ($TID) panicked at f.rs:10:5:]]> <![CDATA[assertion failed: false]]> <![CDATA[note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace]]> <![CDATA[]]></system-out></testcase><testcase classname="unknown" name="c" time="$TIME"/><system-out/><system-err/></testsuite></testsuites>

tests/run-make/libtest-junit/output-stdout-success.xml+1-1

...	...	@@ -1 +1 @@
1		<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="1" tests="4" skipped="1" ><testcase classname="unknown" name="a" time="$TIME"><system-out><![CDATA[print from successful test]]> <![CDATA[]]></system-out></testcase><testcase classname="unknown" name="b" time="$TIME"><failure type="assert"/><system-out><![CDATA[print from failing test]]> <![CDATA[thread 'b' panicked at f.rs:10:5:]]> <![CDATA[assertion failed: false]]> <![CDATA[note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace]]> <![CDATA[]]></system-out></testcase><testcase classname="unknown" name="c" time="$TIME"><system-out><![CDATA[]]> <![CDATA[thread 'c' panicked at f.rs:16:5:]]> <![CDATA[assertion failed: false]]> <![CDATA[]]></system-out></testcase><system-out/><system-err/></testsuite></testsuites>
	1	<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="test" package="test" id="0" errors="0" failures="1" tests="4" skipped="1" ><testcase classname="unknown" name="a" time="$TIME"><system-out><![CDATA[print from successful test]]> <![CDATA[]]></system-out></testcase><testcase classname="unknown" name="b" time="$TIME"><failure type="assert"/><system-out><![CDATA[print from failing test]]> <![CDATA[thread 'b' ($TID) panicked at f.rs:10:5:]]> <![CDATA[assertion failed: false]]> <![CDATA[note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace]]> <![CDATA[]]></system-out></testcase><testcase classname="unknown" name="c" time="$TIME"><system-out><![CDATA[]]> <![CDATA[thread 'c' ($TID) panicked at f.rs:16:5:]]> <![CDATA[assertion failed: false]]> <![CDATA[]]></system-out></testcase><system-out/><system-err/></testsuite></testsuites>

tests/run-make/libtest-junit/rmake.rs+1

...	...	@@ -27,5 +27,6 @@ fn run_tests(extra_args: &[&str], expected_file: &str) {
27	27	.expected_file(expected_file)
28	28	.actual_text("stdout", test_stdout)
29	29	.normalize(r#"\btime="[0-9.]+""#, r#"time="$$TIME""#)
	30	.normalize(r"thread '(?P<name>.*?)' $\d+$ panicked", "thread '$name' ($$TID) panicked")
30	31	.run();
31	32	}

tests/rustdoc-ui/doctest/edition-2024-error-output.stdout+1-1

...	...	@@ -9,7 +9,7 @@ Test executable failed (exit status: 101).
9	9
10	10	stderr:
11	11
12		thread 'main' panicked at $TMP:6:1:
	12	thread 'main' ($TID) panicked at $TMP:6:1:
13	13	assertion `left == right` failed
14	14	left: 4
15	15	right: 5

tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout+1-1

...	...	@@ -27,7 +27,7 @@ stderr:
27	27	stderr 1
28	28	stderr 2
29	29
30		thread 'main' panicked at $DIR/failed-doctest-output-windows.rs:7:1:
	30	thread 'main' ($TID) panicked at $DIR/failed-doctest-output-windows.rs:7:1:
31	31	oh no
32	32	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
33	33

tests/rustdoc-ui/doctest/failed-doctest-output.stdout+1-1

...	...	@@ -27,7 +27,7 @@ stderr:
27	27	stderr 1
28	28	stderr 2
29	29
30		thread 'main' panicked at $DIR/failed-doctest-output.rs:7:1:
	30	thread 'main' ($TID) panicked at $DIR/failed-doctest-output.rs:7:1:
31	31	oh no
32	32	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
33	33

tests/rustdoc-ui/doctest/stdout-and-stderr.stdout+2-2

...	...	@@ -14,7 +14,7 @@ stdout:
14	14
15	15	stderr:
16	16
17		thread 'main' panicked at $TMP:7:1:
	17	thread 'main' ($TID) panicked at $TMP:7:1:
18	18	assertion `left == right` failed
19	19	left: "doc"
20	20	right: "test"
...	...	@@ -26,7 +26,7 @@ Test executable failed (exit status: 101).
26	26
27	27	stderr:
28	28
29		thread 'main' panicked at $TMP:15:1:
	29	thread 'main' ($TID) panicked at $TMP:15:1:
30	30	assertion `left == right` failed
31	31	left: "doc"
32	32	right: "test"

tests/rustdoc-ui/remap-path-prefix-failed-doctest-output.stdout+1-1

...	...	@@ -9,7 +9,7 @@ Test executable failed (exit status: 101).
9	9
10	10	stderr:
11	11
12		thread 'main' panicked at remapped_path/remap-path-prefix-failed-doctest-output.rs:3:1:
	12	thread 'main' ($TID) panicked at remapped_path/remap-path-prefix-failed-doctest-output.rs:3:1:
13	13	oh no
14	14	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
15	15

tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs+1-1

...	...	@@ -2,7 +2,7 @@
2	2	// be talking about `async fn`s instead.
3	3
4	4	//@ run-fail
5		//@ error-pattern: thread 'main' panicked
	5	//@ regex-error-pattern: thread 'main'.*panicked
6	6	//@ error-pattern: `async fn` resumed after completion
7	7	//@ edition:2018
8	8

tests/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs+1-1

...	...	@@ -3,7 +3,7 @@
3	3
4	4	//@ run-fail
5	5	//@ needs-unwind
6		//@ error-pattern: thread 'main' panicked
	6	//@ regex-error-pattern: thread 'main'.*panicked
7	7	//@ error-pattern: `async fn` resumed after panicking
8	8	//@ edition:2018
9	9

tests/ui/backtrace/synchronized-panic-handler.run.stderr+2-2

...	...	@@ -1,7 +1,7 @@
1	1
2		thread '<unnamed>' panicked at $DIR/synchronized-panic-handler.rs:11:5:
	2	thread '<unnamed>' ($TID) panicked at $DIR/synchronized-panic-handler.rs:11:5:
3	3	oops oh no woe is me
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5
6		thread '<unnamed>' panicked at $DIR/synchronized-panic-handler.rs:11:5:
	6	thread '<unnamed>' ($TID) panicked at $DIR/synchronized-panic-handler.rs:11:5:
7	7	oops oh no woe is me

tests/ui/const-generics/generic_const_exprs/issue-80742.rs+1-1

...	...	@@ -2,7 +2,7 @@
2	2	//@ known-bug: #97477
3	3	//@ failure-status: 101
4	4	//@ normalize-stderr: "note: .*\n\n" -> ""
5		//@ normalize-stderr: "thread 'rustc' panicked.*\n" -> ""
	5	//@ normalize-stderr: "thread 'rustc'.panicked.\n" -> ""
6	6	//@ normalize-stderr: "(error: internal compiler error: [^:]+):\d+:\d+: " -> "$1:LL:CC: "
7	7	//@ rustc-env:RUST_BACKTRACE=0
8	8

tests/ui/extern/extern-types-field-offset.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at library/core/src/panicking.rs:$LINE:$COL:
	2	thread 'main' ($TID) panicked at library/core/src/panicking.rs:$LINE:$COL:
3	3	attempted to compute the size or alignment of extern type `Opaque`
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	thread caused non-unwinding panic. aborting.

tests/ui/extern/extern-types-size_of_val.align.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at library/core/src/panicking.rs:$LINE:$COL:
	2	thread 'main' ($TID) panicked at library/core/src/panicking.rs:$LINE:$COL:
3	3	attempted to compute the size or alignment of extern type `A`
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	thread caused non-unwinding panic. aborting.

tests/ui/extern/extern-types-size_of_val.size.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at library/core/src/panicking.rs:$LINE:$COL:
	2	thread 'main' ($TID) panicked at library/core/src/panicking.rs:$LINE:$COL:
3	3	attempted to compute the size or alignment of extern type `A`
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	thread caused non-unwinding panic. aborting.

tests/ui/hygiene/panic-location.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at $DIR/panic-location.rs:LL:CC:
	2	thread 'main' ($TID) panicked at $DIR/panic-location.rs:LL:CC:
3	3	capacity overflow
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/intrinsics/const-eval-select-backtrace-std.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at $DIR/const-eval-select-backtrace-std.rs:6:8:
	2	thread 'main' ($TID) panicked at $DIR/const-eval-select-backtrace-std.rs:6:8:
3	3	byte index 1 is out of bounds of ``
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/intrinsics/const-eval-select-backtrace.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at $DIR/const-eval-select-backtrace.rs:15:5:
	2	thread 'main' ($TID) panicked at $DIR/const-eval-select-backtrace.rs:15:5:
3	3	Aaah!
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/intrinsics/not-overridden.rs+1-1

...	...	@@ -4,7 +4,7 @@
4	4	//@ build-fail
5	5	//@ failure-status:101
6	6	//@ normalize-stderr: ".note: .\n\n" -> ""
7		//@ normalize-stderr: "thread 'rustc' panicked.:\n.\n" -> ""
	7	//@ normalize-stderr: "thread 'rustc'.panicked.:\n.*\n" -> ""
8	8	//@ normalize-stderr: "internal compiler error:.*: intrinsic const_deallocate " -> ""
9	9	//@ rustc-env:RUST_BACKTRACE=0
10	10

tests/ui/issues/issue-87707.run.stderr+2-2

...	...	@@ -1,7 +1,7 @@
1	1
2		thread 'main' panicked at $DIR/issue-87707.rs:14:24:
	2	thread 'main' ($TID) panicked at $DIR/issue-87707.rs:14:24:
3	3	Here Once instance is poisoned.
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5
6		thread 'main' panicked at $DIR/issue-87707.rs:16:7:
	6	thread 'main' ($TID) panicked at $DIR/issue-87707.rs:16:7:
7	7	Once instance has previously been poisoned

tests/ui/layout/valid_range_oob.rs+1-1

...	...	@@ -1,6 +1,6 @@
1	1	//@ failure-status: 101
2	2	//@ normalize-stderr: "note: .*\n\n" -> ""
3		//@ normalize-stderr: "thread 'rustc' panicked.*\n" -> ""
	3	//@ normalize-stderr: "thread 'rustc'.panicked.\n" -> ""
4	4	//@ rustc-env:RUST_BACKTRACE=0
5	5
6	6	#![feature(rustc_attrs)]

tests/ui/macros/assert-long-condition.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at $DIR/assert-long-condition.rs:7:5:
	2	thread 'main' ($TID) panicked at $DIR/assert-long-condition.rs:7:5:
3	3	assertion failed: 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18
4	4	+ 19 + 20 + 21 + 22 + 23 + 24 + 25 == 0
5	5	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/mir/lint/storage-live.rs+1-1

...	...	@@ -1,7 +1,7 @@
1	1	//@ compile-flags: -Zlint-mir -Ztreat-err-as-bug
2	2	//@ failure-status: 101
3	3	//@ normalize-stderr: "note: .*\n\n" -> ""
4		//@ normalize-stderr: "thread 'rustc' panicked.*\n" -> ""
	4	//@ normalize-stderr: "thread 'rustc'.panicked.\n" -> ""
5	5	//@ normalize-stderr: "storage_live\[....\]" -> "storage_live[HASH]"
6	6	//@ normalize-stderr: "(delayed at [^:]+):\d+:\d+ - " -> "$1:LL:CC - "
7	7	//@ rustc-env:RUST_BACKTRACE=0

tests/ui/nll/issue-51345-2.rs+2-2

...	...	@@ -1,6 +1,6 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked
3		//@ error-pattern:explicit panic
	2	//@ regex-error-pattern: thread 'main'.*panicked
	3	//@ error-pattern: explicit panic
4	4	//@ needs-subprocess
5	5
6	6	fn main() {

tests/ui/numbers-arithmetic/overflowing-add.rs+2-2

...	...	@@ -1,6 +1,6 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked
3		//@ error-pattern:attempt to add with overflow
	2	//@ regex-error-pattern: thread 'main'.*panicked
	3	//@ error-pattern: attempt to add with overflow
4	4	//@ compile-flags: -C debug-assertions
5	5	//@ needs-subprocess
6	6

tests/ui/numbers-arithmetic/overflowing-mul.rs+2-2

...	...	@@ -1,6 +1,6 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked
3		//@ error-pattern:attempt to multiply with overflow
	2	//@ regex-error-pattern: thread 'main'.*panicked
	3	//@ error-pattern: attempt to multiply with overflow
4	4	//@ needs-subprocess
5	5	//@ compile-flags: -C debug-assertions
6	6

tests/ui/numbers-arithmetic/overflowing-pow-signed.rs+2-2

...	...	@@ -1,6 +1,6 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked
3		//@ error-pattern:attempt to multiply with overflow
	2	//@ regex-error-pattern: thread 'main'.*panicked
	3	//@ error-pattern: attempt to multiply with overflow
4	4	//@ needs-subprocess
5	5	//@ compile-flags: -C debug-assertions
6	6

tests/ui/numbers-arithmetic/overflowing-pow-unsigned.rs+2-2

...	...	@@ -1,6 +1,6 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked
3		//@ error-pattern:attempt to multiply with overflow
	2	//@ regex-error-pattern: thread 'main'.*panicked
	3	//@ error-pattern: attempt to multiply with overflow
4	4	//@ needs-subprocess
5	5	//@ compile-flags: -C debug-assertions
6	6

tests/ui/numbers-arithmetic/overflowing-sub.rs+2-2

...	...	@@ -1,6 +1,6 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked
3		//@ error-pattern:attempt to subtract with overflow
	2	//@ regex-error-pattern: thread 'main'.*panicked
	3	//@ error-pattern: attempt to subtract with overflow
4	4	//@ needs-subprocess
5	5	//@ compile-flags: -C debug-assertions
6	6

tests/ui/panics/fmt-only-once.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1	fmt
2	2
3		thread 'main' panicked at $DIR/fmt-only-once.rs:20:5:
	3	thread 'main' ($TID) panicked at $DIR/fmt-only-once.rs:20:5:
4	4	PrintOnFmt
5	5	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/panics/issue-47429-short-backtraces.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at $DIR/issue-47429-short-backtraces.rs:24:5:
	2	thread 'main' ($TID) panicked at $DIR/issue-47429-short-backtraces.rs:24:5:
3	3	explicit panic
4	4	stack backtrace:
5	5	0: std::panicking::begin_panic

tests/ui/panics/location-detail-panic-no-column.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at $DIR/location-detail-panic-no-column.rs:7:0:
	2	thread 'main' ($TID) panicked at $DIR/location-detail-panic-no-column.rs:7:0:
3	3	column-redacted
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/panics/location-detail-panic-no-file.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at <redacted>:7:5:
	2	thread 'main' ($TID) panicked at <redacted>:7:5:
3	3	file-redacted
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/panics/location-detail-panic-no-line.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at $DIR/location-detail-panic-no-line.rs:0:5:
	2	thread 'main' ($TID) panicked at $DIR/location-detail-panic-no-line.rs:0:5:
3	3	line-redacted
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/panics/location-detail-panic-no-location-info.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at <redacted>:0:0:
	2	thread 'main' ($TID) panicked at <redacted>:0:0:
3	3	no location info
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/panics/location-detail-unwrap-no-file.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at <redacted>:8:9:
	2	thread 'main' ($TID) panicked at <redacted>:8:9:
3	3	called `Option::unwrap()` on a `None` value
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/panics/main-panic.rs+1-1

...	...	@@ -1,5 +1,5 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked at
	2	//@ regex-error-pattern: thread 'main' $\d+$ panicked at
3	3	//@ needs-subprocess
4	4
5	5	fn main() {

tests/ui/panics/panic-in-cleanup.run.stderr+3-3

...	...	@@ -1,12 +1,12 @@
1	1
2		thread 'main' panicked at $DIR/panic-in-cleanup.rs:22:5:
	2	thread 'main' ($TID) panicked at $DIR/panic-in-cleanup.rs:22:5:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5
6		thread 'main' panicked at $DIR/panic-in-cleanup.rs:16:9:
	6	thread 'main' ($TID) panicked at $DIR/panic-in-cleanup.rs:16:9:
7	7	BOOM
8	8	stack backtrace:
9	9
10		thread 'main' panicked at library/core/src/panicking.rs:$LINE:$COL:
	10	thread 'main' ($TID) panicked at library/core/src/panicking.rs:$LINE:$COL:
11	11	panic in a destructor during cleanup
12	12	thread caused non-unwinding panic. aborting.

tests/ui/panics/panic-in-ffi.run.stderr+2-2

...	...	@@ -1,10 +1,10 @@
1	1
2		thread 'main' panicked at $DIR/panic-in-ffi.rs:21:5:
	2	thread 'main' ($TID) panicked at $DIR/panic-in-ffi.rs:21:5:
3	3	Test
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5	Noisy Drop
6	6
7		thread 'main' panicked at library/core/src/panicking.rs:$LINE:$COL:
	7	thread 'main' ($TID) panicked at library/core/src/panicking.rs:$LINE:$COL:
8	8	panic in a function that cannot unwind
9	9	stack backtrace:
10	10	thread caused non-unwinding panic. aborting.

tests/ui/panics/panic-set-unset-handler.rs+2-2

...	...	@@ -1,6 +1,6 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked
3		//@ error-pattern:foobar
	2	//@ regex-error-pattern: thread 'main' $\d+$ panicked
	3	//@ error-pattern: foobar
4	4	//@ needs-subprocess
5	5
6	6	use std::panic;

tests/ui/panics/panic-short-backtrace-windows-x86_64.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1		thread 'main' panicked at 'd was called', $DIR/panic-short-backtrace-windows-x86_64.rs:48:5
	1	thread 'main' ($TID) panicked at 'd was called', $DIR/panic-short-backtrace-windows-x86_64.rs:48:5
2	2	stack backtrace:
3	3	0: std::panicking::begin_panic
4	4	1: d

tests/ui/panics/panic-take-handler-nop.rs+2-2

...	...	@@ -1,6 +1,6 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'main' panicked
3		//@ error-pattern:foobar
	2	//@ regex-error-pattern: thread 'main' $\d+$ panicked
	3	//@ error-pattern: foobar
4	4	//@ needs-subprocess
5	5
6	6	use std::panic;

tests/ui/panics/panic-task-name-none.rs+5-5

...	...	@@ -1,14 +1,14 @@
1	1	//@ run-fail
2		//@ error-pattern:thread '<unnamed>' panicked
3		//@ error-pattern:test
	2	//@ regex-error-pattern: thread '<unnamed>' $\d+$ panicked
	3	//@ error-pattern: test
4	4	//@ needs-threads
5	5
6	6	use std::thread;
7	7
8	8	fn main() {
9	9	let r: Result<(), _> = thread::spawn(move \|\| {
10		panic!("test");
11		})
12		.join();
	10	panic!("test");
	11	})
	12	.join();
13	13	assert!(r.is_ok());
14	14	}

tests/ui/panics/panic-task-name-owned.rs+10-10

...	...	@@ -1,19 +1,19 @@
1	1	//@ run-fail
2		//@ error-pattern:thread 'owned name' panicked
3		//@ error-pattern:test
	2	//@ regex-error-pattern: thread 'owned name' $\d+$ panicked
	3	//@ error-pattern: test
4	4	//@ needs-threads
5	5
6	6	use std::thread::Builder;
7	7
8	8	fn main() {
9	9	let r: () = Builder::new()
10		.name("owned name".to_string())
11		.spawn(move \|\| {
12		panic!("test");
13		()
14		})
15		.unwrap()
16		.join()
17		.unwrap();
	10	.name("owned name".to_string())
	11	.spawn(move \|\| {
	12	panic!("test");
	13	()
	14	})
	15	.unwrap()
	16	.join()
	17	.unwrap();
18	18	panic!();
19	19	}

tests/ui/panics/runtime-switch.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at $DIR/runtime-switch.rs:28:5:
	2	thread 'main' ($TID) panicked at $DIR/runtime-switch.rs:28:5:
3	3	explicit panic
4	4	stack backtrace:
5	5	0: std::panicking::begin_panic

tests/ui/panics/short-ice-remove-middle-frames-2.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at $DIR/short-ice-remove-middle-frames-2.rs:62:5:
	2	thread 'main' ($TID) panicked at $DIR/short-ice-remove-middle-frames-2.rs:62:5:
3	3	debug!!!
4	4	stack backtrace:
5	5	0: std::panicking::begin_panic

tests/ui/panics/short-ice-remove-middle-frames.run.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		thread 'main' panicked at $DIR/short-ice-remove-middle-frames.rs:58:5:
	2	thread 'main' ($TID) panicked at $DIR/short-ice-remove-middle-frames.rs:58:5:
3	3	debug!!!
4	4	stack backtrace:
5	5	0: std::panicking::begin_panic

tests/ui/proc-macro/load-panic-backtrace.rs+1-1

...	...	@@ -1,7 +1,7 @@
1	1	//@ proc-macro: test-macros.rs
2	2	//@ compile-flags: -Z proc-macro-backtrace
3	3	//@ rustc-env:RUST_BACKTRACE=0
4		//@ normalize-stderr: "thread '.*' panicked " -> ""
	4	//@ normalize-stderr: "thread '.*' $0x[[:xdigit:]]+$ panicked " -> ""
5	5	//@ normalize-stderr: "note:.RUST_BACKTRACE=1.\n" -> ""
6	6	//@ needs-unwind proc macro panics to report errors
7	7

tests/ui/proc-macro/load-panic-backtrace.stderr+1-1

...	...	@@ -1,5 +1,5 @@
1	1
2		at $DIR/auxiliary/test-macros.rs:38:5:
	2	thread '<unnamed>' ($TID) panicked at $DIR/auxiliary/test-macros.rs:38:5:
3	3	panic-derive
4	4	error: proc-macro derive panicked
5	5	--> $DIR/load-panic-backtrace.rs:11:10

tests/ui/process/multi-panic.rs+15-6

...	...	@@ -7,18 +7,27 @@ fn check_for_no_backtrace(test: std::process::Output) {
7	7	let err = String::from_utf8_lossy(&test.stderr);
8	8	let mut it = err.lines().filter(\|l\| !l.is_empty());
9	9
10		assert_eq!(it.next().map(\|l\| l.starts_with("thread '<unnamed>' panicked")), Some(true));
11		assert_eq!(it.next().is_some(), true);
	10	assert_eq!(
	11	it.next().map(\|l\| l.starts_with("thread '<unnamed>' (") && l.contains("panicked")),
	12	Some(true),
	13	"out: ```{err}```",
	14	);
	15	assert_eq!(it.next().is_some(), true, "out: ```{err}```");
12	16	assert_eq!(
13	17	it.next(),
14	18	Some(
15	19	"note: run with `RUST_BACKTRACE=1` \
16	20	environment variable to display a backtrace"
17		)
	21	),
	22	"out: ```{err}```",
	23	);
	24	assert_eq!(
	25	it.next().map(\|l\| l.starts_with("thread 'main' (") && l.contains("panicked at")),
	26	Some(true),
	27	"out: ```{err}```",
18	28	);
19		assert_eq!(it.next().map(\|l\| l.starts_with("thread 'main' panicked at")), Some(true));
20		assert_eq!(it.next().is_some(), true);
21		assert_eq!(it.next(), None);
	29	assert_eq!(it.next().is_some(), true, "out: ```{err}```");
	30	assert_eq!(it.next(), None, "out: ```{err}```");
22	31	}
23	32
24	33	fn main() {

tests/ui/process/println-with-broken-pipe.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'main' panicked at library/std/src/io/stdio.rs:LL:CC:
	2	thread 'main' ($TID) panicked at library/std/src/io/stdio.rs:LL:CC:
3	3	failed printing to stdout: Broken pipe (os error 32)
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/resolve/multiple_definitions_attribute_merging.rs+1-1

...	...	@@ -5,7 +5,7 @@
5	5	//@known-bug: #120873
6	6	//@ failure-status: 101
7	7	//@ normalize-stderr: "note: .*\n\n" -> ""
8		//@ normalize-stderr: "thread 'rustc' panicked.*\n" -> ""
	8	//@ normalize-stderr: "thread 'rustc'.panicked.\n" -> ""
9	9	//@ normalize-stderr: "(error: internal compiler error: [^:]+):\d+:\d+: " -> "$1:LL:CC: "
10	10	//@ rustc-env:RUST_BACKTRACE=0
11	11

tests/ui/resolve/proc_macro_generated_packed.rs+1-1

...	...	@@ -5,7 +5,7 @@
5	5	//@known-bug: #120873
6	6	//@ failure-status: 101
7	7	//@ normalize-stderr: "note: .*\n\n" -> ""
8		//@ normalize-stderr: "thread 'rustc' panicked.*\n" -> ""
	8	//@ normalize-stderr: "thread 'rustc'.panicked.\n" -> ""
9	9	//@ normalize-stderr: "(error: internal compiler error: [^:]+):\d+:\d+: " -> "$1:LL:CC: "
10	10	//@ rustc-env:RUST_BACKTRACE=0
11	11

tests/ui/test-attrs/terse.run.stdout+3-3

...	...	@@ -10,18 +10,18 @@ failures:
10	10
11	11	---- abc stdout ----
12	12
13		thread 'abc' panicked at $DIR/terse.rs:12:5:
	13	thread 'abc' ($TID) panicked at $DIR/terse.rs:12:5:
14	14	explicit panic
15	15	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
16	16
17	17	---- foo stdout ----
18	18
19		thread 'foo' panicked at $DIR/terse.rs:17:5:
	19	thread 'foo' ($TID) panicked at $DIR/terse.rs:17:5:
20	20	explicit panic
21	21
22	22	---- foo2 stdout ----
23	23
24		thread 'foo2' panicked at $DIR/terse.rs:22:5:
	24	thread 'foo2' ($TID) panicked at $DIR/terse.rs:22:5:
25	25	explicit panic
26	26
27	27

tests/ui/test-attrs/test-panic-abort-nocapture.run.stderr+2-2

...	...	@@ -1,11 +1,11 @@
1	1
2		thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:32:5:
	2	thread 'main' ($TID) panicked at $DIR/test-panic-abort-nocapture.rs:32:5:
3	3	assertion `left == right` failed
4	4	left: 2
5	5	right: 4
6	6	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
7	7
8		thread 'main' panicked at $DIR/test-panic-abort-nocapture.rs:26:5:
	8	thread 'main' ($TID) panicked at $DIR/test-panic-abort-nocapture.rs:26:5:
9	9	assertion `left == right` failed
10	10	left: 2
11	11	right: 4

tests/ui/test-attrs/test-panic-abort.run.stdout+1-1

...	...	@@ -18,7 +18,7 @@ testing123
18	18	---- it_fails stderr ----
19	19	testing321
20	20
21		thread 'main' panicked at $DIR/test-panic-abort.rs:37:5:
	21	thread 'main' ($TID) panicked at $DIR/test-panic-abort.rs:37:5:
22	22	assertion `left == right` failed
23	23	left: 2
24	24	right: 5

tests/ui/test-attrs/test-should-panic-failed-show-span.run.stderr+4-4

...	...	@@ -1,13 +1,13 @@
1	1
2		thread 'should_panic_with_any_message' panicked at $DIR/test-should-panic-failed-show-span.rs:14:5:
	2	thread 'should_panic_with_any_message' ($TID) panicked at $DIR/test-should-panic-failed-show-span.rs:14:5:
3	3	Panic!
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
5	5
6		thread 'should_panic_with_message' panicked at $DIR/test-should-panic-failed-show-span.rs:20:5:
	6	thread 'should_panic_with_message' ($TID) panicked at $DIR/test-should-panic-failed-show-span.rs:20:5:
7	7	message
8	8
9		thread 'should_panic_with_substring_panics_with_incorrect_string' panicked at $DIR/test-should-panic-failed-show-span.rs:38:5:
	9	thread 'should_panic_with_substring_panics_with_incorrect_string' ($TID) panicked at $DIR/test-should-panic-failed-show-span.rs:38:5:
10	10	ZOMGWTFBBQ
11	11
12		thread 'should_panic_with_substring_panics_with_non_string_value' panicked at $DIR/test-should-panic-failed-show-span.rs:45:5:
	12	thread 'should_panic_with_substring_panics_with_non_string_value' ($TID) panicked at $DIR/test-should-panic-failed-show-span.rs:45:5:
13	13	Box<dyn Any>

tests/ui/test-attrs/test-thread-capture.run.stdout+1-1

...	...	@@ -11,7 +11,7 @@ fie
11	11	foe
12	12	fum
13	13
14		thread 'thready_fail' panicked at $DIR/test-thread-capture.rs:32:5:
	14	thread 'thready_fail' ($TID) panicked at $DIR/test-thread-capture.rs:32:5:
15	15	explicit panic
16	16	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
17	17

tests/ui/test-attrs/test-thread-nocapture.run.stderr+1-1

...	...	@@ -1,4 +1,4 @@
1	1
2		thread 'thready_fail' panicked at $DIR/test-thread-nocapture.rs:32:5:
	2	thread 'thready_fail' ($TID) panicked at $DIR/test-thread-nocapture.rs:32:5:
3	3	explicit panic
4	4	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/ui/track-diagnostics/track.rs+5

...	...	@@ -13,6 +13,11 @@
13	13	// top of this file are present, then assume all args are present.
14	14	//@ normalize-stderr: "note: compiler flags: .-Z ui-testing.-Z track-diagnostics" -> "note: compiler flags: ... -Z ui-testing ... -Z track-diagnostics"
15	15
	16	// FIXME: this tests a crash in rustc. For stage1, rustc is built with the downloaded standard
	17	// library which doesn't yet print the thread ID. Normalization can be removed at the stage bump.
	18	// For the grep: cfg(bootstrap)
	19	//@normalize-stderr: "thread 'rustc' panicked" -> "thread 'rustc' ($$TID) panicked"
	20
16	21	fn main() {
17	22	break rust
18	23	//~^ ERROR cannot find value `rust` in this scope

tests/ui/track-diagnostics/track.stderr+1-1

...	...	@@ -27,7 +27,7 @@ LL \| break rust
27	27	= note: compiler flags: ... -Z ui-testing ... -Z track-diagnostics
28	28
29	29
30		thread 'rustc' panicked at compiler/rustc_hir_typeck/src/lib.rs:LL:CC:
	30	thread 'rustc' ($TID) panicked at compiler/rustc_hir_typeck/src/lib.rs:LL:CC:
31	31	Box<dyn Any>
32	32	note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
33	33

tests/ui/treat-err-as-bug/err.rs+1-1

...	...	@@ -1,7 +1,7 @@
1	1	//@ compile-flags: -Ztreat-err-as-bug
2	2	//@ failure-status: 101
3	3	//@ normalize-stderr: "note: .*\n\n" -> ""
4		//@ normalize-stderr: "thread 'rustc' panicked.:\n.\n" -> ""
	4	//@ normalize-stderr: "thread 'rustc'.panicked.:\n.*\n" -> ""
5	5	//@ rustc-env:RUST_BACKTRACE=0
6	6
7	7	#![crate_type = "rlib"]

tests/ui/treat-err-as-bug/span_delayed_bug.rs+1-1

...	...	@@ -1,7 +1,7 @@
1	1	//@ compile-flags: -Ztreat-err-as-bug -Zeagerly-emit-delayed-bugs
2	2	//@ failure-status: 101
3	3	//@ normalize-stderr: "note: .*\n\n" -> ""
4		//@ normalize-stderr: "thread 'rustc' panicked.:\n.\n" -> ""
	4	//@ normalize-stderr: "thread 'rustc'.panicked.:\n.*\n" -> ""
5	5	//@ rustc-env:RUST_BACKTRACE=0
6	6
7	7	#![feature(rustc_attrs)]

tests/ui/type/pattern_types/bad_const_generics_args_on_const_param.rs+1-1

...	...	@@ -1,7 +1,7 @@
1	1	//@known-bug: #127972
2	2	//@ failure-status: 101
3	3	//@ normalize-stderr: "note: .*\n\n" -> ""
4		//@ normalize-stderr: "thread 'rustc' panicked.*\n" -> ""
	4	//@ normalize-stderr: "thread 'rustc'.panicked.\n" -> ""
5	5	//@ normalize-stderr: "(error: internal compiler error: [^:]+):\d+:\d+: " -> "$1:LL:CC: "
6	6	//@ rustc-env:RUST_BACKTRACE=0
7	7