Skip to content

Commit 66226ca

Browse files
JohnTitorJohnTitor
committed
Address some code reviews
1 parent ad978e5 commit 66226ca

File tree

3 files changed

+89
-110
lines changed

3 files changed

+89
-110
lines changed

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

Lines changed: 85 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,99 +1570,66 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
15701570
format!("does not implement `{}`", trait_ref.print_only_trait_path())
15711571
};
15721572

1573-
let mut explain_yield =
1574-
|interior_span: Span, yield_span: Span, scope_span: Option<Span>| {
1575-
let mut span = MultiSpan::from_span(yield_span);
1576-
if let Ok(snippet) = source_map.span_to_snippet(interior_span) {
1577-
// #70935: If snippet contains newlines, display "the value" instead
1578-
// so that we do not emit complex diagnostics.
1579-
let snippet = &format!("`{}`", snippet);
1580-
let snippet = if snippet.contains('\n') { "the value" } else { snippet };
1581-
// The multispan can be complex here, like:
1582-
// note: future is not `Send` as this value is used across an await
1583-
// --> $DIR/issue-70935-complex-spans.rs:13:9
1584-
// |
1585-
// LL | baz(|| async{
1586-
// | __________^___-
1587-
// | | _________|
1588-
// | ||
1589-
// LL | || foo(tx.clone());
1590-
// LL | || }).await;
1591-
// | || - ^- value is later dropped here
1592-
// | ||_________|______|
1593-
// | |__________| await occurs here, with value maybe used later
1594-
// | has type `closure` which is not `Send`
1595-
// = note: the return type of a function must have a statically known size
1596-
// So, detect it and separate into some notes, like:
1597-
// note: future is not `Send` as this value is used across an await
1598-
// --> $DIR/issue-70935-complex-spans.rs:13:9
1599-
// |
1600-
// LL | / baz(|| async{
1601-
// LL | | foo(tx.clone());
1602-
// LL | | }).await;
1603-
// | |________________^
1604-
// note: first, await occurs here, with the value maybe used later
1605-
// --> $DIR/issue-70935-complex-spans.rs:13:9
1606-
// |
1607-
// LL | / baz(|| async{
1608-
// LL | | foo(tx.clone());
1609-
// LL | | }).await;
1610-
// | |________________^
1611-
// note: ...but, the value is later dropped here
1612-
// --> $DIR/issue-70935-complex-spans.rs:15:17
1613-
// |
1614-
// LL | }).await;
1615-
// | ^
1616-
// = note: the return type of a function must have a statically known size
1617-
1618-
// If available, use the scope span to annotate the drop location.
1619-
if let Some(scope_span) = scope_span {
1620-
let scope_span = source_map.end_point(scope_span);
1621-
let is_overlapped =
1622-
yield_span.overlaps(scope_span) || yield_span.overlaps(interior_span);
1623-
if is_overlapped {
1624-
err.span_note(
1625-
span,
1626-
&format!(
1627-
"{} {} as this value is used across {}",
1628-
future_or_generator, trait_explanation, an_await_or_yield
1629-
),
1630-
);
1631-
err.span_note(
1632-
yield_span,
1633-
&format!(
1634-
"first, {} occurs here, with {} maybe used later",
1635-
await_or_yield, snippet
1636-
),
1637-
);
1638-
err.span_note(
1639-
scope_span,
1640-
&format!("...but, {} is later dropped here", snippet),
1641-
);
1642-
} else {
1643-
span.push_span_label(
1644-
yield_span,
1645-
format!(
1646-
"{} occurs here, with {} maybe used later",
1647-
await_or_yield, snippet
1648-
),
1649-
);
1650-
span.push_span_label(
1651-
scope_span,
1652-
format!("{} is later dropped here", snippet),
1653-
);
1654-
span.push_span_label(
1655-
interior_span,
1656-
format!("has type `{}` which {}", target_ty, trait_explanation),
1657-
);
1658-
err.span_note(
1659-
span,
1660-
&format!(
1661-
"{} {} as this value is used across {}",
1662-
future_or_generator, trait_explanation, an_await_or_yield
1663-
),
1664-
);
1665-
}
1573+
let mut explain_yield = |interior_span: Span,
1574+
yield_span: Span,
1575+
scope_span: Option<Span>| {
1576+
let mut span = MultiSpan::from_span(yield_span);
1577+
if let Ok(snippet) = source_map.span_to_snippet(interior_span) {
1578+
// #70935: If snippet contains newlines, display "the value" instead
1579+
// so that we do not emit complex diagnostics.
1580+
let snippet = &format!("`{}`", snippet);
1581+
let snippet = if snippet.contains('\n') { "the value" } else { snippet };
1582+
// The multispan can be complex here, like:
1583+
// note: future is not `Send` as this value is used across an await
1584+
// --> $DIR/issue-70935-complex-spans.rs:13:9
1585+
// |
1586+
// LL | baz(|| async{
1587+
// | __________^___-
1588+
// | | _________|
1589+
// | ||
1590+
// LL | || foo(tx.clone());
1591+
// LL | || }).await;
1592+
// | || - ^- value is later dropped here
1593+
// | ||_________|______|
1594+
// | |__________| await occurs here, with value maybe used later
1595+
// | has type `closure` which is not `Send`
1596+
//
1597+
// So, detect it and separate into some notes, like:
1598+
//
1599+
// note: future is not `Send` as this value is used across an await
1600+
// --> $DIR/issue-70935-complex-spans.rs:13:9
1601+
// |
1602+
// LL | / baz(|| async{
1603+
// LL | | foo(tx.clone());
1604+
// LL | | }).await;
1605+
// | |________________^ first, await occurs here, with the value maybe used later...
1606+
// note: the value is later dropped here
1607+
// --> $DIR/issue-70935-complex-spans.rs:15:17
1608+
// |
1609+
// LL | }).await;
1610+
// | ^
1611+
//
1612+
// If available, use the scope span to annotate the drop location.
1613+
if let Some(scope_span) = scope_span {
1614+
let scope_span = source_map.end_point(scope_span);
1615+
let is_overlapped =
1616+
yield_span.overlaps(scope_span) || yield_span.overlaps(interior_span);
1617+
if is_overlapped {
1618+
span.push_span_label(
1619+
yield_span,
1620+
format!(
1621+
"first, {} occurs here, with {} maybe used later...",
1622+
await_or_yield, snippet
1623+
),
1624+
);
1625+
err.span_note(
1626+
span,
1627+
&format!(
1628+
"{} {} as this value is used across {}",
1629+
future_or_generator, trait_explanation, an_await_or_yield
1630+
),
1631+
);
1632+
err.span_note(scope_span, &format!("{} is later dropped here", snippet));
16661633
} else {
16671634
span.push_span_label(
16681635
yield_span,
@@ -1671,6 +1638,10 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
16711638
await_or_yield, snippet
16721639
),
16731640
);
1641+
span.push_span_label(
1642+
scope_span,
1643+
format!("{} is later dropped here", snippet),
1644+
);
16741645
span.push_span_label(
16751646
interior_span,
16761647
format!("has type `{}` which {}", target_ty, trait_explanation),
@@ -1683,8 +1654,28 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
16831654
),
16841655
);
16851656
}
1657+
} else {
1658+
span.push_span_label(
1659+
yield_span,
1660+
format!(
1661+
"{} occurs here, with {} maybe used later",
1662+
await_or_yield, snippet
1663+
),
1664+
);
1665+
span.push_span_label(
1666+
interior_span,
1667+
format!("has type `{}` which {}", target_ty, trait_explanation),
1668+
);
1669+
err.span_note(
1670+
span,
1671+
&format!(
1672+
"{} {} as this value is used across {}",
1673+
future_or_generator, trait_explanation, an_await_or_yield
1674+
),
1675+
);
16861676
}
1687-
};
1677+
}
1678+
};
16881679
match interior_or_upvar_span {
16891680
GeneratorInteriorOrUpvar::Interior(interior_span) => {
16901681
if let Some((scope_span, yield_span, expr, from_awaited_ty)) = interior_extra_info {

‎src/test/ui/async-await/issue-70935-complex-spans.stderr‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,8 @@ note: future is not `Send` as this value is used across an await
1111
LL | / baz(|| async{
1212
LL | | foo(tx.clone());
1313
LL | | }).await;
14-
| |________________^
15-
note: first, await occurs here, with the value maybe used later
16-
--> $DIR/issue-70935-complex-spans.rs:13:9
17-
|
18-
LL | / baz(|| async{
19-
LL | | foo(tx.clone());
20-
LL | | }).await;
21-
| |________________^
22-
note: ...but, the value is later dropped here
14+
| |________________^ first, await occurs here, with the value maybe used later...
15+
note: the value is later dropped here
2316
--> $DIR/issue-70935-complex-spans.rs:15:17
2417
|
2518
LL | }).await;

‎src/test/ui/async-await/issues/issue-65436-raw-ptr-not-send.stderr‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,8 @@ note: future is not `Send` as this value is used across an await
1212
--> $DIR/issue-65436-raw-ptr-not-send.rs:14:9
1313
|
1414
LL | bar(Foo(std::ptr::null())).await;
15-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
16-
note: first, await occurs here, with `std::ptr::null()` maybe used later
17-
--> $DIR/issue-65436-raw-ptr-not-send.rs:14:9
18-
|
19-
LL | bar(Foo(std::ptr::null())).await;
20-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
21-
note: ...but, `std::ptr::null()` is later dropped here
15+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ first, await occurs here, with `std::ptr::null()` maybe used later...
16+
note: `std::ptr::null()` is later dropped here
2217
--> $DIR/issue-65436-raw-ptr-not-send.rs:14:41
2318
|
2419
LL | bar(Foo(std::ptr::null())).await;

0 commit comments

Comments
 (0)