Move CtfeMemory alias next to CompileTimeInterpreter

Author: ecstatic-morse

src/librustc_mir/const_eval.rs

@@ -305,6 +305,8 @@ impl interpret::MayLeak for ! {
     }
 }
 
+pub type CtfeMemory<'mir, 'tcx> = Memory<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>;
+
 impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir, 'tcx> {
     type MemoryKinds = !;
     type PointerTag = ();
@@ -445,7 +447,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
     }
 
     fn ptr_to_int(
-        _mem: &Memory<'mir, 'tcx, Self>,
+        _mem: &CtfeMemory<'mir, 'tcx>,
         _ptr: Pointer,
     ) -> InterpResult<'tcx, u64> {
         Err(

src/librustc_mir/interpret/snapshot.rs

@@ -63,11 +63,9 @@ use rustc::ty::layout::Size;
 use rustc_data_structures::fx::{FxHasher, FxHashMap, FxHashSet};
 
 use super::{memory, AllocId, Frame, Immediate, MemPlace, Operand};
-use crate::const_eval::CompileTimeInterpreter;
+use crate::const_eval::{CompileTimeInterpreter, CtfeMemory};
 use crate::interpret::{LocalState, LocalValue};
 
-type CtfeMemory<'mir, 'tcx> = Memory<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>>;
-
 #[derive(Default)]
 pub(crate) struct InfiniteLoopDetector<'mir, 'tcx> {
     /// The set of all `InterpSnapshot` *hashes* observed by this detector.