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,
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;
};
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,
};
fn assert_panic(
_: &mut InterpCx<'mir, 'tcx, Self>,
_: Span,
- _: &PanicInfo<Operand<'tcx>>,
+ _: &mir::AssertKind<Operand<'tcx>>,
_: Option<BasicBlock>,
) -> InterpResult<'tcx> {
unreachable!()