Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit df64c5d

Browse files
tmandrytmandry
committed
Incorporate feedback into diagnostics
1 parent 00795a9 commit df64c5d

13 files changed

+41
-49
lines changed

‎src/librustc_trait_selection/traits/error_reporting/suggestions.rs

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,8 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
13181318
_ => false,
13191319
})
13201320
.unwrap_or(false);
1321-
let await_or_yield = if is_async { "await" } else { "yield" };
1321+
let (await_or_yield, an_await_or_yield) =
1322+
if is_async { ("await", "an await") } else { ("yield", "a yield") };
13221323
let future_or_generator = if is_async { "future" } else { "generator" };
13231324

13241325
// Special case the primary error message when send or sync is the trait that was
@@ -1364,38 +1365,26 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
13641365
span.push_span_label(original_span, message);
13651366
err.set_span(span);
13661367

1367-
format!("{} is not {}", future_or_generator, trait_name)
1368+
format!("is not {}", trait_name)
13681369
} else {
1369-
format!(
1370-
"{} does not implement `{}`",
1371-
future_or_generator,
1372-
trait_ref.print_only_trait_path()
1373-
)
1374-
};
1375-
1376-
let push_target_span_with_fallback = |span: &mut MultiSpan, fallback: &str| {
1377-
if target_ty.is_impl_trait() {
1378-
// It's not very useful to tell the user the type if it's opaque.
1379-
span.push_span_label(target_span, fallback.to_string());
1380-
} else {
1381-
span.push_span_label(target_span, format!("has type `{}`", target_ty));
1382-
}
1370+
format!("does not implement `{}`", trait_ref.print_only_trait_path())
13831371
};
13841372

13851373
if let Some(await_span) = from_awaited_ty {
13861374
// The type causing this obligation is one being awaited at await_span.
13871375
let mut span = MultiSpan::from_span(await_span);
13881376

1389-
if target_span == await_span {
1390-
push_target_span_with_fallback(&mut span, "await occurs here");
1391-
} else {
1392-
span.push_span_label(await_span, "await occurs here".to_string());
1393-
push_target_span_with_fallback(&mut span, "created here");
1394-
}
1377+
span.push_span_label(
1378+
await_span,
1379+
format!("await occurs here on type `{}`, which {}", target_ty, trait_explanation),
1380+
);
13951381

13961382
err.span_note(
13971383
span,
1398-
&format!("{} as this value is used in an await", trait_explanation),
1384+
&format!(
1385+
"future {not_trait} as it awaits another future which {not_trait}",
1386+
not_trait = trait_explanation
1387+
),
13991388
);
14001389
} else {
14011390
// Look at the last interior type to get a span for the `.await`.
@@ -1410,7 +1399,10 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
14101399
format!("{} occurs here, with `{}` maybe used later", await_or_yield, snippet),
14111400
);
14121401

1413-
push_target_span_with_fallback(&mut span, "created here");
1402+
span.push_span_label(
1403+
target_span,
1404+
format!("has type `{}` which {}", target_ty, trait_explanation),
1405+
);
14141406

14151407
// If available, use the scope span to annotate the drop location.
14161408
if let Some(scope_span) = scope_span {
@@ -1423,8 +1415,8 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
14231415
err.span_note(
14241416
span,
14251417
&format!(
1426-
"{} as this value is used across an {}",
1427-
trait_explanation, await_or_yield
1418+
"{} {} as this value is used across {}",
1419+
future_or_generator, trait_explanation, an_await_or_yield
14281420
),
14291421
);
14301422
}

