Highlight parts of fn in type errors #66682
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? @davidtwco (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
Nice! |
When a type error arises between two fn items, fn pointers or tuples, highlight only the differing parts of each.
estebank
force-pushed
the
fn-type-err
branch
from
b48ec30
to
d92355c
Compare
Centril
reviewed
Nov 24, 2019
| values.0.push_normal(", ".to_string()); | ||
| } | ||
| values.0.push("...".to_string(), !sig2.c_variadic); | ||
| } |
There was a problem hiding this comment.
Seems like a lot of things are repeated twice in this method; could we try to rewrite things so that it isn't repeated by computing the diffs first and then doing all the logic for a single case?
| values | ||
| } | ||
|
|
||
| (ty::FnPtr(sig1), ty::FnDef(did2, substs2)) => { |
There was a problem hiding this comment.
btw, this method is some 325+ LOC... would be good to split it up
Centril
reviewed
Nov 24, 2019
estebank
force-pushed
the
fn-type-err
branch
from
c2b1ed3
to
9d7774c
Compare
|
@bors r=davidtwco @davidtwco @Centril, I will make a follow up PR to split out |
|
📌 Commit 9d7774c has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Nov 25, 2019
Highlight parts of fn in type errors When a type error arises between two fn items, fn pointers or tuples, highlight only the differing parts of each. Examples: <img width="699" alt="" src="https://user-images.githubusercontent.com/1606434/69487597-ab561600-0e11-11ea-9b4e-d4fd9e91d5dc.png"> <img width="528" alt="" src="https://user-images.githubusercontent.com/1606434/69487207-9033d800-0e0a-11ea-93e3-8c4d002411a5.png"> <img width="468" alt="" src="https://user-images.githubusercontent.com/1606434/69487208-9033d800-0e0a-11ea-92e3-2b2cee120335.png"> <img width="775" alt="" src="https://user-images.githubusercontent.com/1606434/69487209-9033d800-0e0a-11ea-9e68-7f6ed5c8cb08.png">
|
☀️ Test successful - checks-azure |
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.
When a type error arises between two fn items, fn pointers or tuples,
highlight only the differing parts of each.
Examples: