2 files changed, 9 insertions, 11 deletions

diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml
index 62850746f..c85da7a2c 100644
--- a/crates/ra_batch/Cargo.toml
+++ b/crates/ra_batch/Cargo.toml
@@ -9,7 +9,7 @@ log = "0.4.5"
 rustc-hash = "1.0"
 crossbeam-channel = "0.3.5"
 
-ra_vfs = "0.4.0"
+ra_vfs = "0.5.0"
 ra_vfs_glob = { path = "../ra_vfs_glob" }
 ra_db = { path = "../ra_db" }
 ra_ide_api = { path = "../ra_ide_api" }
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs
index a5fc2a23e..df49eb13d 100644
--- a/crates/ra_batch/src/lib.rs
+++ b/crates/ra_batch/src/lib.rs
@@ -43,8 +43,12 @@ pub fn load_cargo(root: &Path) -> Result<(AnalysisHost, FxHashMap<SourceRootId,
     );
 
     // FIXME: cfg options?
-    let default_cfg_options =
-        get_rustc_cfg_options().atom("test".into()).atom("debug_assertion".into());
+    let default_cfg_options = {
+        let mut opts = get_rustc_cfg_options();
+        opts.insert_atom("test".into());
+        opts.insert_atom("debug_assertion".into());
+        opts
+    };
 
     let (crate_graph, _crate_names) =
         ws.to_crate_graph(&default_cfg_options, &mut |path: &Path| {
@@ -137,14 +141,8 @@ mod tests {
     #[test]
     fn test_loading_rust_analyzer() {
         let path = Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap().parent().unwrap();
-        let (host, roots) = load_cargo(path).unwrap();
-        let mut n_crates = 0;
-        for (root, _) in roots {
-            for _krate in Crate::source_root_crates(host.raw_database(), root) {
-                n_crates += 1;
-            }
-        }
-
+        let (host, _roots) = load_cargo(path).unwrap();
+        let n_crates = Crate::all(host.raw_database()).len();
         // RA has quite a few crates, but the exact count doesn't matter
         assert!(n_crates > 20);
     }