about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Mansi <markm@cs.wisc.edu>2019-12-09 12:24:47 -0600
committerMark Mansi <markm@cs.wisc.edu>2019-12-11 21:35:51 -0600
commitbc9582a9534f8d352581617780abe247aaddc2ae (patch)
treebac10932034283843d7cacd7fbfbd3f290f45530
parent02d93bd703b54112afccf4719497bcf9ab0979d0 (diff)
downloadrust-bc9582a9534f8d352581617780abe247aaddc2ae.tar.gz
rust-bc9582a9534f8d352581617780abe247aaddc2ae.zip
fix imports after rebase
-rw-r--r--src/librustc_mir/borrow_check/nll.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc_mir/borrow_check/nll.rs b/src/librustc_mir/borrow_check/nll.rs
index 61e6b4c8631..6d28a8caa92 100644
--- a/src/librustc_mir/borrow_check/nll.rs
+++ b/src/librustc_mir/borrow_check/nll.rs
@@ -22,15 +22,14 @@ use polonius_engine::{Algorithm, Output};
 
 use crate::util as mir_util;
 use crate::util::pretty;
-use crate::dataflow::indexes::BorrowIndex;
-use crate::dataflow::move_paths::{InitLocation, MoveData, MovePathIndex, InitKind};
+use crate::dataflow::move_paths::{InitLocation, MoveData, InitKind};
 use crate::dataflow::FlowAtLocation;
 use crate::dataflow::MaybeInitializedPlaces;
 use crate::transform::MirSource;
 
 use crate::borrow_check::{
     borrow_set::BorrowSet,
-    location::{LocationIndex, LocationTable},
+    location::LocationTable,
     facts::{AllFacts, AllFactsExt, RustcFacts},
     region_infer::{RegionInferenceContext, values::RegionValueElements},
     universal_regions::UniversalRegions,