---

yaml
---
r: 195522
b: refs/heads/master
c: 1973f7e
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1f5e45b76961d54e3b825c3c6af6b6e02504d2be
+refs/heads/master: 1973f7ebe5c67ef9ed57f7a64781d13868a70d3d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b3317d68910900f135f9f38e43a7a699bc736b4a
 refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf

trunk/src/test/compile-fail/const-eval-overflow-3.rs

@@ -22,7 +22,8 @@ use std::{u8, u16, u32, u64, usize};
 const A_I8_I
     : [u32; (i8::MAX as usize) + 1]
     = [0; (i8::MAX + 1) as usize];
-//~^ ERROR error evaluating count: attempted to add with overflow
+//~^ ERROR mismatched types
+//~| ERROR expected constant integer for repeat count, but attempted to add with overflow
 
 fn main() {
     foo(&A_I8_I[..]);

trunk/src/test/compile-fail/const-eval-overflow-3b.rs

@@ -27,6 +27,10 @@ const A_I8_I
     : [u32; (i8::MAX as usize) + 1]
     = [0; (i8::MAX + 1u8) as usize];
 //~^ ERROR mismatched types
+//~| ERROR mismatched types
+//~| ERROR expected constant integer for repeat count, but attempted to add with overflow
+//~| ERROR the trait `core::ops::Add<u8>` is not implemented for the type `i8`
+//~| ERROR the trait `core::ops::Add<u8>` is not implemented for the type `i8`
 
 fn main() {
     foo(&A_I8_I[..]);

trunk/src/test/compile-fail/const-eval-overflow-4b.rs

@@ -22,6 +22,8 @@ use std::{u8, u16, u32, u64, usize};
 const A_I8_T
     : [u32; (i8::MAX as i8 + 1u8) as usize]
     //~^ ERROR mismatched types
+    //~| the trait `core::ops::Add<u8>` is not implemented for the type `i8`
+    //~| the trait `core::ops::Add<u8>` is not implemented for the type `i8`
     = [0; (i8::MAX as usize) + 1];
 
 fn main() {

trunk/src/test/compile-fail/huge-array-simple.rs

@@ -8,9 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: too big for the current
 #![allow(exceeding_bitshifts)]
 
 fn main() {
-   let fat : [u8; (1<<61)+(1<<31)] = [0; (1u64<<61) as usize +(1u64<<31) as usize];
+    let fat : [u8; (1<<61)+(1<<31)] =
+        //~^ ERROR array length constant evaluation error: attempted left shift with overflow
+        [0; (1u64<<61) as usize +(1u64<<31) as usize];
+    //~^ ERROR expected constant integer for repeat count, but attempted left shift with overflow
 }