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_eglot.el | |
| 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_eglot.el')
| -rw-r--r-- | src/etc/rust_analyzer_eglot.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/etc/rust_analyzer_eglot.el b/src/etc/rust_analyzer_eglot.el index 3151cb1a6e7..e5abf67235a 100644 --- a/src/etc/rust_analyzer_eglot.el +++ b/src/etc/rust_analyzer_eglot.el @@ -6,6 +6,8 @@ :overrideCommand ["python3" "x.py" "check" + "--build-dir" + "build-rust-analyzer" "--json-output"]) :linkedProjects ["Cargo.toml" "compiler/rustc_codegen_cranelift/Cargo.toml" @@ -13,9 +15,9 @@ "library/Cargo.toml" "src/bootstrap/Cargo.toml" "src/tools/rust-analyzer/Cargo.toml"] - :rustfmt ( :overrideCommand ["build/host/rustfmt/bin/rustfmt" + :rustfmt ( :overrideCommand ["build-rust-analyzer/host/rustfmt/bin/rustfmt" "--edition=2024"]) - :procMacro ( :server "build/host/stage0/libexec/rust-analyzer-proc-macro-srv" + :procMacro ( :server "build-rust-analyzer/host/stage0/libexec/rust-analyzer-proc-macro-srv" :enable t) :cargo ( :buildScripts ( :enable t :invocationLocation "root" @@ -23,6 +25,8 @@ :overrideCommand ["python3" "x.py" "check" + "--build-dir" + "build-rust-analyzer" "--json-output" "--compile-time-deps"])] :sysrootSrc "./library" |