aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src/body.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir_def/src/body.rs')
-rw-r--r--crates/ra_hir_def/src/body.rs16
1 files changed, 6 insertions, 10 deletions
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index 7e84e9113..5d8c299ba 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -16,20 +16,16 @@ use crate::{
16 ModuleId, 16 ModuleId,
17}; 17};
18 18
19pub struct MacroResolver { 19pub struct Expander {
20 crate_def_map: Arc<CrateDefMap>, 20 crate_def_map: Arc<CrateDefMap>,
21 current_file_id: HirFileId, 21 current_file_id: HirFileId,
22 module: ModuleId, 22 module: ModuleId,
23} 23}
24 24
25impl MacroResolver { 25impl Expander {
26 pub fn new( 26 pub fn new(db: &impl DefDatabase2, current_file_id: HirFileId, module: ModuleId) -> Expander {
27 db: &impl DefDatabase2,
28 current_file_id: HirFileId,
29 module: ModuleId,
30 ) -> MacroResolver {
31 let crate_def_map = db.crate_def_map(module.krate); 27 let crate_def_map = db.crate_def_map(module.krate);
32 MacroResolver { crate_def_map, current_file_id, module } 28 Expander { crate_def_map, current_file_id, module }
33 } 29 }
34 30
35 fn resolve_path_as_macro(&self, db: &impl DefDatabase2, path: &Path) -> Option<MacroDefId> { 31 fn resolve_path_as_macro(&self, db: &impl DefDatabase2, path: &Path) -> Option<MacroDefId> {
@@ -82,11 +78,11 @@ pub struct BodySourceMap {
82impl Body { 78impl Body {
83 pub fn new( 79 pub fn new(
84 db: &impl DefDatabase2, 80 db: &impl DefDatabase2,
85 resolver: MacroResolver, 81 expander: Expander,
86 params: Option<ast::ParamList>, 82 params: Option<ast::ParamList>,
87 body: Option<ast::Expr>, 83 body: Option<ast::Expr>,
88 ) -> (Body, BodySourceMap) { 84 ) -> (Body, BodySourceMap) {
89 lower::lower(db, resolver, params, body) 85 lower::lower(db, expander, params, body)
90 } 86 }
91 87
92 pub fn params(&self) -> &[PatId] { 88 pub fn params(&self) -> &[PatId] {