bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir_def/src/lib.rs')
-rw-r--r--crates/hir_def/src/lib.rs10
1 files changed, 4 insertions, 6 deletions
diff --git a/crates/hir_def/src/lib.rs b/crates/hir_def/src/lib.rs
index 481a69c5b1..c2e2de309e 100644
--- a/crates/hir_def/src/lib.rs
+++ b/crates/hir_def/src/lib.rs
@@ -538,7 +538,7 @@ pub enum AttrDefId {
ConstId(ConstId),
TraitId(TraitId),
TypeAliasId(TypeAliasId),
- MacroDefId(MacroDefId),
+ MacroId(MacroId),
ImplId(ImplId),
GenericParamId(GenericParamId),
ExternBlockId(ExternBlockId),
@@ -554,7 +554,7 @@ impl_from!(
FunctionId,
TraitId,
TypeAliasId,
- MacroDefId,
+ MacroId,
ImplId,
GenericParamId
for AttrDefId
@@ -757,9 +757,7 @@ impl AttrDefId {
.module(db)
.krate
}
- // FIXME: `MacroDefId` should store the defining module, then this can implement
- // `HasModule`
- AttrDefId::MacroDefId(it) => it.krate,
+ AttrDefId::MacroId(it) => it.module(db).krate,
}
}
}
@@ -856,7 +854,7 @@ fn macro_call_as_call_id(
Ok(res)
}
-fn macro_id_to_def_id(db: &dyn db::DefDatabase, id: MacroId) -> MacroDefId {
+pub fn macro_id_to_def_id(db: &dyn db::DefDatabase, id: MacroId) -> MacroDefId {
match id {
MacroId::Macro2Id(it) => {
let loc = it.lookup(db);