Rework how the disallowed qualifier in function type diagnostics are generated #142302
Conversation
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
rustbot
added
S-waiting-on-review
JonathanBrouwer
changed the title
JonathanBrouwer
changed the title
JonathanBrouwer
changed the title
Signed-off-by: Jonathan Brouwer <[email protected]>
JonathanBrouwer
force-pushed
the
invalid-const-token
branch
from
43f3afd to
dc49bef
Compare
| LL + pub type W1 = unsafe fn(); | ||
| | | ||
|
|
||
| error: expected one of `extern` or `fn`, found keyword `const` |
There was a problem hiding this comment.
these two errors in some sense say a very similar thing, so I feel like ideally they're not emitted separately and as one diagnostic that explains both problems
There was a problem hiding this comment.
though that might be a separate issue
There was a problem hiding this comment.
Would you just want the "expected one of extern or fn, found keyword const" to go, and only have the "an fn pointer type cannot be const"?
That should be relatively easy to do
There was a problem hiding this comment.
The latter, with a "allowed keywords are ...."
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
Reminder, once the PR becomes ready for a review, use |
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.
This pull request fixes two independent issues:
unsafe const fn()type #142268, which is an issue created by Trim extra whitespace in fn ptr suggestion span #133151. This is fixed by moving the check intoparse_fn_front_matter, where better span information is available to generate the right suggestions.cargo fixcrashes because "cannot replace slice of data that was already replaced". This is fixed by not generating a suggestion for the "wrong order" diagnostic if the "disallowed qualifier" diagnostic is triggered.There is a commit with failing tests so the test diff is clearer
r? @jdonszelmann