diff --git a/src/driver.rs b/src/driver.rs
index 92f83f1a29e3..1b0ea2e769a2 100644
--- a/src/driver.rs
+++ b/src/driver.rs
@@ -248,7 +248,7 @@ You can use tool lints to allow or deny lints from your code, eg.:
pub fn main() {
rustc_driver::init_rustc_env_logger();
exit(
- rustc_driver::report_ices_to_stderr_if_any(move || {
+ rustc_driver::catch_fatal_errors(move || {
use std::env;
if std::env::args().any(|a| a == "--version" || a == "-V") {
diff --git a/tests/ui/non_copy_const.rs b/tests/ui/non_copy_const.rs
index 46cbb3fee35a..5a62957cdb47 100644
--- a/tests/ui/non_copy_const.rs
+++ b/tests/ui/non_copy_const.rs
@@ -1,4 +1,3 @@
-#![feature(const_string_new, const_vec_new)]
#![allow(clippy::ref_in_deref, dead_code)]
use std::borrow::Cow;
diff --git a/tests/ui/non_copy_const.stderr b/tests/ui/non_copy_const.stderr
index 634933eac618..2f325f9e3dfd 100644
--- a/tests/ui/non_copy_const.stderr
+++ b/tests/ui/non_copy_const.stderr
@@ -1,5 +1,5 @@
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:10:1
+ --> $DIR/non_copy_const.rs:9:1
|
LL | const ATOMIC: AtomicUsize = AtomicUsize::new(5); //~ ERROR interior mutable
| -----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -9,7 +9,7 @@ LL | const ATOMIC: AtomicUsize = AtomicUsize::new(5); //~ ERROR interior mutable
= note: `#[deny(clippy::declare_interior_mutable_const)]` on by default
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:11:1
+ --> $DIR/non_copy_const.rs:10:1
|
LL | const CELL: Cell<usize> = Cell::new(6); //~ ERROR interior mutable
| -----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -17,7 +17,7 @@ LL | const CELL: Cell<usize> = Cell::new(6); //~ ERROR interior mutable
| help: make this a static item: `static`
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:12:1
+ --> $DIR/non_copy_const.rs:11:1
|
LL | const ATOMIC_TUPLE: ([AtomicUsize; 1], Vec<AtomicUsize>, u8) = ([ATOMIC], Vec::new(), 7);
| -----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -25,7 +25,7 @@ LL | const ATOMIC_TUPLE: ([AtomicUsize; 1], Vec<AtomicUsize>, u8) = ([ATOMIC], V
| help: make this a static item: `static`
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:17:9
+ --> $DIR/non_copy_const.rs:16:9
|
LL | const $name: $ty = $e;
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -34,49 +34,49 @@ LL | declare_const!(_ONCE: Once = Once::new()); //~ ERROR interior mutable
| ------------------------------------------ in this macro invocation
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:41:5
+ --> $DIR/non_copy_const.rs:40:5
|
LL | const ATOMIC: AtomicUsize; //~ ERROR interior mutable
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:45:5
+ --> $DIR/non_copy_const.rs:44:5
|
LL | const INPUT: T;
| ^^^^^^^^^^^^^^^
|
help: consider requiring `T` to be `Copy`
- --> $DIR/non_copy_const.rs:45:18
+ --> $DIR/non_copy_const.rs:44:18
|
LL | const INPUT: T;
| ^
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:48:5
+ --> $DIR/non_copy_const.rs:47:5
|
LL | const ASSOC: Self::NonCopyType;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: consider requiring `<Self as Trait<T>>::NonCopyType` to be `Copy`
- --> $DIR/non_copy_const.rs:48:18
+ --> $DIR/non_copy_const.rs:47:18
|
LL | const ASSOC: Self::NonCopyType;
| ^^^^^^^^^^^^^^^^^
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:52:5
+ --> $DIR/non_copy_const.rs:51:5
|
LL | const AN_INPUT: T = Self::INPUT;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: consider requiring `T` to be `Copy`
- --> $DIR/non_copy_const.rs:52:21
+ --> $DIR/non_copy_const.rs:51:21
|
LL | const AN_INPUT: T = Self::INPUT;
| ^
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:17:9
+ --> $DIR/non_copy_const.rs:16:9
|
LL | const $name: $ty = $e;
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -85,49 +85,49 @@ LL | declare_const!(ANOTHER_INPUT: T = Self::INPUT); //~ ERROR interior muta
| ----------------------------------------------- in this macro invocation
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:61:5
+ --> $DIR/non_copy_const.rs:60:5
|
LL | const SELF_2: Self;
| ^^^^^^^^^^^^^^^^^^^
|
help: consider requiring `Self` to be `Copy`
- --> $DIR/non_copy_const.rs:61:19
+ --> $DIR/non_copy_const.rs:60:19
|
LL | const SELF_2: Self;
| ^^^^
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:82:5
+ --> $DIR/non_copy_const.rs:81:5
|
LL | const ASSOC_3: AtomicUsize = AtomicUsize::new(14); //~ ERROR interior mutable
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:85:5
+ --> $DIR/non_copy_const.rs:84:5
|
LL | const U_SELF: U = U::SELF_2;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: consider requiring `U` to be `Copy`
- --> $DIR/non_copy_const.rs:85:19
+ --> $DIR/non_copy_const.rs:84:19
|
LL | const U_SELF: U = U::SELF_2;
| ^
error: a const item should never be interior mutable
- --> $DIR/non_copy_const.rs:88:5
+ --> $DIR/non_copy_const.rs:87:5
|
LL | const T_ASSOC: T::NonCopyType = T::ASSOC;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: consider requiring `<T as Trait<u32>>::NonCopyType` to be `Copy`
- --> $DIR/non_copy_const.rs:88:20
+ --> $DIR/non_copy_const.rs:87:20
|
LL | const T_ASSOC: T::NonCopyType = T::ASSOC;
| ^^^^^^^^^^^^^^
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:95:5
+ --> $DIR/non_copy_const.rs:94:5
|
LL | ATOMIC.store(1, Ordering::SeqCst); //~ ERROR interior mutability
| ^^^^^^
@@ -136,7 +136,7 @@ LL | ATOMIC.store(1, Ordering::SeqCst); //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:96:16
+ --> $DIR/non_copy_const.rs:95:16
|
LL | assert_eq!(ATOMIC.load(Ordering::SeqCst), 5); //~ ERROR interior mutability
| ^^^^^^
@@ -144,7 +144,7 @@ LL | assert_eq!(ATOMIC.load(Ordering::SeqCst), 5); //~ ERROR interior mutabi
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:99:22
+ --> $DIR/non_copy_const.rs:98:22
|
LL | let _once_ref = &ONCE_INIT; //~ ERROR interior mutability
| ^^^^^^^^^
@@ -152,7 +152,7 @@ LL | let _once_ref = &ONCE_INIT; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:100:25
+ --> $DIR/non_copy_const.rs:99:25
|
LL | let _once_ref_2 = &&ONCE_INIT; //~ ERROR interior mutability
| ^^^^^^^^^
@@ -160,7 +160,7 @@ LL | let _once_ref_2 = &&ONCE_INIT; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:101:27
+ --> $DIR/non_copy_const.rs:100:27
|
LL | let _once_ref_4 = &&&&ONCE_INIT; //~ ERROR interior mutability
| ^^^^^^^^^
@@ -168,7 +168,7 @@ LL | let _once_ref_4 = &&&&ONCE_INIT; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:102:26
+ --> $DIR/non_copy_const.rs:101:26
|
LL | let _once_mut = &mut ONCE_INIT; //~ ERROR interior mutability
| ^^^^^^^^^
@@ -176,7 +176,7 @@ LL | let _once_mut = &mut ONCE_INIT; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:113:14
+ --> $DIR/non_copy_const.rs:112:14
|
LL | let _ = &ATOMIC_TUPLE; //~ ERROR interior mutability
| ^^^^^^^^^^^^
@@ -184,7 +184,7 @@ LL | let _ = &ATOMIC_TUPLE; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:114:14
+ --> $DIR/non_copy_const.rs:113:14
|
LL | let _ = &ATOMIC_TUPLE.0; //~ ERROR interior mutability
| ^^^^^^^^^^^^
@@ -192,7 +192,7 @@ LL | let _ = &ATOMIC_TUPLE.0; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:115:19
+ --> $DIR/non_copy_const.rs:114:19
|
LL | let _ = &(&&&&ATOMIC_TUPLE).0; //~ ERROR interior mutability
| ^^^^^^^^^^^^
@@ -200,7 +200,7 @@ LL | let _ = &(&&&&ATOMIC_TUPLE).0; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:116:14
+ --> $DIR/non_copy_const.rs:115:14
|
LL | let _ = &ATOMIC_TUPLE.0[0]; //~ ERROR interior mutability
| ^^^^^^^^^^^^
@@ -208,7 +208,7 @@ LL | let _ = &ATOMIC_TUPLE.0[0]; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:117:13
+ --> $DIR/non_copy_const.rs:116:13
|
LL | let _ = ATOMIC_TUPLE.0[0].load(Ordering::SeqCst); //~ ERROR interior mutability
| ^^^^^^^^^^^^
@@ -216,7 +216,7 @@ LL | let _ = ATOMIC_TUPLE.0[0].load(Ordering::SeqCst); //~ ERROR interior mu
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:123:13
+ --> $DIR/non_copy_const.rs:122:13
|
LL | let _ = ATOMIC_TUPLE.0[0]; //~ ERROR interior mutability
| ^^^^^^^^^^^^
@@ -224,7 +224,7 @@ LL | let _ = ATOMIC_TUPLE.0[0]; //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:128:5
+ --> $DIR/non_copy_const.rs:127:5
|
LL | CELL.set(2); //~ ERROR interior mutability
| ^^^^
@@ -232,7 +232,7 @@ LL | CELL.set(2); //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:129:16
+ --> $DIR/non_copy_const.rs:128:16
|
LL | assert_eq!(CELL.get(), 6); //~ ERROR interior mutability
| ^^^^
@@ -240,7 +240,7 @@ LL | assert_eq!(CELL.get(), 6); //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:142:5
+ --> $DIR/non_copy_const.rs:141:5
|
LL | u64::ATOMIC.store(5, Ordering::SeqCst); //~ ERROR interior mutability
| ^^^^^^^^^^^
@@ -248,7 +248,7 @@ LL | u64::ATOMIC.store(5, Ordering::SeqCst); //~ ERROR interior mutability
= help: assign this const to a local or static variable, and use the variable here
error: a const item with interior mutability should not be borrowed
- --> $DIR/non_copy_const.rs:143:16
+ --> $DIR/non_copy_const.rs:142:16
|
LL | assert_eq!(u64::ATOMIC.load(Ordering::SeqCst), 9); //~ ERROR interior mutability
| ^^^^^^^^^^^