fix rebase

Author: estebank

tests/ui/pattern/pattern-bad-ref-box-order.fixed

@@ -5,8 +5,10 @@
 
 fn foo(f: Option<Box<i32>>) {
     match f {
-        Some(box ref _i) => {},
+        Some(box ref, _i) => {},
         //~^ ERROR switch the order of `ref` and `box`
+        //~| ERROR expected one of `)`, `,`, or `|`, found `_i`
+        //~| ERROR this pattern has 2 fields, but the corresponding tuple variant has 1 field
         None => {}
     }
 }

tests/ui/pattern/pattern-bad-ref-box-order.rs

@@ -7,6 +7,8 @@ fn foo(f: Option<Box<i32>>) {
     match f {
         Some(ref box _i) => {},
         //~^ ERROR switch the order of `ref` and `box`
+        //~| ERROR expected one of `)`, `,`, or `|`, found `_i`
+        //~| ERROR this pattern has 2 fields, but the corresponding tuple variant has 1 field
         None => {}
     }
 }

tests/ui/pattern/pattern-bad-ref-box-order.stderr

@@ -4,5 +4,23 @@ error: switch the order of `ref` and `box`
 LL |         Some(ref box _i) => {},
    |              ^^^^^^^ help: swap them: `box ref`
 
-error: aborting due to 1 previous error
+error: expected one of `)`, `,`, or `|`, found `_i`
+  --> $DIR/pattern-bad-ref-box-order.rs:8:22
+   |
+LL |         Some(ref box _i) => {},
+   |                     -^^ expected one of `)`, `,`, or `|`
+   |                     |
+   |                     help: missing `,`
+
+error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field
+  --> $DIR/pattern-bad-ref-box-order.rs:8:22
+   |
+LL |         Some(ref box _i) => {},
+   |                      ^^ expected 1 field, found 2
+  --> $SRC_DIR/core/src/option.rs:LL:COL
+   |
+   = note: tuple variant has 1 field
+
+error: aborting due to 3 previous errors
 
+For more information about this error, try `rustc --explain E0023`.