From ed9ec388fd2d4137beb8284456fae940d5658362 Mon Sep 17 00:00:00 2001 From: Steven Joruk Date: Fri, 3 Dec 2021 04:50:37 +0000 Subject: [PATCH 1/4] Support `term.quiet` configuration This matches how users can specify `--verbose` on the command line, or `term.verbose` in the configuration. --- src/cargo/util/config/mod.rs | 28 ++++++++-------- src/doc/src/reference/config.md | 10 ++++++ tests/testsuite/config_cli.rs | 10 ++++++ tests/testsuite/run.rs | 58 +++++++++++++++++++++++++++++---- 4 files changed, 85 insertions(+), 21 deletions(-) diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs index bc0d5709807..52a4955fd62 100644 --- a/src/cargo/util/config/mod.rs +++ b/src/cargo/util/config/mod.rs @@ -909,20 +909,19 @@ impl Config { let color = color.or_else(|| term.color.as_deref()); - let verbosity = match (verbose, term.verbose, quiet) { - (true, _, false) | (_, Some(true), false) => Verbosity::Verbose, - - // Command line takes precedence over configuration, so ignore the - // configuration.. - (false, _, true) => Verbosity::Quiet, - - // Can't pass both at the same time on the command line regardless - // of configuration. - (true, _, true) => { - bail!("cannot set both --verbose and --quiet"); - } - - (false, _, false) => Verbosity::Normal, + // The command line takes precedence over configuration. + let verbosity = match (verbose, quiet) { + (true, true) => bail!("cannot set both --verbose and --quiet"), + (true, false) => Verbosity::Verbose, + (false, true) => Verbosity::Quiet, + (false, false) => match (term.verbose, term.quiet) { + (Some(true), Some(true)) => { + bail!("cannot set both `term.verbose` and `term.quiet`") + } + (Some(true), Some(false)) => Verbosity::Verbose, + (Some(false), Some(true)) => Verbosity::Quiet, + _ => Verbosity::Normal, + }, }; let cli_target_dir = target_dir.as_ref().map(|dir| Filesystem::new(dir.clone())); @@ -2127,6 +2126,7 @@ pub struct CargoBuildConfig { #[derive(Deserialize, Default)] struct TermConfig { verbose: Option, + quiet: Option, color: Option, #[serde(default)] #[serde(deserialize_with = "progress_or_string")] diff --git a/src/doc/src/reference/config.md b/src/doc/src/reference/config.md index 65918cc5d3e..ec0ef3483fe 100644 --- a/src/doc/src/reference/config.md +++ b/src/doc/src/reference/config.md @@ -992,6 +992,16 @@ metadata_key2 = "value" The `[term]` table controls terminal output and interaction. +##### `term.quiet` +* Type: boolean +* Default: false +* Environment: `CARGO_TERM_QUIET` + +Controls whether or not log messages are displayed by Cargo. + +Specifying the `--quiet` flag will override and force quiet output. +Specifying the `--verbose` flag will override and disable quiet output. + ##### `term.verbose` * Type: boolean * Default: false diff --git a/tests/testsuite/config_cli.rs b/tests/testsuite/config_cli.rs index e8a78e7c462..745525012eb 100644 --- a/tests/testsuite/config_cli.rs +++ b/tests/testsuite/config_cli.rs @@ -39,12 +39,14 @@ fn cli_priority() { jobs = 3 rustc = 'file' [term] + quiet = false verbose = false ", ); let config = ConfigBuilder::new().build(); assert_eq!(config.get::("build.jobs").unwrap(), 3); assert_eq!(config.get::("build.rustc").unwrap(), "file"); + assert_eq!(config.get::("term.quiet").unwrap(), false); assert_eq!(config.get::("term.verbose").unwrap(), false); let config = ConfigBuilder::new() @@ -58,6 +60,14 @@ fn cli_priority() { assert_eq!(config.get::("build.jobs").unwrap(), 1); assert_eq!(config.get::("build.rustc").unwrap(), "cli"); assert_eq!(config.get::("term.verbose").unwrap(), true); + + // Setting both term.verbose and term.quiet is invalid and is tested + // in the run test suite. + let config = ConfigBuilder::new() + .env("CARGO_TERM_QUIET", "false") + .config_arg("term.quiet=true") + .build(); + assert_eq!(config.get::("term.quiet").unwrap(), true); } #[cargo_test] diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs index 5775e5b8e00..8f2db8e66e3 100644 --- a/tests/testsuite/run.rs +++ b/tests/testsuite/run.rs @@ -22,30 +22,34 @@ fn simple() { } #[cargo_test] -fn simple_quiet() { +fn quiet_arg() { let p = project() .file("src/main.rs", r#"fn main() { println!("hello"); }"#) .build(); - p.cargo("run -q").with_stdout("hello").run(); + p.cargo("build -q") + .with_stderr_does_not_contain("[FINISHED] [..]") + .run(); - p.cargo("run --quiet").with_stdout("hello").run(); + p.cargo("build --quiet") + .with_stderr_does_not_contain("[FINISHED] [..]") + .run(); } #[cargo_test] -fn simple_quiet_and_verbose() { +fn quiet_arg_and_verbose_arg() { let p = project() .file("src/main.rs", r#"fn main() { println!("hello"); }"#) .build(); - p.cargo("run -q -v") + p.cargo("build -q -v") .with_status(101) .with_stderr("[ERROR] cannot set both --verbose and --quiet") .run(); } #[cargo_test] -fn quiet_and_verbose_config() { +fn quiet_arg_and_verbose_config() { let p = project() .file( ".cargo/config", @@ -57,7 +61,47 @@ fn quiet_and_verbose_config() { .file("src/main.rs", r#"fn main() { println!("hello"); }"#) .build(); - p.cargo("run -q").run(); + p.cargo("build -q") + .with_stderr_does_not_contain("[FINISHED] [..]") + .run(); +} + +#[cargo_test] +fn verbose_arg_and_quiet_config() { + let p = project() + .file( + ".cargo/config", + r#" + [term] + quiet = true + "#, + ) + .file("src/main.rs", r#"fn main() { println!("hello"); }"#) + .build(); + + p.cargo("build -v") + .with_stderr_contains("[RUNNING] `rustc [..]") + .run(); +} + +#[cargo_test] +fn quiet_config_and_verbose_config() { + let p = project() + .file( + ".cargo/config", + r#" + [term] + verbose = true + quiet = true + "#, + ) + .file("src/main.rs", r#"fn main() { println!("hello"); }"#) + .build(); + + p.cargo("build") + .with_status(101) + .with_stderr("[ERROR] cannot set both `term.verbose` and `term.quiet`") + .run(); } #[cargo_test] From 7ac6f537437259dde30d214a9396c9bb340ccce2 Mon Sep 17 00:00:00 2001 From: Steven Joruk Date: Wed, 8 Dec 2021 21:49:22 +0000 Subject: [PATCH 2/4] Code review fixes --- src/doc/man/includes/options-display.md | 2 ++ src/doc/src/reference/config.md | 1 + .../src/reference/environment-variables.md | 1 + tests/testsuite/run.rs | 28 +++++++++++-------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/doc/man/includes/options-display.md b/src/doc/man/includes/options-display.md index 051edcae362..917dac49cc0 100644 --- a/src/doc/man/includes/options-display.md +++ b/src/doc/man/includes/options-display.md @@ -7,6 +7,8 @@ May also be specified with the `term.verbose` {{#option "`-q`" "`--quiet`"}} Do not print cargo log messages. +May also be specified with the `term.quiet` +[config value](../reference/config.html). {{/option}} {{#option "`--color` _when_"}} diff --git a/src/doc/src/reference/config.md b/src/doc/src/reference/config.md index ec0ef3483fe..abba63a06a8 100644 --- a/src/doc/src/reference/config.md +++ b/src/doc/src/reference/config.md @@ -168,6 +168,7 @@ metadata_key1 = "value" metadata_key2 = "value" [term] +quiet = false # whether cargo output is quiet verbose = false # whether cargo provides verbose output color = 'auto' # whether cargo colorizes output progress.when = 'auto' # whether cargo shows progress bar diff --git a/src/doc/src/reference/environment-variables.md b/src/doc/src/reference/environment-variables.md index 88f3c94e440..9034f15d6da 100644 --- a/src/doc/src/reference/environment-variables.md +++ b/src/doc/src/reference/environment-variables.md @@ -114,6 +114,7 @@ supported environment variables are: * `CARGO_TARGET__LINKER` — The linker to use, see [`target..linker`]. The triple must be [converted to uppercase and underscores](config.md#environment-variables). * `CARGO_TARGET__RUNNER` — The executable runner, see [`target..runner`]. * `CARGO_TARGET__RUSTFLAGS` — Extra `rustc` flags for a target, see [`target..rustflags`]. +* `CARGO_TERM_QUIET` — Quiet mode, see [`term.quiet`]. * `CARGO_TERM_VERBOSE` — The default terminal verbosity, see [`term.verbose`]. * `CARGO_TERM_COLOR` — The default color mode, see [`term.color`]. * `CARGO_TERM_PROGRESS_WHEN` — The default progress bar showing mode, see [`term.progress.when`]. diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs index 8f2db8e66e3..0ff0de68449 100644 --- a/tests/testsuite/run.rs +++ b/tests/testsuite/run.rs @@ -27,12 +27,11 @@ fn quiet_arg() { .file("src/main.rs", r#"fn main() { println!("hello"); }"#) .build(); - p.cargo("build -q") - .with_stderr_does_not_contain("[FINISHED] [..]") - .run(); + p.cargo("run -q").with_stderr("").with_stdout("hello").run(); - p.cargo("build --quiet") - .with_stderr_does_not_contain("[FINISHED] [..]") + p.cargo("run --quiet") + .with_stderr("") + .with_stdout("hello") .run(); } @@ -42,7 +41,7 @@ fn quiet_arg_and_verbose_arg() { .file("src/main.rs", r#"fn main() { println!("hello"); }"#) .build(); - p.cargo("build -q -v") + p.cargo("run -q -v") .with_status(101) .with_stderr("[ERROR] cannot set both --verbose and --quiet") .run(); @@ -61,9 +60,7 @@ fn quiet_arg_and_verbose_config() { .file("src/main.rs", r#"fn main() { println!("hello"); }"#) .build(); - p.cargo("build -q") - .with_stderr_does_not_contain("[FINISHED] [..]") - .run(); + p.cargo("run -q").with_stderr("").with_stdout("hello").run(); } #[cargo_test] @@ -79,8 +76,15 @@ fn verbose_arg_and_quiet_config() { .file("src/main.rs", r#"fn main() { println!("hello"); }"#) .build(); - p.cargo("build -v") - .with_stderr_contains("[RUNNING] `rustc [..]") + p.cargo("run -v") + .with_stderr( + "\ +[COMPILING] foo v0.0.1 ([CWD]) +[RUNNING] `rustc [..] +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +[RUNNING] `target/debug/foo[EXE]`", + ) + .with_stdout("hello") .run(); } @@ -98,7 +102,7 @@ fn quiet_config_and_verbose_config() { .file("src/main.rs", r#"fn main() { println!("hello"); }"#) .build(); - p.cargo("build") + p.cargo("run") .with_status(101) .with_stderr("[ERROR] cannot set both `term.verbose` and `term.quiet`") .run(); From cd4e2804581b84accf5420a134ddb17260da28de Mon Sep 17 00:00:00 2001 From: Steven Joruk Date: Wed, 8 Dec 2021 22:15:28 +0000 Subject: [PATCH 3/4] Update docs --- src/doc/man/generated_txt/cargo-bench.txt | 4 +++- src/doc/man/generated_txt/cargo-build.txt | 4 +++- src/doc/man/generated_txt/cargo-check.txt | 4 +++- src/doc/man/generated_txt/cargo-clean.txt | 4 +++- src/doc/man/generated_txt/cargo-doc.txt | 4 +++- src/doc/man/generated_txt/cargo-fetch.txt | 4 +++- src/doc/man/generated_txt/cargo-fix.txt | 4 +++- src/doc/man/generated_txt/cargo-generate-lockfile.txt | 4 +++- src/doc/man/generated_txt/cargo-init.txt | 4 +++- src/doc/man/generated_txt/cargo-install.txt | 4 +++- src/doc/man/generated_txt/cargo-locate-project.txt | 4 +++- src/doc/man/generated_txt/cargo-login.txt | 4 +++- src/doc/man/generated_txt/cargo-metadata.txt | 4 +++- src/doc/man/generated_txt/cargo-new.txt | 4 +++- src/doc/man/generated_txt/cargo-owner.txt | 4 +++- src/doc/man/generated_txt/cargo-package.txt | 4 +++- src/doc/man/generated_txt/cargo-pkgid.txt | 4 +++- src/doc/man/generated_txt/cargo-publish.txt | 4 +++- src/doc/man/generated_txt/cargo-run.txt | 4 +++- src/doc/man/generated_txt/cargo-rustc.txt | 4 +++- src/doc/man/generated_txt/cargo-rustdoc.txt | 4 +++- src/doc/man/generated_txt/cargo-search.txt | 4 +++- src/doc/man/generated_txt/cargo-test.txt | 4 +++- src/doc/man/generated_txt/cargo-tree.txt | 4 +++- src/doc/man/generated_txt/cargo-uninstall.txt | 4 +++- src/doc/man/generated_txt/cargo-update.txt | 4 +++- src/doc/man/generated_txt/cargo-vendor.txt | 4 +++- src/doc/man/generated_txt/cargo-verify-project.txt | 4 +++- src/doc/man/generated_txt/cargo-yank.txt | 4 +++- src/doc/man/generated_txt/cargo.txt | 4 +++- src/doc/src/commands/cargo-bench.md | 4 +++- src/doc/src/commands/cargo-build.md | 4 +++- src/doc/src/commands/cargo-check.md | 4 +++- src/doc/src/commands/cargo-clean.md | 4 +++- src/doc/src/commands/cargo-doc.md | 4 +++- src/doc/src/commands/cargo-fetch.md | 4 +++- src/doc/src/commands/cargo-fix.md | 4 +++- src/doc/src/commands/cargo-generate-lockfile.md | 4 +++- src/doc/src/commands/cargo-init.md | 4 +++- src/doc/src/commands/cargo-install.md | 4 +++- src/doc/src/commands/cargo-locate-project.md | 4 +++- src/doc/src/commands/cargo-login.md | 4 +++- src/doc/src/commands/cargo-metadata.md | 4 +++- src/doc/src/commands/cargo-new.md | 4 +++- src/doc/src/commands/cargo-owner.md | 4 +++- src/doc/src/commands/cargo-package.md | 4 +++- src/doc/src/commands/cargo-pkgid.md | 4 +++- src/doc/src/commands/cargo-publish.md | 4 +++- src/doc/src/commands/cargo-run.md | 4 +++- src/doc/src/commands/cargo-rustc.md | 4 +++- src/doc/src/commands/cargo-rustdoc.md | 4 +++- src/doc/src/commands/cargo-search.md | 4 +++- src/doc/src/commands/cargo-test.md | 4 +++- src/doc/src/commands/cargo-tree.md | 4 +++- src/doc/src/commands/cargo-uninstall.md | 4 +++- src/doc/src/commands/cargo-update.md | 4 +++- src/doc/src/commands/cargo-vendor.md | 4 +++- src/doc/src/commands/cargo-verify-project.md | 4 +++- src/doc/src/commands/cargo-yank.md | 4 +++- src/doc/src/commands/cargo.md | 4 +++- src/etc/man/cargo-bench.1 | 2 ++ src/etc/man/cargo-build.1 | 2 ++ src/etc/man/cargo-check.1 | 2 ++ src/etc/man/cargo-clean.1 | 2 ++ src/etc/man/cargo-doc.1 | 2 ++ src/etc/man/cargo-fetch.1 | 2 ++ src/etc/man/cargo-fix.1 | 2 ++ src/etc/man/cargo-generate-lockfile.1 | 2 ++ src/etc/man/cargo-init.1 | 2 ++ src/etc/man/cargo-install.1 | 2 ++ src/etc/man/cargo-locate-project.1 | 2 ++ src/etc/man/cargo-login.1 | 2 ++ src/etc/man/cargo-metadata.1 | 2 ++ src/etc/man/cargo-new.1 | 2 ++ src/etc/man/cargo-owner.1 | 2 ++ src/etc/man/cargo-package.1 | 2 ++ src/etc/man/cargo-pkgid.1 | 2 ++ src/etc/man/cargo-publish.1 | 2 ++ src/etc/man/cargo-run.1 | 2 ++ src/etc/man/cargo-rustc.1 | 2 ++ src/etc/man/cargo-rustdoc.1 | 2 ++ src/etc/man/cargo-search.1 | 2 ++ src/etc/man/cargo-test.1 | 2 ++ src/etc/man/cargo-tree.1 | 2 ++ src/etc/man/cargo-uninstall.1 | 2 ++ src/etc/man/cargo-update.1 | 2 ++ src/etc/man/cargo-vendor.1 | 2 ++ src/etc/man/cargo-verify-project.1 | 2 ++ src/etc/man/cargo-yank.1 | 2 ++ src/etc/man/cargo.1 | 2 ++ 90 files changed, 240 insertions(+), 60 deletions(-) diff --git a/src/doc/man/generated_txt/cargo-bench.txt b/src/doc/man/generated_txt/cargo-bench.txt index 4414c887198..4a773e8a313 100644 --- a/src/doc/man/generated_txt/cargo-bench.txt +++ b/src/doc/man/generated_txt/cargo-bench.txt @@ -241,7 +241,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-build.txt b/src/doc/man/generated_txt/cargo-build.txt index 4aa746e95fd..348d8be4ed3 100644 --- a/src/doc/man/generated_txt/cargo-build.txt +++ b/src/doc/man/generated_txt/cargo-build.txt @@ -181,7 +181,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-check.txt b/src/doc/man/generated_txt/cargo-check.txt index 28befe66d23..2d72cdc6922 100644 --- a/src/doc/man/generated_txt/cargo-check.txt +++ b/src/doc/man/generated_txt/cargo-check.txt @@ -185,7 +185,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-clean.txt b/src/doc/man/generated_txt/cargo-clean.txt index 4ffd74dbb71..bec65ca1198 100644 --- a/src/doc/man/generated_txt/cargo-clean.txt +++ b/src/doc/man/generated_txt/cargo-clean.txt @@ -62,7 +62,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-doc.txt b/src/doc/man/generated_txt/cargo-doc.txt index 820eed38e0a..1c17854db43 100644 --- a/src/doc/man/generated_txt/cargo-doc.txt +++ b/src/doc/man/generated_txt/cargo-doc.txt @@ -156,7 +156,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-fetch.txt b/src/doc/man/generated_txt/cargo-fetch.txt index 646c7a51ce0..91664c46b96 100644 --- a/src/doc/man/generated_txt/cargo-fetch.txt +++ b/src/doc/man/generated_txt/cargo-fetch.txt @@ -47,7 +47,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-fix.txt b/src/doc/man/generated_txt/cargo-fix.txt index e96c2b01247..8c5036912b8 100644 --- a/src/doc/man/generated_txt/cargo-fix.txt +++ b/src/doc/man/generated_txt/cargo-fix.txt @@ -258,7 +258,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-generate-lockfile.txt b/src/doc/man/generated_txt/cargo-generate-lockfile.txt index 51c86626070..13f11379018 100644 --- a/src/doc/man/generated_txt/cargo-generate-lockfile.txt +++ b/src/doc/man/generated_txt/cargo-generate-lockfile.txt @@ -23,7 +23,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-init.txt b/src/doc/man/generated_txt/cargo-init.txt index 9094f580ef4..f95348a66dc 100644 --- a/src/doc/man/generated_txt/cargo-init.txt +++ b/src/doc/man/generated_txt/cargo-init.txt @@ -62,7 +62,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-install.txt b/src/doc/man/generated_txt/cargo-install.txt index 7774a6c6139..9cb8c1d97f8 100644 --- a/src/doc/man/generated_txt/cargo-install.txt +++ b/src/doc/man/generated_txt/cargo-install.txt @@ -247,7 +247,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-locate-project.txt b/src/doc/man/generated_txt/cargo-locate-project.txt index b4c4b24f66c..38cbe96304e 100644 --- a/src/doc/man/generated_txt/cargo-locate-project.txt +++ b/src/doc/man/generated_txt/cargo-locate-project.txt @@ -32,7 +32,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-login.txt b/src/doc/man/generated_txt/cargo-login.txt index f9fef72a01b..888a1010066 100644 --- a/src/doc/man/generated_txt/cargo-login.txt +++ b/src/doc/man/generated_txt/cargo-login.txt @@ -37,7 +37,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-metadata.txt b/src/doc/man/generated_txt/cargo-metadata.txt index 21a582aee01..ddb0ee3ca41 100644 --- a/src/doc/man/generated_txt/cargo-metadata.txt +++ b/src/doc/man/generated_txt/cargo-metadata.txt @@ -335,7 +335,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-new.txt b/src/doc/man/generated_txt/cargo-new.txt index 5f6463ee179..1cb22b57cb3 100644 --- a/src/doc/man/generated_txt/cargo-new.txt +++ b/src/doc/man/generated_txt/cargo-new.txt @@ -57,7 +57,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-owner.txt b/src/doc/man/generated_txt/cargo-owner.txt index 610a7676d50..ac3b19bf708 100644 --- a/src/doc/man/generated_txt/cargo-owner.txt +++ b/src/doc/man/generated_txt/cargo-owner.txt @@ -64,7 +64,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-package.txt b/src/doc/man/generated_txt/cargo-package.txt index d312300d655..91bc938b2dd 100644 --- a/src/doc/man/generated_txt/cargo-package.txt +++ b/src/doc/man/generated_txt/cargo-package.txt @@ -197,7 +197,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-pkgid.txt b/src/doc/man/generated_txt/cargo-pkgid.txt index 4a035f452fe..1f6cfa1e183 100644 --- a/src/doc/man/generated_txt/cargo-pkgid.txt +++ b/src/doc/man/generated_txt/cargo-pkgid.txt @@ -53,7 +53,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-publish.txt b/src/doc/man/generated_txt/cargo-publish.txt index 1ca883e0ded..5cd25c59d83 100644 --- a/src/doc/man/generated_txt/cargo-publish.txt +++ b/src/doc/man/generated_txt/cargo-publish.txt @@ -164,7 +164,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-run.txt b/src/doc/man/generated_txt/cargo-run.txt index f159a7a0ebc..a61795be374 100644 --- a/src/doc/man/generated_txt/cargo-run.txt +++ b/src/doc/man/generated_txt/cargo-run.txt @@ -101,7 +101,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-rustc.txt b/src/doc/man/generated_txt/cargo-rustc.txt index f39d83626de..0fb98510ad9 100644 --- a/src/doc/man/generated_txt/cargo-rustc.txt +++ b/src/doc/man/generated_txt/cargo-rustc.txt @@ -180,7 +180,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-rustdoc.txt b/src/doc/man/generated_txt/cargo-rustdoc.txt index 857d0c0fde3..bb6386fe213 100644 --- a/src/doc/man/generated_txt/cargo-rustdoc.txt +++ b/src/doc/man/generated_txt/cargo-rustdoc.txt @@ -172,7 +172,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-search.txt b/src/doc/man/generated_txt/cargo-search.txt index c56d8fe4cde..2e2e8d22daf 100644 --- a/src/doc/man/generated_txt/cargo-search.txt +++ b/src/doc/man/generated_txt/cargo-search.txt @@ -34,7 +34,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-test.txt b/src/doc/man/generated_txt/cargo-test.txt index 599bbd075fd..729fa14067f 100644 --- a/src/doc/man/generated_txt/cargo-test.txt +++ b/src/doc/man/generated_txt/cargo-test.txt @@ -255,7 +255,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-tree.txt b/src/doc/man/generated_txt/cargo-tree.txt index a82e00c2145..c8d4c6b5e5d 100644 --- a/src/doc/man/generated_txt/cargo-tree.txt +++ b/src/doc/man/generated_txt/cargo-tree.txt @@ -244,7 +244,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-uninstall.txt b/src/doc/man/generated_txt/cargo-uninstall.txt index 2c83540ee31..7e55fca19f9 100644 --- a/src/doc/man/generated_txt/cargo-uninstall.txt +++ b/src/doc/man/generated_txt/cargo-uninstall.txt @@ -46,7 +46,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-update.txt b/src/doc/man/generated_txt/cargo-update.txt index df0bb65089d..e1de455bde4 100644 --- a/src/doc/man/generated_txt/cargo-update.txt +++ b/src/doc/man/generated_txt/cargo-update.txt @@ -53,7 +53,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-vendor.txt b/src/doc/man/generated_txt/cargo-vendor.txt index ff017e515b4..6004360bc0e 100644 --- a/src/doc/man/generated_txt/cargo-vendor.txt +++ b/src/doc/man/generated_txt/cargo-vendor.txt @@ -79,7 +79,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-verify-project.txt b/src/doc/man/generated_txt/cargo-verify-project.txt index ded9cb164d1..22e4e950e02 100644 --- a/src/doc/man/generated_txt/cargo-verify-project.txt +++ b/src/doc/man/generated_txt/cargo-verify-project.txt @@ -26,7 +26,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo-yank.txt b/src/doc/man/generated_txt/cargo-yank.txt index b1f2b338fa8..3c85d09bb45 100644 --- a/src/doc/man/generated_txt/cargo-yank.txt +++ b/src/doc/man/generated_txt/cargo-yank.txt @@ -59,7 +59,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/man/generated_txt/cargo.txt b/src/doc/man/generated_txt/cargo.txt index 4ded9e88c75..91d9bcf7839 100644 --- a/src/doc/man/generated_txt/cargo.txt +++ b/src/doc/man/generated_txt/cargo.txt @@ -136,7 +136,9 @@ OPTIONS value . -q, --quiet - Do not print cargo log messages. + Do not print cargo log messages. May also be specified with the + term.quiet config value + . --color when Control when colored output is used. Valid values: diff --git a/src/doc/src/commands/cargo-bench.md b/src/doc/src/commands/cargo-bench.md index fd9ba09a052..88cbe5d62ed 100644 --- a/src/doc/src/commands/cargo-bench.md +++ b/src/doc/src/commands/cargo-bench.md @@ -299,7 +299,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-build.md b/src/doc/src/commands/cargo-build.md index 357f3d56120..3ec309f63a5 100644 --- a/src/doc/src/commands/cargo-build.md +++ b/src/doc/src/commands/cargo-build.md @@ -235,7 +235,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-check.md b/src/doc/src/commands/cargo-check.md index 70cd1bafa6e..2408ad1d8a8 100644 --- a/src/doc/src/commands/cargo-check.md +++ b/src/doc/src/commands/cargo-check.md @@ -235,7 +235,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-clean.md b/src/doc/src/commands/cargo-clean.md index 9b16228706b..4f38f03b13e 100644 --- a/src/doc/src/commands/cargo-clean.md +++ b/src/doc/src/commands/cargo-clean.md @@ -84,7 +84,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-doc.md b/src/doc/src/commands/cargo-doc.md index 19288eaed13..1b0a543b7d0 100644 --- a/src/doc/src/commands/cargo-doc.md +++ b/src/doc/src/commands/cargo-doc.md @@ -209,7 +209,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-fetch.md b/src/doc/src/commands/cargo-fetch.md index 60fbc28128d..675d99e602f 100644 --- a/src/doc/src/commands/cargo-fetch.md +++ b/src/doc/src/commands/cargo-fetch.md @@ -57,7 +57,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-fix.md b/src/doc/src/commands/cargo-fix.md index 478eaef1b43..23ba2a2e770 100644 --- a/src/doc/src/commands/cargo-fix.md +++ b/src/doc/src/commands/cargo-fix.md @@ -315,7 +315,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-generate-lockfile.md b/src/doc/src/commands/cargo-generate-lockfile.md index 42f26dbad49..20189031d6d 100644 --- a/src/doc/src/commands/cargo-generate-lockfile.md +++ b/src/doc/src/commands/cargo-generate-lockfile.md @@ -32,7 +32,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-init.md b/src/doc/src/commands/cargo-init.md index 2d1ec7de454..3cd8e46a3c6 100644 --- a/src/doc/src/commands/cargo-init.md +++ b/src/doc/src/commands/cargo-init.md @@ -80,7 +80,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-install.md b/src/doc/src/commands/cargo-install.md index 70b9591ac67..3576d51df1f 100644 --- a/src/doc/src/commands/cargo-install.md +++ b/src/doc/src/commands/cargo-install.md @@ -292,7 +292,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-locate-project.md b/src/doc/src/commands/cargo-locate-project.md index 6c5b32219af..600d9a7b0cf 100644 --- a/src/doc/src/commands/cargo-locate-project.md +++ b/src/doc/src/commands/cargo-locate-project.md @@ -46,7 +46,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-login.md b/src/doc/src/commands/cargo-login.md index ceb14bfee40..65468249876 100644 --- a/src/doc/src/commands/cargo-login.md +++ b/src/doc/src/commands/cargo-login.md @@ -48,7 +48,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-metadata.md b/src/doc/src/commands/cargo-metadata.md index d7758991823..870b6ef35c9 100644 --- a/src/doc/src/commands/cargo-metadata.md +++ b/src/doc/src/commands/cargo-metadata.md @@ -360,7 +360,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-new.md b/src/doc/src/commands/cargo-new.md index 771d146d867..89f26c65bf4 100644 --- a/src/doc/src/commands/cargo-new.md +++ b/src/doc/src/commands/cargo-new.md @@ -75,7 +75,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-owner.md b/src/doc/src/commands/cargo-owner.md index d4f0678556d..9d6998bb203 100644 --- a/src/doc/src/commands/cargo-owner.md +++ b/src/doc/src/commands/cargo-owner.md @@ -86,7 +86,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-package.md b/src/doc/src/commands/cargo-package.md index 2c3126e3dc3..57f11332f61 100644 --- a/src/doc/src/commands/cargo-package.md +++ b/src/doc/src/commands/cargo-package.md @@ -243,7 +243,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-pkgid.md b/src/doc/src/commands/cargo-pkgid.md index 808376447b7..0009f53437b 100644 --- a/src/doc/src/commands/cargo-pkgid.md +++ b/src/doc/src/commands/cargo-pkgid.md @@ -59,7 +59,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-publish.md b/src/doc/src/commands/cargo-publish.md index 9be7ae98f0a..f35e30ef718 100644 --- a/src/doc/src/commands/cargo-publish.md +++ b/src/doc/src/commands/cargo-publish.md @@ -209,7 +209,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-run.md b/src/doc/src/commands/cargo-run.md index c6e3d9a0a8c..ffbb1fc9014 100644 --- a/src/doc/src/commands/cargo-run.md +++ b/src/doc/src/commands/cargo-run.md @@ -145,7 +145,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-rustc.md b/src/doc/src/commands/cargo-rustc.md index 5601425e6a9..9709b8613cf 100644 --- a/src/doc/src/commands/cargo-rustc.md +++ b/src/doc/src/commands/cargo-rustc.md @@ -224,7 +224,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-rustdoc.md b/src/doc/src/commands/cargo-rustdoc.md index 719c7f5ca23..cc93e402ffe 100644 --- a/src/doc/src/commands/cargo-rustdoc.md +++ b/src/doc/src/commands/cargo-rustdoc.md @@ -228,7 +228,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-search.md b/src/doc/src/commands/cargo-search.md index 0018d93367b..5a117683b7e 100644 --- a/src/doc/src/commands/cargo-search.md +++ b/src/doc/src/commands/cargo-search.md @@ -52,7 +52,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-test.md b/src/doc/src/commands/cargo-test.md index 1bc44e5ebfc..eea63c654f7 100644 --- a/src/doc/src/commands/cargo-test.md +++ b/src/doc/src/commands/cargo-test.md @@ -314,7 +314,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-tree.md b/src/doc/src/commands/cargo-tree.md index e608719e992..b1880b4569e 100644 --- a/src/doc/src/commands/cargo-tree.md +++ b/src/doc/src/commands/cargo-tree.md @@ -280,7 +280,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-uninstall.md b/src/doc/src/commands/cargo-uninstall.md index 646ba33a4f4..d4b9f7fe17f 100644 --- a/src/doc/src/commands/cargo-uninstall.md +++ b/src/doc/src/commands/cargo-uninstall.md @@ -61,7 +61,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-update.md b/src/doc/src/commands/cargo-update.md index 291b93ec645..f5bf623d187 100644 --- a/src/doc/src/commands/cargo-update.md +++ b/src/doc/src/commands/cargo-update.md @@ -70,7 +70,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-vendor.md b/src/doc/src/commands/cargo-vendor.md index 81f86a971f0..b1c6f858a37 100644 --- a/src/doc/src/commands/cargo-vendor.md +++ b/src/doc/src/commands/cargo-vendor.md @@ -102,7 +102,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-verify-project.md b/src/doc/src/commands/cargo-verify-project.md index ac3401b3128..55f8885ca90 100644 --- a/src/doc/src/commands/cargo-verify-project.md +++ b/src/doc/src/commands/cargo-verify-project.md @@ -35,7 +35,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo-yank.md b/src/doc/src/commands/cargo-yank.md index b6f29f9fe3b..5dbda77d99c 100644 --- a/src/doc/src/commands/cargo-yank.md +++ b/src/doc/src/commands/cargo-yank.md @@ -79,7 +79,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/doc/src/commands/cargo.md b/src/doc/src/commands/cargo.md index 2801b9f6167..5a61239e136 100644 --- a/src/doc/src/commands/cargo.md +++ b/src/doc/src/commands/cargo.md @@ -160,7 +160,9 @@ May also be specified with the term.verbose
-q
--quiet
-
Do not print cargo log messages.
+
Do not print cargo log messages. +May also be specified with the term.quiet +config value.
--color when
diff --git a/src/etc/man/cargo-bench.1 b/src/etc/man/cargo-bench.1 index 87755c4d786..105cef5a6b3 100644 --- a/src/etc/man/cargo-bench.1 +++ b/src/etc/man/cargo-bench.1 @@ -301,6 +301,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-build.1 b/src/etc/man/cargo-build.1 index 832c70686d2..ab9460d6128 100644 --- a/src/etc/man/cargo-build.1 +++ b/src/etc/man/cargo-build.1 @@ -220,6 +220,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-check.1 b/src/etc/man/cargo-check.1 index 420a04212e5..49eabcb1ee0 100644 --- a/src/etc/man/cargo-check.1 +++ b/src/etc/man/cargo-check.1 @@ -221,6 +221,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-clean.1 b/src/etc/man/cargo-clean.1 index 33aa3ea11d1..20b9fa1f195 100644 --- a/src/etc/man/cargo-clean.1 +++ b/src/etc/man/cargo-clean.1 @@ -78,6 +78,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-doc.1 b/src/etc/man/cargo-doc.1 index 5b13991289b..4fd6beffaad 100644 --- a/src/etc/man/cargo-doc.1 +++ b/src/etc/man/cargo-doc.1 @@ -188,6 +188,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-fetch.1 b/src/etc/man/cargo-fetch.1 index a0e8afd0daa..ef5d989dc27 100644 --- a/src/etc/man/cargo-fetch.1 +++ b/src/etc/man/cargo-fetch.1 @@ -52,6 +52,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-fix.1 b/src/etc/man/cargo-fix.1 index 1bb823fe44e..61ed8d82453 100644 --- a/src/etc/man/cargo-fix.1 +++ b/src/etc/man/cargo-fix.1 @@ -316,6 +316,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-generate-lockfile.1 b/src/etc/man/cargo-generate-lockfile.1 index cd3b421bec6..c4177d5c999 100644 --- a/src/etc/man/cargo-generate-lockfile.1 +++ b/src/etc/man/cargo-generate-lockfile.1 @@ -30,6 +30,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-init.1 b/src/etc/man/cargo-init.1 index f2def367c41..79502736bbd 100644 --- a/src/etc/man/cargo-init.1 +++ b/src/etc/man/cargo-init.1 @@ -79,6 +79,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-install.1 b/src/etc/man/cargo-install.1 index babd1c81f3b..99c1fad53cc 100644 --- a/src/etc/man/cargo-install.1 +++ b/src/etc/man/cargo-install.1 @@ -320,6 +320,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-locate-project.1 b/src/etc/man/cargo-locate-project.1 index 2de3be08206..0fd5be1e66c 100644 --- a/src/etc/man/cargo-locate-project.1 +++ b/src/etc/man/cargo-locate-project.1 @@ -45,6 +45,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-login.1 b/src/etc/man/cargo-login.1 index de9119dae3c..d0cadb46e35 100644 --- a/src/etc/man/cargo-login.1 +++ b/src/etc/man/cargo-login.1 @@ -43,6 +43,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-metadata.1 b/src/etc/man/cargo-metadata.1 index b0a83363231..89a05a79cfd 100644 --- a/src/etc/man/cargo-metadata.1 +++ b/src/etc/man/cargo-metadata.1 @@ -353,6 +353,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-new.1 b/src/etc/man/cargo-new.1 index 51dcbd4dcd5..475f929c9cd 100644 --- a/src/etc/man/cargo-new.1 +++ b/src/etc/man/cargo-new.1 @@ -74,6 +74,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-owner.1 b/src/etc/man/cargo-owner.1 index 9eee069c447..5ddba809c48 100644 --- a/src/etc/man/cargo-owner.1 +++ b/src/etc/man/cargo-owner.1 @@ -85,6 +85,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-package.1 b/src/etc/man/cargo-package.1 index 12ba8d97ca9..3258628f545 100644 --- a/src/etc/man/cargo-package.1 +++ b/src/etc/man/cargo-package.1 @@ -250,6 +250,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-pkgid.1 b/src/etc/man/cargo-pkgid.1 index 599091f1707..67ed66f0b1c 100644 --- a/src/etc/man/cargo-pkgid.1 +++ b/src/etc/man/cargo-pkgid.1 @@ -85,6 +85,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-publish.1 b/src/etc/man/cargo-publish.1 index 0f5405dfaaa..afd4e91392a 100644 --- a/src/etc/man/cargo-publish.1 +++ b/src/etc/man/cargo-publish.1 @@ -200,6 +200,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-run.1 b/src/etc/man/cargo-run.1 index ee98a69bfd4..2eac4867304 100644 --- a/src/etc/man/cargo-run.1 +++ b/src/etc/man/cargo-run.1 @@ -121,6 +121,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-rustc.1 b/src/etc/man/cargo-rustc.1 index f73643102be..fde4e49682d 100644 --- a/src/etc/man/cargo-rustc.1 +++ b/src/etc/man/cargo-rustc.1 @@ -216,6 +216,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-rustdoc.1 b/src/etc/man/cargo-rustdoc.1 index 01c93eeb9e6..3c54c884f7c 100644 --- a/src/etc/man/cargo-rustdoc.1 +++ b/src/etc/man/cargo-rustdoc.1 @@ -207,6 +207,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-search.1 b/src/etc/man/cargo-search.1 index d07523c6ba5..505fec118d4 100644 --- a/src/etc/man/cargo-search.1 +++ b/src/etc/man/cargo-search.1 @@ -46,6 +46,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-test.1 b/src/etc/man/cargo-test.1 index eaa000305d3..7cd37232b7c 100644 --- a/src/etc/man/cargo-test.1 +++ b/src/etc/man/cargo-test.1 @@ -316,6 +316,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-tree.1 b/src/etc/man/cargo-tree.1 index 71677c7bcb8..c3bd42862e2 100644 --- a/src/etc/man/cargo-tree.1 +++ b/src/etc/man/cargo-tree.1 @@ -318,6 +318,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-uninstall.1 b/src/etc/man/cargo-uninstall.1 index 8247d632714..610537795d3 100644 --- a/src/etc/man/cargo-uninstall.1 +++ b/src/etc/man/cargo-uninstall.1 @@ -69,6 +69,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-update.1 b/src/etc/man/cargo-update.1 index cbd9e90bfbe..c5c9e686f1e 100644 --- a/src/etc/man/cargo-update.1 +++ b/src/etc/man/cargo-update.1 @@ -70,6 +70,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-vendor.1 b/src/etc/man/cargo-vendor.1 index 42b771fc68e..eeaf740467b 100644 --- a/src/etc/man/cargo-vendor.1 +++ b/src/etc/man/cargo-vendor.1 @@ -97,6 +97,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-verify-project.1 b/src/etc/man/cargo-verify-project.1 index 0da5e5aaa33..000ccad9213 100644 --- a/src/etc/man/cargo-verify-project.1 +++ b/src/etc/man/cargo-verify-project.1 @@ -40,6 +40,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo-yank.1 b/src/etc/man/cargo-yank.1 index 1cec70cdb07..053fbbdcaad 100644 --- a/src/etc/man/cargo-yank.1 +++ b/src/etc/man/cargo-yank.1 @@ -74,6 +74,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR diff --git a/src/etc/man/cargo.1 b/src/etc/man/cargo.1 index 6f58c26db59..8f1616957bc 100644 --- a/src/etc/man/cargo.1 +++ b/src/etc/man/cargo.1 @@ -179,6 +179,8 @@ May also be specified with the \fBterm.verbose\fR \fB\-\-quiet\fR .RS 4 Do not print cargo log messages. +May also be specified with the \fBterm.quiet\fR +\fIconfig value\fR \&. .RE .sp \fB\-\-color\fR \fIwhen\fR From bfe27c5fec7b149b5ebbc077121a5bc632524b8b Mon Sep 17 00:00:00 2001 From: Steven Joruk Date: Wed, 8 Dec 2021 22:28:14 +0000 Subject: [PATCH 4/4] Fix link to config.md#termquiet --- src/doc/src/reference/environment-variables.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/doc/src/reference/environment-variables.md b/src/doc/src/reference/environment-variables.md index 9034f15d6da..4f30ec79a2c 100644 --- a/src/doc/src/reference/environment-variables.md +++ b/src/doc/src/reference/environment-variables.md @@ -176,6 +176,7 @@ supported environment variables are: [`target..linker`]: config.md#targettriplelinker [`target..runner`]: config.md#targettriplerunner [`target..rustflags`]: config.md#targettriplerustflags +[`term.quiet`]: config.md#termquiet [`term.verbose`]: config.md#termverbose [`term.color`]: config.md#termcolor [`term.progress.when`]: config.md#termprogresswhen