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

Recover labels written as identifiers #106783

Merged
merged 3 commits into from
Jan 20, 2023
Merged

Recover labels written as identifiers #106783

merged 3 commits into from
Jan 20, 2023

Conversation

WaffleLapkin
Copy link
Member

This adds recovery for break label expr and continue label, as well as a test for break label.

@rustbot
Copy link
Collaborator

rustbot commented Jan 12, 2023

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 12, 2023
@WaffleLapkin WaffleLapkin added A-diagnostics Area: Messages for errors, warnings, and lints A-parser Area: The parsing of Rust source code to an AST A-suggestion-diagnostics Area: Suggestions generated by the compiler applied by `cargo fix` labels Jan 12, 2023
@rust-log-analyzer

This comment was marked as resolved.

Sign in to view
@wesleywiser
Copy link
Member

Thanks @WaffleLapkin! The new error message is a lot better than the old "expected on of ..." 🥇

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 19, 2023

📌 Commit 57d822a has been approved by wesleywiser

It is now in the queue for this repository.

@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 Jan 19, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 20, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2023
@bors
Auto merge of rust-lang#107105 - matthiaskrgr:rollup-rkz9t7r, r=matth…
04a41f8 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#106783 (Recover labels written as identifiers)
 - rust-lang#106973 (Don't treat closures from other crates as local)
 - rust-lang#106979 (Document how to get the type of a default associated type)
 - rust-lang#107053 (signal update string representation for haiku.)
 - rust-lang#107058 (Recognise double-equals homoglyph)
 - rust-lang#107067 (Custom MIR: Support storage statements)
 - rust-lang#107076 (Added const-generic ui test case for issue rust-lang#106419)
 - rust-lang#107091 (Fix broken format strings in `infer.ftl`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit df88f7e into rust-lang:master Jan 20, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@wesleywiser wesleywiser

Labels
A-diagnostics Area: Messages for errors, warnings, and lints A-parser Area: The parsing of Rust source code to an AST A-suggestion-diagnostics Area: Suggestions generated by the compiler applied by `cargo fix` S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.
5 participants
@WaffleLapkin @rustbot @rust-log-analyzer @wesleywiser @bors