From b72ba0559cab28ab88c9397ece9e5e4b193bdc89 Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Fri, 22 Feb 2019 16:07:15 +0100
Subject: [PATCH] Switch from error patterns to `//~ ERROR` markers.

AFAICT, we do not have the same const-eval issues that we used to when
rust-lang/rust#23926 was filed. (Probably because of the switch to
miri for const-evaluation.)
---
 src/test/ui/consts/const-eval/const-eval-overflow-3.rs |  9 +++++----
 .../ui/consts/const-eval/const-eval-overflow-3b.rs     | 10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3.rs b/src/test/ui/consts/const-eval/const-eval-overflow-3.rs
index 95deb04fb01d5..6fd8e9cbc806b 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-3.rs
+++ b/src/test/ui/consts/const-eval/const-eval-overflow-3.rs
@@ -3,11 +3,11 @@
 //
 // 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: attempt to add with overflow
+
+
+
+
 
 #![allow(unused_imports)]
 
@@ -18,6 +18,7 @@ use std::{u8, u16, u32, u64, usize};
 const A_I8_I
     : [u32; (i8::MAX as usize) + 1]
     = [0; (i8::MAX + 1) as usize];
+//~^ ERROR evaluation of constant value failed
 
 fn main() {
     foo(&A_I8_I[..]);
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs b/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs
index 5a6be0c9bd38b..d9b06370dff79 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs
+++ b/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs
@@ -7,11 +7,11 @@
 // 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)]
 
@@ -22,6 +22,8 @@ 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 cannot add `u8` to `i8`
 
 fn main() {
     foo(&A_I8_I[..]);