diff --git a/src/test/ui/or-patterns/or-pattern-mismatch.rs b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs
similarity index 100%
rename from src/test/ui/or-patterns/or-pattern-mismatch.rs
rename to src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs
diff --git a/src/test/ui/or-patterns/or-pattern-mismatch.stderr b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
similarity index 85%
rename from src/test/ui/or-patterns/or-pattern-mismatch.stderr
rename to src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
index 84c38e3be90..5094f04b920 100644
--- a/src/test/ui/or-patterns/or-pattern-mismatch.stderr
+++ b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:13:39
+  --> $DIR/or-patterns-binding-type-mismatch.rs:13:39
    |
 LL |     match Blah::A(1, 1, 2) {
    |           ---------------- this expression has type `main::Blah`
@@ -7,7 +7,7 @@ LL |         Blah::A(_, x, y) | Blah::B(x, y) => {}
    |                                       ^ expected `usize`, found `isize`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:17:44
+  --> $DIR/or-patterns-binding-type-mismatch.rs:17:44
    |
 LL |     match Some(Blah::A(1, 1, 2)) {
    |           ---------------------- this expression has type `std::option::Option<main::Blah>`
@@ -15,7 +15,7 @@ LL |         Some(Blah::A(_, x, y) | Blah::B(x, y)) => {}
    |                                            ^ expected `usize`, found `isize`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:21:19
+  --> $DIR/or-patterns-binding-type-mismatch.rs:21:19
    |
 LL |     match (0u8, 1u16) {
    |           ----------- this expression has type `(u8, u16)`
@@ -23,7 +23,7 @@ LL |         (x, y) | (y, x) => {}
    |                   ^ expected `u16`, found `u8`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:21:22
+  --> $DIR/or-patterns-binding-type-mismatch.rs:21:22
    |
 LL |     match (0u8, 1u16) {
    |           ----------- this expression has type `(u8, u16)`
@@ -31,7 +31,7 @@ LL |         (x, y) | (y, x) => {}
    |                      ^ expected `u8`, found `u16`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:26:41
+  --> $DIR/or-patterns-binding-type-mismatch.rs:26:41
    |
 LL |     match Some((0u8, Some((1u16, 2u32)))) {
    |           ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
@@ -39,7 +39,7 @@ LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
    |                                         ^ expected `u16`, found `u8`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:26:50
+  --> $DIR/or-patterns-binding-type-mismatch.rs:26:50
    |
 LL |     match Some((0u8, Some((1u16, 2u32)))) {
    |           ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
@@ -47,7 +47,7 @@ LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
    |                                                  ^ expected `u8`, found `u16`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:26:59
+  --> $DIR/or-patterns-binding-type-mismatch.rs:26:59
    |
 LL |     match Some((0u8, Some((1u16, 2u32)))) {
    |           ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
@@ -55,7 +55,7 @@ LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
    |                                                           ^ expected `u32`, found `u16`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:26:62
+  --> $DIR/or-patterns-binding-type-mismatch.rs:26:62
    |
 LL |     match Some((0u8, Some((1u16, 2u32)))) {
    |           ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
@@ -63,7 +63,7 @@ LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
    |                                                              ^ expected `u8`, found `u32`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:34:42
+  --> $DIR/or-patterns-binding-type-mismatch.rs:34:42
    |
 LL |     if let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2) {
    |                                          ^    ---------------- this expression has type `main::Blah`
@@ -71,7 +71,7 @@ LL |     if let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2) {
    |                                          expected `usize`, found `isize`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:38:47
+  --> $DIR/or-patterns-binding-type-mismatch.rs:38:47
    |
 LL |     if let Some(Blah::A(_, x, y) | Blah::B(x, y)) = Some(Blah::A(1, 1, 2)) {
    |                                               ^     ---------------------- this expression has type `std::option::Option<main::Blah>`
@@ -79,7 +79,7 @@ LL |     if let Some(Blah::A(_, x, y) | Blah::B(x, y)) = Some(Blah::A(1, 1, 2))
    |                                               expected `usize`, found `isize`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:42:22
+  --> $DIR/or-patterns-binding-type-mismatch.rs:42:22
    |
 LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
    |                      ^       ----------- this expression has type `(u8, u16)`
@@ -87,7 +87,7 @@ LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
    |                      expected `u16`, found `u8`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:42:25
+  --> $DIR/or-patterns-binding-type-mismatch.rs:42:25
    |
 LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
    |                         ^    ----------- this expression has type `(u8, u16)`
@@ -95,7 +95,7 @@ LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
    |                         expected `u8`, found `u16`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:47:44
+  --> $DIR/or-patterns-binding-type-mismatch.rs:47:44
    |
 LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
    |                                            ^ expected `u16`, found `u8`
@@ -104,7 +104,7 @@ LL |     = Some((0u8, Some((1u16, 2u32))))
    |       ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:47:53
+  --> $DIR/or-patterns-binding-type-mismatch.rs:47:53
    |
 LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
    |                                                     ^ expected `u8`, found `u16`
@@ -113,7 +113,7 @@ LL |     = Some((0u8, Some((1u16, 2u32))))
    |       ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:47:62
+  --> $DIR/or-patterns-binding-type-mismatch.rs:47:62
    |
 LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
    |                                                              ^ expected `u32`, found `u16`
@@ -122,7 +122,7 @@ LL |     = Some((0u8, Some((1u16, 2u32))))
    |       ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:47:65
+  --> $DIR/or-patterns-binding-type-mismatch.rs:47:65
    |
 LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
    |                                                                 ^ expected `u8`, found `u32`
@@ -131,7 +131,7 @@ LL |     = Some((0u8, Some((1u16, 2u32))))
    |       ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:55:39
+  --> $DIR/or-patterns-binding-type-mismatch.rs:55:39
    |
 LL |     let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2);
    |                                       ^    ---------------- this expression has type `main::Blah`
@@ -139,7 +139,7 @@ LL |     let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2);
    |                                       expected `usize`, found `isize`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:58:19
+  --> $DIR/or-patterns-binding-type-mismatch.rs:58:19
    |
 LL |     let (x, y) | (y, x) = (0u8, 1u16);
    |                   ^       ----------- this expression has type `(u8, u16)`
@@ -147,7 +147,7 @@ LL |     let (x, y) | (y, x) = (0u8, 1u16);
    |                   expected `u16`, found `u8`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:58:22
+  --> $DIR/or-patterns-binding-type-mismatch.rs:58:22
    |
 LL |     let (x, y) | (y, x) = (0u8, 1u16);
    |                      ^    ----------- this expression has type `(u8, u16)`
@@ -155,7 +155,7 @@ LL |     let (x, y) | (y, x) = (0u8, 1u16);
    |                      expected `u8`, found `u16`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:62:42
+  --> $DIR/or-patterns-binding-type-mismatch.rs:62:42
    |
 LL |     fn f1((Blah::A(_, x, y) | Blah::B(x, y)): Blah) {}
    |                                          ^    ---- expected due to this
@@ -163,7 +163,7 @@ LL |     fn f1((Blah::A(_, x, y) | Blah::B(x, y)): Blah) {}
    |                                          expected `usize`, found `isize`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:65:22
+  --> $DIR/or-patterns-binding-type-mismatch.rs:65:22
    |
 LL |     fn f2(((x, y) | (y, x)): (u8, u16)) {}
    |                      ^       --------- expected due to this
@@ -171,7 +171,7 @@ LL |     fn f2(((x, y) | (y, x)): (u8, u16)) {}
    |                      expected `u16`, found `u8`
 
 error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:65:25
+  --> $DIR/or-patterns-binding-type-mismatch.rs:65:25
    |
 LL |     fn f2(((x, y) | (y, x)): (u8, u16)) {}
    |                         ^    --------- expected due to this