diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs index b09014dc6c5..9edaf36cf18 100644 --- a/crates/ra_db/src/input.rs +++ b/crates/ra_db/src/input.rs @@ -5,8 +5,6 @@ use ra_syntax::SmolStr; use salsa; -use crate::file_resolver::FileResolverImp; - #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct FileId(pub u32); @@ -123,7 +121,6 @@ fn crate_graph() -> Arc { #[derive(Default, Clone, Debug, PartialEq, Eq)] pub struct SourceRoot { - pub file_resolver: FileResolverImp, pub files: FxHashSet, } diff --git a/crates/ra_db/src/mock.rs b/crates/ra_db/src/mock.rs index 2f7551597fc..14d9e79b50e 100644 --- a/crates/ra_db/src/mock.rs +++ b/crates/ra_db/src/mock.rs @@ -1,9 +1,7 @@ -use std::sync::Arc; - use rustc_hash::FxHashSet; use relative_path::{RelativePath, RelativePathBuf}; -use crate::{FileId, FileResolver, SourceRoot, FileResolverImp}; +use crate::{FileId, FileResolver, SourceRoot}; #[derive(Default, Debug, Clone)] pub struct FileMap(Vec<(FileId, RelativePathBuf)>); @@ -17,11 +15,7 @@ pub fn add(&mut self, path: RelativePathBuf) -> FileId { pub fn into_source_root(self) -> SourceRoot { let files = self.files(); - let file_resolver = FileResolverImp::new(Arc::new(self)); - SourceRoot { - file_resolver, - files, - } + SourceRoot { files } } pub fn files(&self) -> FxHashSet {