---

yaml
---
r: 195754
b: refs/heads/auto
c: 2a9de1d
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 2243a2cceddd6c9708e3d296b5375da72a6b3d2a
+refs/heads/auto: 2a9de1d989d7f95846b711eec2695cbd86794ee3
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

@@ -13,6 +13,12 @@
 //
 // This test is checking the count in an array expression.
 
+// FIXME (#23926): the error output is not consistent between a
+// self-hosted and a cross-compiled setup; therefore resorting to
+// error-pattern for now.
+
+// error-pattern: expected constant integer for repeat count, but attempted to add with overflow
+
 #![allow(unused_imports)]
 
 use std::fmt;
@@ -22,8 +28,6 @@ use std::{u8, u16, u32, u64, usize};
 const A_I8_I
     : [u32; (i8::MAX as usize) + 1]
     = [0; (i8::MAX + 1) as usize];
-//~^ ERROR mismatched types
-//~| ERROR expected constant integer for repeat count, but attempted to add with overflow
 
 fn main() {
     foo(&A_I8_I[..]);

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

@@ -17,6 +17,12 @@
 // types for the left- and right-hand sides of the addition do not
 // match (as well as overflow).
 
+// FIXME (#23926): the error output is not consistent between a
+// self-hosted and a cross-compiled setup; therefore resorting to
+// error-pattern for now.
+
+// error-pattern: mismatched types
+
 #![allow(unused_imports)]
 
 use std::fmt;
@@ -26,11 +32,6 @@ use std::{u8, u16, u32, u64, usize};
 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[..]);

branches/auto/src/test/compile-fail/huge-array-simple.rs

@@ -8,11 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// FIXME (#23926): the error output is not consistent between a
+// self-hosted and a cross-compiled setup. Skipping for now.
+
+// ignore-test FIXME(#23926)
+
 #![allow(exceeding_bitshifts)]
 
 fn main() {
-    let fat : [u8; (1<<61)+(1<<31)] =
-        //~^ ERROR array length constant evaluation error: attempted left shift with overflow
+    let _fat : [u8; (1<<61)+(1<<31)] =
         [0; (1u64<<61) as usize +(1u64<<31) as usize];
-    //~^ ERROR expected constant integer for repeat count, but attempted left shift with overflow
 }