Skip to content

Commit b796ced

Browse files
authored
Merge pull request #4762 from rust-lang/rustup-2025-12-13
Automatic Rustup
2 parents 2243962 + 21a46be commit b796ced

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f5209000832c9d3bc29c91f4daef4ca9f28dc797
1+
dc47a69ed94bc88b10b7d500cceacf29b87bcbbe

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)