Skip to content

Commit a873df5

Browse files
committed
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.
2 parents 96fe1c9 + ad0a113 commit a873df5

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

src/cargo/util/command_prelude.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ pub trait CommandExt: Sized {
260260
opt(
261261
"vcs",
262262
"Initialize a new repository for the given version \
263-
control system (git, hg, pijul, or fossil) or do not \
264-
initialize any version control at all (none), overriding \
263+
control system, overriding \
265264
a global configuration.",
266265
)
267266
.value_name("VCS")

tests/testsuite/cargo_init/help/stdout.log

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ Arguments:
66
[path] [default: .]
77

88
Options:
9-
--vcs <VCS> Initialize a new repository for the given version control system (git,
10-
hg, pijul, or fossil) or do not initialize any version control at all
11-
(none), overriding a global configuration. [possible values: git, hg,
12-
pijul, fossil, none]
9+
--vcs <VCS> Initialize a new repository for the given version control system,
10+
overriding a global configuration. [possible values: git, hg, pijul,
11+
fossil, none]
1312
--bin Use a binary (application) template [default]
1413
--lib Use a library template
1514
--edition <YEAR> Edition to set for the crate generated [possible values: 2015, 2018,

tests/testsuite/cargo_new/help/stdout.log

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ Arguments:
66
<path>
77

88
Options:
9-
--vcs <VCS> Initialize a new repository for the given version control system (git,
10-
hg, pijul, or fossil) or do not initialize any version control at all
11-
(none), overriding a global configuration. [possible values: git, hg,
12-
pijul, fossil, none]
9+
--vcs <VCS> Initialize a new repository for the given version control system,
10+
overriding a global configuration. [possible values: git, hg, pijul,
11+
fossil, none]
1312
--bin Use a binary (application) template [default]
1413
--lib Use a library template
1514
--edition <YEAR> Edition to set for the crate generated [possible values: 2015, 2018,

0 commit comments

Comments
 (0)