Skip to content

Add test for semicolon recovery ICE - #108244

Merged
bors merged 1 commit into
rust-lang:masterfrom
lukas-code:semicolon-recovery-span
Mar 6, 2023
Merged

Add test for semicolon recovery ICE#108244
bors merged 1 commit into
rust-lang:masterfrom
lukas-code:semicolon-recovery-span

Conversation

@lukas-code

@lukas-codelukas-code commented Feb 19, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

closes#108242

@rustbot

rustbot commented Feb 19, 2023

Copy link
Copy Markdown
Collaborator

r? @compiler-errors

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

@rustbotrustbot 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 Feb 19, 2023
@compiler-errors

compiler-errors commented Feb 20, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

I'll mark this as blocked on ##108239 for now. Use rustbot ready (or maybe I will) when that other PR lands. Changes look fine though, I can give them another look when this is ready to land.

@rustbot blocked

@rustbotrustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 20, 2023
@clubby789clubby789 mentioned this pull request Feb 20, 2023
Merged
@lukas-code
lukas-codeforce-pushed the semicolon-recovery-span branch from e06fa9d to 611ab68CompareFebruary 22, 2023 15:35
@lukas-code

lukas-code commented Feb 22, 2023

Copy link
Copy Markdown
ContributorAuthor

#108239 landed and I rebased on top of it.

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 22, 2023
@compiler-errors

compiler-errors commented Mar 1, 2023

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Mar 1, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 611ab68 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Mar 1, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2023
@matthiaskrgr
Rollup merge ofrust-lang#108244- lukas-code:semicolon-recovery-span…
5b64847
…, r=compiler-errors
Use span of semicolon for eager recovery in expression
Instead of the span of the token after the semicolon. This will hopefully cause fewer errors from overlapping spans.
fixesrust-lang#108242
based on rust-lang#108239
@matthiaskrgrmatthiaskrgr mentioned this pull request Mar 1, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2023
@matthiaskrgr
Rollup merge ofrust-lang#108244- lukas-code:semicolon-recovery-span…
a43380f
…, r=compiler-errors
Use span of semicolon for eager recovery in expression
Instead of the span of the token after the semicolon. This will hopefully cause fewer errors from overlapping spans.
fixesrust-lang#108242
based on rust-lang#108239
@matthiaskrgrmatthiaskrgr mentioned this pull request Mar 1, 2023
Closed
@matthiaskrgr

matthiaskrgr commented Mar 1, 2023

Copy link
Copy Markdown
Member

@bors r-
needs rebase and test output update it seems

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2023
@lukas-code

lukas-code commented Mar 1, 2023

Copy link
Copy Markdown
ContributorAuthor

Looks like this entire recovery code is a unreachable after #108297.

@bors

bors commented Mar 5, 2023

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #108747) made this pull request unmergeable. Please resolve the merge conflicts.

@matthiaskrgr

matthiaskrgr commented Mar 5, 2023

Copy link
Copy Markdown
Member

So the ICE is already fixed it seems, but we could still add the test?

@lukas-code
lukas-codeforce-pushed the semicolon-recovery-span branch from 611ab68 to a435b3cCompareMarch 5, 2023 13:25
@lukas-codelukas-code changed the title Use span of semicolon for eager recovery in expressionAdd test for semicolon recoveryMar 5, 2023
@lukas-code

lukas-code commented Mar 5, 2023

Copy link
Copy Markdown
ContributorAuthor

removed everything except test

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 5, 2023
@lukas-codelukas-code changed the title Add test for semicolon recoveryAdd test for semicolon recovery ICEMar 5, 2023
@cjgillot

cjgillot commented Mar 5, 2023

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Mar 5, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit a435b3c has been approved by cjgillot

It is now in the queue for this repository.

@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 Mar 5, 2023
@matthiaskrgrmatthiaskrgr mentioned this pull request Mar 5, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2023
@bors
Auto merge ofrust-lang#108789- matthiaskrgr:rollup-nyurto8, r=matth…
8c0f83d
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#108244 (Add test for semicolon recovery ICE)
- rust-lang#108746 (Don't project to RPITIT that has no default value)
- rust-lang#108764 (Tweaks to -Zdrop-tracking-mir)
- rust-lang#108770 (Improve documentation and argument naming of some TyCtxt methods)
- rust-lang#108773 (x fmt: Only check modified files locally)
- rust-lang#108775 (Use the correct bound vars in return type suggestion.)
- rust-lang#108776 (Make `x test tidy` less noisy)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit ced9cd1 into rust-lang:masterMar 6, 2023
@rustbotrustbot added this to the 1.70.0 milestone Mar 6, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@compiler-errorscompiler-errors

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.70.0

Development

Successfully merging this pull request may close these issues.

report_arg_errors: Span must not be empty and have no suggestion

6 participants

@lukas-code@rustbot@compiler-errors@bors@matthiaskrgr@cjgillot