From 7fdf06cdde49c8cd87e34e85a95c1fe90ebdb0c3 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Sun, 26 Aug 2018 15:19:34 +0200 Subject: Report const eval error inside the query --- .../ui/consts/const-eval/const-eval-overflow2b.rs | 41 +++++++++------------- 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'src/test/ui/consts/const-eval/const-eval-overflow2b.rs') diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2b.rs b/src/test/ui/consts/const-eval/const-eval-overflow2b.rs index 1878daea931..55dc2a89405 100644 --- a/src/test/ui/consts/const-eval/const-eval-overflow2b.rs +++ b/src/test/ui/consts/const-eval/const-eval-overflow2b.rs @@ -21,62 +21,55 @@ use std::fmt; use std::{i8, i16, i32, i64, isize}; use std::{u8, u16, u32, u64, usize}; -const VALS_I8: (i8,) = - //~^ ERROR this constant cannot be used +const VALS_I8: (i8,) = //~ ERROR any use of this value will cause an error + //~^ const_err ( i8::MAX + 1, ); -const VALS_I16: (i16,) = - //~^ ERROR this constant cannot be used +const VALS_I16: (i16,) = //~ ERROR any use of this value will cause an error ( i16::MAX + 1, ); -const VALS_I32: (i32,) = - //~^ ERROR this constant cannot be used +const VALS_I32: (i32,) = //~ ERROR any use of this value will cause an error ( i32::MAX + 1, ); -const VALS_I64: (i64,) = - //~^ ERROR this constant cannot be used +const VALS_I64: (i64,) = //~ ERROR any use of this value will cause an error ( i64::MAX + 1, ); -const VALS_U8: (u8,) = - //~^ ERROR this constant cannot be used +const VALS_U8: (u8,) = //~ ERROR any use of this value will cause an error ( u8::MAX + 1, ); -const VALS_U16: (u16,) = ( - //~^ ERROR this constant cannot be used +const VALS_U16: (u16,) = ( //~ ERROR any use of this value will cause an error u16::MAX + 1, ); -const VALS_U32: (u32,) = ( - //~^ ERROR this constant cannot be used +const VALS_U32: (u32,) = ( //~ ERROR any use of this value will cause an error u32::MAX + 1, ); -const VALS_U64: (u64,) = - //~^ ERROR this constant cannot be used +const VALS_U64: (u64,) = //~ ERROR any use of this value will cause an error ( u64::MAX + 1, ); fn main() { - foo(VALS_I8); - foo(VALS_I16); - foo(VALS_I32); - foo(VALS_I64); + foo(VALS_I8); //~ ERROR erroneous constant used + foo(VALS_I16); //~ ERROR erroneous constant used + foo(VALS_I32); //~ ERROR erroneous constant used + foo(VALS_I64); //~ ERROR erroneous constant used - foo(VALS_U8); - foo(VALS_U16); - foo(VALS_U32); - foo(VALS_U64); + foo(VALS_U8); //~ ERROR erroneous constant used + foo(VALS_U16); //~ ERROR erroneous constant used + foo(VALS_U32); //~ ERROR erroneous constant used + foo(VALS_U64); //~ ERROR erroneous constant used } fn foo(_: T) { -- cgit 1.4.1-3-g733a5