2229 editon feature perf test

compiler/rustc_mir_build/src/build/expr/as_place.rs

@@ -219,7 +219,6 @@ fn to_upvars_resolved_place_builder<'a, 'tcx>(
 
             // We won't be building MIR if the closure wasn't local
             let closure_hir_id = tcx.hir().local_def_id_to_hir_id(closure_def_id.expect_local());
-            let closure_span = tcx.hir().span(closure_hir_id);
 
             let (capture_index, capture) = if let Some(capture_details) =
                 find_capture_matching_projections(
@@ -230,7 +229,7 @@ fn to_upvars_resolved_place_builder<'a, 'tcx>(
                 ) {
                 capture_details
             } else {
-                if !enable_precise_capture(tcx, closure_span) {
+                if !tcx.features().capture_disjoint_fields {
                     bug!(
                         "No associated capture found for {:?}[{:#?}] even though \
                             capture_disjoint_fields isn't enabled",
@@ -783,9 +782,3 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         }
     }
 }
-
-/// Precise capture is enabled if the feature gate `capture_disjoint_fields` is enabled or if
-/// user is using Rust Edition 2021 or higher.
-fn enable_precise_capture(tcx: TyCtxt<'_>, closure_span: Span) -> bool {
-    tcx.features().capture_disjoint_fields || closure_span.rust_2021()
-}

compiler/rustc_typeck/src/check/upvar.rs

@@ -179,7 +179,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         // We now fake capture information for all variables that are mentioned within the closure
         // We do this after handling migrations so that min_captures computes before
-        if !enable_precise_capture(self.tcx, span) {
+        if !self.tcx.features().capture_disjoint_fields {
             let mut capture_information: InferredCaptureInformation<'tcx> = Default::default();
 
             if let Some(upvars) = self.tcx.upvars_mentioned(closure_def_id) {
@@ -216,7 +216,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
             // If we have an origin, store it.
             if let Some(origin) = delegate.current_origin.clone() {
-                let origin = if enable_precise_capture(self.tcx, span) {
+                let origin = if self.tcx.features().capture_disjoint_fields {
                     (origin.0, restrict_capture_precision(capture_clause, origin.1))
                 } else {
                     (origin.0, Place { projections: vec![], ..origin.1 })
@@ -1979,13 +1979,3 @@ fn determine_place_ancestry_relation(
         PlaceAncestryRelation::Divergent
     }
 }
-
-/// Precise capture is enabled if the feature gate `capture_disjoint_fields` is enabled or if
-/// user is using Rust Edition 2021 or higher.
-///
-/// `span` is the span of the closure.
-fn enable_precise_capture(tcx: TyCtxt<'_>, span: Span) -> bool {
-    // We use span here to ensure that if the closure was generated by a macro with a different
-    // edition.
-    tcx.features().capture_disjoint_fields || span.rust_2021()
-}