From 9419fcb109c2659084eadf05c5b188e514340b80 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Thu, 4 May 2023 20:46:05 +0200 Subject: [PATCH] fix: Fix body lowering not using block def maps --- crates/base-db/src/change.rs | 4 ++-- crates/hir-def/src/body/lower.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/base-db/src/change.rs b/crates/base-db/src/change.rs index 2b33457b6d..6a3b36b231 100644 --- a/crates/base-db/src/change.rs +++ b/crates/base-db/src/change.rs @@ -77,10 +77,10 @@ impl Change { db.set_file_text_with_durability(file_id, text, durability) } if let Some(crate_graph) = self.crate_graph { - db.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH) + db.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH); } if let Some(proc_macros) = self.proc_macros { - db.set_proc_macros_with_durability(Arc::new(proc_macros), Durability::HIGH) + db.set_proc_macros_with_durability(Arc::new(proc_macros), Durability::HIGH); } } } diff --git a/crates/hir-def/src/body/lower.rs b/crates/hir-def/src/body/lower.rs index 0ecad857a4..80aa1af057 100644 --- a/crates/hir-def/src/body/lower.rs +++ b/crates/hir-def/src/body/lower.rs @@ -54,7 +54,7 @@ pub(super) fn lower( ExprCollector { db, krate, - def_map: db.crate_def_map(krate), + def_map: expander.module.def_map(db), source_map: BodySourceMap::default(), ast_id_map: db.ast_id_map(expander.current_file_id), body: Body {