user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix rebase fallout

Browse source
This commit is contained in:
Mazdak Farrokhzad 2019-12-15 05:45:34 +01:00
parent 27b75a580d
commit 03046abbd0
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
warning: any use of this value will cause an error
--> $DIR/index-out-of-bounds-never-type.rs:9:61
--> $DIR/index-out-of-bounds-never-type.rs:10:61
|
LL | const VOID: ! = { let x = 0 * std::mem::size_of::<T>(); [][x] };
| --------------------------------------------------------^^^^^---
@ -13,9 +13,10 @@ LL | #![warn(const_err)]
| ^^^^^^^^^
error: erroneous constant encountered
--> $DIR/index-out-of-bounds-never-type.rs:14:13
--> $DIR/index-out-of-bounds-never-type.rs:15:13
|
LL | let _ = PrintName::<T>::VOID;
| ^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error

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

@ -1,10 +1,10 @@
warning: any use of this value will cause an error
--> $DIR/panic-assoc-never-type.rs:10:21
--> $DIR/panic-assoc-never-type.rs:11:21
|
LL | const VOID: ! = panic!();
| ----------------^^^^^^^^-
| |
| the evaluated program panicked at 'explicit panic', $DIR/panic-assoc-never-type.rs:10:21
| the evaluated program panicked at 'explicit panic', $DIR/panic-assoc-never-type.rs:11:21
|
note: lint level defined here
--> $DIR/panic-assoc-never-type.rs:4:9
@ -14,7 +14,7 @@ LL | #![warn(const_err)]
= note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
error[E0080]: erroneous constant used
--> $DIR/panic-assoc-never-type.rs:15:13
--> $DIR/panic-assoc-never-type.rs:16:13
|
LL | let _ = PrintName::VOID;
| ^^^^^^^^^^^^^^^ referenced constant has errors

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

@ -1,10 +1,10 @@
warning: any use of this value will cause an error
--> $DIR/panic-never-type.rs:7:17
--> $DIR/panic-never-type.rs:8:17
|
LL | const VOID: ! = panic!();
| ----------------^^^^^^^^-
| |
| the evaluated program panicked at 'explicit panic', $DIR/panic-never-type.rs:7:17
| the evaluated program panicked at 'explicit panic', $DIR/panic-never-type.rs:8:17
|
note: lint level defined here
--> $DIR/panic-never-type.rs:4:9
@ -14,7 +14,7 @@ LL | #![warn(const_err)]
= note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
error[E0080]: erroneous constant used
--> $DIR/panic-never-type.rs:11:13
--> $DIR/panic-never-type.rs:12:13
|
LL | let _ = VOID;
| ^^^^ referenced constant has errors