Merge #664

664: rename FilesDatabase -> SourceDatabase r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

4 files changed, 7 insertions, 13 deletions

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index dfbf41bd6..9b5b79d38 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use ra_syntax::{SyntaxNode, TreeArc, SourceFile};
-use ra_db::{SyntaxDatabase, CrateId, salsa};
+use ra_db::{SourceDatabase, CrateId, salsa};
 
 use crate::{
     MacroCallId, HirFileId,
@@ -19,7 +19,7 @@ use crate::{
 };
 
 #[salsa::query_group(HirDatabaseStorage)]
-pub trait HirDatabase: SyntaxDatabase + AsRef<HirInterner> {
+pub trait HirDatabase: SourceDatabase + AsRef<HirInterner> {
     #[salsa::invoke(HirFileId::hir_source_file)]
     fn hir_source_file(&self, file_id: HirFileId) -> TreeArc<SourceFile>;
 
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index 2dc252b1e..7da15eca0 100644
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -2,7 +2,7 @@ use std::{sync::Arc, panic};
 
 use parking_lot::Mutex;
 use ra_db::{
-    BaseDatabase, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, FilesDatabase, salsa,
+    CheckCanceled, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, SourceDatabase, salsa,
 };
 use relative_path::RelativePathBuf;
 use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset};
@@ -11,11 +11,7 @@ use crate::{db, HirInterner};
 
 pub const WORKSPACE: SourceRootId = SourceRootId(0);
 
-#[salsa::database(
-    ra_db::FilesDatabaseStorage,
-    ra_db::SyntaxDatabaseStorage,
-    db::HirDatabaseStorage
-)]
+#[salsa::database(ra_db::SourceDatabaseStorage, db::HirDatabaseStorage)]
 #[derive(Debug)]
 pub(crate) struct MockDatabase {
     events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>,
@@ -144,8 +140,6 @@ impl Default for MockDatabase {
             file_counter: 0,
         };
         db.set_crate_graph(Default::default());
-        db.set_local_roots(Default::default());
-        db.set_library_roots(Default::default());
         db
     }
 }
@@ -161,7 +155,7 @@ impl salsa::ParallelDatabase for MockDatabase {
     }
 }
 
-impl BaseDatabase for MockDatabase {}
+impl CheckCanceled for MockDatabase {}
 
 impl AsRef<HirInterner> for MockDatabase {
     fn as_ref(&self) -> &HirInterner {
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 24936976c..e72781f51 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use ra_db::{CrateGraph, SourceRootId, FilesDatabase};
+use ra_db::{CrateGraph, SourceRootId, SourceDatabase};
 use relative_path::RelativePath;
 use test_utils::{assert_eq_text, covers};
 
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index 389bdaf23..0eb4da06e 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 use std::fmt::Write;
 
-use ra_db::{SyntaxDatabase, salsa::Database};
+use ra_db::{SourceDatabase, salsa::Database};
 use ra_syntax::ast::{self, AstNode};
 
 use crate::{