Skip to content

Commit b5b2ffa

Browse files
committed
Rustup to rustc 1.43.0-nightly (5d04ce67f 2020-02-13)
1 parent e95a300 commit b5b2ffa

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

patches/0017-Fix-libtest-compilation.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ index 8b76080..9e65de2 100644
1717
io::prelude::Write,
1818
- panic::{self, catch_unwind, AssertUnwindSafe, PanicInfo},
1919
+ panic::{self, PanicInfo},
20-
process,
21-
process::{Command, Termination},
20+
process::{self, Command, Termination},
2221
sync::mpsc::{channel, Sender},
22+
sync::{Arc, Mutex},
2323
@@ -1493,7 +1493,7 @@ pub fn run_test(
2424
fn run_test_inner(
2525
desc: TestDesc,

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-02-07
1+
nightly-2020-02-14

src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
190190
cleanup: _,
191191
} => {
192192
if !fx.tcx.sess.overflow_checks() {
193-
if let mir::interpret::PanicInfo::OverflowNeg = *msg {
193+
if let mir::AssertKind::OverflowNeg = *msg {
194194
let target = fx.get_ebb(*target);
195195
fx.bcx.ins().jump(target, &[]);
196196
continue;

src/constant.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc::mir::interpret::{
77
};
88
use rustc::ty::{layout::Align, Const, ConstKind};
99
use rustc_mir::interpret::{
10-
ImmTy, InterpCx, Machine, Memory, MemoryKind, OpTy, PanicInfo, PlaceTy, Pointer,
10+
ImmTy, InterpCx, Machine, Memory, MemoryKind, OpTy, PlaceTy, Pointer,
1111
StackPopCleanup, StackPopInfo,
1212
};
1313

@@ -525,7 +525,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
525525
fn assert_panic(
526526
_: &mut InterpCx<'mir, 'tcx, Self>,
527527
_: Span,
528-
_: &PanicInfo<Operand<'tcx>>,
528+
_: &mir::AssertKind<Operand<'tcx>>,
529529
_: Option<BasicBlock>,
530530
) -> InterpResult<'tcx> {
531531
unreachable!()

0 commit comments

Comments
 (0)