From f473ba8f87a8397e358a79f8ccae2d944f7bee95 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sun, 28 Apr 2019 20:37:44 +0200 Subject: [PATCH] Rustup to rustc 1.36.0-nightly (938d4ffe1 2019-04-27) --- src/abi.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/abi.rs b/src/abi.rs index 531e4f063af3..74b373276cb7 100644 --- a/src/abi.rs +++ b/src/abi.rs @@ -87,7 +87,7 @@ fn clif_sig_from_fn_sig<'a, 'tcx: 'a>(tcx: TyCtxt<'a, 'tcx, 'tcx>, sig: FnSig<'t _ => bug!("argument to function with \"rust-call\" ABI is not a tuple"), }; let mut inputs: Vec = vec![sig.inputs()[0]]; - inputs.extend(extra_args.into_iter()); + inputs.extend(extra_args.types()); (CallConv::SystemV, inputs, sig.output()) } Abi::System => bug!("system abi should be selected elsewhere"), @@ -434,7 +434,7 @@ pub fn codegen_fn_prelude<'a, 'tcx: 'a>( }; let mut params = Vec::new(); - for (i, arg_ty) in tupled_arg_tys.iter().enumerate() { + for (i, arg_ty) in tupled_arg_tys.types().enumerate() { let param = cvalue_for_param( fx, start_ebb,