Auto merge of #1896 - camelid:rustup, r=RalfJung

rustup Update to the `HEAD` commit of rust-lang/rust and fix test failure. r? `@RalfJung`
2021-10-05 20:28:34 +00:00 · 2021-10-05 20:28:34 +00:00 · f3af24096e
commit f3af24096e
parent 18667a8565 9af75a824f
2 changed files with 1 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-2b6ed3b675475abc01ce7e68bb75b457f0c85684
+25ec8273855fde2d72ae877b397e054de5300e10
--- a/tests/compile-fail/erroneous_const.rs
+++ b/tests/compile-fail/erroneous_const.rs
@ -2,7 +2,6 @@
 //! (https://github.com/rust-lang/miri/issues/1382)
 // Inlining changes the error location
 // compile-flags: -Zmir-opt-level=0
-#![feature(const_panic)]
 #![feature(never_type)]
 #![warn(warnings, const_err)]