Adjust imports to librustc::mir::interpret

Author: oli-obk

src/Cargo.lock

@@ -23,6 +23,12 @@ rustc_errors = { path = "../librustc_errors" }
 serialize = { path = "../libserialize" }
 syntax = { path = "../libsyntax" }
 syntax_pos = { path = "../libsyntax_pos" }
+log_settings = "0.1.1"
+lazy_static = "0.2.8"
+regex = "0.2.2"
+backtrace = "0.3.3"
+byteorder = { version = "1.1", features = ["i128"]}
+
 
 # Note that these dependencies are a lie, they're just here to get linkage to
 # work.

src/librustc/Cargo.toml

@@ -54,6 +54,7 @@
 #![feature(specialization)]
 #![feature(unboxed_closures)]
 #![feature(trace_macros)]
+#![feature(catch_expr)]
 #![feature(test)]
 
 #![cfg_attr(stage0, feature(const_fn))]
@@ -82,6 +83,13 @@ extern crate jobserver;
 
 extern crate serialize as rustc_serialize; // used by deriving
 
+extern crate log_settings;
+extern crate byteorder;
+#[macro_use]
+extern crate lazy_static;
+extern crate regex;
+extern crate backtrace;
+
 // Note that librustc doesn't actually depend on these crates, see the note in
 // `Cargo.toml` for this crate about why these are here.
 #[allow(unused_extern_crates)]

src/librustc/lib.rs

@@ -1,4 +1,4 @@
-use rustc::ty::{self, Ty};
+use ty::{self, Ty};
 use syntax::ast::{FloatTy, IntTy, UintTy};
 
 use super::{PrimVal, EvalContext, EvalResult, MemoryPointer, PointerArithmetic, Machine};
@@ -72,7 +72,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
         negative: bool,
     ) -> EvalResult<'tcx, PrimVal> {
         trace!("cast_from_int: {}, {}, {}", v, ty, negative);
-        use rustc::ty::TypeVariants::*;
+        use ty::TypeVariants::*;
         match ty.sty {
             // Casts to bool are not permitted by rustc, no need to handle them here.
             TyInt(ty) => Ok(PrimVal::Bytes(self.int_to_int(v as i128, ty))),
@@ -94,7 +94,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
     }
 
     fn cast_from_float(&self, val: f64, ty: Ty<'tcx>) -> EvalResult<'tcx, PrimVal> {
-        use rustc::ty::TypeVariants::*;
+        use ty::TypeVariants::*;
         match ty.sty {
             // Casting negative floats to unsigned integers yields zero.
             TyUint(_) if val < 0.0 => self.cast_from_int(0, ty, false),
@@ -109,7 +109,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
     }
 
     fn cast_from_ptr(&self, ptr: MemoryPointer, ty: Ty<'tcx>) -> EvalResult<'tcx, PrimVal> {
-        use rustc::ty::TypeVariants::*;
+        use ty::TypeVariants::*;
         match ty.sty {
             // Casting to a reference or fn pointer is not permitted by rustc, no need to support it here.
             TyRawPtr(_) |

src/librustc/mir/interpret/cast.rs

@@ -1,6 +1,6 @@
-use rustc::traits::Reveal;
-use rustc::ty::{self, TyCtxt, Ty, Instance, layout};
-use rustc::mir;
+use traits::Reveal;
+use ty::{self, TyCtxt, Ty, Instance, layout};
+use mir;
 
 use syntax::ast::Mutability;
 use syntax::codemap::Span;
@@ -83,7 +83,7 @@ pub fn eval_body_as_integer<'a, 'tcx>(
     let (prim, ty) = eval_body_as_primval(tcx, instance)?;
     let prim = prim.to_bytes()?;
     use syntax::ast::{IntTy, UintTy};
-    use rustc::ty::TypeVariants::*;
+    use ty::TypeVariants::*;
     use rustc_const_math::{ConstIsize, ConstUsize};
     Ok(match ty.sty {
         TyInt(IntTy::I8) => ConstInt::I8(prim as i128 as i8),

src/librustc/mir/interpret/const_eval.rs

@@ -1,8 +1,8 @@
 use std::error::Error;
 use std::{fmt, env};
 
-use rustc::mir;
-use rustc::ty::{FnSig, Ty, layout};
+use mir;
+use ty::{FnSig, Ty, layout};
 
 use super::{
     MemoryPointer, Lock, AccessKind