moved 35 tests to organized locations

3 files changed, 80 insertions, 0 deletions

diff --git a/tests/ui/match/guard-pattern-ordering-14865.rs b/tests/ui/match/guard-pattern-ordering-14865.rs
new file mode 100644
index 00000000000..e0f8bfe9428
--- /dev/null
+++ b/tests/ui/match/guard-pattern-ordering-14865.rs
@@ -0,0 +1,23 @@
+//@ run-pass
+#![allow(dead_code)]
+
+enum X {
+    Foo(usize),
+    Bar(bool)
+}
+
+fn main() {
+    let x = match X::Foo(42) {
+        X::Foo(..) => 1,
+        _ if true => 0,
+        X::Bar(..) => panic!("Oh dear")
+    };
+    assert_eq!(x, 1);
+
+    let x = match X::Foo(42) {
+        _ if true => 0,
+        X::Foo(..) => 1,
+        X::Bar(..) => panic!("Oh dear")
+    };
+    assert_eq!(x, 0);
+}
diff --git a/tests/ui/match/multiple-refutable-patterns-13867.rs b/tests/ui/match/multiple-refutable-patterns-13867.rs
new file mode 100644
index 00000000000..ad7d6d66393
--- /dev/null
+++ b/tests/ui/match/multiple-refutable-patterns-13867.rs
@@ -0,0 +1,48 @@
+//@ run-pass
+// Test that codegen works correctly when there are multiple refutable
+// patterns in match expression.
+
+enum Foo {
+    FooUint(usize),
+    FooNullary,
+}
+
+fn main() {
+    let r = match (Foo::FooNullary, 'a') {
+        (Foo::FooUint(..), 'a'..='z') => 1,
+        (Foo::FooNullary, 'x') => 2,
+        _ => 0
+    };
+    assert_eq!(r, 0);
+
+    let r = match (Foo::FooUint(0), 'a') {
+        (Foo::FooUint(1), 'a'..='z') => 1,
+        (Foo::FooUint(..), 'x') => 2,
+        (Foo::FooNullary, 'a') => 3,
+        _ => 0
+    };
+    assert_eq!(r, 0);
+
+    let r = match ('a', Foo::FooUint(0)) {
+        ('a'..='z', Foo::FooUint(1)) => 1,
+        ('x', Foo::FooUint(..)) => 2,
+        ('a', Foo::FooNullary) => 3,
+        _ => 0
+    };
+    assert_eq!(r, 0);
+
+    let r = match ('a', 'a') {
+        ('a'..='z', 'b') => 1,
+        ('x', 'a'..='z') => 2,
+        _ => 0
+    };
+    assert_eq!(r, 0);
+
+    let r = match ('a', 'a') {
+        ('a'..='z', 'b') => 1,
+        ('x', 'a'..='z') => 2,
+        ('a', 'a') => 3,
+        _ => 0
+    };
+    assert_eq!(r, 3);
+}
diff --git a/tests/ui/match/tuple-usize-pattern-14393.rs b/tests/ui/match/tuple-usize-pattern-14393.rs
new file mode 100644
index 00000000000..69c3fc15d31
--- /dev/null
+++ b/tests/ui/match/tuple-usize-pattern-14393.rs
@@ -0,0 +1,9 @@
+//@ run-pass
+
+fn main() {
+    match ("", 1_usize) {
+        (_, 42_usize) => (),
+        ("", _) => (),
+        _ => ()
+    }
+}