about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2025-06-28 21:56:32 +0000
committerGitHub <noreply@github.com>2025-06-28 21:56:32 +0000
commit40ec14702b5ff87f512b9d3c8c6ce28c779d8415 (patch)
tree4ba74fbe9324850b310afb32ebb0bddd9b9dd084
parent85357d1e5cf56d8aca54e7d4f6cc365b006f484a (diff)
parent6e05d61e388b799cd97a4751652816891029fc78 (diff)
downloadrust-40ec14702b5ff87f512b9d3c8c6ce28c779d8415.tar.gz
rust-40ec14702b5ff87f512b9d3c8c6ce28c779d8415.zip
Merge pull request #4415 from YohDeadfall/sync-ra-configs
Synced rust-analyzer configs
-rw-r--r--src/tools/miri/etc/rust_analyzer_helix.toml12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/tools/miri/etc/rust_analyzer_helix.toml b/src/tools/miri/etc/rust_analyzer_helix.toml
index 62db463a191..9bfb09120d8 100644
--- a/src/tools/miri/etc/rust_analyzer_helix.toml
+++ b/src/tools/miri/etc/rust_analyzer_helix.toml
@@ -9,23 +9,21 @@ linkedProjects = [
 ]
 
 [language-server.rust-analyzer.config.check]
-invocationLocation = "root"
 invocationStrategy = "once"
 overrideCommand = [
-    "env",
-    "MIRI_AUTO_OPS=no",
     "./miri",
     "clippy", # make this `check` when working with a locally built rustc
     "--message-format=json",
 ]
 
+[language-server.rust-analyzer.config.cargo.extraEnv]
+MIRI_AUTO_OPS = "no"
+MIRI_IN_RA = "1"
+
 # Contrary to what the name suggests, this also affects proc macros.
-[language-server.rust-analyzer.config.buildScripts]
-invocationLocation = "root"
+[language-server.rust-analyzer.config.cargo.buildScripts]
 invocationStrategy = "once"
 overrideCommand = [
-    "env",
-    "MIRI_AUTO_OPS=no",
     "./miri",
     "check",
     "--message-format=json",