Merge pull request #504 from RalfJung/crate

use crate:: imports where appropriate

Author: oli-obk

src/fn_call.rs

@@ -4,7 +4,7 @@ use rustc::hir::def_id::DefId;
 use rustc::mir;
 use syntax::attr;
 
-use super::*;
+use crate::*;
 
 pub trait EvalContextExt<'tcx, 'mir> {
     /// Emulate calling a foreign item, fail if the item is not supported.

src/helpers.rs

@@ -3,7 +3,7 @@ use std::mem;
 use rustc::ty;
 use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};
 
-use super::*;
+use crate::*;
 
 pub trait ScalarExt {
     /// HACK: this function just extracts all bits if `defined != 0`

src/intrinsic.rs

@@ -4,7 +4,7 @@ use rustc::ty;
 
 use rustc::mir::interpret::{EvalResult, PointerArithmetic};
 
-use super::{
+use crate::{
     PlaceTy, OpTy, Value, Scalar, ScalarMaybeUndef, Borrow,
     ScalarExt, OperatorEvalContextExt
 };

src/lib.rs

@@ -37,15 +37,15 @@ mod range_map;
 mod mono_hash_map;
 mod stacked_borrows;
 
-use fn_call::EvalContextExt as MissingFnsEvalContextExt;
-use operator::EvalContextExt as OperatorEvalContextExt;
-use intrinsic::EvalContextExt as IntrinsicEvalContextExt;
-use tls::{EvalContextExt as TlsEvalContextExt, TlsData};
-use range_map::RangeMap;
+use crate::fn_call::EvalContextExt as MissingFnsEvalContextExt;
+use crate::operator::EvalContextExt as OperatorEvalContextExt;
+use crate::intrinsic::EvalContextExt as IntrinsicEvalContextExt;
+use crate::tls::{EvalContextExt as TlsEvalContextExt, TlsData};
+use crate::range_map::RangeMap;
 #[allow(unused_imports)] // FIXME rustc bug https://github.com/rust-lang/rust/issues/53682
-use helpers::{ScalarExt, EvalContextExt as HelpersEvalContextExt};
-use mono_hash_map::MonoHashMap;
-use stacked_borrows::{EvalContextExt as StackedBorEvalContextExt};
+use crate::helpers::{ScalarExt, EvalContextExt as HelpersEvalContextExt};
+use crate::mono_hash_map::MonoHashMap;
+use crate::stacked_borrows::{EvalContextExt as StackedBorEvalContextExt};
 
 // Used by priroda
 pub use stacked_borrows::{Borrow, Stacks, Mut as MutBorrow};

src/mono_hash_map.rs

@@ -12,7 +12,7 @@ use std::borrow::Borrow;
 
 use rustc_data_structures::fx::FxHashMap;
 
-use super::AllocMap;
+use crate::AllocMap;
 
 #[derive(Debug, Clone)]
 pub struct MonoHashMap<K: Hash + Eq, V>(RefCell<FxHashMap<K, Box<V>>>);

src/operator.rs

@@ -1,7 +1,7 @@
 use rustc::ty::{Ty, layout::TyLayout};
 use rustc::mir;
 
-use super::*;
+use crate::*;
 
 pub trait EvalContextExt<'tcx> {
     fn ptr_op(

src/tls.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use rustc_target::abi::LayoutOf;
 use rustc::{ty, ty::layout::HasDataLayout, mir};
 
-use super::{
+use crate::{
     EvalResult, EvalErrorKind, StackPopCleanup,
     MPlaceTy, Scalar, Borrow,
 };