Skip to content

Fix printing of Yield terminator #69200

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

Merged
merged 2 commits into from
Feb 18, 2020
Merged

Fix printing of Yield terminator #69200

merged 2 commits into from
Feb 18, 2020

Conversation

jonas-schievink
Copy link
Contributor

Addresses the bug found in #69039 (comment)

@rust-highfive
Copy link
Contributor

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 15, 2020
@jonas-schievink
Copy link
Contributor Author

r? @Zoxc

@rust-highfive rust-highfive assigned Zoxc and unassigned eddyb Feb 16, 2020
@eddyb
Copy link
Member

eddyb commented Feb 16, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 16, 2020

📌 Commit 759526e has been approved by eddyb

@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 Feb 16, 2020
Return => write!(fmt, "return"),
GeneratorDrop => write!(fmt, "generator_drop"),
Resume => write!(fmt, "resume"),
Abort => write!(fmt, "abort"),
Yield { ref value, .. } => write!(fmt, "_1 = suspend({:?})", value),
Yield { value, resume_arg, .. } => {
write!(fmt, "{:?} = suspend({:?})", resume_arg, value)
Copy link
Contributor

Choose a reason for hiding this comment

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

You can probably output yield instead of suspend. I think this was just missed during the Suspend to Yield rename.

@jonas-schievink
Copy link
Contributor Author

@bors r=eddyb,Zoxc

@bors
Copy link
Collaborator

bors commented Feb 16, 2020

📌 Commit bb482eb has been approved by eddyb,Zoxc

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 16, 2020
…b,Zoxc

Fix printing of `Yield` terminator

Addresses the bug found in rust-lang#69039 (comment)
Centril added a commit to Centril/rust that referenced this pull request Feb 17, 2020
…b,Zoxc

Fix printing of `Yield` terminator

Addresses the bug found in rust-lang#69039 (comment)
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 18, 2020
…b,Zoxc

Fix printing of `Yield` terminator

Addresses the bug found in rust-lang#69039 (comment)
bors added a commit that referenced this pull request Feb 18, 2020
Rollup of 5 pull requests

Successful merges:

 - #69181 (Change const eval to just return the value )
 - #69192 (Add more regression tests)
 - #69200 (Fix printing of `Yield` terminator)
 - #69205 (Allow whitespaces in revision flags)
 - #69233 (Clean up E0310 explanation)

Failed merges:

r? @ghost
@bors bors merged commit bb482eb into rust-lang:master Feb 18, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.

5 participants