refactor rustc_hir_typeck/src/op.rs#154223

malezjaa · 2026-03-22T19:27:27Z

This is a refactoring PR with no logic or behaviour changes. I tried to improve readability of op.rs, which had a few very large functions using some suboptimal syntax. I broke these up into smaller helpers.

rustbot · 2026-03-22T19:27:31Z

r? @adwinwhite

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

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler
compiler expanded to 69 candidates
Random selection from 13 candidates

Kivooeo · 2026-03-22T23:50:19Z

This is a fairly large PR -- could you help reviewers by adding some context to the description? It would be great to have a summary of what was changed, the key decisions made and the reasoning behind them, and ideally a breakdown into separate commits to make it easier to review piece by piece.

malezjaa · 2026-03-23T15:25:19Z

Updated the description. There weren't really any key decisions to make since this is a refactor with no behaviour changes. As for separate commits, splitting style changes after the fact would be tedious and I'm not sure it would add much value for reviewers.

adwinwhite · 2026-04-05T01:39:38Z

@malezjaa I'm really sorry that I didn't get to this quickly. Thank you for trying to clean this up.
This change is still very desirable. I will do the review in a timely manner if you're still willing to working on it. That said, if you don't want to continue with this PR, that's completely okay.

malezjaa · 2026-04-05T07:53:15Z

I am also sorry for closing this so quickly. I’ll try to resolve these merge conflicts as soon as I can.

rustbot · 2026-04-05T10:25:45Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

adwinwhite · 2026-04-06T05:01:48Z

@rustbot author

rustbot · 2026-04-06T05:01:52Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

malezjaa · 2026-04-07T13:35:53Z

@rustbot ready

adwinwhite · 2026-04-08T01:15:36Z

Did you forget to push?

malezjaa · 2026-04-08T04:54:50Z

Sorry for the confusion 😅, but the only change I made after reopening was the rebase to fix merge conflicts. I also updated the PR description a while back when it was requested. Is there something I should be pushing? I don't see any review comments.

adwinwhite · 2026-04-08T11:33:49Z

~~That's strange. I did leave several inline comments~~
Sorry, I forgot to press the submit button

Kivooeo · 2026-04-08T11:35:18Z

one of possibilities is that you didn't pressed "submit review" green button or whatever it called

compiler/rustc_hir_typeck/src/op.rs

malezjaa · 2026-04-08T14:17:56Z

I'll squash the commits after review

malezjaa · 2026-04-08T14:18:54Z

@rustbot ready

adwinwhite · 2026-04-09T02:59:47Z

r=me after squashing

@bors delegate+

rust-bors · 2026-04-09T02:59:51Z

✌️ @malezjaa, you can now approve this pull request!

If @adwinwhite told you to "r=me" after making some further change, then please make that change and post @bors r=adwinwhite.

malezjaa · 2026-04-09T08:28:23Z

@bors r=adwinwhite

rust-bors · 2026-04-09T08:28:27Z

📌 Commit 118edea has been approved by adwinwhite

It is now in the queue for this repository.

rust-bors · 2026-04-09T13:25:45Z

☀️ Test successful - CI
Approved by: adwinwhite
Duration: 3h 13m 32s
Pushing 4c42051 to main...

github-actions · 2026-04-09T13:29:19Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 1948ee1 (parent) -> 4c42051 (this PR)

Test differences

Show 3 test diffs

3 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 4c4205163abcbd08948b3efab796c543ba1ea687 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

dist-aarch64-linux: 2h 29m -> 1h 46m (-28.4%)
dist-android: 27m 40s -> 22m 2s (-20.4%)
i686-gnu-2: 1h 44m -> 1h 26m (-17.0%)
i686-gnu-nopt-1: 2h 19m -> 1h 55m (-16.7%)
x86_64-rust-for-linux: 52m 42s -> 45m 5s (-14.4%)
dist-apple-various: 1h 42m -> 1h 56m (+13.5%)
test-various: 2h 6m -> 1h 50m (-12.9%)
aarch64-apple: 3h 27m -> 3h (-12.6%)
armhf-gnu: 1h 29m -> 1h 18m (-11.7%)
x86_64-gnu-tools: 1h 3m -> 57m 2s (-10.6%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

hkBst · 2026-04-09T13:44:59Z

compiler/rustc_hir_typeck/src/op.rs

                        self.apply_adjustments(lhs_expr, vec![autoref]);
                    }
