rustc: move middle::subst into middle::ty.

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;

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;

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> {

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;

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;

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};

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};
 

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;
 

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;

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;

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};
 

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;

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;

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;

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;

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;

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};

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};
 

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 {

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};
 

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;

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;

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};

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;

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};

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;

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;

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;

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};

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;

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;

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;

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};

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};
 

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;

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};

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;

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;

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};

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;

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;