Update rust-toolchain #1776

gendx · 2020-04-21T13:08:33Z

Pull Request Overview

This pull request updates the Rust toolchain to today's nightly (nightly-2020-04-21).

Fixed the sed commands in tools/update_rust_version.sh to work on Linux.
Fixed some new warnings about unnecessary parentheses.
Migrated from the now-deprecated asm! macro to its llvm_asm! replacement.

I've seen that the Tock 1.5 version is in progress (#1685), but almost no test have been done yet. It would be a nice opportunity to upgrade to a nightly as recent as possible for this release.

Testing Strategy

This pull request was tested by Travis.

TODO or Help Wanted

It looks like this particular nightly triggers compiler crashes: 'rustc' panicked at 'failed to lookup SourceFile in new context' rust-lang/rust#70924.

Documentation Updated

Updated the relevant files in /docs, or no updates are required.

Formatting

Ran make formatall.

error: use of deprecated item 'asm': the syntax of asm! will change soon, use llvm_asm! to avoid breakage

tools/update_rust_version.sh

ppannuto

@tock/core-wg I've reviewed all the changes and they're purely cosmetic. I think this is something we can/should pull in for 1.5 before doing testing.

gendx · 2020-04-21T14:27:47Z

Hum, this caused the following compiler crash on Travis.

thread 'rustc' panicked at 'failed to lookup `SourceFile` in new context', src/librustc_middle/ty/query/on_disk_cache.rs:456:17
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
error: internal compiler error: unexpected panic
note: the compiler unexpectedly panicked. this is a bug.
note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
note: rustc 1.44.0-nightly (20fc02f83 2020-04-20) running on x86_64-unknown-linux-gnu
note: compiler flags: -C opt-level=z -C debuginfo=2 -C debug-assertions=on -C incremental --crate-type lib
note: some of the compiler flags provided by cargo are hidden

