Skip to content

Commit 83bd9f6

Browse files
borsbors
committed
Auto merge of #10080 - hi-rustin:rustin-patch-quiet, r=alexcrichton
Improve the help text of the --quiet args for all commands close #8928
2 parents d2cc298 + 17c0ea7 commit 83bd9f6

File tree

121 files changed

+121
-121
lines changed

Some content is hidden

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

121 files changed

+121
-121
lines changed

‎src/bin/cargo/cli.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ See 'cargo help <command>' for more information on a specific command.\n",
438438
.multiple(true)
439439
.global(true),
440440
)
441-
.arg(opt("quiet", "No output printed to stdout").short("q"))
441+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
442442
.arg(
443443
opt("color", "Coloring: auto, always, never")
444444
.value_name("WHEN")

‎src/bin/cargo/commands/bench.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub fn cli() -> App {
55
subcommand("bench")
66
.setting(AppSettings::TrailingVarArg)
77
.about("Execute all benchmarks of a local package")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg(
1010
Arg::with_name("BENCHNAME")
1111
.help("If specified, only run benches containing this string in their names"),

‎src/bin/cargo/commands/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub fn cli() -> App {
77
// subcommand aliases are handled in aliased_command()
88
// .alias("b")
99
.about("Compile a local package and all of its dependencies")
10-
.arg(opt("quiet", "No output printed to stdout").short("q"))
10+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1111
.arg_package_spec(
1212
"Package to build (see `cargo help pkgid`)",
1313
"Build all packages in the workspace",

‎src/bin/cargo/commands/check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub fn cli() -> App {
77
// subcommand aliases are handled in aliased_command()
88
// .alias("c")
99
.about("Check a local package and all of its dependencies for errors")
10-
.arg(opt("quiet", "No output printed to stdout").short("q"))
10+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1111
.arg_package_spec(
1212
"Package(s) to check",
1313
"Check all packages in the workspace",

‎src/bin/cargo/commands/clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use cargo::util::print_available_packages;
66
pub fn cli() -> App {
77
subcommand("clean")
88
.about("Remove artifacts that cargo has generated in the past")
9-
.arg(opt("quiet", "No output printed to stdout").short("q"))
9+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1010
.arg_package_spec_simple("Package to clean artifacts for")
1111
.arg_manifest_path()
1212
.arg_target_triple("Target triple to clean output for")

‎src/bin/cargo/commands/doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub fn cli() -> App {
77
// subcommand aliases are handled in aliased_command()
88
// .alias("d")
99
.about("Build a package's documentation")
10-
.arg(opt("quiet", "No output printed to stdout").short("q"))
10+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1111
.arg(opt(
1212
"open",
1313
"Opens the docs in a browser after the operation",

‎src/bin/cargo/commands/fetch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use cargo::ops::FetchOptions;
66
pub fn cli() -> App {
77
subcommand("fetch")
88
.about("Fetch dependencies of a package from the network")
9-
.arg(opt("quiet", "No output printed to stdout").short("q"))
9+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1010
.arg_manifest_path()
1111
.arg_target_triple("Fetch dependencies for the target triple")
1212
.after_help("Run `cargo help fetch` for more detailed information.\n")

‎src/bin/cargo/commands/fix.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops::{self, CompileFilter, FilterRule, LibRule};
55
pub fn cli() -> App {
66
subcommand("fix")
77
.about("Automatically fix lint warnings reported by rustc")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg_package_spec(
1010
"Package(s) to fix",
1111
"Fix all packages in the workspace",

‎src/bin/cargo/commands/generate_lockfile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops;
55
pub fn cli() -> App {
66
subcommand("generate-lockfile")
77
.about("Generate the lockfile for a package")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg_manifest_path()
1010
.after_help("Run `cargo help generate-lockfile` for more detailed information.\n")
1111
}

‎src/bin/cargo/commands/init.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops;
55
pub fn cli() -> App {
66
subcommand("init")
77
.about("Create a new cargo package in an existing directory")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg(Arg::with_name("path").default_value("."))
1010
.arg(opt("registry", "Registry to use").value_name("REGISTRY"))
1111
.arg_new_opts()

‎src/bin/cargo/commands/install.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use cargo::util::IntoUrl;
77
pub fn cli() -> App {
88
subcommand("install")
99
.about("Install a Rust binary. Default location is $HOME/.cargo/bin")
10-
.arg(opt("quiet", "No output printed to stdout").short("q"))
10+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1111
.arg(Arg::with_name("crate").empty_values(false).multiple(true))
1212
.arg(
1313
opt("version", "Specify a version to install")

‎src/bin/cargo/commands/locate_project.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use serde::Serialize;
66
pub fn cli() -> App {
77
subcommand("locate-project")
88
.about("Print a JSON representation of a Cargo.toml file's location")
9-
.arg(opt("quiet", "No output printed to stdout").short("q"))
9+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1010
.arg_manifest_path()
1111
.arg(
1212
opt(

‎src/bin/cargo/commands/login.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub fn cli() -> App {
88
"Save an api token from the registry locally. \
99
If token is not specified, it will be read from stdin.",
1010
)
11-
.arg(opt("quiet", "No output printed to stdout").short("q"))
11+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1212
.arg(Arg::with_name("token"))
1313
// --host is deprecated (use --registry instead)
1414
.arg(

‎src/bin/cargo/commands/logout.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use cargo::ops;
44
pub fn cli() -> App {
55
subcommand("logout")
66
.about("Remove an API token from the registry locally")
7-
.arg(opt("quiet", "No output printed to stdout").short("q"))
7+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
88
.arg(opt("registry", "Registry to use").value_name("REGISTRY"))
99
.after_help("Run `cargo help logout` for more detailed information.\n")
1010
}

‎src/bin/cargo/commands/new.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops;
55
pub fn cli() -> App {
66
subcommand("new")
77
.about("Create a new cargo package at <path>")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg(Arg::with_name("path").required(true))
1010
.arg(opt("registry", "Registry to use").value_name("REGISTRY"))
1111
.arg_new_opts()

‎src/bin/cargo/commands/owner.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops::{self, OwnersOptions};
55
pub fn cli() -> App {
66
subcommand("owner")
77
.about("Manage the owners of a crate on the registry")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg(Arg::with_name("crate"))
1010
.arg(
1111
multi_opt(

‎src/bin/cargo/commands/package.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops::{self, PackageOpts};
55
pub fn cli() -> App {
66
subcommand("package")
77
.about("Assemble the local package into a distributable tarball")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg(
1010
opt(
1111
"list",

‎src/bin/cargo/commands/pkgid.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use cargo::util::print_available_packages;
66
pub fn cli() -> App {
77
subcommand("pkgid")
88
.about("Print a fully qualified package specification")
9-
.arg(opt("quiet", "No output printed to stdout").short("q"))
9+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1010
.arg(Arg::with_name("spec"))
1111
.arg_package("Argument to get the package ID specifier for")
1212
.arg_manifest_path()

‎src/bin/cargo/commands/publish.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops::{self, PublishOpts};
55
pub fn cli() -> App {
66
subcommand("publish")
77
.about("Upload a package to the registry")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg_index()
1010
.arg(opt("token", "Token to use when uploading").value_name("TOKEN"))
1111
.arg(opt(

‎src/bin/cargo/commands/read_manifest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Print a JSON representation of a Cargo.toml manifest.
99
Deprecated, use `cargo metadata --no-deps` instead.\
1010
",
1111
)
12-
.arg(opt("quiet", "No output printed to stdout").short("q"))
12+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1313
.arg_manifest_path()
1414
}
1515

‎src/bin/cargo/commands/run.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub fn cli() -> App {
1010
// .alias("r")
1111
.setting(AppSettings::TrailingVarArg)
1212
.about("Run a binary or example of the local package")
13-
.arg(opt("quiet", "No output printed to stdout").short("q"))
13+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1414
.arg(Arg::with_name("args").multiple(true))
1515
.arg_targets_bin_example(
1616
"Name of the bin target to run",

‎src/bin/cargo/commands/rustc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub fn cli() -> App {
88
subcommand("rustc")
99
.setting(AppSettings::TrailingVarArg)
1010
.about("Compile a package, and pass extra options to the compiler")
11-
.arg(opt("quiet", "No output printed to stdout").short("q"))
11+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1212
.arg(Arg::with_name("args").multiple(true).help("Rustc flags"))
1313
.arg_package("Package to build")
1414
.arg_jobs()

‎src/bin/cargo/commands/rustdoc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub fn cli() -> App {
66
subcommand("rustdoc")
77
.setting(AppSettings::TrailingVarArg)
88
.about("Build a package's documentation, using specified custom flags.")
9-
.arg(opt("quiet", "No output printed to stdout").short("q"))
9+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1010
.arg(Arg::with_name("args").multiple(true))
1111
.arg(opt(
1212
"open",

‎src/bin/cargo/commands/search.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use cargo::ops;
77
pub fn cli() -> App {
88
subcommand("search")
99
.about("Search packages in crates.io")
10-
.arg(opt("quiet", "No output printed to stdout").short("q"))
10+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1111
.arg(Arg::with_name("query").multiple(true))
1212
.arg_index()
1313
.arg(

‎src/bin/cargo/commands/uninstall.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops;
55
pub fn cli() -> App {
66
subcommand("uninstall")
77
.about("Remove a Rust binary")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg(Arg::with_name("spec").multiple(true))
1010
.arg_package_spec_simple("Package to uninstall")
1111
.arg(multi_opt("bin", "NAME", "Only uninstall the binary NAME"))

‎src/bin/cargo/commands/update.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use cargo::util::print_available_packages;
66
pub fn cli() -> App {
77
subcommand("update")
88
.about("Update dependencies as recorded in the local lock file")
9-
.arg(opt("quiet", "No output printed to stdout").short("q"))
9+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1010
.arg(opt("workspace", "Only update the workspace packages").short("w"))
1111
.arg_package_spec_simple("Package to update")
1212
.arg(opt(

‎src/bin/cargo/commands/vendor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::path::PathBuf;
55
pub fn cli() -> App {
66
subcommand("vendor")
77
.about("Vendor all dependencies for a project locally")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg_manifest_path()
1010
.arg(Arg::with_name("path").help("Where to vendor crates (`vendor` by default)"))
1111
.arg(

‎src/bin/cargo/commands/verify_project.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::process;
66
pub fn cli() -> App {
77
subcommand("verify-project")
88
.about("Check correctness of crate manifest")
9-
.arg(opt("quiet", "No output printed to stdout").short("q"))
9+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
1010
.arg_manifest_path()
1111
.after_help("Run `cargo help verify-project` for more detailed information.\n")
1212
}

‎src/bin/cargo/commands/version.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::command_prelude::*;
44
pub fn cli() -> App {
55
subcommand("version")
66
.about("Show version information")
7-
.arg(opt("quiet", "No output printed to stdout").short("q"))
7+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
88
.after_help("Run `cargo help version` for more detailed information.\n")
99
}
1010

‎src/bin/cargo/commands/yank.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cargo::ops;
55
pub fn cli() -> App {
66
subcommand("yank")
77
.about("Remove a pushed crate from the index")
8-
.arg(opt("quiet", "No output printed to stdout").short("q"))
8+
.arg(opt("quiet", "Do not print cargo log messages").short("q"))
99
.arg(Arg::with_name("crate"))
1010
.arg(
1111
opt("vers", "The version to yank or un-yank")

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

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

243243
-q, --quiet
244-
No output printed to stdout.
244+
Do not print cargo log messages.
245245

246246
--color when
247247
Control when colored output is used. Valid values:

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

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

183183
-q, --quiet
184-
No output printed to stdout.
184+
Do not print cargo log messages.
185185

186186
--color when
187187
Control when colored output is used. Valid values:

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

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

187187
-q, --quiet
188-
No output printed to stdout.
188+
Do not print cargo log messages.
189189

190190
--color when
191191
Control when colored output is used. Valid values:

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

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

6464
-q, --quiet
65-
No output printed to stdout.
65+
Do not print cargo log messages.
6666

6767
--color when
6868
Control when colored output is used. Valid values:

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

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

158158
-q, --quiet
159-
No output printed to stdout.
159+
Do not print cargo log messages.
160160

161161
--color when
162162
Control when colored output is used. Valid values:

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

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

4949
-q, --quiet
50-
No output printed to stdout.
50+
Do not print cargo log messages.
5151

5252
--color when
5353
Control when colored output is used. Valid values:

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

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

260260
-q, --quiet
261-
No output printed to stdout.
261+
Do not print cargo log messages.
262262

263263
--color when
264264
Control when colored output is used. Valid values:

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

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

2525
-q, --quiet
26-
No output printed to stdout.
26+
Do not print cargo log messages.
2727

2828
--color when
2929
Control when colored output is used. Valid values:

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

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

6464
-q, --quiet
65-
No output printed to stdout.
65+
Do not print cargo log messages.
6666

6767
--color when
6868
Control when colored output is used. Valid values:

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

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

249249
-q, --quiet
250-
No output printed to stdout.
250+
Do not print cargo log messages.
251251

252252
--color when
253253
Control when colored output is used. Valid values:

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

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

3434
-q, --quiet
35-
No output printed to stdout.
35+
Do not print cargo log messages.
3636

3737
--color when
3838
Control when colored output is used. Valid values:

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

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

3939
-q, --quiet
40-
No output printed to stdout.
40+
Do not print cargo log messages.
4141

4242
--color when
4343
Control when colored output is used. Valid values:

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

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

337337
-q, --quiet
338-
No output printed to stdout.
338+
Do not print cargo log messages.
339339

340340
--color when
341341
Control when colored output is used. Valid values:

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

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

5959
-q, --quiet
60-
No output printed to stdout.
60+
Do not print cargo log messages.
6161

6262
--color when
6363
Control when colored output is used. Valid values:

0 commit comments

Comments
 (0)