Skip to content

Fix parser ICE when recovering dyn/impl after for<...> #118585

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Dec 6, 2023
Merged

Fix parser ICE when recovering dyn/impl after for<...> #118585

merged 1 commit into from
Dec 6, 2023

Conversation

sjwang05
Copy link
Contributor

@sjwang05 sjwang05 commented Dec 4, 2023

Fixes #118564

@rustbot
Copy link
Collaborator

rustbot commented Dec 4, 2023

r? @petrochenkov

(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 Dec 4, 2023
@compiler-errors
Copy link
Member

r? compiler-errors

Can you just move the diagnostic creation below the two ? statements? Then we don't need to cancel anything?

@sjwang05
Copy link
Contributor Author

sjwang05 commented Dec 4, 2023

Fixed, thanks

@rustbot review

@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 5, 2023

📌 Commit d627e2a 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 Dec 5, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 5, 2023
@matthiaskrgr
Rollup merge of rust-lang#118585 - sjwang05:issue-118564, r=compiler-…
ee37f4a 
…errors

Fix parser ICE when recovering `dyn`/`impl` after `for<...>`

Fixes rust-lang#118564
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 5, 2023
Closed
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Dec 5, 2023
@compiler-errors
Rollup merge of rust-lang#118585 - sjwang05:issue-118564, r=compiler-…
c87f5b8 
…errors

Fix parser ICE when recovering `dyn`/`impl` after `for<...>`

Fixes rust-lang#118564
@compiler-errors compiler-errors mentioned this pull request Dec 5, 2023
Closed
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Dec 5, 2023
@compiler-errors
Rollup merge of rust-lang#118585 - sjwang05:issue-118564, r=compiler-…
eef5043 
…errors

Fix parser ICE when recovering `dyn`/`impl` after `for<...>`

Fixes rust-lang#118564
This was referenced Dec 5, 2023
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 5, 2023
@bors
Auto merge of rust-lang#118655 - compiler-errors:rollup-vrngyzn, r=co…
b55e874 
…mpiler-errors

Rollup of 9 pull requests

Successful merges:

 - rust-lang#117793 (Update variable name to fix `unused_variables` warning)
 - rust-lang#118123 (Add support for making lib features internal)
 - rust-lang#118268 (Pretty print `Fn<(..., ...)>` trait refs with parentheses (almost) always)
 - rust-lang#118346 (Add `deeply_normalize_for_diagnostics`, use it in coherence)
 - rust-lang#118350 (Simplify Default for tuples)
 - rust-lang#118450 (Use OnceCell in cell module documentation)
 - rust-lang#118585 (Fix parser ICE when recovering `dyn`/`impl` after `for<...>`)
 - rust-lang#118587 (Cleanup error handlers some more)
 - rust-lang#118642 (bootstrap(builder.rs): Don't explicitly warn against `semicolon_in_expressions_from_macros`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 5, 2023
@bors
Auto merge of rust-lang#118655 - compiler-errors:rollup-vrngyzn, r=co…
2e366fc 
…mpiler-errors

Rollup of 9 pull requests

Successful merges:

 - rust-lang#117793 (Update variable name to fix `unused_variables` warning)
 - rust-lang#118123 (Add support for making lib features internal)
 - rust-lang#118268 (Pretty print `Fn<(..., ...)>` trait refs with parentheses (almost) always)
 - rust-lang#118346 (Add `deeply_normalize_for_diagnostics`, use it in coherence)
 - rust-lang#118350 (Simplify Default for tuples)
 - rust-lang#118450 (Use OnceCell in cell module documentation)
 - rust-lang#118585 (Fix parser ICE when recovering `dyn`/`impl` after `for<...>`)
 - rust-lang#118587 (Cleanup error handlers some more)
 - rust-lang#118642 (bootstrap(builder.rs): Don't explicitly warn against `semicolon_in_expressions_from_macros`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 6, 2023
@bors
Auto merge of rust-lang#118655 - compiler-errors:rollup-vrngyzn, r=co…
9ad0af5 
…mpiler-errors

Rollup of 9 pull requests

Successful merges:

 - rust-lang#117793 (Update variable name to fix `unused_variables` warning)
 - rust-lang#118123 (Add support for making lib features internal)
 - rust-lang#118268 (Pretty print `Fn<(..., ...)>` trait refs with parentheses (almost) always)
 - rust-lang#118346 (Add `deeply_normalize_for_diagnostics`, use it in coherence)
 - rust-lang#118350 (Simplify Default for tuples)
 - rust-lang#118450 (Use OnceCell in cell module documentation)
 - rust-lang#118585 (Fix parser ICE when recovering `dyn`/`impl` after `for<...>`)
 - rust-lang#118587 (Cleanup error handlers some more)
 - rust-lang#118642 (bootstrap(builder.rs): Don't explicitly warn against `semicolon_in_expressions_from_macros`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 6, 2023
@bors
Auto merge of rust-lang#118655 - compiler-errors:rollup-vrngyzn, r=co…
1dd4db5 
…mpiler-errors

Rollup of 9 pull requests

Successful merges:

 - rust-lang#117793 (Update variable name to fix `unused_variables` warning)
 - rust-lang#118123 (Add support for making lib features internal)
 - rust-lang#118268 (Pretty print `Fn<(..., ...)>` trait refs with parentheses (almost) always)
 - rust-lang#118346 (Add `deeply_normalize_for_diagnostics`, use it in coherence)
 - rust-lang#118350 (Simplify Default for tuples)
 - rust-lang#118450 (Use OnceCell in cell module documentation)
 - rust-lang#118585 (Fix parser ICE when recovering `dyn`/`impl` after `for<...>`)
 - rust-lang#118587 (Cleanup error handlers some more)
 - rust-lang#118642 (bootstrap(builder.rs): Don't explicitly warn against `semicolon_in_expressions_from_macros`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dbcde57 into rust-lang:master Dec 6, 2023
@rustbot rustbot added this to the 1.76.0 milestone Dec 6, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 6, 2023
@rust-timer
Unrolled build for rust-lang#118585
d111424 
Rollup merge of rust-lang#118585 - sjwang05:issue-118564, r=compiler-errors

Fix parser ICE when recovering `dyn`/`impl` after `for<...>`

Fixes rust-lang#118564
@sjwang05 sjwang05 deleted the issue-118564 branch January 16, 2024 03:18
# for free to join this conversation on GitHub. Already have an account? # 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.76.0
Development

Successfully merging this pull request may close these issues.

ICE: error was constructed but not emitted
5 participants
@sjwang05 @rustbot @compiler-errors @bors @petrochenkov