Rollup merge of #64895 - davidtwco:issue-64130-async-error-definition, r=nikomatsakis

[rust.git] / src / librustc_mir / dataflow / impls / borrows.rs

diff --git a/src/librustc_mir/dataflow/impls/borrows.rs b/src/librustc_mir/dataflow/impls/borrows.rs
index a86fcb30f4d36ca97bbf7c94fec381eaf69e9834..5e64144df2cd1c371d93d4b1b995017f191f3fd3 100644 (file)
--- a/src/librustc_mir/dataflow/impls/borrows.rs
+++ b/src/librustc_mir/dataflow/impls/borrows.rs
@@ -5,9 +5,9 @@
 use rustc::ty::{self, TyCtxt};
 use rustc::ty::RegionVid;
 
-use rustc_data_structures::bit_set::BitSet;
+use rustc_index::bit_set::BitSet;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::indexed_vec::{Idx, IndexVec};
+use rustc_index::vec::{Idx, IndexVec};
 
 use crate::dataflow::{BitDenotation, BottomValue, GenKillSet};
 use crate::borrow_check::nll::region_infer::RegionInferenceContext;
@@ -16,7 +16,7 @@
 
 use std::rc::Rc;
 
-newtype_index! {
+rustc_index::newtype_index! {
     pub struct BorrowIndex {
         DEBUG_FORMAT = "bw{}"
     }