mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded HirFileId argument

Browse Source
This commit is contained in:
Jonas Schievink 2020-06-24 16:21:00 +02:00
parent d4ddec2bdf
commit 59d4640b64
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ra_hir_def/src/body.rs
View File

@ -243,7 +243,7 @@ impl Body {
}
};
let expander = Expander::new(db, file_id, module);
let (body, source_map) = Body::new(db, file_id, def, expander, params, body);
let (body, source_map) = Body::new(db, def, expander, params, body);
(Arc::new(body), Arc::new(source_map))
}
@ -253,13 +253,12 @@ impl Body {
fn new(
db: &dyn DefDatabase,
file_id: HirFileId,
def: DefWithBodyId,
expander: Expander,
params: Option<ast::ParamList>,
body: Option<ast::Expr>,
) -> (Body, BodySourceMap) {
lower::lower(db, file_id, def, expander, params, body)
lower::lower(db, def, expander, params, body)
}
}

7
crates/ra_hir_def/src/body/lower.rs
View File

@ -57,17 +57,15 @@ impl LowerCtx {
pub(super) fn lower(
db: &dyn DefDatabase,
file_id: HirFileId,
def: DefWithBodyId,
expander: Expander,
params: Option<ast::ParamList>,
body: Option<ast::Expr>,
) -> (Body, BodySourceMap) {
let item_tree = db.item_tree(file_id);
let item_tree = db.item_tree(expander.current_file_id);
ExprCollector {
db,
def,
expander,
source_map: BodySourceMap::default(),
body: Body {
exprs: Arena::default(),
@ -76,7 +74,8 @@ pub(super) fn lower(
body_expr: dummy_expr_id(),
item_scope: Default::default(),
},
item_trees: vec![(file_id, item_tree)],
item_trees: vec![(expander.current_file_id, item_tree)],
expander,
}
.collect(params, body)
}