Rollup merge of #123350 - compiler-errors:async-closure-by-move, r=oli-obk
Actually use the inferred `ClosureKind` from signature inference in coroutine-closures A follow-up to https://github.com/rust-lang/rust/pull/123349, which fixes another subtle bug: We were not taking into account the async closure kind we infer during closure signature inference. When I pass a closure directly to an arg like `fn(x: impl async FnOnce())`, that should have the side-effect of artificially restricting the kind of the async closure to `ClosureKind::FnOnce`. We weren't doing this -- that's a quick fix; however, it uncovers a second, more subtle bug with the way that `move`, async closures, and `FnOnce` interact. Specifically, when we have an async closure like: ``` let x = Struct; let c = infer_as_fnonce(async move || { println!("{x:?}"); } ``` The outer closure captures `x` by move, but the inner coroutine still immutably borrows `x` from the outer closure. Since we've forced the closure to by `async FnOnce()`, we can't actually *do* a self borrow, since the signature of `AsyncFnOnce::call_once` doesn't have a borrowed lifetime. This means that all `async move` closures that are constrained to `FnOnce` will fail borrowck. We can fix that by detecting this case specifically, and making the *inner* async closure `move` as well. This is always beneficial to closure analysis, since if we have an `async FnOnce()` that's `move`, there's no reason to ever borrow anything, so `move` isn't artificially restrictive.
This commit is contained in:
commit
02ee8a8cee
9 changed files with 182 additions and 55 deletions
|
|
@ -88,4 +88,38 @@ async fn async_main() {
|
|||
};
|
||||
call_once(c).await;
|
||||
}
|
||||
|
||||
fn force_fnonce<T>(f: impl async FnOnce() -> T) -> impl async FnOnce() -> T {
|
||||
f
|
||||
}
|
||||
|
||||
// Capture something with `move`, but infer to `AsyncFnOnce`
|
||||
{
|
||||
let x = Hello(6);
|
||||
let c = force_fnonce(async move || {
|
||||
println!("{x:?}");
|
||||
});
|
||||
call_once(c).await;
|
||||
|
||||
let x = &Hello(7);
|
||||
let c = force_fnonce(async move || {
|
||||
println!("{x:?}");
|
||||
});
|
||||
call_once(c).await;
|
||||
}
|
||||
|
||||
// Capture something by-ref, but infer to `AsyncFnOnce`
|
||||
{
|
||||
let x = Hello(8);
|
||||
let c = force_fnonce(async || {
|
||||
println!("{x:?}");
|
||||
});
|
||||
call_once(c).await;
|
||||
|
||||
let x = &Hello(9);
|
||||
let c = force_fnonce(async || {
|
||||
println!("{x:?}");
|
||||
});
|
||||
call_once(c).await;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,3 +8,7 @@ Hello(3)
|
|||
Hello(4)
|
||||
Hello(4)
|
||||
Hello(5)
|
||||
Hello(6)
|
||||
Hello(7)
|
||||
Hello(8)
|
||||
Hello(9)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue