Skip to content

-Znext-solver Remove the forced ambiguity hack from search graph#149904

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
ShoyuVanilla:ns-remove-sg-hack
Feb 17, 2026
Merged

-Znext-solver Remove the forced ambiguity hack from search graph#149904
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
ShoyuVanilla:ns-remove-sg-hack

Conversation

@ShoyuVanilla
Copy link
Member

@rustbot 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Dec 12, 2025
@lcnr
Copy link
Contributor

lcnr commented Dec 16, 2025

integrated this in #133502, want to check whether this causes any significant hangs, so going to mark this as blocked for now

@rustbot blocked

@rustbot rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 16, 2025
@lcnr lcnr added the T-types Relevant to the types team, which will review and decide on the PR/issue. label Feb 6, 2026
@lcnr
Copy link
Contributor

lcnr commented Feb 6, 2026

This PR removes a performance optimization which seems like it is no longer necessary, as we no longer have any affected tests.

This performance regression was originally added during the stabilization of -Znext-solver=coherence in #128828 to avoid hangs in fuchsia. The minimization of that hang no longer does, even after removing this optimization.

The optimization does incorrectly force goals to be ambiguous, breaking binius_field see rust-lang/trait-system-refactor-initiative#257. Given that undesirable behavior and the fact that it doesn't seem necessary anymore, I propose removing this optimization, accepting the fact that it may theoretically cause yet unknown hangs in coherence.

In this case we do cause hangs, we can then find a different solution and potentially temporarily revert this change again. I did not immediately see any concerning regressions in the crater run with -Znext-solver=globally with this change, but think we should spend some time looking over the crater run during the FCP here. See https://rust-lang.zulipchat.com/#narrow/channel/364551-t-types.2Ftrait-system-refactor/topic/help.20looking.20for.20hangs.20on.20crater/with/572360464

@rfcbot fcp merge types

@rust-rfcbot
Copy link
Collaborator

rust-rfcbot commented Feb 6, 2026

Team member @lcnr has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@rust-rfcbot rust-rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Feb 6, 2026
@rust-rfcbot
Copy link
Collaborator

🔔 This is now entering its final comment period, as per the review above. 🔔

@rust-rfcbot rust-rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. to-announce Announce this issue on triage meeting and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Feb 17, 2026
@rust-rfcbot
Copy link
Collaborator

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

@lcnr
Copy link
Contributor

lcnr commented Feb 17, 2026

@bors r+ rollup=never

@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 17, 2026

📋 This PR cannot be approved because it currently has the following label: S-blocked.

@lcnr lcnr removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Feb 17, 2026
@lcnr
Copy link
Contributor

lcnr commented Feb 17, 2026

@bors r+

@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 17, 2026

📌 Commit 9e63845 has been approved by lcnr

It is now in the queue for this repository.

@rust-bors rust-bors bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 17, 2026
jdonszelmann added a commit to jdonszelmann/rust that referenced this pull request Feb 17, 2026
…lcnr

`-Znext-solver` Remove the forced ambiguity hack from search graph

As discussed in rust-lang/trait-system-refactor-initiative#257

r? lcnr
rust-bors bot pushed a commit that referenced this pull request Feb 17, 2026
Rollup of 6 pull requests

Successful merges:

 - #152609 (Install LLVM DLL in the right place on Windows)
 - #149904 (`-Znext-solver` Remove the forced ambiguity hack from search graph)
 - #152704 (Remove `QueryCtxt` and trait `HasDepContext`)
 - #152746 (remove `#![allow(stable_features)]` from most tests)
 - #152675 (Improve `VaList` stdlib docs)
 - #152748 (Update `sysinfo` version to `0.38.2`)
@rust-bors rust-bors bot merged commit c108ad5 into rust-lang:main Feb 17, 2026
11 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Feb 17, 2026
rust-timer added a commit that referenced this pull request Feb 17, 2026
Rollup merge of #149904 - ShoyuVanilla:ns-remove-sg-hack, r=lcnr

`-Znext-solver` Remove the forced ambiguity hack from search graph

As discussed in rust-lang/trait-system-refactor-initiative#257

r? lcnr
@ShoyuVanilla ShoyuVanilla deleted the ns-remove-sg-hack branch February 17, 2026 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. finished-final-comment-period The final comment period is finished for this PR / Issue. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-types Relevant to the types team, which will review and decide on the PR/issue. to-announce Announce this issue on triage meeting WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Comments