Auto merge of #4606 - Manishearth:rustup, r=centril

Fix some tests Might be breaking the rustup? I can't tell, I can't reproduce errors on CI rust-lang/rust#64963 (comment)
rust-lang · Oct 1, 2019 · 9a82250 · 9a82250
2 parents b462905 + f513aa3
commit 9a82250
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/tests/ui/out_of_bounds_indexing/empty_array.rs b/tests/ui/out_of_bounds_indexing/empty_array.rs
@@ -1,5 +1,5 @@
 #![warn(clippy::out_of_bounds_indexing)]
-#![allow(clippy::no_effect, clippy::unnecessary_operation)]
+#![allow(clippy::no_effect, clippy::unnecessary_operation, const_err)]
 
 fn main() {
     let empty: [i8; 0] = [];

diff --git a/tests/ui/out_of_bounds_indexing/empty_array.stderr b/tests/ui/out_of_bounds_indexing/empty_array.stderr
@@ -1,11 +1,3 @@
-error: index out of bounds: the len is 0 but the index is 0
-  --> $DIR/empty_array.rs:6:5
-   |
-LL |     empty[0];
-   |     ^^^^^^^^
-   |
-   = note: `#[deny(const_err)]` on by default
-
 error: range is out of bounds
   --> $DIR/empty_array.rs:7:12
    |
@@ -50,5 +42,5 @@ error: range is out of bounds
 LL |     &empty[..=0];
    |               ^
 
-error: aborting due to 8 previous errors
+error: aborting due to 7 previous errors
 
diff --git a/tests/ui/out_of_bounds_indexing/issue-3102.rs b/tests/ui/out_of_bounds_indexing/issue-3102.rs
@@ -1,5 +1,5 @@
 #![warn(clippy::out_of_bounds_indexing)]
-#![allow(clippy::no_effect)]
+#![allow(clippy::no_effect, const_err)]
 
 fn main() {
     let x = [1, 2, 3, 4];

diff --git a/tests/ui/out_of_bounds_indexing/simple.rs b/tests/ui/out_of_bounds_indexing/simple.rs
@@ -1,5 +1,5 @@
 #![warn(clippy::out_of_bounds_indexing)]
-#![allow(clippy::no_effect, clippy::unnecessary_operation)]
+#![allow(clippy::no_effect, clippy::unnecessary_operation, const_err)]
 
 fn main() {
     let x = [1, 2, 3, 4];