Consistently give toolchain argument a help text #1212
Merged
+23
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
☔ The latest upstream changes (presumably #1214) made this pull request unmergeable. Please resolve the merge conflicts. |
alexcrichton
force-pushed
the
toolchain-arg-help
branch
from
5611373
to
8c4632f
Compare
|
@bors: r+ Thanks! |
|
📌 Commit 8c4632f has been approved by |
|
☔ The latest upstream changes (presumably #1213) made this pull request unmergeable. Please resolve the merge conflicts. |
|
🔒 Merge conflict |
This adds a help text to every toolchain command line argument. The
help text for 'rustup default' now reads:
rustup-default
Set the default toolchain
USAGE:
rustup default <toolchain>
FLAGS:
-h, --help Prints help information
ARGS:
<toolchain> Toolchain name, such as 'stable', 'nightly', or '1.8.0'.
For more information see `rustup help toolchain`
DISCUSSION:
Sets the default toolchain to the one specified. If the toolchain
is not already installed then it is installed first.
Two commands (update and install) already explained what the toolchain
argument was -- but it was explained in the freeform "after help"
text. These explanations have been moved to the arguments themselves
for consistency.
Fixes rust-lang#923.
mgeisler
force-pushed
the
toolchain-arg-help
branch
from
8c4632f
to
fab6588
Compare
|
Rebased and resolved the merge conflicts. |
|
@bors: r+ Thanks! |
|
📌 Commit fab6588 has been approved by |
bors
added a commit
that referenced
this pull request
Aug 13, 2017
Consistently give toolchain argument a help text
This adds a help text to every toolchain command line argument. The
help text for 'rustup default' now reads:
```
rustup-default
Set the default toolchain
USAGE:
rustup default <toolchain>
FLAGS:
-h, --help Prints help information
ARGS:
<toolchain> Toolchain name, such as 'stable', 'nightly', or '1.8.0'.
For more information see `rustup help toolchain`
DISCUSSION:
Sets the default toolchain to the one specified. If the toolchain
is not already installed then it is installed first.
```
Two commands (update and install) already explained what the toolchain
argument was -- but it was explained in the freeform "after help"
text. These explanations have been moved to the arguments themselves
for consistency.
Fixes #923.
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a help text to every toolchain command line argument. The
help text for 'rustup default' now reads:
Two commands (update and install) already explained what the toolchain
argument was -- but it was explained in the freeform "after help"
text. These explanations have been moved to the arguments themselves
for consistency.
Fixes #923.