3 files changed, 19 insertions, 13 deletions

diff --git a/crates/mbe/src/benchmark.rs b/crates/mbe/src/benchmark.rs
index 0d0acd589..6d81be880 100644
--- a/crates/mbe/src/benchmark.rs
+++ b/crates/mbe/src/benchmark.rs
@@ -177,7 +177,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt
             let c = 1013904223;
             *seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c);
             return *seed;
-        };
+        }
         fn make_ident(ident: &str) -> tt::TokenTree {
             tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), text: SmolStr::new(ident) })
                 .into()
diff --git a/crates/rust-analyzer/tests/rust-analyzer/main.rs b/crates/rust-analyzer/tests/rust-analyzer/main.rs
index 80bde29b9..7545b4a34 100644
--- a/crates/rust-analyzer/tests/rust-analyzer/main.rs
+++ b/crates/rust-analyzer/tests/rust-analyzer/main.rs
@@ -54,7 +54,9 @@ version = "0.0.0"
 use std::collections::Spam;
 "#,
     )
-    .with_sysroot(true)
+    .with_config(serde_json::json!({
+        "cargo": { "noSysroot": false }
+    }))
     .server()
     .wait_until_workspace_is_loaded();
 
@@ -451,7 +453,9 @@ fn main() {{}}
 "#,
         librs, libs
     ))
-    .with_sysroot(true)
+    .with_config(serde_json::json!({
+        "cargo": { "noSysroot": false }
+    }))
     .server()
     .wait_until_workspace_is_loaded();
 
@@ -574,7 +578,10 @@ fn main() {
 "###,
     )
     .with_config(serde_json::json!({
-        "cargo": { "loadOutDirsFromCheck": true }
+        "cargo": {
+            "loadOutDirsFromCheck": true,
+            "noSysroot": true,
+        }
     }))
     .server()
     .wait_until_workspace_is_loaded();
@@ -717,7 +724,10 @@ pub fn foo(_input: TokenStream) -> TokenStream {
 "###,
     )
     .with_config(serde_json::json!({
-        "cargo": { "loadOutDirsFromCheck": true },
+        "cargo": {
+            "loadOutDirsFromCheck": true,
+            "noSysroot": true,
+        },
         "procMacro": {
             "enable": true,
             "server": PathBuf::from(env!("CARGO_BIN_EXE_rust-analyzer")),
diff --git a/crates/rust-analyzer/tests/rust-analyzer/support.rs b/crates/rust-analyzer/tests/rust-analyzer/support.rs
index 453ce4fa8..6b774073d 100644
--- a/crates/rust-analyzer/tests/rust-analyzer/support.rs
+++ b/crates/rust-analyzer/tests/rust-analyzer/support.rs
@@ -20,7 +20,6 @@ use crate::testdir::TestDir;
 
 pub(crate) struct Project<'a> {
     fixture: &'a str,
-    with_sysroot: bool,
     tmp_dir: Option<TestDir>,
     roots: Vec<PathBuf>,
     config: serde_json::Value,
@@ -32,8 +31,10 @@ impl<'a> Project<'a> {
             fixture,
             tmp_dir: None,
             roots: vec![],
-            with_sysroot: false,
-            config: serde_json::Value::Null,
+            config: serde_json::json!({
+                // Loading standard library is costly, let's ignore it by default
+                "cargo": { "noSysroot": true }
+            }),
         }
     }
 
@@ -47,11 +48,6 @@ impl<'a> Project<'a> {
         self
     }
 
-    pub(crate) fn with_sysroot(mut self, yes: bool) -> Project<'a> {
-        self.with_sysroot = yes;
-        self
-    }
-
     pub(crate) fn with_config(mut self, config: serde_json::Value) -> Project<'a> {
         self.config = config;
         self