Move the core MIR datastructures to librustc.

This is done mostly so that we can refer to MIR types in csearch and other metadata related area.

Author: michaelwoerister

src/librustc/lib.rs

@@ -136,6 +136,11 @@ pub mod middle {
     pub mod weak_lang_items;
 }
 
+pub mod mir {
+    pub mod repr;
+    pub mod tcx;
+}
+
 pub mod session;
 
 pub mod lint;

src/librustc_mir/repr.rs renamed to src/librustc/mir/repr.rs

@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use rustc::middle::const_eval::ConstVal;
-use rustc::middle::def_id::DefId;
-use rustc::middle::subst::Substs;
-use rustc::middle::ty::{AdtDef, ClosureSubsts, FnOutput, Region, Ty};
+use middle::const_eval::ConstVal;
+use middle::def_id::DefId;
+use middle::subst::Substs;
+use middle::ty::{AdtDef, ClosureSubsts, FnOutput, Region, Ty};
 use rustc_back::slice;
 use rustc_front::hir::InlineAsm;
 use syntax::ast::Name;

src/librustc_mir/tcx/mod.rs renamed to src/librustc/mir/tcx.rs

@@ -13,9 +13,9 @@
  * building is complete.
  */
 
-use repr::*;
-use rustc::middle::subst::Substs;
-use rustc::middle::ty::{self, AdtDef, Ty};
+use mir::repr::*;
+use middle::subst::Substs;
+use middle::ty::{self, AdtDef, Ty};
 use rustc_front::hir;
 
 #[derive(Copy, Clone, Debug)]

src/librustc_mir/build/block.rs

@@ -10,7 +10,7 @@
 
 use build::{BlockAnd, Builder};
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 use rustc_front::hir;
 
 impl<'a,'tcx> Builder<'a,'tcx> {

src/librustc_mir/build/cfg.rs

@@ -14,7 +14,7 @@
 //! Routines for manipulating the control-flow graph.
 
 use build::CFG;
-use repr::*;
+use rustc::mir::repr::*;
 use syntax::codemap::Span;
 
 impl<'tcx> CFG<'tcx> {

src/librustc_mir/build/expr/as_constant.rs

@@ -12,7 +12,7 @@
 
 use build::Builder;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr`, yielding a compile-time constant. Assumes that

src/librustc_mir/build/expr/as_lvalue.rs

@@ -10,10 +10,10 @@
 
 //! See docs in build/expr/mod.rs
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::Category;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr`, yielding an lvalue that we can move from etc.

src/librustc_mir/build/expr/as_operand.rs

@@ -10,10 +10,10 @@
 
 //! See docs in build/expr/mod.rs
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::Category;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr` into a value that can be used as an operand.

src/librustc_mir/build/expr/as_rvalue.rs

@@ -12,10 +12,10 @@
 
 use rustc_data_structures::fnv::FnvHashMap;
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::{Category, RvalueFunc};
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr`, yielding an rvalue.

src/librustc_mir/build/expr/as_temp.rs

@@ -10,10 +10,10 @@
 
 //! See docs in build/expr/mod.rs
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::Category;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr` into a fresh temporary. This is used when building