Merge tuple and struct pattern generation.

oli-obk · oli-obk · commit b54f122a1cb2 · 2020-09-20T12:31:37.000+02:00
diff --git a/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs b/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs
@@ -279,11 +279,7 @@ impl<'a, 'tcx> ConstToPat<'a, 'tcx> {
                     subpatterns: field_pats(destructured.fields),
                 }
             }
-            ty::Adt(_, _) => {
-                let destructured = tcx.destructure_const(param_env.and(cv));
-                PatKind::Leaf { subpatterns: field_pats(destructured.fields) }
-            }
-            ty::Tuple(_) => {
+            ty::Tuple(_) | ty::Adt(_, _) => {
                 let destructured = tcx.destructure_const(param_env.and(cv));
                 PatKind::Leaf { subpatterns: field_pats(destructured.fields) }
             }

Original file line number	Diff line number	Diff line change
`@@ -279,11 +279,7 @@ impl<'a, 'tcx> ConstToPat<'a, 'tcx> {`
`279`	`279`	`subpatterns: field_pats(destructured.fields),`
`280`	`280`	`}`
`281`	`281`	`}`
`282`		`- ty::Adt(_, _) => {`
`283`		`- let destructured = tcx.destructure_const(param_env.and(cv));`
`284`		`- PatKind::Leaf { subpatterns: field_pats(destructured.fields) }`
`285`		`- }`
`286`		`- ty::Tuple(_) => {`
	`282`	`+ ty::Tuple(_) \| ty::Adt(_, _) => {`
`287`	`283`	`let destructured = tcx.destructure_const(param_env.and(cv));`
`288`	`284`	`PatKind::Leaf { subpatterns: field_pats(destructured.fields) }`
`289`	`285`	`}`