about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2017-12-14 09:03:04 -0600
committerFelix S. Klock II <pnkfelix@pnkfx.org>2017-12-14 09:03:04 -0600
commitb75248ef4eeac4cf06e8cfd2fa6e36ab488eb4d1 (patch)
treefc925e901876e50ca1a2ef9034e10481b3a0c945 /src
parentf96777c9ffa1d564f26fee7ed64e4ccc4f8dd1fa (diff)
downloadrust-b75248ef4eeac4cf06e8cfd2fa6e36ab488eb4d1.tar.gz
rust-b75248ef4eeac4cf06e8cfd2fa6e36ab488eb4d1.zip
Address review note: `AccessErrorsReported` meant to track whether error reported at *any* point in past.
Diffstat (limited to 'src')
-rw-r--r--src/librustc_mir/borrow_check/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs
index e9d5bd365e2..074b4a09a2d 100644
--- a/src/librustc_mir/borrow_check/mod.rs
+++ b/src/librustc_mir/borrow_check/mod.rs
@@ -706,7 +706,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
             if self.reservation_error_reported.contains(&place_span.0) {
                 debug!("skipping access_place for activation of invalid reservation \
                         place: {:?} borrow_index: {:?}", place_span.0, borrow_index);
-                return AccessErrorsReported { mutability_error: false, conflict_error: false };
+                return AccessErrorsReported { mutability_error: false, conflict_error: true };
             }
         }