Skip to content

Commit 17b7d63

Browse files
committed
rtprintpanic: clarify that the error is aborting the process
1 parent 0d56e3e commit 17b7d63

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Diff for: library/std/src/rt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ macro_rules! rtprintpanic {
4646
macro_rules! rtabort {
4747
($($t:tt)*) => {
4848
{
49-
rtprintpanic!("fatal runtime error: {}\n", format_args!($($t)*));
49+
rtprintpanic!("fatal runtime error: {}, aborting\n", format_args!($($t)*));
5050
crate::sys::abort_internal();
5151
}
5252
}

Diff for: src/tools/miri/tests/fail/panic/tls_macro_const_drop_panic.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
thread $NAME panicked at tests/fail/panic/tls_macro_const_drop_panic.rs:LL:CC:
33
ow
4-
fatal runtime error: thread local panicked on drop
4+
fatal runtime error: thread local panicked on drop, aborting
55
error: abnormal termination: the program aborted execution
66

77
error: aborting due to 1 previous error

Diff for: src/tools/miri/tests/fail/panic/tls_macro_drop_panic.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
thread $NAME panicked at tests/fail/panic/tls_macro_drop_panic.rs:LL:CC:
33
ow
4-
fatal runtime error: thread local panicked on drop
4+
fatal runtime error: thread local panicked on drop, aborting
55
error: abnormal termination: the program aborted execution
66

77
error: aborting due to 1 previous error

Diff for: tests/ui/runtime/rt-explody-panic-payloads.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fn main() {
2727
// by QEMU in the stderr whenever a core dump happens. Remove it before the check.
2828
v.strip_suffix("qemu: uncaught target signal 6 (Aborted) - core dumped\n").unwrap_or(v)
2929
})
30-
.map(|v| { v.ends_with("fatal runtime error: drop of the panic payload panicked\n") })
30+
.map(|v| v.ends_with("fatal runtime error: drop of the panic payload panicked, aborting\n"))
3131
.unwrap_or(false));
3232
}

0 commit comments

Comments
 (0)