Skip to content

Commit

Permalink
Rollup merge of rust-lang#128379 - Dajamante:aïssata_needs_unwind, r=…
Browse files Browse the repository at this point in the history
…pietroalbini

the output in stderr expects panic-unwind

r​? ``@pietroalbini``
  • Loading branch information
matthiaskrgr authored Jul 30, 2024
2 parents 6f0b237 + dadf3d2 commit 7ea1f72
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions tests/ui/backtrace/synchronized-panic-handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//@ edition:2021
//@ exec-env:RUST_BACKTRACE=0
//@ needs-threads
//@ needs-unwind
use std::thread;
const PANIC_MESSAGE: &str = "oops oh no woe is me";

Expand Down
4 changes: 2 additions & 2 deletions tests/ui/backtrace/synchronized-panic-handler.run.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
thread '<unnamed>' panicked at $DIR/synchronized-panic-handler.rs:10:5:
thread '<unnamed>' panicked at $DIR/synchronized-panic-handler.rs:11:5:
oops oh no woe is me
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
thread '<unnamed>' panicked at $DIR/synchronized-panic-handler.rs:10:5:
thread '<unnamed>' panicked at $DIR/synchronized-panic-handler.rs:11:5:
oops oh no woe is me

0 comments on commit 7ea1f72

Please sign in to comment.