Skip to content

Commit 0dd94d3

Browse files
committed
Auto merge of #14738 - Veykril:def-map-fix, r=Veykril
fix: Fix body lowering not using block def maps Fixes the issue in the comment here #10084 (comment), not the general issue unfortunately.
2 parents 0d5773e + 9419fcb commit 0dd94d3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

crates/base-db/src/change.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ impl Change {
7777
db.set_file_text_with_durability(file_id, text, durability)
7878
}
7979
if let Some(crate_graph) = self.crate_graph {
80-
db.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH)
80+
db.set_crate_graph_with_durability(Arc::new(crate_graph), Durability::HIGH);
8181
}
8282
if let Some(proc_macros) = self.proc_macros {
83-
db.set_proc_macros_with_durability(Arc::new(proc_macros), Durability::HIGH)
83+
db.set_proc_macros_with_durability(Arc::new(proc_macros), Durability::HIGH);
8484
}
8585
}
8686
}

crates/hir-def/src/body/lower.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub(super) fn lower(
5454
ExprCollector {
5555
db,
5656
krate,
57-
def_map: db.crate_def_map(krate),
57+
def_map: expander.module.def_map(db),
5858
source_map: BodySourceMap::default(),
5959
ast_id_map: db.ast_id_map(expander.current_file_id),
6060
body: Body {

0 commit comments

Comments
 (0)