From: Noah Lev <camelidcamel@gmail.com>
Date: Tue, 5 Oct 2021 20:13:06 +0000 (-0700)
Subject: rustup
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=9af75a824f0d1d07e111ef68c3198568a2b6a513;p=rust.git

rustup

Update to the `HEAD` commit of rust-lang/rust and fix test failure.
---

diff --git a/rust-version b/rust-version
index 65591aa7ebd..0423627269b 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-2b6ed3b675475abc01ce7e68bb75b457f0c85684
+25ec8273855fde2d72ae877b397e054de5300e10
diff --git a/tests/compile-fail/erroneous_const.rs b/tests/compile-fail/erroneous_const.rs
index 199439ccbd2..2592483fe65 100644
--- 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)]