Auto merge of #12594 - epage:help-redundant, r=weihanglo

fix(help): Remove redundant information from new/init Auditing all of the `--help` in prep for #12578 and noticed that we list the VCS information twice, once on our end and once by clap.
rust-lang · Aug 29, 2023 · a873df5 · a873df5
2 parents 96fe1c9 + ad0a113
commit a873df5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs
@@ -260,8 +260,7 @@ pub trait CommandExt: Sized {
             opt(
                 "vcs",
                 "Initialize a new repository for the given version \
-                 control system (git, hg, pijul, or fossil) or do not \
-                 initialize any version control at all (none), overriding \
+                 control system, overriding \
                  a global configuration.",
             )
             .value_name("VCS")

diff --git a/tests/testsuite/cargo_init/help/stdout.log b/tests/testsuite/cargo_init/help/stdout.log
@@ -6,10 +6,9 @@ Arguments:
   [path]  [default: .]
 
 Options:
-      --vcs <VCS>            Initialize a new repository for the given version control system (git,
-                             hg, pijul, or fossil) or do not initialize any version control at all
-                             (none), overriding a global configuration. [possible values: git, hg,
-                             pijul, fossil, none]
+      --vcs <VCS>            Initialize a new repository for the given version control system,
+                             overriding a global configuration. [possible values: git, hg, pijul,
+                             fossil, none]
       --bin                  Use a binary (application) template [default]
       --lib                  Use a library template
       --edition <YEAR>       Edition to set for the crate generated [possible values: 2015, 2018,

diff --git a/tests/testsuite/cargo_new/help/stdout.log b/tests/testsuite/cargo_new/help/stdout.log
@@ -6,10 +6,9 @@ Arguments:
   <path>  
 
 Options:
-      --vcs <VCS>            Initialize a new repository for the given version control system (git,
-                             hg, pijul, or fossil) or do not initialize any version control at all
-                             (none), overriding a global configuration. [possible values: git, hg,
-                             pijul, fossil, none]
+      --vcs <VCS>            Initialize a new repository for the given version control system,
+                             overriding a global configuration. [possible values: git, hg, pijul,
+                             fossil, none]
       --bin                  Use a binary (application) template [default]
       --lib                  Use a library template
       --edition <YEAR>       Edition to set for the crate generated [possible values: 2015, 2018,