rename InterpretCx -> InterpCx

That's more consistent with InterpResult and InterpError.

src/librustc/mir/interpret/error.rs

@@ -178,7 +178,7 @@ pub fn struct_error<'tcx>(tcx: TyCtxtAt<'tcx>, msg: &str) -> DiagnosticBuilder<'
 /// up with a Rust-level backtrace of where the error occured.
 /// Thsese should always be constructed by calling `.into()` on
 /// a `InterpError`. In `librustc_mir::interpret`, we have the `err!`
-/// macro for this
+/// macro for this.
 #[derive(Debug, Clone)]
 pub struct InterpErrorInfo<'tcx> {
  pub kind: InterpError<'tcx, u64>,

src/librustc_mir/const_eval.rs

@@ -22,7 +22,7 @@ use syntax::source_map::{Span, DUMMY_SP};
 use crate::interpret::{self,
  PlaceTy, MPlaceTy, OpTy, ImmTy, Immediate, Scalar,
  RawConst, ConstValue,
- InterpResult, InterpErrorInfo, InterpError, GlobalId, InterpretCx, StackPopCleanup,
+ InterpResult, InterpErrorInfo, InterpError, GlobalId, InterpCx, StackPopCleanup,
  Allocation, AllocId, MemoryKind, Memory,
  snapshot, RefTracking, intern_const_alloc_recursive,
 };
@@ -34,7 +34,7 @@ const STEPS_UNTIL_DETECTOR_ENABLED: isize = 1_000_000;
 /// Should be a power of two for performance reasons.
 const DETECTOR_SNAPSHOT_PERIOD: isize = 256;
 
-/// The `InterpretCx` is only meant to be used to do field and index projections into constants for
+/// The `InterpCx` is only meant to be used to do field and index projections into constants for
 /// `simd_shuffle` and const patterns in match arms.
 ///
 /// The function containing the `match` that is currently being analyzed may have generic bounds
