Rebase fallout

diff --git a/src/test/ui/const-eval/index_out_of_bounds.rs b/src/test/ui/const-eval/index_out_of_bounds.rs
index f3578bcef6e411b5018155264b7bbc6be5d28b18..55c64d2b04e45e7194280eb19e3b8508d7cd82ed 100644 (file)
--- a/src/test/ui/const-eval/index_out_of_bounds.rs
+++ b/src/test/ui/const-eval/index_out_of_bounds.rs
@@ -10,6 +10,7 @@
 
 static FOO: i32 = [][0];
 //~^ ERROR E0080
+//~| ERROR E0080
 
 fn main() {
     let array = [std::env::args().len()];

diff --git a/src/test/ui/const-eval/index_out_of_bounds.stderr b/src/test/ui/const-eval/index_out_of_bounds.stderr
index 96e592dc209a8a7c59b82b9ea45d4c5e42ff6127..828fba55a3afebc8b432e9fa6c36d7b18f531ded 100644 (file)
--- a/src/test/ui/const-eval/index_out_of_bounds.stderr
+++ b/src/test/ui/const-eval/index_out_of_bounds.stderr
@@ -1,17 +1,25 @@
-error[E0080]: constant evaluation error
+error[E0080]: could not evaluate static initializer
   --> $DIR/index_out_of_bounds.rs:11:19
    |
 LL | static FOO: i32 = [][0];
    |                   ^^^^^ index out of bounds: the len is 0 but the index is 0
 
+error[E0080]: could not evaluate static initializer
+  --> $DIR/index_out_of_bounds.rs:11:1
+   |
+LL | static FOO: i32 = [][0];
+   | ^^^^^^^^^^^^^^^^^^-----^
+   |                   |
+   |                   index out of bounds: the len is 0 but the index is 0
+
 error: index out of bounds: the len is 1 but the index is 1
-  --> $DIR/index_out_of_bounds.rs:16:5
+  --> $DIR/index_out_of_bounds.rs:17:5
    |
 LL |     array[1]; //~ ERROR index out of bounds
    |     ^^^^^^^^
    |
    = note: #[deny(const_err)] on by default
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors
 
 For more information about this error, try `rustc --explain E0080`.