mirror of
https://github.com/rust-lang/rust.git
synced 2025-01-23 21:23:20 +00:00
remove indexed_vec re-export from rustc_data_structures
This commit is contained in:
parent
d20183dbbf
commit
64f61c7888
@ -3342,7 +3342,6 @@ dependencies = [
|
||||
name = "rustc_codegen_llvm"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"rustc_index",
|
||||
"rustc_llvm",
|
||||
]
|
||||
|
||||
@ -3519,6 +3518,7 @@ dependencies = [
|
||||
"log",
|
||||
"rustc",
|
||||
"rustc_data_structures",
|
||||
"rustc_index",
|
||||
"rustc_target",
|
||||
"syntax",
|
||||
"syntax_pos",
|
||||
@ -3687,6 +3687,7 @@ dependencies = [
|
||||
"bitflags",
|
||||
"log",
|
||||
"rustc_data_structures",
|
||||
"rustc_index",
|
||||
"serialize",
|
||||
"syntax_pos",
|
||||
]
|
||||
@ -3735,6 +3736,7 @@ dependencies = [
|
||||
"rustc",
|
||||
"rustc_data_structures",
|
||||
"rustc_errors",
|
||||
"rustc_index",
|
||||
"rustc_target",
|
||||
"smallvec",
|
||||
"syntax",
|
||||
@ -4281,6 +4283,7 @@ dependencies = [
|
||||
"arena",
|
||||
"cfg-if",
|
||||
"rustc_data_structures",
|
||||
"rustc_index",
|
||||
"rustc_macros",
|
||||
"scoped-tls",
|
||||
"serialize",
|
||||
|
@ -26,12 +26,12 @@ macro_rules! arena_types {
|
||||
[] steal_mir: rustc::ty::steal::Steal<rustc::mir::Body<$tcx>>,
|
||||
[] mir: rustc::mir::Body<$tcx>,
|
||||
[] steal_promoted: rustc::ty::steal::Steal<
|
||||
rustc_data_structures::indexed_vec::IndexVec<
|
||||
rustc_index::vec::IndexVec<
|
||||
rustc::mir::Promoted,
|
||||
rustc::mir::Body<$tcx>
|
||||
>
|
||||
>,
|
||||
[] promoted: rustc_data_structures::indexed_vec::IndexVec<
|
||||
[] promoted: rustc_index::vec::IndexVec<
|
||||
rustc::mir::Promoted,
|
||||
rustc::mir::Body<$tcx>
|
||||
>,
|
||||
|
@ -1,7 +1,7 @@
|
||||
use errors::Diagnostic;
|
||||
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
|
||||
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use smallvec::SmallVec;
|
||||
use rustc_data_structures::sync::{Lrc, Lock, AtomicU32, Ordering};
|
||||
use std::env;
|
||||
@ -26,7 +26,7 @@ pub struct DepGraph {
|
||||
data: Option<Lrc<DepGraphData>>,
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct DepNodeIndex { .. }
|
||||
}
|
||||
|
||||
|
@ -2,9 +2,9 @@
|
||||
|
||||
use crate::dep_graph::DepNode;
|
||||
use crate::ich::Fingerprint;
|
||||
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
|
||||
use rustc_index::vec::{IndexVec, Idx};
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct SerializedDepNodeIndex { .. }
|
||||
}
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
use crate::ty::{self, TyCtxt};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use std::fmt;
|
||||
use std::u32;
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct CrateId {
|
||||
ENCODABLE = custom
|
||||
}
|
||||
@ -87,7 +87,7 @@ impl fmt::Display for CrateNum {
|
||||
impl rustc_serialize::UseSpecializedEncodable for CrateNum {}
|
||||
impl rustc_serialize::UseSpecializedDecodable for CrateNum {}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
/// A DefIndex is an index into the hir-map for a crate, identifying a
|
||||
/// particular definition. It should really be considered an interned
|
||||
/// shorthand for a particular DefPath.
|
||||
|
@ -52,7 +52,7 @@ use crate::util::common::FN_OUTPUT_NAME;
|
||||
use crate::util::nodemap::{DefIdMap, NodeMap};
|
||||
use errors::Applicability;
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_data_structures::thin_vec::ThinVec;
|
||||
use rustc_data_structures::sync::Lrc;
|
||||
|
||||
|
@ -5,7 +5,7 @@ use crate::hir::map::HirEntryMap;
|
||||
use crate::hir::def_id::{LOCAL_CRATE, CrateNum};
|
||||
use crate::hir::intravisit::{Visitor, NestedVisitorMap};
|
||||
use rustc_data_structures::svh::Svh;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use crate::ich::Fingerprint;
|
||||
use crate::middle::cstore::CrateStore;
|
||||
use crate::session::CrateDisambiguator;
|
||||
|
@ -11,7 +11,7 @@ use crate::session::CrateDisambiguator;
|
||||
use crate::util::nodemap::NodeMap;
|
||||
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::{IndexVec};
|
||||
use rustc_index::vec::{IndexVec};
|
||||
use rustc_data_structures::stable_hasher::StableHasher;
|
||||
use std::borrow::Borrow;
|
||||
use std::fmt::Write;
|
||||
|
@ -17,7 +17,7 @@ use crate::util::common::time;
|
||||
|
||||
use rustc_target::spec::abi::Abi;
|
||||
use rustc_data_structures::svh::Svh;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use syntax::ast::{self, Name, NodeId};
|
||||
use syntax::source_map::Spanned;
|
||||
use syntax::ext::base::MacroKind;
|
||||
|
@ -122,9 +122,9 @@ impl fmt::Display for HirId {
|
||||
|
||||
// Hack to ensure that we don't try to access the private parts of `ItemLocalId` in this module.
|
||||
mod item_local_id_inner {
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_macros::HashStable;
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
/// An `ItemLocalId` uniquely identifies something within a given "item-like";
|
||||
/// that is, within a `hir::Item`, `hir::TraitItem`, or `hir::ImplItem`. There is no
|
||||
/// guarantee that the numerical value of a given `ItemLocalId` corresponds to
|
||||
|
@ -18,7 +18,7 @@ use crate::ty::{self, BoundVar, InferConst, List, Ty, TyCtxt, TypeFlags};
|
||||
use crate::ty::flags::FlagComputation;
|
||||
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use smallvec::SmallVec;
|
||||
|
||||
impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
|
||||
|
@ -25,7 +25,7 @@ use crate::infer::{InferCtxt, RegionVariableOrigin, TypeVariableOrigin, TypeVari
|
||||
use crate::infer::{ConstVariableOrigin, ConstVariableOriginKind};
|
||||
use crate::infer::region_constraints::MemberConstraint;
|
||||
use crate::mir::interpret::ConstValue;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_macros::HashStable;
|
||||
use rustc_serialize::UseSpecializedDecodable;
|
||||
use smallvec::SmallVec;
|
||||
|
@ -17,8 +17,8 @@ use crate::infer::region_constraints::{Constraint, RegionConstraintData};
|
||||
use crate::infer::InferCtxtBuilder;
|
||||
use crate::infer::{InferCtxt, InferOk, InferResult};
|
||||
use crate::mir::interpret::ConstValue;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use std::fmt::Debug;
|
||||
use syntax_pos::DUMMY_SP;
|
||||
use crate::traits::query::{Fallible, NoSolution};
|
||||
|
@ -19,7 +19,7 @@ use rustc_data_structures::fx::FxHashSet;
|
||||
use rustc_data_structures::graph::implementation::{
|
||||
Direction, Graph, NodeIndex, INCOMING, OUTGOING,
|
||||
};
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use smallvec::SmallVec;
|
||||
use std::fmt;
|
||||
use syntax_pos::Span;
|
||||
|
@ -7,7 +7,7 @@ use super::unify_key;
|
||||
use super::{MiscVariable, RegionVariableOrigin, SubregionOrigin};
|
||||
|
||||
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_data_structures::sync::Lrc;
|
||||
use rustc_data_structures::unify as ut;
|
||||
use crate::hir::def_id::DefId;
|
||||
|
@ -5,7 +5,7 @@ use crate::ty::layout::{LayoutError, Pointer, SizeSkeleton, VariantIdx};
|
||||
use crate::ty::query::Providers;
|
||||
|
||||
use rustc_target::spec::abi::Abi::RustIntrinsic;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use syntax_pos::{Span, sym};
|
||||
use crate::hir::intravisit::{self, Visitor, NestedVisitorMap};
|
||||
use crate::hir;
|
||||
|
@ -16,8 +16,8 @@ use crate::util::nodemap::{FxHashMap, FxHashSet};
|
||||
use crate::ty::{self, DefIdTree, TyCtxt};
|
||||
use crate::ty::query::Providers;
|
||||
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_macros::HashStable;
|
||||
use syntax::source_map;
|
||||
use syntax_pos::{Span, DUMMY_SP};
|
||||
@ -131,7 +131,7 @@ pub enum ScopeData {
|
||||
Remainder(FirstStatementIndex)
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
/// Represents a subscope of `block` for a binding that is introduced
|
||||
/// by `block.stmts[first_statement_index]`. Such subscopes represent
|
||||
/// a suffix of the block. Note that each subscope does not include
|
||||
|
@ -1,4 +1,4 @@
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_data_structures::sync::{RwLock, MappedReadGuard, ReadGuard};
|
||||
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
|
||||
use rustc_serialize::{Encodable, Encoder, Decodable, Decoder};
|
||||
|
@ -24,7 +24,7 @@ use rustc_index::bit_set::BitMatrix;
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
use rustc_data_structures::graph::dominators::{dominators, Dominators};
|
||||
use rustc_data_structures::graph::{self, GraphPredecessors, GraphSuccessors};
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use rustc_data_structures::sync::Lrc;
|
||||
use rustc_data_structures::sync::MappedReadGuard;
|
||||
use rustc_macros::HashStable;
|
||||
@ -581,7 +581,7 @@ impl BorrowKind {
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
// Variables and temps
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct Local {
|
||||
derive [HashStable]
|
||||
DEBUG_FORMAT = "_{}",
|
||||
@ -994,7 +994,7 @@ pub struct UpvarDebuginfo {
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
// BasicBlock
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct BasicBlock {
|
||||
derive [HashStable]
|
||||
DEBUG_FORMAT = "bb{}",
|
||||
@ -1832,7 +1832,7 @@ static_assert_size!(PlaceElem<'_>, 16);
|
||||
/// need neither the `V` parameter for `Index` nor the `T` for `Field`.
|
||||
pub type ProjectionKind = ProjectionElem<(), ()>;
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct Field {
|
||||
derive [HashStable]
|
||||
DEBUG_FORMAT = "field[{}]"
|
||||
@ -2047,7 +2047,7 @@ impl Debug for PlaceBase<'_> {
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
// Scopes
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct SourceScope {
|
||||
derive [HashStable]
|
||||
DEBUG_FORMAT = "scope[{}]",
|
||||
@ -2586,7 +2586,7 @@ impl<'tcx> TypeFoldable<'tcx> for UserTypeProjection {
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct Promoted {
|
||||
derive [HashStable]
|
||||
DEBUG_FORMAT = "promoted[{}]"
|
||||
@ -2743,7 +2743,7 @@ pub struct UnsafetyCheckResult {
|
||||
pub unsafe_blocks: Lrc<[(hir::HirId, bool)]>,
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct GeneratorSavedLocal {
|
||||
derive [HashStable]
|
||||
DEBUG_FORMAT = "_{}",
|
||||
|
@ -132,7 +132,7 @@ rustc_queries! {
|
||||
cache_on_disk_if { key.is_local() }
|
||||
load_cached(tcx, id) {
|
||||
let promoted: Option<
|
||||
rustc_data_structures::indexed_vec::IndexVec<
|
||||
rustc_index::vec::IndexVec<
|
||||
crate::mir::Promoted,
|
||||
crate::mir::Body<'tcx>
|
||||
>> = tcx.queries.on_disk_cache.try_load_query_result(tcx, id);
|
||||
|
@ -52,7 +52,7 @@ use smallvec::SmallVec;
|
||||
use rustc_data_structures::stable_hasher::{
|
||||
HashStable, StableHasher, StableVec, hash_stable_hashmap,
|
||||
};
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use rustc_data_structures::sharded::ShardedHashMap;
|
||||
use rustc_data_structures::sync::{Lrc, Lock, WorkerLocal};
|
||||
use std::any::Any;
|
||||
@ -777,7 +777,7 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for TypeckTables<'tcx> {
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct UserTypeAnnotationIndex {
|
||||
derive [HashStable]
|
||||
DEBUG_FORMAT = "UserType({})",
|
||||
|
@ -18,8 +18,8 @@ use crate::mir::{GeneratorLayout, GeneratorSavedLocal};
|
||||
use crate::ty::GeneratorSubsts;
|
||||
use crate::ty::subst::Subst;
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
|
||||
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
|
||||
use rustc_index::vec::{IndexVec, Idx};
|
||||
|
||||
pub use rustc_target::abi::*;
|
||||
use rustc_target::spec::{HasTargetSpec, abi::Abi as SpecAbi};
|
||||
|
@ -51,8 +51,8 @@ use syntax_pos::Span;
|
||||
|
||||
use smallvec;
|
||||
use rustc_data_structures::fx::FxIndexMap;
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_data_structures::stable_hasher::{StableHasher, HashStable};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
|
||||
use crate::hir;
|
||||
|
||||
@ -1536,7 +1536,7 @@ impl<'tcx> InstantiatedPredicates<'tcx> {
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
/// "Universes" are used during type- and trait-checking in the
|
||||
/// presence of `for<..>` binders to control what sets of names are
|
||||
/// visible. Universes are arranged into a tree: the root universe
|
||||
|
@ -43,7 +43,7 @@ use crate::util::profiling::ProfileCategory::*;
|
||||
|
||||
use rustc_data_structures::svh::Svh;
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_data_structures::fx::{FxIndexMap, FxHashMap, FxHashSet};
|
||||
use rustc_data_structures::stable_hasher::StableVec;
|
||||
use rustc_data_structures::sync::Lrc;
|
||||
|
@ -15,7 +15,7 @@ use errors::Diagnostic;
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::thin_vec::ThinVec;
|
||||
use rustc_data_structures::sync::{Lrc, Lock, HashMapExt, Once};
|
||||
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
|
||||
use rustc_index::vec::{IndexVec, Idx};
|
||||
use rustc_serialize::{
|
||||
Decodable, Decoder, Encodable, Encoder, SpecializedDecoder, SpecializedEncoder,
|
||||
UseSpecializedDecodable, UseSpecializedEncodable, opaque,
|
||||
|
@ -9,7 +9,7 @@ use crate::mir::interpret::ConstValue;
|
||||
use crate::ty::{self, Lift, Ty, TyCtxt, InferConst};
|
||||
use crate::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
|
||||
use crate::ty::print::{FmtPrinter, Printer};
|
||||
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
|
||||
use rustc_index::vec::{IndexVec, Idx};
|
||||
use smallvec::SmallVec;
|
||||
use crate::mir::interpret;
|
||||
|
||||
|
@ -8,7 +8,7 @@ use crate::infer::canonical::Canonical;
|
||||
use crate::mir::interpret::ConstValue;
|
||||
use crate::middle::region;
|
||||
use polonius_engine::Atom;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_macros::HashStable;
|
||||
use crate::ty::subst::{InternalSubsts, Subst, SubstsRef, GenericArg, GenericArgKind};
|
||||
use crate::ty::{self, AdtDef, Discr, DefIdTree, TypeFlags, Ty, TyCtxt, TypeFoldable};
|
||||
@ -1165,7 +1165,7 @@ impl<'tcx> ParamConst {
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
/// A [De Bruijn index][dbi] is a standard means of representing
|
||||
/// regions (and perhaps later types) in a higher-ranked setting. In
|
||||
/// particular, imagine a type like this:
|
||||
@ -1349,7 +1349,7 @@ pub struct FloatVid {
|
||||
pub index: u32,
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct RegionVid {
|
||||
DEBUG_FORMAT = custom,
|
||||
}
|
||||
@ -1376,7 +1376,7 @@ pub enum InferTy {
|
||||
FreshFloatTy(u32),
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct BoundVar { .. }
|
||||
}
|
||||
|
||||
|
@ -12,7 +12,6 @@ test = false
|
||||
|
||||
[dependencies]
|
||||
rustc_llvm = { path = "../librustc_llvm" }
|
||||
rustc_index = { path = "../librustc_index" }
|
||||
|
||||
[features]
|
||||
# This is used to convince Cargo to separately cache builds of `rustc_codegen_llvm`
|
||||
|
@ -12,7 +12,7 @@ use libc::c_uint;
|
||||
use syntax_pos::Pos;
|
||||
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
|
||||
use syntax_pos::BytePos;
|
||||
|
||||
|
@ -26,7 +26,7 @@ use rustc::mir;
|
||||
use rustc::session::config::{self, DebugInfo};
|
||||
use rustc::util::nodemap::{DefIdMap, FxHashMap, FxHashSet};
|
||||
use rustc_data_structures::small_c_str::SmallCStr;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_codegen_ssa::debuginfo::{FunctionDebugContext, MirDebugScope, VariableAccess,
|
||||
VariableKind, FunctionDebugContextData, type_names};
|
||||
|
||||
|
@ -31,6 +31,7 @@ extern crate libc;
|
||||
#[macro_use] extern crate rustc;
|
||||
extern crate rustc_target;
|
||||
#[macro_use] extern crate rustc_data_structures;
|
||||
extern crate rustc_index;
|
||||
extern crate rustc_incremental;
|
||||
extern crate rustc_codegen_utils;
|
||||
extern crate rustc_codegen_ssa;
|
||||
|
@ -13,7 +13,7 @@ use rustc::ty::{TyCtxt, SymbolName};
|
||||
use rustc::ty::query::Providers;
|
||||
use rustc::ty::subst::SubstsRef;
|
||||
use rustc::util::nodemap::{FxHashMap, DefIdMap};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use syntax::ext::allocator::ALLOCATOR_METHODS;
|
||||
|
||||
pub type ExportedSymbols = FxHashMap<
|
||||
|
@ -29,7 +29,7 @@ use rustc::util::common::{time, print_time_passes_entry, set_time_depth, time_de
|
||||
use rustc::session::config::{self, EntryFnType, Lto};
|
||||
use rustc::session::Session;
|
||||
use rustc::util::nodemap::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_codegen_utils::{symbol_names_test, check_for_rustc_errors_attr};
|
||||
use rustc::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
|
||||
use crate::mir::place::PlaceRef;
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_data_structures::graph::dominators::Dominators;
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use rustc::mir::{self, Location, TerminatorKind};
|
||||
use rustc::mir::visit::{Visitor, PlaceContext, MutatingUseContext, NonMutatingUseContext};
|
||||
use rustc::mir::traversal;
|
||||
|
@ -1,4 +1,4 @@
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc::middle::lang_items;
|
||||
use rustc::ty::{self, Ty, TypeFoldable, Instance};
|
||||
use rustc::ty::layout::{self, LayoutOf, HasTyCtxt, FnTypeExt};
|
||||
|
@ -1,6 +1,6 @@
|
||||
use rustc::mir::interpret::ErrorHandled;
|
||||
use rustc::mir;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc::ty::{self, Ty};
|
||||
use rustc::ty::layout::{self, HasTyCtxt};
|
||||
use syntax::source_map::Span;
|
||||
|
@ -14,7 +14,7 @@ use syntax::symbol::kw;
|
||||
use std::iter;
|
||||
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
|
||||
use self::analyze::CleanupKind;
|
||||
use self::place::PlaceRef;
|
||||
|
@ -3,7 +3,7 @@ use crate::debuginfo::{FunctionDebugContext, MirDebugScope, VariableAccess, Vari
|
||||
use rustc::hir::def_id::CrateNum;
|
||||
use rustc::mir;
|
||||
use rustc::ty::{self, Ty, Instance};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use syntax::ast::Name;
|
||||
use syntax_pos::{SourceFile, Span};
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
//! Rice Computer Science TS-06-33870
|
||||
//! <https://www.cs.rice.edu/~keith/EMBED/dom.pdf>
|
||||
|
||||
use super::super::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use super::iterate::reverse_post_order;
|
||||
use super::ControlFlowGraph;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
use super::super::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use super::{DirectedGraph, WithNumNodes, WithSuccessors, WithStartNode};
|
||||
use rustc_index::bit_set::BitSet;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
use super::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
|
||||
pub mod dominators;
|
||||
pub mod implementation;
|
||||
|
@ -6,7 +6,7 @@
|
||||
use crate::fx::FxHashSet;
|
||||
use crate::graph::{DirectedGraph, WithNumNodes, WithNumEdges, WithSuccessors, GraphSuccessors};
|
||||
use crate::graph::vec_graph::VecGraph;
|
||||
use crate::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use std::ops::Range;
|
||||
|
||||
#[cfg(test)]
|
||||
|
@ -1,4 +1,4 @@
|
||||
use crate::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use crate::graph::{DirectedGraph, WithNumNodes, WithNumEdges, WithSuccessors, GraphSuccessors};
|
||||
|
||||
#[cfg(test)]
|
||||
|
@ -37,7 +37,6 @@ extern crate libc;
|
||||
extern crate cfg_if;
|
||||
|
||||
pub use rustc_serialize::hex::ToHex;
|
||||
pub use rustc_index::{indexed_vec, newtype_index};
|
||||
|
||||
#[inline(never)]
|
||||
#[cold]
|
||||
|
@ -138,7 +138,7 @@ pub struct ObligationForest<O: ForestObligation> {
|
||||
/// call to `compress`.
|
||||
///
|
||||
/// `usize` indices are used here and throughout this module, rather than
|
||||
/// `newtype_index!` indices, because this code is hot enough that the
|
||||
/// `rustc_index::newtype_index!` indices, because this code is hot enough that the
|
||||
/// `u32`-to-`usize` conversions that would be required are significant,
|
||||
/// and space considerations are not important.
|
||||
nodes: Vec<Node<O>>,
|
||||
|
@ -2,7 +2,7 @@ use std::hash::{Hash, Hasher, BuildHasher};
|
||||
use std::mem;
|
||||
use smallvec::SmallVec;
|
||||
use crate::sip128::SipHasher128;
|
||||
use crate::indexed_vec;
|
||||
use rustc_index::vec;
|
||||
use rustc_index::bit_set;
|
||||
|
||||
/// When hashing something that ends up affecting properties like symbol names,
|
||||
@ -429,7 +429,7 @@ impl<T, CTX> HashStable<CTX> for ::std::mem::Discriminant<T> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<I: indexed_vec::Idx, T, CTX> HashStable<CTX> for indexed_vec::IndexVec<I, T>
|
||||
impl<I: vec::Idx, T, CTX> HashStable<CTX> for vec::IndexVec<I, T>
|
||||
where T: HashStable<CTX>,
|
||||
{
|
||||
fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
|
||||
@ -441,14 +441,14 @@ impl<I: indexed_vec::Idx, T, CTX> HashStable<CTX> for indexed_vec::IndexVec<I, T
|
||||
}
|
||||
|
||||
|
||||
impl<I: indexed_vec::Idx, CTX> HashStable<CTX> for bit_set::BitSet<I>
|
||||
impl<I: vec::Idx, CTX> HashStable<CTX> for bit_set::BitSet<I>
|
||||
{
|
||||
fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
|
||||
self.words().hash_stable(ctx, hasher);
|
||||
}
|
||||
}
|
||||
|
||||
impl<R: indexed_vec::Idx, C: indexed_vec::Idx, CTX> HashStable<CTX>
|
||||
impl<R: vec::Idx, C: vec::Idx, CTX> HashStable<CTX>
|
||||
for bit_set::BitMatrix<R, C>
|
||||
{
|
||||
fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
use crate::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
|
||||
pub fn iter<Ls>(
|
||||
first: Option<Ls::LinkIndex>,
|
||||
|
@ -1,5 +1,5 @@
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use crate::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use std::collections::VecDeque;
|
||||
|
||||
/// A work queue is a handy data structure for tracking work left to
|
||||
|
@ -1,4 +1,4 @@
|
||||
use crate::indexed_vec::{Idx, IndexVec};
|
||||
use crate::vec::{Idx, IndexVec};
|
||||
use smallvec::SmallVec;
|
||||
use std::fmt;
|
||||
use std::iter;
|
||||
|
@ -3,5 +3,5 @@
|
||||
#![feature(test)]
|
||||
#![feature(fn_traits)]
|
||||
|
||||
pub mod indexed_vec;
|
||||
pub mod vec;
|
||||
pub mod bit_set;
|
||||
|
@ -15,3 +15,4 @@ rustc_target = { path = "../librustc_target" }
|
||||
syntax = { path = "../libsyntax" }
|
||||
syntax_pos = { path = "../libsyntax_pos" }
|
||||
rustc_data_structures = { path = "../librustc_data_structures" }
|
||||
rustc_index = { path = "../librustc_index" }
|
||||
|
@ -7,7 +7,7 @@ use rustc::ty::subst::SubstsRef;
|
||||
use rustc::ty::{self, AdtKind, ParamEnv, Ty, TyCtxt};
|
||||
use rustc::ty::layout::{self, IntegerExt, LayoutOf, VariantIdx, SizeSkeleton};
|
||||
use rustc::{lint, util};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use util::nodemap::FxHashSet;
|
||||
use lint::{LateContext, LintContext, LintArray};
|
||||
use lint::{LintPass, LateLintPass};
|
||||
|
@ -6,7 +6,7 @@ use rustc::hir::def_id::{CrateNum, DefIndex};
|
||||
use rustc::hir::map::definitions::DefPathTable;
|
||||
use rustc::middle::cstore::{DepKind, ExternCrate, MetadataLoader};
|
||||
use rustc::mir::interpret::AllocDecodingState;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc::util::nodemap::{FxHashMap, NodeMap};
|
||||
|
||||
use rustc_data_structures::sync::{Lrc, RwLock, Lock};
|
||||
|
@ -3,7 +3,7 @@
|
||||
use crate::cstore::{self, CrateMetadata, MetadataBlob, NativeLibrary, ForeignModule};
|
||||
use crate::schema::*;
|
||||
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_data_structures::sync::{Lrc, ReadGuard};
|
||||
use rustc::hir::map::{DefKey, DefPath, DefPathData, DefPathHash};
|
||||
use rustc::hir;
|
||||
|
@ -8,7 +8,7 @@ use rustc::hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefIndex, DefId, LocalDefId,
|
||||
use rustc::hir::GenericParamKind;
|
||||
use rustc::hir::map::definitions::DefPathTable;
|
||||
use rustc_data_structures::fingerprint::Fingerprint;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc::middle::dependency_format::Linkage;
|
||||
use rustc::middle::exported_symbols::{ExportedSymbol, SymbolExportLevel,
|
||||
metadata_symbol_name};
|
||||
|
@ -11,7 +11,7 @@ use rustc::session::CrateDisambiguator;
|
||||
use rustc::session::config::SymbolManglingVersion;
|
||||
use rustc::ty::{self, Ty, ReprOptions};
|
||||
use rustc_target::spec::{PanicStrategy, TargetTriple};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_data_structures::svh::Svh;
|
||||
|
||||
use syntax::{ast, attr};
|
||||
|
@ -8,7 +8,7 @@ use rustc::mir::visit::{PlaceContext, Visitor, NonUseContext, MutatingUseContext
|
||||
use rustc::mir::{self, Location, Body, Local};
|
||||
use rustc::ty::{RegionVid, TyCtxt};
|
||||
use rustc::util::nodemap::{FxHashMap, FxHashSet};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use std::fmt;
|
||||
use std::ops::Index;
|
||||
|
@ -7,7 +7,7 @@ use rustc::mir::{
|
||||
};
|
||||
use rustc::ty::{self, Ty};
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_errors::{Applicability, DiagnosticBuilder};
|
||||
use syntax_pos::Span;
|
||||
use syntax::source_map::DesugaringKind;
|
||||
|
@ -1,5 +1,5 @@
|
||||
use rustc::mir::{BasicBlock, Location, Body};
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
|
||||
/// Maps between a MIR Location, which identifies a particular
|
||||
/// statement within a basic block, to a "rich location", which
|
||||
@ -17,7 +17,7 @@ crate struct LocationTable {
|
||||
statements_before_block: IndexVec<BasicBlock, usize>,
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct LocationIndex {
|
||||
DEBUG_FORMAT = "LocationIndex({})"
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ use rustc_errors::{Applicability, Diagnostic, DiagnosticBuilder};
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
||||
use rustc_data_structures::graph::dominators::Dominators;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use smallvec::SmallVec;
|
||||
|
||||
use std::collections::BTreeMap;
|
||||
|
@ -5,7 +5,7 @@ use rustc::mir::{
|
||||
Mutability, Place, PlaceRef, PlaceBase, ProjectionElem, Static, StaticKind
|
||||
};
|
||||
use rustc::ty::{self, Ty, TyCtxt};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use syntax_pos::Span;
|
||||
use syntax_pos::symbol::kw;
|
||||
|
||||
|
@ -4,7 +4,7 @@ use crate::borrow_check::nll::constraints::{OutlivesConstraintSet, OutlivesConst
|
||||
use rustc::mir::ConstraintCategory;
|
||||
use rustc::ty::RegionVid;
|
||||
use rustc_data_structures::graph;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use syntax_pos::DUMMY_SP;
|
||||
|
||||
/// The construct graph organizes the constraints by their end-points.
|
||||
|
@ -2,7 +2,7 @@ use crate::borrow_check::nll::type_check::Locations;
|
||||
use rustc::mir::ConstraintCategory;
|
||||
use rustc::ty::RegionVid;
|
||||
use rustc_data_structures::graph::scc::Sccs;
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use std::fmt;
|
||||
use std::ops::Index;
|
||||
|
||||
@ -100,13 +100,13 @@ impl fmt::Debug for OutlivesConstraint {
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct OutlivesConstraintIndex {
|
||||
DEBUG_FORMAT = "OutlivesConstraintIndex({})"
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct ConstraintSccIndex {
|
||||
DEBUG_FORMAT = "ConstraintSccIndex({})"
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ use polonius_engine::AllFacts as PoloniusAllFacts;
|
||||
use polonius_engine::Atom;
|
||||
use rustc::mir::Local;
|
||||
use rustc::ty::{RegionVid, TyCtxt};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use std::error::Error;
|
||||
use std::fmt::Debug;
|
||||
use std::fs::{self, File};
|
||||
|
@ -2,7 +2,7 @@ use crate::rustc::ty::{self, Ty};
|
||||
use rustc::hir::def_id::DefId;
|
||||
use rustc::infer::region_constraints::MemberConstraint;
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use std::hash::Hash;
|
||||
use std::ops::Index;
|
||||
use syntax_pos::Span;
|
||||
@ -51,7 +51,7 @@ crate struct NllMemberConstraint<'tcx> {
|
||||
end_index: usize,
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
crate struct NllMemberConstraintIndex {
|
||||
DEBUG_FORMAT = "MemberConstraintIndex({})"
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ use rustc::infer::InferCtxt;
|
||||
use rustc::mir::{ClosureOutlivesSubject, ClosureRegionRequirements,
|
||||
Local, Location, Body, LocalKind, BasicBlock, Promoted};
|
||||
use rustc::ty::{self, RegionKind, RegionVid};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_errors::Diagnostic;
|
||||
use std::fmt::Debug;
|
||||
use std::env;
|
||||
|
@ -12,7 +12,7 @@ use rustc::infer::InferCtxt;
|
||||
use rustc::infer::NLLRegionVariableOrigin;
|
||||
use rustc::mir::{ConstraintCategory, Location, Body};
|
||||
use rustc::ty::{self, RegionVid};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_errors::DiagnosticBuilder;
|
||||
use std::collections::VecDeque;
|
||||
use syntax::errors::Applicability;
|
||||
|
@ -3,7 +3,7 @@ use crate::borrow_check::nll::ToRegionVid;
|
||||
use crate::borrow_check::Upvar;
|
||||
use rustc::mir::{Local, Body};
|
||||
use rustc::ty::{RegionVid, TyCtxt};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use syntax::source_map::Span;
|
||||
use syntax_pos::symbol::Symbol;
|
||||
|
||||
|
@ -32,7 +32,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
||||
use rustc_data_structures::graph::WithSuccessors;
|
||||
use rustc_data_structures::graph::scc::Sccs;
|
||||
use rustc_data_structures::graph::vec_graph::VecGraph;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_errors::{Diagnostic, DiagnosticBuilder};
|
||||
use syntax_pos::Span;
|
||||
|
||||
|
@ -2,8 +2,8 @@ use rustc::mir::{BasicBlock, Location, Body};
|
||||
use rustc::ty::{self, RegionVid};
|
||||
use rustc_index::bit_set::{HybridBitSet, SparseBitMatrix};
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use std::fmt::Debug;
|
||||
use std::rc::Rc;
|
||||
|
||||
@ -116,13 +116,13 @@ impl RegionValueElements {
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
/// A single integer representing a `Location` in the MIR control-flow
|
||||
/// graph. Constructed efficiently from `RegionValueElements`.
|
||||
pub struct PointIndex { DEBUG_FORMAT = "PointIndex({})" }
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
/// A single integer representing a `ty::Placeholder`.
|
||||
pub struct PlaceholderIndex { DEBUG_FORMAT = "PlaceholderIndex({})" }
|
||||
}
|
||||
|
@ -3,7 +3,7 @@ use rustc::ty::{self, ClosureSubsts, GeneratorSubsts, Ty, TypeFoldable};
|
||||
use rustc::mir::{Location, Body, Promoted};
|
||||
use rustc::mir::visit::{MutVisitor, TyContext};
|
||||
use rustc::infer::{InferCtxt, NLLRegionVariableOrigin};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
|
||||
/// Replaces all free regions appearing in the MIR with fresh
|
||||
/// inference variables, returning the number of variables created.
|
||||
|
@ -12,7 +12,7 @@ use rustc::infer::LateBoundRegionConversionTime;
|
||||
use rustc::mir::*;
|
||||
use rustc::ty::Ty;
|
||||
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use syntax_pos::Span;
|
||||
|
||||
use super::{Locations, TypeChecker};
|
||||
|
@ -2,7 +2,7 @@ use crate::borrow_check::nll::region_infer::values::{PointIndex, RegionValueElem
|
||||
use crate::util::liveness::{categorize, DefUse};
|
||||
use rustc::mir::visit::{PlaceContext, Visitor};
|
||||
use rustc::mir::{Body, Local, Location};
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use rustc_data_structures::vec_linked_list as vll;
|
||||
|
||||
/// A map that cross references each local with the locations where it
|
||||
@ -44,7 +44,7 @@ struct Appearance {
|
||||
next: Option<AppearanceIndex>,
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct AppearanceIndex { .. }
|
||||
}
|
||||
|
||||
|
@ -43,7 +43,7 @@ use rustc::ty::{
|
||||
UserTypeAnnotationIndex,
|
||||
};
|
||||
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
||||
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
|
||||
use rustc_index::vec::{IndexVec, Idx};
|
||||
use rustc::ty::layout::VariantIdx;
|
||||
use std::rc::Rc;
|
||||
use std::{fmt, iter, mem};
|
||||
|
@ -21,7 +21,7 @@ use rustc::ty::fold::TypeFoldable;
|
||||
use rustc::ty::subst::{InternalSubsts, SubstsRef, Subst};
|
||||
use rustc::ty::{self, ClosureSubsts, GeneratorSubsts, RegionVid, Ty, TyCtxt};
|
||||
use rustc::util::nodemap::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use rustc_errors::DiagnosticBuilder;
|
||||
use std::iter;
|
||||
|
||||
|
@ -8,7 +8,7 @@ use rustc::mir::interpret::{PanicInfo::BoundsCheck};
|
||||
use rustc::mir::*;
|
||||
use rustc::ty::{CanonicalUserTypeAnnotation, Variance};
|
||||
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
|
||||
impl<'a, 'tcx> Builder<'a, 'tcx> {
|
||||
/// Compile `expr`, yielding a place that we can move from etc.
|
||||
|
@ -1,7 +1,7 @@
|
||||
//! See docs in `build/expr/mod.rs`.
|
||||
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
|
||||
use crate::build::expr::category::{Category, RvalueFunc};
|
||||
use crate::build::{BlockAnd, BlockAndExtension, Builder};
|
||||
|
@ -14,7 +14,7 @@ use rustc::ty::{self, Ty, TyCtxt};
|
||||
use rustc::ty::subst::Subst;
|
||||
use rustc::util::nodemap::HirIdMap;
|
||||
use rustc_target::spec::PanicStrategy;
|
||||
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
|
||||
use rustc_index::vec::{IndexVec, Idx};
|
||||
use std::u32;
|
||||
use rustc_target::spec::abi::Abi;
|
||||
use syntax::attr::{self, UnwindAttr};
|
||||
@ -455,7 +455,7 @@ struct CFG<'tcx> {
|
||||
basic_blocks: IndexVec<BasicBlock, BasicBlockData<'tcx>>,
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct ScopeId { .. }
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ use std::ops;
|
||||
|
||||
use rustc::mir::{self, traversal, BasicBlock, Location};
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use rustc_data_structures::work_queue::WorkQueue;
|
||||
|
||||
use crate::dataflow::BottomValue;
|
||||
|
@ -7,7 +7,7 @@ use rustc::ty::RegionVid;
|
||||
|
||||
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 crate::borrow_check::places_conflict;
|
||||
|
||||
use std::rc::Rc;
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct BorrowIndex {
|
||||
DEBUG_FORMAT = "bw{}"
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
use rustc::mir::visit::Visitor;
|
||||
use rustc::mir::{self, Local, Location};
|
||||
use rustc::ty::{self, TyCtxt};
|
||||
use rustc_data_structures::bit_set::BitSet;
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use syntax_pos::DUMMY_SP;
|
||||
|
||||
use crate::dataflow::{self, GenKillSet};
|
||||
|
@ -5,7 +5,7 @@
|
||||
use rustc::ty::TyCtxt;
|
||||
use rustc::mir::{self, Body, Location};
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
|
||||
use super::MoveDataParamEnv;
|
||||
|
||||
|
@ -2,7 +2,7 @@ use syntax::ast::{self, MetaItem};
|
||||
use syntax::symbol::{Symbol, sym};
|
||||
|
||||
use rustc_index::bit_set::{BitSet, HybridBitSet};
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_data_structures::work_queue::WorkQueue;
|
||||
|
||||
use rustc::hir::def_id::DefId;
|
||||
|
@ -1,7 +1,7 @@
|
||||
use rustc::mir::tcx::RvalueInitializationState;
|
||||
use rustc::mir::*;
|
||||
use rustc::ty::{self, TyCtxt};
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use smallvec::{smallvec, SmallVec};
|
||||
|
||||
use std::collections::hash_map::Entry;
|
||||
|
@ -2,7 +2,7 @@ use core::slice::Iter;
|
||||
use rustc::mir::*;
|
||||
use rustc::ty::{Ty, TyCtxt};
|
||||
use rustc::util::nodemap::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::{Enumerated, Idx, IndexVec};
|
||||
use rustc_index::vec::{Enumerated, Idx, IndexVec};
|
||||
use smallvec::SmallVec;
|
||||
use syntax_pos::Span;
|
||||
|
||||
@ -13,19 +13,19 @@ use self::abs_domain::{AbstractElem, Lift};
|
||||
|
||||
mod abs_domain;
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct MovePathIndex {
|
||||
DEBUG_FORMAT = "mp{}"
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct MoveOutIndex {
|
||||
DEBUG_FORMAT = "mo{}"
|
||||
}
|
||||
}
|
||||
|
||||
newtype_index! {
|
||||
rustc_index::newtype_index! {
|
||||
pub struct InitIndex {
|
||||
DEBUG_FORMAT = "in{}"
|
||||
}
|
||||
|
@ -5,7 +5,7 @@ use rustc::middle::region;
|
||||
use rustc::hir;
|
||||
use rustc::ty;
|
||||
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
|
||||
impl<'tcx> Mirror<'tcx> for &'tcx hir::Block {
|
||||
type Output = Block<'tcx>;
|
||||
|
@ -3,7 +3,7 @@ use crate::hair::cx::Cx;
|
||||
use crate::hair::cx::block;
|
||||
use crate::hair::cx::to_ref::ToRef;
|
||||
use crate::hair::util::UserAnnotatedTyHelpers;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc::hir::def::{CtorOf, Res, DefKind, CtorKind};
|
||||
use rustc::mir::interpret::{GlobalId, ErrorHandled, ConstValue};
|
||||
use rustc::ty::{self, AdtKind, Ty};
|
||||
|
@ -5,7 +5,7 @@
|
||||
use crate::hair::*;
|
||||
use crate::hair::util::UserAnnotatedTyHelpers;
|
||||
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc::hir::def_id::DefId;
|
||||
use rustc::hir::Node;
|
||||
use rustc::middle::region;
|
||||
|
@ -161,7 +161,7 @@ use self::Usefulness::*;
|
||||
use self::WitnessPreference::*;
|
||||
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
|
||||
use super::{FieldPat, Pat, PatKind, PatRange};
|
||||
use super::{PatternFoldable, PatternFolder, compare_const_vals};
|
||||
|
@ -24,7 +24,7 @@ use rustc::hir::def::{CtorOf, Res, DefKind, CtorKind};
|
||||
use rustc::hir::pat_util::EnumerateAndAdjustIterator;
|
||||
use rustc::hir::ptr::P;
|
||||
|
||||
use rustc_data_structures::indexed_vec::Idx;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
|
||||
use std::cmp::Ordering;
|
||||
|
@ -12,7 +12,7 @@ use rustc::ty::layout::{
|
||||
use rustc::ty::subst::SubstsRef;
|
||||
use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
|
||||
use rustc::ty::query::TyCtxtAt;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc::mir::interpret::{
|
||||
GlobalId, Scalar, Pointer, FrameInfo, AllocId,
|
||||
InterpResult, truncate, sign_extend,
|
||||
|
@ -17,7 +17,7 @@ use rustc::mir::interpret::{
|
||||
use rustc::ty::{self, TyCtxt};
|
||||
use rustc::ty::layout::{Align, Size};
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
|
||||
use syntax::ast::Mutability;
|
||||
use syntax::source_map::Span;
|
||||
|
@ -6,7 +6,7 @@ use rustc::ty::layout::VariantIdx;
|
||||
use rustc::ty::subst::{Subst, InternalSubsts};
|
||||
use rustc::ty::query::Providers;
|
||||
|
||||
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
|
||||
use rustc_index::vec::{IndexVec, Idx};
|
||||
|
||||
use rustc_target::spec::abi::Abi;
|
||||
use syntax_pos::{Span, sym};
|
||||
|
@ -1,6 +1,6 @@
|
||||
use rustc::ty::TyCtxt;
|
||||
use rustc::mir::*;
|
||||
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
use crate::transform::{MirPass, MirSource};
|
||||
|
||||
#[derive(PartialEq)]
|
||||
|
@ -3,7 +3,7 @@
|
||||
use rustc::mir::*;
|
||||
use rustc::mir::interpret::ConstValue;
|
||||
use rustc::ty::{self, Ty};
|
||||
use rustc_data_structures::bit_set::BitSet;
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use syntax_pos::DUMMY_SP;
|
||||
|
||||
use super::Item as ConstCx;
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
use rustc::mir::visit::Visitor;
|
||||
use rustc::mir::{self, BasicBlock, Local, Location};
|
||||
use rustc_data_structures::bit_set::BitSet;
|
||||
use rustc_index::bit_set::BitSet;
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::marker::PhantomData;
|
||||
|
@ -5,7 +5,7 @@ use rustc::mir::visit::{PlaceContext, Visitor, MutatingUseContext, NonMutatingUs
|
||||
use rustc::mir::*;
|
||||
use rustc::ty::cast::CastTy;
|
||||
use rustc::ty::{self, TyCtxt};
|
||||
use rustc_data_structures::bit_set::BitSet;
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_target::spec::abi::Abi;
|
||||
use syntax::symbol::sym;
|
||||
use syntax_pos::Span;
|
||||
|
@ -1,5 +1,5 @@
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc_data_structures::sync::Lrc;
|
||||
|
||||
use rustc::ty::query::Providers;
|
||||
|
@ -21,7 +21,7 @@ use syntax::ast::Mutability;
|
||||
use syntax_pos::{Span, DUMMY_SP};
|
||||
use rustc::ty::subst::InternalSubsts;
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::indexed_vec::IndexVec;
|
||||
use rustc_index::vec::IndexVec;
|
||||
use rustc::ty::layout::{
|
||||
LayoutOf, TyLayout, LayoutError, HasTyCtxt, TargetDataLayout, HasDataLayout,
|
||||
};
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user