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.

Sign up for GitHub

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

Jump to bottom

[beta] backports #82062

Merged
merged 6 commits into from
Feb 14, 2021
Merged

[beta] backports #82062

merged 6 commits into from
Feb 14, 2021

Conversation

Mark-Simulacrum
Copy link
Member

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

r? @Mark-Simulacrum

Mark-Simulacrum and others added 6 commits February 13, 2021 10:41
@Mark-Simulacrum
Bump stage0 to released stable
a21d90a
@pietroalbini @Mark-Simulacrum
bootstrap: fix wrong docs installation path
6a98a31
@osa1 @Mark-Simulacrum
parser: Fix panic in 'const impl' recovery
853f787 
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.

Fixes rust-lang#81806
@LeSeulArtichaut @Mark-Simulacrum
Revert "Get rid of custom pretty-printing in rustdoc"
af18bf8 
This reverts commit 31375d2.
@LeSeulArtichaut @Mark-Simulacrum
Add regression test for rust-lang#81289
2d6c4b3
@LeSeulArtichaut @Mark-Simulacrum
Do not ICE on range patterns in function arguments
b016024
@rust-highfive
Copy link
Collaborator

⚠️ 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-highfive rust-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
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Feb 13, 2021

📌 Commit b016024 has been approved by Mark-Simulacrum

@bors bors 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
Copy link
Contributor

bors commented Feb 14, 2021

⌛ Testing commit b016024 with merge 14b2755...

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 14, 2021
Merged
@bors
Copy link
Contributor

bors commented Feb 14, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 14, 2021
@bors bors merged commit 14b2755 into rust-lang:beta Feb 14, 2021
@rustbot rustbot added this to the 1.51.0 milestone Feb 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Mark-Simulacrum @rust-highfive @bors @rustbot @pietroalbini @osa1 @LeSeulArtichaut