check_match: extract common logic

diff --git a/src/librustc_mir_build/hair/pattern/_match.rs b/src/librustc_mir_build/hair/pattern/_match.rs
index a2ce224904b29f5c5563b0ca8774356f01b25c3c..08ed6b521b502d04a2356bdfa3202502a366d1c4 100644 (file)
--- a/src/librustc_mir_build/hair/pattern/_match.rs
+++ b/src/librustc_mir_build/hair/pattern/_match.rs
@@ -586,7 +586,7 @@ impl<'a, 'tcx> MatchCheckCtxt<'a, 'tcx> {
         tcx: TyCtxt<'tcx>,
         param_env: ty::ParamEnv<'tcx>,
         module: DefId,
-        f: impl for<'b> FnOnce(MatchCheckCtxt<'b, 'tcx>) -> R,
+        f: impl FnOnce(MatchCheckCtxt<'_, 'tcx>) -> R,
     ) -> R {
         let pattern_arena = TypedArena::default();
 

diff --git a/src/librustc_mir_build/hair/pattern/check_match.rs b/src/librustc_mir_build/hair/pattern/check_match.rs
index 49b7c2d41fcbb2978cf9e938e7cd63a115ffd25d..82822f0c471a4d2be1a83acaeec5f464e3dc40de 100644 (file)
--- a/src/librustc_mir_build/hair/pattern/check_match.rs
+++ b/src/librustc_mir_build/hair/pattern/check_match.rs
@@ -140,6 +140,11 @@ fn lower_pattern<'p>(
         (pattern, pattern_ty)
     }
 
+    fn check_in_cx(&self, hir_id: HirId, f: impl FnOnce(MatchCheckCtxt<'_, 'tcx>)) {
+        let module = self.tcx.hir().get_module_parent(hir_id);
+        MatchCheckCtxt::create_and_enter(self.tcx, self.param_env, module, |cx| f(cx));
+    }
+
     fn check_match(
         &mut self,
         scrut: &hir::Expr<'_>,
@@ -151,8 +156,7 @@ fn check_match(
             self.check_patterns(arm.guard.is_some(), &arm.pat);
         }
 
-        let module = self.tcx.hir().get_module_parent(scrut.hir_id);
-        MatchCheckCtxt::create_and_enter(self.tcx, self.param_env, module, |ref mut cx| {
+        self.check_in_cx(scrut.hir_id, |ref mut cx| {
             let mut have_errors = false;
 
             let inlined_arms: Vec<_> = arms
@@ -180,8 +184,7 @@ fn check_match(
     }
 
     fn check_irrefutable(&self, pat: &'tcx Pat<'tcx>, origin: &str, sp: Option<Span>) {
-        let module = self.tcx.hir().get_module_parent(pat.hir_id);
-        MatchCheckCtxt::create_and_enter(self.tcx, self.param_env, module, |ref mut cx| {
+        self.check_in_cx(pat.hir_id, |ref mut cx| {
             let (pattern, pattern_ty) = self.lower_pattern(cx, pat, &mut false);
             let pats: Matrix<'_, '_> = vec![PatStack::from_pattern(pattern)].into_iter().collect();