Skip to content

Commit 3cf6550

Browse files
committed
Auto merge of #1848 - RalfJung:rustup, r=RalfJung
rustup Cc rust-lang/rust#86923
2 parents 4a30b68 + 833dff9 commit 3cf6550

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-
39e20f1ae5f13451eb35247808d6a2527cb7d060
1+
c5e344f7747dbd7e7d4b209e3c480deb5979a56f

tests/run-pass/panic/catch_panic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// We test the `align_offset` panic below, make sure we test the interpreter impl and not the "real" one.
44
// compile-flags: -Zmiri-symbolic-alignment-check
55
#![feature(never_type)]
6-
#![allow(unconditional_panic, non_fmt_panic)]
6+
#![allow(unconditional_panic, non_fmt_panics)]
77

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

0 commit comments

Comments
 (0)