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 printing of `Yield` terminator #69200

Merged
merged 2 commits into from Feb 18, 2020
Merged

Conversation

@jonas-schievink
Copy link
Member

jonas-schievink commented Feb 15, 2020

Addresses the bug found in #69039 (comment)

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 15, 2020

r? @eddyb

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

@jonas-schievink

This comment has been minimized.

Copy link
Member Author

jonas-schievink commented Feb 16, 2020

r? @Zoxc

@rust-highfive rust-highfive assigned Zoxc and unassigned eddyb Feb 16, 2020
@eddyb
eddyb approved these changes Feb 16, 2020
@eddyb

This comment has been minimized.

Copy link
Member

eddyb commented Feb 16, 2020

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 16, 2020

📌 Commit 759526e has been approved by eddyb

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)

This comment has been minimized.

Copy link
@Zoxc

Zoxc Feb 16, 2020

Contributor

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

@jonas-schievink

This comment has been minimized.

Copy link
Member Author

jonas-schievink commented Feb 16, 2020

@bors r=eddyb,Zoxc

@bors

This comment has been minimized.

Copy link
Contributor

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)
bors added a commit that referenced this pull request Feb 16, 2020
Rollup of 10 pull requests

Successful merges:

 - #68495 (Updating str.chars docs to mention crates.io.)
 - #68701 (Improve #Safety of various methods in core::ptr)
 - #68767 (macOS: avoid calling pthread_self() twice)
 - #69179 (Rename `FunctionRetTy` to `FnRetTy`)
 - #69186 ([tiny] parser: `macro_rules` is a weak keyword)
 - #69188 (Clean up E0309 explanation)
 - #69198 (Fix running rustdoc-js test suite individually)
 - #69200 (Fix printing of `Yield` terminator)
 - #69205 (Allow whitespaces in revision flags)
 - #69208 (debug_assert a few more raw pointer methods)

Failed merges:

r? @ghost
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)
bors added a commit that referenced this pull request Feb 17, 2020
Rollup of 6 pull requests

Successful merges:

 - #69129 (Transition macro_legacy_warnings into a hard error)
 - #69159 (Select an appropriate unused lifetime name in suggestion)
 - #69175 (Do not ICE when encountering `yield` inside `async` block)
 - #69192 (Add more regression tests)
 - #69200 (Fix printing of `Yield` terminator)
 - #69208 (debug_assert a few more raw pointer methods)

Failed merges:

r? @ghost
Dylan-DPC added a commit to Dylan-DPC/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
4 checks passed
4 checks passed
pr Build #20200216.19 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-7) Linux x86_64-gnu-llvm-7 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.