From b5b2ffab6ae4026f8d9a8b552e075fdc81002ec7 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Fri, 14 Feb 2020 18:20:34 +0100
Subject: Rustup to rustc 1.43.0-nightly (5d04ce67f 2020-02-13)

---
 patches/0017-Fix-libtest-compilation.patch | 4 ++--
 rust-toolchain                             | 2 +-
 src/base.rs                                | 2 +-
 src/constant.rs                            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/0017-Fix-libtest-compilation.patch b/patches/0017-Fix-libtest-compilation.patch
index 5299fb2b465..12dac18f3fa 100644
--- a/patches/0017-Fix-libtest-compilation.patch
+++ b/patches/0017-Fix-libtest-compilation.patch
@@ -17,9 +17,9 @@ index 8b76080..9e65de2 100644
      io::prelude::Write,
 -    panic::{self, catch_unwind, AssertUnwindSafe, PanicInfo},
 +    panic::{self, PanicInfo},
-     process,
-     process::{Command, Termination},
+     process::{self, Command, Termination},
      sync::mpsc::{channel, Sender},
+     sync::{Arc, Mutex},
 @@ -1493,7 +1493,7 @@ pub fn run_test(
      fn run_test_inner(
          desc: TestDesc,
diff --git a/rust-toolchain b/rust-toolchain
index 2580eba6f26..b17bee1216c 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-02-07
+nightly-2020-02-14
diff --git a/src/base.rs b/src/base.rs
index 5860e3121b4..a0add9b202f 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -190,7 +190,7 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
                 cleanup: _,
             } => {
                 if !fx.tcx.sess.overflow_checks() {
-                    if let mir::interpret::PanicInfo::OverflowNeg = *msg {
+                    if let mir::AssertKind::OverflowNeg = *msg {
                         let target = fx.get_ebb(*target);
                         fx.bcx.ins().jump(target, &[]);
                         continue;
diff --git a/src/constant.rs b/src/constant.rs
index b6b43526c72..c0e2770361c 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -7,7 +7,7 @@ use rustc::mir::interpret::{
 };
 use rustc::ty::{layout::Align, Const, ConstKind};
 use rustc_mir::interpret::{
-    ImmTy, InterpCx, Machine, Memory, MemoryKind, OpTy, PanicInfo, PlaceTy, Pointer,
+    ImmTy, InterpCx, Machine, Memory, MemoryKind, OpTy, PlaceTy, Pointer,
     StackPopCleanup, StackPopInfo,
 };
 
@@ -525,7 +525,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
     fn assert_panic(
         _: &mut InterpCx<'mir, 'tcx, Self>,
         _: Span,
-        _: &PanicInfo<Operand<'tcx>>,
+        _: &mir::AssertKind<Operand<'tcx>>,
         _: Option<BasicBlock>,
     ) -> InterpResult<'tcx> {
         unreachable!()
-- 
cgit 1.4.1-3-g733a5