Bump bootstrap compiler #71439
Merged
Bump bootstrap compiler #71439
Conversation
This file contains hidden or 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
|
r? @kennytm (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
Mark-Simulacrum
force-pushed
the
stage0-next
branch
from
4337c42 to
0b1238c
Compare
|
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. |
|
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. |
|
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 |
|
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? |
src/libcore/macros/mod.rs
Outdated
| @@ -360,7 +336,7 @@ macro_rules! r#try { | |||
| } | |||
| }; | |||
| ($expr:expr,) => { | |||
| $crate::r#try!($expr) | |||
| $crate::try!($expr) | |||
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...
Mark-Simulacrum
force-pushed
the
stage0-next
branch
from
0b1238c to
986e55a
Compare
|
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... |
|
@bors r+ |
|
📌 Commit 986e55a has been approved by |
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Apr 23, 2020
…s-schievink Bump bootstrap compiler This bumps the bootstrap compiler and the rustfmt that x.py fmt uses.
Mark-Simulacrum
force-pushed
the
stage0-next
branch
from
986e55a to
fb34aad
Compare
|
@bors r=jonas-schievink (rustfmt "bug" was my editor not passing --edition=2018). |
|
💡 This pull request was already approved, no need to approve it again.
|
|
📌 Commit 986e55a has been approved by |
RalfJung
reviewed
Apr 23, 2020
| @@ -61,7 +58,7 @@ macro_rules! fixed_size_encoding_byte_len_and_defaults { | |||
| }; | |||
| self.write_to_bytes(&mut b[i]); | |||
| } | |||
| } | |||
| }; | |||
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 :)
|
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 |
|
CI failure is I think related to github troubles, not this PR's changes. |
|
☔ The latest upstream changes (presumably #71496) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Mark-Simulacrum
force-pushed
the
stage0-next
branch
from
fb34aad to
811ecac
Compare
|
@bors r=jonas-schievink |
|
📌 Commit 811ecacdbf6b5f253a0da6dd86087c20204e7f0b has been approved by |
bors
added
S-waiting-on-bors
|
@bors p=1 (fairly prone to merge conflicts due to the spread-out changes) |
|
⌛ Testing commit 811ecacdbf6b5f253a0da6dd86087c20204e7f0b with merge 49ec3c6cbb378e09a48a68395349e6d366f82df4... |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
Mark-Simulacrum
force-pushed
the
stage0-next
branch
from
811ecac to
17a393e
Compare
|
@bors r=jonas-schievink |
|
📌 Commit 17a393e has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
This was referenced Apr 25, 2020
Merged
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.
This bumps the bootstrap compiler and the rustfmt that x.py fmt uses.