New upstream version 1.53.0+dfsg1

[rustc.git] / src / test / ui / or-patterns / or-patterns-binding-type-mismatch.stderr

diff --git a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
index 26e14b539dbf29edf7b248f87f4379cdb6214a9a..00ce46c5690d59176cef6902054bc52c344748c4 100644 (file)
--- a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
+++ b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:13:39
+  --> $DIR/or-patterns-binding-type-mismatch.rs:11:39
    |
 LL |     match Blah::A(1, 1, 2) {
    |           ---------------- this expression has type `Blah`
@@ -11,7 +11,7 @@ LL |         Blah::A(_, x, y) | Blah::B(x, y) => {}
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:17:44
+  --> $DIR/or-patterns-binding-type-mismatch.rs:15:44
    |
 LL |     match Some(Blah::A(1, 1, 2)) {
    |           ---------------------- this expression has type `Option<Blah>`
@@ -23,7 +23,7 @@ LL |         Some(Blah::A(_, x, y) | Blah::B(x, y)) => {}
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:21:19
+  --> $DIR/or-patterns-binding-type-mismatch.rs:19:19
    |
 LL |     match (0u8, 1u16) {
    |           ----------- this expression has type `(u8, u16)`
@@ -35,7 +35,7 @@ LL |         (x, y) | (y, x) => {}
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:21:22
+  --> $DIR/or-patterns-binding-type-mismatch.rs:19:22
    |
 LL |     match (0u8, 1u16) {
    |           ----------- this expression has type `(u8, u16)`
@@ -47,7 +47,7 @@ LL |         (x, y) | (y, x) => {}
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:26:41
+  --> $DIR/or-patterns-binding-type-mismatch.rs:24:41
    |
 LL |     match Some((0u8, Some((1u16, 2u32)))) {
    |           ------------------------------- this expression has type `Option<(u8, Option<(u16, u32)>)>`
@@ -59,7 +59,7 @@ LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:26:50
+  --> $DIR/or-patterns-binding-type-mismatch.rs:24:50
    |
 LL |     match Some((0u8, Some((1u16, 2u32)))) {
    |           ------------------------------- this expression has type `Option<(u8, Option<(u16, u32)>)>`
@@ -71,7 +71,7 @@ LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:26:59
+  --> $DIR/or-patterns-binding-type-mismatch.rs:24:59
    |
 LL |     match Some((0u8, Some((1u16, 2u32)))) {
    |           ------------------------------- this expression has type `Option<(u8, Option<(u16, u32)>)>`
@@ -83,7 +83,7 @@ LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:26:62
+  --> $DIR/or-patterns-binding-type-mismatch.rs:24:62
    |
 LL |     match Some((0u8, Some((1u16, 2u32)))) {
    |           ------------------------------- this expression has type `Option<(u8, Option<(u16, u32)>)>`
@@ -93,7 +93,7 @@ LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:34:42
+  --> $DIR/or-patterns-binding-type-mismatch.rs:32:42
    |
 LL |     if let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2) {
    |                          -               ^    ---------------- this expression has type `Blah`
@@ -104,7 +104,7 @@ LL |     if let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2) {
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:38:47
+  --> $DIR/or-patterns-binding-type-mismatch.rs:36:47
    |
 LL |     if let Some(Blah::A(_, x, y) | Blah::B(x, y)) = Some(Blah::A(1, 1, 2)) {
    |                               -               ^     ---------------------- this expression has type `Option<Blah>`
@@ -115,7 +115,7 @@ LL |     if let Some(Blah::A(_, x, y) | Blah::B(x, y)) = Some(Blah::A(1, 1, 2))
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:42:22
+  --> $DIR/or-patterns-binding-type-mismatch.rs:40:22
    |
 LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
    |                -     ^       ----------- this expression has type `(u8, u16)`
@@ -126,7 +126,7 @@ LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:42:25
+  --> $DIR/or-patterns-binding-type-mismatch.rs:40:25
    |
 LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
    |             -           ^    ----------- this expression has type `(u8, u16)`
@@ -137,7 +137,7 @@ LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:47:44
+  --> $DIR/or-patterns-binding-type-mismatch.rs:45:44
    |
 LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
    |                           -                ^ expected `u16`, found `u8`
@@ -150,7 +150,7 @@ LL |     = Some((0u8, Some((1u16, 2u32))))
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:47:53
+  --> $DIR/or-patterns-binding-type-mismatch.rs:45:53
    |
 LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
    |                  -                                  ^ expected `u8`, found `u16`
@@ -163,7 +163,7 @@ LL |     = Some((0u8, Some((1u16, 2u32))))
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:47:62
+  --> $DIR/or-patterns-binding-type-mismatch.rs:45:62
    |
 LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
    |                              -                               ^ expected `u32`, found `u16`
@@ -176,7 +176,7 @@ LL |     = Some((0u8, Some((1u16, 2u32))))
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:47:65
+  --> $DIR/or-patterns-binding-type-mismatch.rs:45:65
    |
 LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
    |                  - first introduced with type `u8` here         ^ expected `u8`, found `u32`
@@ -187,7 +187,7 @@ LL |     = Some((0u8, Some((1u16, 2u32))))
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:55:40
+  --> $DIR/or-patterns-binding-type-mismatch.rs:53:40
    |
 LL |     let (Blah::A(_, x, y) | Blah::B(x, y)) = Blah::A(1, 1, 2);
    |                        -               ^     ---------------- this expression has type `Blah`
@@ -198,7 +198,7 @@ LL |     let (Blah::A(_, x, y) | Blah::B(x, y)) = Blah::A(1, 1, 2);
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:58:20
+  --> $DIR/or-patterns-binding-type-mismatch.rs:56:20
    |
 LL |     let ((x, y) | (y, x)) = (0u8, 1u16);
    |              -     ^        ----------- this expression has type `(u8, u16)`
@@ -209,7 +209,7 @@ LL |     let ((x, y) | (y, x)) = (0u8, 1u16);
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:58:23
+  --> $DIR/or-patterns-binding-type-mismatch.rs:56:23
    |
 LL |     let ((x, y) | (y, x)) = (0u8, 1u16);
    |           -           ^     ----------- this expression has type `(u8, u16)`
@@ -220,7 +220,7 @@ LL |     let ((x, y) | (y, x)) = (0u8, 1u16);
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:62:42
+  --> $DIR/or-patterns-binding-type-mismatch.rs:60:42
    |
 LL |     fn f1((Blah::A(_, x, y) | Blah::B(x, y)): Blah) {}
    |                          -               ^    ---- expected due to this
@@ -231,7 +231,7 @@ LL |     fn f1((Blah::A(_, x, y) | Blah::B(x, y)): Blah) {}
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:65:22
+  --> $DIR/or-patterns-binding-type-mismatch.rs:63:22
    |
 LL |     fn f2(((x, y) | (y, x)): (u8, u16)) {}
    |                -     ^       --------- expected due to this
@@ -242,7 +242,7 @@ LL |     fn f2(((x, y) | (y, x)): (u8, u16)) {}
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-binding-type-mismatch.rs:65:25
+  --> $DIR/or-patterns-binding-type-mismatch.rs:63:25
    |
 LL |     fn f2(((x, y) | (y, x)): (u8, u16)) {}
    |             -           ^    --------- expected due to this