diff options
| author | bors <bors@rust-lang.org> | 2021-03-27 19:38:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-27 19:38:01 +0000 |
| commit | 9b0edb7fddacd6a60a380c1ce59159de597ab270 (patch) | |
| tree | 334eb1b9a4ec064bca2df01036caabb5d4b1ea09 /compiler/rustc_codegen_llvm/src/builder.rs | |
| parent | afaf33dcafe9c7068b63eb997df221aa08db7c29 (diff) | |
| parent | 7d6af6751c5726d884440d4e8d462a9ee6c5efc1 (diff) | |
| download | rust-9b0edb7fddacd6a60a380c1ce59159de597ab270.tar.gz rust-9b0edb7fddacd6a60a380c1ce59159de597ab270.zip | |
Auto merge of #83580 - Dylan-DPC:rollup-1zod4p7, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #81351 (combine: stop eagerly evaluating consts) - #82525 (make unaligned_references future-incompat lint warn-by-default) - #82626 (update array missing `IntoIterator` msg) - #82917 (Add function core::iter::zip) - #82993 (rustdoc: Use diagnostics for error when including sources) - #83522 (Improve fs error open_from unix) - #83548 (Always preserve `None`-delimited groups in a captured `TokenStream`) - #83555 (Add #[inline] to io::Error methods) Failed merges: - #83130 (escape_ascii take 2) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/builder.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/builder.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs index f4852c91e53..896e56a9a1e 100644 --- a/compiler/rustc_codegen_llvm/src/builder.rs +++ b/compiler/rustc_codegen_llvm/src/builder.rs @@ -21,6 +21,7 @@ use rustc_target::abi::{self, Align, Size}; use rustc_target::spec::{HasTargetSpec, Target}; use std::borrow::Cow; use std::ffi::CStr; +use std::iter; use std::ops::{Deref, Range}; use std::ptr; use tracing::debug; @@ -1352,18 +1353,14 @@ impl Builder<'a, 'll, 'tcx> { let param_tys = self.cx.func_params_types(fn_ty); - let all_args_match = param_tys - .iter() - .zip(args.iter().map(|&v| self.val_ty(v))) + let all_args_match = iter::zip(¶m_tys, args.iter().map(|&v| self.val_ty(v))) .all(|(expected_ty, actual_ty)| *expected_ty == actual_ty); if all_args_match { return Cow::Borrowed(args); } - let casted_args: Vec<_> = param_tys - .into_iter() - .zip(args.iter()) + let casted_args: Vec<_> = iter::zip(param_tys, args) .enumerate() .map(|(i, (expected_ty, &actual_val))| { let actual_ty = self.val_ty(actual_val); |
