Bless miri unleashed test now that errors are mandatory

rust-lang · Nov 13, 2019 · 5e048da · 5e048da
1 parent 86734b1
commit 5e048da
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/test/ui/consts/miri_unleashed/enum_discriminants.rs b/src/test/ui/consts/miri_unleashed/enum_discriminants.rs
@@ -20,9 +20,9 @@ const OVERFLOW: usize = {
         C(WithWraparoundInvalidValues),
     }
 
-    let x = Foo::B; //~ WARNING skipping const checks
-    match x {
-        Foo::B => 0, //~ WARNING skipping const checks
+    let x = Foo::B;
+    match x { //~ WARNING skipping const checks
+        Foo::B => 0,
         _ => panic!(),
     }
 };
@@ -87,18 +87,20 @@ const MORE_OVERFLOW: usize = {
 
     if let E1::V2 { .. } = (E1::V1 { f: true }) {
         //~^ WARNING skipping const checks
-        //~| WARNING skipping const checks
         unreachable!()
     }
     if let E1::V1 { .. } = (E1::V1 { f: true }) {
+        //~^ WARNING skipping const checks
     } else {
         unreachable!()
     }
 
     if let E2::V1 { .. } = E2::V3::<Infallible> {
+        //~^ WARNING skipping const checks
         unreachable!()
     }
     if let E2::V3 { .. } = E2::V3::<Infallible> {
+        //~^ WARNING skipping const checks
     } else {
         unreachable!()
     }

diff --git a/src/test/ui/consts/miri_unleashed/enum_discriminants.stderr b/src/test/ui/consts/miri_unleashed/enum_discriminants.stderr
@@ -11,31 +11,35 @@ warning: skipping const checks
   --> $DIR/enum_discriminants.rs:88:5
    |
 LL | /     if let E1::V2 { .. } = (E1::V1 { f: true }) {
+LL | |
 LL | |         unreachable!()
 LL | |     }
    | |_____^
 
 warning: skipping const checks
-  --> $DIR/enum_discriminants.rs:91:5
+  --> $DIR/enum_discriminants.rs:92:5
    |
 LL | /     if let E1::V1 { .. } = (E1::V1 { f: true }) {
+LL | |
 LL | |     } else {
 LL | |         unreachable!()
 LL | |     }
    | |_____^
 
 warning: skipping const checks
-  --> $DIR/enum_discriminants.rs:96:5
+  --> $DIR/enum_discriminants.rs:98:5
    |
 LL | /     if let E2::V1 { .. } = E2::V3::<Infallible> {
+LL | |
 LL | |         unreachable!()
 LL | |     }
    | |_____^
 
 warning: skipping const checks
-  --> $DIR/enum_discriminants.rs:99:5
+  --> $DIR/enum_discriminants.rs:102:5
    |
 LL | /     if let E2::V3 { .. } = E2::V3::<Infallible> {
+LL | |
 LL | |     } else {
 LL | |         unreachable!()
 LL | |     }