about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-02-20 22:57:02 +0000
committerbors <bors@rust-lang.org>2020-02-20 22:57:02 +0000
commitf5b4acccf7bcee641ff3b43436bb7d02efccd1b1 (patch)
treedc94b7a00b9ace0383ac12abfc6ee3dfb9ac39b5
parent8daeee5533418901d26a64896854570e9f0e8493 (diff)
parent4f85bc2fe9299778223b6d72573ce613d47d739d (diff)
downloadrust-f5b4acccf7bcee641ff3b43436bb7d02efccd1b1.tar.gz
rust-f5b4acccf7bcee641ff3b43436bb7d02efccd1b1.zip
Auto merge of #5208 - matthiaskrgr:stderr, r=flip1995
rustup https://github.com/rust-lang/rust/pull/69325, update test stderr

changelog: none
-rw-r--r--tests/ui/indexing_slicing_index.stderr14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/ui/indexing_slicing_index.stderr b/tests/ui/indexing_slicing_index.stderr
index b4fac2a0fe0..ac5f0d0a39e 100644
--- a/tests/ui/indexing_slicing_index.stderr
+++ b/tests/ui/indexing_slicing_index.stderr
@@ -1,22 +1,22 @@
-error: index out of bounds: the len is 4 but the index is 4
+error: this operation will panic at runtime
   --> $DIR/indexing_slicing_index.rs:11:5
    |
 LL |     x[4]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
-   |     ^^^^
+   |     ^^^^ index out of bounds: the len is 4 but the index is 4
    |
-   = note: `#[deny(const_err)]` on by default
+   = note: `#[deny(unconditional_panic)]` on by default
 
-error: index out of bounds: the len is 4 but the index is 8
+error: this operation will panic at runtime
   --> $DIR/indexing_slicing_index.rs:12:5
    |
 LL |     x[1 << 3]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
-   |     ^^^^^^^^^
+   |     ^^^^^^^^^ index out of bounds: the len is 4 but the index is 8
 
-error: index out of bounds: the len is 4 but the index is 15
+error: this operation will panic at runtime
   --> $DIR/indexing_slicing_index.rs:27:5
    |
 LL |     x[N]; // Ok, let rustc's `const_err` lint handle `usize` indexing on arrays.
-   |     ^^^^
+   |     ^^^^ index out of bounds: the len is 4 but the index is 15
 
 error: indexing may panic.
   --> $DIR/indexing_slicing_index.rs:10:5