@@ -47,7 +47,7 @@ pub(crate) fn mk_eval_cx<'mir, 'tcx>(
  param_env: ty::ParamEnv<'tcx>,
 ) -> CompileTimeEvalContext<'mir, 'tcx> {
  debug!("mk_eval_cx: {:?}", param_env);
- InterpretCx::new(tcx.at(span), param_env, CompileTimeInterpreter::new())
+ InterpCx::new(tcx.at(span), param_env, CompileTimeInterpreter::new())
 }
 
 pub(crate) fn eval_promoted<'mir, 'tcx>(
@@ -303,7 +303,7 @@ impl<K: Hash + Eq, V> interpret::AllocMap<K, V> for FxHashMap<K, V> {
 }
 
 crate type CompileTimeEvalContext<'mir, 'tcx> =
- InterpretCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>;
+ InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>;
 
 impl interpret::MayLeak for ! {
  #[inline(always)]
@@ -326,12 +326,12 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
  const STATIC_KIND: Option<!> = None; // no copying of statics allowed
 
  #[inline(always)]
- fn enforce_validity(_ecx: &InterpretCx<'mir, 'tcx, Self>) -> bool {
+ fn enforce_validity(_ecx: &InterpCx<'mir, 'tcx, Self>) -> bool {
  false // for now, we don't enforce validity
  }
 
  fn find_fn(
- ecx: &mut InterpretCx<'mir, 'tcx, Self>,
+ ecx: &mut InterpCx<'mir, 'tcx, Self>,
  instance: ty::Instance<'tcx>,
  args: &[OpTy<'tcx>],
  dest: Option<PlaceTy<'tcx>>,
@@ -371,7 +371,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
  }
 
  fn call_intrinsic(
- ecx: &mut InterpretCx<'mir, 'tcx, Self>,
+ ecx: &mut InterpCx<'mir, 'tcx, Self>,
  instance: ty::Instance<'tcx>,
  args: &[OpTy<'tcx>],
  dest: PlaceTy<'tcx>,
@@ -387,7 +387,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
  }
 
  fn ptr_op(
- _ecx: &InterpretCx<'mir, 'tcx, Self>,
+ _ecx: &InterpCx<'mir, 'tcx, Self>,
  _bin_op: mir::BinOp,
  _left: ImmTy<'tcx>,
  _right: ImmTy<'tcx>,
@@ -424,15 +424,15 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
  }
 
  fn box_alloc(
- _ecx: &mut InterpretCx<'mir, 'tcx, Self>,
+ _ecx: &mut InterpCx<'mir, 'tcx, Self>,
  _dest: PlaceTy<'tcx>,
  ) -> InterpResult<'tcx> {
  Err(
  ConstEvalError::NeedsRfc("heap allocations via `box` keyword".to_string()).into(),
  )
  }
 
- fn before_terminator(ecx: &mut InterpretCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
+ fn before_terminator(ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
  {
  let steps = &mut ecx.machine.steps_since_detector_enabled;
 
@@ -457,13 +457,13 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
  }
 
  #[inline(always)]
- fn stack_push(_ecx: &mut InterpretCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
+ fn stack_push(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
  Ok(())
  }
 
  /// Called immediately before a stack frame gets popped.
  #[inline(always)]
- fn stack_pop(_ecx: &mut InterpretCx<'mir, 'tcx, Self>, _extra: ()) -> InterpResult<'tcx> {
+ fn stack_pop(_ecx: &mut InterpCx<'mir, 'tcx, Self>, _extra: ()) -> InterpResult<'tcx> {
  Ok(())
  }
 }
@@ -508,7 +508,7 @@ pub fn const_variant_index<'tcx>(
 }
 
 pub fn error_to_const_error<'mir, 'tcx>(
- ecx: &InterpretCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
+ ecx: &InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>,
  mut error: InterpErrorInfo<'tcx>,
 ) -> ConstEvalErr<'tcx> {
  error.print_backtrace();
@@ -632,7 +632,7 @@ pub fn const_eval_raw_provider<'tcx>(
  }
 
  let span = tcx.def_span(cid.instance.def_id());
- let mut ecx = InterpretCx::new(tcx.at(span), key.param_env, CompileTimeInterpreter::new());
+ let mut ecx = InterpCx::new(tcx.at(span), key.param_env, CompileTimeInterpreter::new());
 
  let res = ecx.load_mir(cid.instance.def);
  res.map(|body| {

src/librustc_mir/interpret/cast.rs

@@ -11,9 +11,9 @@ use rustc::mir::interpret::{
 };
 use rustc::mir::CastKind;
 
-use super::{InterpretCx, Machine, PlaceTy, OpTy, Immediate};
+use super::{InterpCx, Machine, PlaceTy, OpTy, Immediate};
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
  fn type_is_fat_ptr(&self, ty: Ty<'tcx>) -> bool {
  match ty.sty {
  ty::RawPtr(ty::TypeAndMut { ty, .. }) |

src/librustc_mir/interpret/eval_context.rs

@@ -26,7 +26,7 @@ use super::{
  Memory, Machine
 };
 
-pub struct InterpretCx<'mir, 'tcx, M: Machine<'mir, 'tcx>> {
+pub struct InterpCx<'mir, 'tcx, M: Machine<'mir, 'tcx>> {
  /// Stores the `Machine` instance.
  pub machine: M,
 
@@ -158,14 +158,14 @@ impl<'tcx, Tag: Copy + 'static> LocalState<'tcx, Tag> {
  }
 }
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> HasDataLayout for InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> HasDataLayout for InterpCx<'mir, 'tcx, M> {
  #[inline]
  fn data_layout(&self) -> &layout::TargetDataLayout {
  &self.tcx.data_layout
  }
 }
 
-impl<'mir, 'tcx, M> layout::HasTyCtxt<'tcx> for InterpretCx<'mir, 'tcx, M>
+impl<'mir, 'tcx, M> layout::HasTyCtxt<'tcx> for InterpCx<'mir, 'tcx, M>
 where
  M: Machine<'mir, 'tcx>,
 {
@@ -175,7 +175,7 @@ where
  }
 }
 
-impl<'mir, 'tcx, M> layout::HasParamEnv<'tcx> for InterpretCx<'mir, 'tcx, M>
+impl<'mir, 'tcx, M> layout::HasParamEnv<'tcx> for InterpCx<'mir, 'tcx, M>
 where
  M: Machine<'mir, 'tcx>,
 {
@@ -184,7 +184,7 @@ where
  }
 }
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> LayoutOf for InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> LayoutOf for InterpCx<'mir, 'tcx, M> {
  type Ty = Ty<'tcx>;
  type TyLayout = InterpResult<'tcx, TyLayout<'tcx>>;
 
@@ -195,9 +195,9 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> LayoutOf for InterpretCx<'mir, 'tcx, M>
  }
 }
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
  pub fn new(tcx: TyCtxtAt<'tcx>, param_env: ty::ParamEnv<'tcx>, machine: M) -> Self {
- InterpretCx {
+ InterpCx {
  machine,
  tcx,
  param_env,

src/librustc_mir/interpret/intrinsics.rs

@@ -11,7 +11,7 @@ use rustc::mir::interpret::{
 };
 
 use super::{
- Machine, PlaceTy, OpTy, InterpretCx, Immediate,
+ Machine, PlaceTy, OpTy, InterpCx, Immediate,
 };
 
 mod type_name;
@@ -39,7 +39,7 @@ fn numeric_intrinsic<'tcx, Tag>(
  Ok(Scalar::from_uint(bits_out, size))
 }
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
  /// Returns `true` if emulation happened.
  pub fn emulate_intrinsic(
  &mut self,

src/librustc_mir/interpret/machine.rs

@@ -11,7 +11,7 @@ use rustc::ty::{self, query::TyCtxtAt};
 
 use super::{
  Allocation, AllocId, InterpResult, Scalar, AllocationExtra,
- InterpretCx, PlaceTy, OpTy, ImmTy, MemoryKind, Pointer, Memory
+ InterpCx, PlaceTy, OpTy, ImmTy, MemoryKind, Pointer, Memory
 };
 
 /// Whether this kind of memory is allowed to leak
@@ -95,11 +95,11 @@ pub trait Machine<'mir, 'tcx>: Sized {
  const STATIC_KIND: Option<Self::MemoryKinds>;
 
  /// Whether to enforce the validity invariant
- fn enforce_validity(ecx: &InterpretCx<'mir, 'tcx, Self>) -> bool;
+ fn enforce_validity(ecx: &InterpCx<'mir, 'tcx, Self>) -> bool;
 
  /// Called before a basic block terminator is executed.
  /// You can use this to detect endlessly running programs.
- fn before_terminator(ecx: &mut InterpretCx<'mir, 'tcx, Self>) -> InterpResult<'tcx>;
+ fn before_terminator(ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx>;
 
  /// Entry point to all function calls.
  ///
@@ -112,7 +112,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
  /// Passing `dest`and `ret` in the same `Option` proved very annoying when only one of them
  /// was used.
  fn find_fn(
- ecx: &mut InterpretCx<'mir, 'tcx, Self>,
+ ecx: &mut InterpCx<'mir, 'tcx, Self>,
  instance: ty::Instance<'tcx>,
  args: &[OpTy<'tcx, Self::PointerTag>],
  dest: Option<PlaceTy<'tcx, Self::PointerTag>>,
@@ -122,7 +122,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
  /// Directly process an intrinsic without pushing a stack frame.
  /// If this returns successfully, the engine will take care of jumping to the next block.
  fn call_intrinsic(
- ecx: &mut InterpretCx<'mir, 'tcx, Self>,
+ ecx: &mut InterpCx<'mir, 'tcx, Self>,
  instance: ty::Instance<'tcx>,
  args: &[OpTy<'tcx, Self::PointerTag>],
  dest: PlaceTy<'tcx, Self::PointerTag>,
@@ -145,15 +145,15 @@ pub trait Machine<'mir, 'tcx>: Sized {
  ///
  /// Returns a (value, overflowed) pair if the operation succeeded
  fn ptr_op(
- ecx: &InterpretCx<'mir, 'tcx, Self>,
+ ecx: &InterpCx<'mir, 'tcx, Self>,
  bin_op: mir::BinOp,
  left: ImmTy<'tcx, Self::PointerTag>,
  right: ImmTy<'tcx, Self::PointerTag>,
  ) -> InterpResult<'tcx, (Scalar<Self::PointerTag>, bool)>;
 
  /// Heap allocations via the `box` keyword.
  fn box_alloc(
- ecx: &mut InterpretCx<'mir, 'tcx, Self>,
+ ecx: &mut InterpCx<'mir, 'tcx, Self>,
  dest: PlaceTy<'tcx, Self::PointerTag>,
  ) -> InterpResult<'tcx>;
 
@@ -193,19 +193,19 @@ pub trait Machine<'mir, 'tcx>: Sized {
  /// Executes a retagging operation
  #[inline]
  fn retag(
- _ecx: &mut InterpretCx<'mir, 'tcx, Self>,
+ _ecx: &mut InterpCx<'mir, 'tcx, Self>,
  _kind: mir::RetagKind,
  _place: PlaceTy<'tcx, Self::PointerTag>,
  ) -> InterpResult<'tcx> {
  Ok(())
  }
 
  /// Called immediately before a new stack frame got pushed
- fn stack_push(ecx: &mut InterpretCx<'mir, 'tcx, Self>) -> InterpResult<'tcx, Self::FrameExtra>;
+ fn stack_push(ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx, Self::FrameExtra>;
 
  /// Called immediately after a stack frame gets popped
  fn stack_pop(
- ecx: &mut InterpretCx<'mir, 'tcx, Self>,
+ ecx: &mut InterpCx<'mir, 'tcx, Self>,
  extra: Self::FrameExtra,
  ) -> InterpResult<'tcx>;
 

src/librustc_mir/interpret/mod.rs

@@ -19,7 +19,7 @@ mod intern;
 pub use rustc::mir::interpret::*; // have all the `interpret` symbols in one place: here
 
 pub use self::eval_context::{
- InterpretCx, Frame, StackPopCleanup, LocalState, LocalValue,
+ InterpCx, Frame, StackPopCleanup, LocalState, LocalValue,
 };
 
 pub use self::place::{Place, PlaceTy, MemPlace, MPlaceTy};

src/librustc_mir/interpret/operand.rs

@@ -15,7 +15,7 @@ use rustc::mir::interpret::{
  sign_extend, truncate,
 };
 use super::{
- InterpretCx, Machine,
+ InterpCx, Machine,
  MemPlace, MPlaceTy, PlaceTy, Place,
 };
 pub use rustc::mir::interpret::ScalarMaybeUndef;
@@ -213,7 +213,7 @@ pub(super) fn from_known_layout<'tcx>(
  }
 }
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
  /// Try reading an immediate in memory; this is interesting particularly for `ScalarPair`.
  /// Returns `None` if the layout does not permit loading this as a value.
  fn try_read_immediate_from_mplace(

src/librustc_mir/interpret/operator.rs

@@ -4,10 +4,10 @@ use syntax::ast::FloatTy;
 use rustc_apfloat::Float;
 use rustc::mir::interpret::{InterpResult, Scalar};
 
-use super::{InterpretCx, PlaceTy, Immediate, Machine, ImmTy};
+use super::{InterpCx, PlaceTy, Immediate, Machine, ImmTy};
 
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
  /// Applies the binary operation `op` to the two operands and writes a tuple of the result
  /// and a boolean signifying the potential overflow to the destination.
  pub fn binop_with_overflow(
@@ -36,7 +36,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpretCx<'mir, 'tcx, M> {
  }
 }
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
  fn binary_char_op(
  &self,
  bin_op: mir::BinOp,

src/librustc_mir/interpret/place.rs

@@ -13,7 +13,7 @@ use rustc::ty::TypeFoldable;
 
 use super::{
  GlobalId, AllocId, Allocation, Scalar, InterpResult, Pointer, PointerArithmetic,
- InterpretCx, Machine, AllocMap, AllocationExtra,
+ InterpCx, Machine, AllocMap, AllocationExtra,
  RawConst, Immediate, ImmTy, ScalarMaybeUndef, Operand, OpTy, MemoryKind, LocalValue
 };
 
@@ -290,7 +290,7 @@ impl<'tcx, Tag: ::std::fmt::Debug> PlaceTy<'tcx, Tag> {
 }
 
 // separating the pointer tag for `impl Trait`, see https:/rust-lang/rust/issues/54385
-impl<'mir, 'tcx, Tag, M> InterpretCx<'mir, 'tcx, M>
+impl<'mir, 'tcx, Tag, M> InterpCx<'mir, 'tcx, M>
 where
  // FIXME: Working around https:/rust-lang/rust/issues/54385
  Tag: ::std::fmt::Debug + Copy + Eq + Hash + 'static,
@@ -583,7 +583,7 @@ where
  // global table but not in its local memory: It calls back into tcx through
  // a query, triggering the CTFE machinery to actually turn this lazy reference
  // into a bunch of bytes. IOW, statics are evaluated with CTFE even when
- // this InterpretCx uses another Machine (e.g., in miri). This is what we
+ // this InterpCx uses another Machine (e.g., in miri). This is what we
  // want! This way, computing statics works consistently between codegen
  // and miri: They use the same query to eventually obtain a `ty::Const`
  // and use that for further computation.

src/librustc_mir/interpret/step.rs

@@ -1,12 +1,12 @@
-//! This module contains the `InterpretCx` methods for executing a single step of the interpreter.
+//! This module contains the `InterpCx` methods for executing a single step of the interpreter.
 //!
 //! The main entry point is the `step` method.
 
 use rustc::mir;
 use rustc::ty::layout::LayoutOf;
 use rustc::mir::interpret::{InterpResult, Scalar, PointerArithmetic};
 
-use super::{InterpretCx, Machine};
+use super::{InterpCx, Machine};
 
 /// Classify whether an operator is "left-homogeneous", i.e., the LHS has the
 /// same type as the result.
@@ -35,7 +35,7 @@ fn binop_right_homogeneous(op: mir::BinOp) -> bool {
  }
 }
 
-impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpretCx<'mir, 'tcx, M> {
+impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
  pub fn run(&mut self) -> InterpResult<'tcx> {
  while self.step()? {}
  Ok(())