Skip to content

Commit 6651238

Browse files
estebankestebank
committed
Point at tail expression on rpit E0277
``` error[E0277]: the trait bound `{gen block@$DIR/gen_block_is_coro.rs:7:5: 7:8}: Coroutine` is not satisfied --> $DIR/gen_block_is_coro.rs:6:13 | LL | fn foo() -> impl Coroutine<Yield = u32, Return = ()> { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Coroutine` is not implemented for `{gen block@$DIR/gen_block_is_coro.rs:7:5: 7:8}` LL | gen { yield 42 } | ---------------- return type was inferred to be `{gen block@$DIR/gen_block_is_coro.rs:7:5: 7:8}` here ``` The secondary span label is new.
1 parent a50c8eb commit 6651238

20 files changed

+121
-32
lines changed

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

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3567,17 +3567,34 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
35673567
)]);
35683568
}
35693569
ObligationCauseCode::OpaqueReturnType(expr_info) => {
3570-
if let Some((expr_ty, hir_id)) = expr_info {
3571-
let expr_ty = self.tcx.short_ty_string(expr_ty, long_ty_file);
3572-
let expr = self.infcx.tcx.hir().expect_expr(hir_id);
3573-
err.span_label(
3574-
expr.span,
3575-
with_forced_trimmed_paths!(format!(
3576-
"return type was inferred to be `{expr_ty}` here",
3577-
)),
3578-
);
3579-
suggest_remove_deref(err, &expr);
3580-
}
3570+
let (expr_ty, expr) = if let Some((expr_ty, hir_id)) = expr_info {
3571+
let expr_ty = tcx.short_ty_string(expr_ty, long_ty_file);
3572+
let expr = tcx.hir().expect_expr(hir_id);
3573+
(expr_ty, expr)
3574+
} else if let Some(body_id) = tcx.hir_node_by_def_id(body_id).body_id()
3575+
&& let body = tcx.hir().body(body_id)
3576+
&& let hir::ExprKind::Block(block, _) = body.value.kind
3577+
&& let Some(expr) = block.expr
3578+
&& let Some(expr_ty) = self
3579+
.typeck_results
3580+
.as_ref()
3581+
.and_then(|typeck| typeck.node_type_opt(expr.hir_id))
3582+
&& let Some(pred) = predicate.as_clause()
3583+
&& let ty::ClauseKind::Trait(pred) = pred.kind().skip_binder()
3584+
&& self.can_eq(param_env, pred.self_ty(), expr_ty)
3585+
{
3586+
let expr_ty = tcx.short_ty_string(expr_ty, long_ty_file);
3587+
(expr_ty, expr)
3588+
} else {
3589+
return;
3590+
};
3591+
err.span_label(
3592+
expr.span,
3593+
with_forced_trimmed_paths!(format!(
3594+
"return type was inferred to be `{expr_ty}` here",
3595+
)),
3596+
);
3597+
suggest_remove_deref(err, &expr);
35813598
}
35823599
}
35833600
}

‎tests/ui/async-await/async-error-span.stderr‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ error[E0277]: `()` is not a future
33
|
44
LL | fn get_future() -> impl Future<Output = ()> {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^ `()` is not a future
6+
LL |
7+
LL | panic!()
8+
| -------- return type was inferred to be `_` here
69
|
710
= help: the trait `Future` is not implemented for `()`
811

‎tests/ui/coroutine/arg-count-mismatch-on-unit-input.stderr‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ LL | fn foo() -> impl Coroutine<u8> {
55
| ^^^^^^^^^^^^^^^^^^ expected due to this
66
...
77
LL | |_: ()| {}
8-
| ------- found signature defined here
8+
| ----------
9+
| |
10+
| found signature defined here
11+
| return type was inferred to be `{coroutine@$DIR/arg-count-mismatch-on-unit-input.rs:8:5: 8:12}` here
912
|
1013
= note: expected coroutine signature `fn(u8) -> _`
1114
found coroutine signature `fn(()) -> _`

‎tests/ui/coroutine/gen_block_is_coro.stderr‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,24 @@ error[E0277]: the trait bound `{gen block@$DIR/gen_block_is_coro.rs:7:5: 7:8}: C
33
|
44
LL | fn foo() -> impl Coroutine<Yield = u32, Return = ()> {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Coroutine` is not implemented for `{gen block@$DIR/gen_block_is_coro.rs:7:5: 7:8}`
6+
LL | gen { yield 42 }
7+
| ---------------- return type was inferred to be `{gen block@$DIR/gen_block_is_coro.rs:7:5: 7:8}` here
68

79
error[E0277]: the trait bound `{gen block@$DIR/gen_block_is_coro.rs:11:5: 11:8}: Coroutine` is not satisfied
810
--> $DIR/gen_block_is_coro.rs:10:13
911
|
1012
LL | fn bar() -> impl Coroutine<Yield = i64, Return = ()> {
1113
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Coroutine` is not implemented for `{gen block@$DIR/gen_block_is_coro.rs:11:5: 11:8}`
14+
LL | gen { yield 42 }
15+
| ---------------- return type was inferred to be `{gen block@$DIR/gen_block_is_coro.rs:11:5: 11:8}` here
1216

1317
error[E0277]: the trait bound `{gen block@$DIR/gen_block_is_coro.rs:15:5: 15:8}: Coroutine` is not satisfied
1418
--> $DIR/gen_block_is_coro.rs:14:13
1519
|
1620
LL | fn baz() -> impl Coroutine<Yield = i32, Return = ()> {
1721
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Coroutine` is not implemented for `{gen block@$DIR/gen_block_is_coro.rs:15:5: 15:8}`
22+
LL | gen { yield 42 }
23+
| ---------------- return type was inferred to be `{gen block@$DIR/gen_block_is_coro.rs:15:5: 15:8}` here
1824

1925
error: aborting due to 3 previous errors
2026

‎tests/ui/coroutine/gen_block_is_no_future.stderr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ error[E0277]: `{gen block@$DIR/gen_block_is_no_future.rs:5:5: 5:8}` is not a fut
33
|
44
LL | fn foo() -> impl std::future::Future {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^ `{gen block@$DIR/gen_block_is_no_future.rs:5:5: 5:8}` is not a future
6+
LL | gen { yield 42 }
7+
| ---------------- return type was inferred to be `{gen block@$DIR/gen_block_is_no_future.rs:5:5: 5:8}` here
68
|
79
= help: the trait `Future` is not implemented for `{gen block@$DIR/gen_block_is_no_future.rs:5:5: 5:8}`
810

‎tests/ui/coroutine/issue-88653.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ fn foo(bar: bool) -> impl Coroutine<(bool,)> {
1414
#[coroutine]
1515
|bar| {
1616
//~^ NOTE: found signature defined here
17+
//~| NOTE: return type was inferred to be
1718
if bar {
1819
yield bar;
1920
}

‎tests/ui/coroutine/issue-88653.stderr‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
error[E0631]: type mismatch in coroutine arguments
22
--> $DIR/issue-88653.rs:8:22
33
|
4-
LL | fn foo(bar: bool) -> impl Coroutine<(bool,)> {
5-
| ^^^^^^^^^^^^^^^^^^^^^^^ expected due to this
4+
LL | fn foo(bar: bool) -> impl Coroutine<(bool,)> {
5+
| ^^^^^^^^^^^^^^^^^^^^^^^ expected due to this
66
...
7-
LL | |bar| {
8-
| ----- found signature defined here
7+
LL | |bar| {
8+
| -----
9+
| |
10+
| _____found signature defined here
11+
| |
12+
LL | |
13+
LL | |
14+
LL | | if bar {
15+
LL | | yield bar;
16+
LL | | }
17+
LL | | }
18+
| |_____- return type was inferred to be `{coroutine@$DIR/issue-88653.rs:15:5: 15:10}` here
919
|
1020
= note: expected coroutine signature `fn((bool,)) -> _`
1121
found coroutine signature `fn(bool) -> _`

‎tests/ui/impl-trait/diagnostics/highlight-difference-between-expected-trait-and-found-trait.svg‎

Lines changed: 17 additions & 13 deletions
Loading

‎tests/ui/impl-trait/issue-55872-1.stderr‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ error[E0277]: the trait bound `S: Copy` is not satisfied in `(S, T)`
1212
|
1313
LL | fn foo<T: Default>() -> Self::E {
1414
| ^^^^^^^ within `(S, T)`, the trait `Copy` is not implemented for `S`, which is required by `(S, T): Copy`
15+
...
16+
LL | (S::default(), T::default())
17+
| ---------------------------- return type was inferred to be `(S, T)` here
1518
|
1619
= note: required because it appears within the type `(S, T)`
1720
help: consider further restricting this bound
@@ -24,6 +27,9 @@ error[E0277]: the trait bound `T: Copy` is not satisfied in `(S, T)`
2427
|
2528
LL | fn foo<T: Default>() -> Self::E {
2629
| ^^^^^^^ within `(S, T)`, the trait `Copy` is not implemented for `T`, which is required by `(S, T): Copy`
30+
...
31+
LL | (S::default(), T::default())
32+
| ---------------------------- return type was inferred to be `(S, T)` here
2733
|
2834
= note: required because it appears within the type `(S, T)`
2935
help: consider further restricting this bound

‎tests/ui/impl-trait/issue-55872-3.stderr‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ error[E0277]: the trait bound `{async block@$DIR/issue-55872-3.rs:15:9: 15:14}:
33
|
44
LL | fn foo<T>() -> Self::E {
55
| ^^^^^^^ the trait `Copy` is not implemented for `{async block@$DIR/issue-55872-3.rs:15:9: 15:14}`
6+
LL |
7+
LL | async {}
8+
| -------- return type was inferred to be `{async block@$DIR/issue-55872-3.rs:15:9: 15:14}` here
69

710
error: aborting due to 1 previous error
811

0 commit comments

Comments
 (0)