Auto merge of #1102 - RalfJung:rsutup, r=RalfJung

rustup for find_fn rename

Author: bors

rust-version

@@ -1 +1 @@
-7afe6d9d1f48b998cc88fe6f01ba0082788ba4b9
+6d77e45f01079fe3d40180b3e256e414ab379f63

src/machine.rs

@@ -182,14 +182,14 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {
     }
 
     #[inline(always)]
-    fn find_fn(
+    fn find_mir_or_eval_fn(
         ecx: &mut InterpCx<'mir, 'tcx, Self>,
         instance: ty::Instance<'tcx>,
         args: &[OpTy<'tcx, Tag>],
         ret: Option<(PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
         unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx, Option<&'mir mir::Body<'tcx>>> {
-        ecx.find_fn(instance, args, ret, unwind)
+        ecx.find_mir_or_eval_fn(instance, args, ret, unwind)
     }
 
     #[inline(always)]

src/shims/mod.rs

@@ -12,7 +12,7 @@ use crate::*;
 
 impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
 pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
-    fn find_fn(
+    fn find_mir_or_eval_fn(
         &mut self,
         instance: ty::Instance<'tcx>,
         args: &[OpTy<'tcx, Tag>],