diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 20:43:09 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 20:43:09 +0000 |
| commit | 3c7acecade09e1234ac7b1d1ed2f22edbc543f64 (patch) | |
| tree | 462edbf67d8647a21c16720d621a164293651c79 /crates/ra_db/src/lib.rs | |
| parent | d0ddc5a7c1e3f3df09f4e3637cc80459d8273310 (diff) | |
| parent | c2474fcd386a267cf49f6d9d47ca6ff4585ca330 (diff) | |
Merge #656
656: :arrow_up deps r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_db/src/lib.rs')
| -rw-r--r-- | crates/ra_db/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
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 { | |||
| 63 | pub range: TextRange, | 63 | pub range: TextRange, |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | #[salsa::query_group] | 66 | #[salsa::query_group(FilesDatabaseStorage)] |
| 67 | pub trait FilesDatabase: salsa::Database { | 67 | pub trait FilesDatabase: salsa::Database { |
| 68 | /// Text of the file. | 68 | /// Text of the file. |
| 69 | #[salsa::input] | 69 | #[salsa::input] |
| @@ -102,7 +102,7 @@ fn source_root_crates(db: &impl FilesDatabase, id: SourceRootId) -> Arc<Vec<Crat | |||
| 102 | Arc::new(res) | 102 | Arc::new(res) |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | #[salsa::query_group] | 105 | #[salsa::query_group(SyntaxDatabaseStorage)] |
| 106 | pub trait SyntaxDatabase: FilesDatabase + BaseDatabase { | 106 | pub trait SyntaxDatabase: FilesDatabase + BaseDatabase { |
| 107 | fn source_file(&self, file_id: FileId) -> TreeArc<SourceFile>; | 107 | fn source_file(&self, file_id: FileId) -> TreeArc<SourceFile>; |
| 108 | } | 108 | } |