diff options
| author | bors <bors@rust-lang.org> | 2024-09-14 16:18:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-14 16:18:12 +0000 |
| commit | 5fe0e40e05f2d0408c6a292b160f96d595aedfbc (patch) | |
| tree | ec012b7fe5ec3a55d979f5f8ce97a3dbdad94d41 /compiler/rustc_mir_transform/src/deduplicate_blocks.rs | |
| parent | e7386b361dda8c2222bee7a1ae79faba7e9a0351 (diff) | |
| parent | 2b40fdbb28009e8f23f34169c6f5579a037eaec5 (diff) | |
| download | rust-5fe0e40e05f2d0408c6a292b160f96d595aedfbc.tar.gz rust-5fe0e40e05f2d0408c6a292b160f96d595aedfbc.zip | |
Auto merge of #130357 - fmease:rollup-j3ej4q0, r=fmease
Rollup of 6 pull requests Successful merges: - #130017 (coverage: Extract `executor::block_on` from several async coverage tests) - #130268 (simd_shuffle: require index argument to be a vector) - #130290 (Stabilize entry_insert) - #130294 (Lifetime cleanups) - #130343 (docs: Enable required feature for 'closure_returning_async_block' lint) - #130349 (Fix `Parser::break_up_float`'s right span) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/deduplicate_blocks.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/deduplicate_blocks.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/deduplicate_blocks.rs b/compiler/rustc_mir_transform/src/deduplicate_blocks.rs index ad204e76d0d..26b28c8c487 100644 --- a/compiler/rustc_mir_transform/src/deduplicate_blocks.rs +++ b/compiler/rustc_mir_transform/src/deduplicate_blocks.rs @@ -98,7 +98,7 @@ fn find_duplicates(body: &Body<'_>) -> FxHashMap<BasicBlock, BasicBlock> { duplicates } -struct BasicBlockHashable<'tcx, 'a> { +struct BasicBlockHashable<'a, 'tcx> { basic_block_data: &'a BasicBlockData<'tcx>, } |