Rollup merge of #57107 - mjbshaw:thread_local_test, r=nikomatsakis

[rust.git] / src / test / ui / eval-enum.stderr

diff --git a/src/test/ui/eval-enum.stderr b/src/test/ui/eval-enum.stderr
index f26c48f1a72ae112daac2217e30402fa6624c05e..195eaddb71b37974415601e06cdbfdd1644599c3 100644 (file)
--- a/src/test/ui/eval-enum.stderr
+++ b/src/test/ui/eval-enum.stderr
@@ -1,41 +1,15 @@
-error: attempt to divide by zero
-  --> $DIR/eval-enum.rs:12:15
-   |
-LL |     DivZero = 1/0,
-   |               ^^^
-   |
-   = note: #[deny(const_err)] on by default
-
-error: this expression will panic at runtime
-  --> $DIR/eval-enum.rs:12:15
-   |
-LL |     DivZero = 1/0,
-   |               ^^^ attempt to divide by zero
-
-error[E0080]: could not evaluate enum discriminant
-  --> $DIR/eval-enum.rs:12:15
+error[E0080]: evaluation of constant value failed
+  --> $DIR/eval-enum.rs:2:15
    |
 LL |     DivZero = 1/0,
    |               ^^^ attempt to divide by zero
 
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/eval-enum.rs:16:15
-   |
-LL |     RemZero = 1%0,
-   |               ^^^
-
-error: this expression will panic at runtime
-  --> $DIR/eval-enum.rs:16:15
-   |
-LL |     RemZero = 1%0,
-   |               ^^^ attempt to calculate the remainder with a divisor of zero
-
-error[E0080]: could not evaluate enum discriminant
-  --> $DIR/eval-enum.rs:16:15
+error[E0080]: evaluation of constant value failed
+  --> $DIR/eval-enum.rs:5:15
    |
 LL |     RemZero = 1%0,
    |               ^^^ attempt to calculate the remainder with a divisor of zero
 
-error: aborting due to 6 previous errors
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0080`.