Rebase fallout in ui output

5 files changed, 13 insertions, 26 deletions

diff --git a/src/librustc_codegen_llvm/mir/operand.rs b/src/librustc_codegen_llvm/mir/operand.rs
index 25f03cbe970..d1b6aa7fc42 100644
--- a/src/librustc_codegen_llvm/mir/operand.rs
+++ b/src/librustc_codegen_llvm/mir/operand.rs
@@ -12,8 +12,6 @@ use rustc::mir::interpret::{ConstValue, ErrorHandled};
 use rustc::mir;
 use rustc::ty;
 use rustc::ty::layout::{self, Align, LayoutOf, TyLayout};
-use rustc_data_structures::sync::Lrc;
-use rustc_data_structures::indexed_vec::Idx;
 
 use base;
 use common::{CodegenCx, C_undef, C_usize};
diff --git a/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
index 9a7c510029c..50794c8f065 100644
--- a/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
+++ b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
@@ -1,5 +1,5 @@
 error: any use of this value will cause an error
-  --> $DIR/const_panic_libcore_main.rs:20:1
+  --> $DIR/const_panic_libcore_main.rs:19:1
    |
 LL | const Z: () = panic!("cheese");
    | ^^^^^^^^^^^^^^----------------^
@@ -10,7 +10,7 @@ LL | const Z: () = panic!("cheese");
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: any use of this value will cause an error
-  --> $DIR/const_panic_libcore_main.rs:23:1
+  --> $DIR/const_panic_libcore_main.rs:22:1
    |
 LL | const Y: () = unreachable!();
    | ^^^^^^^^^^^^^^--------------^
@@ -20,7 +20,7 @@ LL | const Y: () = unreachable!();
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: any use of this value will cause an error
-  --> $DIR/const_panic_libcore_main.rs:26:1
+  --> $DIR/const_panic_libcore_main.rs:25:1
    |
 LL | const X: () = unimplemented!();
    | ^^^^^^^^^^^^^^----------------^
diff --git a/src/test/ui/consts/const-eval/issue-52475.rs b/src/test/ui/consts/const-eval/issue-52475.rs
index 1c1e6535e69..b21c1827e2b 100644
--- a/src/test/ui/consts/const-eval/issue-52475.rs
+++ b/src/test/ui/consts/const-eval/issue-52475.rs
@@ -13,11 +13,10 @@
 fn main() {
     let _ = [(); {
         //~^ WARNING Constant evaluating a complex constant, this might take some time
-        //~| ERROR could not evaluate repeat length
         let mut x = &0;
         let mut n = 0;
         while n < 5 { //~ ERROR constant contains unimplemented expression type
-            n = (n + 1) % 5;
+            n = (n + 1) % 5; //~ ERROR evaluation of constant value failed
             x = &0; // Materialize a new AllocId
         }
         0
diff --git a/src/test/ui/consts/const-eval/issue-52475.stderr b/src/test/ui/consts/const-eval/issue-52475.stderr
index f45587f3f75..c0cd98b2fca 100644
--- a/src/test/ui/consts/const-eval/issue-52475.stderr
+++ b/src/test/ui/consts/const-eval/issue-52475.stderr
@@ -1,8 +1,8 @@
 error[E0019]: constant contains unimplemented expression type
-  --> $DIR/issue-52475.rs:19:9
+  --> $DIR/issue-52475.rs:18:9
    |
 LL | /         while n < 5 { //~ ERROR constant contains unimplemented expression type
-LL | |             n = (n + 1) % 5;
+LL | |             n = (n + 1) % 5; //~ ERROR evaluation of constant value failed
 LL | |             x = &0; // Materialize a new AllocId
 LL | |         }
    | |_________^
@@ -13,28 +13,18 @@ warning: Constant evaluating a complex constant, this might take some time
 LL |       let _ = [(); {
    |  __________________^
 LL | |         //~^ WARNING Constant evaluating a complex constant, this might take some time
-LL | |         //~| ERROR could not evaluate repeat length
 LL | |         let mut x = &0;
+LL | |         let mut n = 0;
 ...  |
 LL | |         0
 LL | |     }];
    | |_____^
 
-error[E0080]: could not evaluate repeat length
-  --> $DIR/issue-52475.rs:14:18
+error[E0080]: evaluation of constant value failed
+  --> $DIR/issue-52475.rs:19:17
    |
-LL |       let _ = [(); {
-   |  __________________^
-LL | |         //~^ WARNING Constant evaluating a complex constant, this might take some time
-LL | |         //~| ERROR could not evaluate repeat length
-LL | |         let mut x = &0;
-...  |
-LL | |             n = (n + 1) % 5;
-   | |                 ----------- duplicate interpreter state observed here, const evaluation will never terminate
-...  |
-LL | |         0
-LL | |     }];
-   | |_____^
+LL |             n = (n + 1) % 5; //~ ERROR evaluation of constant value failed
+   |                 ^^^^^^^^^^^ duplicate interpreter state observed here, const evaluation will never terminate
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/const-int-unchecked.stderr b/src/test/ui/consts/const-int-unchecked.stderr
index b8fd0facbc1..314a3e488a1 100644
--- a/src/test/ui/consts/const-int-unchecked.stderr
+++ b/src/test/ui/consts/const-int-unchecked.stderr
@@ -1,4 +1,4 @@
-error: this constant cannot be used
+error: any use of this value will cause an error
   --> $DIR/const-int-unchecked.rs:15:1
    |
 LL | const SHR: u8 = unsafe { intrinsics::unchecked_shr(5_u8, 8) };
@@ -8,7 +8,7 @@ LL | const SHR: u8 = unsafe { intrinsics::unchecked_shr(5_u8, 8) };
    |
    = note: #[deny(const_err)] on by default
 
-error: this constant cannot be used
+error: any use of this value will cause an error
   --> $DIR/const-int-unchecked.rs:17:1
    |
 LL | const SHL: u8 = unsafe { intrinsics::unchecked_shl(5_u8, 8) };