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

fix Miri visiting generators #60541

Merged
merged 2 commits into from
May 5, 2019
Merged

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented May 4, 2019

Fixes fall-out caused by #59897.

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 4, 2019
// when really many of them can be uninitialized.
// Just treat them as a union for now, until hopefully the layout
// computation is fixed.
return self.visit_union(v);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oli-obk
Copy link
Contributor

oli-obk commented May 5, 2019

@bors r+ p=1

@bors
Copy link
Contributor

bors commented May 5, 2019

📌 Commit c5c161e has been approved by oli-obk

@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 5, 2019
@bors
Copy link
Contributor

bors commented May 5, 2019

⌛ Testing commit c5c161e with merge c6b1698...

bors added a commit that referenced this pull request May 5, 2019
fix Miri visiting generators

Fixes fall-out caused by #59897.

r? @oli-obk
@@ -66,6 +66,7 @@ macro_rules! try_validation {
pub enum PathElem {
Field(Symbol),
Variant(Symbol),
GeneratoreState(VariantIdx),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sp: GeneratorState

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oopsie fixed in #60569

@bors
Copy link
Contributor

bors commented May 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing c6b1698 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2019
@bors bors merged commit c5c161e into rust-lang:master May 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants