Move lowerer creation out of the loop

Author: aerooneqq

compiler/rustc_ast_lowering/src/item.rs

@@ -60,9 +60,9 @@ fn add_ty_alias_where_clause(
 
 impl<'a, 'b, 'hir> ItemLowerer<'a, 'b, 'hir> {
     fn with_lctx(
-        &'b mut self,
+        &mut self,
         owner: NodeId,
-        f: impl FnOnce(&mut LoweringContext<'a, 'b, 'hir>) -> hir::OwnerNode<'hir>,
+        f: impl FnOnce(&mut LoweringContext<'_, '_, 'hir>) -> hir::OwnerNode<'hir>,
     ) {
         let mut lctx = LoweringContext::new(self.tcx, self.resolver);
         lctx.with_hir_id_owner(owner, |lctx| f(lctx));
@@ -83,7 +83,7 @@ impl<'a, 'b, 'hir> ItemLowerer<'a, 'b, 'hir> {
         }
     }
 
-    pub(super) fn lower_node(&'b mut self, def_id: LocalDefId) {
+    pub(super) fn lower_node(&mut self, def_id: LocalDefId) {
         let owner = match &mut self.owners {
             Owners::IndexVec(index_vec) => {
                 index_vec.ensure_contains_elem(def_id, || hir::MaybeOwner::Phantom)

compiler/rustc_ast_lowering/src/lib.rs

@@ -602,6 +602,13 @@ pub fn lower_to_hir(tcx: TyCtxt<'_>, (): ()) -> rustc_middle::hir::Crate<'_> {
 
     let mut delayed_ids: FxIndexSet<LocalDefId> = Default::default();
 
+    let mut lowerer = item::ItemLowerer {
+        tcx,
+        resolver: &mut resolver,
+        ast_index: &ast_index,
+        owners: Owners::IndexVec(&mut owners),
+    };
+
     for def_id in ast_index.indices() {
         let owner = &ast_index[def_id];
         let delay_lowering = match owner {
@@ -617,13 +624,6 @@ pub fn lower_to_hir(tcx: TyCtxt<'_>, (): ()) -> rustc_middle::hir::Crate<'_> {
             continue;
         }
 
-        let mut lowerer = item::ItemLowerer {
-            tcx,
-            resolver: &mut resolver,
-            ast_index: &ast_index,
-            owners: Owners::IndexVec(&mut owners),
-        };
-
         lowerer.lower_node(def_id);
     }