Auto merge of #82864 - jyn514:short-circuit, r=GuillaumeGomez

[rust.git] / src / test / ui / or-patterns / inconsistent-modes.stderr

diff --git a/src/test/ui/or-patterns/inconsistent-modes.stderr b/src/test/ui/or-patterns/inconsistent-modes.stderr
index 99791431eaf25bcb8cee5fbf5f71fb3e38d39aca..dae6bb41e74e296b67127be90a874cbcde098403 100644 (file)
--- a/src/test/ui/or-patterns/inconsistent-modes.stderr
+++ b/src/test/ui/or-patterns/inconsistent-modes.stderr
@@ -1,5 +1,5 @@
 error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
-  --> $DIR/inconsistent-modes.rs:7:26
+  --> $DIR/inconsistent-modes.rs:6:26
    |
 LL |     let (Ok(a) | Err(ref a)): Result<&u8, u8> = Ok(&0);
    |             -            ^ bound in different ways
@@ -7,7 +7,7 @@ LL |     let (Ok(a) | Err(ref a)): Result<&u8, u8> = Ok(&0);
    |             first binding
 
 error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
-  --> $DIR/inconsistent-modes.rs:9:30
+  --> $DIR/inconsistent-modes.rs:8:30
    |
 LL |     let (Ok(ref mut a) | Err(a)): Result<u8, &mut u8> = Ok(0);
    |                     -        ^ bound in different ways
@@ -15,25 +15,25 @@ LL |     let (Ok(ref mut a) | Err(a)): Result<u8, &mut u8> = Ok(0);
    |                     first binding
 
 error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
-  --> $DIR/inconsistent-modes.rs:11:34
+  --> $DIR/inconsistent-modes.rs:10:34
    |
 LL |     let (Ok(ref a) | Err(ref mut a)): Result<&u8, &mut u8> = Ok(&0);
    |                 - first binding  ^ bound in different ways
 
 error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
-  --> $DIR/inconsistent-modes.rs:14:40
+  --> $DIR/inconsistent-modes.rs:13:40
    |
 LL |     let (Ok((ref a, b)) | Err((ref mut a, ref b))) = Ok((0, &0));
    |                  - first binding       ^ bound in different ways
 
 error[E0409]: variable `b` is bound inconsistently across alternatives separated by `|`
-  --> $DIR/inconsistent-modes.rs:14:47
+  --> $DIR/inconsistent-modes.rs:13:47
    |
 LL |     let (Ok((ref a, b)) | Err((ref mut a, ref b))) = Ok((0, &0));
    |                     - first binding           ^ bound in different ways
 
 error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
-  --> $DIR/inconsistent-modes.rs:20:39
+  --> $DIR/inconsistent-modes.rs:19:39
    |
 LL |     let (Ok(Ok(a) | Err(a)) | Err(ref a)) = Err(0);
    |                         -             ^ bound in different ways
@@ -41,7 +41,7 @@ LL |     let (Ok(Ok(a) | Err(a)) | Err(ref a)) = Err(0);
    |                         first binding
 
 error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
-  --> $DIR/inconsistent-modes.rs:24:34
+  --> $DIR/inconsistent-modes.rs:23:34
    |
 LL |     let (Ok([Ok((Ok(ref a) | Err(a),)) | Err(a)]) | Err(a)) = Err(&1);
    |                         -        ^ bound in different ways
@@ -49,7 +49,7 @@ LL |     let (Ok([Ok((Ok(ref a) | Err(a),)) | Err(a)]) | Err(a)) = Err(&1);
    |                         first binding
 
 error[E0308]: mismatched types
-  --> $DIR/inconsistent-modes.rs:11:26
+  --> $DIR/inconsistent-modes.rs:10:26
    |
 LL |     let (Ok(ref a) | Err(ref mut a)): Result<&u8, &mut u8> = Ok(&0);
    |             -----        ^^^^^^^^^    -------------------- expected due to this
@@ -62,7 +62,7 @@ LL |     let (Ok(ref a) | Err(ref mut a)): Result<&u8, &mut u8> = Ok(&0);
    = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/inconsistent-modes.rs:14:32
+  --> $DIR/inconsistent-modes.rs:13:32
    |
 LL |     let (Ok((ref a, b)) | Err((ref mut a, ref b))) = Ok((0, &0));
    |              -----             ^^^^^^^^^             ----------- this expression has type `Result<({integer}, &{integer}), (_, _)>`