rust plugin: use rust-toolchain by default if present #2613
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
If the plugin options are not used and a rust-toolchain file is found in the source, use that and only default to the stable toolchain channel as a last resort. Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
cjp256
approved these changes
Jun 26, 2019
| If a rust-toolchain file is not present and neither rust-version | ||
| nor rust-channel are set, then stable will be returned. | ||
| """ | ||
| if self.options.source_subdir: |
There was a problem hiding this comment.
NIT - could be simplified:
sourcedir = self.sourcedir
if self.options.source_subdir:
sourcedir = os.path.join(sourcedir, self.options.source_subdir)
There was a problem hiding this comment.
this is a a problem with all plugins, we should fix it across instead of just here
| else: | ||
| sourcedir = self.sourcedir | ||
| rust_toolchain_path = os.path.join(sourcedir, "rust-toolchain") | ||
|
|
||
| if self.options.rust_revision: |
There was a problem hiding this comment.
I wonder if it should error if both revision and channel are specified in the config? Otherwise it should probably spell out the precedence in the documentation.
There was a problem hiding this comment.
I will do a follow-up for this, it is documented though
|
Failed unrelated test:
|
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.
If the plugin options are not used and a rust-toolchain file
is found in the source, use that and only default to the
stable toolchain channel as a last resort.
Signed-off-by: Sergio Schvezov sergio.schvezov@canonical.com
./runtests.sh static?./runtests.sh tests/unit?