diff options
author | Edwin Cheng <[email protected]> | 2019-05-26 13:10:56 +0100 |
---|---|---|
committer | Edwin Cheng <[email protected]> | 2019-05-26 13:10:56 +0100 |
commit | b72074a715cc08b5520c52438c8bb987ddf9038d (patch) | |
tree | ac1e51b23bbe2c1f4fd6ebddba394531758563ae /crates/ra_hir/src/code_model.rs | |
parent | c0dc14ba5a0ad9f92d1c9795e252eeed45a912e2 (diff) |
Use ItemOrMacro in item resolution
Diffstat (limited to 'crates/ra_hir/src/code_model.rs')
-rw-r--r-- | crates/ra_hir/src/code_model.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 49030ce67..4735256b4 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
@@ -13,7 +13,7 @@ use crate::{ | |||
13 | adt::{EnumVariantId, StructFieldId, VariantDef}, | 13 | adt::{EnumVariantId, StructFieldId, VariantDef}, |
14 | generics::HasGenericParams, | 14 | generics::HasGenericParams, |
15 | docs::{Documentation, Docs, docs_from_ast}, | 15 | docs::{Documentation, Docs, docs_from_ast}, |
16 | ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeAliasId}, | 16 | ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeAliasId, MacroDefId}, |
17 | impl_block::ImplBlock, | 17 | impl_block::ImplBlock, |
18 | resolve::Resolver, | 18 | resolve::Resolver, |
19 | diagnostics::{DiagnosticSink}, | 19 | diagnostics::{DiagnosticSink}, |
@@ -937,6 +937,11 @@ impl Docs for TypeAlias { | |||
937 | docs_from_ast(&*self.source(db).1) | 937 | docs_from_ast(&*self.source(db).1) |
938 | } | 938 | } |
939 | } | 939 | } |
940 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | ||
941 | pub struct MacroDef { | ||
942 | pub(crate) id: MacroDefId, | ||
943 | } | ||
944 | |||
940 | 945 | ||
941 | pub enum Container { | 946 | pub enum Container { |
942 | Trait(Trait), | 947 | Trait(Trait), |