Merge #292

292: Vfs r=matklad a=matklad

closes #243



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 1 insertions, 27 deletions

diff --git a/crates/ra_db/src/mock.rs b/crates/ra_db/src/mock.rs
index 2f7551597..5e185062b 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};
 
 #[derive(Default, Debug, Clone)]
 pub struct FileMap(Vec<(FileId, RelativePathBuf)>);
@@ -15,15 +13,6 @@ impl FileMap {
         file_id
     }
 
-    pub fn into_source_root(self) -> SourceRoot {
-        let files = self.files();
-        let file_resolver = FileResolverImp::new(Arc::new(self));
-        SourceRoot {
-            file_resolver,
-            files,
-        }
-    }
-
     pub fn files(&self) -> FxHashSet<FileId> {
         self.iter().map(|(id, _)| id).collect()
     }
@@ -38,19 +27,4 @@ impl FileMap {
             .iter()
             .map(|(id, path)| (*id, path.as_relative_path()))
     }
-
-    fn path(&self, id: FileId) -> &RelativePath {
-        self.iter().find(|&(it, _)| it == id).unwrap().1
-    }
-}
-
-impl FileResolver for FileMap {
-    fn file_stem(&self, id: FileId) -> String {
-        self.path(id).file_stem().unwrap().to_string()
-    }
-    fn resolve(&self, id: FileId, rel: &RelativePath) -> Option<FileId> {
-        let path = self.path(id).join(rel).normalize();
-        let id = self.iter().find(|&(_, p)| path == p)?.0;
-        Some(id)
-    }
 }