Skip to content

Commit 54bbbd1

Browse files
committed
Auto merge of #1701 - m-ou-se:non-fmt-panic-lint, r=oli-obk
Update rust version and update tests. This is a fix for rust-lang/rust#81770
2 parents 4cf36f2 + 7fc2444 commit 54bbbd1

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
120b2a704a60d4341286bd82f6e638c65ca169b6
1+
6a388dcfbb07b3ca3d4ad3fd3902ac7e3b11b5f6

tests/run-pass/async-fn.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![feature(never_type)]
2-
#![feature(wake_trait)]
32

43
use std::{future::Future, pin::Pin, task::Poll};
54
use std::task::{Wake, Waker, Context};

tests/run-pass/panic/catch_panic.rs

+1-1
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)]
6+
#![allow(unconditional_panic, non_fmt_panic)]
77

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

0 commit comments

Comments
 (0)