Skip to content

Commit 3cde236

Browse files
authored
Merge pull request #20803 from SomeoneToIgnore/nocapture
Replace `--show-output` task defaults with `--nocapture`
2 parents 7e9be34 + d0e07f0 commit 3cde236

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

crates/rust-analyzer/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ config_data! {
895895
/// [custom test harness](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#the-harness-field),
896896
/// they will end up being interpreted as options to
897897
/// [`rustc`’s built-in test harness (“libtest”)](https://doc.rust-lang.org/rustc/tests/index.html#cli-arguments).
898-
runnables_extraTestBinaryArgs: Vec<String> = vec!["--show-output".to_owned()],
898+
runnables_extraTestBinaryArgs: Vec<String> = vec!["--nocapture".to_owned()],
899899

900900
/// Path to the Cargo.toml of the rust compiler workspace, for usage in rustc_private
901901
/// projects, or "discover" to try to automatically find it if the `rustc-dev` component

crates/rust-analyzer/tests/slow-tests/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ fn main() {}
256256
{
257257
"args": {
258258
"cargoArgs": ["test", "--package", "foo", "--test", "spam"],
259-
"executableArgs": ["test_eggs", "--exact", "--show-output"],
259+
"executableArgs": ["test_eggs", "--exact", "--nocapture"],
260260
"overrideCargo": null,
261261
"cwd": server.path().join("foo"),
262262
"workspaceRoot": server.path().join("foo")
@@ -289,7 +289,7 @@ fn main() {}
289289
],
290290
"executableArgs": [
291291
"",
292-
"--show-output"
292+
"--nocapture"
293293
]
294294
},
295295
"kind": "cargo",

docs/book/src/configuration_generated.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@ tests or binaries. For example, it may be `--release`.
13231323
Default:
13241324
```json
13251325
[
1326-
"--show-output"
1326+
"--nocapture"
13271327
]
13281328
```
13291329

editors/code/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2789,7 +2789,7 @@
27892789
"rust-analyzer.runnables.extraTestBinaryArgs": {
27902790
"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).",
27912791
"default": [
2792-
"--show-output"
2792+
"--nocapture"
27932793
],
27942794
"type": "array",
27952795
"items": {

0 commit comments

Comments
 (0)