about summary refs log tree commit diff
path: root/src/etc
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-09-16 23:20:41 +0200
committerGitHub <noreply@github.com>2023-09-16 23:20:41 +0200
commitedea0d5179a144dcd23b0dcc38e217d30e49d8be (patch)
tree2bb3088dab28d00a49280c84da3b71d6671acfc4 /src/etc
parent633f143921fdc9e83dd2f773fccbf97b2835eabd (diff)
parent9af39a69acee35d07b42d08e4a3de02771d1a295 (diff)
Rollup merge of #115836 - RalfJung:rust_analyzer_settings.json, r=compiler-errors
update rust_analyzer_settings.json

This works around https://github.com/rust-lang/rust-analyzer/issues/15595, and avoids relying on the unspecified working directory of this command.
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/rust_analyzer_settings.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/rust_analyzer_settings.json b/src/etc/rust_analyzer_settings.json
index 6e5e2c35005..32a04cfd5d1 100644
--- a/src/etc/rust_analyzer_settings.json
+++ b/src/etc/rust_analyzer_settings.json
@@ -16,10 +16,10 @@
         "compiler/rustc_codegen_gcc/Cargo.toml"
     ],
     "rust-analyzer.rustfmt.overrideCommand": [
-        "./build/host/rustfmt/bin/rustfmt",
+        "${workspaceFolder}/build/host/rustfmt/bin/rustfmt",
         "--edition=2021"
     ],
-    "rust-analyzer.procMacro.server": "./build/host/stage0/libexec/rust-analyzer-proc-macro-srv",
+    "rust-analyzer.procMacro.server": "${workspaceFolder}/build/host/stage0/libexec/rust-analyzer-proc-macro-srv",
     "rust-analyzer.procMacro.enable": true,
     "rust-analyzer.cargo.buildScripts.enable": true,
     "rust-analyzer.cargo.buildScripts.invocationLocation": "root",