From 7fc24442bd6e35a0d7a7f025da41870506490605 Mon Sep 17 00:00:00 2001
From: Mara Bos <m-ou.se@m-ou.se>
Date: Fri, 5 Feb 2021 10:02:47 +0100
Subject: [PATCH] Update rust version.

- Allow new non_fmt_panic lint in test.
- Remove stabilized feature(wake_trait).
---
 rust-version                        | 2 +-
 tests/run-pass/async-fn.rs          | 1 -
 tests/run-pass/panic/catch_panic.rs | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/rust-version b/rust-version
index 555bac8c19..3fb38bf738 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-120b2a704a60d4341286bd82f6e638c65ca169b6
+6a388dcfbb07b3ca3d4ad3fd3902ac7e3b11b5f6
diff --git a/tests/run-pass/async-fn.rs b/tests/run-pass/async-fn.rs
index b0a9791233..d03c2cf282 100644
--- a/tests/run-pass/async-fn.rs
+++ b/tests/run-pass/async-fn.rs
@@ -1,5 +1,4 @@
 #![feature(never_type)]
-#![feature(wake_trait)]
 
 use std::{future::Future, pin::Pin, task::Poll};
 use std::task::{Wake, Waker, Context};
diff --git a/tests/run-pass/panic/catch_panic.rs b/tests/run-pass/panic/catch_panic.rs
index 941f79c7ad..9f9a2b493c 100644
--- 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)]
+#![allow(unconditional_panic, non_fmt_panic)]
 
 use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::cell::Cell;