Store all the data in the Salsa Database

1 files changed, 0 insertions, 136 deletions

diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs
deleted file mode 100644
index b527cde61..000000000
--- a/crates/ra_analysis/src/db.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use std::{
-    fmt,
-    hash::{Hash, Hasher},
-    sync::Arc,
-};
-
-use ra_editor::LineIndex;
-use ra_syntax::File;
-use rustc_hash::FxHashSet;
-use salsa;
-
-use crate::{
-    db,
-    Cancelable, Canceled,
-    descriptors::module::{SubmodulesQuery, ModuleTreeQuery, ModulesDatabase},
-    symbol_index::SymbolIndex,
-    FileId, FileResolverImp,
-};
-
-#[derive(Default)]
-pub(crate) struct RootDatabase {
-    runtime: salsa::Runtime<RootDatabase>,
-}
-
-impl fmt::Debug for RootDatabase {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str("RootDatabase { ... }")
-    }
-}
-
-impl salsa::Database for RootDatabase {
-    fn salsa_runtime(&self) -> &salsa::Runtime<RootDatabase> {
-        &self.runtime
-    }
-}
-
-pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> {
-    if db.salsa_runtime().is_current_revision_canceled() {
-        Err(Canceled)
-    } else {
-        Ok(())
-    }
-}
-
-impl salsa::ParallelDatabase for RootDatabase {
-    fn fork(&self) -> Self {
-        RootDatabase {
-            runtime: self.runtime.fork(),
-        }
-    }
-}
-
-impl Clone for RootDatabase {
-    fn clone(&self) -> RootDatabase {
-        salsa::ParallelDatabase::fork(self)
-    }
-}
-
-salsa::database_storage! {
-    pub(crate) struct RootDatabaseStorage for RootDatabase {
-        impl FilesDatabase {
-            fn file_text() for FileTextQuery;
-            fn file_set() for FileSetQuery;
-        }
-        impl SyntaxDatabase {
-            fn file_syntax() for FileSyntaxQuery;
-            fn file_lines() for FileLinesQuery;
-            fn file_symbols() for FileSymbolsQuery;
-        }
-        impl ModulesDatabase {
-            fn module_tree() for ModuleTreeQuery;
-            fn module_descriptor() for SubmodulesQuery;
-        }
-    }
-}
-
-salsa::query_group! {
-    pub(crate) trait FilesDatabase: salsa::Database {
-        fn file_text(file_id: FileId) -> Arc<String> {
-            type FileTextQuery;
-            storage input;
-        }
-        fn file_set() -> Arc<FileSet> {
-            type FileSetQuery;
-            storage input;
-        }
-    }
-}
-
-#[derive(Default, Debug, Eq)]
-pub(crate) struct FileSet {
-    pub(crate) files: FxHashSet<FileId>,
-    pub(crate) resolver: FileResolverImp,
-}
-
-impl PartialEq for FileSet {
-    fn eq(&self, other: &FileSet) -> bool {
-        self.files == other.files && self.resolver == other.resolver
-    }
-}
-
-impl Hash for FileSet {
-    fn hash<H: Hasher>(&self, hasher: &mut H) {
-        let mut files = self.files.iter().cloned().collect::<Vec<_>>();
-        files.sort();
-        files.hash(hasher);
-    }
-}
-
-salsa::query_group! {
-    pub(crate) trait SyntaxDatabase: FilesDatabase {
-        fn file_syntax(file_id: FileId) -> File {
-            type FileSyntaxQuery;
-        }
-        fn file_lines(file_id: FileId) -> Arc<LineIndex> {
-            type FileLinesQuery;
-        }
-        fn file_symbols(file_id: FileId) -> Cancelable<Arc<SymbolIndex>> {
-            type FileSymbolsQuery;
-        }
-    }
-}
-
-fn file_syntax(db: &impl SyntaxDatabase, file_id: FileId) -> File {
-    let text = db.file_text(file_id);
-    File::parse(&*text)
-}
-fn file_lines(db: &impl SyntaxDatabase, file_id: FileId) -> Arc<LineIndex> {
-    let text = db.file_text(file_id);
-    Arc::new(LineIndex::new(&*text))
-}
-fn file_symbols(db: &impl SyntaxDatabase, file_id: FileId) -> Cancelable<Arc<SymbolIndex>> {
-    db::check_canceled(db)?;
-    let syntax = db.file_syntax(file_id);
-    Ok(Arc::new(SymbolIndex::for_file(file_id, syntax)))
-}