Add some help about rustup's +toolchain syntax. #8455
Merged
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
|
r? @Eh2406 (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Eh2406
reviewed
Jul 6, 2020
src/bin/cargo/cli.rs
Outdated
| @@ -256,13 +256,19 @@ impl GlobalArgs { | |||
| } | |||
|
|
|||
| fn cli() -> App { | |||
| let is_rustup = std::env::var_os("RUSTUP_HOME").is_some(); | |||
| let usage = match is_rustup { | |||
There was a problem hiding this comment.
Oh, no good reason. I think I wanted to save 1 line of code or something. I went ahead and switched it to a if since that is probably more natural.
|
Thank you! This feels like a great compromise on how much rustup docs to add to cargo. |
|
@bors r+ |
|
📌 Commit 337fd9f has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 7, 2020
Update cargo 5 commits in fede83ccf973457de319ba6fa0e36ead454d2e20..729e5676a02404b1d745013f8b280945cfa2d50d 2020-07-02 21:51:34 +0000 to 2020-07-07 15:51:28 +0000 - Add support for deserializing enums in config files (rust-lang/cargo#8454) - Write GNU tar files, supporting long names. (rust-lang/cargo#8453) - Don't overwrite existing `rustdoc` args with --document-private-items (rust-lang/cargo#8449) - Add some help about rustup's +toolchain syntax. (rust-lang/cargo#8455) - Update metadata man page. (rust-lang/cargo#8451)
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 9, 2020
Update cargo 6 commits in fede83ccf973457de319ba6fa0e36ead454d2e20..4f74d9b2a771c58b7ef4906b2668afd075bc8081 2020-07-02 21:51:34 +0000 to 2020-07-08 17:13:00 +0000 - Disable long_file_names test if not supported on Windows. (rust-lang/cargo#8469) - Add support for deserializing enums in config files (rust-lang/cargo#8454) - Write GNU tar files, supporting long names. (rust-lang/cargo#8453) - Don't overwrite existing `rustdoc` args with --document-private-items (rust-lang/cargo#8449) - Add some help about rustup's +toolchain syntax. (rust-lang/cargo#8455) - Update metadata man page. (rust-lang/cargo#8451)
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 9, 2020
Update cargo 6 commits in fede83ccf973457de319ba6fa0e36ead454d2e20..4f74d9b2a771c58b7ef4906b2668afd075bc8081 2020-07-02 21:51:34 +0000 to 2020-07-08 17:13:00 +0000 - Disable long_file_names test if not supported on Windows. (rust-lang/cargo#8469) - Add support for deserializing enums in config files (rust-lang/cargo#8454) - Write GNU tar files, supporting long names. (rust-lang/cargo#8453) - Don't overwrite existing `rustdoc` args with --document-private-items (rust-lang/cargo#8449) - Add some help about rustup's +toolchain syntax. (rust-lang/cargo#8455) - Update metadata man page. (rust-lang/cargo#8451)
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 9, 2020
Update cargo 6 commits in fede83ccf973457de319ba6fa0e36ead454d2e20..4f74d9b2a771c58b7ef4906b2668afd075bc8081 2020-07-02 21:51:34 +0000 to 2020-07-08 17:13:00 +0000 - Disable long_file_names test if not supported on Windows. (rust-lang/cargo#8469) - Add support for deserializing enums in config files (rust-lang/cargo#8454) - Write GNU tar files, supporting long names. (rust-lang/cargo#8453) - Don't overwrite existing `rustdoc` args with --document-private-items (rust-lang/cargo#8449) - Add some help about rustup's +toolchain syntax. (rust-lang/cargo#8455) - Update metadata man page. (rust-lang/cargo#8451)
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 tries to bring more attention to the
+toolchainsyntax from rustup.Closes #8058