Merge pull request #2108 from topecongiro/combine-pat-tuplestruct

Combine ast::PatKind::TupleStruct

Author: nrc

src/patterns.rs

@@ -247,9 +247,10 @@ impl<'a> Spanned for TuplePatField<'a> {
 pub fn can_be_overflowed_pat(context: &RewriteContext, pat: &TuplePatField, len: usize) -> bool {
     match *pat {
         TuplePatField::Pat(pat) => match pat.node {
-            ast::PatKind::Path(..) | ast::PatKind::Tuple(..) | ast::PatKind::Struct(..) => {
-                context.use_block_indent() && len == 1
-            }
+            ast::PatKind::Path(..) |
+            ast::PatKind::Tuple(..) |
+            ast::PatKind::Struct(..) |
+            ast::PatKind::TupleStruct(..) => context.use_block_indent() && len == 1,
             ast::PatKind::Ref(ref p, _) | ast::PatKind::Box(ref p) => {
                 can_be_overflowed_pat(context, &TuplePatField::Pat(p), len)
             }

tests/source/pattern.rs

@@ -48,3 +48,18 @@ fn issue_1874() {
 y
     }
 }
+
+fn combine_patterns() {
+    let x = match y {
+        Some(
+            Some(
+                Foo {
+                    z: Bar(..),
+                    a: Bar(..),
+                    b: Bar(..),
+                },
+            ),
+        ) => z,
+        _ => return,
+    };
+}

tests/target/pattern.rs

@@ -63,3 +63,14 @@ fn issue_1874() {
         y
     }
 }
+
+fn combine_patterns() {
+    let x = match y {
+        Some(Some(Foo {
+            z: Bar(..),
+            a: Bar(..),
+            b: Bar(..),
+        })) => z,
+        _ => return,
+    };
+}