Remove Vfs from project model

[rust.git] / crates / ra_project_model / src / lib.rs

diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 30612ac845f9947b5569c5efb9f8089de2afdd70..156af9e7a29fba76a393c4572855ae833662dd91 100644 (file)
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -7,7 +7,6 @@
 use rustc_hash::FxHashMap;
 
 use ra_db::{CrateGraph, FileId};
-use ra_vfs::Vfs;
 
 pub use crate::{
     cargo_workspace::{CargoWorkspace, Package, Target, TargetKind},
@@ -32,12 +31,11 @@ pub fn discover(path: &Path) -> Result<ProjectWorkspace> {
         Ok(res)
     }
 
-    pub fn to_crate_graph(&self, vfs: &mut Vfs) -> CrateGraph {
+    pub fn to_crate_graph(&self, load: &mut dyn FnMut(&Path) -> Option<FileId>) -> CrateGraph {
         let mut crate_graph = CrateGraph::default();
         let mut sysroot_crates = FxHashMap::default();
         for krate in self.sysroot.crates() {
-            if let Some(file_id) = vfs.load(krate.root(&self.sysroot)) {
-                let file_id = FileId(file_id.0.into());
+            if let Some(file_id) = load(krate.root(&self.sysroot)) {
                 sysroot_crates.insert(krate, crate_graph.add_crate_root(file_id));
             }
         }
@@ -47,7 +45,7 @@ pub fn to_crate_graph(&self, vfs: &mut Vfs) -> CrateGraph {
                 if let (Some(&from), Some(&to)) =
                     (sysroot_crates.get(&from), sysroot_crates.get(&to))
                 {
-                    if let Err(_) = crate_graph.add_dep(from, name.clone(), to) {
+                    if let Err(_) = crate_graph.add_dep(from, name.into(), to) {
                         log::error!("cyclic dependency between sysroot crates")
                     }
                 }
@@ -63,8 +61,7 @@ pub fn to_crate_graph(&self, vfs: &mut Vfs) -> CrateGraph {
             let mut lib_tgt = None;
             for tgt in pkg.targets(&self.cargo) {
                 let root = tgt.root(&self.cargo);
-                if let Some(file_id) = vfs.load(root) {
-                    let file_id = FileId(file_id.0.into());
+                if let Some(file_id) = load(root) {
                     let crate_id = crate_graph.add_crate_root(file_id);
                     if tgt.kind(&self.cargo) == TargetKind::Lib {
                         lib_tgt = Some(crate_id);
@@ -101,7 +98,7 @@ pub fn to_crate_graph(&self, vfs: &mut Vfs) -> CrateGraph {
             for dep in pkg.dependencies(&self.cargo) {
                 if let Some(&to) = pkg_to_lib_crate.get(&dep.pkg) {
                     for &from in pkg_crates.get(&pkg).into_iter().flatten() {
-                        if let Err(_) = crate_graph.add_dep(from, dep.name.clone(), to) {
+                        if let Err(_) = crate_graph.add_dep(from, dep.name.clone().into(), to) {
                             log::error!(
                                 "cyclic dependency {} -> {}",
                                 pkg.name(&self.cargo),