Skip to content

[beta] backports - #82062

Merged
bors merged 6 commits into
rust-lang:betafrom
Mark-Simulacrum:beta-next
Feb 14, 2021
Merged

[beta] backports#82062
bors merged 6 commits into
rust-lang:betafrom
Mark-Simulacrum:beta-next

Conversation

@Mark-Simulacrum

Copy link
Copy Markdown
Member

This backports some PRs and bumps to the released stable compiler:

r? @Mark-Simulacrum

Mark-Simulacrumand others added 6 commits February 13, 2021 10:41
The panic happens when in recovery parsing a full `impl`
(`parse_item_impl`) fails and we drop the `DiagnosticBuilder` for the
recovery suggestion and return the `parse_item_impl` error.
We now raise the original error "expected identifier found `impl`" when
parsing the `impl` fails.
Note that the regression test is slightly simplified version of the
original repro in rust-lang#81806, to make the error output smaller and more
resilient to unrelated changes in parser error messages.
Fixesrust-lang#81806
@rust-highfive

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 13, 2021
@Mark-Simulacrum

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never

@bors

bors commented Feb 13, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit b016024 has been approved by Mark-Simulacrum

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 13, 2021
@bors

bors commented Feb 14, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b016024 with merge 14b2755...

@bors

bors commented Feb 14, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 14b2755 to beta...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 14, 2021
@bors
bors merged commit 14b2755 into rust-lang:betaFeb 14, 2021
@rustbotrustbot added this to the 1.51.0 milestone Feb 14, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@Mark-Simulacrum@rust-highfive@bors@rustbot@emilyalbini@osa1@LeSeulArtichaut