mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #132488 - compiler-errors:more-fixmes-bye, r=jieyouxu

Browse Source 
Remove or fix some more `FIXME(async_closure)`

Self-explanatory
This commit is contained in:
Matthias Krüger 2024-11-02 08:33:15 +01:00 committed by GitHub
commit 30497b05cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_infer/src/infer/opaque_types/mod.rs
View File

@ -432,7 +432,6 @@ fn visit_ty(&mut self, ty: Ty<'tcx>) {
upvar.visit_with(self);
}
// FIXME(async_closures): Is this the right signature to visit here?
args.as_coroutine_closure().signature_parts_ty().visit_with(self);
}

3
tests/ui/async-await/async-closures/mangle.rs
View File

@ -5,9 +5,6 @@
//@[v0] compile-flags: -Csymbol-mangling-version=v0
//@[legacy] compile-flags: -Csymbol-mangling-version=legacy -Zunstable-options
// FIXME(async_closures): When `fn_sig_for_fn_abi` is fixed, remove this.
//@ ignore-pass (test emits codegen-time warnings)
#![feature(async_closure, noop_waker)]
extern crate block_on;

5
tests/ui/async-await/async-closures/no-borrow-from-env.rs
View File

@ -38,7 +38,10 @@ fn through_field_and_ref<'a>(x: &S<'a>) {
let c = async move || { println!("{}", *x.0); };
outlives::<'a>(c());
// outlives::<'a>(call_once(c)); // FIXME(async_closures): Figure out why this fails
// outlives::<'a>(call_once(c));
// The above fails b/c the by-move coroutine of `c` captures `x` in its entirety.
// Since we have not asserted that the borrow for `&S<'a>` outlives `'a`, it'll fail.
}
fn main() {}

2
tests/ui/async-await/async-closures/not-fn.rs
View File

@ -9,7 +9,7 @@ fn needs_fn<T>(_: impl FnMut() -> T) {}
let mut x = 1;
needs_fn(async || {
//~^ ERROR async closure does not implement `FnMut` because it captures state from its environment
//~^ ERROR async closure does not implement `FnMut` because it captures state from its environment
x += 1;
});
}

4
tests/ui/async-await/async-closures/precise-captures.rs
View File

@ -126,7 +126,7 @@ async fn async_main() {
{
let mut s = S { a: 1, b: Drop("drop first"), c: Drop("untouched") };
let c = guidance!(async move || {
// s.a = 2; // FIXME(async_closures): Figure out why this fails
s.a = 2;
drop(s.b);
});
s.c.0 = "uncaptured";
@ -141,7 +141,7 @@ async fn async_main() {
{
let mut s = S { a: 1, b: Drop("drop first"), c: Drop("untouched") };
let c = guidance!(async move || {
// s.a = 2; // FIXME(async_closures): Figure out why this fails
s.a = 2;
drop(s.b);
});
s.c.0 = "uncaptured";

4
tests/ui/async-await/async-closures/without-precise-captures-we-are-powerless.rs
View File

@ -38,10 +38,12 @@ fn through_field_and_ref<'a>(x: &S<'a>) {
let c = async || { println!("{}", *x.0); }; //~ ERROR `x` does not live long enough
outlives::<'a>(c());
outlives::<'a>(call_once(c)); //~ ERROR explicit lifetime required in the type of `x`
}
fn through_field_and_ref_move<'a>(x: &S<'a>) {
let c = async move || { println!("{}", *x.0); };
outlives::<'a>(c()); //~ ERROR `c` does not live long enough
// outlives::<'a>(call_once(c)); // FIXME(async_closures): Figure out why this fails
outlives::<'a>(call_once(c)); //~ ERROR explicit lifetime required in the type of `x`
}
fn main() {}

21
tests/ui/async-await/async-closures/without-precise-captures-we-are-powerless.stderr
View File

@ -100,7 +100,6 @@ LL | let c = async || { println!("{}", *x.0); };
LL | outlives::<'a>(c());
LL | outlives::<'a>(call_once(c));
| ------------ argument requires that `x` is borrowed for `'a`
...
LL | }
| - `x` dropped here while still borrowed
@ -114,11 +113,10 @@ LL | outlives::<'a>(call_once(c));
| ^^^^^^^^^^^^ lifetime `'a` required
error[E0597]: `c` does not live long enough
--> $DIR/without-precise-captures-we-are-powerless.rs:43:20
--> $DIR/without-precise-captures-we-are-powerless.rs:45:20
|
LL | fn through_field_and_ref<'a>(x: &S<'a>) {
| -- lifetime `'a` defined here
...
LL | fn through_field_and_ref_move<'a>(x: &S<'a>) {
| -- lifetime `'a` defined here
LL | let c = async move || { println!("{}", *x.0); };
| - binding `c` declared here
LL | outlives::<'a>(c());
@ -126,11 +124,20 @@ LL | outlives::<'a>(c());
| |
| borrowed value does not live long enough
| argument requires that `c` is borrowed for `'a`
LL | // outlives::<'a>(call_once(c)); // FIXME(async_closures): Figure out why this fails
LL | outlives::<'a>(call_once(c));
LL | }
| - `c` dropped here while still borrowed
error: aborting due to 9 previous errors
error[E0621]: explicit lifetime required in the type of `x`
--> $DIR/without-precise-captures-we-are-powerless.rs:46:20
|
LL | fn through_field_and_ref_move<'a>(x: &S<'a>) {
| ------ help: add explicit lifetime `'a` to the type of `x`: `&'a S<'a>`
...
LL | outlives::<'a>(call_once(c));
| ^^^^^^^^^^^^ lifetime `'a` required
error: aborting due to 10 previous errors
Some errors have detailed explanations: E0505, E0597, E0621.
For more information about an error, try `rustc --explain E0505`.