Auto merge of #10168 - hi-rustin:rustin-patch-flag, r=ehuss

Unify the description of quiet flag

cc: #8928
I seem to have missed it.

Author: bors

src/bin/cargo/cli.rs

@@ -453,7 +453,7 @@ See 'cargo help <command>' for more information on a specific command.\n",
             .multiple(true)
             .global(true),
         )
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(
             opt("color", "Coloring: auto, always, never")
                 .value_name("WHEN")

src/bin/cargo/commands/bench.rs

@@ -5,7 +5,7 @@ pub fn cli() -> App {
     subcommand("bench")
         .setting(AppSettings::TrailingVarArg)
         .about("Execute all benchmarks of a local package")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(
             Arg::with_name("BENCHNAME")
                 .help("If specified, only run benches containing this string in their names"),

src/bin/cargo/commands/build.rs

@@ -7,7 +7,7 @@ pub fn cli() -> App {
         // subcommand aliases are handled in aliased_command()
         // .alias("b")
         .about("Compile a local package and all of its dependencies")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_package_spec(
             "Package to build (see `cargo help pkgid`)",
             "Build all packages in the workspace",

src/bin/cargo/commands/check.rs

@@ -7,7 +7,7 @@ pub fn cli() -> App {
         // subcommand aliases are handled in aliased_command()
         // .alias("c")
         .about("Check a local package and all of its dependencies for errors")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_package_spec(
             "Package(s) to check",
             "Check all packages in the workspace",

src/bin/cargo/commands/clean.rs

@@ -6,7 +6,7 @@ use cargo::util::print_available_packages;
 pub fn cli() -> App {
     subcommand("clean")
         .about("Remove artifacts that cargo has generated in the past")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_package_spec_simple("Package to clean artifacts for")
         .arg_manifest_path()
         .arg_target_triple("Target triple to clean output for")

src/bin/cargo/commands/doc.rs

@@ -7,7 +7,7 @@ pub fn cli() -> App {
         // subcommand aliases are handled in aliased_command()
         // .alias("d")
         .about("Build a package's documentation")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(opt(
             "open",
             "Opens the docs in a browser after the operation",

src/bin/cargo/commands/fetch.rs

@@ -6,7 +6,7 @@ use cargo::ops::FetchOptions;
 pub fn cli() -> App {
     subcommand("fetch")
         .about("Fetch dependencies of a package from the network")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_manifest_path()
         .arg_target_triple("Fetch dependencies for the target triple")
         .after_help("Run `cargo help fetch` for more detailed information.\n")

src/bin/cargo/commands/fix.rs

@@ -5,7 +5,7 @@ use cargo::ops::{self, CompileFilter, FilterRule, LibRule};
 pub fn cli() -> App {
     subcommand("fix")
         .about("Automatically fix lint warnings reported by rustc")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_package_spec(
             "Package(s) to fix",
             "Fix all packages in the workspace",

src/bin/cargo/commands/generate_lockfile.rs

@@ -5,7 +5,7 @@ use cargo::ops;
 pub fn cli() -> App {
     subcommand("generate-lockfile")
         .about("Generate the lockfile for a package")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_manifest_path()
         .after_help("Run `cargo help generate-lockfile` for more detailed information.\n")
 }

src/bin/cargo/commands/init.rs

@@ -5,7 +5,7 @@ use cargo::ops;
 pub fn cli() -> App {
     subcommand("init")
         .about("Create a new cargo package in an existing directory")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("path").default_value("."))
         .arg(opt("registry", "Registry to use").value_name("REGISTRY"))
         .arg_new_opts()

src/bin/cargo/commands/install.rs

@@ -7,7 +7,7 @@ use cargo::util::IntoUrl;
 pub fn cli() -> App {
     subcommand("install")
         .about("Install a Rust binary. Default location is $HOME/.cargo/bin")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("crate").empty_values(false).multiple(true))
         .arg(
             opt("version", "Specify a version to install")

src/bin/cargo/commands/locate_project.rs

@@ -6,7 +6,7 @@ use serde::Serialize;
 pub fn cli() -> App {
     subcommand("locate-project")
         .about("Print a JSON representation of a Cargo.toml file's location")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_manifest_path()
         .arg(
             opt(

src/bin/cargo/commands/login.rs

@@ -8,7 +8,7 @@ pub fn cli() -> App {
             "Save an api token from the registry locally. \
              If token is not specified, it will be read from stdin.",
         )
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("token"))
         // --host is deprecated (use --registry instead)
         .arg(

src/bin/cargo/commands/logout.rs

@@ -4,7 +4,7 @@ use cargo::ops;
 pub fn cli() -> App {
     subcommand("logout")
         .about("Remove an API token from the registry locally")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(opt("registry", "Registry to use").value_name("REGISTRY"))
         .after_help("Run `cargo help logout` for more detailed information.\n")
 }

src/bin/cargo/commands/metadata.rs

@@ -8,7 +8,7 @@ pub fn cli() -> App {
              the concrete used versions including overrides, \
              in machine-readable format",
         )
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_features()
         .arg(multi_opt(
             "filter-platform",

src/bin/cargo/commands/new.rs

@@ -5,7 +5,7 @@ use cargo::ops;
 pub fn cli() -> App {
     subcommand("new")
         .about("Create a new cargo package at <path>")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("path").required(true))
         .arg(opt("registry", "Registry to use").value_name("REGISTRY"))
         .arg_new_opts()

src/bin/cargo/commands/owner.rs

@@ -5,7 +5,7 @@ use cargo::ops::{self, OwnersOptions};
 pub fn cli() -> App {
     subcommand("owner")
         .about("Manage the owners of a crate on the registry")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("crate"))
         .arg(
             multi_opt(

src/bin/cargo/commands/package.rs

@@ -5,7 +5,7 @@ use cargo::ops::{self, PackageOpts};
 pub fn cli() -> App {
     subcommand("package")
         .about("Assemble the local package into a distributable tarball")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(
             opt(
                 "list",

src/bin/cargo/commands/pkgid.rs

@@ -6,7 +6,7 @@ use cargo::util::print_available_packages;
 pub fn cli() -> App {
     subcommand("pkgid")
         .about("Print a fully qualified package specification")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("spec"))
         .arg_package("Argument to get the package ID specifier for")
         .arg_manifest_path()

src/bin/cargo/commands/publish.rs

@@ -5,7 +5,7 @@ use cargo::ops::{self, PublishOpts};
 pub fn cli() -> App {
     subcommand("publish")
         .about("Upload a package to the registry")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_index()
         .arg(opt("token", "Token to use when uploading").value_name("TOKEN"))
         .arg(opt(

src/bin/cargo/commands/read_manifest.rs

@@ -9,7 +9,7 @@ Print a JSON representation of a Cargo.toml manifest.
 Deprecated, use `cargo metadata --no-deps` instead.\
 ",
         )
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_manifest_path()
 }
 

src/bin/cargo/commands/run.rs

@@ -10,7 +10,7 @@ pub fn cli() -> App {
         // .alias("r")
         .setting(AppSettings::TrailingVarArg)
         .about("Run a binary or example of the local package")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("args").multiple(true))
         .arg_targets_bin_example(
             "Name of the bin target to run",

src/bin/cargo/commands/rustc.rs

@@ -9,7 +9,7 @@ pub fn cli() -> App {
     subcommand("rustc")
         .setting(AppSettings::TrailingVarArg)
         .about("Compile a package, and pass extra options to the compiler")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("args").multiple(true).help("Rustc flags"))
         .arg_package("Package to build")
         .arg_jobs()

src/bin/cargo/commands/rustdoc.rs

@@ -6,7 +6,7 @@ pub fn cli() -> App {
     subcommand("rustdoc")
         .setting(AppSettings::TrailingVarArg)
         .about("Build a package's documentation, using specified custom flags.")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("args").multiple(true))
         .arg(opt(
             "open",

src/bin/cargo/commands/search.rs

@@ -7,7 +7,7 @@ use cargo::ops;
 pub fn cli() -> App {
     subcommand("search")
         .about("Search packages in crates.io")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("query").multiple(true))
         .arg_index()
         .arg(

src/bin/cargo/commands/tree.rs

@@ -12,7 +12,7 @@ use std::str::FromStr;
 pub fn cli() -> App {
     subcommand("tree")
         .about("Display a tree visualization of a dependency graph")
-        .arg(opt("quiet", "Suppress status messages").short("q"))
+        .arg_quiet()
         .arg_manifest_path()
         .arg_package_spec_no_all(
             "Package to be used as the root of the tree",

src/bin/cargo/commands/uninstall.rs

@@ -5,7 +5,7 @@ use cargo::ops;
 pub fn cli() -> App {
     subcommand("uninstall")
         .about("Remove a Rust binary")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("spec").multiple(true))
         .arg_package_spec_simple("Package to uninstall")
         .arg(multi_opt("bin", "NAME", "Only uninstall the binary NAME"))

src/bin/cargo/commands/update.rs

@@ -6,7 +6,7 @@ use cargo::util::print_available_packages;
 pub fn cli() -> App {
     subcommand("update")
         .about("Update dependencies as recorded in the local lock file")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(opt("workspace", "Only update the workspace packages").short("w"))
         .arg_package_spec_simple("Package to update")
         .arg(opt(

src/bin/cargo/commands/vendor.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 pub fn cli() -> App {
     subcommand("vendor")
         .about("Vendor all dependencies for a project locally")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_manifest_path()
         .arg(Arg::with_name("path").help("Where to vendor crates (`vendor` by default)"))
         .arg(

src/bin/cargo/commands/verify_project.rs

@@ -6,7 +6,7 @@ use std::process;
 pub fn cli() -> App {
     subcommand("verify-project")
         .about("Check correctness of crate manifest")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg_manifest_path()
         .after_help("Run `cargo help verify-project` for more detailed information.\n")
 }

src/bin/cargo/commands/version.rs

@@ -4,7 +4,7 @@ use crate::command_prelude::*;
 pub fn cli() -> App {
     subcommand("version")
         .about("Show version information")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .after_help("Run `cargo help version` for more detailed information.\n")
 }
 

src/bin/cargo/commands/yank.rs

@@ -5,7 +5,7 @@ use cargo::ops;
 pub fn cli() -> App {
     subcommand("yank")
         .about("Remove a pushed crate from the index")
-        .arg(opt("quiet", "Do not print cargo log messages").short("q"))
+        .arg_quiet()
         .arg(Arg::with_name("crate"))
         .arg(
             opt("vers", "The version to yank or un-yank")

src/cargo/util/command_prelude.rs

@@ -236,6 +236,10 @@ pub trait AppExt: Sized {
             "Outputs a future incompatibility report at the end of the build",
         ))
     }
+
+    fn arg_quiet(self) -> Self {
+        self._arg(opt("quiet", "Do not print cargo log messages").short("q"))
+    }
 }
 
 impl AppExt for App {