Skip to content

Commit e28c73d

Browse files
committed
mir-borrowck: Add span labels to report_illegal_mutation_of_borrowed()
1 parent 34d36c0 commit e28c73d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/librustc_mir/borrow_check.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -979,9 +979,15 @@ impl<'c, 'b, 'a: 'b+'c, 'gcx, 'tcx: 'a> MirBorrowckCtxt<'c, 'b, 'a, 'gcx, 'tcx>
979979
_: Context,
980980
(lvalue, span): (&Lvalue, Span),
981981
loan: &BorrowData) {
982+
let describe_lvalue = self.describe_lvalue(lvalue);
983+
let borrow_span = self.retrieve_borrow_span(loan);
984+
982985
let mut err = self.tcx.cannot_assign_to_borrowed(
983986
span, &self.describe_lvalue(lvalue), Origin::Mir);
984-
// FIXME: add span labels for borrow and assignment points
987+
988+
err.span_label(borrow_span, format!("borrow of `{}` occurs here", describe_lvalue));
989+
err.span_label(span, format!("assignment to borrowed `{}` occurs here", describe_lvalue));
990+
985991
err.emit();
986992
}
987993

0 commit comments

Comments
 (0)