I observed a similar issue at some point on my machine (rust-lang/rust#71380).

So it looks like this particular nightly version is a bad one. Maybe we should keep the previous pinned version for the release.

bradjc · 2020-04-21T14:34:22Z

We normally update every two-ish months unless there is a problem, plus with this not passing travis, I say we continue with 1.5-rc1 to try to make this a timely release.

ppannuto · 2020-04-21T14:42:00Z

Upon second thinking, you're right, a last-minute nightly update doesn't really make sense if the goal is a stable release, but I do think this can merge right after the 1.5 freeze.

Re the build issue: That's a known cacheing problem, rust-lang/rust#70924 -- clearing the travis cache fixed the build here, running clean locally should fix as well. Not sure whether that will be fixed or something people will just need to do as a one-off.

gendx · 2020-04-21T14:48:06Z

@ppannuto did someone manually re-run the Travis build? I wanted to reference it but now it unfortunately shows as "passed"...

ppannuto · 2020-04-21T14:54:30Z

I did, sorry

alistair23

Looks good for after 1.5

bradjc

Might as well go even newer!

But can the script be changed back or something? I now get a bunch of new files:

On branch pr/1776
Untracked files:
  (use "git add <file>..." to include in what will be committed)

	.travis.yml.bak
	.vscode/settings.json.bak
	doc/Getting_Started.md.bak
	rust-toolchain.bak
	shell.nix.bak
	tools/netlify-build.sh.bak

ppannuto · 2020-05-01T17:00:11Z

I updated the script to fix the .bak file problem

bradjc · 2020-05-01T22:24:02Z

Can we redo the build?

gendx · 2020-05-04T12:35:57Z

Marking as draft until nightly is usable again: rust-lang/rust#70924

hudson-ayers · 2020-05-11T15:10:06Z

Separately from the issue that requires cargo clean, make format fails on this branch, throwing the error "failed to find targets"

bradjc · 2020-05-15T18:58:06Z

The blocking issue is only relevant to travis, correct? I don't think we can wait indefinitely for Rust to fix this. But hopefully this is patched soon.

I also just tried make format on today's nightly and it ran without issue.

hudson-ayers · 2020-05-15T19:01:43Z

Yeah, the make format issue was actually from an out of tree file getting picked up by the formatting script, sorry forgot to update here.

gendx · 2020-05-18T09:27:08Z

The blocking issue is only relevant to travis, correct? I don't think we can wait indefinitely for Rust to fix this. But hopefully this is patched soon.

As discussed in #1654, this is unfortunately the trade-off of choosing Rust nightly over Rust stable. When some things break on nightly there is no prioritization to fix them within a day. And the bigger the codebase + the more unstable features we rely on, the likelier it is that at least one thing breaks in a nightly release (as we've already seen with nightly versions not supporting Rustfmt or Clippy).

In this particular case, we can get away by asking developers to explicitly cargo clean before each call to cargo (at the expense of longer compilation times) or whenever they see the compiler error.

On the other hand, after a month and a half lingering around, this bug is now "high priority", so i guess there is a chance it gets fixed in the next few weeks: rust-lang/rust#70924 (comment).

1884: Remove unused `asm` feature flags r=ppannuto a=bradjc ### Pull Request Overview I noticed in #1776 that not all `asm` features are actually required. This removes many of the `asm` feature. Part of #1654, technically. ### Testing Strategy This pull request was tested by travis. (Can I still say that?) ### TODO or Help Wanted n/a ### Documentation Updated - [x] Updated the relevant files in `/docs`, or no updates are required. ### Formatting - [x] Ran `make format`. - [x] Fixed errors surfaced by `make clippy`. Co-authored-by: Brad Campbell <[email protected]>

hudson-ayers · 2020-05-31T21:20:53Z

rust-lang/rust#70924 has been fixed! So if we update this to latest nightly we are probably good to go.

gendx · 2020-06-02T08:00:43Z

rust-lang/rust#70924 has been fixed! So if we update this to latest nightly we are probably good to go.

It's probably easier to start from scratch to avoid merge conflicts from the past couple months. And the branch name is not valid anymore ;)

gendx added 3 commits April 21, 2020 14:36

Update to today's nightly.

6ea46cf

Remove warned parentheses.

ace4fc5

Migrate away from deprecated asm feature.

0486784

error: use of deprecated item 'asm': the syntax of asm! will change soon, use llvm_asm! to avoid breakage

ppannuto reviewed Apr 21, 2020

View reviewed changes

tools/update_rust_version.sh Outdated Show resolved Hide resolved

tools: fix in-place sed to be x-platform

d512764

ppannuto previously approved these changes Apr 21, 2020

View reviewed changes

gendx marked this pull request as draft April 21, 2020 15:11

gendx mentioned this pull request Apr 21, 2020

'rustc' panicked at 'failed to lookup SourceFile in new context' rust-lang/rust#70924

Closed

alistair23 previously approved these changes Apr 22, 2020

View reviewed changes

update rust to 04-30-2020

5882230

bradjc dismissed stale reviews from alistair23 and ppannuto via 5882230 April 30, 2020 22:22

bradjc requested changes Apr 30, 2020

View reviewed changes

bradjc marked this pull request as ready for review April 30, 2020 22:24

ppannuto force-pushed the nightly-2020-04 branch 2 times, most recently from e7af2e3 to 08194db Compare May 1, 2020 17:01

tools: don't leave .bak files around in update

e4c9c84

ppannuto force-pushed the nightly-2020-04 branch from 08194db to e4c9c84 Compare May 1, 2020 17:01

alistair23 approved these changes May 1, 2020

View reviewed changes

bradjc approved these changes May 1, 2020

View reviewed changes

gendx marked this pull request as draft May 4, 2020 12:35

bradjc mentioned this pull request May 28, 2020

Remove unused asm feature flags #1884

Merged

3 tasks

gendx closed this Jun 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update rust-toolchain #1776

Update rust-toolchain #1776

gendx commented Apr 21, 2020 •

edited

Loading

ppannuto left a comment

gendx commented Apr 21, 2020

bradjc commented Apr 21, 2020

ppannuto commented Apr 21, 2020

gendx commented Apr 21, 2020

ppannuto commented Apr 21, 2020

alistair23 left a comment

bradjc left a comment

ppannuto commented May 1, 2020

bradjc commented May 1, 2020

gendx commented May 4, 2020

hudson-ayers commented May 11, 2020

bradjc commented May 15, 2020

hudson-ayers commented May 15, 2020

gendx commented May 18, 2020

hudson-ayers commented May 31, 2020

gendx commented Jun 2, 2020

Update rust-toolchain #1776

Update rust-toolchain #1776

Conversation

gendx commented Apr 21, 2020 • edited Loading

Pull Request Overview

Testing Strategy

TODO or Help Wanted

Documentation Updated

Formatting

ppannuto left a comment

Choose a reason for hiding this comment

gendx commented Apr 21, 2020

bradjc commented Apr 21, 2020

ppannuto commented Apr 21, 2020

gendx commented Apr 21, 2020

ppannuto commented Apr 21, 2020

alistair23 left a comment

Choose a reason for hiding this comment

bradjc left a comment

Choose a reason for hiding this comment

ppannuto commented May 1, 2020

bradjc commented May 1, 2020

gendx commented May 4, 2020

hudson-ayers commented May 11, 2020

bradjc commented May 15, 2020

hudson-ayers commented May 15, 2020

gendx commented May 18, 2020

hudson-ayers commented May 31, 2020

gendx commented Jun 2, 2020

gendx commented Apr 21, 2020 •

edited

Loading