-
Notifications
You must be signed in to change notification settings - Fork 12.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Sort the errors from arguments checking so that suggestions are handled properly #112762
Merged
bors
merged 2 commits into
rust-lang:master
from
chenyukang:yukang-fix-112507-argument-checking
Jun 20, 2023
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
pub enum Value { | ||
Float(Option<f64>), | ||
} | ||
|
||
fn main() { | ||
let _a = Value::Float( //~ ERROR this enum variant takes 1 argument but 4 arguments were supplied | ||
0, | ||
None, | ||
None, | ||
0, | ||
); | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
error[E0061]: this enum variant takes 1 argument but 4 arguments were supplied | ||
--> $DIR/issue-112507.rs:6:14 | ||
| | ||
LL | let _a = Value::Float( | ||
| ^^^^^^^^^^^^ | ||
LL | 0, | ||
| - unexpected argument of type `{integer}` | ||
LL | None, | ||
LL | None, | ||
| ---- unexpected argument of type `Option<_>` | ||
LL | 0, | ||
| - unexpected argument of type `{integer}` | ||
| | ||
note: tuple variant defined here | ||
--> $DIR/issue-112507.rs:2:5 | ||
| | ||
LL | Float(Option<f64>), | ||
| ^^^^^ | ||
help: remove the extra arguments | ||
| | ||
LL ~ , | ||
LL ~ None); | ||
| | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0061`. |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you could probably just derive
Ord
onError
and just use.sort()
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we need to customize
PartialOrd
forError
and I think only ordering onMissing
andExtra
is enough(which will involve adding or removing arguments).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it hurts to just totally sort the list. I think right now the sort implementation is not actually valid because it returns Equal for other elements 😅
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, I just validated with some playground code, it won't sort in some cases, let me fix it 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But actually, this implementation is enough, because it makes sure the consecutive
Extra
andMissing
ordered 😆, which is the scenario that makes sub-suggestions buggy.Anyway, let's make it all ordered.