about summary refs log tree commit diff
path: root/src/test/ui/consts/const-eval/conditional_array_execution.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-10-26 11:05:00 +0000
committerbors <bors@rust-lang.org>2018-10-26 11:05:00 +0000
commit694cf752988728ba5da85c36c2deaeefeb49c05e (patch)
treef2501734f55b37ac50bf5604a897c939ccfdc996 /src/test/ui/consts/const-eval/conditional_array_execution.rs
parent82239b04dc9cea1d54422c2fb223ff5321ccafdd (diff)
parent13d94ee1154770caa8e027394fa2221db2dfe5c3 (diff)
downloadrust-694cf752988728ba5da85c36c2deaeefeb49c05e.tar.gz
rust-694cf752988728ba5da85c36c2deaeefeb49c05e.zip
Auto merge of #53821 - oli-obk:sanity_query, r=RalfJung
Report const eval error inside the query

Functional changes: We no longer warn about bad constants embedded in unused types. This relied on being able to report just a warning, not a hard error on that case, which we cannot do any more now that error reporting is consistently centralized.

r? @RalfJung

fixes #53561
Diffstat (limited to 'src/test/ui/consts/const-eval/conditional_array_execution.rs')
-rw-r--r--src/test/ui/consts/const-eval/conditional_array_execution.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/ui/consts/const-eval/conditional_array_execution.rs b/src/test/ui/consts/const-eval/conditional_array_execution.rs
index 8142ed0155a..4e245c6b9e8 100644
--- a/src/test/ui/consts/const-eval/conditional_array_execution.rs
+++ b/src/test/ui/consts/const-eval/conditional_array_execution.rs
@@ -13,10 +13,9 @@
 const X: u32 = 5;
 const Y: u32 = 6;
 const FOO: u32 = [X - Y, Y - X][(X < Y) as usize];
-//~^ WARN this constant cannot be used
+//~^ WARN any use of this value will cause an error
 
 fn main() {
     println!("{}", FOO);
     //~^ ERROR
-    //~| ERROR
 }