Allow multiple candidates with same response in new solver#107863
Merged
bors merged 1 commit intorust-lang:masterfrom Feb 10, 2023
Merged
Allow multiple candidates with same response in new solver#107863bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
|
r? @Nilstrieb (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Collaborator
|
These commits modify the If this was intentional then you can ignore this comment. Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor |
Contributor
Author
|
r? @lcnr |
compiler-errors
commented
Feb 10, 2023
| if candidates.len() > 1 { | ||
| // If there are *STILL* multiple candidates that have *different* response | ||
| // results, give up and report ambiguity. | ||
| if candidates.len() > 1 && !candidates.iter().map(|cand| cand.result).all_equal() { |
Contributor
Author
There was a problem hiding this comment.
I guess we could also take the intersection of the candidates' certainty... but if they're not all Certainty::Yes then we already return ambiguous, so I think this has the same effect.
Member
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 10, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#107043 (Support `true` and `false` as boolean flag params) - rust-lang#107831 (Query refactoring) - rust-lang#107841 (Handled snap curl issue inside Rust) - rust-lang#107852 (rustdoc: remove unused fn parameter `tab`) - rust-lang#107861 (Sync release notes for 1.67.1) - rust-lang#107863 (Allow multiple candidates with same response in new solver) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Contributor
|
@bors rollup |
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
6 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.
Treat >1 candidates as not ambiguous if they return the same response.