Auto merge of #1848 - RalfJung:rustup, r=RalfJung

rustup Cc https://github.com/rust-lang/rust/issues/86923
2021-07-07 07:33:42 +00:00 · 2021-07-07 07:33:42 +00:00 · 3cf6550cc1
commit 3cf6550cc1
parent 4a30b68d45 833dff994f
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-39e20f1ae5f13451eb35247808d6a2527cb7d060
+c5e344f7747dbd7e7d4b209e3c480deb5979a56f
--- a/tests/run-pass/panic/catch_panic.rs
+++ b/tests/run-pass/panic/catch_panic.rs
@ -3,7 +3,7 @@
 // We test the `align_offset` panic below, make sure we test the interpreter impl and not the "real" one.
 // compile-flags: -Zmiri-symbolic-alignment-check
 #![feature(never_type)]
-#![allow(unconditional_panic, non_fmt_panic)]
+#![allow(unconditional_panic, non_fmt_panics)]

 use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::cell::Cell;