Use rustc_index::vec instead of rustc_data_structures::indexed_vec

Author: rinon

c2rust-refactor/src/analysis/ownership/annot.rs

@@ -8,7 +8,7 @@ use std::str::FromStr;
 use arena::SyncDroplessArena;
 use log::Level;
 use rustc::hir::def_id::DefId;
-use rustc_data_structures::indexed_vec::IndexVec;
+use rustc_index::vec::IndexVec;
 use syntax::ast;
 use syntax::symbol::Symbol;
 use syntax::visit::{self, Visitor};

c2rust-refactor/src/analysis/ownership/context.rs

@@ -26,7 +26,7 @@ use arena::SyncDroplessArena;
 use log::Level;
 use rustc::hir::def_id::DefId;
 use rustc::ty::{Ty, TyCtxt, TyKind};
-use rustc_data_structures::indexed_vec::IndexVec;
+use rustc_index::vec::IndexVec;
 use syntax::source_map::Span;
 
 use crate::analysis::labeled_ty::LabeledTyCtxt;

c2rust-refactor/src/analysis/ownership/debug.rs

@@ -4,7 +4,7 @@ use std::fmt;
 
 use rustc::hir;
 use rustc::ty::TyKind;
-use rustc_data_structures::indexed_vec::Idx;
+use rustc_index::vec::Idx;
 
 use crate::analysis::labeled_ty::LabeledTy;
 

c2rust-refactor/src/analysis/ownership/inst.rs

@@ -6,7 +6,7 @@ use std::usize;
 use log::Level;
 
 use rustc::hir::def_id::DefId;
-use rustc_data_structures::indexed_vec::IndexVec;
+use rustc_index::vec::IndexVec;
 
 use super::constraint::ConstraintSet;
 use super::context::{Ctxt, Instantiation, VariantSumm};

c2rust-refactor/src/analysis/ownership/intra.rs

@@ -4,7 +4,7 @@ use log::Level;
 use rustc::hir::def_id::DefId;
 use rustc::mir::*;
 use rustc::ty::{Ty, TyKind};
-use rustc_data_structures::indexed_vec::IndexVec;
+use rustc_index::vec::IndexVec;
 use rustc_target::abi::VariantIdx;
 
 use crate::analysis::labeled_ty::{LabeledTy, LabeledTyCtxt};

c2rust-refactor/src/analysis/ownership/mod.rs

@@ -24,7 +24,7 @@ use rustc::hir;
 use rustc::hir::def_id::{DefId, LOCAL_CRATE};
 use rustc::hir::{Mutability, Node};
 use rustc::ty::{TyCtxt, TyKind, TypeAndMut, TyS};
-use rustc_data_structures::indexed_vec::{Idx, IndexVec};
+use rustc_index::vec::{Idx, IndexVec};
 use syntax::ast::IntTy;
 use syntax::source_map::Span;
 

c2rust-refactor/src/analysis/ownership/mono.rs

@@ -1,4 +1,4 @@
-use rustc_data_structures::indexed_vec::IndexVec;
+use rustc_index::vec::IndexVec;
 
 use super::constraint::{ConstraintSet, Perm};
 use super::context::{Ctxt, FuncSumm};

c2rust-refactor/src/lib.rs

@@ -27,6 +27,7 @@ extern crate rustc_data_structures;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_incremental;
+extern crate rustc_index;
 extern crate rustc_interface;
 extern crate rustc_lint;
 extern crate rustc_metadata;

c2rust-refactor/src/transform/ownership.rs

@@ -3,7 +3,7 @@ use std::collections::HashSet;
 
 use arena::SyncDroplessArena;
 use rustc::hir::def_id::DefId;
-use rustc_data_structures::indexed_vec::IndexVec;
+use rustc_index::vec::IndexVec;
 use syntax::ast::*;
 use syntax::source_map::DUMMY_SP;
 use syntax::mut_visit::{self, MutVisitor};