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

rustup Cc rust-lang/rust#86923
rust-lang · Jul 7, 2021 · 3cf6550 · 3cf6550
2 parents 4a30b68 + 833dff9
commit 3cf6550
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-39e20f1ae5f13451eb35247808d6a2527cb7d060
+c5e344f7747dbd7e7d4b209e3c480deb5979a56f
diff --git 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;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		39e20f1ae5f13451eb35247808d6a2527cb7d060
		c5e344f7747dbd7e7d4b209e3c480deb5979a56f