Fix stray trait mismatch in resolve_associated_item for AsyncFn#121350
Merged
bors merged 1 commit intorust-lang:masterfrom Feb 21, 2024
Merged
Fix stray trait mismatch in resolve_associated_item for AsyncFn#121350bors merged 1 commit intorust-lang:masterfrom
resolve_associated_item for AsyncFn#121350bors merged 1 commit intorust-lang:masterfrom
Conversation
compiler-errors
commented
Feb 20, 2024
| fn main() { | ||
| let fut = call_asyncly(|x| async move { x + 1 }); | ||
| block_on::block_on(async { | ||
| call_asyncly(|x| async move { x + 1 }).await; |
Contributor
Author
There was a problem hiding this comment.
Turns out that this wasn't caught because we weren't actually codegenning <{closure} as AsyncFn>::async_call here, since we weren't awaiting the future.
Makes me wish we had a first-class async main to make testing here easier.
Contributor
|
oh that diff was confusing to look at. @bors r+ |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 20, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#119203 (Correct the simd_masked_{load,store} intrinsic docs) - rust-lang#121277 (Refactor trait implementations in `core::convert::num`.) - rust-lang#121322 (Don't ICE when hitting overflow limit in fulfillment loop in next solver) - rust-lang#121323 (Don't use raw parameter types in `find_builder_fn`) - rust-lang#121344 (Expand weak alias types before collecting constrained/referenced late bound regions + refactorings) - rust-lang#121350 (Fix stray trait mismatch in `resolve_associated_item` for `AsyncFn`) - rust-lang#121352 (docs: add missing "the" to `str::strip_prefix` doc) Failed merges: - rust-lang#121340 (bootstrap: apply most of clippy's suggestions) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 21, 2024
Rollup merge of rust-lang#121350 - compiler-errors:resolve, r=oli-obk Fix stray trait mismatch in `resolve_associated_item` for `AsyncFn` Copy-paste error meant that we were calling `fn_trait_kind_from_def_id` instead of `async_fn_trait_kind_from_def_id`. But turns out we don't even need to do that, since we already matched the trait def id above. Fixes rust-lang#121306 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
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.
Copy-paste error meant that we were calling
fn_trait_kind_from_def_idinstead ofasync_fn_trait_kind_from_def_id. But turns out we don't even need to do that, since we already matched the trait def id above.Fixes #121306
r? oli-obk