From 14d08e53710f8be52734ad285d221b224415dc15 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Tue, 5 Jun 2018 21:08:43 +0200 Subject: [PATCH] Rebase fallout --- src/test/ui/const-eval/index_out_of_bounds.rs | 1 + src/test/ui/const-eval/index_out_of_bounds.stderr | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) 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 f3578bcef6e..55c64d2b04e 100644 --- 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 96e592dc209..828fba55a3a 100644 --- 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`.