Make trait/impl where clause mismatch on region error a bit more actionable#106208
Merged
bors merged 3 commits intorust-lang:masterfrom Dec 29, 2022
Merged
Make trait/impl where clause mismatch on region error a bit more actionable#106208bors merged 3 commits intorust-lang:masterfrom
where clause mismatch on region error a bit more actionable#106208bors merged 3 commits intorust-lang:masterfrom
Conversation
Collaborator
|
r? @estebank (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
compiler-errors
commented
Dec 28, 2022
src/test/ui/generic-associated-types/missing-where-clause-on-trait.stderr
Outdated
Show resolved
Hide resolved
compiler-errors
commented
Dec 28, 2022
src/test/ui/generic-associated-types/mismatched-where-clause-regions.stderr
Outdated
Show resolved
Hide resolved
Collaborator
|
☔ The latest upstream changes (presumably #106129) made this pull request unmergeable. Please resolve the merge conflicts. |
estebank
reviewed
Dec 28, 2022
estebank
reviewed
Dec 28, 2022
estebank
reviewed
Dec 28, 2022
Contributor
There was a problem hiding this comment.
you have a few unwraps that I'd be more comfortable turning to else { return; };s if possible, but don't care that much either way (it protects users from weird ICEs in the face of broken invariants, but we would still want to know about them, right?)
estebank
reviewed
Dec 28, 2022
Contributor
There was a problem hiding this comment.
Regarding your concern with spaces:
There are two things we could do: change generics.where_clause_span to include the previous spaces, or get the whole item instead of just the generics and do ty.span.to(where_clause_span) to include the space.
estebank
approved these changes
Dec 28, 2022
Contributor
estebank
left a comment
estebank
left a comment
There was a problem hiding this comment.
r=me with whatever nitpicks you want to address
compiler-errors
force-pushed
the
compare-item-region-err
branch
from
c649d7e to
358b871
Compare
compiler-errors
force-pushed
the
compare-item-region-err
branch
from
358b871 to
6e794dc
Compare
Contributor
Author
|
@bors r=estebank |
Collaborator
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 29, 2022
…n-err, r=estebank Make trait/impl `where` clause mismatch on region error a bit more actionable Improve `where` clause suggestions for GATs/methods that have incompatible region predicates in their `where` clauses. Also addresses this diagnostic that went away rust-lang#106129 (comment)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 29, 2022
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#106208 (Make trait/impl `where` clause mismatch on region error a bit more actionable) - rust-lang#106216 (Powershell: Use `WaitForExit` instead of `-Wait`) - rust-lang#106217 (rustdoc: remove unnecessary `.tooltip::after { text-align: center }`) - rust-lang#106218 (Migrate css var scraped examples) - rust-lang#106221 (Rename `Rptr` to `Ref` in AST and HIR) - rust-lang#106223 (On unsized locals with explicit types suggest `&`) - rust-lang#106225 (Remove CraftSpider from review rotation) - rust-lang#106229 (update Miri) - rust-lang#106242 (Detect diff markers in the parser) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Aaron1011
pushed a commit
to Aaron1011/rust
that referenced
this pull request
Jan 6, 2023
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#106208 (Make trait/impl `where` clause mismatch on region error a bit more actionable) - rust-lang#106216 (Powershell: Use `WaitForExit` instead of `-Wait`) - rust-lang#106217 (rustdoc: remove unnecessary `.tooltip::after { text-align: center }`) - rust-lang#106218 (Migrate css var scraped examples) - rust-lang#106221 (Rename `Rptr` to `Ref` in AST and HIR) - rust-lang#106223 (On unsized locals with explicit types suggest `&`) - rust-lang#106225 (Remove CraftSpider from review rotation) - rust-lang#106229 (update Miri) - rust-lang#106242 (Detect diff markers in the parser) Failed merges: r? `@ghost` `@rustbot` modify labels: 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
4 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.
Improve
whereclause suggestions for GATs/methods that have incompatible region predicates in theirwhereclauses.Also addresses this diagnostic that went away #106129 (comment)