Rollup merge of #66800 - jyn514:combine-const-match-tests, r=Dylan-DPC

Combine similar tests for const match See #66788 (comment) for context.
rust-lang · Nov 27, 2019 · a40494b · a40494b
2 parents 999fd56 + 9617d7c
commit a40494b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/src/test/ui/consts/control-flow/exhaustive-c-like-enum-match.rs b/src/test/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
@@ -18,4 +18,14 @@ const fn f(e: E) {
     }
 }
 
-fn main() {}
+const fn g(e: E) -> usize {
+    match e {
+        _ => 0
+    }
+}
+
+fn main() {
+    const X: usize = g(E::C);
+    assert_eq!(X, 0);
+    assert_eq!(g(E::A), 0);
+}
diff --git a/src/test/ui/consts/control-flow/single-arm-match-wild.rs b/src/test/ui/consts/control-flow/single-arm-match-wild.rs