OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mir-borrowck: Add borrow data parameter to report_illegal_mutation_of_borrowed()

Browse Source
This commit is contained in:
Basile Desloges 2017-09-24 15:25:49 +02:00
parent 1c4510adc8
commit 34d36c0168
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc_mir/borrow_check.rs
View File

@ -412,7 +412,7 @@ impl<'c, 'b, 'a: 'b+'c, 'gcx, 'tcx: 'a> MirBorrowckCtxt<'c, 'b, 'a, 'gcx, 'tcx>
WriteKind::StorageDead | WriteKind::StorageDead |
WriteKind::Mutate => WriteKind::Mutate =>
this.report_illegal_mutation_of_borrowed( this.report_illegal_mutation_of_borrowed(
context, lvalue_span), context, lvalue_span, borrow),
WriteKind::Move => WriteKind::Move =>
this.report_move_out_while_borrowed( this.report_move_out_while_borrowed(
context, lvalue_span, borrow), context, lvalue_span, borrow),
@ -975,7 +975,10 @@ impl<'c, 'b, 'a: 'b+'c, 'gcx, 'tcx: 'a> MirBorrowckCtxt<'c, 'b, 'a, 'gcx, 'tcx>
err.emit(); err.emit();
} }
fn report_illegal_mutation_of_borrowed(&mut self, _: Context, (lvalue, span): (&Lvalue, Span)) { fn report_illegal_mutation_of_borrowed(&mut self,
_: Context,
(lvalue, span): (&Lvalue, Span),
loan: &BorrowData) {
let mut err = self.tcx.cannot_assign_to_borrowed( let mut err = self.tcx.cannot_assign_to_borrowed(
span, &self.describe_lvalue(lvalue), Origin::Mir); span, &self.describe_lvalue(lvalue), Origin::Mir);
// FIXME: add span labels for borrow and assignment points // FIXME: add span labels for borrow and assignment points