New upstream version 1.50.0+dfsg1

[rustc.git] / src / test / ui / consts / const-eval / unwind-abort.stderr

diff --git a/src/test/ui/consts/const-eval/unwind-abort.stderr b/src/test/ui/consts/const-eval/unwind-abort.stderr
index 084beb19eb934973d935748996464ff89ca113c7..eee1a35a0dc88610f15c91886477489847330ade 100644 (file)
--- a/src/test/ui/consts/const-eval/unwind-abort.stderr
+++ b/src/test/ui/consts/const-eval/unwind-abort.stderr
@@ -1,21 +1,18 @@
-error[E0080]: evaluation of constant value failed
+error: any use of this value will cause an error
   --> $DIR/unwind-abort.rs:5:5
    |
 LL |     panic!()
-   |     ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/unwind-abort.rs:5:5
-   |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: any use of this value will cause an error
-  --> $DIR/unwind-abort.rs:8:15
-   |
+   |     ^^^^^^^^
+   |     |
+   |     the evaluated program panicked at 'explicit panic', $DIR/unwind-abort.rs:5:5
+   |     inside `foo` at $SRC_DIR/std/src/macros.rs:LL:COL
+   |     inside `_` at $DIR/unwind-abort.rs:8:15
+...
 LL | const _: () = foo();
-   | --------------^^^^^-
-   |               |
-   |               referenced constant has errors
+   | --------------------
    |
    = note: `#[deny(const_err)]` on by default
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0080`.