Skip to content

-Znext-solver Propagate stalled_on_coroutines as a field in Certainty::Maybe#155648

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
ShoyuVanilla:maybe-stalled-on-couroutines
Apr 29, 2026
Merged

-Znext-solver Propagate stalled_on_coroutines as a field in Certainty::Maybe#155648
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
ShoyuVanilla:maybe-stalled-on-couroutines

Conversation

@ShoyuVanilla
Copy link
Copy Markdown
Member

@ShoyuVanilla ShoyuVanilla commented Apr 22, 2026

View all comments

..instead of collecting them with a ProofTreeVisitor

Fixes rust-lang/trait-system-refactor-initiative#270

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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 Apr 22, 2026
@ShoyuVanilla
Copy link
Copy Markdown
Member Author

r? lcnr
I guess you're back? 😅

@ShoyuVanilla ShoyuVanilla marked this pull request as ready for review April 27, 2026 04:41
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 27, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 27, 2026

Some changes occurred to the core trait solver

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

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 27, 2026
@lcnr
Copy link
Copy Markdown
Contributor

lcnr commented Apr 27, 2026

let's see

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 27, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Apr 27, 2026
…<try>

`-Znext-solver` Propagate `stalled_on_coroutines` as a field in `Certainty::Maybe`
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 27, 2026

☀️ Try build successful (CI)
Build commit: 383ff9d (383ff9dd818595378514a935e4e5429ab8b3d2cd, parent: 4933094f25ba1edf2de0a203665976832fc85bc9)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (383ff9d): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking means the PR may be perf-sensitive. Consider adding rollup=never if this change is not fit for rolling up.

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

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

Results (secondary 5.7%)

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

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

Cycles

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

Binary size

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

Bootstrap: 488.817s -> 488.152s (-0.14%)
Artifact size: 393.48 MiB -> 393.48 MiB (-0.00%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 27, 2026
Comment thread compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs Outdated
@ShoyuVanilla ShoyuVanilla force-pushed the maybe-stalled-on-couroutines branch from 3dd7f0f to 58572ce Compare April 27, 2026 13:27
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 27, 2026

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot

This comment has been minimized.

@ShoyuVanilla ShoyuVanilla force-pushed the maybe-stalled-on-couroutines branch from 58572ce to 97868eb Compare April 27, 2026 13:29
@ShoyuVanilla
Copy link
Copy Markdown
Member Author

Oh, sorry. I accidently pushed cargo submodule 😢

Comment thread compiler/rustc_next_trait_solver/src/solve/normalizes_to/mod.rs Outdated
Comment thread compiler/rustc_next_trait_solver/src/solve/mod.rs Outdated
@ShoyuVanilla ShoyuVanilla force-pushed the maybe-stalled-on-couroutines branch from 97868eb to 7ba46ec Compare April 27, 2026 14:32
Comment thread compiler/rustc_next_trait_solver/src/solve/assembly/mod.rs Outdated
Comment thread compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs Outdated
Comment thread compiler/rustc_next_trait_solver/src/solve/mod.rs Outdated
@ShoyuVanilla ShoyuVanilla force-pushed the maybe-stalled-on-couroutines branch 2 times, most recently from 1d8941d to b29d6e9 Compare April 27, 2026 16:13
Comment on lines +161 to +165
self.evaluate_added_goals_and_make_canonical_response(Certainty::Maybe(MaybeInfo {
cause: MaybeCause::Ambiguity,
opaque_types_jank: OpaqueTypesJank::AllGood,
})
stalled_on_coroutines: StalledOnCoroutines::No,
}))
Copy link
Copy Markdown
Contributor

@lcnr lcnr Apr 28, 2026

Choose a reason for hiding this comment

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

Suggested change
self.evaluate_added_goals_and_make_canonical_response(Certainty::Maybe(MaybeInfo {
cause: MaybeCause::Ambiguity,
opaque_types_jank: OpaqueTypesJank::AllGood,
})
stalled_on_coroutines: StalledOnCoroutines::No,
}))
self.evaluate_added_goals_and_make_canonical_response(Certainty::AMBIGUOUS)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Oh, I missed this 😅

Copy link
Copy Markdown
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

r=me after nit :heart

View changes since this review

@ShoyuVanilla ShoyuVanilla force-pushed the maybe-stalled-on-couroutines branch from b29d6e9 to 25c241c Compare April 28, 2026 17:28
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 28, 2026

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.

@ShoyuVanilla
Copy link
Copy Markdown
Member Author

@bors r=lcnr

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 28, 2026

📌 Commit 25c241c 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 Apr 28, 2026
rust-bors Bot pushed a commit that referenced this pull request Apr 29, 2026
Rollup of 6 pull requests

Successful merges:

 - #152443 (NVPTX: Drop support for old architectures and old ISAs)
 - #155648 (`-Znext-solver` Propagate `stalled_on_coroutines` as a field in `Certainty::Maybe`)
 - #155896 (Shrink `ParseSess`)
 - #155922 (delete unused auxiliary test files)
 - #155943 (fix: ✏️ forgot to change the stable version for `assert_matches!` macro.)
 - #155947 (tests: mark simple UI tests as check-pass)
@rust-bors rust-bors Bot merged commit dce5b97 into rust-lang:main Apr 29, 2026
11 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 29, 2026
rust-timer added a commit that referenced this pull request Apr 29, 2026
Rollup merge of #155648 - ShoyuVanilla:maybe-stalled-on-couroutines, r=lcnr

`-Znext-solver` Propagate `stalled_on_coroutines` as a field in `Certainty::Maybe`

..instead of collecting them with a `ProofTreeVisitor`

Fixes rust-lang/trait-system-refactor-initiative#270
@ShoyuVanilla ShoyuVanilla deleted the maybe-stalled-on-couroutines branch April 29, 2026 08:19
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. 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.

StalledOnCoroutine doesn't detect coroutine for deeply nested goals

4 participants