Skip to content

Add test for semicolon recovery ICE#108244

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

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

Conversation

@lukas-code
Copy link
Member

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

closes #108242

@rustbot
Copy link
Collaborator

rustbot commented Feb 19, 2023

r? @compiler-errors

(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 Feb 19, 2023
@compiler-errors
Copy link
Contributor

compiler-errors commented Feb 20, 2023 •
edited
Loading

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

@rustbot rustbot 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
@clubby789 clubby789 mentioned this pull request Feb 20, 2023
Merged
@lukas-code lukas-code force-pushed the semicolon-recovery-span branch from e06fa9d to 611ab68 Compare February 22, 2023 15:35
@lukas-code
Copy link
Member Author

lukas-code commented Feb 22, 2023

#108239 landed and I rebased on top of it.

@rustbot ready

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

compiler-errors commented Mar 1, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 1, 2023

📌 Commit 611ab68 has been approved by compiler-errors

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 Mar 1, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2023
@matthiaskrgr
Rollup merge of rust-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.

fixes rust-lang#108242
based on rust-lang#108239
@matthiaskrgr matthiaskrgr 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 of rust-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.

fixes rust-lang#108242
based on rust-lang#108239
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 1, 2023
Closed
@matthiaskrgr
Copy link
Member

matthiaskrgr commented Mar 1, 2023

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

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

lukas-code commented Mar 1, 2023

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

@bors
Copy link
Collaborator

bors commented Mar 5, 2023

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

@matthiaskrgr
Copy link
Member

matthiaskrgr commented Mar 5, 2023

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

@lukas-code lukas-code force-pushed the semicolon-recovery-span branch from 611ab68 to a435b3c Compare March 5, 2023 13:25
@lukas-code lukas-code changed the title Use span of semicolon for eager recovery in expression Add test for semicolon recovery Mar 5, 2023
@lukas-code
Copy link
Member Author

lukas-code commented Mar 5, 2023

removed everything except test

@rustbot ready

@rustbot rustbot 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-code lukas-code changed the title Add test for semicolon recovery Add test for semicolon recovery ICE Mar 5, 2023
@cjgillot
Copy link
Contributor

cjgillot commented Mar 5, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 5, 2023

📌 Commit a435b3c has been approved by cjgillot

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 Mar 5, 2023
@matthiaskrgr matthiaskrgr 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 of rust-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:master Mar 6, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@compiler-errors compiler-errors

Labels

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.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