Skip to content

Commit 55b415b

Browse files
JonathanBrouwerJonathanBrouwer
authored
Rollup merge of rust-lang#151194 - chenyukang:yukang-fix-150701-async-closure, r=wesleywiser
Fix wrong suggestion for returning async closure Fixes rust-lang#150701 r? @estebank
2 parents b173cbb + ae05a49 commit 55b415b

7 files changed

Lines changed: 161 additions & 30 deletions

File tree

‎compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs‎

Lines changed: 70 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,17 +1043,25 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
10431043
&& let ty::Tuple(inputs) = *sig.tupled_inputs_ty.kind()
10441044
&& inputs.is_empty()
10451045
&& self.tcx.is_lang_item(trait_pred.def_id(), LangItem::Future)
1046+
&& let ObligationCauseCode::FunctionArg { arg_hir_id, .. } = obligation.cause.code()
1047+
&& let hir::Node::Expr(hir::Expr { kind: hir::ExprKind::Closure(..), .. }) =
1048+
self.tcx.hir_node(*arg_hir_id)
10461049
&& let Some(hir::Node::Expr(hir::Expr {
1047-
kind:
1048-
hir::ExprKind::Closure(hir::Closure {
1049-
kind: hir::ClosureKind::CoroutineClosure(CoroutineDesugaring::Async),
1050-
fn_arg_span: Some(arg_span),
1051-
..
1052-
}),
1053-
..
1050+
kind: hir::ExprKind::Closure(closure), ..
10541051
})) = self.tcx.hir_get_if_local(def_id)
1055-
&& obligation.cause.span.contains(*arg_span)
1052+
&& let hir::ClosureKind::CoroutineClosure(CoroutineDesugaring::Async) = closure.kind
1053+
&& let Some(arg_span) = closure.fn_arg_span
1054+
&& obligation.cause.span.contains(arg_span)
10561055
{
1056+
let mut body = self.tcx.hir_body(closure.body).value;
1057+
let peeled = body.peel_blocks().peel_drop_temps();
1058+
if let hir::ExprKind::Closure(inner) = peeled.kind {
1059+
body = self.tcx.hir_body(inner.body).value;
1060+
}
1061+
if !matches!(body.peel_blocks().peel_drop_temps().kind, hir::ExprKind::Block(..)) {
1062+
return false;
1063+
}
1064+
10571065
let sm = self.tcx.sess.source_map();
10581066
let removal_span = if let Ok(snippet) =
10591067
sm.span_to_snippet(arg_span.with_hi(arg_span.hi() + rustc_span::BytePos(1)))
@@ -1062,7 +1070,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
10621070
// There's a space after `||`, include it in the removal
10631071
arg_span.with_hi(arg_span.hi() + rustc_span::BytePos(1))
10641072
} else {
1065-
*arg_span
1073+
arg_span
10661074
};
10671075
err.span_suggestion_verbose(
10681076
removal_span,
@@ -1102,23 +1110,63 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
11021110
.collect::<Vec<_>>()
11031111
.join(", ");
11041112

1105-
if matches!(obligation.cause.code(), ObligationCauseCode::FunctionArg { .. })
1113+
if let ObligationCauseCode::FunctionArg { arg_hir_id, .. } = obligation.cause.code()
11061114
&& obligation.cause.span.can_be_used_for_suggestions()
11071115
{
1108-
let (span, sugg) = if let Some(snippet) =
1109-
self.tcx.sess.source_map().span_to_snippet(obligation.cause.span).ok()
1110-
&& snippet.starts_with("|")
1111-
{
1112-
(obligation.cause.span, format!("({snippet})({args})"))
1113-
} else {
1114-
(obligation.cause.span.shrink_to_hi(), format!("({args})"))
1116+
let span = obligation.cause.span;
1117+
1118+
let arg_expr = match self.tcx.hir_node(*arg_hir_id) {
1119+
hir::Node::Expr(expr) => Some(expr),
1120+
_ => None,
11151121
};
11161122

1117-
// When the obligation error has been ensured to have been caused by
1118-
// an argument, the `obligation.cause.span` points at the expression
1119-
// of the argument, so we can provide a suggestion. Otherwise, we give
1120-
// a more general note.
1121-
err.span_suggestion_verbose(span, msg, sugg, Applicability::HasPlaceholders);
1123+
let is_closure_expr =
1124+
arg_expr.is_some_and(|expr| matches!(expr.kind, hir::ExprKind::Closure(..)));
1125+
1126+
// If the user wrote `|| {}()`, suggesting to call the closure would produce `(|| {}())()`,
1127+
// which doesn't help and is often outright wrong.
1128+
if args.is_empty()
1129+
&& let Some(expr) = arg_expr
1130+
&& let hir::ExprKind::Closure(closure) = expr.kind
1131+
{
1132+
let mut body = self.tcx.hir_body(closure.body).value;
1133+
1134+
// Async closures desugar to a closure returning a coroutine
1135+
if let hir::ClosureKind::CoroutineClosure(hir::CoroutineDesugaring::Async) =
1136+
closure.kind
1137+
{
1138+
let peeled = body.peel_blocks().peel_drop_temps();
1139+
if let hir::ExprKind::Closure(inner) = peeled.kind {
1140+
body = self.tcx.hir_body(inner.body).value;
1141+
}
1142+
}
1143+
1144+
let peeled_body = body.peel_blocks().peel_drop_temps();
1145+
if let hir::ExprKind::Call(callee, call_args) = peeled_body.kind
1146+
&& call_args.is_empty()
1147+
&& let hir::ExprKind::Block(..) = callee.peel_blocks().peel_drop_temps().kind
1148+
{
1149+
return false;
1150+
}
1151+
}
1152+
1153+
if is_closure_expr {
1154+
err.multipart_suggestions(
1155+
msg,
1156+
vec![vec![
1157+
(span.shrink_to_lo(), "(".to_string()),
1158+
(span.shrink_to_hi(), format!(")({args})")),
1159+
]],
1160+
Applicability::HasPlaceholders,
1161+
);
1162+
} else {
1163+
err.span_suggestion_verbose(
1164+
span.shrink_to_hi(),
1165+
msg,
1166+
format!("({args})"),
1167+
Applicability::HasPlaceholders,
1168+
);
1169+
}
11221170
} else if let DefIdOrName::DefId(def_id) = def_id_or_name {
11231171
let name = match self.tcx.hir_get_if_local(def_id) {
11241172
Some(hir::Node::Expr(hir::Expr {

‎tests/ui/async-await/async-closures/suggest-async-block-issue-140265.stderr‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,11 @@ LL | fn takes_future(_fut: impl Future<Output = ()>) {}
6666
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `takes_future`
6767
help: use parentheses to call this closure
6868
|
69-
LL | }(/* i32 */));
70-
| +++++++++++
69+
LL ~ takes_future((async |x: i32| {
70+
LL |
71+
LL | println!("{x}");
72+
LL ~ })(/* i32 */));
73+
|
7174

7275
error: aborting due to 3 previous errors
7376

‎tests/ui/const-generics/adt_const_params/const_param_ty_bad.stderr‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ LL | fn check(_: impl std::marker::ConstParamTy_) {}
3232
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `check`
3333
help: use parentheses to call this closure
3434
|
35-
LL - check(|| {});
36-
LL + check((|| {})());
37-
|
35+
LL | check((|| {})());
36+
| + +++
3837

3938
error[E0277]: `fn()` can't be used as a const parameter type
4039
--> $DIR/const_param_ty_bad.rs:9:11

‎tests/ui/suggestions/suggest-create-closure-issue-150701.fixed‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Regression test for #150701
2+
3+
//@ run-rustfix
4+
//@ edition: 2024
5+
6+
use std::future::Future;
7+
8+
fn f(_c: impl Future<Output = ()>) {}
9+
10+
fn main() {
11+
f((async || {})()); //~ ERROR: expected function, found `()`
12+
//~^ ERROR: is not a future
13+
f(async {});
14+
//~^ ERROR: is not a future
15+
}

‎tests/ui/suggestions/suggest-create-closure-issue-150701.rs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Regression test for #150701
2+
3+
//@ run-rustfix
4+
//@ edition: 2024
5+
6+
use std::future::Future;
7+
8+
fn f(_c: impl Future<Output = ()>) {}
9+
10+
fn main() {
11+
f(async || {}()); //~ ERROR: expected function, found `()`
12+
//~^ ERROR: is not a future
13+
f(async || {});
14+
//~^ ERROR: is not a future
15+
}

‎tests/ui/suggestions/suggest-create-closure-issue-150701.stderr‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
error[E0618]: expected function, found `()`
2+
--> $DIR/suggest-create-closure-issue-150701.rs:11:16
3+
|
4+
LL | f(async || {}());
5+
| ^^--
6+
| |
7+
| call expression requires function
8+
|
9+
help: if you meant to create this closure and immediately call it, surround the closure with parentheses
10+
|
11+
LL | f((async || {})());
12+
| + +
13+
14+
error[E0277]: `{async closure@$DIR/suggest-create-closure-issue-150701.rs:11:7: 11:15}` is not a future
15+
--> $DIR/suggest-create-closure-issue-150701.rs:11:7
16+
|
17+
LL | f(async || {}());
18+
| - ^^^^^^^^^^^^^ `{async closure@$DIR/suggest-create-closure-issue-150701.rs:11:7: 11:15}` is not a future
19+
| |
20+
| required by a bound introduced by this call
21+
|
22+
= help: the trait `Future` is not implemented for `{async closure@$DIR/suggest-create-closure-issue-150701.rs:11:7: 11:15}`
23+
note: required by a bound in `f`
24+
--> $DIR/suggest-create-closure-issue-150701.rs:8:15
25+
|
26+
LL | fn f(_c: impl Future<Output = ()>) {}
27+
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `f`
28+
29+
error[E0277]: `{async closure@$DIR/suggest-create-closure-issue-150701.rs:13:7: 13:15}` is not a future
30+
--> $DIR/suggest-create-closure-issue-150701.rs:13:7
31+
|
32+
LL | f(async || {});
33+
| - ^^^^^^^^^^^ `{async closure@$DIR/suggest-create-closure-issue-150701.rs:13:7: 13:15}` is not a future
34+
| |
35+
| required by a bound introduced by this call
36+
|
37+
= help: the trait `Future` is not implemented for `{async closure@$DIR/suggest-create-closure-issue-150701.rs:13:7: 13:15}`
38+
note: required by a bound in `f`
39+
--> $DIR/suggest-create-closure-issue-150701.rs:8:15
40+
|
41+
LL | fn f(_c: impl Future<Output = ()>) {}
42+
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `f`
43+
help: use `async {}` instead of `async || {}` to introduce an async block
44+
|
45+
LL - f(async || {});
46+
LL + f(async {});
47+
|
48+
49+
error: aborting due to 3 previous errors
50+
51+
Some errors have detailed explanations: E0277, E0618.
52+
For more information about an error, try `rustc --explain E0277`.

‎tests/ui/suggestions/use-parentheses-to-call-closure-issue-145404.stderr‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ LL | fn call(&self, _: impl Display) {}
1414
| ^^^^^^^ required by this bound in `S::call`
1515
help: use parentheses to call this closure
1616
|
17-
LL - S.call(|| "hello");
18-
LL + S.call((|| "hello")());
19-
|
17+
LL | S.call((|| "hello")());
18+
| + +++
2019

2120
error: aborting due to 1 previous error
2221

0 commit comments

Comments
 (0)