From a2ca03d10b093ea20d7db8bfd78aa1e787482cc0 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 17 Jan 2019 14:11:00 +0300
Subject: :arrow_up: salsa

---
 crates/ra_ide_api/src/db.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'crates/ra_ide_api/src/db.rs')

diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index 60f84675d..36778b955 100644
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -1,7 +1,9 @@
 use std::{fmt, sync::Arc};
 
-use salsa::{self, Database};
-use ra_db::{LocationIntener, BaseDatabase, FileId, Canceled};
+use ra_db::{
+    LocationIntener, BaseDatabase, FileId, Canceled,
+    salsa::{self, Database},
+};
 
 use crate::{symbol_index, LineIndex};
 
@@ -73,12 +75,9 @@ impl AsRef<LocationIntener<hir::MacroCallLoc, hir::MacroCallId>> for RootDatabas
     }
 }
 
-salsa::query_group! {
-    pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + BaseDatabase {
-        fn line_index(file_id: FileId) -> Arc<LineIndex> {
-            type LineIndexQuery;
-        }
-    }
+#[salsa::query_group]
+pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + BaseDatabase {
+    fn line_index(&self, file_id: FileId) -> Arc<LineIndex>;
 }
 
 fn line_index(db: &impl ra_db::FilesDatabase, file_id: FileId) -> Arc<LineIndex> {
@@ -109,10 +108,10 @@ salsa::database_storage! {
         }
         impl hir::db::HirDatabase {
             fn hir_source_file() for hir::db::HirSourceFileQuery;
-            fn expand_macro_invocation() for hir::db::ExpandMacroCallQuery;
+            fn expand_macro_invocation() for hir::db::ExpandMacroInvocationQuery;
             fn module_tree() for hir::db::ModuleTreeQuery;
             fn fn_scopes() for hir::db::FnScopesQuery;
-            fn file_items() for hir::db::SourceFileItemsQuery;
+            fn file_items() for hir::db::FileItemsQuery;
             fn file_item() for hir::db::FileItemQuery;
             fn input_module_items() for hir::db::InputModuleItemsQuery;
             fn item_map() for hir::db::ItemMapQuery;
-- 
cgit v1.2.3