Skip to content

Commit

Permalink
Fix test output.
Browse files Browse the repository at this point in the history
  • Loading branch information
m-ou-se committed Jul 29, 2023
1 parent 0e72940 commit 893bb8e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
thread $NAME panicked at 'ow', $DIR/thread_local_const_drop_panic.rs:LL:CC
thread $NAME panicked at $DIR/thread_local_const_drop_panic.rs:LL:CC:
ow
fatal runtime error: thread local panicked on drop
error: abnormal termination: the program aborted execution

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
thread $NAME panicked at 'ow', $DIR/thread_local_drop_panic.rs:LL:CC
thread $NAME panicked at $DIR/thread_local_drop_panic.rs:LL:CC:
ow
fatal runtime error: thread local panicked on drop
error: abnormal termination: the program aborted execution

Expand Down
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/ice-bug-report-url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

// normalize-stderr-test "note: compiler flags.*\n\n" -> ""
// normalize-stderr-test "note: rustc.*running on.*" -> "note: rustc {version} running on {platform}"
// normalize-stderr-test "thread.*panicked at .*, compiler.*" -> "thread panicked at 'aborting due to `-Z treat-err-as-bug`'"
// normalize-stderr-test "thread.*panicked at compiler.*" -> ""
// normalize-stderr-test " +\d{1,}: .*\n" -> ""
// normalize-stderr-test " + at .*\n" -> ""
// normalize-stderr-test ".*note: Some details are omitted.*\n" -> ""
Expand Down
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/ice-bug-report-url.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: expected one of `->`, `where`, or `{`, found `<eof>`
LL | fn wrong()
| ^ expected one of `->`, `where`, or `{`

thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:1711:30:

aborting due to `-Z treat-err-as-bug=1`
stack backtrace:

Expand Down

0 comments on commit 893bb8e

Please sign in to comment.