Remove 'mir lifetime parameter

Author: TDecking

src/shims/x86/sse42.rs

@@ -17,10 +17,8 @@ const USE_WORDS: u8 = 1;
 /// signed integers and unsigned integers.
 const USE_SIGNED: u8 = 2;
 
-impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriInterpCx<'mir, 'tcx> {}
-pub(super) trait EvalContextExt<'mir, 'tcx: 'mir>:
-    crate::MiriInterpCxExt<'mir, 'tcx>
-{
+impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
+pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     fn emulate_x86_sse42_intrinsic(
         &mut self,
         link_name: Symbol,
@@ -255,8 +253,8 @@ pub(super) trait EvalContextExt<'mir, 'tcx: 'mir>:
 /// A result mask. The bit at index `i` inside the mask is set if 'str2' starting at `i`
 /// fulfills the test as defined inside the immediate byte.
 /// The mask may be negated if negation flags inside the immediate byte are set.
-fn compare_strings<'mir, 'tcx: 'mir>(
-    this: &mut InterpCx<'mir, 'tcx, MiriMachine<'mir, 'tcx>>,
+fn compare_strings<'tcx>(
+    this: &mut MiriInterpCx<'tcx>,
     str1: &OpTy<'tcx>,
     str2: &OpTy<'tcx>,
     len: Option<(u64, u64)>,
@@ -379,14 +377,14 @@ fn compare_strings<'mir, 'tcx: 'mir>(
 /// * The immediate instruction byte.
 /// The string arguments will be transmuted into arrays of bytes
 /// or words, depending on the value of the immediate byte.
-fn deconstruct_args<'mir, 'tcx: 'mir>(
+fn deconstruct_args<'tcx>(
     unprefixed_name: &str,
-    this: &mut InterpCx<'mir, 'tcx, MiriMachine<'mir, 'tcx>>,
+    this: &mut MiriInterpCx<'tcx>,
     link_name: Symbol,
     abi: Abi,
     args: &[OpTy<'tcx>],
 ) -> InterpResult<'tcx, (OpTy<'tcx>, OpTy<'tcx>, Option<(u64, u64)>, u8)> {
-    let array_layout_fn = |this: &mut InterpCx<'mir, 'tcx, MiriMachine<'mir, 'tcx>>, imm: u8| {
+    let array_layout_fn = |this: &mut MiriInterpCx<'tcx>, imm: u8| {
         if imm & USE_WORDS != 0 {
             this.layout_of(Ty::new_array(this.tcx.tcx, this.tcx.types.u16, 8))
         } else {
@@ -429,8 +427,8 @@ fn deconstruct_args<'mir, 'tcx: 'mir>(
 }
 
 /// Calculate the c-style string length for a given string `str`.
-fn implicit_len<'mir, 'tcx: 'mir>(
-    this: &mut InterpCx<'mir, 'tcx, MiriMachine<'mir, 'tcx>>,
+fn implicit_len<'tcx>(
+    this: &mut MiriInterpCx<'tcx>,
     str: &OpTy<'tcx>,
     imm: u8,
 ) -> InterpResult<'tcx, Option<u64>> {