diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_batch/src/lib.rs | 3 | ||||
-rw-r--r-- | crates/ra_vfs/src/lib.rs | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs index c1cfb76bc..837fff4dc 100644 --- a/crates/ra_batch/src/lib.rs +++ b/crates/ra_batch/src/lib.rs | |||
@@ -22,7 +22,6 @@ type Result<T> = std::result::Result<T, failure::Error>; | |||
22 | pub struct BatchDatabase { | 22 | pub struct BatchDatabase { |
23 | runtime: salsa::Runtime<BatchDatabase>, | 23 | runtime: salsa::Runtime<BatchDatabase>, |
24 | interner: Arc<HirInterner>, | 24 | interner: Arc<HirInterner>, |
25 | // file_counter: u32, | ||
26 | } | 25 | } |
27 | 26 | ||
28 | impl salsa::Database for BatchDatabase { | 27 | impl salsa::Database for BatchDatabase { |
@@ -83,7 +82,7 @@ impl BatchDatabase { | |||
83 | VfsChange::AddFile { .. } | 82 | VfsChange::AddFile { .. } |
84 | | VfsChange::RemoveFile { .. } | 83 | | VfsChange::RemoveFile { .. } |
85 | | VfsChange::ChangeFile { .. } => { | 84 | | VfsChange::ChangeFile { .. } => { |
86 | // log::warn!("VFS changed while loading"); | 85 | // We just need the first scan, so just ignore these |
87 | } | 86 | } |
88 | } | 87 | } |
89 | } | 88 | } |
diff --git a/crates/ra_vfs/src/lib.rs b/crates/ra_vfs/src/lib.rs index 2d861f832..3805be570 100644 --- a/crates/ra_vfs/src/lib.rs +++ b/crates/ra_vfs/src/lib.rs | |||
@@ -162,13 +162,6 @@ impl Vfs { | |||
162 | self.roots[root].root.clone() | 162 | self.roots[root].root.clone() |
163 | } | 163 | } |
164 | 164 | ||
165 | pub fn path2root(&self, path: &Path) -> Option<VfsRoot> { | ||
166 | match self.find_root(path) { | ||
167 | Some((root, _path, _file)) => Some(root), | ||
168 | _ => None, | ||
169 | } | ||
170 | } | ||
171 | |||
172 | pub fn path2file(&self, path: &Path) -> Option<VfsFile> { | 165 | pub fn path2file(&self, path: &Path) -> Option<VfsFile> { |
173 | if let Some((_root, _path, Some(file))) = self.find_root(path) { | 166 | if let Some((_root, _path, Some(file))) = self.find_root(path) { |
174 | return Some(file); | 167 | return Some(file); |