From cc0804e8157af4899d0de9d65202e83d4688eb84 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sun, 21 Apr 2019 14:41:23 +0200 Subject: [PATCH] Rustup to rustc 1.36.0-nightly (33fe1131c 2019-04-20) --- src/base.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/base.rs b/src/base.rs index 0fb69e2a1e3..eed66a28806 100644 --- a/src/base.rs +++ b/src/base.rs @@ -1,3 +1,5 @@ +use rustc::ty::adjustment::PointerCast; + use crate::prelude::*; struct PrintOnPanic String>(F); @@ -530,7 +532,7 @@ fn trans_stmt<'a, 'tcx: 'a>( }; lval.write_cvalue(fx, CValue::ByVal(res, layout)); } - Rvalue::Cast(CastKind::ReifyFnPointer, operand, ty) => { + Rvalue::Cast(CastKind::Pointer(PointerCast::ReifyFnPointer), operand, ty) => { let layout = fx.layout_of(ty); match fx .monomorphize(&operand.ty(&fx.mir.local_decls, fx.tcx)) @@ -547,8 +549,8 @@ fn trans_stmt<'a, 'tcx: 'a>( _ => bug!("Trying to ReifyFnPointer on non FnDef {:?}", ty), } } - Rvalue::Cast(CastKind::UnsafeFnPointer, operand, ty) - | Rvalue::Cast(CastKind::MutToConstPointer, operand, ty) => { + Rvalue::Cast(CastKind::Pointer(PointerCast::UnsafeFnPointer), operand, ty) + | Rvalue::Cast(CastKind::Pointer(PointerCast::MutToConstPointer), operand, ty) => { let operand = trans_operand(fx, operand); let layout = fx.layout_of(ty); lval.write_cvalue(fx, operand.unchecked_cast_to(layout)); @@ -644,7 +646,7 @@ fn trans_stmt<'a, 'tcx: 'a>( lval.write_cvalue(fx, CValue::ByVal(res, dest_layout)); } } - Rvalue::Cast(CastKind::ClosureFnPointer(_), operand, _ty) => { + Rvalue::Cast(CastKind::Pointer(PointerCast::ClosureFnPointer(_)), operand, _ty) => { let operand = trans_operand(fx, operand); match operand.layout().ty.sty { ty::Closure(def_id, substs) => { @@ -663,7 +665,7 @@ fn trans_stmt<'a, 'tcx: 'a>( } } } - Rvalue::Cast(CastKind::Unsize, operand, _ty) => { + Rvalue::Cast(CastKind::Pointer(PointerCast::Unsize), operand, _ty) => { let operand = trans_operand(fx, operand); operand.unsize_value(fx, lval); }