Merge ref 'dc47a69ed94b' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: dc47a69ed94bc88b10b7d500cceacf29b87bcbbe
Filtered ref: c2685da
Upstream diff: rust-lang/rust@f520900...dc47a69

This merge was created using https://github.com/rust-lang/josh-sync.

Author: The Miri Cronjob Bot

tests/fail/panic/tls_macro_drop_panic.rs

@@ -1,7 +1,7 @@
 //@error-in-other-file: aborted execution
 // Backtraces vary wildly between platforms, we have to normalize away almost the entire thing
 //@normalize-stderr-test: "'main'|'<unnamed>'" -> "$$NAME"
-//@normalize-stderr-test: ".*(note|-->|\|).*\n" -> ""
+//@normalize-stderr-test: ".*(note|-->|:::|\|).*\n" -> ""
 
 pub struct NoisyDrop {}