diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index d8d0079b3e398..37b6ea7872aad 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -113,7 +113,6 @@ pub mod middle { pub mod recursion_limit; pub mod resolve_lifetime; pub mod stability; - pub mod subst; pub mod traits; pub mod ty; pub mod weak_lang_items; diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs index c102822e8c126..5c881bcb3963b 100644 --- a/src/librustc/middle/const_eval.rs +++ b/src/librustc/middle/const_eval.rs @@ -18,11 +18,11 @@ use front::map as ast_map; use front::map::blocks::FnLikeNode; use lint; use middle::cstore::{self, CrateStore, InlinedItem}; -use middle::{infer, subst, traits}; +use middle::{infer, traits}; use middle::def::Def; use middle::def_id::DefId; use middle::pat_util::def_to_path; -use middle::ty::{self, Ty, TyCtxt}; +use middle::ty::{self, subst, Ty, TyCtxt}; use middle::ty::util::IntTypeExt; use middle::traits::ProjectionMode; use middle::astconv_util::ast_ty_to_prim_ty; diff --git a/src/librustc/middle/cstore.rs b/src/librustc/middle/cstore.rs index 7cad9b10f85ec..aada2ca2743b8 100644 --- a/src/librustc/middle/cstore.rs +++ b/src/librustc/middle/cstore.rs @@ -499,7 +499,7 @@ pub mod tls { use std::cell::Cell; use std::mem; use middle::ty::{self, Ty, TyCtxt}; - use middle::subst::Substs; + use middle::ty::subst::Substs; use middle::def_id::DefId; pub trait EncodingContext<'tcx> { diff --git a/src/librustc/middle/def.rs b/src/librustc/middle/def.rs index 6d4799749b93a..f832a871c8b1b 100644 --- a/src/librustc/middle/def.rs +++ b/src/librustc/middle/def.rs @@ -9,7 +9,7 @@ // except according to those terms. use middle::def_id::DefId; -use middle::subst::ParamSpace; +use middle::ty::subst::ParamSpace; use util::nodemap::NodeMap; use syntax::ast; use rustc_front::hir; diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs index 089eae89d0492..7a1da77453147 100644 --- a/src/librustc/middle/infer/error_reporting.rs +++ b/src/librustc/middle/infer/error_reporting.rs @@ -82,7 +82,7 @@ use middle::def::Def; use middle::def_id::DefId; use middle::infer::{self, TypeOrigin}; use middle::region; -use middle::subst; +use middle::ty::subst; use middle::ty::{self, Ty, TyCtxt, TypeFoldable}; use middle::ty::{Region, ReFree}; use middle::ty::error::TypeError; diff --git a/src/librustc/middle/infer/mod.rs b/src/librustc/middle/infer/mod.rs index 645e5323ef4ae..ea11ade1d16dd 100644 --- a/src/librustc/middle/infer/mod.rs +++ b/src/librustc/middle/infer/mod.rs @@ -24,9 +24,9 @@ use middle::free_region::FreeRegionMap; use middle::mem_categorization as mc; use middle::mem_categorization::McResult; use middle::region::CodeExtent; -use middle::subst; -use middle::subst::Substs; -use middle::subst::Subst; +use middle::ty::subst; +use middle::ty::subst::Substs; +use middle::ty::subst::Subst; use middle::traits::{self, ProjectionMode}; use middle::ty::adjustment; use middle::ty::{TyVid, IntVid, FloatVid}; diff --git a/src/librustc/middle/intrinsicck.rs b/src/librustc/middle/intrinsicck.rs index 233e55cdbb5dd..e3da34acb4b43 100644 --- a/src/librustc/middle/intrinsicck.rs +++ b/src/librustc/middle/intrinsicck.rs @@ -11,7 +11,7 @@ use dep_graph::DepNode; use middle::def::Def; use middle::def_id::DefId; -use middle::subst::{Subst, Substs, EnumeratedItems}; +use middle::ty::subst::{Subst, Substs, EnumeratedItems}; use middle::ty::{TransmuteRestriction, TyCtxt}; use middle::ty::{self, Ty, TypeFoldable}; diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index 9507c379b4fe1..ee39a4fc7df6e 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -115,7 +115,7 @@ use middle::pat_util; use middle::ty::{self, TyCtxt, ParameterEnvironment}; use middle::traits::{self, ProjectionMode}; use middle::infer; -use middle::subst::Subst; +use middle::ty::subst::Subst; use lint; use util::nodemap::NodeMap; diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index a80b130e5be5f..8d3a80854b467 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -23,7 +23,7 @@ use front::map::Map; use session::Session; use middle::def::{Def, DefMap}; use middle::region; -use middle::subst; +use middle::ty::subst; use middle::ty; use std::fmt; use std::mem::replace; diff --git a/src/librustc/middle/traits/coherence.rs b/src/librustc/middle/traits/coherence.rs index 64d1c992cbf1d..547cb71f234f0 100644 --- a/src/librustc/middle/traits/coherence.rs +++ b/src/librustc/middle/traits/coherence.rs @@ -14,7 +14,7 @@ use super::{SelectionContext, Obligation, ObligationCause}; use middle::cstore::LOCAL_CRATE; use middle::def_id::DefId; -use middle::subst::TypeSpace; +use middle::ty::subst::TypeSpace; use middle::ty::{self, Ty, TyCtxt}; use middle::infer::{self, InferCtxt, TypeOrigin}; use syntax::codemap::DUMMY_SP; diff --git a/src/librustc/middle/traits/mod.rs b/src/librustc/middle/traits/mod.rs index 5f66e9e6344ad..9404731859961 100644 --- a/src/librustc/middle/traits/mod.rs +++ b/src/librustc/middle/traits/mod.rs @@ -17,7 +17,7 @@ pub use self::ObligationCauseCode::*; use middle::def_id::DefId; use middle::free_region::FreeRegionMap; -use middle::subst; +use middle::ty::subst; use middle::ty::{self, Ty, TypeFoldable}; use middle::infer::{self, fixup_err_to_string, InferCtxt}; diff --git a/src/librustc/middle/traits/object_safety.rs b/src/librustc/middle/traits/object_safety.rs index 4a0da521eef30..8777b9eb00cfd 100644 --- a/src/librustc/middle/traits/object_safety.rs +++ b/src/librustc/middle/traits/object_safety.rs @@ -21,7 +21,7 @@ use super::supertraits; use super::elaborate_predicates; use middle::def_id::DefId; -use middle::subst::{self, SelfSpace, TypeSpace}; +use middle::ty::subst::{self, SelfSpace, TypeSpace}; use middle::traits; use middle::ty::{self, ToPolyTraitRef, Ty, TyCtxt, TypeFoldable}; use std::rc::Rc; diff --git a/src/librustc/middle/traits/project.rs b/src/librustc/middle/traits/project.rs index e86f3ed01a49d..bd075a5dc88db 100644 --- a/src/librustc/middle/traits/project.rs +++ b/src/librustc/middle/traits/project.rs @@ -25,7 +25,7 @@ use super::util; use middle::def_id::DefId; use middle::infer::{self, TypeOrigin}; -use middle::subst::Subst; +use middle::ty::subst::Subst; use middle::ty::{self, ToPredicate, ToPolyTraitRef, Ty, TyCtxt}; use middle::ty::fold::{TypeFoldable, TypeFolder}; use syntax::parse::token; diff --git a/src/librustc/middle/traits/select.rs b/src/librustc/middle/traits/select.rs index 3eaf123e5be58..050468809a5ac 100644 --- a/src/librustc/middle/traits/select.rs +++ b/src/librustc/middle/traits/select.rs @@ -39,7 +39,7 @@ use super::util; use middle::def_id::DefId; use middle::infer; use middle::infer::{InferCtxt, TypeFreshener, TypeOrigin}; -use middle::subst::{Subst, Substs, TypeSpace}; +use middle::ty::subst::{Subst, Substs, TypeSpace}; use middle::ty::{self, ToPredicate, ToPolyTraitRef, Ty, TyCtxt, TypeFoldable}; use middle::traits; use middle::ty::fast_reject; diff --git a/src/librustc/middle/traits/specialize/mod.rs b/src/librustc/middle/traits/specialize/mod.rs index 92478f2874e1e..088099d87b158 100644 --- a/src/librustc/middle/traits/specialize/mod.rs +++ b/src/librustc/middle/traits/specialize/mod.rs @@ -24,7 +24,7 @@ use middle::cstore::CrateStore; use middle::def_id::DefId; use middle::infer::{self, InferCtxt, TypeOrigin}; use middle::region; -use middle::subst::{Subst, Substs}; +use middle::ty::subst::{Subst, Substs}; use middle::traits::{self, ProjectionMode, ObligationCause, Normalized}; use middle::ty::{self, TyCtxt}; use syntax::codemap::DUMMY_SP; diff --git a/src/librustc/middle/traits/util.rs b/src/librustc/middle/traits/util.rs index 9f984bc1fc63a..f9a1b09a93d2c 100644 --- a/src/librustc/middle/traits/util.rs +++ b/src/librustc/middle/traits/util.rs @@ -10,7 +10,7 @@ use middle::def_id::DefId; use middle::infer::InferCtxt; -use middle::subst::{Subst, Substs}; +use middle::ty::subst::{Subst, Substs}; use middle::ty::{self, Ty, TyCtxt, ToPredicate, ToPolyTraitRef}; use syntax::codemap::Span; use util::common::ErrorReported; diff --git a/src/librustc/middle/ty/context.rs b/src/librustc/middle/ty/context.rs index 6acd094c1f90d..74714f714819c 100644 --- a/src/librustc/middle/ty/context.rs +++ b/src/librustc/middle/ty/context.rs @@ -22,7 +22,7 @@ use middle::free_region::FreeRegionMap; use middle::region::RegionMaps; use middle::resolve_lifetime; use middle::stability; -use middle::subst::{self, Subst, Substs}; +use middle::ty::subst::{self, Subst, Substs}; use middle::traits; use middle::ty::{self, TraitRef, Ty, TypeAndMut}; use middle::ty::{TyS, TypeVariants}; diff --git a/src/librustc/middle/ty/error.rs b/src/librustc/middle/ty/error.rs index 1033af5f331a7..8e1ace57e42ad 100644 --- a/src/librustc/middle/ty/error.rs +++ b/src/librustc/middle/ty/error.rs @@ -9,7 +9,7 @@ // except according to those terms. use middle::def_id::DefId; -use middle::subst; +use middle::ty::subst; use middle::infer::type_variable; use middle::ty::{self, BoundRegion, Region, Ty, TyCtxt}; diff --git a/src/librustc/middle/ty/flags.rs b/src/librustc/middle/ty/flags.rs index c874e9b7ca52d..12b2426150797 100644 --- a/src/librustc/middle/ty/flags.rs +++ b/src/librustc/middle/ty/flags.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use middle::subst; +use middle::ty::subst; use middle::ty::{self, Ty, TypeFlags, TypeFoldable}; pub struct FlagComputation { diff --git a/src/librustc/middle/ty/fold.rs b/src/librustc/middle/ty/fold.rs index f754e5c5a0a7d..2e8782a72f691 100644 --- a/src/librustc/middle/ty/fold.rs +++ b/src/librustc/middle/ty/fold.rs @@ -40,7 +40,7 @@ //! and does not need to visit anything else. use middle::region; -use middle::subst; +use middle::ty::subst; use middle::ty::adjustment; use middle::ty::{self, Binder, Ty, TyCtxt, TypeFlags}; diff --git a/src/librustc/middle/ty/mod.rs b/src/librustc/middle/ty/mod.rs index a4c3e82b6335d..0eee78dcab3d2 100644 --- a/src/librustc/middle/ty/mod.rs +++ b/src/librustc/middle/ty/mod.rs @@ -27,10 +27,10 @@ use middle::def::{self, Def, ExportMap}; use middle::def_id::DefId; use middle::lang_items::{FnTraitLangItem, FnMutTraitLangItem, FnOnceTraitLangItem}; use middle::region::{CodeExtent}; -use middle::subst::{self, Subst, Substs, VecPerParamSpace}; use middle::traits; use middle::ty; use middle::ty::fold::TypeFolder; +use middle::ty::subst::{Subst, Substs, VecPerParamSpace}; use middle::ty::walk::TypeWalker; use util::common::MemoizationMap; use util::nodemap::{NodeMap, NodeSet}; @@ -91,6 +91,7 @@ pub mod _match; pub mod maps; pub mod outlives; pub mod relate; +pub mod subst; pub mod trait_def; pub mod walk; pub mod wf; diff --git a/src/librustc/middle/ty/relate.rs b/src/librustc/middle/ty/relate.rs index 563ff346a6440..d648c2c588476 100644 --- a/src/librustc/middle/ty/relate.rs +++ b/src/librustc/middle/ty/relate.rs @@ -14,7 +14,7 @@ //! type equality, etc. use middle::def_id::DefId; -use middle::subst::{ParamSpace, Substs}; +use middle::ty::subst::{ParamSpace, Substs}; use middle::ty::{self, Ty, TyCtxt, TypeFoldable}; use middle::ty::error::{ExpectedFound, TypeError}; use std::rc::Rc; diff --git a/src/librustc/middle/ty/structural_impls.rs b/src/librustc/middle/ty/structural_impls.rs index 0358fa2f12455..23ec75b18e82c 100644 --- a/src/librustc/middle/ty/structural_impls.rs +++ b/src/librustc/middle/ty/structural_impls.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use middle::subst::{self, VecPerParamSpace}; +use middle::ty::subst::{self, VecPerParamSpace}; use middle::traits; use middle::ty::{self, Lift, TraitRef, Ty, TyCtxt}; use middle::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor}; diff --git a/src/librustc/middle/ty/sty.rs b/src/librustc/middle/ty/sty.rs index 7a17b24df5e9d..d8f0dd2903196 100644 --- a/src/librustc/middle/ty/sty.rs +++ b/src/librustc/middle/ty/sty.rs @@ -13,7 +13,7 @@ use middle::cstore; use middle::def_id::DefId; use middle::region; -use middle::subst::{self, Substs}; +use middle::ty::subst::{self, Substs}; use middle::traits; use middle::ty::{self, AdtDef, ToPredicate, TypeFlags, Ty, TyCtxt, TyS, TypeFoldable}; use util::common::ErrorReported; diff --git a/src/librustc/middle/subst.rs b/src/librustc/middle/ty/subst.rs similarity index 100% rename from src/librustc/middle/subst.rs rename to src/librustc/middle/ty/subst.rs diff --git a/src/librustc/middle/ty/util.rs b/src/librustc/middle/ty/util.rs index 6a91592dbd52a..f6c4390b83c96 100644 --- a/src/librustc/middle/ty/util.rs +++ b/src/librustc/middle/ty/util.rs @@ -14,7 +14,7 @@ use back::svh::Svh; use middle::const_eval::{self, ConstVal, ErrKind}; use middle::const_eval::EvalHint::UncheckedExprHint; use middle::def_id::DefId; -use middle::subst; +use middle::ty::subst; use middle::infer; use middle::pat_util; use middle::traits::{self, ProjectionMode}; diff --git a/src/librustc/middle/ty/wf.rs b/src/librustc/middle/ty/wf.rs index 5f81d27a1f688..1becdb14fa534 100644 --- a/src/librustc/middle/ty/wf.rs +++ b/src/librustc/middle/ty/wf.rs @@ -11,7 +11,7 @@ use middle::def_id::DefId; use middle::infer::InferCtxt; use middle::ty::outlives::{self, Component}; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::traits; use middle::ty::{self, ToPredicate, Ty, TyCtxt, TypeFoldable}; use std::iter::once; diff --git a/src/librustc/mir/repr.rs b/src/librustc/mir/repr.rs index 47d923cbce359..20cf6d929ca7c 100644 --- a/src/librustc/mir/repr.rs +++ b/src/librustc/mir/repr.rs @@ -12,7 +12,7 @@ use graphviz::IntoCow; use middle::const_eval::ConstVal; use rustc_const_eval::{ConstUsize, ConstInt}; use middle::def_id::DefId; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::ty::{self, AdtDef, ClosureSubsts, FnOutput, Region, Ty}; use util::ppaux; use rustc_back::slice; diff --git a/src/librustc/mir/tcx.rs b/src/librustc/mir/tcx.rs index c8a2bc440ce1d..0c9e00a6c5ec4 100644 --- a/src/librustc/mir/tcx.rs +++ b/src/librustc/mir/tcx.rs @@ -14,7 +14,7 @@ */ use mir::repr::*; -use middle::subst::{Subst, Substs}; +use middle::ty::subst::{Subst, Substs}; use middle::ty::{self, AdtDef, Ty, TyCtxt}; use middle::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor}; use rustc_front::hir; diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 6e7f49516e8fa..f67346fe1f940 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -10,7 +10,7 @@ use middle::def_id::DefId; -use middle::subst::{self, Subst}; +use middle::ty::subst::{self, Subst}; use middle::ty::{BrAnon, BrEnv, BrFresh, BrNamed}; use middle::ty::{TyBool, TyChar, TyStruct, TyEnum}; use middle::ty::{TyError, TyStr, TyArray, TySlice, TyFloat, TyFnDef, TyFnPtr}; diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index 111db3b1d3890..6bca4ff481d38 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -20,8 +20,8 @@ use rustc_typeck::middle::region::{self, CodeExtent}; use rustc_typeck::middle::region::CodeExtentData; use rustc_typeck::middle::resolve_lifetime; use rustc_typeck::middle::stability; -use rustc_typeck::middle::subst; -use rustc_typeck::middle::subst::Subst; +use rustc_typeck::middle::ty::subst; +use rustc_typeck::middle::ty::subst::Subst; use rustc_typeck::middle::traits::ProjectionMode; use rustc_typeck::middle::ty::{self, Ty, TyCtxt, TypeFoldable}; use rustc_typeck::middle::ty::relate::TypeRelation; diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index 2ccb905b6ecdf..66e19cf29bf9e 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -32,7 +32,7 @@ use middle::{cfg, infer, stability, traits}; use middle::def::Def; use middle::cstore::CrateStore; use middle::def_id::DefId; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::ty::{self, Ty, TyCtxt}; use middle::ty::adjustment; use middle::traits::ProjectionMode; diff --git a/src/librustc_lint/types.rs b/src/librustc_lint/types.rs index 1a84afab86bfc..3dfd265c5a020 100644 --- a/src/librustc_lint/types.rs +++ b/src/librustc_lint/types.rs @@ -12,7 +12,7 @@ use middle::{infer}; use middle::def_id::DefId; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::ty::{self, Ty, TyCtxt}; use middle::const_eval::{eval_const_expr_partial, ConstVal}; use middle::const_eval::EvalHint::ExprTypeChecked; diff --git a/src/librustc_metadata/astencode.rs b/src/librustc_metadata/astencode.rs index 60f7110764699..4a74dc03fb4b5 100644 --- a/src/librustc_metadata/astencode.rs +++ b/src/librustc_metadata/astencode.rs @@ -33,7 +33,7 @@ use middle::const_qualif::ConstQualif; use middle::def::{self, Def}; use middle::def_id::DefId; use middle::region; -use middle::subst; +use middle::ty::subst; use middle::ty::{self, Ty, TyCtxt}; use syntax::{ast, ast_util, codemap}; diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index a4eeee44fb718..47273b7f26adb 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -32,7 +32,7 @@ use middle::cstore::{DefLike, DlDef, DlField, DlImpl, tls}; use middle::def::Def; use middle::def_id::{DefId, DefIndex}; use middle::lang_items; -use middle::subst; +use middle::ty::subst; use middle::ty::{ImplContainer, TraitContainer}; use middle::ty::{self, Ty, TyCtxt, TypeFoldable, VariantKind}; diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs index 73ac64adbb2a5..22b5297df4326 100644 --- a/src/librustc_metadata/encoder.rs +++ b/src/librustc_metadata/encoder.rs @@ -25,7 +25,7 @@ use middle::def; use middle::def_id::{CRATE_DEF_INDEX, DefId}; use middle::dependency_format::Linkage; use middle::stability; -use middle::subst; +use middle::ty::subst; use middle::traits::specialization_graph; use middle::ty::{self, Ty, TyCtxt}; use middle::ty::util::IntTypeExt; diff --git a/src/librustc_metadata/tls_context.rs b/src/librustc_metadata/tls_context.rs index f90abd9e1d961..2ba3e351c50aa 100644 --- a/src/librustc_metadata/tls_context.rs +++ b/src/librustc_metadata/tls_context.rs @@ -15,7 +15,7 @@ use rbml::opaque::Encoder as OpaqueEncoder; use rbml::opaque::Decoder as OpaqueDecoder; use rustc::middle::cstore::tls; use rustc::middle::def_id::DefId; -use rustc::middle::subst::Substs; +use rustc::middle::ty::subst::Substs; use rustc::middle::ty::{self, TyCtxt}; use decoder::{self, Cmd}; diff --git a/src/librustc_metadata/tydecode.rs b/src/librustc_metadata/tydecode.rs index cd9c2e828bdef..8c88a63a161f4 100644 --- a/src/librustc_metadata/tydecode.rs +++ b/src/librustc_metadata/tydecode.rs @@ -20,8 +20,8 @@ use rustc_front::hir; use middle::def_id::{DefId, DefIndex}; use middle::region; -use middle::subst; -use middle::subst::VecPerParamSpace; +use middle::ty::subst; +use middle::ty::subst::VecPerParamSpace; use middle::ty::{self, ToPredicate, Ty, TyCtxt, TypeFoldable}; use rbml; diff --git a/src/librustc_metadata/tyencode.rs b/src/librustc_metadata/tyencode.rs index 67e77ba3315c9..6fc9b91213d05 100644 --- a/src/librustc_metadata/tyencode.rs +++ b/src/librustc_metadata/tyencode.rs @@ -19,8 +19,8 @@ use std::io::prelude::*; use middle::def_id::DefId; use middle::region; -use middle::subst; -use middle::subst::VecPerParamSpace; +use middle::ty::subst; +use middle::ty::subst::VecPerParamSpace; use middle::ty::ParamTy; use middle::ty::{self, Ty, TyCtxt}; use rustc::util::nodemap::FnvHashMap; diff --git a/src/librustc_mir/build/scope.rs b/src/librustc_mir/build/scope.rs index f5f6f409eaba4..033e1361d4a8c 100644 --- a/src/librustc_mir/build/scope.rs +++ b/src/librustc_mir/build/scope.rs @@ -89,7 +89,7 @@ should go to. use build::{BlockAnd, BlockAndExtension, Builder, CFG, ScopeAuxiliary}; use rustc::middle::region::{CodeExtent, CodeExtentData}; use rustc::middle::lang_items; -use rustc::middle::subst::{Substs, Subst, VecPerParamSpace}; +use rustc::middle::ty::subst::{Substs, Subst, VecPerParamSpace}; use rustc::middle::ty::{self, Ty, TyCtxt}; use rustc::mir::repr::*; use syntax::codemap::{Span, DUMMY_SP}; diff --git a/src/librustc_mir/hair/cx/mod.rs b/src/librustc_mir/hair/cx/mod.rs index b97bfaf5aef68..d603979906dda 100644 --- a/src/librustc_mir/hair/cx/mod.rs +++ b/src/librustc_mir/hair/cx/mod.rs @@ -21,7 +21,7 @@ use rustc::mir::repr::*; use rustc::middle::const_eval::{self, ConstVal}; use rustc::middle::def_id::DefId; use rustc::middle::infer::InferCtxt; -use rustc::middle::subst::{Subst, Substs}; +use rustc::middle::ty::subst::{Subst, Substs}; use rustc::middle::ty::{self, Ty, TyCtxt}; use syntax::codemap::Span; use syntax::parse::token; diff --git a/src/librustc_mir/hair/mod.rs b/src/librustc_mir/hair/mod.rs index 78c438df6f87a..3eca7f0a8772c 100644 --- a/src/librustc_mir/hair/mod.rs +++ b/src/librustc_mir/hair/mod.rs @@ -19,7 +19,7 @@ use rustc::mir::repr::{BinOp, BorrowKind, Field, Literal, Mutability, UnOp, use rustc::middle::const_eval::ConstVal; use rustc::middle::def_id::DefId; use rustc::middle::region::CodeExtent; -use rustc::middle::subst::Substs; +use rustc::middle::ty::subst::Substs; use rustc::middle::ty::{self, AdtDef, ClosureSubsts, Region, Ty}; use rustc_front::hir; use syntax::ast; diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index d9fc678554ff6..fb0f0125812f1 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -55,7 +55,7 @@ use rustc::middle::cstore::CrateStore; use rustc::middle::def::*; use rustc::middle::def_id::DefId; use rustc::middle::pat_util::pat_bindings; -use rustc::middle::subst::{ParamSpace, FnSpace, TypeSpace}; +use rustc::middle::ty::subst::{ParamSpace, FnSpace, TypeSpace}; use rustc::middle::ty::{Freevar, FreevarMap, TraitMap, GlobMap}; use rustc::util::nodemap::{NodeMap, FnvHashMap}; diff --git a/src/librustc_trans/trans/_match.rs b/src/librustc_trans/trans/_match.rs index 8aea2f1ec4f4a..561fd022ecef5 100644 --- a/src/librustc_trans/trans/_match.rs +++ b/src/librustc_trans/trans/_match.rs @@ -200,7 +200,7 @@ use middle::lang_items::StrEqFnLangItem; use middle::mem_categorization as mc; use middle::mem_categorization::Categorization; use middle::pat_util::*; -use middle::subst::Substs; +use middle::ty::subst::Substs; use trans::adt; use trans::base::*; use trans::build::{AddCase, And, Br, CondBr, GEPi, InBoundsGEP, Load, PointerCast}; diff --git a/src/librustc_trans/trans/adt.rs b/src/librustc_trans/trans/adt.rs index db0fa2a64bde6..e94c4ebe3b56b 100644 --- a/src/librustc_trans/trans/adt.rs +++ b/src/librustc_trans/trans/adt.rs @@ -48,7 +48,7 @@ use std; use std::rc::Rc; use llvm::{ValueRef, True, IntEQ, IntNE}; -use middle::subst; +use middle::ty::subst; use middle::ty::{self, Ty, TyCtxt}; use syntax::ast; use syntax::attr; diff --git a/src/librustc_trans/trans/base.rs b/src/librustc_trans/trans/base.rs index 7231304ec4c4f..5d7da08cf9fe8 100644 --- a/src/librustc_trans/trans/base.rs +++ b/src/librustc_trans/trans/base.rs @@ -41,7 +41,7 @@ use middle::infer; use middle::lang_items::{LangItem, ExchangeMallocFnLangItem, StartFnLangItem}; use middle::weak_lang_items; use middle::pat_util::simple_name; -use middle::subst::{self, Substs}; +use middle::ty::subst::{self, Substs}; use middle::traits; use middle::ty::{self, Ty, TyCtxt, TypeFoldable}; use middle::ty::adjustment::CustomCoerceUnsized; diff --git a/src/librustc_trans/trans/callee.rs b/src/librustc_trans/trans/callee.rs index 6fe4598c1ba3c..baad981a8c848 100644 --- a/src/librustc_trans/trans/callee.rs +++ b/src/librustc_trans/trans/callee.rs @@ -23,8 +23,8 @@ use llvm::{self, ValueRef, get_params}; use middle::cstore::LOCAL_CRATE; use middle::def_id::DefId; use middle::infer; -use middle::subst; -use middle::subst::{Substs}; +use middle::ty::subst; +use middle::ty::subst::{Substs}; use middle::traits; use rustc::front::map as hir_map; use trans::abi::{Abi, FnType}; diff --git a/src/librustc_trans/trans/collector.rs b/src/librustc_trans/trans/collector.rs index 3f3da36be0695..41bd7497433a6 100644 --- a/src/librustc_trans/trans/collector.rs +++ b/src/librustc_trans/trans/collector.rs @@ -195,7 +195,7 @@ use rustc::front::map as hir_map; use rustc::middle::def_id::DefId; use rustc::middle::lang_items::{ExchangeFreeFnLangItem, ExchangeMallocFnLangItem}; use rustc::middle::traits; -use rustc::middle::subst::{self, Substs, Subst}; +use rustc::middle::ty::subst::{self, Substs, Subst}; use rustc::middle::ty::{self, Ty, TypeFoldable}; use rustc::middle::ty::adjustment::CustomCoerceUnsized; use rustc::mir::repr as mir; diff --git a/src/librustc_trans/trans/common.rs b/src/librustc_trans/trans/common.rs index db06b2352fd35..eb443a3b0b977 100644 --- a/src/librustc_trans/trans/common.rs +++ b/src/librustc_trans/trans/common.rs @@ -21,7 +21,7 @@ use middle::def::Def; use middle::def_id::DefId; use middle::infer; use middle::lang_items::LangItem; -use middle::subst::Substs; +use middle::ty::subst::Substs; use trans::abi::{Abi, FnType}; use trans::base; use trans::build; diff --git a/src/librustc_trans/trans/consts.rs b/src/librustc_trans/trans/consts.rs index 4cdb64a9bfb71..956c40a443fcd 100644 --- a/src/librustc_trans/trans/consts.rs +++ b/src/librustc_trans/trans/consts.rs @@ -32,7 +32,7 @@ use trans::type_::Type; use trans::type_of; use trans::value::Value; use trans::Disr; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::ty::adjustment::{AdjustDerefRef, AdjustReifyFnPointer}; use middle::ty::adjustment::{AdjustUnsafeFnPointer, AdjustMutToConstPointer}; use middle::ty::{self, Ty, TyCtxt}; diff --git a/src/librustc_trans/trans/context.rs b/src/librustc_trans/trans/context.rs index bd556c0f2ebf6..f2ea8ad861271 100644 --- a/src/librustc_trans/trans/context.rs +++ b/src/librustc_trans/trans/context.rs @@ -29,7 +29,7 @@ use trans::Instance; use trans::collector::{TransItem, TransItemState}; use trans::type_::{Type, TypeNames}; -use middle::subst::{Substs, VecPerParamSpace}; +use middle::ty::subst::{Substs, VecPerParamSpace}; use middle::ty::{self, Ty, TyCtxt}; use session::config::NoDebugInfo; use session::Session; diff --git a/src/librustc_trans/trans/controlflow.rs b/src/librustc_trans/trans/controlflow.rs index 91454df156655..65f5ab1f22818 100644 --- a/src/librustc_trans/trans/controlflow.rs +++ b/src/librustc_trans/trans/controlflow.rs @@ -11,7 +11,7 @@ use llvm::ValueRef; use middle::def::Def; use middle::lang_items::{PanicFnLangItem, PanicBoundsCheckFnLangItem}; -use middle::subst::Substs; +use middle::ty::subst::Substs; use trans::base::*; use trans::basic_block::BasicBlock; use trans::build::*; diff --git a/src/librustc_trans/trans/debuginfo/metadata.rs b/src/librustc_trans/trans/debuginfo/metadata.rs index e22d42e9d28da..a654a3f37c8da 100644 --- a/src/librustc_trans/trans/debuginfo/metadata.rs +++ b/src/librustc_trans/trans/debuginfo/metadata.rs @@ -26,7 +26,7 @@ use llvm::debuginfo::{DIType, DIFile, DIScope, DIDescriptor, DICompositeType}; use middle::def_id::DefId; use middle::infer; use middle::pat_util; -use middle::subst; +use middle::ty::subst; use rustc::front::map as hir_map; use rustc_front::hir::{self, PatKind}; use trans::{type_of, adt, machine, monomorphize}; diff --git a/src/librustc_trans/trans/debuginfo/mod.rs b/src/librustc_trans/trans/debuginfo/mod.rs index 40eb29ed25050..dbba03cf4551f 100644 --- a/src/librustc_trans/trans/debuginfo/mod.rs +++ b/src/librustc_trans/trans/debuginfo/mod.rs @@ -28,7 +28,7 @@ use llvm::debuginfo::{DIFile, DIType, DIScope, DIBuilderRef, DISubprogram, DIArr DIDescriptor, FlagPrototyped}; use middle::def_id::DefId; use middle::infer::normalize_associated_type; -use middle::subst::{self, Substs}; +use middle::ty::subst::{self, Substs}; use rustc_front; use rustc_front::hir; diff --git a/src/librustc_trans/trans/debuginfo/type_names.rs b/src/librustc_trans/trans/debuginfo/type_names.rs index b71b7789affe2..a051966795d55 100644 --- a/src/librustc_trans/trans/debuginfo/type_names.rs +++ b/src/librustc_trans/trans/debuginfo/type_names.rs @@ -15,7 +15,7 @@ use super::namespace::crate_root_namespace; use trans::common::CrateContext; use middle::def_id::DefId; use middle::infer; -use middle::subst; +use middle::ty::subst; use middle::ty::{self, Ty}; use rustc_front::hir; diff --git a/src/librustc_trans/trans/expr.rs b/src/librustc_trans/trans/expr.rs index fe98fa290211c..8b7527fd7de64 100644 --- a/src/librustc_trans/trans/expr.rs +++ b/src/librustc_trans/trans/expr.rs @@ -54,7 +54,7 @@ use self::lazy_binop_ty::*; use llvm::{self, ValueRef, TypeKind}; use middle::const_qualif::ConstQualif; use middle::def::Def; -use middle::subst::Substs; +use middle::ty::subst::Substs; use trans::{_match, abi, adt, asm, base, closure, consts, controlflow}; use trans::base::*; use trans::build::*; diff --git a/src/librustc_trans/trans/glue.rs b/src/librustc_trans/trans/glue.rs index aa205898114d6..972e32a267423 100644 --- a/src/librustc_trans/trans/glue.rs +++ b/src/librustc_trans/trans/glue.rs @@ -18,7 +18,7 @@ use back::symbol_names; use llvm; use llvm::{ValueRef, get_param}; use middle::lang_items::ExchangeFreeFnLangItem; -use middle::subst::{Substs}; +use middle::ty::subst::{Substs}; use middle::traits; use middle::ty::{self, Ty, TyCtxt}; use trans::abi::{Abi, FnType}; diff --git a/src/librustc_trans/trans/inline.rs b/src/librustc_trans/trans/inline.rs index a9c94a4522ba9..3e37b7007c37d 100644 --- a/src/librustc_trans/trans/inline.rs +++ b/src/librustc_trans/trans/inline.rs @@ -11,7 +11,7 @@ use llvm::{AvailableExternallyLinkage, InternalLinkage, SetLinkage}; use middle::cstore::{CrateStore, FoundAst, InlinedItem}; use middle::def_id::DefId; -use middle::subst::Substs; +use middle::ty::subst::Substs; use trans::base::{push_ctxt, trans_item, trans_fn}; use trans::callee::Callee; use trans::common::*; diff --git a/src/librustc_trans/trans/intrinsic.rs b/src/librustc_trans/trans/intrinsic.rs index 9bc07c6cd8626..d3b84fbac1a9b 100644 --- a/src/librustc_trans/trans/intrinsic.rs +++ b/src/librustc_trans/trans/intrinsic.rs @@ -16,8 +16,8 @@ use libc; use llvm; use llvm::{ValueRef, TypeKind}; use middle::infer; -use middle::subst; -use middle::subst::FnSpace; +use middle::ty::subst; +use middle::ty::subst::FnSpace; use trans::abi::{Abi, FnType}; use trans::adt; use trans::attributes; @@ -38,7 +38,7 @@ use trans::machine; use trans::type_::Type; use middle::ty::{self, Ty, TypeFoldable}; use trans::Disr; -use middle::subst::Substs; +use middle::ty::subst::Substs; use rustc::dep_graph::DepNode; use rustc_front::hir; use syntax::ast; diff --git a/src/librustc_trans/trans/meth.rs b/src/librustc_trans/trans/meth.rs index f45de10bca853..f08ee4d48dc41 100644 --- a/src/librustc_trans/trans/meth.rs +++ b/src/librustc_trans/trans/meth.rs @@ -15,8 +15,8 @@ use back::symbol_names; use llvm::{ValueRef, get_params}; use middle::def_id::DefId; use middle::infer; -use middle::subst::{FnSpace, Subst, Substs}; -use middle::subst; +use middle::ty::subst::{FnSpace, Subst, Substs}; +use middle::ty::subst; use middle::traits::{self, ProjectionMode}; use trans::abi::FnType; use trans::base::*; diff --git a/src/librustc_trans/trans/monomorphize.rs b/src/librustc_trans/trans/monomorphize.rs index 6dd8d651012e0..9a1b2790d3269 100644 --- a/src/librustc_trans/trans/monomorphize.rs +++ b/src/librustc_trans/trans/monomorphize.rs @@ -13,8 +13,8 @@ use llvm::ValueRef; use llvm; use middle::def_id::DefId; use middle::infer::normalize_associated_type; -use middle::subst; -use middle::subst::{Subst, Substs}; +use middle::ty::subst; +use middle::ty::subst::{Subst, Substs}; use middle::ty::{self, Ty, TyCtxt}; use middle::ty::fold::{TypeFolder, TypeFoldable}; use trans::attributes; diff --git a/src/librustc_trans/trans/type_of.rs b/src/librustc_trans/trans/type_of.rs index 7d5218d84dafe..e81039908c173 100644 --- a/src/librustc_trans/trans/type_of.rs +++ b/src/librustc_trans/trans/type_of.rs @@ -12,7 +12,7 @@ use middle::def_id::DefId; use middle::infer; -use middle::subst; +use middle::ty::subst; use trans::abi::FnType; use trans::adt; use trans::common::*; diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index 159ff90b50955..3b3d2cbad10cc 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -54,7 +54,7 @@ use middle::const_eval::EvalHint::UncheckedExprHint; use middle::def::{self, Def}; use middle::def_id::DefId; use middle::resolve_lifetime as rl; -use middle::subst::{FnSpace, TypeSpace, SelfSpace, Subst, Substs, ParamSpace}; +use middle::ty::subst::{FnSpace, TypeSpace, SelfSpace, Subst, Substs, ParamSpace}; use middle::traits; use middle::ty::{self, Ty, TyCtxt, ToPredicate, TypeFoldable}; use middle::ty::wf::object_region_bounds; diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs index 305970db9e72e..947488bde71dd 100644 --- a/src/librustc_typeck/check/_match.rs +++ b/src/librustc_typeck/check/_match.rs @@ -12,7 +12,7 @@ use middle::def::{self, Def}; use middle::infer::{self, TypeOrigin}; use middle::pat_util::{PatIdMap, pat_id_map, pat_is_binding}; use middle::pat_util::pat_is_resolved_const; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::ty::{self, Ty, TypeFoldable, LvaluePreference}; use check::{check_expr, check_expr_has_type, check_expr_with_expectation}; use check::{demand, FnCtxt, Expectation}; diff --git a/src/librustc_typeck/check/closure.rs b/src/librustc_typeck/check/closure.rs index a4fb2e381459e..54b2c8c59234e 100644 --- a/src/librustc_typeck/check/closure.rs +++ b/src/librustc_typeck/check/closure.rs @@ -13,7 +13,7 @@ use super::{check_fn, Expectation, FnCtxt}; use astconv; -use middle::subst; +use middle::ty::subst; use middle::ty::{self, ToPolyTraitRef, Ty}; use std::cmp; use syntax::abi::Abi; diff --git a/src/librustc_typeck/check/compare_method.rs b/src/librustc_typeck/check/compare_method.rs index 3e59f0ba73a81..eee3fddcaea3d 100644 --- a/src/librustc_typeck/check/compare_method.rs +++ b/src/librustc_typeck/check/compare_method.rs @@ -12,7 +12,7 @@ use middle::free_region::FreeRegionMap; use middle::infer::{self, TypeOrigin}; use middle::ty::{self, TyCtxt}; use middle::traits::{self, ProjectionMode}; -use middle::subst::{self, Subst, Substs, VecPerParamSpace}; +use middle::ty::subst::{self, Subst, Substs, VecPerParamSpace}; use syntax::ast; use syntax::codemap::Span; diff --git a/src/librustc_typeck/check/dropck.rs b/src/librustc_typeck/check/dropck.rs index 7dd5db831fd75..fd5d06ea9d19e 100644 --- a/src/librustc_typeck/check/dropck.rs +++ b/src/librustc_typeck/check/dropck.rs @@ -14,7 +14,7 @@ use middle::def_id::DefId; use middle::free_region::FreeRegionMap; use middle::infer; use middle::region; -use middle::subst::{self, Subst}; +use middle::ty::subst::{self, Subst}; use middle::ty::{self, Ty, TyCtxt}; use middle::traits::{self, ProjectionMode}; use util::nodemap::FnvHashSet; diff --git a/src/librustc_typeck/check/intrinsic.rs b/src/librustc_typeck/check/intrinsic.rs index 2cd166ebe7ebe..9440be50e2106 100644 --- a/src/librustc_typeck/check/intrinsic.rs +++ b/src/librustc_typeck/check/intrinsic.rs @@ -13,7 +13,7 @@ use astconv::AstConv; use intrinsics; -use middle::subst::{self, Substs}; +use middle::ty::subst::{self, Substs}; use middle::ty::FnSig; use middle::ty::{self, Ty, TyCtxt}; use middle::ty::fold::TypeFolder; diff --git a/src/librustc_typeck/check/method/confirm.rs b/src/librustc_typeck/check/method/confirm.rs index aa4e1d0b52908..b8c1d43b7c475 100644 --- a/src/librustc_typeck/check/method/confirm.rs +++ b/src/librustc_typeck/check/method/confirm.rs @@ -13,7 +13,7 @@ use super::probe; use check::{self, FnCtxt, callee, demand}; use check::UnresolvedTypeAction; use middle::def_id::DefId; -use middle::subst::{self}; +use middle::ty::subst::{self}; use middle::traits; use middle::ty::{self, NoPreference, PreferMutLvalue, Ty, TyCtxt}; use middle::ty::adjustment::{AdjustDerefRef, AutoDerefRef, AutoPtr}; diff --git a/src/librustc_typeck/check/method/mod.rs b/src/librustc_typeck/check/method/mod.rs index 7f982c466a704..6648236f33ae0 100644 --- a/src/librustc_typeck/check/method/mod.rs +++ b/src/librustc_typeck/check/method/mod.rs @@ -14,7 +14,7 @@ use astconv::AstConv; use check::FnCtxt; use middle::def::Def; use middle::def_id::DefId; -use middle::subst; +use middle::ty::subst; use middle::traits; use middle::ty::{self, TyCtxt, ToPredicate, ToPolyTraitRef, TraitRef, TypeFoldable}; use middle::ty::adjustment::{AdjustDerefRef, AutoDerefRef, AutoPtr}; diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs index 5f7f9703b1059..6be822aebcadf 100644 --- a/src/librustc_typeck/check/method/probe.rs +++ b/src/librustc_typeck/check/method/probe.rs @@ -16,8 +16,8 @@ use super::suggest; use check; use check::{FnCtxt, UnresolvedTypeAction}; use middle::def_id::DefId; -use middle::subst; -use middle::subst::Subst; +use middle::ty::subst; +use middle::ty::subst::Subst; use middle::traits; use middle::ty::{self, NoPreference, Ty, TyCtxt, ToPolyTraitRef, TraitRef, TypeFoldable}; use middle::infer; diff --git a/src/librustc_typeck/check/method/suggest.rs b/src/librustc_typeck/check/method/suggest.rs index 44724ca26b164..b940c073a7fec 100644 --- a/src/librustc_typeck/check/method/suggest.rs +++ b/src/librustc_typeck/check/method/suggest.rs @@ -21,7 +21,7 @@ use middle::cstore::{self, CrateStore}; use middle::def::Def; use middle::def_id::DefId; use middle::lang_items::FnOnceTraitLangItem; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::traits::{Obligation, SelectionContext}; use util::nodemap::{FnvHashSet}; diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 6eb663e604791..8d025e164224d 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -91,7 +91,7 @@ use middle::def_id::DefId; use middle::infer; use middle::infer::{TypeOrigin, TypeTrace, type_variable}; use middle::pat_util::{self, pat_id_map}; -use middle::subst::{self, Subst, Substs, VecPerParamSpace, ParamSpace}; +use middle::ty::subst::{self, Subst, Substs, VecPerParamSpace, ParamSpace}; use middle::traits::{self, report_fulfillment_errors, ProjectionMode}; use middle::ty::{GenericPredicates, TypeScheme}; use middle::ty::{ParamTy, ParameterEnvironment}; diff --git a/src/librustc_typeck/check/regionck.rs b/src/librustc_typeck/check/regionck.rs index fb4870bce8765..afbe511dda89f 100644 --- a/src/librustc_typeck/check/regionck.rs +++ b/src/librustc_typeck/check/regionck.rs @@ -89,7 +89,7 @@ use middle::free_region::FreeRegionMap; use middle::mem_categorization as mc; use middle::mem_categorization::Categorization; use middle::region::{self, CodeExtent}; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::traits; use middle::ty::{self, Ty, TyCtxt, MethodCall, TypeFoldable}; use middle::infer::{self, GenericKind, InferCtxt, SubregionOrigin, TypeOrigin, VerifyBound}; diff --git a/src/librustc_typeck/check/wfcheck.rs b/src/librustc_typeck/check/wfcheck.rs index a8ada8061317e..af33b6b394e5f 100644 --- a/src/librustc_typeck/check/wfcheck.rs +++ b/src/librustc_typeck/check/wfcheck.rs @@ -14,7 +14,7 @@ use constrained_type_params::{identify_constrained_type_params, Parameter}; use CrateCtxt; use middle::def_id::DefId; use middle::region::{CodeExtent}; -use middle::subst::{self, TypeSpace, FnSpace, ParamSpace, SelfSpace}; +use middle::ty::subst::{self, TypeSpace, FnSpace, ParamSpace, SelfSpace}; use middle::traits; use middle::ty::{self, Ty, TyCtxt}; use middle::ty::fold::{TypeFolder}; diff --git a/src/librustc_typeck/coherence/mod.rs b/src/librustc_typeck/coherence/mod.rs index 278d4d8b5b44a..af4975091055a 100644 --- a/src/librustc_typeck/coherence/mod.rs +++ b/src/librustc_typeck/coherence/mod.rs @@ -17,7 +17,7 @@ use middle::def_id::DefId; use middle::lang_items::UnsizeTraitLangItem; -use middle::subst::{self, Subst}; +use middle::ty::subst::{self, Subst}; use middle::ty::{self, TyCtxt, TypeFoldable}; use middle::traits::{self, ProjectionMode}; use middle::ty::{ImplOrTraitItemId, ConstTraitItemId}; diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 3f8f31ce3ce80..a282165d1a041 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -68,7 +68,7 @@ use middle::lang_items::SizedTraitLangItem; use middle::resolve_lifetime; use middle::const_eval::{self, ConstVal}; use middle::const_eval::EvalHint::UncheckedExprHint; -use middle::subst::{Substs, FnSpace, ParamSpace, SelfSpace, TypeSpace, VecPerParamSpace}; +use middle::ty::subst::{Substs, FnSpace, ParamSpace, SelfSpace, TypeSpace, VecPerParamSpace}; use middle::ty::{ToPredicate, ImplContainer, ImplOrTraitItemContainer, TraitContainer}; use middle::ty::{self, ToPolyTraitRef, Ty, TyCtxt, TypeScheme}; use middle::ty::{VariantKind}; diff --git a/src/librustc_typeck/constrained_type_params.rs b/src/librustc_typeck/constrained_type_params.rs index 4446063e0c7bc..016ff3b5a067b 100644 --- a/src/librustc_typeck/constrained_type_params.rs +++ b/src/librustc_typeck/constrained_type_params.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use middle::subst; +use middle::ty::subst; use middle::ty::{self, Ty, TyCtxt}; use std::collections::HashSet; diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 4e1f3d3cbb7a9..ccc79b0748c20 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -105,7 +105,7 @@ use dep_graph::DepNode; use front::map as hir_map; use middle::def::Def; use middle::infer::{self, TypeOrigin}; -use middle::subst::Substs; +use middle::ty::subst::Substs; use middle::ty::{self, Ty, TyCtxt, TypeFoldable}; use middle::traits::ProjectionMode; use session::{config, CompileResult}; diff --git a/src/librustc_typeck/variance/constraints.rs b/src/librustc_typeck/variance/constraints.rs index 5c74e9096f3a7..f46edb03b95b7 100644 --- a/src/librustc_typeck/variance/constraints.rs +++ b/src/librustc_typeck/variance/constraints.rs @@ -16,8 +16,8 @@ use dep_graph::DepTrackingMapConfig; use middle::def_id::DefId; use middle::resolve_lifetime as rl; -use middle::subst; -use middle::subst::ParamSpace; +use middle::ty::subst; +use middle::ty::subst::ParamSpace; use middle::ty::{self, Ty, TyCtxt}; use middle::ty::maps::ItemVariances; use rustc::front::map as hir_map; diff --git a/src/librustc_typeck/variance/solve.rs b/src/librustc_typeck/variance/solve.rs index fd442a4547cf9..c5e925226d07e 100644 --- a/src/librustc_typeck/variance/solve.rs +++ b/src/librustc_typeck/variance/solve.rs @@ -15,7 +15,7 @@ //! optimal solution to the constraints. The final variance for each //! inferred is then written into the `variance_map` in the tcx. -use middle::subst::VecPerParamSpace; +use middle::ty::subst::VecPerParamSpace; use middle::ty; use std::rc::Rc; diff --git a/src/librustc_typeck/variance/terms.rs b/src/librustc_typeck/variance/terms.rs index ff55aefb20ff3..7148afb5e856c 100644 --- a/src/librustc_typeck/variance/terms.rs +++ b/src/librustc_typeck/variance/terms.rs @@ -21,7 +21,7 @@ use arena::TypedArena; use dep_graph::DepTrackingMapConfig; -use middle::subst::{ParamSpace, FnSpace, TypeSpace, SelfSpace, VecPerParamSpace}; +use middle::ty::subst::{ParamSpace, FnSpace, TypeSpace, SelfSpace, VecPerParamSpace}; use middle::ty::{self, TyCtxt}; use middle::ty::maps::ItemVariances; use std::fmt; diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index e9c55c56a9d72..75bf1036fa2cc 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -20,7 +20,7 @@ use rustc::middle::cstore::{self, CrateStore}; use rustc::middle::def::Def; use rustc::middle::def_id::DefId; use rustc::middle::ty::{self, TyCtxt}; -use rustc::middle::subst; +use rustc::middle::ty::subst; use rustc::middle::stability; use rustc::middle::const_eval; diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index aab5c960df353..17fde1c7b33f7 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -38,7 +38,7 @@ use rustc_trans::back::link; use rustc::middle::cstore::{self, CrateStore}; use rustc::middle::def::Def; use rustc::middle::def_id::{DefId, DefIndex}; -use rustc::middle::subst::{self, ParamSpace, VecPerParamSpace}; +use rustc::middle::ty::subst::{self, ParamSpace, VecPerParamSpace}; use rustc::middle::ty; use rustc::middle::stability; diff --git a/src/librustdoc/clean/simplify.rs b/src/librustdoc/clean/simplify.rs index 716b88d5534ae..4cce835899203 100644 --- a/src/librustdoc/clean/simplify.rs +++ b/src/librustdoc/clean/simplify.rs @@ -30,7 +30,7 @@ use std::mem; use std::collections::HashMap; use rustc::middle::def_id::DefId; -use rustc::middle::subst; +use rustc::middle::ty::subst; use clean::PathParameters as PP; use clean::WherePredicate as WP;