Skip to content

Commit 03046ab

Browse files
committed
fix rebase fallout
1 parent 27b75a5 commit 03046ab

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/test/ui/consts/const-eval/index-out-of-bounds-never-type.stderr

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: any use of this value will cause an error
2-
--> $DIR/index-out-of-bounds-never-type.rs:9:61
2+
--> $DIR/index-out-of-bounds-never-type.rs:10:61
33
|
44
LL | const VOID: ! = { let x = 0 * std::mem::size_of::<T>(); [][x] };
55
| --------------------------------------------------------^^^^^---
@@ -13,9 +13,10 @@ LL | #![warn(const_err)]
1313
| ^^^^^^^^^
1414

1515
error: erroneous constant encountered
16-
--> $DIR/index-out-of-bounds-never-type.rs:14:13
16+
--> $DIR/index-out-of-bounds-never-type.rs:15:13
1717
|
1818
LL | let _ = PrintName::<T>::VOID;
1919
| ^^^^^^^^^^^^^^^^^^^^
2020

2121
error: aborting due to previous error
22+

src/test/ui/consts/const-eval/panic-assoc-never-type.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
warning: any use of this value will cause an error
2-
--> $DIR/panic-assoc-never-type.rs:10:21
2+
--> $DIR/panic-assoc-never-type.rs:11:21
33
|
44
LL | const VOID: ! = panic!();
55
| ----------------^^^^^^^^-
66
| |
7-
| the evaluated program panicked at 'explicit panic', $DIR/panic-assoc-never-type.rs:10:21
7+
| the evaluated program panicked at 'explicit panic', $DIR/panic-assoc-never-type.rs:11:21
88
|
99
note: lint level defined here
1010
--> $DIR/panic-assoc-never-type.rs:4:9
@@ -14,7 +14,7 @@ LL | #![warn(const_err)]
1414
= note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
1515

1616
error[E0080]: erroneous constant used
17-
--> $DIR/panic-assoc-never-type.rs:15:13
17+
--> $DIR/panic-assoc-never-type.rs:16:13
1818
|
1919
LL | let _ = PrintName::VOID;
2020
| ^^^^^^^^^^^^^^^ referenced constant has errors

src/test/ui/consts/const-eval/panic-never-type.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
warning: any use of this value will cause an error
2-
--> $DIR/panic-never-type.rs:7:17
2+
--> $DIR/panic-never-type.rs:8:17
33
|
44
LL | const VOID: ! = panic!();
55
| ----------------^^^^^^^^-
66
| |
7-
| the evaluated program panicked at 'explicit panic', $DIR/panic-never-type.rs:7:17
7+
| the evaluated program panicked at 'explicit panic', $DIR/panic-never-type.rs:8:17
88
|
99
note: lint level defined here
1010
--> $DIR/panic-never-type.rs:4:9
@@ -14,7 +14,7 @@ LL | #![warn(const_err)]
1414
= note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
1515

1616
error[E0080]: erroneous constant used
17-
--> $DIR/panic-never-type.rs:11:13
17+
--> $DIR/panic-never-type.rs:12:13
1818
|
1919
LL | let _ = VOID;
2020
| ^^^^ referenced constant has errors

0 commit comments

Comments
 (0)