nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove dead code

Browse Source
This commit is contained in:
Aleksey Kladov 2019-11-04 22:19:06 +03:00
parent 24894aca31
commit 7649a8ebbe
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/ra_hir/src/mock.rs
View File

@ -9,7 +9,6 @@ use ra_db::{
salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, RelativePath, SourceDatabase, salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, RelativePath, SourceDatabase,
SourceRootId, SourceRootId,
}; };
use rustc_hash::FxHashMap;
use crate::{db, debug::HirDebugHelper}; use crate::{db, debug::HirDebugHelper};
@ -28,9 +27,6 @@ pub const WORKSPACE: SourceRootId = SourceRootId(0);
pub struct MockDatabase { pub struct MockDatabase {
events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>, events: Mutex<Option<Vec<salsa::Event<MockDatabase>>>>,
runtime: salsa::Runtime<MockDatabase>, runtime: salsa::Runtime<MockDatabase>,
files: FxHashMap<String, FileId>,
crate_names: Arc<FxHashMap<CrateId, String>>,
file_paths: Arc<FxHashMap<FileId, String>>,
} }
impl panic::RefUnwindSafe for MockDatabase {} impl panic::RefUnwindSafe for MockDatabase {}
@ -51,24 +47,18 @@ impl FileLoader for MockDatabase {
} }
} }
// FIXME: improve `WithFixture` to bring useful hir debugging back
impl HirDebugHelper for MockDatabase { impl HirDebugHelper for MockDatabase {
fn crate_name(&self, krate: CrateId) -> Option<String> { fn crate_name(&self, _krate: CrateId) -> Option<String> {
self.crate_names.get(&krate).cloned() None
} }
fn file_path(&self, file_id: FileId) -> Option<String> { fn file_path(&self, _file_id: FileId) -> Option<String> {
self.file_paths.get(&file_id).cloned() None
} }
} }
impl MockDatabase { impl MockDatabase {
pub fn file_id_of(&self, path: &str) -> FileId {
match self.files.get(path) {
Some(it) => *it,
None => panic!("unknown file: {:?}\nexisting files:\n{:#?}", path, self.files),
}
}
pub fn diagnostics(&self) -> String { pub fn diagnostics(&self) -> String {
let mut buf = String::new(); let mut buf = String::new();
let crate_graph = self.crate_graph(); let crate_graph = self.crate_graph();
@ -104,13 +94,8 @@ impl salsa::Database for MockDatabase {
impl Default for MockDatabase { impl Default for MockDatabase {
fn default() -> MockDatabase { fn default() -> MockDatabase {
let mut db = MockDatabase { let mut db =
events: Default::default(), MockDatabase { events: Default::default(), runtime: salsa::Runtime::default() };
runtime: salsa::Runtime::default(),
files: FxHashMap::default(),
crate_names: Default::default(),
file_paths: Default::default(),
};
db.set_crate_graph(Default::default()); db.set_crate_graph(Default::default());
db db
} }
@ -121,10 +106,6 @@ impl salsa::ParallelDatabase for MockDatabase {
salsa::Snapshot::new(MockDatabase { salsa::Snapshot::new(MockDatabase {
events: Default::default(), events: Default::default(),
runtime: self.runtime.snapshot(self), runtime: self.runtime.snapshot(self),
// only the root database can be used to get file_id by path.
files: FxHashMap::default(),
file_paths: Arc::clone(&self.file_paths),
crate_names: Arc::clone(&self.crate_names),
}) })
} }
} }