‎src/test/ui/async-await/async-fn-nonsend.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ note: future is not `Send` as this value is used across an await
1212
--> $DIR/async-fn-nonsend.rs:24:5
1313
|
1414
LL | let x = non_send();
15-
| - created here
15+
| - has type `impl std::fmt::Debug` which is not `Send`
1616
LL | drop(x);
1717
LL | fut().await;
1818
| ^^^^^^^^^^^ await occurs here, with `x` maybe used later
@@ -33,7 +33,7 @@ note: future is not `Send` as this value is used across an await
3333
--> $DIR/async-fn-nonsend.rs:33:20
3434
|
3535
LL | match Some(non_send()) {
36-
| ---------- created here
36+
| ---------- has type `impl std::fmt::Debug` which is not `Send`
3737
LL | Some(_) => fut().await,
3838
| ^^^^^^^^^^^ await occurs here, with `non_send()` maybe used later
3939
...
@@ -54,7 +54,7 @@ note: future is not `Send` as this value is used across an await
5454
--> $DIR/async-fn-nonsend.rs:42:9
5555
|
5656
LL | let f: &mut std::fmt::Formatter = panic!();
57-
| - has type `&mut std::fmt::Formatter<'_>`
57+
| - has type `&mut std::fmt::Formatter<'_>` which is not `Send`
5858
LL | if non_sync().fmt(f).unwrap() == () {
5959
LL | fut().await;
6060
| ^^^^^^^^^^^ await occurs here, with `f` maybe used later

‎src/test/ui/async-await/issue-64130-1-sync.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ note: future is not `Sync` as this value is used across an await
1212
--> $DIR/issue-64130-1-sync.rs:15:5
1313
|
1414
LL | let x = Foo;
15-
| - has type `Foo`
15+
| - has type `Foo` which is not `Sync`
1616
LL | baz().await;
1717
| ^^^^^^^^^^^ await occurs here, with `x` maybe used later
1818
LL | }

‎src/test/ui/async-await/issue-64130-2-send.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ note: future is not `Send` as this value is used across an await
1212
--> $DIR/issue-64130-2-send.rs:15:5
1313
|
1414
LL | let x = Foo;
15-
| - has type `Foo`
15+
| - has type `Foo` which is not `Send`
1616
LL | baz().await;
1717
| ^^^^^^^^^^^ await occurs here, with `x` maybe used later
1818
LL | }

‎src/test/ui/async-await/issue-64130-3-other.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ note: future does not implement `Qux` as this value is used across an await
1616
--> $DIR/issue-64130-3-other.rs:18:5
1717
|
1818
LL | let x = Foo;
19-
| - has type `Foo`
19+
| - has type `Foo` which does not implement `Qux`
2020
LL | baz().await;
2121
| ^^^^^^^^^^^ await occurs here, with `x` maybe used later
2222
LL | }

‎src/test/ui/async-await/issue-64130-4-async-move.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ note: future is not `Send` as this value is used across an await
1818
--> $DIR/issue-64130-4-async-move.rs:21:26
1919
|
2020
LL | match client.status() {
21-
| ------ has type `&Client`
21+
| ------ has type `&Client` which is not `Send`
2222
LL | 200 => {
2323
LL | let _x = get().await;
2424
| ^^^^^^^^^^^ await occurs here, with `client` maybe used later

‎src/test/ui/async-await/issue-64130-non-send-future-diags.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ note: future is not `Send` as this value is used across an await
1212
--> $DIR/issue-64130-non-send-future-diags.rs:15:5
1313
|
1414
LL | let g = x.lock().unwrap();
15-
| - has type `std::sync::MutexGuard<'_, u32>`
15+
| - has type `std::sync::MutexGuard<'_, u32>` which is not `Send`
1616
LL | baz().await;
1717
| ^^^^^^^^^^^ await occurs here, with `g` maybe used later
1818
LL | }

‎src/test/ui/async-await/issue-67252-unnamed-future.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ note: future is not `Send` as this value is used across an await
1212
--> $DIR/issue-67252-unnamed-future.rs:20:9
1313
|
1414
LL | let _a = std::ptr::null_mut::<()>(); // `*mut ()` is not `Send`
15-
| -- has type `*mut ()`
15+
| -- has type `*mut ()` which is not `Send`
1616
LL | AFuture.await;
1717
| ^^^^^^^^^^^^^ await occurs here, with `_a` maybe used later
1818
LL | });

