recurse into refs when comparing tys for diagnostics#118730
Merged
bors merged 1 commit intorust-lang:masterfrom Dec 9, 2023
Merged
recurse into refs when comparing tys for diagnostics#118730bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
|
r? @b-naber (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Member
Author
|
note that the decision of whether to fully elide the type as rust/compiler/rustc_infer/src/infer/error_reporting/mod.rs Lines 1510 to 1512 in eb53721 |
estebank
reviewed
Dec 8, 2023
Comment on lines
+405
to
+406
| = note: expected reference `&Foo<_, B>` | ||
| found struct `Foo<_, A>` |
Contributor
There was a problem hiding this comment.
Oh! Interesting that we have a likely improvement here!
estebank
reviewed
Dec 8, 2023
| @@ -4,8 +4,8 @@ error[E0308]: mismatched types | |||
| LL | debug_assert_eq!(iter.next(), Some(value)); | |||
| | ^^^^^^^^^^^ expected `Option<<I as Iterator>::Item>`, found `Option<&<I as Iterator>::Item>` | |||
Contributor
There was a problem hiding this comment.
It seems like maybe we should use the expected/found ones now instead for the label, as they end up being significantly shorter.
compiler-errors
approved these changes
Dec 8, 2023
Comment on lines
+12
to
+13
| = note: expected reference `&_` | ||
| found type parameter `_` |
Contributor
There was a problem hiding this comment.
I wish we didn't use _ as a placeholder here, but whatever. This is still pretty helpful.
Contributor
Collaborator
bors
added
S-waiting-on-bors
Contributor
|
@bors r=estebank,compiler-errors |
Collaborator
|
💡 This pull request was already approved, no need to approve it again.
|
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 8, 2023
…er-errors recurse into refs when comparing tys for diagnostics before:  after:  this diff from the test suite is also quite nice imo: ```diff `@@` -4,8 +4,8 `@@` error[E0308]: mismatched types LL | debug_assert_eq!(iter.next(), Some(value)); | ^^^^^^^^^^^ expected `Option<<I as Iterator>::Item>`, found `Option<&<I as Iterator>::Item>` | - = note: expected enum `Option<<I as Iterator>::Item>` - found enum `Option<&<I as Iterator>::Item>` + = note: expected enum `Option<_>` + found enum `Option<&_>` ```
Contributor
|
Future work: highlight the relevant part of trait objects and impl Traits. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 8, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#117586 (Uplift the (new solver) canonicalizer into `rustc_next_trait_solver`) - rust-lang#118692 (remove redundant imports) - rust-lang#118694 (Add instance evaluation and methods to read an allocation in StableMIR) - rust-lang#118715 (privacy: visit trait def id of projections) - rust-lang#118730 (recurse into refs when comparing tys for diagnostics) - rust-lang#118736 (temporarily revert "ice on ambguity in mir typeck") r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 9, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#117586 (Uplift the (new solver) canonicalizer into `rustc_next_trait_solver`) - rust-lang#118502 (fix: correct the arg for 'suggest to use associated function syntax' diagnostic) - rust-lang#118694 (Add instance evaluation and methods to read an allocation in StableMIR) - rust-lang#118715 (privacy: visit trait def id of projections) - rust-lang#118730 (recurse into refs when comparing tys for diagnostics) - rust-lang#118736 (temporarily revert "ice on ambguity in mir typeck") r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 9, 2023
Rollup merge of rust-lang#118730 - jyn514:cmp_refs, r=estebank,compiler-errors recurse into refs when comparing tys for diagnostics before:  after:  this diff from the test suite is also quite nice imo: ```diff `@@` -4,8 +4,8 `@@` error[E0308]: mismatched types LL | debug_assert_eq!(iter.next(), Some(value)); | ^^^^^^^^^^^ expected `Option<<I as Iterator>::Item>`, found `Option<&<I as Iterator>::Item>` | - = note: expected enum `Option<<I as Iterator>::Item>` - found enum `Option<&<I as Iterator>::Item>` + = note: expected enum `Option<_>` + found enum `Option<&_>` ```
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.
before:
after:
this diff from the test suite is also quite nice imo: