diff options
Diffstat (limited to 'crates/ra_analysis/src')
-rw-r--r-- | crates/ra_analysis/src/db.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs index 2a71cc2b6..86c15f4ee 100644 --- a/crates/ra_analysis/src/db.rs +++ b/crates/ra_analysis/src/db.rs | |||
@@ -15,7 +15,7 @@ pub(crate) struct RootDatabase { | |||
15 | #[derive(Default)] | 15 | #[derive(Default)] |
16 | struct IdMaps { | 16 | struct IdMaps { |
17 | defs: LocationIntener<hir::DefLoc, hir::DefId>, | 17 | defs: LocationIntener<hir::DefLoc, hir::DefId>, |
18 | macros: LocationIntener<hir::MacroInvocationLoc, hir::MacroInvocationId>, | 18 | macros: LocationIntener<hir::MacroCallLoc, hir::MacroCallId>, |
19 | } | 19 | } |
20 | 20 | ||
21 | impl fmt::Debug for IdMaps { | 21 | impl fmt::Debug for IdMaps { |
@@ -65,8 +65,8 @@ impl AsRef<LocationIntener<hir::DefLoc, hir::DefId>> for RootDatabase { | |||
65 | } | 65 | } |
66 | } | 66 | } |
67 | 67 | ||
68 | impl AsRef<LocationIntener<hir::MacroInvocationLoc, hir::MacroInvocationId>> for RootDatabase { | 68 | impl AsRef<LocationIntener<hir::MacroCallLoc, hir::MacroCallId>> for RootDatabase { |
69 | fn as_ref(&self) -> &LocationIntener<hir::MacroInvocationLoc, hir::MacroInvocationId> { | 69 | fn as_ref(&self) -> &LocationIntener<hir::MacroCallLoc, hir::MacroCallId> { |
70 | &self.id_maps.macros | 70 | &self.id_maps.macros |
71 | } | 71 | } |
72 | } | 72 | } |
@@ -91,7 +91,7 @@ salsa::database_storage! { | |||
91 | fn library_symbols() for symbol_index::LibrarySymbolsQuery; | 91 | fn library_symbols() for symbol_index::LibrarySymbolsQuery; |
92 | } | 92 | } |
93 | impl hir::db::HirDatabase { | 93 | impl hir::db::HirDatabase { |
94 | fn expand_macro_invocation() for hir::db::ExpandMacroInvocationQuery; | 94 | fn expand_macro_invocation() for hir::db::ExpandMacroCallQuery; |
95 | fn module_tree() for hir::db::ModuleTreeQuery; | 95 | fn module_tree() for hir::db::ModuleTreeQuery; |
96 | fn fn_scopes() for hir::db::FnScopesQuery; | 96 | fn fn_scopes() for hir::db::FnScopesQuery; |
97 | fn file_items() for hir::db::SourceFileItemsQuery; | 97 | fn file_items() for hir::db::SourceFileItemsQuery; |