bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix two uses of span_note when the source is not available

Browse source
This commit is contained in:
Fabian Wolff 2021-07-12 18:08:14 +02:00
parent 497ee321af
commit 57fcb2e2d6
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View file

@ -218,7 +218,19 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
); );
if self.fn_self_span_reported.insert(fn_span) { if self.fn_self_span_reported.insert(fn_span) {
err.span_note( err.span_note(
self_arg.span, // Check whether the source is accessible
if self
.infcx
.tcx
.sess
.source_map()
.span_to_snippet(self_arg.span)
.is_ok()
{
self_arg.span
} else {
fn_call_span
},
"calling this operator moves the left-hand side", "calling this operator moves the left-hand side",
); );
} }
@ -429,7 +441,10 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
deref_target_ty deref_target_ty
)); ));
err.span_note(deref_target, "deref defined here"); // Check first whether the source is accessible (issue #87060)
if self.infcx.tcx.sess.source_map().span_to_snippet(deref_target).is_ok() {
err.span_note(deref_target, "deref defined here");
}
} }
if let Some((_, mut old_err)) = if let Some((_, mut old_err)) =