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.rs75
1 files changed, 2 insertions, 73 deletions
diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index 9a7d406dfd..37f96df269 100644
--- a/crates/hir-def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs
@@ -92,7 +92,7 @@ use crate::{
data::adt::VariantData,
db::DefDatabase,
item_tree::{
- Const, Enum, ExternCrate, Function, Impl, ItemTreeId, ItemTreeNode, MacroDef, MacroRules,
+ Const, Enum, ExternCrate, Function, Impl, ItemTreeId, ItemTreeNode, Macro2, MacroRules,
Static, Struct, Trait, TraitAlias, TypeAlias, Union, Use,
},
};
@@ -366,7 +366,7 @@ pub struct Macro2Id(salsa::InternId);
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct Macro2Loc {
pub container: ModuleId,
- pub id: ItemTreeId<MacroDef>,
+ pub id: ItemTreeId<Macro2>,
pub expander: MacroExpander,
pub allow_internal_unsafe: bool,
}
@@ -1223,77 +1223,6 @@ fn macro_call_as_call_id_with_eager(
Ok(res)
}
-pub fn macro_id_to_def_id(db: &dyn DefDatabase, id: MacroId) -> MacroDefId {
- match id {
- MacroId::Macro2Id(it) => {
- let loc = it.lookup(db);
-
- let item_tree = loc.id.item_tree(db);
- let makro = &item_tree[loc.id.value];
- let in_file = |m: FileAstId<ast::MacroDef>| InFile::new(loc.id.file_id(), m.upcast());
- MacroDefId {
- krate: loc.container.krate,
- kind: match loc.expander {
- MacroExpander::Declarative => MacroDefKind::Declarative(in_file(makro.ast_id)),
- MacroExpander::BuiltIn(it) => MacroDefKind::BuiltIn(it, in_file(makro.ast_id)),
- MacroExpander::BuiltInAttr(it) => {
- MacroDefKind::BuiltInAttr(it, in_file(makro.ast_id))
- }
- MacroExpander::BuiltInDerive(it) => {
- MacroDefKind::BuiltInDerive(it, in_file(makro.ast_id))
- }
- MacroExpander::BuiltInEager(it) => {
- MacroDefKind::BuiltInEager(it, in_file(makro.ast_id))
- }
- },
- local_inner: false,
- allow_internal_unsafe: loc.allow_internal_unsafe,
- }
- }
- MacroId::MacroRulesId(it) => {
- let loc = it.lookup(db);
-
- let item_tree = loc.id.item_tree(db);
- let makro = &item_tree[loc.id.value];
- let in_file = |m: FileAstId<ast::MacroRules>| InFile::new(loc.id.file_id(), m.upcast());
- MacroDefId {
- krate: loc.container.krate,
- kind: match loc.expander {
- MacroExpander::Declarative => MacroDefKind::Declarative(in_file(makro.ast_id)),
- MacroExpander::BuiltIn(it) => MacroDefKind::BuiltIn(it, in_file(makro.ast_id)),
- MacroExpander::BuiltInAttr(it) => {
- MacroDefKind::BuiltInAttr(it, in_file(makro.ast_id))
- }
- MacroExpander::BuiltInDerive(it) => {
- MacroDefKind::BuiltInDerive(it, in_file(makro.ast_id))
- }
- MacroExpander::BuiltInEager(it) => {
- MacroDefKind::BuiltInEager(it, in_file(makro.ast_id))
- }
- },
- local_inner: loc.local_inner,
- allow_internal_unsafe: loc.allow_internal_unsafe,
- }
- }
- MacroId::ProcMacroId(it) => {
- let loc = it.lookup(db);
-
- let item_tree = loc.id.item_tree(db);
- let makro = &item_tree[loc.id.value];
- MacroDefId {
- krate: loc.container.krate,
- kind: MacroDefKind::ProcMacro(
- loc.expander,
- loc.kind,
- InFile::new(loc.id.file_id(), makro.ast_id),
- ),
- local_inner: false,
- allow_internal_unsafe: false,
- }
- }
- }
-}
-
fn derive_macro_as_call_id(
db: &dyn DefDatabase,
item_attr: &AstIdWithPath<ast::Adt>,