Skip to content

Commit a0f6557

Browse files
committed
Auto merge of #3371 - trafficland:master, r=alexcrichton
Add -vv to the list of options printed by cargo --help.
2 parents cb2102b + d6d69a9 commit a0f6557

29 files changed

+29
-28
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ src/registry/target
99
src/registry/Cargo.lock
1010
rustc
1111
__pycache__
12+
.idea/

src/bin/bench.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Options:
4848
--no-default-features Do not build the `default` feature
4949
--target TRIPLE Build for the target triple
5050
--manifest-path PATH Path to the manifest to build benchmarks for
51-
-v, --verbose ... Use verbose output
51+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
5252
-q, --quiet No output printed to stdout
5353
--color WHEN Coloring: auto, always, never
5454
--message-format FMT Error format: human, json [default: human]

src/bin/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Options:
4949
--no-default-features Do not build the `default` feature
5050
--target TRIPLE Build for the target triple
5151
--manifest-path PATH Path to the manifest to compile
52-
-v, --verbose ... Use verbose output
52+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
5353
-q, --quiet No output printed to stdout
5454
--color WHEN Coloring: auto, always, never
5555
--message-format FMT Error format: human, json [default: human]

src/bin/cargo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Options:
4343
-V, --version Print version info and exit
4444
--list List installed commands
4545
--explain CODE Run `rustc --explain CODE`
46-
-v, --verbose ... Use verbose output
46+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
4747
-q, --quiet No output printed to stdout
4848
--color WHEN Coloring: auto, always, never
4949
--frozen Require Cargo.lock and cache are up to date

src/bin/clean.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Options:
3030
--manifest-path PATH Path to the manifest to the package to clean
3131
--target TRIPLE Target triple to clean output for (default all)
3232
--release Whether or not to clean release artifacts
33-
-v, --verbose ... Use verbose output
33+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
3434
-q, --quiet No output printed to stdout
3535
--color WHEN Coloring: auto, always, never
3636
--frozen Require Cargo.lock and cache are up to date

src/bin/doc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Options:
4545
--no-default-features Do not build the `default` feature
4646
--target TRIPLE Build for the target triple
4747
--manifest-path PATH Path to the manifest to document
48-
-v, --verbose ... Use verbose output
48+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
4949
-q, --quiet No output printed to stdout
5050
--color WHEN Coloring: auto, always, never
5151
--message-format FMT Error format: human, json [default: human]

src/bin/fetch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Usage:
2222
Options:
2323
-h, --help Print this message
2424
--manifest-path PATH Path to the manifest to fetch dependencies for
25-
-v, --verbose ... Use verbose output
25+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
2626
-q, --quiet No output printed to stdout
2727
--color WHEN Coloring: auto, always, never
2828
--frozen Require Cargo.lock and cache are up to date

src/bin/generate_lockfile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Usage:
2424
Options:
2525
-h, --help Print this message
2626
--manifest-path PATH Path to the manifest to generate a lockfile for
27-
-v, --verbose ... Use verbose output
27+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
2828
-q, --quiet No output printed to stdout
2929
--color WHEN Coloring: auto, always, never
3030
--frozen Require Cargo.lock and cache are up to date

src/bin/git_checkout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Usage:
2222
2323
Options:
2424
-h, --help Print this message
25-
-v, --verbose ... Use verbose output
25+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
2626
-q, --quiet No output printed to stdout
2727
--color WHEN Coloring: auto, always, never
2828
--frozen Require Cargo.lock and cache are up to date

src/bin/init.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Options:
3232
--bin Use a binary (application) template
3333
--lib Use a library template
3434
--name NAME Set the resulting package name
35-
-v, --verbose ... Use verbose output
35+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
3636
-q, --quiet No output printed to stdout
3737
--color WHEN Coloring: auto, always, never
3838
--frozen Require Cargo.lock and cache are up to date

0 commit comments

Comments
 (0)