diff options
| author | bors <bors@rust-lang.org> | 2023-08-06 23:44:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-06 23:44:08 +0000 |
| commit | 72c6b8d36fa27207fb66b2d8386ad959aa10e6bb (patch) | |
| tree | ecb9dc8ed83023517c3384c9d6e8326acab2556e /compiler/rustc_codegen_llvm/src | |
| parent | f3623871cfa0763c95ebd6ceafaa6dc2e44ca68f (diff) | |
| parent | f44f0279fa46ca1b4e71c9b15791377fda93c655 (diff) | |
| download | rust-72c6b8d36fa27207fb66b2d8386ad959aa10e6bb.tar.gz rust-72c6b8d36fa27207fb66b2d8386ad959aa10e6bb.zip | |
Auto merge of #114565 - matthiaskrgr:rollup-p7cjs3m, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #114535 (bump schannel, miow to drop windows-sys 0.42) - #114542 (interpret: use ConstPropNonsense for more const-prop induced issues) - #114543 (add tests for some fixed ConstProp ICEs) - #114550 (Generate better function argument names in global_allocator expansion) - #114556 (Issue numbers are enforced on active features; remove FIXME) - #114558 (Remove FIXME about NLL diagnostic that is already improved) Failed merges: - #114485 (Add trait decls to SMIR) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/allocator.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/allocator.rs b/compiler/rustc_codegen_llvm/src/allocator.rs index ca123334fca..8bb93025c45 100644 --- a/compiler/rustc_codegen_llvm/src/allocator.rs +++ b/compiler/rustc_codegen_llvm/src/allocator.rs @@ -34,8 +34,8 @@ pub(crate) unsafe fn codegen( if kind == AllocatorKind::Default { for method in ALLOCATOR_METHODS { let mut args = Vec::with_capacity(method.inputs.len()); - for ty in method.inputs.iter() { - match *ty { + for input in method.inputs.iter() { + match input.ty { AllocatorTy::Layout => { args.push(usize); // size args.push(usize); // align |