Skip to content

Commit ff8a24a

Browse files
committed
Auto merge of rust-lang#16988 - Veykril:config-docs, r=Veykril
fix: Fix `allFeatures` config docs
2 parents c82d168 + ff279f1 commit ff8a24a

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

crates/rust-analyzer/src/config.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ config_data! {
7171
/// How many worker threads to handle priming caches. The default `0` means to pick automatically.
7272
cachePriming_numThreads: ParallelCachePrimingNumThreads = "0",
7373

74-
/// Pass `--all-targets` to cargo invocation. Overridden by `#rust-analyzer.check.allTargets#`
75-
/// when the latter is set.
74+
/// Pass `--all-targets` to cargo invocation.
7675
cargo_allTargets: bool = "true",
7776
/// Automatically refresh project info via `cargo metadata` on
7877
/// `Cargo.toml` or `.cargo/config.toml` changes.
@@ -166,7 +165,8 @@ config_data! {
166165
/// Run the check command for diagnostics on save.
167166
checkOnSave | checkOnSave_enable: bool = "true",
168167

169-
/// Check all targets and tests (`--all-targets`). Overrides `#rust-analyzer.cargo.allTargets#`.
168+
/// Check all targets and tests (`--all-targets`). Defaults to
169+
/// `#rust-analyzer.cargo.allTargets#`.
170170
check_allTargets | checkOnSave_allTargets: Option<bool> = "null",
171171
/// Cargo command to use for `cargo check`.
172172
check_command | checkOnSave_command: String = "\"check\"",

docs/user/generated_config.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ How many worker threads to handle priming caches. The default `0` means to pick
2222
[[rust-analyzer.cargo.allTargets]]rust-analyzer.cargo.allTargets (default: `true`)::
2323
+
2424
--
25-
Pass `--all-targets` to cargo invocation. Overridden by `#rust-analyzer.check.allTargets#`
26-
when the latter is set.
25+
Pass `--all-targets` to cargo invocation.
2726
--
2827
[[rust-analyzer.cargo.autoreload]]rust-analyzer.cargo.autoreload (default: `true`)::
2928
+
@@ -173,7 +172,8 @@ Run the check command for diagnostics on save.
173172
[[rust-analyzer.check.allTargets]]rust-analyzer.check.allTargets (default: `null`)::
174173
+
175174
--
176-
Check all targets and tests (`--all-targets`). Overrides `#rust-analyzer.cargo.allTargets#`.
175+
Check all targets and tests (`--all-targets`). Defaults to
176+
`#rust-analyzer.cargo.allTargets#`.
177177
--
178178
[[rust-analyzer.check.command]]rust-analyzer.check.command (default: `"check"`)::
179179
+

editors/code/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@
547547
"maximum": 255
548548
},
549549
"rust-analyzer.cargo.allTargets": {
550-
"markdownDescription": "Pass `--all-targets` to cargo invocation. Overridden by `#rust-analyzer.check.allTargets#`\nwhen the latter is set.",
550+
"markdownDescription": "Pass `--all-targets` to cargo invocation.",
551551
"default": true,
552552
"type": "boolean"
553553
},
@@ -712,7 +712,7 @@
712712
"type": "boolean"
713713
},
714714
"rust-analyzer.check.allTargets": {
715-
"markdownDescription": "Check all targets and tests (`--all-targets`). Overrides `#rust-analyzer.cargo.allTargets#`.",
715+
"markdownDescription": "Check all targets and tests (`--all-targets`). Defaults to\n`#rust-analyzer.cargo.allTargets#`.",
716716
"default": null,
717717
"type": [
718718
"null",

0 commit comments

Comments
 (0)