From ad0a11349e0c9b52664c842d40a0960a08de5cb1 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 29 Aug 2023 16:28:49 -0500 Subject: [PATCH] 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. --- src/cargo/util/command_prelude.rs | 3 +-- tests/testsuite/cargo_init/help/stdout.log | 7 +++---- tests/testsuite/cargo_new/help/stdout.log | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs index ed470653864..2186b9f2900 100644 --- 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 index 5dfb02498d7..0eb4c976bb7 100644 --- 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 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 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 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 index 7252e0da1f0..a937f619bdd 100644 --- a/tests/testsuite/cargo_new/help/stdout.log +++ b/tests/testsuite/cargo_new/help/stdout.log @@ -6,10 +6,9 @@ Arguments: Options: - --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 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 Edition to set for the crate generated [possible values: 2015, 2018,