Don't consider candidates with no failing where clauses when refining obligation causes in new solver#124771
Merged
bors merged 1 commit intorust-lang:masterfrom May 6, 2024
Merged
Conversation
Collaborator
|
Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor |
compiler-errors
commented
May 5, 2024
| let candidates = goal.candidates(); | ||
| if candidates.len() > 1 { | ||
| candidates.retain(|candidate| { | ||
| goal.infcx().probe(|_| { |
Contributor
Author
There was a problem hiding this comment.
Kind of a shame we have to do this in a probe, but if we don't, then the instantiated nested goals from different candidates will affect eachother, causing weirdness and ICEs.
Luckily, we do this only when there's >1 candidate.
We could, perhaps, first filter out candidates with no GoalSource::ImplWhereBound | GoalSource::InstantiateHigherRanked without even instantiating them, and only instantiate them if necessary.
Also, I guess we should have both the source and the certainty in the proof tree without instantiating -- we just need to expose it, perhaps?
lcnr
reviewed
May 6, 2024
Contributor
lcnr
left a comment
There was a problem hiding this comment.
can you move this into a separate function fn non_trivial_candidates or sth 🤔 r=me after that
014ae81 to
4e3350d
Compare
Contributor
Author
|
@bors r=lcnr |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 6, 2024
… r=lcnr Don't consider candidates with no failing where clauses when refining obligation causes in new solver Improves error messages when we have param-env candidates that don't deeply unify (i.e. after alias-bounds). r? lcnr
Collaborator
Collaborator
Collaborator
|
💔 Test failed - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 6, 2024
…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#124520 (Document that `create_dir_all` calls `mkdir`/`CreateDirW` multiple times) - rust-lang#124724 (Prefer lower vtable candidates in select in new solver) - rust-lang#124771 (Don't consider candidates with no failing where clauses when refining obligation causes in new solver) - rust-lang#124808 (Use `super_fold` in `RegionsToStatic` visitor) r? `@ghost` `@rustbot` modify labels: rollup
Contributor
|
@bors retry |
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 6, 2024
Rollup merge of rust-lang#124771 - compiler-errors:cand-has-failing-wc, r=lcnr Don't consider candidates with no failing where clauses when refining obligation causes in new solver Improves error messages when we have param-env candidates that don't deeply unify (i.e. after alias-bounds). r? lcnr
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Improves error messages when we have param-env candidates that don't deeply unify (i.e. after alias-bounds).
r? lcnr