summaryrefslogtreecommitdiffstats
path: root/src/librustc_mir/borrow_check/mod.rs
diff options
context:
space:
mode:
authorSantiago Pastorino <spastorino@gmail.com>2018-05-29 08:54:15 -0300
committerSantiago Pastorino <spastorino@gmail.com>2018-05-29 10:19:46 -0300
commit9de4e342dfc84c66d4ab435adcafc930c35f5586 (patch)
tree2be802a50f6c9dd3d6c22db153b133cc421d5979 /src/librustc_mir/borrow_check/mod.rs
parentstore output in FlowState (diff)
downloadgrust-9de4e342dfc84c66d4ab435adcafc930c35f5586.tar.gz
grust-9de4e342dfc84c66d4ab435adcafc930c35f5586.tar.bz2
grust-9de4e342dfc84c66d4ab435adcafc930c35f5586.tar.xz
Use polonius_output
Diffstat (limited to 'src/librustc_mir/borrow_check/mod.rs')
-rw-r--r--src/librustc_mir/borrow_check/mod.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs
index 983a2ac2ec..9bfba219cc 100644
--- a/src/librustc_mir/borrow_check/mod.rs
+++ b/src/librustc_mir/borrow_check/mod.rs
@@ -937,6 +937,8 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
937 let mut error_reported = false; 937 let mut error_reported = false;
938 let tcx = self.tcx; 938 let tcx = self.tcx;
939 let mir = self.mir; 939 let mir = self.mir;
940 let location_table = &LocationTable::new(mir);
941 let location = location_table.start_index(context.loc);
940 let borrow_set = self.borrow_set.clone(); 942 let borrow_set = self.borrow_set.clone();
941 each_borrow_involving_path( 943 each_borrow_involving_path(
942 self, 944 self,
@@ -945,7 +947,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
945 context, 947 context,
946 (sd, place_span.0), 948 (sd, place_span.0),
947 &borrow_set, 949 &borrow_set,
948 flow_state.borrows_in_scope(), 950 flow_state.borrows_in_scope(location),
949 |this, borrow_index, borrow| 951 |this, borrow_index, borrow|
950 match (rw, borrow.kind) { 952 match (rw, borrow.kind) {
951 // Obviously an activation is compatible with its own 953 // Obviously an activation is compatible with its own