From da22793a35b725e2fe2f7e2ac1d808404c39c4aa Mon Sep 17 00:00:00 2001 From: Matthew Jasper Date: Thu, 9 May 2019 23:01:39 +0100 Subject: Create fewer basic blocks in match MIR lowering --- src/test/ui/consts/const-eval/match-test-ptr-null.rs | 1 + src/test/ui/consts/const-eval/match-test-ptr-null.stderr | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/test/ui/consts/const-eval') diff --git a/src/test/ui/consts/const-eval/match-test-ptr-null.rs b/src/test/ui/consts/const-eval/match-test-ptr-null.rs index e0af01aeef4..50757afaf56 100644 --- a/src/test/ui/consts/const-eval/match-test-ptr-null.rs +++ b/src/test/ui/consts/const-eval/match-test-ptr-null.rs @@ -6,6 +6,7 @@ fn main() { match &1 as *const i32 as usize { //~^ ERROR casting pointers to integers in constants //~| NOTE for more information, see + //~| ERROR constant contains unimplemented expression type 0 => 42, //~ ERROR constant contains unimplemented expression type //~^ NOTE "pointer arithmetic or comparison" needs an rfc before being allowed //~| ERROR evaluation of constant value failed diff --git a/src/test/ui/consts/const-eval/match-test-ptr-null.stderr b/src/test/ui/consts/const-eval/match-test-ptr-null.stderr index d005e09b28a..167d5ad8d61 100644 --- a/src/test/ui/consts/const-eval/match-test-ptr-null.stderr +++ b/src/test/ui/consts/const-eval/match-test-ptr-null.stderr @@ -8,18 +8,24 @@ LL | match &1 as *const i32 as usize { = help: add #![feature(const_raw_ptr_to_usize_cast)] to the crate attributes to enable error[E0019]: constant contains unimplemented expression type - --> $DIR/match-test-ptr-null.rs:9:13 + --> $DIR/match-test-ptr-null.rs:6:15 + | +LL | match &1 as *const i32 as usize { + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + +error[E0019]: constant contains unimplemented expression type + --> $DIR/match-test-ptr-null.rs:10:13 | LL | 0 => 42, | ^ error[E0080]: evaluation of constant value failed - --> $DIR/match-test-ptr-null.rs:9:13 + --> $DIR/match-test-ptr-null.rs:10:13 | LL | 0 => 42, | ^ "pointer arithmetic or comparison" needs an rfc before being allowed inside constants -error: aborting due to 3 previous errors +error: aborting due to 4 previous errors Some errors have detailed explanations: E0019, E0080, E0658. For more information about an error, try `rustc --explain E0019`. -- cgit 1.4.1-3-g733a5