In `rustc_mir_transform`, iterate over index newtypes instead of ints #139674

yotamofek · 2025-04-11T14:28:26Z

Just makes code more idiomatic/easier to read, IMHO.
Also, some drive-by simplifications and cleanups.

rustbot · 2025-04-11T14:28:31Z

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-04-11T14:28:34Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler-errors · 2025-04-11T15:54:34Z

compiler/rustc_mir_transform/src/coroutine.rs

@@ -1339,13 +1333,10 @@ fn create_coroutine_resume_function<'tcx>(

    make_coroutine_state_argument_indirect(tcx, body);

-    match transform.coroutine_kind {


Change this back to a match and make it exhaustive, please.

!matches IMO makes it much easier to forget adding a variant in the future.

Like this? It can be be even more exhaustive (i.e. on Movability and CoroutineSource)

This is good enough

compiler/rustc_mir_transform/src/coroutine.rs

compiler-errors · 2025-04-11T15:55:30Z

compiler/rustc_mir_transform/src/coroutine.rs

@@ -1057,7 +1057,7 @@ fn insert_switch<'tcx>(
    let blocks = body.basic_blocks_mut().iter_mut();

    for target in blocks.flat_map(|b| b.terminator_mut().successors_mut()) {


can this be changed into a count?

This loops over a bunch of BasicBlocks and increments each one, so something like *target += blocks.flat_map(..).count() would mean something completely different.
Unless I misunderstood you?

Oh, I'm blind, lol. I thought we were incrementing a counter, not incrementing a per-bb index.

compiler-errors · 2025-04-13T16:26:01Z

@bors r+ rollup

bors · 2025-04-13T16:26:04Z

📌 Commit c36e8fc has been approved by compiler-errors

It is now in the queue for this repository.

…terators, r=compiler-errors In `rustc_mir_transform`, iterate over index newtypes instead of ints Just makes code more idiomatic/easier to read, IMHO. Also, some drive-by simplifications and cleanups.

…enton Rollup of 12 pull requests Successful merges: - rust-lang#138744 (Add methods to TCP and UDP sockets to modify hop limit (refresh of rust-lang#94678)) - rust-lang#138962 (Expect an array when expected and acutal types are both arrays during cast) - rust-lang#139001 (add `naked_functions_rustic_abi` feature gate) - rust-lang#139379 (Use delayed bug for normalization errors in drop elaboration) - rust-lang#139582 (Various coercion cleanups) - rust-lang#139628 (Suggest remove redundant `$()?` around `vis`) - rust-lang#139644 (Micro-optimize `InstSimplify`'s `simplify_primitive_clone`) - rust-lang#139666 (cleanup `mir_borrowck`) - rust-lang#139674 (In `rustc_mir_transform`, iterate over index newtypes instead of ints) - rust-lang#139695 (compiletest: consistently use `camino::{Utf8Path,Utf8PathBuf}` throughout) - rust-lang#139722 (Move some things to rustc_type_ir) - rust-lang#139740 (Convert `tests/ui/lint/dead-code/self-assign.rs` to a known-bug test) r? `@ghost` `@rustbot` modify labels: rollup

…terators, r=compiler-errors In `rustc_mir_transform`, iterate over index newtypes instead of ints Just makes code more idiomatic/easier to read, IMHO. Also, some drive-by simplifications and cleanups.

Rollup of 11 pull requests Successful merges: - rust-lang#137043 (Initial `UnsafePinned` implementation [Part 1: Libs]) - rust-lang#138962 (Expect an array when expected and acutal types are both arrays during cast) - rust-lang#139001 (add `naked_functions_rustic_abi` feature gate) - rust-lang#139379 (Use delayed bug for normalization errors in drop elaboration) - rust-lang#139582 (Various coercion cleanups) - rust-lang#139628 (Suggest remove redundant `$()?` around `vis`) - rust-lang#139644 (Micro-optimize `InstSimplify`'s `simplify_primitive_clone`) - rust-lang#139671 (Proc macro span API redesign: Replace proc_macro::SourceFile by Span::{file, local_file}) - rust-lang#139674 (In `rustc_mir_transform`, iterate over index newtypes instead of ints) - rust-lang#139740 (Convert `tests/ui/lint/dead-code/self-assign.rs` to a known-bug test) - rust-lang#139741 (fix smir's run! doc and import) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 10 pull requests Successful merges: - rust-lang#137043 (Initial `UnsafePinned` implementation [Part 1: Libs]) - rust-lang#138962 (Expect an array when expected and acutal types are both arrays during cast) - rust-lang#139001 (add `naked_functions_rustic_abi` feature gate) - rust-lang#139379 (Use delayed bug for normalization errors in drop elaboration) - rust-lang#139582 (Various coercion cleanups) - rust-lang#139628 (Suggest remove redundant `$()?` around `vis`) - rust-lang#139644 (Micro-optimize `InstSimplify`'s `simplify_primitive_clone`) - rust-lang#139674 (In `rustc_mir_transform`, iterate over index newtypes instead of ints) - rust-lang#139740 (Convert `tests/ui/lint/dead-code/self-assign.rs` to a known-bug test) - rust-lang#139741 (fix smir's run! doc and import) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#139674 - yotamofek:pr/mir_transform/index-iterators, r=compiler-errors In `rustc_mir_transform`, iterate over index newtypes instead of ints Just makes code more idiomatic/easier to read, IMHO. Also, some drive-by simplifications and cleanups.

…li-obk Use `newtype_index!`-generated types more idiomatically Continuation of sorts of rust-lang#139674 Shouldn't affect anything, just makes some code simpler

Rollup merge of rust-lang#139811 - yotamofek:pr/newtype_cleanups, r=oli-obk Use `newtype_index!`-generated types more idiomatically Continuation of sorts of rust-lang#139674 Shouldn't affect anything, just makes some code simpler

rustbot assigned jieyouxu Apr 11, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 11, 2025

oli-obk changed the title ~~In rustc_mir_tranform, iterator over index newtypes instead of ints~~ In rustc_mir_transform, iterator over index newtypes instead of ints Apr 11, 2025

This comment was marked as resolved.

Sign in to view

rustbot assigned nnethercote and unassigned jieyouxu Apr 11, 2025

yotamofek changed the title ~~In rustc_mir_transform, iterator over index newtypes instead of ints~~ In rustc_mir_transform, iterate over index newtypes instead of ints Apr 11, 2025

compiler-errors requested changes Apr 11, 2025

View reviewed changes

compiler-errors assigned compiler-errors and unassigned nnethercote Apr 11, 2025

In rustc_mir_tranform, iterate over index newtypes instead of ints

c36e8fc

yotamofek force-pushed the pr/mir_transform/index-iterators branch from 197dcb5 to c36e8fc Compare April 12, 2025 11:54

compiler-errors approved these changes Apr 13, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 13, 2025

ChrisDenton mentioned this pull request Apr 13, 2025

Rollup of 13 pull requests #139754

Closed

ChrisDenton mentioned this pull request Apr 13, 2025

Rollup of 12 pull requests #139755

Closed

jhpratt mentioned this pull request Apr 13, 2025

Rollup of 11 pull requests #139761

Closed

jhpratt mentioned this pull request Apr 13, 2025

Rollup of 10 pull requests #139766

Merged

bors merged commit 1b6fcd9 into rust-lang:master Apr 14, 2025
6 checks passed

rustbot added this to the 1.88.0 milestone Apr 14, 2025

yotamofek mentioned this pull request Apr 14, 2025

Use newtype_index!-generated types more idiomatically #139811

Merged

yotamofek deleted the pr/mir_transform/index-iterators branch April 14, 2025 16:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

In `rustc_mir_transform`, iterate over index newtypes instead of ints #139674

In `rustc_mir_transform`, iterate over index newtypes instead of ints #139674

yotamofek commented Apr 11, 2025

rustbot commented Apr 11, 2025

rustbot commented Apr 11, 2025

This comment was marked as resolved.

compiler-errors Apr 11, 2025

yotamofek Apr 12, 2025

compiler-errors Apr 13, 2025

compiler-errors Apr 11, 2025

yotamofek Apr 12, 2025

compiler-errors Apr 13, 2025

compiler-errors commented Apr 13, 2025

bors commented Apr 13, 2025

		@@ -1339,13 +1333,10 @@ fn create_coroutine_resume_function<'tcx>(

		make_coroutine_state_argument_indirect(tcx, body);

		match transform.coroutine_kind {

		@@ -1057,7 +1057,7 @@ fn insert_switch<'tcx>(
		let blocks = body.basic_blocks_mut().iter_mut();

		for target in blocks.flat_map(\|b\| b.terminator_mut().successors_mut()) {

In rustc_mir_transform, iterate over index newtypes instead of ints #139674

In rustc_mir_transform, iterate over index newtypes instead of ints #139674

Conversation

yotamofek commented Apr 11, 2025

rustbot commented Apr 11, 2025

rustbot commented Apr 11, 2025

This comment was marked as resolved.

compiler-errors Apr 11, 2025

Choose a reason for hiding this comment

yotamofek Apr 12, 2025

Choose a reason for hiding this comment

compiler-errors Apr 13, 2025

Choose a reason for hiding this comment

compiler-errors Apr 11, 2025

Choose a reason for hiding this comment

yotamofek Apr 12, 2025

Choose a reason for hiding this comment

compiler-errors Apr 13, 2025

Choose a reason for hiding this comment

compiler-errors commented Apr 13, 2025

bors commented Apr 13, 2025

In `rustc_mir_transform`, iterate over index newtypes instead of ints #139674

In `rustc_mir_transform`, iterate over index newtypes instead of ints #139674