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.

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

Handle error body in generator layout #111533

Merged
merged 1 commit into from
May 16, 2023

Conversation

clubby789
Copy link
Contributor

Fixes #111468

I feel like making this query return Option<GeneratorLayout> might be better but had some issues with that approach

@rustbot
Copy link
Collaborator

rustbot commented May 13, 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 May 13, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 13, 2023

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@oli-obk oli-obk self-assigned this May 13, 2023
@clubby789
Copy link
Contributor Author

Got this working with an Option instead, I can revert to the other approach if that's preferred

@clubby789 clubby789 changed the title Dummy layout for generator with error body Handle error body in generator layout May 13, 2023
compiler/rustc_index/src/bit_set.rs Outdated Show resolved Hide resolved
compiler/rustc_middle/src/mir/query.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/rmeta/mod.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented May 16, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 16, 2023

📌 Commit f77971e has been approved by oli-obk

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 May 16, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request May 16, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#107680 (Hide repr attribute from doc of types without guaranteed repr)
 - rust-lang#111488 (Use error term in projection if missing associated item in new solver)
 - rust-lang#111533 (Handle error body in generator layout)
 - rust-lang#111573 (Erase `ReError` properly)
 - rust-lang#111592 (Change Vec examples to not assert exact capacity except where it is guaranteed)
 - rust-lang#111610 (fix(diagnostic): wrap parens for ref impl trait param)
 - rust-lang#111642 ([rustdoc] Only keep impl blocks from bodies)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 426dbcd into rust-lang:master May 16, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

ICE: unexpected generator type [type error]
6 participants