diff options
author | Aleksey Kladov <[email protected]> | 2019-01-01 15:12:31 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-01 19:15:35 +0000 |
commit | 882a86240f42068038586431e7e5de5de247720c (patch) | |
tree | eb7fc927ce33ba3ee60add688e42b49f664db8e2 /crates/ra_hir/src/db.rs | |
parent | b2fec18098b6a99613012d185801fed72e424997 (diff) |
rename
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 242d0549d..95d8da200 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -8,7 +8,7 @@ use crate::{ | |||
8 | SourceFileItems, SourceItemId, | 8 | SourceFileItems, SourceItemId, |
9 | query_definitions, | 9 | query_definitions, |
10 | FnScopes, | 10 | FnScopes, |
11 | macros::{MacroInvocationLoc, MacroInvocationId, MacroInput, MacroDef, MacroExpansion}, | 11 | macros::{MacroCallLoc, MacroCallId, MacroInput, MacroDef, MacroExpansion}, |
12 | module::{ModuleId, ModuleTree, ModuleSource, | 12 | module::{ModuleId, ModuleTree, ModuleSource, |
13 | nameres::{ItemMap, InputModuleItems}}, | 13 | nameres::{ItemMap, InputModuleItems}}, |
14 | ty::{InferenceResult, Ty}, | 14 | ty::{InferenceResult, Ty}, |
@@ -19,10 +19,10 @@ salsa::query_group! { | |||
19 | 19 | ||
20 | pub trait HirDatabase: SyntaxDatabase | 20 | pub trait HirDatabase: SyntaxDatabase |
21 | + AsRef<LocationIntener<DefLoc, DefId>> | 21 | + AsRef<LocationIntener<DefLoc, DefId>> |
22 | + AsRef<LocationIntener<MacroInvocationLoc, MacroInvocationId>> | 22 | + AsRef<LocationIntener<MacroCallLoc, MacroCallId>> |
23 | { | 23 | { |
24 | fn expand_macro_invocation(invoc: MacroInvocationId) -> Option<Arc<MacroExpansion>> { | 24 | fn expand_macro_invocation(invoc: MacroCallId) -> Option<Arc<MacroExpansion>> { |
25 | type ExpandMacroInvocationQuery; | 25 | type ExpandMacroCallQuery; |
26 | use fn crate::macros::expand_macro_invocation; | 26 | use fn crate::macros::expand_macro_invocation; |
27 | } | 27 | } |
28 | 28 | ||