Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ProvenVia for global where clauses #138797

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

compiler-errors
Copy link
Member

When we're merging one (or more) global where clauses in the presence of no other candidates, ensure that we return TraitGoalProvenVia::ParamEnv so that rigid projections work correctly. This fixes some tests with feature(trivial_bounds).

@rustbot
Copy link
Collaborator

rustbot commented Mar 21, 2025

r? @BoxyUwU

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

@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 Mar 21, 2025
@compiler-errors
Copy link
Member Author

r? lcnr

@rustbot rustbot assigned lcnr and unassigned BoxyUwU Mar 21, 2025
Comment on lines +1297 to +1298
|| (candidates.len() > 0
&& candidates.iter().all(|c| matches!(c.source, CandidateSource::ParamEnv(_))))
Copy link
Contributor

@lcnr lcnr Mar 26, 2025

Choose a reason for hiding this comment

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

While correct, I feel like this complicates the controlflow and is a bit confusing to me. I think I'd prefer to instead add the following the "merge all candidates" success branch

let proven_via = if candidates.iter().all(|c| matches!(c.source, CandidateSource::ParamEnv(_)) { TraitGoalProvenVia::ParamEnv } else { TraitGoalProvenVia::Misc };

with that, r=me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants