Skip to content

internal: update next-solver to 0.166 - #22939

Merged
ChayimFriedman2 merged 1 commit into
rust-lang:masterfrom
ada4a:push-kmnplvwwunpy
Jul 28, 2026
Merged

internal: update next-solver to 0.166#22939
ChayimFriedman2 merged 1 commit into
rust-lang:masterfrom
ada4a:push-kmnplvwwunpy

Conversation

@ada4a

@ada4a ada4a commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

A small PR to see if I'm doing things right.

This update seems to consist of just rust-lang/rust#156246, which changes Interner::for_each_{blanket,relevant}_impl to be able to early-return, using the VisitorResult type. My adaptation mostly involved:

  • Replacing calls to .for_each with for-loops, to allow early-returning (.try_for_each unfortunately doesn't work, as VisitorResult isn't Try)
  • Copying the ret! macro introduced in the upstream PR. Upstream only needs it in one place, while we need it in four, so I put it into next_solver/util.rs.

cc @ChayimFriedman2

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2026
@ada4a
ada4a force-pushed the push-kmnplvwwunpy branch from 1985bbd to a3f0bcf Compare July 28, 2026 15:00
@ChayimFriedman2
ChayimFriedman2 self-requested a review July 28, 2026 16:09

@ChayimFriedman2 ChayimFriedman2 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you deliberately didn't upgrade to the last version, to keep it small?

Thanks!

View changes since this review

@ChayimFriedman2
ChayimFriedman2 added this pull request to the merge queue Jul 28, 2026
@ada4a

ada4a commented Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

I guess you deliberately didn't upgrade to the last version, to keep it small?

That, but also because of the fact that, if I were to jump across multiple versions, I'd like to have a commit per version, but then I wouldn't be able to link the relevant PRs, because rustbot would complain...

@ChayimFriedman2

Copy link
Copy Markdown
Contributor

You absolutely can put links in commit messages, you just need them to be full (rust-lang/rust#number or https://github.com/rust-lang/rust/issue/number).

Merged via the queue into rust-lang:master with commit 3cba187 Jul 28, 2026
18 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2026
@ada4a
ada4a deleted the push-kmnplvwwunpy branch July 28, 2026 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants