Skip to content

Commit 523465a

Browse files
committed
Auto merge of rust-lang#17614 - lnicola:build-scripts-override-docs, r=lnicola
minor: Add --keep-going to the `cargo.buildScripts.overrideCommand` docs CC rust-lang/rust-analyzer#17608 (comment)
2 parents 2a8b4a2 + f0b8055 commit 523465a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ config_data! {
108108
/// targets and features, with the following base command line:
109109
///
110110
/// ```bash
111-
/// cargo check --quiet --workspace --message-format=json --all-targets
111+
/// cargo check --quiet --workspace --message-format=json --all-targets --keep-going
112112
/// ```
113113
/// .
114114
cargo_buildScripts_overrideCommand: Option<Vec<String>> = None,

src/tools/rust-analyzer/docs/user/generated_config.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ By default, a cargo invocation will be constructed for the configured
8282
targets and features, with the following base command line:
8383

8484
```bash
85-
cargo check --quiet --workspace --message-format=json --all-targets
85+
cargo check --quiet --workspace --message-format=json --all-targets --keep-going
8686
```
8787
.
8888
--

src/tools/rust-analyzer/editors/code/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@
718718
"title": "cargo",
719719
"properties": {
720720
"rust-analyzer.cargo.buildScripts.overrideCommand": {
721-
"markdownDescription": "Override the command rust-analyzer uses to run build scripts and\nbuild procedural macros. The command is required to output json\nand should therefore include `--message-format=json` or a similar\noption.\n\nIf there are multiple linked projects/workspaces, this command is invoked for\neach of them, with the working directory being the workspace root\n(i.e., the folder containing the `Cargo.toml`). This can be overwritten\nby changing `#rust-analyzer.cargo.buildScripts.invocationStrategy#` and\n`#rust-analyzer.cargo.buildScripts.invocationLocation#`.\n\nBy default, a cargo invocation will be constructed for the configured\ntargets and features, with the following base command line:\n\n```bash\ncargo check --quiet --workspace --message-format=json --all-targets\n```\n.",
721+
"markdownDescription": "Override the command rust-analyzer uses to run build scripts and\nbuild procedural macros. The command is required to output json\nand should therefore include `--message-format=json` or a similar\noption.\n\nIf there are multiple linked projects/workspaces, this command is invoked for\neach of them, with the working directory being the workspace root\n(i.e., the folder containing the `Cargo.toml`). This can be overwritten\nby changing `#rust-analyzer.cargo.buildScripts.invocationStrategy#` and\n`#rust-analyzer.cargo.buildScripts.invocationLocation#`.\n\nBy default, a cargo invocation will be constructed for the configured\ntargets and features, with the following base command line:\n\n```bash\ncargo check --quiet --workspace --message-format=json --all-targets --keep-going\n```\n.",
722722
"default": null,
723723
"type": [
724724
"null",

0 commit comments

Comments
 (0)