Auto merge of #1187 - RalfJung:rustup, r=RalfJung

fix for const-prop lint changes

Cc rust-lang/rust#69331

Author: bors

rust-version

@@ -1 +1 @@
-de362d88ea17ab23ca2483cb798bc7aeb81a48f5
+2851e59a52673e0242532035047009c6e121c95a

test-cargo-miri/tests/test.rs

@@ -55,7 +55,7 @@ fn do_panic() { // In large, friendly letters :)
 
 // FIXME: see above
 #[test]
-#[allow(const_err)]
+#[allow(unconditional_panic)]
 #[cfg_attr(not(windows), should_panic(expected="the len is 0 but the index is 42"))]
 fn fail_index_check() {
     #[cfg(not(windows))]

tests/run-pass/coerce_non_capture_closure_to_fn_ptr.rs

@@ -1,7 +1,4 @@
-// allow(const_err) to work around a bug in warnings
-#[allow(const_err)]
 static FOO: fn() = || { assert_ne!(42, 43) };
-#[allow(const_err)]
 static BAR: fn(i32, i32) = |a, b| { assert_ne!(a, b) };
 
 // use to first make the closure FnOnce() before making it fn()

tests/run-pass/panic/catch_panic.rs

@@ -1,7 +1,7 @@
 // ignore-windows: Unwind panicking does not currently work on Windows
 // normalize-stderr-test "[^ ]*libcore/macros/mod.rs[0-9:]*" -> "$$LOC"
 #![feature(never_type)]
-#![allow(const_err)]
+#![allow(unconditional_panic)]
 use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::cell::Cell;
 

tests/run-pass/panic/div-by-zero-2.rs

@@ -1,5 +1,5 @@
 // ignore-windows: Unwind panicking does not currently work on Windows
-#![allow(const_err)]
+#![allow(unconditional_panic)]
 
 fn main() {
     let _n = 1 / 0;

tests/run-pass/panic/overflowing-lsh-neg.rs

@@ -1,6 +1,5 @@
 // ignore-windows: Unwind panicking does not currently work on Windows
-#![allow(exceeding_bitshifts)]
-#![allow(const_err)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     let _n = 2i64 << -1;

tests/run-pass/panic/overflowing-lsh-neg.stderr

@@ -1 +1 @@
-thread 'main' panicked at 'attempt to shift left with overflow', $DIR/overflowing-lsh-neg.rs:6:14
+thread 'main' panicked at 'attempt to shift left with overflow', $DIR/overflowing-lsh-neg.rs:5:14

tests/run-pass/panic/overflowing-rsh-1.rs

@@ -1,5 +1,5 @@
 // ignore-windows: Unwind panicking does not currently work on Windows
-#![allow(exceeding_bitshifts, const_err)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     let _n = 1i64 >> 64;

tests/run-pass/panic/overflowing-rsh-2.rs

@@ -1,5 +1,5 @@
 // ignore-windows: Unwind panicking does not currently work on Windows
-#![allow(exceeding_bitshifts, const_err)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     // Make sure we catch overflows that would be hidden by first casting the RHS to u32