language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use ItemOrMacro in item resolution

Browse source
This commit is contained in:
Edwin Cheng 2019-05-26 20:10:56 +08:00
parent c0dc14ba5a
commit b72074a715
4 changed files with 214 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_hir/src/code_model.rs
View file

@ -13,7 +13,7 @@ use crate::{
adt::{EnumVariantId, StructFieldId, VariantDef},
generics::HasGenericParams,
docs::{Documentation, Docs, docs_from_ast},
ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeAliasId},
ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeAliasId, MacroDefId},
impl_block::ImplBlock,
resolve::Resolver,
diagnostics::{DiagnosticSink},
@ -937,6 +937,11 @@ impl Docs for TypeAlias {
docs_from_ast(&*self.source(db).1)
}
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct MacroDef {
pub(crate) id: MacroDefId,
}
pub enum Container {
Trait(Trait),