-use rustc::mir::{Body, Local, ReadOnlyBodyAndCache};
-use rustc::ty::{RegionVid, TyCtxt};
use rustc_data_structures::fx::FxHashSet;
+use rustc_middle::mir::{Body, Local, ReadOnlyBodyAndCache};
+use rustc_middle::ty::{RegionVid, TyCtxt};
use std::rc::Rc;
-use crate::dataflow::generic::ResultsCursor;
use crate::dataflow::move_paths::MoveData;
use crate::dataflow::MaybeInitializedPlaces;
+use crate::dataflow::ResultsCursor;
use crate::borrow_check::{
constraints::OutlivesConstraintSet,