]> git.lizzy.rs Git - rust.git/commitdiff
mir-borrowck: Add borrow data parameter to `report_illegal_mutation_of_borrowed()`
authorBasile Desloges <basile.desloges@gmail.com>
Sun, 24 Sep 2017 13:25:49 +0000 (15:25 +0200)
committerBasile Desloges <basile.desloges@gmail.com>
Tue, 26 Sep 2017 17:09:56 +0000 (19:09 +0200)
src/librustc_mir/borrow_check.rs

index 9e261d60248917ced17645bdabe13363e3048696..f324e20b26df3eeed3a2b2a71255286a19e83b4d 100644 (file)
@@ -412,7 +412,7 @@ fn access_lvalue(&mut self,
                             WriteKind::StorageDead |
                             WriteKind::Mutate =>
                                 this.report_illegal_mutation_of_borrowed(
-                                    context, lvalue_span),
+                                    context, lvalue_span, borrow),
                             WriteKind::Move =>
                                 this.report_move_out_while_borrowed(
                                     context, lvalue_span, borrow),
@@ -975,7 +975,10 @@ fn report_conflicting_borrow(&mut self,
         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(
             span, &self.describe_lvalue(lvalue), Origin::Mir);
         // FIXME: add span labels for borrow and assignment points