Skip to content

Commit 09c2efd

Browse files
committed
use separate option for rust-analyzer.checkOnSave.features
instead of using the same as rls. Also remove deprecated configuration option :allTargets
1 parent 4bb61e6 commit 09c2efd

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

clients/lsp-rust.el

+7-7
Original file line numberDiff line numberDiff line change
@@ -495,11 +495,12 @@ The command should include `--message=format=json` or similar option."
495495
:group 'lsp-rust-analyzer
496496
:package-version '(lsp-mode . "6.2.2"))
497497

498-
(defcustom lsp-rust-analyzer-cargo-all-targets t
499-
"Cargo watch all targets or not."
500-
:type 'boolean
501-
:group 'lsp-rust-analyzer
502-
:package-version '(lsp-mode . "6.2.2"))
498+
(defcustom lsp-rust-analyzer-checkonsave-features []
499+
"List of features to activate.
500+
Set this to `\"all\"` to pass `--all-features` to cargo."
501+
:type 'lsp-string-vector
502+
:group 'lsp-rust-rust-analyzer
503+
:package-version '(lsp-mode . "8.0.2"))
503504

504505
(defcustom lsp-rust-analyzer-cargo-unset-test []
505506
"force rust-analyzer to unset `#[cfg(test)]` for the specified crates."
@@ -746,8 +747,7 @@ or JSON objects in `rust-project.json` format."
746747
:checkOnSave (:enable ,(lsp-json-bool lsp-rust-analyzer-cargo-watch-enable)
747748
:command ,lsp-rust-analyzer-cargo-watch-command
748749
:extraArgs ,lsp-rust-analyzer-cargo-watch-args
749-
:features ,lsp-rust-features
750-
:allTargets ,(lsp-json-bool lsp-rust-analyzer-cargo-all-targets)
750+
:features ,lsp-rust-analyzer-checkonsave-features
751751
:overrideCommand ,lsp-rust-analyzer-cargo-override-command)
752752
:files (:exclude ,lsp-rust-analyzer-exclude-globs
753753
:watcher ,(if lsp-rust-analyzer-use-client-watching "client" "notify")

0 commit comments

Comments
 (0)