Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #20803 from SomeoneToIgnore/nocapture
Replace `--show-output` task defaults with `--nocapture`
| -rw-r--r-- | crates/rust-analyzer/src/config.rs | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/tests/slow-tests/main.rs | 4 | ||||
| -rw-r--r-- | docs/book/src/configuration_generated.md | 2 | ||||
| -rw-r--r-- | editors/code/package.json | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index a88d228fcb..8272ba7f6b 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -895,7 +895,7 @@ config_data! { /// [custom test harness](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#the-harness-field), /// they will end up being interpreted as options to /// [`rustc`’s built-in test harness (“libtest”)](https://doc.rust-lang.org/rustc/tests/index.html#cli-arguments). - runnables_extraTestBinaryArgs: Vec<String> = vec!["--show-output".to_owned()], + runnables_extraTestBinaryArgs: Vec<String> = vec!["--nocapture".to_owned()], /// Path to the Cargo.toml of the rust compiler workspace, for usage in rustc_private /// projects, or "discover" to try to automatically find it if the `rustc-dev` component diff --git a/crates/rust-analyzer/tests/slow-tests/main.rs b/crates/rust-analyzer/tests/slow-tests/main.rs index 8a04bc7798..5a4ad6f380 100644 --- a/crates/rust-analyzer/tests/slow-tests/main.rs +++ b/crates/rust-analyzer/tests/slow-tests/main.rs @@ -256,7 +256,7 @@ fn main() {} { "args": { "cargoArgs": ["test", "--package", "foo", "--test", "spam"], - "executableArgs": ["test_eggs", "--exact", "--show-output"], + "executableArgs": ["test_eggs", "--exact", "--nocapture"], "overrideCargo": null, "cwd": server.path().join("foo"), "workspaceRoot": server.path().join("foo") @@ -289,7 +289,7 @@ fn main() {} ], "executableArgs": [ "", - "--show-output" + "--nocapture" ] }, "kind": "cargo", diff --git a/docs/book/src/configuration_generated.md b/docs/book/src/configuration_generated.md index e78f1b4ba3..d768993f50 100644 --- a/docs/book/src/configuration_generated.md +++ b/docs/book/src/configuration_generated.md @@ -1323,7 +1323,7 @@ tests or binaries. For example, it may be `--release`. Default: ```json [ - "--show-output" + "--nocapture" ] ``` diff --git a/editors/code/package.json b/editors/code/package.json index 745e0da4ef..e9d00e4f1f 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -2789,7 +2789,7 @@ "rust-analyzer.runnables.extraTestBinaryArgs": { "markdownDescription": "Additional arguments to be passed through Cargo to launched tests, benchmarks, or\ndoc-tests.\n\nUnless the launched target uses a\n[custom test harness](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#the-harness-field),\nthey will end up being interpreted as options to\n[`rustc`’s built-in test harness (“libtest”)](https://doc.rust-lang.org/rustc/tests/index.html#cli-arguments).", "default": [ - "--show-output" + "--nocapture" ], "type": "array", "items": { |