Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rust plugin: fix usage of rust-channel #2538

Merged
merged 2 commits into from
Apr 24, 2019

Conversation

sergiusens
Copy link
Collaborator

@sergiusens sergiusens commented Apr 23, 2019

rustup.sh no longer accepts a --channel argument. Fix by setting up the
toolchain using rustup.

For consistency, do not install the default toolchain on toolchain setup
and instead use the former mechanism for all code paths.

Lastly, remove an unsued variable in RustPlugin._get_toolchain

LP: #1825062

Signed-off-by: Sergio Schvezov sergio.schvezov@canonical.com

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run ./runtests.sh static?
  • Have you successfully run ./runtests.sh tests/unit?

rustup.sh no longer accepts a --channel argument. Fix by setting up the
toolchain using rustup.

For consistency, do not install the default toolchain on toolchain setup
and instead use the former mechanism for all code paths.

Lastly, remove an unsued variable in RustPlugin._get_toolchain

LP: #1825062

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
@sergiusens
Copy link
Collaborator Author

the test failure is due to catkin tests failing, unrelated to changes here.

Copy link
Contributor

@cmatsuoka cmatsuoka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't actually run the code, but fix seems sound by visual inspection.

@codecov-io
Copy link

codecov-io commented Apr 24, 2019

Codecov Report

Merging #2538 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2538      +/-   ##
==========================================
- Coverage    89.1%   89.09%   -0.01%     
==========================================
  Files         201      201              
  Lines       13660    13657       -3     
  Branches     2068     2067       -1     
==========================================
- Hits        12172    12168       -4     
  Misses       1050     1050              
- Partials      438      439       +1
Impacted Files Coverage Δ
snapcraft/plugins/rust.py 94.06% <100%> (-0.15%) ⬇️
snapcraft/internal/elf.py 80.71% <0%> (-0.36%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 70ab7d1...5e20fcb. Read the comment docs.

@sergiusens sergiusens merged commit 4eb0895 into canonical:master Apr 24, 2019
@sergiusens sergiusens deleted the rust-channel branch April 24, 2019 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants