From f0bb30f8a1ac6107555dfc8fe830d42f469af7f8 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Thu, 28 Nov 2019 21:35:03 +0100
Subject: [PATCH] Rustup to rustc 1.41.0-nightly (25d8a9494 2019-11-29)

---
 src/constant.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/constant.rs b/src/constant.rs
index 1f0a39540d1..ab099292bf4 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -411,8 +411,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
         _: &mut InterpCx<'mir, 'tcx, Self>,
         _: Instance<'tcx>,
         _: &[OpTy<'tcx>],
-        _: Option<PlaceTy<'tcx>>,
-        _: Option<BasicBlock>,
+        _: Option<(PlaceTy<'tcx>, BasicBlock)>,
         _: Option<BasicBlock>,
     ) -> InterpResult<'tcx, Option<&'mir Body<'tcx>>> {
         panic!();
@@ -423,8 +422,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
         _: Span,
         _: Instance<'tcx>,
         _: &[OpTy<'tcx>],
-        _: Option<PlaceTy<'tcx>>,
-        _: Option<BasicBlock>,
+        _: Option<(PlaceTy<'tcx>, BasicBlock)>,
         _: Option<BasicBlock>,
     ) -> InterpResult<'tcx> {
         panic!();
@@ -468,7 +466,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
         _: &mut InterpCx<'mir, 'tcx, Self>,
         _: !,
         _: &[OpTy<'tcx, ()>],
-        _: Option<PlaceTy<'tcx, ()>>,
+        _: Option<(PlaceTy<'tcx, ()>, BasicBlock)>,
         _: Option<BasicBlock>,
     ) -> InterpResult<'tcx> {
         unreachable!();