Various coercion cleanups #139582

oli-obk · 2025-04-09T13:22:50Z

I think the commit order is the most reasonable one, but there's probably more ways to get to the same goal.

Essentially I got rid of the simple and identity helpers by adding a dedicated function for the common identity case and getting rid of the callbacks alltogether by realizing that all callbacks were of the pattern "use this fixed prefix list of adjustments, then add another adjustment with the unified type as the target type".

No behavioral changes intended

rustbot · 2025-04-09T13:22:55Z

r? @fee1-dead

rustbot has assigned @fee1-dead.
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

oli-obk · 2025-04-09T13:23:02Z

@bors try @rust-timer queue

Various coercion cleanups I think the commit order is the most reasonable one, but there's probably more ways to get to the same goal. Essentially I got rid of the `simple` and `identity` helpers by adding a dedicated function for the common `identity` case and getting rid of the callbacks alltogether by realizing that all callbacks were of the pattern "use this fixed prefix list of adjustments, then add another adjustment with the unified type as the target type". No behavioral changes intended

bors · 2025-04-09T13:24:15Z

⌛ Trying commit 3528a65 with merge 40110c0...

bors · 2025-04-09T15:34:30Z

☀️ Try build successful - checks-actions
Build commit: 40110c0 (40110c0d5339c1590f2b5ab0bca8a6682b0909a4)

compiler-errors

LGTM. r=me when perf.

rust-timer · 2025-04-09T17:29:24Z

Finished benchmarking commit (40110c0): comparison URL.

Overall result: ❌ regressions - please read the text below

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.5%	[0.4%, 1.2%]	14
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 6.2%, secondary 1.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	6.2%	[6.2%, 6.2%]	1
Regressions ❌ (secondary)	1.9%	[0.9%, 4.5%]	10
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-7.9%	[-7.9%, -7.9%]	1
All ❌✅ (primary)	6.2%	[6.2%, 6.2%]	1

Cycles

