Skip to content

Commit

Permalink
Auto merge of #1701 - m-ou-se:non-fmt-panic-lint, r=oli-obk
Browse files Browse the repository at this point in the history
Update rust version and update tests.

This is a fix for rust-lang/rust#81770
  • Loading branch information
bors committed Feb 5, 2021
2 parents 4cf36f2 + 7fc2444 commit 54bbbd1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
120b2a704a60d4341286bd82f6e638c65ca169b6
6a388dcfbb07b3ca3d4ad3fd3902ac7e3b11b5f6
1 change: 0 additions & 1 deletion tests/run-pass/async-fn.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(never_type)]
#![feature(wake_trait)]

use std::{future::Future, pin::Pin, task::Poll};
use std::task::{Wake, Waker, Context};
Expand Down
2 changes: 1 addition & 1 deletion tests/run-pass/panic/catch_panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
#![allow(unconditional_panic, non_fmt_panic)]

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

0 comments on commit 54bbbd1

Please sign in to comment.