Skip to content

Commit 88811ee

Browse files
Rollup merge of rust-lang#156636 - Human9000-bit:mir-transform-ref, r=Kivooeo
minor `rustc_mir_transform` cleanup Some minor things I noticed here and there while reading though code
2 parents f45339e + 053761d commit 88811ee

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

compiler/rustc_mir_transform/src/inline.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,8 +1072,7 @@ fn make_call_args<'tcx, I: Inliner<'tcx>>(
10721072
//
10731073
// and the vector is `[closure_ref, tmp0, tmp1, tmp2]`.
10741074
if callsite.fn_sig.abi() == ExternAbi::RustCall && callee_body.spread_arg.is_none() {
1075-
// FIXME(edition_2024): switch back to a normal method call.
1076-
let mut args = <_>::into_iter(args);
1075+
let mut args = args.into_iter();
10771076
let self_ = create_temp_if_necessary(
10781077
inliner,
10791078
args.next().unwrap().node,

compiler/rustc_mir_transform/src/pass_manager.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,15 +296,14 @@ fn run_passes_inner<'tcx>(
296296

297297
if is_optimization_stage(body, phase_change, optimizations)
298298
&& let Some(limit) = &tcx.sess.opts.unstable_opts.mir_opt_bisect_limit
299-
{
300-
if limited_by_opt_bisect(
299+
&& limited_by_opt_bisect(
301300
tcx,
302301
tcx.def_path_debug_str(body.source.def_id()),
303302
*limit,
304303
*pass,
305-
) {
306-
continue;
307-
}
304+
)
305+
{
306+
continue;
308307
}
309308

310309
let dumper = if pass.is_mir_dump_enabled()

0 commit comments

Comments
 (0)