From 627d7cba644575467eb276a853acc07f7fcf2b33 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 21 Feb 2020 10:28:24 +0100 Subject: [PATCH] fix for const-prop lint changes --- rust-version | 2 +- tests/run-pass/panic/catch_panic.rs | 2 +- tests/run-pass/panic/div-by-zero-2.rs | 2 +- tests/run-pass/panic/overflowing-lsh-neg.rs | 3 +-- tests/run-pass/panic/overflowing-lsh-neg.stderr | 2 +- tests/run-pass/panic/overflowing-rsh-1.rs | 2 +- tests/run-pass/panic/overflowing-rsh-2.rs | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rust-version b/rust-version index 00feed4764..fe788019e0 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -de362d88ea17ab23ca2483cb798bc7aeb81a48f5 +2851e59a52673e0242532035047009c6e121c95a diff --git a/tests/run-pass/panic/catch_panic.rs b/tests/run-pass/panic/catch_panic.rs index 4d4206923a..21a6fee7c9 100644 --- a/tests/run-pass/panic/catch_panic.rs +++ b/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; diff --git a/tests/run-pass/panic/div-by-zero-2.rs b/tests/run-pass/panic/div-by-zero-2.rs index 6cc319bf0b..cfacc9db0d 100644 --- a/tests/run-pass/panic/div-by-zero-2.rs +++ b/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; diff --git a/tests/run-pass/panic/overflowing-lsh-neg.rs b/tests/run-pass/panic/overflowing-lsh-neg.rs index b214243c88..ee15ca0284 100644 --- a/tests/run-pass/panic/overflowing-lsh-neg.rs +++ b/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; diff --git a/tests/run-pass/panic/overflowing-lsh-neg.stderr b/tests/run-pass/panic/overflowing-lsh-neg.stderr index fe5a35e6b3..e1e7daa119 100644 --- a/tests/run-pass/panic/overflowing-lsh-neg.stderr +++ b/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 diff --git a/tests/run-pass/panic/overflowing-rsh-1.rs b/tests/run-pass/panic/overflowing-rsh-1.rs index 68ea51d167..36ab948a5e 100644 --- a/tests/run-pass/panic/overflowing-rsh-1.rs +++ b/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; diff --git a/tests/run-pass/panic/overflowing-rsh-2.rs b/tests/run-pass/panic/overflowing-rsh-2.rs index 4e287f20ad..da77a46a80 100644 --- a/tests/run-pass/panic/overflowing-rsh-2.rs +++ b/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