Skip to content

Trim GoalStalledOn::Certainty - #160886

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
nnethercote:GoalStalledOn-stalled_maybe_info
Aug 12, 2026
Merged

Trim GoalStalledOn::Certainty#160886
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
nnethercote:GoalStalledOn-stalled_maybe_info

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

It's always Certainty::Maybe, so we can trim it down to just the MaybeInfo that is within Certainty::Maybe.

r? @lcnr

@rustbot

rustbot commented Aug 11, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@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 Aug 11, 2026
Comment thread compiler/rustc_trait_selection/src/solve/fulfill.rs Outdated
Comment thread compiler/rustc_next_trait_solver/src/solve/eval_ctxt/fast_path.rs Outdated

@lcnr lcnr 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.

thanks ❤️

two nits

View changes since this review

@nnethercote
nnethercote force-pushed the GoalStalledOn-stalled_maybe_info branch from 7c7cbc5 to 9d667f0 Compare August 11, 2026 10:40
@rustbot

This comment has been minimized.

@nnethercote

Copy link
Copy Markdown
Contributor Author

This now removed a check on the ultra-hot fast path in try_evaluate_obligations, so let's measure perf:

@bors try @rust-timer queue

@rust-timer

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rust-bors

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 11, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 11, 2026
… r=<try>

Trim `GoalStalledOn::Certainty`
@rust-bors

rust-bors Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 13539ad (13539ad8cb00a3cab3224d69421ca88a66e8d921)
Base parent: f76a50b (f76a50bb82442dd7208c08a27e2ed258d1f10310)

@rust-timer

Copy link
Copy Markdown
Collaborator

Queued 13539ad with parent f76a50b, future comparison URL.
There are currently 0 preceding artifacts in the queue.
It will probably take at least ~1.0 hours until the benchmark run finishes.

@nnethercote

Copy link
Copy Markdown
Contributor Author

For some reason the perf result comment wasn't posted, so here it is: comparison URL.

Basically perf-neutral, so:

@bors rollup

@lcnr: ready for r+?

@rust-bors

This comment has been minimized.

It's always `Certainty::Maybe`, so we can trim it down to just the
`MaybeInfo` that is within `Certainty::Maybe`. And then the same change
can be made to the field of `RerunStalled::WontMakeProgress`, and
`goal_remains_stalled` can return a bool, and a hot `matches!` in
`try_evaluate_obligations` that never failed can be removed.
@nnethercote
nnethercote force-pushed the GoalStalledOn-stalled_maybe_info branch from 9d667f0 to 7fe7add Compare August 11, 2026 23:25
@rustbot

rustbot commented Aug 11, 2026

Copy link
Copy Markdown
Collaborator

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.

@nnethercote

Copy link
Copy Markdown
Contributor Author

I rebased.

@lcnr

lcnr commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@rust-bors

rust-bors Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 7fe7add has been approved by lcnr

It is now in the queue for this repository.

@rust-bors 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 Aug 12, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 12, 2026
…uwer

Rollup of 6 pull requests

Successful merges:

 - #160966 (bootstrap: Avoid some unnecessary imports from the crate root)
 - #159987 (trait solver: Track canonical response universe assumptions)
 - #160886 (Trim `GoalStalledOn::Certainty`)
 - #160925 (Add `TypeId::is_signed` method)
 - #160926 (sve: add addl. passing test for field projection)
 - #160977 (Remove `MutatingUseContext::Retag`)
@rust-bors
rust-bors Bot merged commit 0724271 into rust-lang:main Aug 12, 2026
13 checks passed
@rustbot rustbot added this to the 1.99.0 milestone Aug 12, 2026
rust-timer added a commit that referenced this pull request Aug 12, 2026
Rollup merge of #160886 - nnethercote:GoalStalledOn-stalled_maybe_info, r=lcnr

Trim `GoalStalledOn::Certainty`

It's always `Certainty::Maybe`, so we can trim it down to just the `MaybeInfo` that is within `Certainty::Maybe`.

r? @lcnr
@nnethercote
nnethercote deleted the GoalStalledOn-stalled_maybe_info branch August 12, 2026 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-perf Status: Waiting on a perf run to be completed. 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)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants