From b54f122a1cb2593325501a2ed5b3fbfc47293615 Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Fri, 3 Apr 2020 15:22:37 +0200 Subject: [PATCH] Merge tuple and struct pattern generation. --- compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 index 2816bad7eabc..55b583842981 100644 --- 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) } }