New VFS

1 files changed, 5 insertions, 10 deletions

diff --git a/crates/vfs/src/file_set.rs b/crates/vfs/src/file_set.rs
index 724606a3d..0173f7464 100644
--- a/crates/vfs/src/file_set.rs
+++ b/crates/vfs/src/file_set.rs
@@ -4,7 +4,6 @@
 //! the default `FileSet`.
 use std::{fmt, iter};
 
-use paths::AbsPathBuf;
 use rustc_hash::FxHashMap;
 
 use crate::{FileId, Vfs, VfsPath};
@@ -41,7 +40,7 @@ impl fmt::Debug for FileSet {
 #[derive(Debug)]
 pub struct FileSetConfig {
     n_file_sets: usize,
-    roots: Vec<(AbsPathBuf, usize)>,
+    roots: Vec<(VfsPath, usize)>,
 }
 
 impl Default for FileSetConfig {
@@ -66,11 +65,7 @@ impl FileSetConfig {
         self.n_file_sets
     }
     fn classify(&self, path: &VfsPath) -> usize {
-        let path = match path.as_path() {
-            Some(it) => it,
-            None => return self.len() - 1,
-        };
-        let idx = match self.roots.binary_search_by(|(p, _)| p.as_path().cmp(path)) {
+        let idx = match self.roots.binary_search_by(|(p, _)| p.cmp(path)) {
             Ok(it) => it,
             Err(it) => it.saturating_sub(1),
         };
@@ -83,7 +78,7 @@ impl FileSetConfig {
 }
 
 pub struct FileSetConfigBuilder {
-    roots: Vec<Vec<AbsPathBuf>>,
+    roots: Vec<Vec<VfsPath>>,
 }
 
 impl Default for FileSetConfigBuilder {
@@ -96,12 +91,12 @@ impl FileSetConfigBuilder {
     pub fn len(&self) -> usize {
         self.roots.len()
     }
-    pub fn add_file_set(&mut self, roots: Vec<AbsPathBuf>) {
+    pub fn add_file_set(&mut self, roots: Vec<VfsPath>) {
         self.roots.push(roots)
     }
     pub fn build(self) -> FileSetConfig {
         let n_file_sets = self.roots.len() + 1;
-        let mut roots: Vec<(AbsPathBuf, usize)> = self
+        let mut roots: Vec<(VfsPath, usize)> = self
             .roots
             .into_iter()
             .enumerate()