bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rtprintpanic: clarify that the error is aborting the process

Browse source
This commit is contained in:
Lieselotte 2025-04-18 15:02:22 +02:00
parent 0d56e3eed1
commit 17b7d63fd7
No known key found for this signature in database
GPG key ID: 68A9A951C7E1F283
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/std/src/rt.rs
View file

@ -46,7 +46,7 @@ macro_rules! rtprintpanic {
macro_rules! rtabort { macro_rules! rtabort {
($($t:tt)*) => { ($($t:tt)*) => {
{ {
rtprintpanic!("fatal runtime error: {}\n", format_args!($($t)*)); rtprintpanic!("fatal runtime error: {}, aborting\n", format_args!($($t)*));
crate::sys::abort_internal(); crate::sys::abort_internal();
} }
} }

2
src/tools/miri/tests/fail/panic/tls_macro_const_drop_panic.stderr
View file

@ -1,7 +1,7 @@
thread $NAME panicked at tests/fail/panic/tls_macro_const_drop_panic.rs:LL:CC: thread $NAME panicked at tests/fail/panic/tls_macro_const_drop_panic.rs:LL:CC:
ow ow
fatal runtime error: thread local panicked on drop fatal runtime error: thread local panicked on drop, aborting
error: abnormal termination: the program aborted execution error: abnormal termination: the program aborted execution
error: aborting due to 1 previous error error: aborting due to 1 previous error

2
src/tools/miri/tests/fail/panic/tls_macro_drop_panic.stderr
View file

@ -1,7 +1,7 @@
thread $NAME panicked at tests/fail/panic/tls_macro_drop_panic.rs:LL:CC: thread $NAME panicked at tests/fail/panic/tls_macro_drop_panic.rs:LL:CC:
ow ow
fatal runtime error: thread local panicked on drop fatal runtime error: thread local panicked on drop, aborting
error: abnormal termination: the program aborted execution error: abnormal termination: the program aborted execution
error: aborting due to 1 previous error error: aborting due to 1 previous error

2
tests/ui/runtime/rt-explody-panic-payloads.rs
View file

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