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

Author: eddyb

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;