Skip to content

Commit a359ce1

Browse files
borsbors
committed
Auto merge of #10152 - steven-joruk:quiet-config, r=ehuss
Support `term.quiet` configuration Fixes #10128 This follows the existing support for `--verbose` and `term.verbose`. I've renamed the related tests to be a bit clearer now there are more cases, and the existing quiet tests now prove that they hide the cargo log. I'm unsure whether I'm supposed to regenerate the documentation as part of this?
2 parents c689f55 + bfe27c5 commit a359ce1

File tree

96 files changed

+333
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+333
-80
lines changed

‎src/cargo/util/config/mod.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -909,20 +909,19 @@ impl Config {
909909

910910
let color = color.or_else(|| term.color.as_deref());
911911

912-
let verbosity = match (verbose, term.verbose, quiet) {
913-
(true, _, false) | (_, Some(true), false) => Verbosity::Verbose,
914-
915-
// Command line takes precedence over configuration, so ignore the
916-
// configuration..
917-
(false, _, true) => Verbosity::Quiet,
918-
919-
// Can't pass both at the same time on the command line regardless
920-
// of configuration.
921-
(true, _, true) => {
922-
bail!("cannot set both --verbose and --quiet");
923-
}
924-
925-
(false, _, false) => Verbosity::Normal,
912+
// The command line takes precedence over configuration.
913+
let verbosity = match (verbose, quiet) {
914+
(true, true) => bail!("cannot set both --verbose and --quiet"),
915+
(true, false) => Verbosity::Verbose,
916+
(false, true) => Verbosity::Quiet,
917+
(false, false) => match (term.verbose, term.quiet) {
918+
(Some(true), Some(true)) => {
919+
bail!("cannot set both `term.verbose` and `term.quiet`")
920+
}
921+
(Some(true), Some(false)) => Verbosity::Verbose,
922+
(Some(false), Some(true)) => Verbosity::Quiet,
923+
_ => Verbosity::Normal,
924+
},
926925
};
927926

928927
let cli_target_dir = target_dir.as_ref().map(|dir| Filesystem::new(dir.clone()));
@@ -2127,6 +2126,7 @@ pub struct CargoBuildConfig {
21272126
#[derive(Deserialize, Default)]
21282127
struct TermConfig {
21292128
verbose: Option<bool>,
2129+
quiet: Option<bool>,
21302130
color: Option<String>,
21312131
#[serde(default)]
21322132
#[serde(deserialize_with = "progress_or_string")]

‎src/doc/man/generated_txt/cargo-bench.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ OPTIONS
241241
value <https://doc.rust-lang.org/cargo/reference/config.html>.
242242

243243
-q, --quiet
244-
Do not print cargo log messages.
244+
Do not print cargo log messages. May also be specified with the
245+
term.quiet config value
246+
<https://doc.rust-lang.org/cargo/reference/config.html>.
245247

246248
--color when
247249
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-build.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@ OPTIONS
181181
value <https://doc.rust-lang.org/cargo/reference/config.html>.
182182

183183
-q, --quiet
184-
Do not print cargo log messages.
184+
Do not print cargo log messages. May also be specified with the
185+
term.quiet config value
186+
<https://doc.rust-lang.org/cargo/reference/config.html>.
185187

186188
--color when
187189
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-check.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ OPTIONS
185185
value <https://doc.rust-lang.org/cargo/reference/config.html>.
186186

187187
-q, --quiet
188-
Do not print cargo log messages.
188+
Do not print cargo log messages. May also be specified with the
189+
term.quiet config value
190+
<https://doc.rust-lang.org/cargo/reference/config.html>.
189191

190192
--color when
191193
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-clean.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ OPTIONS
6262
value <https://doc.rust-lang.org/cargo/reference/config.html>.
6363

6464
-q, --quiet
65-
Do not print cargo log messages.
65+
Do not print cargo log messages. May also be specified with the
66+
term.quiet config value
67+
<https://doc.rust-lang.org/cargo/reference/config.html>.
6668

6769
--color when
6870
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-doc.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ OPTIONS
156156
value <https://doc.rust-lang.org/cargo/reference/config.html>.
157157

158158
-q, --quiet
159-
Do not print cargo log messages.
159+
Do not print cargo log messages. May also be specified with the
160+
term.quiet config value
161+
<https://doc.rust-lang.org/cargo/reference/config.html>.
160162

161163
--color when
162164
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-fetch.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ OPTIONS
4747
value <https://doc.rust-lang.org/cargo/reference/config.html>.
4848

4949
-q, --quiet
50-
Do not print cargo log messages.
50+
Do not print cargo log messages. May also be specified with the
51+
term.quiet config value
52+
<https://doc.rust-lang.org/cargo/reference/config.html>.
5153

5254
--color when
5355
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-fix.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,9 @@ OPTIONS
258258
value <https://doc.rust-lang.org/cargo/reference/config.html>.
259259

260260
-q, --quiet
261-
Do not print cargo log messages.
261+
Do not print cargo log messages. May also be specified with the
262+
term.quiet config value
263+
<https://doc.rust-lang.org/cargo/reference/config.html>.
262264

263265
--color when
264266
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-generate-lockfile.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ OPTIONS
2323
value <https://doc.rust-lang.org/cargo/reference/config.html>.
2424

2525
-q, --quiet
26-
Do not print cargo log messages.
26+
Do not print cargo log messages. May also be specified with the
27+
term.quiet config value
28+
<https://doc.rust-lang.org/cargo/reference/config.html>.
2729

2830
--color when
2931
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-init.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ OPTIONS
6262
value <https://doc.rust-lang.org/cargo/reference/config.html>.
6363

6464
-q, --quiet
65-
Do not print cargo log messages.
65+
Do not print cargo log messages. May also be specified with the
66+
term.quiet config value
67+
<https://doc.rust-lang.org/cargo/reference/config.html>.
6668

6769
--color when
6870
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-install.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,9 @@ OPTIONS
247247
value <https://doc.rust-lang.org/cargo/reference/config.html>.
248248

249249
-q, --quiet
250-
Do not print cargo log messages.
250+
Do not print cargo log messages. May also be specified with the
251+
term.quiet config value
252+
<https://doc.rust-lang.org/cargo/reference/config.html>.
251253

252254
--color when
253255
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-locate-project.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ OPTIONS
3232
value <https://doc.rust-lang.org/cargo/reference/config.html>.
3333

3434
-q, --quiet
35-
Do not print cargo log messages.
35+
Do not print cargo log messages. May also be specified with the
36+
term.quiet config value
37+
<https://doc.rust-lang.org/cargo/reference/config.html>.
3638

3739
--color when
3840
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-login.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ OPTIONS
3737
value <https://doc.rust-lang.org/cargo/reference/config.html>.
3838

3939
-q, --quiet
40-
Do not print cargo log messages.
40+
Do not print cargo log messages. May also be specified with the
41+
term.quiet config value
42+
<https://doc.rust-lang.org/cargo/reference/config.html>.
4143

4244
--color when
4345
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-metadata.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,9 @@ OPTIONS
335335
value <https://doc.rust-lang.org/cargo/reference/config.html>.
336336

337337
-q, --quiet
338-
Do not print cargo log messages.
338+
Do not print cargo log messages. May also be specified with the
339+
term.quiet config value
340+
<https://doc.rust-lang.org/cargo/reference/config.html>.
339341

340342
--color when
341343
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-new.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ OPTIONS
5757
value <https://doc.rust-lang.org/cargo/reference/config.html>.
5858

5959
-q, --quiet
60-
Do not print cargo log messages.
60+
Do not print cargo log messages. May also be specified with the
61+
term.quiet config value
62+
<https://doc.rust-lang.org/cargo/reference/config.html>.
6163

6264
--color when
6365
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-owner.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ OPTIONS
6464
value <https://doc.rust-lang.org/cargo/reference/config.html>.
6565

6666
-q, --quiet
67-
Do not print cargo log messages.
67+
Do not print cargo log messages. May also be specified with the
68+
term.quiet config value
69+
<https://doc.rust-lang.org/cargo/reference/config.html>.
6870

6971
--color when
7072
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-package.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ OPTIONS
197197
value <https://doc.rust-lang.org/cargo/reference/config.html>.
198198

199199
-q, --quiet
200-
Do not print cargo log messages.
200+
Do not print cargo log messages. May also be specified with the
201+
term.quiet config value
202+
<https://doc.rust-lang.org/cargo/reference/config.html>.
201203

202204
--color when
203205
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-pkgid.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ OPTIONS
5353
value <https://doc.rust-lang.org/cargo/reference/config.html>.
5454

5555
-q, --quiet
56-
Do not print cargo log messages.
56+
Do not print cargo log messages. May also be specified with the
57+
term.quiet config value
58+
<https://doc.rust-lang.org/cargo/reference/config.html>.
5759

5860
--color when
5961
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-publish.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,9 @@ OPTIONS
164164
value <https://doc.rust-lang.org/cargo/reference/config.html>.
165165

166166
-q, --quiet
167-
Do not print cargo log messages.
167+
Do not print cargo log messages. May also be specified with the
168+
term.quiet config value
169+
<https://doc.rust-lang.org/cargo/reference/config.html>.
168170

169171
--color when
170172
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-run.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ OPTIONS
101101
value <https://doc.rust-lang.org/cargo/reference/config.html>.
102102

103103
-q, --quiet
104-
Do not print cargo log messages.
104+
Do not print cargo log messages. May also be specified with the
105+
term.quiet config value
106+
<https://doc.rust-lang.org/cargo/reference/config.html>.
105107

106108
--color when
107109
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-rustc.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ OPTIONS
180180
value <https://doc.rust-lang.org/cargo/reference/config.html>.
181181

182182
-q, --quiet
183-
Do not print cargo log messages.
183+
Do not print cargo log messages. May also be specified with the
184+
term.quiet config value
185+
<https://doc.rust-lang.org/cargo/reference/config.html>.
184186

185187
--color when
186188
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-rustdoc.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ OPTIONS
172172
value <https://doc.rust-lang.org/cargo/reference/config.html>.
173173

174174
-q, --quiet
175-
Do not print cargo log messages.
175+
Do not print cargo log messages. May also be specified with the
176+
term.quiet config value
177+
<https://doc.rust-lang.org/cargo/reference/config.html>.
176178

177179
--color when
178180
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-search.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ OPTIONS
3434
value <https://doc.rust-lang.org/cargo/reference/config.html>.
3535

3636
-q, --quiet
37-
Do not print cargo log messages.
37+
Do not print cargo log messages. May also be specified with the
38+
term.quiet config value
39+
<https://doc.rust-lang.org/cargo/reference/config.html>.
3840

3941
--color when
4042
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-test.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,9 @@ OPTIONS
255255
value <https://doc.rust-lang.org/cargo/reference/config.html>.
256256

257257
-q, --quiet
258-
Do not print cargo log messages.
258+
Do not print cargo log messages. May also be specified with the
259+
term.quiet config value
260+
<https://doc.rust-lang.org/cargo/reference/config.html>.
259261

260262
--color when
261263
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-tree.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,9 @@ OPTIONS
244244
value <https://doc.rust-lang.org/cargo/reference/config.html>.
245245

246246
-q, --quiet
247-
Do not print cargo log messages.
247+
Do not print cargo log messages. May also be specified with the
248+
term.quiet config value
249+
<https://doc.rust-lang.org/cargo/reference/config.html>.
248250

249251
--color when
250252
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-uninstall.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ OPTIONS
4646
value <https://doc.rust-lang.org/cargo/reference/config.html>.
4747

4848
-q, --quiet
49-
Do not print cargo log messages.
49+
Do not print cargo log messages. May also be specified with the
50+
term.quiet config value
51+
<https://doc.rust-lang.org/cargo/reference/config.html>.
5052

5153
--color when
5254
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-update.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ OPTIONS
5353
value <https://doc.rust-lang.org/cargo/reference/config.html>.
5454

5555
-q, --quiet
56-
Do not print cargo log messages.
56+
Do not print cargo log messages. May also be specified with the
57+
term.quiet config value
58+
<https://doc.rust-lang.org/cargo/reference/config.html>.
5759

5860
--color when
5961
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-vendor.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ OPTIONS
7979
value <https://doc.rust-lang.org/cargo/reference/config.html>.
8080

8181
-q, --quiet
82-
Do not print cargo log messages.
82+
Do not print cargo log messages. May also be specified with the
83+
term.quiet config value
84+
<https://doc.rust-lang.org/cargo/reference/config.html>.
8385

8486
--color when
8587
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-verify-project.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ OPTIONS
2626
value <https://doc.rust-lang.org/cargo/reference/config.html>.
2727

2828
-q, --quiet
29-
Do not print cargo log messages.
29+
Do not print cargo log messages. May also be specified with the
30+
term.quiet config value
31+
<https://doc.rust-lang.org/cargo/reference/config.html>.
3032

3133
--color when
3234
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo-yank.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ OPTIONS
5959
value <https://doc.rust-lang.org/cargo/reference/config.html>.
6060

6161
-q, --quiet
62-
Do not print cargo log messages.
62+
Do not print cargo log messages. May also be specified with the
63+
term.quiet config value
64+
<https://doc.rust-lang.org/cargo/reference/config.html>.
6365

6466
--color when
6567
Control when colored output is used. Valid values:

‎src/doc/man/generated_txt/cargo.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ OPTIONS
136136
value <https://doc.rust-lang.org/cargo/reference/config.html>.
137137

138138
-q, --quiet
139-
Do not print cargo log messages.
139+
Do not print cargo log messages. May also be specified with the
140+
term.quiet config value
141+
<https://doc.rust-lang.org/cargo/reference/config.html>.
140142

141143
--color when
142144
Control when colored output is used. Valid values:

‎src/doc/man/includes/options-display.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ May also be specified with the `term.verbose`
77

88
{{#option "`-q`" "`--quiet`"}}
99
Do not print cargo log messages.
10+
May also be specified with the `term.quiet`
11+
[config value](../reference/config.html).
1012
{{/option}}
1113

1214
{{#option "`--color` _when_"}}

‎src/doc/src/commands/cargo-bench.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,9 @@ May also be specified with the <code>term.verbose</code>
299299

300300
<dt class="option-term" id="option-cargo-bench--q"><a class="option-anchor" href="#option-cargo-bench--q"></a><code>-q</code></dt>
301301
<dt class="option-term" id="option-cargo-bench---quiet"><a class="option-anchor" href="#option-cargo-bench---quiet"></a><code>--quiet</code></dt>
302-
<dd class="option-desc">Do not print cargo log messages.</dd>
302+
<dd class="option-desc">Do not print cargo log messages.
303+
May also be specified with the <code>term.quiet</code>
304+
<a href="../reference/config.html">config value</a>.</dd>
303305

304306

305307
<dt class="option-term" id="option-cargo-bench---color"><a class="option-anchor" href="#option-cargo-bench---color"></a><code>--color</code> <em>when</em></dt>

0 commit comments

Comments
 (0)