Uh oh!
There was an error while loading. Please reload this page.
Bump bootstrap compiler - #71439
Conversation
rust-highfive
commented
Apr 22, 2020
r? @kennytm (rust_highfive has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
4337c42 to
0b1238cCompareMark-Simulacrum
commented
Apr 22, 2020
Hm, CI failure is concerning. This seems to be due to the Cargo update (a bump to the Cargo.lock resolved it). @ehuss -- do we know what might be causing this? This seems like a bug, since this PR doesn't do anything other than update Cargo, so we shouldn't be seeing a Cargo.lock update as a result. Maybe there's a resolver change in beta that is leading to a forced update? The "Bump Cargo.lock?" commit is the one I'm referencing. |
Mark-Simulacrum
commented
Apr 22, 2020
I'm going to r? @ehuss here for now as I'd like their input on the Cargo.lock bump being a bug before we merge, but if you don't want to review this feel free to re-r? after that to someone else. |
rust-highfive
commented
Apr 22, 2020
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Mark-Simulacrum
commented
Apr 22, 2020
Huh. Weird. We don't seem to be passing --edition=2018 and I don't think we've made try a reserved keyword in 2015? cc @rust-lang/release -- anyone know of changes relating to try! on beta? |
There was a problem hiding this comment.
Was this change intentional?
There was a problem hiding this comment.
Oh. I suspect rustfmt? I'll look...
ehuss
commented
Apr 22, 2020
0b1238c to
986e55aCompareMark-Simulacrum
commented
Apr 23, 2020
I thought I had checked @ehuss -- but you are correct, I think. Sorry for the noise! I believe I've pushed up a fix to both bugs. r? @jonas-schievink since you've presumably done at least a little looking at the patch... |
jonas-schievink
commented
Apr 23, 2020
@bors r+ |
bors
commented
Apr 23, 2020
📌 Commit 986e55a has been approved by |
…s-schievink Bump bootstrap compiler This bumps the bootstrap compiler and the rustfmt that x.py fmt uses.
986e55a to
fb34aadCompareMark-Simulacrum
commented
Apr 23, 2020
@bors r=jonas-schievink (rustfmt "bug" was my editor not passing --edition=2018). |
bors
commented
Apr 23, 2020
💡 This pull request was already approved, no need to approve it again.
|
bors
commented
Apr 23, 2020
📌 Commit 986e55a has been approved by |
There was a problem hiding this comment.
Curious spurious (but harmless) changes?
There was a problem hiding this comment.
These are rustfmt-caused (from the update, I'm pretty sure, not my editor :)
rust-highfive
commented
Apr 23, 2020
Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Mark-Simulacrum
commented
Apr 23, 2020
CI failure is I think related to github troubles, not this PR's changes. |
bors
commented
Apr 24, 2020
☔ The latest upstream changes (presumably #71496) made this pull request unmergeable. Please resolve the merge conflicts. |
fb34aad to
811ecacCompareMark-Simulacrum
commented
Apr 24, 2020
@bors r=jonas-schievink |
bors
commented
Apr 24, 2020
📌 Commit 811ecacdbf6b5f253a0da6dd86087c20204e7f0b has been approved by |
jonas-schievink
commented
Apr 24, 2020
@bors p=1 (fairly prone to merge conflicts due to the spread-out changes) |
bors
commented
Apr 25, 2020
⌛ Testing commit 811ecacdbf6b5f253a0da6dd86087c20204e7f0b with merge 49ec3c6cbb378e09a48a68395349e6d366f82df4... |
bors
commented
Apr 25, 2020
💔 Test failed - checks-azure |
811ecac to
17a393eCompareMark-Simulacrum
commented
Apr 25, 2020
@bors r=jonas-schievink |
bors
commented
Apr 25, 2020
📌 Commit 17a393e has been approved by |
bors
commented
Apr 25, 2020
bors
commented
Apr 25, 2020
☀️ Test successful - checks-azure |
This bumps the bootstrap compiler and the rustfmt that x.py fmt uses.