Pretty-print generators with their generator_kind
#104931
Merged
Conversation
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
|
r? @eholk (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
@bors r+ |
|
📌 Commit daa4845365c5fce7566063552ee52ec8627fac10 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
| @@ -29,13 +29,13 @@ LL | | | |||
| LL | | } | |||
| | |_^ expected `u8`, found `()` | |||
|
|
|||
| error[E0271]: expected `impl Future<Output = u8>` to be a future that resolves to `()`, but it resolves to `u8` | |||
| error[E0271]: expected `[static `async` block@$DIR/async-block-control-flow-static-semantics.rs:23:17: 25:6]` to be a future that resolves to `()`, but it resolves to `u8` | |||
There was a problem hiding this comment.
I think the nested backticks in `async` is a bit strange looking in these type errors.
Also, I'm not sure if we expect users to know what static generator movability is -- if the generator kind is Async, maybe we could just drop the static (maybe unless we pass in -Zverbose or something)?
There was a problem hiding this comment.
Agreed, I pushed an updated version that does this.
Also now uses the descr() method for explicit diagnostics that still print `async` block, but when printing the type of the block itself, the output is cleaner now.
After removing `GenFuture`, I special-cased async generators to pretty-print as `impl Future<Output = X>` mainly to avoid too much diagnostics changes originally. This now reverses that change so that async fn/blocks are pretty-printed as `[$movability `async` $something@$source-position]` in various diagnostics, and updates the tests that this touches.
Swatinem
force-pushed
the
async-pretty
branch
from
daa4845 to
c96d888
Compare
|
Another case that could maybe be improved further would be: The |
|
@bors r+ Thanks for the improvements! |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 27, 2022
Pretty-print generators with their `generator_kind` After removing `GenFuture`, I special-cased async generators to pretty-print as `impl Future<Output = X>` mainly to avoid too much diagnostics changes originally. This now reverses that change so that async fn/blocks are pretty-printed as `[$async-type@$source-position]` in various diagnostics, and updates the tests that this touches.
|
@bors r- failed in a rollup |
bors
added
S-waiting-on-author
|
Hmm, looks like this was actually not the problem 😅 |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 27, 2022
Pretty-print generators with their `generator_kind` After removing `GenFuture`, I special-cased async generators to pretty-print as `impl Future<Output = X>` mainly to avoid too much diagnostics changes originally. This now reverses that change so that async fn/blocks are pretty-printed as `[$async-type@$source-position]` in various diagnostics, and updates the tests that this touches.
This was referenced Nov 27, 2022
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 27, 2022
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#95836 (Use `rust_out{exe_suffix}` for doctests) - rust-lang#104882 (notify lcnr on changes to `ObligationCtxt`) - rust-lang#104892 (Explain how to get the discriminant out of a `#[repr(T)] enum` with payload) - rust-lang#104917 (Allow non-org members to label `requires-debug-assertions`) - rust-lang#104931 (Pretty-print generators with their `generator_kind`) - rust-lang#104934 (Remove redundant `all` in cfg) - rust-lang#104944 (Support unit tests for jsondoclint) - rust-lang#104946 (rustdoc: improve popover focus handling JS) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
After removing
GenFuture, I special-cased async generators to pretty-print asimpl Future<Output = X>mainly to avoid too much diagnostics changes originally.This now reverses that change so that async fn/blocks are pretty-printed as
[$async-type@$source-position]in various diagnostics, and updates the tests that this touches.