diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-01 14:31:23 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-01 14:31:23 +0000 |
commit | 2b5c226e86892113bcab478cdf4c9adaf1e7b2f6 (patch) | |
tree | 3904cb714292f3e1abe5081e4e516eea1b2568fa /crates/ra_hir/src/macros.rs | |
parent | 21c593593163c22b996f7c8bffe05b9708f5b2d0 (diff) | |
parent | 4dffdcf14abe0c79f9d7a9702be77958be1f75b1 (diff) |
Merge #718
718: split HirDatabase r=matklad a=csmoe
Closes #706
Co-authored-by: csmoe <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/macros.rs')
-rw-r--r-- | crates/ra_hir/src/macros.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/macros.rs b/crates/ra_hir/src/macros.rs index cf7220875..cb8a9312e 100644 --- a/crates/ra_hir/src/macros.rs +++ b/crates/ra_hir/src/macros.rs | |||
@@ -14,7 +14,7 @@ use ra_syntax::{ | |||
14 | ast::{self, NameOwner}, | 14 | ast::{self, NameOwner}, |
15 | }; | 15 | }; |
16 | 16 | ||
17 | use crate::{HirDatabase, MacroCallId}; | 17 | use crate::{MacroCallId, PersistentHirDatabase}; |
18 | 18 | ||
19 | // Hard-coded defs for now :-( | 19 | // Hard-coded defs for now :-( |
20 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 20 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
@@ -157,7 +157,7 @@ impl MacroExpansion { | |||
157 | } | 157 | } |
158 | 158 | ||
159 | pub(crate) fn expand_macro_invocation( | 159 | pub(crate) fn expand_macro_invocation( |
160 | db: &impl HirDatabase, | 160 | db: &impl PersistentHirDatabase, |
161 | invoc: MacroCallId, | 161 | invoc: MacroCallId, |
162 | ) -> Option<Arc<MacroExpansion>> { | 162 | ) -> Option<Arc<MacroExpansion>> { |
163 | let loc = invoc.loc(db); | 163 | let loc = invoc.loc(db); |