diff --git a/rust-version b/rust-version index 0af97e2a284c..7695b069436f 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -721268583759224d0f6476e0b8b196cc8afbdea0 +4b9d80325a65b0375eea526409a0f3aaf1cbc23c diff --git a/src/fn_call.rs b/src/fn_call.rs index dc43c6524096..17679e26790c 100644 --- a/src/fn_call.rs +++ b/src/fn_call.rs @@ -17,7 +17,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<' args: &[OpTy<'tcx, Tag>], dest: Option>, ret: Option, - ) -> EvalResult<'tcx, Option<&'mir mir::Mir<'tcx>>> { + ) -> EvalResult<'tcx, Option<&'mir mir::Body<'tcx>>> { let this = self.eval_context_mut(); trace!("eval_fn_call: {:#?}, {:?}", instance, dest.map(|place| *place)); diff --git a/src/lib.rs b/src/lib.rs index a12493fbfbd6..89d7964913ae 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -407,7 +407,7 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for Evaluator<'tcx> { args: &[OpTy<'tcx, Tag>], dest: Option>, ret: Option, - ) -> EvalResult<'tcx, Option<&'mir mir::Mir<'tcx>>> { + ) -> EvalResult<'tcx, Option<&'mir mir::Body<'tcx>>> { ecx.find_fn(instance, args, dest, ret) }