Fix async Fn confirmation for FnDef/FnPtr/Closure types#121654
Merged
bors merged 5 commits intorust-lang:masterfrom Feb 29, 2024
Merged
Fix async Fn confirmation for FnDef/FnPtr/Closure types#121654bors merged 5 commits intorust-lang:masterfrom
async Fn confirmation for FnDef/FnPtr/Closure types#121654bors merged 5 commits intorust-lang:masterfrom
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor |
Contributor
|
oof. and the mixup is only really noticeable for projections, not just proving that one of the async fn traits holds |
Contributor
Author
|
💀 |
oli-obk
reviewed
Feb 26, 2024
| // we'd need to instantiate trait bounds before we get to selection, | ||
| // like the new trait solver does. | ||
| let future_trait_def_id = tcx.require_lang_item(LangItem::Future, None); | ||
| let placeholder_output_ty = self.infcx.enter_forall_and_leak_universe(sig.output()); |
Contributor
There was a problem hiding this comment.
so, if actually used (via unboxed closures), we'd just get odd errors about traits not being implemented even though they are?
Contributor
Author
There was a problem hiding this comment.
No, this change only affects async Fn trait goals, and makes them go from ICE -> PASS.
That issue I linked via unboxed closures still ICEs; I'll put up a fix like #108834 in a separate PR.
Contributor
|
I guess the tests implicitly test that r=me either way, and sorry for not catching these in review. |
Contributor
Author
No, it's definitely 100% my fault for writing extremely incomprehensible code lol |
rust-cloud-vms
bot
force-pushed
the
async-fn-for-fn-def
branch
from
da9c691 to
c8e3f35
Compare
Contributor
Author
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 29, 2024
…llaumeGomez Rollup of 10 pull requests Successful merges: - rust-lang#118217 (Document which methods on `f64` are precise) - rust-lang#119748 (Increase visibility of `join_path` and `split_paths`) - rust-lang#121412 (platform docs: clarify hexagon-unknown-none-elf example, add hexagon-unknown-linux-musl) - rust-lang#121654 (Fix `async Fn` confirmation for `FnDef`/`FnPtr`/`Closure` types) - rust-lang#121700 (CFI: Don't compress user-defined builtin types) - rust-lang#121765 (add platform-specific function to get the error number for HermitOS) - rust-lang#121781 (bootstrap/format: send larger batches to rustfmt) - rust-lang#121788 (bootstrap: fix clap deprecated warnings) - rust-lang#121792 (Improve renaming suggestion when item starts with underscore) - rust-lang#121793 (Document which methods on `f32` are precise) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 29, 2024
Rollup merge of rust-lang#121654 - compiler-errors:async-fn-for-fn-def, r=oli-obk Fix `async Fn` confirmation for `FnDef`/`FnPtr`/`Closure` types Fixes three issues: 1. The code in `extract_tupled_inputs_and_output_from_async_callable` was accidentally getting the *future* type and the *output* type (returned by the future) messed up for fnptr/fndef/closure types. :/ 2. We have a (class of) bug(s) in the old solver where we don't really support higher ranked built-in `Future` goals for generators. This is not possible to hit on stable code, but [can be hit with `unboxed_closures`](https://play.rust-lang.org/?version=nightly&mode=debug&edition=2021&gist=e935de7181e37e13515ad01720bcb899) (rust-lang#121653). * I'm opting not to fix that in this PR. Instead, I just instantiate placeholders when confirming `async Fn` goals. 4. Fixed a bug when generating `FnPtr` shims for `async Fn` trait goals. r? oli-obk
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
4 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.
Fixes three issues:
extract_tupled_inputs_and_output_from_async_callablewas accidentally getting the future type and the output type (returned by the future) messed up for fnptr/fndef/closure types. :/Futuregoals for generators. This is not possible to hit on stable code, but can be hit withunboxed_closures(Confirming built-in higher-ranked Future (and other coroutine) goals ICEs #121653).async Fngoals.FnPtrshims forasync Fntrait goals.r? oli-obk