about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2020-02-14 18:20:34 +0100
committerbjorn3 <bjorn3@users.noreply.github.com>2020-02-14 18:20:34 +0100
commitb5b2ffab6ae4026f8d9a8b552e075fdc81002ec7 (patch)
tree93b27636cdd6e215dc7527f9fba9321fa8e0d6d6 /src
parente95a300630ce9f44b363ecc18e78a6f5df410b79 (diff)
downloadrust-b5b2ffab6ae4026f8d9a8b552e075fdc81002ec7.tar.gz
rust-b5b2ffab6ae4026f8d9a8b552e075fdc81002ec7.zip
Rustup to rustc 1.43.0-nightly (5d04ce67f 2020-02-13)
Diffstat (limited to 'src')
-rw-r--r--src/base.rs2
-rw-r--r--src/constant.rs4
2 files changed, 3 insertions, 3 deletions
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!()