rust-toolchain: Support local toolchain names in the override file #2141
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 `rust-toolchain` override file was limited to valid toolchain names. This commit weakens that slightly to permit *any* string so long as it's a local toolchain name. If it's not then it has to be a valid channelish toolchain name instead. This fixes rust-lang#1745 Signed-off-by: Daniel Silverstone <[email protected]>
SimonSapin
approved these changes
Dec 5, 2019
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.
The
rust-toolchainoverride file was limited to valid toolchainnames. This commit weakens that slightly to permit any string so
long as it's a local toolchain name. If it's not then it has to
be a valid channelish toolchain name instead.
This fixes #1745
It's worth noting that @mikhail-krainik won't be able to commit such a file to git and expect that others will have it work out of the box unless they also have the exact toolchain they list in the file, or the name is a valid channel/version/channel+date.