From: Ralf Jung <post@ralfj.de>
Date: Wed, 29 May 2019 07:30:36 +0000 (+0200)
Subject: fix for rustc changes
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=e4cee77121d8ad3c547a67b6c8cff88e38183ec1;p=rust.git

fix for rustc changes
---

diff --git a/rust-version b/rust-version
index 0af97e2a284..7695b069436 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-721268583759224d0f6476e0b8b196cc8afbdea0
+4b9d80325a65b0375eea526409a0f3aaf1cbc23c
diff --git a/src/fn_call.rs b/src/fn_call.rs
index dc43c652409..17679e26790 100644
--- a/src/fn_call.rs
+++ b/src/fn_call.rs
@@ -17,7 +17,7 @@ fn find_fn(
         args: &[OpTy<'tcx, Tag>],
         dest: Option<PlaceTy<'tcx, Tag>>,
         ret: Option<mir::BasicBlock>,
-    ) -> 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 a12493fbfbd..89d7964913a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -407,7 +407,7 @@ fn find_fn(
         args: &[OpTy<'tcx, Tag>],
         dest: Option<PlaceTy<'tcx, Tag>>,
         ret: Option<mir::BasicBlock>,
-    ) -> EvalResult<'tcx, Option<&'mir mir::Mir<'tcx>>> {
+    ) -> EvalResult<'tcx, Option<&'mir mir::Body<'tcx>>> {
         ecx.find_fn(instance, args, dest, ret)
     }