bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Address some code reviews

Browse source
This commit is contained in:
Yuki Okushi 2020-10-11 04:48:17 +09:00
parent ad978e5572
commit 66226ca157
3 changed files with 89 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

179
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -1570,99 +1570,66 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
format!("does not implement `{}`", trait_ref.print_only_trait_path()) format!("does not implement `{}`", trait_ref.print_only_trait_path())
}; };
let mut explain_yield = let mut explain_yield = |interior_span: Span,
|interior_span: Span, yield_span: Span, scope_span: Option<Span>| { yield_span: Span,
let mut span = MultiSpan::from_span(yield_span); scope_span: Option<Span>| {
if let Ok(snippet) = source_map.span_to_snippet(interior_span) { let mut span = MultiSpan::from_span(yield_span);
// #70935: If snippet contains newlines, display "the value" instead if let Ok(snippet) = source_map.span_to_snippet(interior_span) {
// so that we do not emit complex diagnostics. // #70935: If snippet contains newlines, display "the value" instead
let snippet = &format!("`{}`", snippet); // so that we do not emit complex diagnostics.
let snippet = if snippet.contains('\n') { "the value" } else { snippet }; let snippet = &format!("`{}`", snippet);
// The multispan can be complex here, like: let snippet = if snippet.contains('\n') { "the value" } else { snippet };
// note: future is not `Send` as this value is used across an await // The multispan can be complex here, like:
// --> $DIR/issue-70935-complex-spans.rs:13:9 // note: future is not `Send` as this value is used across an await
// | // --> $DIR/issue-70935-complex-spans.rs:13:9
// LL | baz(|| async{ // |
// | __________^___- // LL | baz(|| async{
// | | _________| // | __________^___-
// | || // | | _________|
// LL | || foo(tx.clone()); // | ||
// LL | || }).await; // LL | || foo(tx.clone());
// | || - ^- value is later dropped here // LL | || }).await;
// | ||_________|______| // | || - ^- value is later dropped here
// | |__________| await occurs here, with value maybe used later // | ||_________|______|
// | has type `closure` which is not `Send` // | |__________| await occurs here, with value maybe used later
// = note: the return type of a function must have a statically known size // | has type `closure` which is not `Send`
// So, detect it and separate into some notes, like: //
// note: future is not `Send` as this value is used across an await // So, detect it and separate into some notes, like:
// --> $DIR/issue-70935-complex-spans.rs:13:9 //
// | // note: future is not `Send` as this value is used across an await
// LL | / baz(|| async{ // --> $DIR/issue-70935-complex-spans.rs:13:9
// LL | | foo(tx.clone()); // |
// LL | | }).await; // LL | / baz(|| async{
// | |________________^ // LL | | foo(tx.clone());
// note: first, await occurs here, with the value maybe used later // LL | | }).await;
// --> $DIR/issue-70935-complex-spans.rs:13:9 // | |________________^ first, await occurs here, with the value maybe used later...
// | // note: the value is later dropped here
// LL | / baz(|| async{ // --> $DIR/issue-70935-complex-spans.rs:15:17
// LL | | foo(tx.clone()); // |
// LL | | }).await; // LL | }).await;
// | |________________^ // | ^
// note: ...but, the value is later dropped here //
// --> $DIR/issue-70935-complex-spans.rs:15:17 // If available, use the scope span to annotate the drop location.
// | if let Some(scope_span) = scope_span {
// LL | }).await; let scope_span = source_map.end_point(scope_span);
// | ^ let is_overlapped =
// = note: the return type of a function must have a statically known size yield_span.overlaps(scope_span) || yield_span.overlaps(interior_span);
if is_overlapped {
// If available, use the scope span to annotate the drop location. span.push_span_label(
if let Some(scope_span) = scope_span { yield_span,
let scope_span = source_map.end_point(scope_span); format!(
let is_overlapped = "first, {} occurs here, with {} maybe used later...",
yield_span.overlaps(scope_span) || yield_span.overlaps(interior_span); await_or_yield, snippet
if is_overlapped { ),
err.span_note( );
span, err.span_note(
&format!( span,
"{} {} as this value is used across {}", &format!(
future_or_generator, trait_explanation, an_await_or_yield "{} {} as this value is used across {}",
), future_or_generator, trait_explanation, an_await_or_yield
); ),
err.span_note( );
yield_span, err.span_note(scope_span, &format!("{} is later dropped here", snippet));
&format!(
"first, {} occurs here, with {} maybe used later",
await_or_yield, snippet
),
);
err.span_note(
scope_span,
&format!("...but, {} is later dropped here", snippet),
);
} else {
span.push_span_label(
yield_span,
format!(
"{} occurs here, with {} maybe used later",
await_or_yield, snippet
),
);
span.push_span_label(
scope_span,
format!("{} is later dropped here", snippet),
);
span.push_span_label(
interior_span,
format!("has type `{}` which {}", target_ty, trait_explanation),
);
err.span_note(
span,
&format!(
"{} {} as this value is used across {}",
future_or_generator, trait_explanation, an_await_or_yield
),
);
}
} else { } else {
span.push_span_label( span.push_span_label(
yield_span, yield_span,
@ -1671,6 +1638,10 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
await_or_yield, snippet await_or_yield, snippet
), ),
); );
span.push_span_label(
scope_span,
format!("{} is later dropped here", snippet),
);
span.push_span_label( span.push_span_label(
interior_span, interior_span,
format!("has type `{}` which {}", target_ty, trait_explanation), format!("has type `{}` which {}", target_ty, trait_explanation),
@ -1683,8 +1654,28 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
), ),
); );
} }
} else {
span.push_span_label(
yield_span,
format!(
"{} occurs here, with {} maybe used later",
await_or_yield, snippet
),
);
span.push_span_label(
interior_span,
format!("has type `{}` which {}", target_ty, trait_explanation),
);
err.span_note(
span,
&format!(
"{} {} as this value is used across {}",
future_or_generator, trait_explanation, an_await_or_yield
),
);
} }
}; }
};
match interior_or_upvar_span { match interior_or_upvar_span {
GeneratorInteriorOrUpvar::Interior(interior_span) => { GeneratorInteriorOrUpvar::Interior(interior_span) => {
if let Some((scope_span, yield_span, expr, from_awaited_ty)) = interior_extra_info { if let Some((scope_span, yield_span, expr, from_awaited_ty)) = interior_extra_info {

11
src/test/ui/async-await/issue-70935-complex-spans.stderr
View file

@ -11,15 +11,8 @@ note: future is not `Send` as this value is used across an await
LL | / baz(|| async{ LL | / baz(|| async{
LL | | foo(tx.clone()); LL | | foo(tx.clone());
LL | | }).await; LL | | }).await;
| |________________^ | |________________^ first, await occurs here, with the value maybe used later...
note: first, await occurs here, with the value maybe used later note: the value is later dropped here
--> $DIR/issue-70935-complex-spans.rs:13:9
|
LL | / baz(|| async{
LL | | foo(tx.clone());
LL | | }).await;
| |________________^
note: ...but, the value is later dropped here
--> $DIR/issue-70935-complex-spans.rs:15:17 --> $DIR/issue-70935-complex-spans.rs:15:17
| |
LL | }).await; LL | }).await;

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

@ -12,13 +12,8 @@ note: future is not `Send` as this value is used across an await
--> $DIR/issue-65436-raw-ptr-not-send.rs:14:9 --> $DIR/issue-65436-raw-ptr-not-send.rs:14:9
| |
LL | bar(Foo(std::ptr::null())).await; LL | bar(Foo(std::ptr::null())).await;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ first, await occurs here, with `std::ptr::null()` maybe used later...
note: first, await occurs here, with `std::ptr::null()` maybe used later note: `std::ptr::null()` is later dropped here
--> $DIR/issue-65436-raw-ptr-not-send.rs:14:9
|
LL | bar(Foo(std::ptr::null())).await;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: ...but, `std::ptr::null()` is later dropped here
--> $DIR/issue-65436-raw-ptr-not-send.rs:14:41 --> $DIR/issue-65436-raw-ptr-not-send.rs:14:41
| |
LL | bar(Foo(std::ptr::null())).await; LL | bar(Foo(std::ptr::null())).await;