Don't unsize coerce infer vars in select in new solver #114199
Merged
Conversation
This file contains 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
rustbot
added
S-waiting-on-review
|
Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor |
lcnr
reviewed
Jul 31, 2023
Comment on lines
230
to
233
| // Don't try to coerce `?0` to `dyn Trait` | ||
| if a_ty.is_ty_var() || b_ty.is_ty_var() { | ||
| return Ok(None); | ||
| } |
There was a problem hiding this comment.
why not move this into the match on kind() 🤔
compiler-errors
force-pushed
the
dont-select-unsize-infer
branch
from
2e0ab4a
to
669bbe3
Compare
|
☔ The latest upstream changes (presumably #114308) made this pull request unmergeable. Please resolve the merge conflicts. |
rust-cloud-vms
bot
force-pushed
the
dont-select-unsize-infer
branch
from
669bbe3
to
d21a335
Compare
|
@bors r=lcnr rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 2, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#114178 (Account for macros when suggesting a new let binding) - rust-lang#114199 (Don't unsize coerce infer vars in select in new solver) - rust-lang#114301 (Don't check unnecessarily that impl trait is RPIT) - rust-lang#114314 (Tweaks to `adt_sized_constraint`) - rust-lang#114322 (Fix invalid slice coercion suggestion reported in turbofish) - rust-lang#114340 ([rustc_attr][nit] Replace `filter` + `is_some` with `map_or`.) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Otherwise we're too eagerly preferring the
T -> dyn Traitbranch during coercion.r? @lcnr