From 27b1f47b0a947f8867d3d0840ea40c5902b7191c Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 1 Nov 2018 08:56:41 +0100 Subject: [PATCH] use crate:: where appropriate --- src/fn_call.rs | 2 +- src/helpers.rs | 2 +- src/intrinsic.rs | 2 +- src/lib.rs | 16 ++++++++-------- src/mono_hash_map.rs | 2 +- src/operator.rs | 2 +- src/tls.rs | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/fn_call.rs b/src/fn_call.rs index 9e3f49ac9f..7e1ff3233f 100644 --- a/src/fn_call.rs +++ b/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. diff --git a/src/helpers.rs b/src/helpers.rs index c4aad2033e..6dc5b768ea 100644 --- a/src/helpers.rs +++ b/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` diff --git a/src/intrinsic.rs b/src/intrinsic.rs index 852c93f650..caf5687b23 100644 --- a/src/intrinsic.rs +++ b/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 }; diff --git a/src/lib.rs b/src/lib.rs index 650998c3e1..cb544e9bb3 100644 --- a/src/lib.rs +++ b/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}; diff --git a/src/mono_hash_map.rs b/src/mono_hash_map.rs index 76ca7ac6a1..e30578a5a7 100644 --- a/src/mono_hash_map.rs +++ b/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(RefCell>>); diff --git a/src/operator.rs b/src/operator.rs index 0eac5c1127..e5c695009c 100644 --- a/src/operator.rs +++ b/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( diff --git a/src/tls.rs b/src/tls.rs index b315e27c45..001da10ddc 100644 --- a/src/tls.rs +++ b/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, };