From 8cf092d5de113fc218b84421a2db4449a370ccb6 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 25 Jan 2019 15:16:50 +0300 Subject: :arrow_up salsa --- crates/ra_db/Cargo.toml | 2 +- crates/ra_db/src/input.rs | 42 ----------------------------- crates/ra_db/src/lib.rs | 68 +++++++++++++++++++++++++++++++++++++---------- 3 files changed, 55 insertions(+), 57 deletions(-) (limited to 'crates/ra_db') diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index bb1b5eae7..3568da905 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Aleksey Kladov "] [dependencies] relative-path = "0.4.0" -salsa = "0.10.0-alpha1" +salsa = "0.10.0-alpha3" rustc-hash = "1.0" parking_lot = "0.7.0" ra_arena = { path = "../ra_arena" } diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs index 9825d52cf..275894252 100644 --- a/crates/ra_db/src/input.rs +++ b/crates/ra_db/src/input.rs @@ -5,11 +5,8 @@ /// Note that neither this module, nor any other part of the analyzer's core do /// actual IO. See `vfs` and `project_model` in the `ra_lsp_server` crate for how /// actual IO is done and lowered to input. -use std::sync::Arc; - use relative_path::RelativePathBuf; use rustc_hash::FxHashMap; -use salsa; use ra_syntax::SmolStr; use rustc_hash::FxHashSet; @@ -146,45 +143,6 @@ impl CrateGraph { } } -#[salsa::query_group] -pub trait FilesDatabase: salsa::Database { - /// Text of the file. - #[salsa::input] - fn file_text(&self, file_id: FileId) -> Arc; - /// Path to a file, relative to the root of its source root. - #[salsa::input] - fn file_relative_path(&self, file_id: FileId) -> RelativePathBuf; - /// Source root of the file. - #[salsa::input] - fn file_source_root(&self, file_id: FileId) -> SourceRootId; - /// Contents of the source root. - #[salsa::input] - fn source_root(&self, id: SourceRootId) -> Arc; - fn source_root_crates(&self, id: SourceRootId) -> Arc>; - /// The set of "local" (that is, from the current workspace) roots. - /// Files in local roots are assumed to change frequently. - #[salsa::input] - fn local_roots(&self) -> Arc>; - /// The set of roots for crates.io libraries. - /// Files in libraries are assumed to never change. - #[salsa::input] - fn library_roots(&self) -> Arc>; - /// The crate graph. - #[salsa::input] - fn crate_graph(&self) -> Arc; -} - -fn source_root_crates(db: &impl FilesDatabase, id: SourceRootId) -> Arc> { - let root = db.source_root(id); - let graph = db.crate_graph(); - let res = root - .files - .values() - .filter_map(|&it| graph.crate_id_for_crate_root(it)) - .collect::>(); - Arc::new(res) -} - #[cfg(test)] mod tests { use super::{CrateGraph, FileId, SmolStr}; diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs index 84759c75a..7e13f70bc 100644 --- a/crates/ra_db/src/lib.rs +++ b/crates/ra_db/src/lib.rs @@ -4,17 +4,18 @@ mod input; mod loc2id; pub mod mock; -use std::panic; +use std::{ + panic, sync::Arc, +}; use ra_syntax::{TextUnit, TextRange, SourceFile, TreeArc}; +use relative_path::RelativePathBuf; pub use ::salsa as salsa; pub use crate::{ cancellation::Canceled, input::{ - FilesDatabase, FileId, CrateId, SourceRoot, SourceRootId, CrateGraph, Dependency, - FileTextQuery, FileSourceRootQuery, SourceRootQuery, SourceRootCratesQuery, LocalRootsQuery, LibraryRootsQuery, CrateGraphQuery, - FileRelativePathQuery + FileId, CrateId, SourceRoot, SourceRootId, CrateGraph, Dependency, }, loc2id::LocationIntener, }; @@ -50,16 +51,6 @@ pub trait BaseDatabase: salsa::Database + panic::RefUnwindSafe { } } -#[salsa::query_group] -pub trait SyntaxDatabase: crate::input::FilesDatabase + BaseDatabase { - fn source_file(&self, file_id: FileId) -> TreeArc; -} - -fn source_file(db: &impl SyntaxDatabase, file_id: FileId) -> TreeArc { - let text = db.file_text(file_id); - SourceFile::parse(&*text) -} - #[derive(Clone, Copy, Debug)] pub struct FilePosition { pub file_id: FileId, @@ -71,3 +62,52 @@ pub struct FileRange { pub file_id: FileId, pub range: TextRange, } + +#[salsa::query_group] +pub trait FilesDatabase: salsa::Database { + /// Text of the file. + #[salsa::input] + fn file_text(&self, file_id: FileId) -> Arc; + /// Path to a file, relative to the root of its source root. + #[salsa::input] + fn file_relative_path(&self, file_id: FileId) -> RelativePathBuf; + /// Source root of the file. + #[salsa::input] + fn file_source_root(&self, file_id: FileId) -> SourceRootId; + /// Contents of the source root. + #[salsa::input] + fn source_root(&self, id: SourceRootId) -> Arc; + fn source_root_crates(&self, id: SourceRootId) -> Arc>; + /// The set of "local" (that is, from the current workspace) roots. + /// Files in local roots are assumed to change frequently. + #[salsa::input] + fn local_roots(&self) -> Arc>; + /// The set of roots for crates.io libraries. + /// Files in libraries are assumed to never change. + #[salsa::input] + fn library_roots(&self) -> Arc>; + /// The crate graph. + #[salsa::input] + fn crate_graph(&self) -> Arc; +} + +fn source_root_crates(db: &impl FilesDatabase, id: SourceRootId) -> Arc> { + let root = db.source_root(id); + let graph = db.crate_graph(); + let res = root + .files + .values() + .filter_map(|&it| graph.crate_id_for_crate_root(it)) + .collect::>(); + Arc::new(res) +} + +#[salsa::query_group] +pub trait SyntaxDatabase: FilesDatabase + BaseDatabase { + fn source_file(&self, file_id: FileId) -> TreeArc; +} + +fn source_file(db: &impl SyntaxDatabase, file_id: FileId) -> TreeArc { + let text = db.file_text(file_id); + SourceFile::parse(&*text) +} -- cgit v1.2.3