Move async closure parameters into the resultant closure's future eagerly #119978

compiler-errors · 2024-01-14T23:30:31Z

Move async closure parameters into the closure's resultant future eagerly.

Before, we used to desugar async |p1, p2, ..| { body } as |p1, p2, ..| { || async { body } }. Now, we desugar the above like |p1, p2, ..| { async move { let p1 = p1; let p2 = p2; ... body } }. This mirrors the same desugaring that async fn does with its parameter types, and the compiler literally uses the same code via a shared helper function.

This removes the necessity for E0708, since now expressions like async |x: i32| { x } will not give you confusing borrow errors.

This does not fix the case where async closures have self-borrows. This will come with a general implementation of async closures, which is still in the works.

r? oli-obk

compiler-errors · 2024-01-15T02:36:25Z

@rustbot author

I'll try my best to restore that suggestion, and then I need to fix clippy's async_yields_async diagnostic...

oli-obk

r=me with suggestions reinstated

rustbot · 2024-01-15T19:46:08Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

oli-obk · 2024-01-16T08:31:34Z

compiler/rustc_error_codes/src/error_codes/E0708.md

the compile_fail examples in this file need to be adjusted

oli-obk

r=me

compiler-errors · 2024-01-16T19:04:50Z

Fixed now.

@bors r=oli-obk

bors · 2024-01-16T19:04:54Z

📌 Commit 04a5ee6 has been approved by oli-obk

It is now in the queue for this repository.

…ures, r=oli-obk Move async closure parameters into the resultant closure's future eagerly Move async closure parameters into the closure's resultant future eagerly. Before, we used to desugar `async |p1, p2, ..| { body }` as `|p1, p2, ..| { || async { body } }`. Now, we desugar the above like `|p1, p2, ..| { async move { let p1 = p1; let p2 = p2; ... body } }`. This mirrors the same desugaring that `async fn` does with its parameter types, and the compiler literally uses the same code via a shared helper function. This removes the necessity for E0708, since now expressions like `async |x: i32| { x }` will not give you confusing borrow errors. This does *not* fix the case where async closures have self-borrows. This will come with a general implementation of async closures, which is still in the works. r? oli-obk

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#119062 (Deny braced macro invocations in let-else) - rust-lang#119922 (Rework how diagnostic lints are stored.) - rust-lang#119978 (Move async closure parameters into the resultant closure's future eagerly) - rust-lang#119984 (Change return type of unstable `Waker::noop()` from `Waker` to `&Waker`.) - rust-lang#120020 (Gracefully handle missing typeck information if typeck errored) - rust-lang#120021 (don't store const var origins for known vars) r? `@ghost` `@rustbot` modify labels: rollup

…ures, r=oli-obk Move async closure parameters into the resultant closure's future eagerly Move async closure parameters into the closure's resultant future eagerly. Before, we used to desugar `async |p1, p2, ..| { body }` as `|p1, p2, ..| { || async { body } }`. Now, we desugar the above like `|p1, p2, ..| { async move { let p1 = p1; let p2 = p2; ... body } }`. This mirrors the same desugaring that `async fn` does with its parameter types, and the compiler literally uses the same code via a shared helper function. This removes the necessity for E0708, since now expressions like `async |x: i32| { x }` will not give you confusing borrow errors. This does *not* fix the case where async closures have self-borrows. This will come with a general implementation of async closures, which is still in the works. r? oli-obk

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#119855 (Enable Static Builds for FreeBSD) - rust-lang#119922 (Rework how diagnostic lints are stored.) - rust-lang#119978 (Move async closure parameters into the resultant closure's future eagerly) - rust-lang#119984 (Change return type of unstable `Waker::noop()` from `Waker` to `&Waker`.) - rust-lang#120020 (Gracefully handle missing typeck information if typeck errored) - rust-lang#120021 (don't store const var origins for known vars) - rust-lang#120032 (Fix `rustc_abi` build on stable) r? `@ghost` `@rustbot` modify labels: rollup

…ures, r=oli-obk Move async closure parameters into the resultant closure's future eagerly Move async closure parameters into the closure's resultant future eagerly. Before, we used to desugar `async |p1, p2, ..| { body }` as `|p1, p2, ..| { || async { body } }`. Now, we desugar the above like `|p1, p2, ..| { async move { let p1 = p1; let p2 = p2; ... body } }`. This mirrors the same desugaring that `async fn` does with its parameter types, and the compiler literally uses the same code via a shared helper function. This removes the necessity for E0708, since now expressions like `async |x: i32| { x }` will not give you confusing borrow errors. This does *not* fix the case where async closures have self-borrows. This will come with a general implementation of async closures, which is still in the works. r? oli-obk

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#119172 (Detect `NulInCStr` error earlier.) - rust-lang#119833 (Make tcx optional from StableMIR run macro and extend it to accept closures) - rust-lang#119967 (Add `PatKind::Err` to AST/HIR) - rust-lang#119978 (Move async closure parameters into the resultant closure's future eagerly) - rust-lang#120021 (don't store const var origins for known vars) - rust-lang#120038 (Don't create a separate "basename" when naming and opening a MIR dump file) - rust-lang#120057 (Don't ICE when deducing future output if other errors already occurred) - rust-lang#120073 (Remove spastorino from users_on_vacation) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119978 - compiler-errors:async-closure-captures, r=oli-obk Move async closure parameters into the resultant closure's future eagerly Move async closure parameters into the closure's resultant future eagerly. Before, we used to desugar `async |p1, p2, ..| { body }` as `|p1, p2, ..| { || async { body } }`. Now, we desugar the above like `|p1, p2, ..| { async move { let p1 = p1; let p2 = p2; ... body } }`. This mirrors the same desugaring that `async fn` does with its parameter types, and the compiler literally uses the same code via a shared helper function. This removes the necessity for E0708, since now expressions like `async |x: i32| { x }` will not give you confusing borrow errors. This does *not* fix the case where async closures have self-borrows. This will come with a general implementation of async closures, which is still in the works. r? oli-obk

