Repository navigation
hir_typeck: Propagate async closure output into its body - #161708
Merged
rust-bors[bot] merged 2 commits intoNov 18, 2026
Merged
rust-bors[bot] merged 2 commits into
rust-bors[bot] merged 2 commits into
Conversation
Collaborator
|
r? @wesleywiser rustbot has assigned @wesleywiser. Use Why was this reviewer chosen?The reviewer was selected based on:
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Async closure bodies are checked as coroutines, but their expected return type was lost before body checking. Reuse the matching coroutine signature. Keep this path limited to async closures because gen closures have a different input shape.
Dnreikronos
force-pushed
the
hir_typeck/async_closure_output_diagnostic
branch
from
September 12, 2026 18:27
ce23647 to
1b7d358
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Contributor
Author
|
@rustbot reroll. |
Contributor
Author
|
Hi @davidtwco, this PR sat without a review for a while, so I rerolled and it landed on you. Let me know what you think when you get a chance. |
davidtwco
approved these changes
Nov 17, 2026
Member
|
@bors r+ rollup |
Contributor
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 17, 2026
…re_output_diagnostic, r=davidtwco hir_typeck: Propagate async closure output into its body Fixes rust-lang#161619 Rustc already knows the output type it expects from an async closure, but that type wasn't reaching the closure body during type checking. When the body returned the wrong thing, rustc compared the generated async types and suggested pinning. That sends you in completely the wrong direction. The fix carries the coroutine signature into the body check, so the regular type error points at `String::new()` and says it expected `()`. My first pass matched any coroutine with the same def id. It looked fine, then the iterator suite caught the problem: `iter!` comes through the same path but its body has no resume input. I narrowed the match to async closure bodies. I prefer that version because it uses type information rustc already has and leaves the gen path alone. The test runs with both trait solvers, and the existing iterator tests cover the case that bit me.
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 17, 2026
…re_output_diagnostic, r=davidtwco hir_typeck: Propagate async closure output into its body Fixes rust-lang#161619 Rustc already knows the output type it expects from an async closure, but that type wasn't reaching the closure body during type checking. When the body returned the wrong thing, rustc compared the generated async types and suggested pinning. That sends you in completely the wrong direction. The fix carries the coroutine signature into the body check, so the regular type error points at `String::new()` and says it expected `()`. My first pass matched any coroutine with the same def id. It looked fine, then the iterator suite caught the problem: `iter!` comes through the same path but its body has no resume input. I narrowed the match to async closure bodies. I prefer that version because it uses type information rustc already has and leaves the gen path alone. The test runs with both trait solvers, and the existing iterator tests cover the case that bit me.
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 17, 2026
…re_output_diagnostic, r=davidtwco hir_typeck: Propagate async closure output into its body Fixes rust-lang#161619 Rustc already knows the output type it expects from an async closure, but that type wasn't reaching the closure body during type checking. When the body returned the wrong thing, rustc compared the generated async types and suggested pinning. That sends you in completely the wrong direction. The fix carries the coroutine signature into the body check, so the regular type error points at `String::new()` and says it expected `()`. My first pass matched any coroutine with the same def id. It looked fine, then the iterator suite caught the problem: `iter!` comes through the same path but its body has no resume input. I narrowed the match to async closure bodies. I prefer that version because it uses type information rustc already has and leaves the gen path alone. The test runs with both trait solvers, and the existing iterator tests cover the case that bit me.
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 17, 2026
…re_output_diagnostic, r=davidtwco hir_typeck: Propagate async closure output into its body Fixes rust-lang#161619 Rustc already knows the output type it expects from an async closure, but that type wasn't reaching the closure body during type checking. When the body returned the wrong thing, rustc compared the generated async types and suggested pinning. That sends you in completely the wrong direction. The fix carries the coroutine signature into the body check, so the regular type error points at `String::new()` and says it expected `()`. My first pass matched any coroutine with the same def id. It looked fine, then the iterator suite caught the problem: `iter!` comes through the same path but its body has no resume input. I narrowed the match to async closure bodies. I prefer that version because it uses type information rustc already has and leaves the gen path alone. The test runs with both trait solvers, and the existing iterator tests cover the case that bit me.
This was referenced Nov 17, 2026
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 17, 2026
…uwer Rollup of 24 pull requests Successful merges: - #164370 (Compact the previous dependency-node reverse index) - #164544 (Add an optional `llvm = ` argument to rustc_intrinsic.) - #165007 (std: Combine `is_mips64_feature_detected` into `is_mips_feature_detected` and enable on MIPS release 6) - #165090 (Check type alignment is <= type size in data layout parser) - #165524 (Cleanup, Get emitting metadata out of codegen) - #165875 (Combine the spans of generic arguments without dropping `->`) - #166074 (rustc: avoid path dependent queries in source presence checks) - #160291 (Add new target: `i686-unknown-none`) - #161708 (hir_typeck: Propagate async closure output into its body) - #162575 (keep the `use<..>` bound in the `refining_impl_trait` suggestion) - #163516 (Update std_detect support for AArch64 Darwin) - #163808 (Add `wasm64-unknown-emscripten` tier 3 target) - #163828 (Change all arm-none targets to skip frame pointers in leaf functions.) - #163966 (Keep deref suggestions from inserting a second pair of brackets) - #164483 (compiler: Add `{x86_64,aarch64}-unknown-serenity` targets) - #164690 (lint: keep type-changing casts in `raw_borrows_via_references`) - #164910 (Add regression tests for #164253) - #164975 (Add wide pointer visualizer for LLDB) - #165652 (Add regression test for GCA associated const with a pattern type field) - #165893 (Prune un/under used methods of `ast::Attribute`) - #166057 ([PAC] Disable rust-tail-cc for pauthtest) - #166071 (illumos dist should enable ThinLTO and codegen-units=1) - #166093 (Move doc attribute and doc comment target checking to attribute parsing) - #166098 (Actually test ABI for C ZSTs and fix Rust ZST ABI for SPARC) Failed merges: - #165267 ([Debuginfo] Emit artificial nested typedef representing generic params on MSVC)
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 18, 2026
…uwer Rollup of 24 pull requests Successful merges: - #164370 (Compact the previous dependency-node reverse index) - #164544 (Add an optional `llvm = ` argument to rustc_intrinsic.) - #165007 (std: Combine `is_mips64_feature_detected` into `is_mips_feature_detected` and enable on MIPS release 6) - #165090 (Check type alignment is <= type size in data layout parser) - #165524 (Cleanup, Get emitting metadata out of codegen) - #165875 (Combine the spans of generic arguments without dropping `->`) - #166074 (rustc: avoid path dependent queries in source presence checks) - #160291 (Add new target: `i686-unknown-none`) - #161708 (hir_typeck: Propagate async closure output into its body) - #162575 (keep the `use<..>` bound in the `refining_impl_trait` suggestion) - #163516 (Update std_detect support for AArch64 Darwin) - #163808 (Add `wasm64-unknown-emscripten` tier 3 target) - #163828 (Change all arm-none targets to skip frame pointers in leaf functions.) - #163966 (Keep deref suggestions from inserting a second pair of brackets) - #164483 (compiler: Add `{x86_64,aarch64}-unknown-serenity` targets) - #164690 (lint: keep type-changing casts in `raw_borrows_via_references`) - #164910 (Add regression tests for #164253) - #164975 (Add wide pointer visualizer for LLDB) - #165652 (Add regression test for GCA associated const with a pattern type field) - #165893 (Prune un/under used methods of `ast::Attribute`) - #166057 ([PAC] Disable rust-tail-cc for pauthtest) - #166071 (illumos dist should enable ThinLTO and codegen-units=1) - #166093 (Move doc attribute and doc comment target checking to attribute parsing) - #166098 (Actually test ABI for C ZSTs and fix Rust ZST ABI for SPARC) Failed merges: - #165267 ([Debuginfo] Emit artificial nested typedef representing generic params on MSVC)
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 18, 2026
Rollup merge of #161708 - Dnreikronos:hir_typeck/async_closure_output_diagnostic, r=davidtwco hir_typeck: Propagate async closure output into its body Fixes #161619 Rustc already knows the output type it expects from an async closure, but that type wasn't reaching the closure body during type checking. When the body returned the wrong thing, rustc compared the generated async types and suggested pinning. That sends you in completely the wrong direction. The fix carries the coroutine signature into the body check, so the regular type error points at `String::new()` and says it expected `()`. My first pass matched any coroutine with the same def id. It looked fine, then the iterator suite caught the problem: `iter!` comes through the same path but its body has no resume input. I narrowed the match to async closure bodies. I prefer that version because it uses type information rustc already has and leaves the gen path alone. The test runs with both trait solvers, and the existing iterator tests cover the case that bit me.
TDecking
pushed a commit
to TDecking/miri
that referenced
this pull request
Nov 18, 2026
…uwer Rollup of 24 pull requests Successful merges: - rust-lang/rust#164370 (Compact the previous dependency-node reverse index) - rust-lang/rust#164544 (Add an optional `llvm = ` argument to rustc_intrinsic.) - rust-lang/rust#165007 (std: Combine `is_mips64_feature_detected` into `is_mips_feature_detected` and enable on MIPS release 6) - rust-lang/rust#165090 (Check type alignment is <= type size in data layout parser) - rust-lang/rust#165524 (Cleanup, Get emitting metadata out of codegen) - rust-lang/rust#165875 (Combine the spans of generic arguments without dropping `->`) - rust-lang/rust#166074 (rustc: avoid path dependent queries in source presence checks) - rust-lang/rust#160291 (Add new target: `i686-unknown-none`) - rust-lang/rust#161708 (hir_typeck: Propagate async closure output into its body) - rust-lang/rust#162575 (keep the `use<..>` bound in the `refining_impl_trait` suggestion) - rust-lang/rust#163516 (Update std_detect support for AArch64 Darwin) - rust-lang/rust#163808 (Add `wasm64-unknown-emscripten` tier 3 target) - rust-lang/rust#163828 (Change all arm-none targets to skip frame pointers in leaf functions.) - rust-lang/rust#163966 (Keep deref suggestions from inserting a second pair of brackets) - rust-lang/rust#164483 (compiler: Add `{x86_64,aarch64}-unknown-serenity` targets) - rust-lang/rust#164690 (lint: keep type-changing casts in `raw_borrows_via_references`) - rust-lang/rust#164910 (Add regression tests for rust-lang/rust#164253) - rust-lang/rust#164975 (Add wide pointer visualizer for LLDB) - rust-lang/rust#165652 (Add regression test for GCA associated const with a pattern type field) - rust-lang/rust#165893 (Prune un/under used methods of `ast::Attribute`) - rust-lang/rust#166057 ([PAC] Disable rust-tail-cc for pauthtest) - rust-lang/rust#166071 (illumos dist should enable ThinLTO and codegen-units=1) - rust-lang/rust#166093 (Move doc attribute and doc comment target checking to attribute parsing) - rust-lang/rust#166098 (Actually test ABI for C ZSTs and fix Rust ZST ABI for SPARC) Failed merges: - rust-lang/rust#165267 ([Debuginfo] Emit artificial nested typedef representing generic params on MSVC)
github-actions Bot
pushed a commit
to rust-lang/stdarch
that referenced
this pull request
Nov 19, 2026
…uwer Rollup of 24 pull requests Successful merges: - rust-lang/rust#164370 (Compact the previous dependency-node reverse index) - rust-lang/rust#164544 (Add an optional `llvm = ` argument to rustc_intrinsic.) - rust-lang/rust#165007 (std: Combine `is_mips64_feature_detected` into `is_mips_feature_detected` and enable on MIPS release 6) - rust-lang/rust#165090 (Check type alignment is <= type size in data layout parser) - rust-lang/rust#165524 (Cleanup, Get emitting metadata out of codegen) - rust-lang/rust#165875 (Combine the spans of generic arguments without dropping `->`) - rust-lang/rust#166074 (rustc: avoid path dependent queries in source presence checks) - rust-lang/rust#160291 (Add new target: `i686-unknown-none`) - rust-lang/rust#161708 (hir_typeck: Propagate async closure output into its body) - rust-lang/rust#162575 (keep the `use<..>` bound in the `refining_impl_trait` suggestion) - rust-lang/rust#163516 (Update std_detect support for AArch64 Darwin) - rust-lang/rust#163808 (Add `wasm64-unknown-emscripten` tier 3 target) - rust-lang/rust#163828 (Change all arm-none targets to skip frame pointers in leaf functions.) - rust-lang/rust#163966 (Keep deref suggestions from inserting a second pair of brackets) - rust-lang/rust#164483 (compiler: Add `{x86_64,aarch64}-unknown-serenity` targets) - rust-lang/rust#164690 (lint: keep type-changing casts in `raw_borrows_via_references`) - rust-lang/rust#164910 (Add regression tests for rust-lang/rust#164253) - rust-lang/rust#164975 (Add wide pointer visualizer for LLDB) - rust-lang/rust#165652 (Add regression test for GCA associated const with a pattern type field) - rust-lang/rust#165893 (Prune un/under used methods of `ast::Attribute`) - rust-lang/rust#166057 ([PAC] Disable rust-tail-cc for pauthtest) - rust-lang/rust#166071 (illumos dist should enable ThinLTO and codegen-units=1) - rust-lang/rust#166093 (Move doc attribute and doc comment target checking to attribute parsing) - rust-lang/rust#166098 (Actually test ABI for C ZSTs and fix Rust ZST ABI for SPARC) Failed merges: - rust-lang/rust#165267 ([Debuginfo] Emit artificial nested typedef representing generic params on MSVC)
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
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.
Fixes #161619
Rustc already knows the output type it expects from an async closure, but that type wasn't reaching the closure body during type checking. When the body returned the wrong thing, rustc compared the generated async types and suggested pinning. That sends you in completely the wrong direction.
The fix carries the coroutine signature into the body check, so the regular type error points at
String::new()and says it expected().My first pass matched any coroutine with the same def id. It looked fine, then the iterator suite caught the problem:
iter!comes through the same path but its body has no resume input. I narrowed the match to async closure bodies. I prefer that version because it uses type information rustc already has and leaves the gen path alone. The test runs with both trait solvers, and the existing iterator tests cover the case that bit me.