diff options
| author | bors <bors@rust-lang.org> | 2025-10-03 00:49:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-10-03 00:49:22 +0000 |
| commit | 3b8665c5ab3aeced9b01672404c3764583e722ca (patch) | |
| tree | dfcb38971fde9f1cd9e197492d91d4f02ed94f86 /src/etc/rust_analyzer_zed.json | |
| parent | 8d603ef2879fd263f8e9aea340b4c035ed7973db (diff) | |
| parent | 9e1b24d9e470b541ba2703ae771a961852ceaa48 (diff) | |
| download | rust-3b8665c5ab3aeced9b01672404c3764583e722ca.tar.gz rust-3b8665c5ab3aeced9b01672404c3764583e722ca.zip | |
Auto merge of #147282 - Zalathar:rollup-7wz3k9r, r=Zalathar
Rollup of 6 pull requests Successful merges: - rust-lang/rust#141839 (make rust-analyzer use a dedicated build directory) - rust-lang/rust#146166 (Implement range support in `//@ edition`) - rust-lang/rust#147259 (cg_llvm: Use helper methods for all calls to `LLVMMDNodeInContext2`) - rust-lang/rust#147263 (Disable triagebot auto stable-regression compiler backport nominations pending redesign) - rust-lang/rust#147268 (add arm-maintainers to various targets) - rust-lang/rust#147270 (Move doc_cfg-specific code into `cfg.rs`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/etc/rust_analyzer_zed.json')
| -rw-r--r-- | src/etc/rust_analyzer_zed.json | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/etc/rust_analyzer_zed.json b/src/etc/rust_analyzer_zed.json index 7eace92500e..d98a082a9b8 100644 --- a/src/etc/rust_analyzer_zed.json +++ b/src/etc/rust_analyzer_zed.json @@ -7,7 +7,15 @@ "enable": true, "invocationLocation": "root", "invocationStrategy": "once", - "overrideCommand": ["python3", "x.py", "check", "--json-output", "--compile-time-deps"] + "overrideCommand": [ + "python3", + "x.py", + "check", + "--build-dir", + "build-rust-analyzer", + "--compile-time-deps", + "--json-output" + ] }, "extraEnv": { "RUSTC_BOOTSTRAP": "1" @@ -17,7 +25,14 @@ "check": { "invocationLocation": "root", "invocationStrategy": "once", - "overrideCommand": ["python3", "x.py", "check", "--json-output"] + "overrideCommand": [ + "python3", + "x.py", + "check", + "--json-output", + "--build-dir", + "build-rust-analyzer" + ] }, "linkedProjects": [ "Cargo.toml", @@ -29,14 +44,14 @@ ], "procMacro": { "enable": true, - "server": "build/host/stage0/libexec/rust-analyzer-proc-macro-srv" + "server": "build-rust-analyzer/host/stage0/libexec/rust-analyzer-proc-macro-srv" }, "rustc": { "source": "./Cargo.toml" }, "rustfmt": { "overrideCommand": [ - "build/host/rustfmt/bin/rustfmt", + "build-rust-analyzer/host/rustfmt/bin/rustfmt", "--edition=2024" ] }, |