…ures, r=oli-obk Move async closure parameters into the resultant closure's future eagerly Move async closure parameters into the closure's resultant future eagerly. Before, we used to desugar `async |p1, p2, ..| { body }` as `|p1, p2, ..| { || async { body } }`. Now, we desugar the above like `|p1, p2, ..| { async move { let p1 = p1; let p2 = p2; ... body } }`. This mirrors the same desugaring that `async fn` does with its parameter types, and the compiler literally uses the same code via a shared helper function. This removes the necessity for E0708, since now expressions like `async |x: i32| { x }` will not give you confusing borrow errors. This does *not* fix the case where async closures have self-borrows. This will come with a general implementation of async closures, which is still in the works. r? oli-obk

rustbot assigned oli-obk Jan 14, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 14, 2024

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 15, 2024

oli-obk approved these changes Jan 15, 2024

View reviewed changes

rust-cloud-vms bot force-pushed the async-closure-captures branch from d4a7567 to 24da342 Compare January 15, 2024 19:46

This comment has been minimized.

Sign in to view

rust-cloud-vms bot force-pushed the async-closure-captures branch from 24da342 to 65e5dcb Compare January 16, 2024 02:05

This comment has been minimized.

Sign in to view

oli-obk reviewed Jan 16, 2024

View reviewed changes

compiler/rustc_error_codes/src/error_codes/E0708.md

Copy link

Contributor

oli-obk Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the compile_fail examples in this file need to be adjusted

oli-obk approved these changes Jan 16, 2024

View reviewed changes

Introduce helper that deals with moving async args into the coroutine

8bb1eae

rust-cloud-vms bot force-pushed the async-closure-captures branch from 65e5dcb to 20c7b20 Compare January 16, 2024 15:15

This comment has been minimized.

Sign in to view

compiler-errors added 3 commits January 16, 2024 17:12

Async closures will move params into the future always

f1ee076

Fix async closure call suggestion

f4e35c6

Deal with additional wrapping of async closure body in clippy

04a5ee6

rust-cloud-vms bot force-pushed the async-closure-captures branch from 20c7b20 to 04a5ee6 Compare January 16, 2024 17:12

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 16, 2024

matthiaskrgr mentioned this pull request Jan 16, 2024

Rollup of 6 pull requests #120030

Closed

matthiaskrgr mentioned this pull request Jan 16, 2024

Rollup of 7 pull requests #120034

Closed

compiler-errors mentioned this pull request Jan 17, 2024

Rollup of 8 pull requests #120067

Closed

matthiaskrgr mentioned this pull request Jan 18, 2024

Rollup of 8 pull requests #120089

Merged

bors merged commit 536fc22 into rust-lang:master Jan 18, 2024
11 checks passed

rustbot added this to the 1.77.0 milestone Jan 18, 2024

rust-timer mentioned this pull request Jan 26, 2024

Rollup of 9 pull requests #120375

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move async closure parameters into the resultant closure's future eagerly #119978

Move async closure parameters into the resultant closure's future eagerly #119978

compiler-errors commented Jan 14, 2024

This comment has been minimized.

compiler-errors commented Jan 15, 2024

oli-obk left a comment

rustbot commented Jan 15, 2024

This comment has been minimized.

This comment has been minimized.

oli-obk Jan 16, 2024

oli-obk left a comment

This comment has been minimized.

compiler-errors commented Jan 16, 2024

bors commented Jan 16, 2024

Move async closure parameters into the resultant closure's future eagerly #119978

Move async closure parameters into the resultant closure's future eagerly #119978

Conversation

compiler-errors commented Jan 14, 2024

This comment has been minimized.

compiler-errors commented Jan 15, 2024

oli-obk left a comment

Choose a reason for hiding this comment

rustbot commented Jan 15, 2024

This comment has been minimized.

This comment has been minimized.

oli-obk Jan 16, 2024

Choose a reason for hiding this comment

oli-obk left a comment

Choose a reason for hiding this comment

This comment has been minimized.

compiler-errors commented Jan 16, 2024

bors commented Jan 16, 2024