-                }
-                if by_ref_binop {


View changes since the review

This condition seems to have been lost.

Oh, I merged it with the above if without thinking. I'll open a follow up pr. Sorry about that.

No problem. I'm surprised though that this was not caught by a test; although I'm not really sure what the effect of this is either...

rust-timer · 2026-04-09T14:07:17Z

Finished benchmarking commit (4c42051): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary 3.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Cycles

Results (primary 2.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 490.984s -> 489.441s (-0.31%)
Artifact size: 395.64 MiB -> 395.61 MiB (-0.01%)

@hkBst

…adwinwhite Fix if branch in op.rs I removed the if guard without thinking in rust-lang#154223. Really sorry about this. r? @hkBst

@hkBst

…adwinwhite Fix if branch in op.rs I removed the if guard without thinking in rust-lang#154223. Really sorry about this. r? @hkBst

rustbot assigned adwinwhite Mar 22, 2026

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 Mar 22, 2026

This comment has been minimized.

Sign in to view

malezjaa force-pushed the refactor-typecheck-op branch from 60bad65 to f803f56 Compare March 22, 2026 19:53

This comment has been minimized.

Sign in to view

malezjaa closed this Apr 4, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 4, 2026

malezjaa deleted the refactor-typecheck-op branch April 5, 2026 07:49

malezjaa restored the refactor-typecheck-op branch April 5, 2026 07:49

malezjaa reopened this Apr 5, 2026

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

malezjaa force-pushed the refactor-typecheck-op branch from f803f56 to 572d1dc Compare April 5, 2026 10:25

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 6, 2026

rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 6, 2026

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 7, 2026

adwinwhite requested changes Apr 8, 2026

View reviewed changes

compiler/rustc_hir_typeck/src/op.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_typeck/src/op.rs Show resolved Hide resolved

compiler/rustc_hir_typeck/src/op.rs Show resolved Hide resolved

compiler/rustc_hir_typeck/src/op.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 8, 2026

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 8, 2026

refactor rustc_hir_typeck/src/op.rs

118edea

malezjaa force-pushed the refactor-typecheck-op branch from 85f5b8a to 118edea Compare April 9, 2026 08:27

rust-bors bot 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 9, 2026

This comment has been minimized.

Sign in to view

rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 9, 2026

rust-bors bot merged commit 4c42051 into rust-lang:main Apr 9, 2026
12 checks passed

rustbot added this to the 1.96.0 milestone Apr 9, 2026

hkBst reviewed Apr 9, 2026

View reviewed changes

malezjaa mentioned this pull request Apr 9, 2026

Fix if branch in op.rs #155043

Open

Uh oh!

Conversation

malezjaa commented Mar 22, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Mar 22, 2026

Uh oh!

This comment has been minimized.

Kivooeo commented Mar 22, 2026

Uh oh!

malezjaa commented Mar 23, 2026

Uh oh!

This comment has been minimized.

adwinwhite commented Apr 5, 2026

Uh oh!

malezjaa commented Apr 5, 2026

Uh oh!

rustbot commented Apr 5, 2026

Uh oh!

adwinwhite commented Apr 6, 2026

Uh oh!

rustbot commented Apr 6, 2026

Uh oh!

malezjaa commented Apr 7, 2026

Uh oh!

adwinwhite commented Apr 8, 2026

Uh oh!

malezjaa commented Apr 8, 2026

Uh oh!

adwinwhite commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kivooeo commented Apr 8, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

malezjaa commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

malezjaa commented Apr 8, 2026

Uh oh!

adwinwhite commented Apr 9, 2026

Uh oh!

rust-bors bot commented Apr 9, 2026

Uh oh!

malezjaa commented Apr 9, 2026

Uh oh!

rust-bors bot commented Apr 9, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Apr 9, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 9, 2026

Test differences

Job duration changes

Uh oh!

hkBst Apr 9, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

malezjaa Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

hkBst Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

rust-timer commented Apr 9, 2026

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

malezjaa commented Mar 22, 2026 •

edited by rustbot

Loading

adwinwhite commented Apr 8, 2026 •

edited

Loading

malezjaa commented Apr 8, 2026 •

edited

Loading

hkBst Apr 9, 2026 •

edited by rustbot

Loading