Merge remote-tracking branch 'origin/master'

1 files changed, 0 insertions, 49 deletions

diff --git a/crates/ra_hir_expand/src/test_db.rs b/crates/ra_hir_expand/src/test_db.rs
deleted file mode 100644
index 332fa556f..000000000
--- a/crates/ra_hir_expand/src/test_db.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-//! Database used for testing `hir_expand`.
-
-use std::{
-    fmt, panic,
-    sync::{Arc, Mutex},
-};
-
-use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate};
-use rustc_hash::FxHashSet;
-
-#[salsa::database(
-    ra_db::SourceDatabaseExtStorage,
-    ra_db::SourceDatabaseStorage,
-    crate::db::AstDatabaseStorage
-)]
-#[derive(Default)]
-pub struct TestDB {
-    storage: salsa::Storage<TestDB>,
-    events: Mutex<Option<Vec<salsa::Event>>>,
-}
-
-impl fmt::Debug for TestDB {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TestDB").finish()
-    }
-}
-
-impl salsa::Database for TestDB {
-    fn salsa_event(&self, event: salsa::Event) {
-        let mut events = self.events.lock().unwrap();
-        if let Some(events) = &mut *events {
-            events.push(event);
-        }
-    }
-}
-
-impl panic::RefUnwindSafe for TestDB {}
-
-impl FileLoader for TestDB {
-    fn file_text(&self, file_id: FileId) -> Arc<String> {
-        FileLoaderDelegate(self).file_text(file_id)
-    }
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
-        FileLoaderDelegate(self).resolve_path(anchor, path)
-    }
-    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
-        FileLoaderDelegate(self).relevant_crates(file_id)
-    }
-}