Restore impl Future<Output = Type> to async blocks#95263
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 31, 2022
Merged
Restore impl Future<Output = Type> to async blocks#95263bors merged 1 commit intorust-lang:masterfrom
impl Future<Output = Type> to async blocks#95263bors merged 1 commit intorust-lang:masterfrom
Conversation
rustbot
added
the
T-compiler
Contributor
|
r? @jackh726 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #94081) made this pull request unmergeable. Please resolve the merge conflicts. |
jplatte
reviewed
Mar 30, 2022
Comment on lines
+912
to
+916
Contributor
There was a problem hiding this comment.
Seems to say the inverse of what it should say
Suggested change
| // Skip printing `<[generator@] as Generator<_>>::Return` from async blocks, | |
| // unless we can find out what generator return type it comes from. | |
| // Skip printing `<[generator@] as Generator<_>>::Return` from async blocks | |
| // if we can find out what generator return type it comes from. |
Contributor
Author
There was a problem hiding this comment.
Maybe our perspectives are inverted -- so it does two things, 1. skips printing <[generator@] as Generator<_>>::Return regardless, but 2. will instead print Output=Type if it can find the return type. If it can't, it skips printing altogether.
Contributor
There was a problem hiding this comment.
Oh, then the comment makes sense 👍🏼
Member
|
r=me after rebase |
compiler-errors
force-pushed
the
async-block-pretty
branch
from
30a7f8b to
7b2eaa3
Compare
Contributor
Author
|
@bors r=jackh726 |
Collaborator
|
📌 Commit 7b2eaa3 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 31, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#95130 (Stabilize thread::is_finished) - rust-lang#95263 (Restore `impl Future<Output = Type>` to async blocks) - rust-lang#95471 (Don't ICE when opaque types get their hidden type constrained again.) - rust-lang#95491 (Stabilize feature vec_retain_mut on Vec and VecDeque) - rust-lang#95497 (Spellchecking compiler comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Collaborator
|
☔ The latest upstream changes (presumably #95506) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I was sad when I undid some of the code I wrote in #91096 in the PR #95225, so I fixed it here to not print
[async output].This PR "manually" normalizes the associated type
<[generator] as Generator>::Returntype which appears very frequently inimpl Futuretypes that result from async block desugaring.