Skip to content

Commit cc0f446

Browse files
estebankestebank
committed
Remove panic: prefix in label from builtin macros
1 parent ec01ff0 commit cc0f446

File tree

50 files changed

+75
-65
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+75
-65
lines changed

‎compiler/rustc_const_eval/src/const_eval/error.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,17 @@ impl MachineStopType for ConstEvalErrKind {
3434
match self {
3535
ConstAccessesMutGlobal => const_eval_const_accesses_mut_global,
3636
ModifiedGlobal => const_eval_modified_global,
37-
Panic { .. } => const_eval_panic,
37+
Panic { msg, .. } => {
38+
let msg = msg.as_str();
39+
match msg {
40+
"explicit panic"
41+
| "not implemented"
42+
| "not yet implemented"
43+
| "internal error: entered unreachable code" => msg.to_string().into(),
44+
_ if msg.starts_with("assertion failed: ") => msg.to_string().into(),
45+
_ => const_eval_panic,
46+
}
47+
}
3848
RecursiveStatic => const_eval_recursive_static,
3949
AssertFailure(x) => x.diagnostic_message(),
4050
WriteThroughImmutablePointer => const_eval_write_through_immutable_pointer,

‎tests/ui/borrowck/issue-81899.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of constant value failed
22
--> $DIR/issue-81899.rs:4:24
33
|
44
LL | const _CONST: &[u8] = &f(&[], |_| {});
5-
| ^^^^^^^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^^^^^^^ explicit panic
66
|
77
note: inside `f::<{closure@$DIR/issue-81899.rs:4:31: 4:34}>`
88
--> $DIR/issue-81899.rs:11:5

‎tests/ui/borrowck/issue-88434-minimal-example.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of constant value failed
22
--> $DIR/issue-88434-minimal-example.rs:3:22
33
|
44
LL | const _CONST: &() = &f(&|_| {});
5-
| ^^^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^^^ explicit panic
66
|
77
note: inside `f::<{closure@$DIR/issue-88434-minimal-example.rs:3:25: 3:28}>`
88
--> $DIR/issue-88434-minimal-example.rs:10:5

‎tests/ui/borrowck/issue-88434-removal-index-should-be-less.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of constant value failed
22
--> $DIR/issue-88434-removal-index-should-be-less.rs:3:24
33
|
44
LL | const _CONST: &[u8] = &f(&[], |_| {});
5-
| ^^^^^^^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^^^^^^^ explicit panic
66
|
77
note: inside `f::<{closure@$DIR/issue-88434-removal-index-should-be-less.rs:3:31: 3:34}>`
88
--> $DIR/issue-88434-removal-index-should-be-less.rs:10:5

‎tests/ui/const-ptr/forbidden_slices.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ error[E0080]: could not evaluate static initializer
103103
--> $DIR/forbidden_slices.rs:50:33
104104
|
105105
LL | pub static R1: &[()] = unsafe { from_ptr_range(ptr::null()..ptr::null()) }; // errors inside libcore
106-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ panic: assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize
106+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assertion failed: 0 < pointee_size && pointee_size <= isize::MAX as usize
107107
|
108108
note: inside `from_ptr_range::<'_, ()>`
109109
--> $SRC_DIR/core/src/slice/raw.rs:LL:COL

‎tests/ui/consts/const-eval/const_panic.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ error[E0080]: evaluation of constant value failed
1010
--> $DIR/const_panic.rs:9:16
1111
|
1212
LL | const Z2: () = std::panic!();
13-
| ^^^^^^^^^^^^^ panic: explicit panic
13+
| ^^^^^^^^^^^^^ explicit panic
1414
|
1515
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `std::panic` (in Nightly builds, run with -Z macro-backtrace for more info)
1616

1717
error[E0080]: evaluation of constant value failed
1818
--> $DIR/const_panic.rs:12:15
1919
|
2020
LL | const Y: () = std::unreachable!();
21-
| ^^^^^^^^^^^^^^^^^^^ panic: internal error: entered unreachable code
21+
| ^^^^^^^^^^^^^^^^^^^ internal error: entered unreachable code
2222
|
2323
= note: this error originates in the macro `$crate::panic::unreachable_2015` which comes from the expansion of the macro `std::unreachable` (in Nightly builds, run with -Z macro-backtrace for more info)
2424

2525
error[E0080]: evaluation of constant value failed
2626
--> $DIR/const_panic.rs:15:15
2727
|
2828
LL | const X: () = std::unimplemented!();
29-
| ^^^^^^^^^^^^^^^^^^^^^ panic: not implemented
29+
| ^^^^^^^^^^^^^^^^^^^^^ not implemented
3030
|
3131
= note: this error originates in the macro `std::unimplemented` (in Nightly builds, run with -Z macro-backtrace for more info)
3232

@@ -58,23 +58,23 @@ error[E0080]: evaluation of constant value failed
5858
--> $DIR/const_panic.rs:27:21
5959
|
6060
LL | const Z2_CORE: () = core::panic!();
61-
| ^^^^^^^^^^^^^^ panic: explicit panic
61+
| ^^^^^^^^^^^^^^ explicit panic
6262
|
6363
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `core::panic` (in Nightly builds, run with -Z macro-backtrace for more info)
6464

6565
error[E0080]: evaluation of constant value failed
6666
--> $DIR/const_panic.rs:30:20
6767
|
6868
LL | const Y_CORE: () = core::unreachable!();
69-
| ^^^^^^^^^^^^^^^^^^^^ panic: internal error: entered unreachable code
69+
| ^^^^^^^^^^^^^^^^^^^^ internal error: entered unreachable code
7070
|
7171
= note: this error originates in the macro `$crate::panic::unreachable_2015` which comes from the expansion of the macro `core::unreachable` (in Nightly builds, run with -Z macro-backtrace for more info)
7272

7373
error[E0080]: evaluation of constant value failed
7474
--> $DIR/const_panic.rs:33:20
7575
|
7676
LL | const X_CORE: () = core::unimplemented!();
77-
| ^^^^^^^^^^^^^^^^^^^^^^ panic: not implemented
77+
| ^^^^^^^^^^^^^^^^^^^^^^ not implemented
7878
|
7979
= note: this error originates in the macro `core::unimplemented` (in Nightly builds, run with -Z macro-backtrace for more info)
8080

‎tests/ui/consts/const-eval/const_panic_2021.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ error[E0080]: evaluation of constant value failed
1010
--> $DIR/const_panic_2021.rs:9:15
1111
|
1212
LL | const B: () = std::panic!();
13-
| ^^^^^^^^^^^^^ panic: explicit panic
13+
| ^^^^^^^^^^^^^ explicit panic
1414
|
1515
= note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `std::panic` (in Nightly builds, run with -Z macro-backtrace for more info)
1616

1717
error[E0080]: evaluation of constant value failed
1818
--> $DIR/const_panic_2021.rs:12:15
1919
|
2020
LL | const C: () = std::unreachable!();
21-
| ^^^^^^^^^^^^^^^^^^^ panic: internal error: entered unreachable code
21+
| ^^^^^^^^^^^^^^^^^^^ internal error: entered unreachable code
2222
|
2323
= note: this error originates in the macro `$crate::panic::unreachable_2021` which comes from the expansion of the macro `std::unreachable` (in Nightly builds, run with -Z macro-backtrace for more info)
2424

2525
error[E0080]: evaluation of constant value failed
2626
--> $DIR/const_panic_2021.rs:15:15
2727
|
2828
LL | const D: () = std::unimplemented!();
29-
| ^^^^^^^^^^^^^^^^^^^^^ panic: not implemented
29+
| ^^^^^^^^^^^^^^^^^^^^^ not implemented
3030
|
3131
= note: this error originates in the macro `std::unimplemented` (in Nightly builds, run with -Z macro-backtrace for more info)
3232

@@ -50,23 +50,23 @@ error[E0080]: evaluation of constant value failed
5050
--> $DIR/const_panic_2021.rs:24:20
5151
|
5252
LL | const B_CORE: () = core::panic!();
53-
| ^^^^^^^^^^^^^^ panic: explicit panic
53+
| ^^^^^^^^^^^^^^ explicit panic
5454
|
5555
= note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `core::panic` (in Nightly builds, run with -Z macro-backtrace for more info)
5656

5757
error[E0080]: evaluation of constant value failed
5858
--> $DIR/const_panic_2021.rs:27:20
5959
|
6060
LL | const C_CORE: () = core::unreachable!();
61-
| ^^^^^^^^^^^^^^^^^^^^ panic: internal error: entered unreachable code
61+
| ^^^^^^^^^^^^^^^^^^^^ internal error: entered unreachable code
6262
|
6363
= note: this error originates in the macro `$crate::panic::unreachable_2021` which comes from the expansion of the macro `core::unreachable` (in Nightly builds, run with -Z macro-backtrace for more info)
6464

6565
error[E0080]: evaluation of constant value failed
6666
--> $DIR/const_panic_2021.rs:30:20
6767
|
6868
LL | const D_CORE: () = core::unimplemented!();
69-
| ^^^^^^^^^^^^^^^^^^^^^^ panic: not implemented
69+
| ^^^^^^^^^^^^^^^^^^^^^^ not implemented
7070
|
7171
= note: this error originates in the macro `core::unimplemented` (in Nightly builds, run with -Z macro-backtrace for more info)
7272

‎tests/ui/consts/const-eval/const_panic_libcore_bin.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ error[E0080]: evaluation of constant value failed
1010
--> $DIR/const_panic_libcore_bin.rs:11:15
1111
|
1212
LL | const Y: () = unreachable!();
13-
| ^^^^^^^^^^^^^^ panic: internal error: entered unreachable code
13+
| ^^^^^^^^^^^^^^ internal error: entered unreachable code
1414
|
1515
= note: this error originates in the macro `$crate::panic::unreachable_2015` which comes from the expansion of the macro `unreachable` (in Nightly builds, run with -Z macro-backtrace for more info)
1616

1717
error[E0080]: evaluation of constant value failed
1818
--> $DIR/const_panic_libcore_bin.rs:14:15
1919
|
2020
LL | const X: () = unimplemented!();
21-
| ^^^^^^^^^^^^^^^^ panic: not implemented
21+
| ^^^^^^^^^^^^^^^^ not implemented
2222
|
2323
= note: this error originates in the macro `unimplemented` (in Nightly builds, run with -Z macro-backtrace for more info)
2424

‎tests/ui/consts/const-eval/panic-assoc-never-type.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of constant value failed
22
--> $DIR/panic-assoc-never-type.rs:9:21
33
|
44
LL | const VOID: ! = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/const-eval/panic-never-type.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of constant value failed
22
--> $DIR/panic-never-type.rs:4:17
33
|
44
LL | const VOID: ! = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/const-eval/unwind-abort.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of constant value failed
22
--> $DIR/unwind-abort.rs:5:15
33
|
44
LL | const _: () = foo();
5-
| ^^^^^ panic: explicit panic
5+
| ^^^^^ explicit panic
66
|
77
note: inside `foo`
88
--> $DIR/unwind-abort.rs:2:5

‎tests/ui/consts/control-flow/assert.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of constant value failed
22
--> $DIR/assert.rs:5:15
33
|
44
LL | const _: () = assert!(false);
5-
| ^^^^^^^^^^^^^^ panic: assertion failed: false
5+
| ^^^^^^^^^^^^^^ assertion failed: false
66
|
77
= note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/issue-66693-panic-in-array-len.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error[E0080]: evaluation of constant value failed
1010
--> $DIR/issue-66693-panic-in-array-len.rs:10:21
1111
|
1212
LL | let _ = [false; panic!()];
13-
| ^^^^^^^^ panic: explicit panic
13+
| ^^^^^^^^ explicit panic
1414
|
1515
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
1616

‎tests/ui/consts/issue-66693.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ error[E0080]: evaluation of constant value failed
1818
--> $DIR/issue-66693.rs:16:15
1919
|
2020
LL | const _: () = panic!();
21-
| ^^^^^^^^ panic: explicit panic
21+
| ^^^^^^^^ explicit panic
2222
|
2323
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
2424

‎tests/ui/consts/required-consts/collect-in-called-fn.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-called-fn.rs:10:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-called-fn.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-called-fn.rs:10:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-closure.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-closure.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-closure.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-closure.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-drop.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-drop.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-drop.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-drop.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fn-behind-assoc-type.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fn-behind-assoc-type.rs:10:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fn-behind-assoc-type.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fn-behind-assoc-type.rs:10:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fn-behind-generic.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fn-behind-generic.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fn-behind-generic.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fn-behind-generic.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fn-behind-opaque-type.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `m::Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fn-behind-opaque-type.rs:11:23
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fn-behind-opaque-type.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `m::Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fn-behind-opaque-type.rs:11:23
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fn.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fn.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fn.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fn.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fnptr-in-const.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Late::<i32>::FAIL` failed
22
--> $DIR/collect-in-dead-fnptr-in-const.rs:9:22
33
|
44
LL | const FAIL: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fnptr-in-const.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Late::<i32>::FAIL` failed
22
--> $DIR/collect-in-dead-fnptr-in-const.rs:9:22
33
|
44
LL | const FAIL: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fnptr.noopt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fnptr.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

‎tests/ui/consts/required-consts/collect-in-dead-fnptr.opt.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: evaluation of `Fail::<i32>::C` failed
22
--> $DIR/collect-in-dead-fnptr.rs:9:19
33
|
44
LL | const C: () = panic!();
5-
| ^^^^^^^^ panic: explicit panic
5+
| ^^^^^^^^ explicit panic
66
|
77
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
88

0 commit comments

Comments
 (0)