about summary refs log tree commit diff
path: root/src/test/ui/consts/const-eval/conditional_array_execution.stderr
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2018-10-17 18:23:43 -0400
committerNiko Matsakis <niko@alum.mit.edu>2018-10-19 09:34:28 -0400
commita66ab2bedcc2ac34086d17753f777ffe31dc6349 (patch)
tree3d5d005e0bb321cd2dac736160138c5b246bc96d /src/test/ui/consts/const-eval/conditional_array_execution.stderr
parentd5d5e8c5f52ccc5f88f8cf691118e364e64bf75b (diff)
skip user-type annotations if they don't have regions
Diffstat (limited to 'src/test/ui/consts/const-eval/conditional_array_execution.stderr')
-rw-r--r--src/test/ui/consts/const-eval/conditional_array_execution.stderr16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/test/ui/consts/const-eval/conditional_array_execution.stderr b/src/test/ui/consts/const-eval/conditional_array_execution.stderr
index b22a8d8aead..29f5f8e2ade 100644
--- a/src/test/ui/consts/const-eval/conditional_array_execution.stderr
+++ b/src/test/ui/consts/const-eval/conditional_array_execution.stderr
@@ -13,7 +13,7 @@ LL | #![warn(const_err)]
    |         ^^^^^^^^^
 
 error[E0080]: referenced constant has errors
-  --> $DIR/conditional_array_execution.rs:20:20
+  --> $DIR/conditional_array_execution.rs:19:20
    |
 LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize];
    |                   ----- attempt to subtract with overflow
@@ -21,20 +21,12 @@ LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize];
 LL |     println!("{}", FOO);
    |                    ^^^
 
-error[E0080]: could not evaluate constant
-  --> $DIR/conditional_array_execution.rs:20:20
+error[E0080]: erroneous constant used
+  --> $DIR/conditional_array_execution.rs:19:20
    |
 LL |     println!("{}", FOO);
    |                    ^^^ referenced constant has errors
 
-error[E0080]: constant evaluation error
-  --> $DIR/conditional_array_execution.rs:15:1
-   |
-LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize];
-   | ^^^^^^^^^^^^^^^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |                   |
-   |                   attempt to subtract with overflow
-
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0080`.