Don't call query_normalize when reporting similar impls
#113005
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
|
r? @cjgillot (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
cjgillot
reviewed
Jun 25, 2023
cjgillot
reviewed
Jun 25, 2023
| normalized_impl_candidates_and_similarities.sort(); | ||
| normalized_impl_candidates_and_similarities.dedup(); | ||
| let mut impl_candidates = impl_candidates.to_vec(); | ||
| impl_candidates.sort_by_key(|cand| (cand.similarity, cand.trait_ref)); |
There was a problem hiding this comment.
Is this useful? report sorts everything again.
There was a problem hiding this comment.
Removed the sort in report -- that should fix the weird rendering and also actually make this sort meaningful. It does have a lot of fallout, but the changes are either neutral or slightly better suggestions.
|
Great! |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 8, 2023
…ze, r=cjgillot
Don't call `query_normalize` when reporting similar impls
Firstly, It's sketchy to be using `query_normalize` at all during HIR typeck -- it's asking for an ICE 😅. Secondly, we're normalizing an impl trait ref that potentially has parameter types in `ty::ParamEnv::empty()`, which is kinda sketchy as well.
The only UI test change from removing this normalization is that we don't evaluate anonymous constants in impls, which end up giving us really ugly suggestions:
```
error[E0277]: the trait bound `[X; 35]: Default` is not satisfied
--> /home/gh-compiler-errors/test.rs:4:5
|
4 | <[X; 35] as Default>::default();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Default` is not implemented for `[X; 35]`
|
= help: the following other types implement trait `Default`:
&[T]
&mut [T]
[T; 32]
[T; core::::array::{impl#30}::{constant#0}]
[T; core::::array::{impl#31}::{constant#0}]
[T; core::::array::{impl#32}::{constant#0}]
[T; core::::array::{impl#33}::{constant#0}]
[T; core::::array::{impl#34}::{constant#0}]
and 27 others
```
So just fold the impls with a `BottomUpFolder` that calls `ty::Const::eval`. This doesn't work totally correctly with generic-const-exprs, but it's fine for stable code, and this is error reporting after all.
This was referenced Jul 8, 2023
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 8, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#113005 (Don't call `query_normalize` when reporting similar impls) - rust-lang#113064 (std: edit [T]::swap docs) - rust-lang#113138 (Add release notes for 1.71.0) - rust-lang#113217 (resolve typerelative ctors to adt) - rust-lang#113254 (Use consistent formatting in Readme) - rust-lang#113482 (Migrate GUI colors test to original CSS color format) 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.
Firstly, It's sketchy to be using
query_normalizeat all during HIR typeck -- it's asking for an ICE 😅. Secondly, we're normalizing an impl trait ref that potentially has parameter types inty::ParamEnv::empty(), which is kinda sketchy as well.The only UI test change from removing this normalization is that we don't evaluate anonymous constants in impls, which end up giving us really ugly suggestions:
So just fold the impls with a
BottomUpFolderthat callsty::Const::eval. This doesn't work totally correctly with generic-const-exprs, but it's fine for stable code, and this is error reporting after all.