From bf5ec797255f95b7912c612942f6ece27b809d32 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Wed, 6 Dec 2017 13:55:46 +0200 Subject: [PATCH] miri: import ty::Ty directly. --- src/librustc/mir/interpret/cast.rs | 6 +++--- src/librustc/mir/interpret/const_eval.rs | 2 +- src/librustc/mir/interpret/eval_context.rs | 2 +- src/librustc/mir/interpret/machine.rs | 9 +++++---- src/librustc/mir/interpret/terminator/mod.rs | 10 +++++----- src/librustc/mir/interpret/validation.rs | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/librustc/mir/interpret/cast.rs b/src/librustc/mir/interpret/cast.rs index 53a0a9c4fdee..e6d163df4d45 100644 --- a/src/librustc/mir/interpret/cast.rs +++ b/src/librustc/mir/interpret/cast.rs @@ -1,4 +1,4 @@ -use ty::{self, Ty}; +use ty::Ty; use syntax::ast::{FloatTy, IntTy, UintTy}; use rustc_const_math::ConstFloat; @@ -37,7 +37,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { } } - fn cast_from_signed_int(&self, val: i128, ty: ty::Ty<'tcx>) -> EvalResult<'tcx, PrimVal> { + fn cast_from_signed_int(&self, val: i128, ty: Ty<'tcx>) -> EvalResult<'tcx, PrimVal> { self.cast_from_int(val as u128, ty, val < 0) } @@ -71,7 +71,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { fn cast_from_int( &self, v: u128, - ty: ty::Ty<'tcx>, + ty: Ty<'tcx>, negative: bool, ) -> EvalResult<'tcx, PrimVal> { trace!("cast_from_int: {}, {}, {}", v, ty, negative); diff --git a/src/librustc/mir/interpret/const_eval.rs b/src/librustc/mir/interpret/const_eval.rs index f5b7d6a673b8..9f6b303e4e03 100644 --- a/src/librustc/mir/interpret/const_eval.rs +++ b/src/librustc/mir/interpret/const_eval.rs @@ -274,7 +274,7 @@ impl<'tcx> super::Machine<'tcx> for CompileTimeFunctionEvaluator { fn box_alloc<'a>( _ecx: &mut EvalContext<'a, 'tcx, Self>, - _ty: ty::Ty<'tcx>, + _ty: Ty<'tcx>, _dest: Place, ) -> EvalResult<'tcx> { Err( diff --git a/src/librustc/mir/interpret/eval_context.rs b/src/librustc/mir/interpret/eval_context.rs index fa09f8743526..a864b7f08f56 100644 --- a/src/librustc/mir/interpret/eval_context.rs +++ b/src/librustc/mir/interpret/eval_context.rs @@ -346,7 +346,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { /// the value has to be a fat pointer, and we only care about the "extra" data in it. pub fn size_and_align_of_dst( &mut self, - ty: ty::Ty<'tcx>, + ty: Ty<'tcx>, value: Value, ) -> EvalResult<'tcx, (Size, Align)> { let layout = self.layout_of(ty)?; diff --git a/src/librustc/mir/interpret/machine.rs b/src/librustc/mir/interpret/machine.rs index 29620ad8c621..65edbea1e5d2 100644 --- a/src/librustc/mir/interpret/machine.rs +++ b/src/librustc/mir/interpret/machine.rs @@ -4,7 +4,8 @@ use super::{EvalResult, EvalContext, Place, PrimVal, ValTy}; -use {mir, ty}; +use mir; +use ty::{self, Ty}; use syntax::codemap::Span; use syntax::ast::Mutability; @@ -60,9 +61,9 @@ pub trait Machine<'tcx>: Sized { ecx: &EvalContext<'a, 'tcx, Self>, bin_op: mir::BinOp, left: PrimVal, - left_ty: ty::Ty<'tcx>, + left_ty: Ty<'tcx>, right: PrimVal, - right_ty: ty::Ty<'tcx>, + right_ty: Ty<'tcx>, ) -> EvalResult<'tcx, Option<(PrimVal, bool)>>; /// Called when trying to mark machine defined `MemoryKinds` as static @@ -73,7 +74,7 @@ pub trait Machine<'tcx>: Sized { /// Returns a pointer to the allocated memory fn box_alloc<'a>( ecx: &mut EvalContext<'a, 'tcx, Self>, - ty: ty::Ty<'tcx>, + ty: Ty<'tcx>, dest: Place, ) -> EvalResult<'tcx>; diff --git a/src/librustc/mir/interpret/terminator/mod.rs b/src/librustc/mir/interpret/terminator/mod.rs index 7597a7e2e0ca..a903c9e06e16 100644 --- a/src/librustc/mir/interpret/terminator/mod.rs +++ b/src/librustc/mir/interpret/terminator/mod.rs @@ -1,5 +1,5 @@ use mir; -use ty::{self, TypeVariants}; +use ty::{self, Ty}; use ty::layout::LayoutOf; use syntax::codemap::Span; use syntax::abi::Abi; @@ -177,7 +177,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { sig: ty::FnSig<'tcx>, real_sig: ty::FnSig<'tcx>, ) -> EvalResult<'tcx, bool> { - fn check_ty_compat<'tcx>(ty: ty::Ty<'tcx>, real_ty: ty::Ty<'tcx>) -> bool { + fn check_ty_compat<'tcx>(ty: Ty<'tcx>, real_ty: Ty<'tcx>) -> bool { if ty == real_ty { return true; } // This is actually a fast pointer comparison @@ -185,8 +185,8 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { // Permit changing the pointer type of raw pointers and references as well as // mutability of raw pointers. // TODO: Should not be allowed when fat pointers are involved. - (&TypeVariants::TyRawPtr(_), &TypeVariants::TyRawPtr(_)) => true, - (&TypeVariants::TyRef(_, _), &TypeVariants::TyRef(_, _)) => { + (&ty::TyRawPtr(_), &ty::TyRawPtr(_)) => true, + (&ty::TyRef(_, _), &ty::TyRef(_, _)) => { ty.is_mutable_pointer() == real_ty.is_mutable_pointer() } // rule out everything else @@ -220,7 +220,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { // Second argument must be a tuple matching the argument list of sig let snd_ty = real_sig.inputs_and_output[1]; match snd_ty.sty { - TypeVariants::TyTuple(tys, _) if sig.inputs().len() == tys.len() => + ty::TyTuple(tys, _) if sig.inputs().len() == tys.len() => if sig.inputs().iter().zip(tys).all(|(ty, real_ty)| check_ty_compat(ty, real_ty)) { return Ok(true) }, diff --git a/src/librustc/mir/interpret/validation.rs b/src/librustc/mir/interpret/validation.rs index 3480bbc8f11e..86ad5399e842 100644 --- a/src/librustc/mir/interpret/validation.rs +++ b/src/librustc/mir/interpret/validation.rs @@ -337,7 +337,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> { base: Place, mut layout: ty::layout::TyLayout<'tcx>, i: usize, - ) -> EvalResult<'tcx, ty::Ty<'tcx>> { + ) -> EvalResult<'tcx, Ty<'tcx>> { match base { Place::Ptr { extra: PlaceExtra::DowncastVariant(variant_index), .. } => { layout = layout.for_variant(&self, variant_index);