language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

move query definitions

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-27 23:33:36 +03:00
parent 90bc832b22
commit b7049ea543
10 changed files with 229 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/ra_analysis/src/db.rs
View file

@ -10,7 +10,7 @@ use crate::{
hir,
symbol_index::SymbolIndex,
syntax_ptr::SyntaxPtr,
loc2id::{IdMaps, IdDatabase},
loc2id::{IdMaps},
Cancelable, Canceled, FileId,
};
@ -77,7 +77,14 @@ impl salsa::ParallelDatabase for RootDatabase {
}
}
impl IdDatabase for RootDatabase {
pub(crate) trait BaseDatabase: salsa::Database {
fn id_maps(&self) -> &IdMaps;
fn check_canceled(&self) -> Cancelable<()> {
check_canceled(self)
}
}
impl BaseDatabase for RootDatabase {
fn id_maps(&self) -> &IdMaps {
&self.id_maps
}
@ -136,7 +143,7 @@ salsa::database_storage! {
}
salsa::query_group! {
pub(crate) trait SyntaxDatabase: crate::input::FilesDatabase {
pub(crate) trait SyntaxDatabase: crate::input::FilesDatabase + BaseDatabase {
fn file_syntax(file_id: FileId) -> SourceFileNode {
type FileSyntaxQuery;
}