‎src/test/ui/async-await/issue-68112.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ fn make_non_send_future2() -> impl Future<Output = Arc<RefCell<i32>>> {
4949
ready2(Arc::new(RefCell::new(0)))
5050
}
5151

52+
// Ideally this test would have diagnostics similar to the test above, but right
53+
// now it doesn't.
5254
fn test2() {
5355
let send_fut = async {
5456
let non_send_fut = make_non_send_future2();

‎src/test/ui/async-await/issue-68112.stderr

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ LL | require_send(send_fut);
88
| ^^^^^^^^^^^^ future created by async block is not `Send`
99
|
1010
= help: the trait `std::marker::Sync` is not implemented for `std::cell::RefCell<i32>`
11-
note: future is not `Send` as this value is used in an await
11+
note: future is not `Send` as it awaits another future which is not `Send`
1212
--> $DIR/issue-68112.rs:31:17
1313
|
14-
LL | let non_send_fut = make_non_send_future1();
15-
| ------------ created here
1614
LL | let _ = non_send_fut.await;
17-
| ^^^^^^^^^^^^ await occurs here
15+
| ^^^^^^^^^^^^ await occurs here on type `impl std::future::Future`, which is not `Send`
1816

1917
error: future cannot be sent between threads safely
2018
--> $DIR/issue-68112.rs:43:5
@@ -26,14 +24,14 @@ LL | require_send(send_fut);
2624
| ^^^^^^^^^^^^ future created by async block is not `Send`
2725
|
2826
= help: the trait `std::marker::Sync` is not implemented for `std::cell::RefCell<i32>`
29-
note: future is not `Send` as this value is used in an await
27+
note: future is not `Send` as it awaits another future which is not `Send`
3028
--> $DIR/issue-68112.rs:40:17
3129
|
3230
LL | let _ = make_non_send_future1().await;
33-
| ^^^^^^^^^^^^^^^^^^^^^^^ await occurs here
31+
| ^^^^^^^^^^^^^^^^^^^^^^^ await occurs here on type `impl std::future::Future`, which is not `Send`
3432

3533
error[E0277]: `std::cell::RefCell<i32>` cannot be shared between threads safely
36-
--> $DIR/issue-68112.rs:58:5
34+
--> $DIR/issue-68112.rs:60:5
3735
|
3836
LL | fn require_send(_: impl Send) {}
3937
| ------------ ---- required by this bound in `require_send`
@@ -49,8 +47,8 @@ LL | require_send(send_fut);
4947
= note: required because it appears within the type `impl std::future::Future`
5048
= note: required because it appears within the type `impl std::future::Future`
5149
= note: required because it appears within the type `{std::future::ResumeTy, impl std::future::Future, (), i32, Ready<i32>}`
52-
= note: required because it appears within the type `[static generator@$DIR/issue-68112.rs:53:26: 57:6 {std::future::ResumeTy, impl std::future::Future, (), i32, Ready<i32>}]`
53-
= note: required because it appears within the type `std::future::from_generator::GenFuture<[static generator@$DIR/issue-68112.rs:53:26: 57:6 {std::future::ResumeTy, impl std::future::Future, (), i32, Ready<i32>}]>`
50+
= note: required because it appears within the type `[static generator@$DIR/issue-68112.rs:55:26: 59:6 {std::future::ResumeTy, impl std::future::Future, (), i32, Ready<i32>}]`
51+
= note: required because it appears within the type `std::future::from_generator::GenFuture<[static generator@$DIR/issue-68112.rs:55:26: 59:6 {std::future::ResumeTy, impl std::future::Future, (), i32, Ready<i32>}]>`
5452
= note: required because it appears within the type `impl std::future::Future`
5553

5654
error: aborting due to 3 previous errors

0 commit comments

Comments
 (0)