Merge #656

656: :arrow_up deps r=matklad a=matklad



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

2 files changed, 4 insertions, 3 deletions

diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 3568da905..9aa77f72e 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -6,9 +6,10 @@ authors = ["Aleksey Kladov <[email protected]>"]
 
 [dependencies]
 relative-path = "0.4.0"
-salsa = "0.10.0-alpha3"
+salsa = "0.10.0-alpha4"
 rustc-hash = "1.0"
 parking_lot = "0.7.0"
+
 ra_arena = { path = "../ra_arena" }
 ra_syntax = { path = "../ra_syntax" }
 test_utils = { path = "../test_utils" }
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 7e13f70bc..3a0aa7d24 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -63,7 +63,7 @@ pub struct FileRange {
     pub range: TextRange,
 }
 
-#[salsa::query_group]
+#[salsa::query_group(FilesDatabaseStorage)]
 pub trait FilesDatabase: salsa::Database {
     /// Text of the file.
     #[salsa::input]
@@ -102,7 +102,7 @@ fn source_root_crates(db: &impl FilesDatabase, id: SourceRootId) -> Arc<Vec<Crat
     Arc::new(res)
 }
 
-#[salsa::query_group]
+#[salsa::query_group(SyntaxDatabaseStorage)]
 pub trait SyntaxDatabase: FilesDatabase + BaseDatabase {
     fn source_file(&self, file_id: FileId) -> TreeArc<SourceFile>;
 }