Skip to content

Commit 2314000

Browse files
committed
Call hir_crate(()) only if we are in crate collector mode
1 parent e6459c2 commit 2314000

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

  • compiler/rustc_middle/src/hir

compiler/rustc_middle/src/hir/map.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,8 +1312,6 @@ struct ItemCollector<'tcx> {
13121312

13131313
impl<'tcx> ItemCollector<'tcx> {
13141314
fn new(tcx: TyCtxt<'tcx>, crate_collector: bool) -> ItemCollector<'tcx> {
1315-
let krate = tcx.hir_crate(());
1316-
13171315
let mut collector = ItemCollector {
13181316
crate_collector,
13191317
tcx,
@@ -1327,10 +1325,13 @@ impl<'tcx> ItemCollector<'tcx> {
13271325
nested_bodies: Vec::default(),
13281326
delayed_lint_items: Vec::default(),
13291327
eiis: Vec::default(),
1330-
delayed_ids: crate_collector.then(|| &krate.delayed_ids),
1328+
delayed_ids: None,
13311329
};
13321330

13331331
if crate_collector {
1332+
let krate = tcx.hir_crate(());
1333+
collector.delayed_ids = Some(&krate.delayed_ids);
1334+
13341335
let delayed_kinds =
13351336
krate.delayed_ids.iter().copied().map(|id| (id, krate.owners[id].expect_delayed()));
13361337

0 commit comments

Comments
 (0)