Results (secondary 0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.6%	[-2.6%, -2.6%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 779.721s -> 779.516s (-0.03%)
Artifact size: 366.13 MiB -> 366.10 MiB (-0.01%)

oli-obk · 2025-04-10T07:20:23Z

The extra heap allocation caused by push was not ideal 😆

@bors try @rust-timer queue

Various coercion cleanups I think the commit order is the most reasonable one, but there's probably more ways to get to the same goal. Essentially I got rid of the `simple` and `identity` helpers by adding a dedicated function for the common `identity` case and getting rid of the callbacks alltogether by realizing that all callbacks were of the pattern "use this fixed prefix list of adjustments, then add another adjustment with the unified type as the target type". No behavioral changes intended

bors · 2025-04-10T07:21:35Z

⌛ Trying commit 673012f with merge 269623e...

bors · 2025-04-10T09:28:21Z

☀️ Try build successful - checks-actions
Build commit: 269623e (269623e84a16b53d8cb42aa8b577552e9a64f527)

rust-timer · 2025-04-10T12:40:06Z

Finished benchmarking commit (269623e): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -2.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (secondary 1.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	1.3%	[1.3%, 1.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 780.636s -> 780.068s (-0.07%)
Artifact size: 366.13 MiB -> 366.17 MiB (0.01%)

oli-obk · 2025-04-10T12:42:05Z

@bors r=compiler-errors rollup

(diff to reviewed code is using arrays and APIT impl Iterator instead of eagerly constructing vecs to which we'll push)

bors · 2025-04-10T12:42:08Z

📌 Commit 673012f has been approved by compiler-errors

It is now in the queue for this repository.

oli-obk · 2025-04-10T12:43:40Z

Ah no forgot I had another commit locally to clean things up

@rustbot ready

@bors r-

compiler-errors · 2025-04-13T16:30:47Z

@bors r+

bors · 2025-04-13T16:30:50Z

📌 Commit f80b121 has been approved by compiler-errors

It is now in the queue for this repository.

…ler-errors Various coercion cleanups I think the commit order is the most reasonable one, but there's probably more ways to get to the same goal. Essentially I got rid of the `simple` and `identity` helpers by adding a dedicated function for the common `identity` case and getting rid of the callbacks alltogether by realizing that all callbacks were of the pattern "use this fixed prefix list of adjustments, then add another adjustment with the unified type as the target type". No behavioral changes intended

…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

…ler-errors Various coercion cleanups I think the commit order is the most reasonable one, but there's probably more ways to get to the same goal. Essentially I got rid of the `simple` and `identity` helpers by adding a dedicated function for the common `identity` case and getting rid of the callbacks alltogether by realizing that all callbacks were of the pattern "use this fixed prefix list of adjustments, then add another adjustment with the unified type as the target type". No behavioral changes intended

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#139582 - oli-obk:coercion-cleanups, r=compiler-errors Various coercion cleanups I think the commit order is the most reasonable one, but there's probably more ways to get to the same goal. Essentially I got rid of the `simple` and `identity` helpers by adding a dedicated function for the common `identity` case and getting rid of the callbacks alltogether by realizing that all callbacks were of the pattern "use this fixed prefix list of adjustments, then add another adjustment with the unified type as the target type". No behavioral changes intended

oli-obk added 5 commits April 9, 2025 12:45

Handle UnsafePointer coercions in one place

f20efc4

Simplify some unify_and calls

697768a

Rename unify to unify_raw

804b6c9

Add a dedicated function for the common unify_and(identity) case

34258d6

Deduplicate target type setting in unify_and callbacks

3528a65

rustbot assigned fee1-dead Apr 9, 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 9, 2025

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 9, 2025

This comment has been minimized.

Sign in to view

compiler-errors approved these changes Apr 9, 2025

View reviewed changes

compiler-errors assigned compiler-errors and unassigned fee1-dead Apr 9, 2025

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Apr 9, 2025

Some performance shenanigans

673012f

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 10, 2025

Avoid some more duplication

f80b121

This comment has been minimized.

Sign in to view

rustbot removed S-waiting-on-perf Status: Waiting on a perf run to be completed. perf-regression Performance regression. labels Apr 10, 2025

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 10, 2025

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 10, 2025

compiler-errors approved these changes Apr 13, 2025

View reviewed changes

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label 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 cd09162 into rust-lang:master Apr 14, 2025
6 checks passed

rustbot added this to the 1.88.0 milestone Apr 14, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various coercion cleanups #139582

Various coercion cleanups #139582

oli-obk commented Apr 9, 2025

rustbot commented Apr 9, 2025

oli-obk commented Apr 9, 2025

This comment has been minimized.

bors commented Apr 9, 2025

bors commented Apr 9, 2025

This comment has been minimized.

compiler-errors left a comment

rust-timer commented Apr 9, 2025

oli-obk commented Apr 10, 2025

This comment has been minimized.

bors commented Apr 10, 2025

bors commented Apr 10, 2025

This comment has been minimized.

rust-timer commented Apr 10, 2025

oli-obk commented Apr 10, 2025

bors commented Apr 10, 2025

oli-obk commented Apr 10, 2025 •

edited

Loading

compiler-errors commented Apr 13, 2025

bors commented Apr 13, 2025

Various coercion cleanups #139582

Various coercion cleanups #139582

Conversation

oli-obk commented Apr 9, 2025

rustbot commented Apr 9, 2025

oli-obk commented Apr 9, 2025

This comment has been minimized.

bors commented Apr 9, 2025

bors commented Apr 9, 2025

This comment has been minimized.

compiler-errors left a comment

Choose a reason for hiding this comment

rust-timer commented Apr 9, 2025

Overall result: ❌ regressions - please read the text below

oli-obk commented Apr 10, 2025

This comment has been minimized.

bors commented Apr 10, 2025

bors commented Apr 10, 2025

This comment has been minimized.

rust-timer commented Apr 10, 2025

Overall result: no relevant changes - no action needed

oli-obk commented Apr 10, 2025

bors commented Apr 10, 2025

oli-obk commented Apr 10, 2025 • edited Loading

compiler-errors commented Apr 13, 2025

bors commented Apr 13, 2025

oli-obk commented Apr 10, 2025 •

edited

Loading