diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-23 11:49:06 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-23 11:49:06 +0100 |
| commit | 41047de9e2f810fcf7aa5e0b038d9c3ad2742564 (patch) | |
| tree | 58fd16f8069708ad617b7eb6121bfbfe5d6a0846 | |
| parent | e99f78af0880edd5f56254236042f3c9ce0dce63 (diff) | |
| download | rust-41047de9e2f810fcf7aa5e0b038d9c3ad2742564.tar.gz rust-41047de9e2f810fcf7aa5e0b038d9c3ad2742564.zip | |
Rustfmt
| -rw-r--r-- | src/abi/mod.rs | 6 | ||||
| -rw-r--r-- | src/base.rs | 24 |
2 files changed, 22 insertions, 8 deletions
diff --git a/src/abi/mod.rs b/src/abi/mod.rs index ac076789f2e..aee274ab4a8 100644 --- a/src/abi/mod.rs +++ b/src/abi/mod.rs @@ -214,10 +214,8 @@ pub(crate) fn get_function_name_and_sig<'tcx>( support_vararg: bool, ) -> (String, Signature) { assert!(!inst.substs.needs_infer()); - let fn_sig = tcx.normalize_erasing_late_bound_regions( - ParamEnv::reveal_all(), - fn_sig_for_fn_abi(tcx, inst), - ); + let fn_sig = tcx + .normalize_erasing_late_bound_regions(ParamEnv::reveal_all(), fn_sig_for_fn_abi(tcx, inst)); if fn_sig.c_variadic && !support_vararg { tcx.sess.span_fatal( tcx.def_span(inst.def_id()), diff --git a/src/base.rs b/src/base.rs index 93b5c36104f..72073896a72 100644 --- a/src/base.rs +++ b/src/base.rs @@ -514,7 +514,11 @@ fn codegen_stmt<'tcx>( }; lval.write_cvalue(fx, res); } - Rvalue::Cast(CastKind::Pointer(PointerCast::ReifyFnPointer), ref operand, to_ty) => { + Rvalue::Cast( + CastKind::Pointer(PointerCast::ReifyFnPointer), + ref operand, + to_ty, + ) => { let from_ty = fx.monomorphize(operand.ty(&fx.mir.local_decls, fx.tcx)); let to_layout = fx.layout_of(fx.monomorphize(to_ty)); match *from_ty.kind() { @@ -535,9 +539,21 @@ fn codegen_stmt<'tcx>( _ => bug!("Trying to ReifyFnPointer on non FnDef {:?}", from_ty), } } - Rvalue::Cast(CastKind::Pointer(PointerCast::UnsafeFnPointer), ref operand, to_ty) - | Rvalue::Cast(CastKind::Pointer(PointerCast::MutToConstPointer), ref operand, to_ty) - | Rvalue::Cast(CastKind::Pointer(PointerCast::ArrayToPointer), ref operand, to_ty) => { + Rvalue::Cast( + CastKind::Pointer(PointerCast::UnsafeFnPointer), + ref operand, + to_ty, + ) + | Rvalue::Cast( + CastKind::Pointer(PointerCast::MutToConstPointer), + ref operand, + to_ty, + ) + | Rvalue::Cast( + CastKind::Pointer(PointerCast::ArrayToPointer), + ref operand, + to_ty, + ) => { let to_layout = fx.layout_of(fx.monomorphize(to_ty)); let operand = codegen_operand(fx, operand); lval.write_cvalue(fx, operand.cast_pointer_to(to_layout)); |
