Skip to content

Commit 57bea44

Browse files
committed
Auto merge of #149891 - matthiaskrgr:rollup-jh6xrhz, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#142380 (Put negative implementors first and apply same ordering logic to foreign implementors) - rust-lang/rust#146584 (remove duplicated columns from `rustc_error_code::error_codes!`) - rust-lang/rust#148717 (Point at span within local macros even when error happens in nested external macro) - rust-lang/rust#149565 (rustdoc: Add unstable `--merge-doctests=yes/no/auto` flag) - rust-lang/rust#149770 (Rename some issue-* tests) - rust-lang/rust#149807 (Use ubuntu:24.04 for the `x86_64-gnu-miri` job) - rust-lang/rust#149850 (Remove "tidy" tool for `tests/rustdoc` testsuite) - rust-lang/rust#149863 (Do not suggest moving expression out of for loop when hitting `break` from desugaring) - rust-lang/rust#149867 (only resolve main in bin crates) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 362ace9 + 5b3a9c9 commit 57bea44

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/fail/panic/tls_macro_drop_panic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@error-in-other-file: aborted execution
22
// Backtraces vary wildly between platforms, we have to normalize away almost the entire thing
33
//@normalize-stderr-test: "'main'|'<unnamed>'" -> "$$NAME"
4-
//@normalize-stderr-test: ".*(note|-->|\|).*\n" -> ""
4+
//@normalize-stderr-test: ".*(note|-->|:::|\|).*\n" -> ""
55

66
pub struct NoisyDrop {}
77

0 commit comments

Comments
 (0)