Change treatment of zero-length filemaps #26816
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? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
|
|
||
| if parser.token == token::Eof && parser.span == codemap::DUMMY_SP { | ||
| parser.span = codemap::mk_sp(end_pos, end_pos); | ||
| } |
There was a problem hiding this comment.
Isn't this redundant? The Eof token should never be associated with a dummy span, given the change to advance_token().
There was a problem hiding this comment.
This still holds sometimes where the file is empty.
There was a problem hiding this comment.
You mean, the condition can hold in the case where codemap::DUMMY_SP is legitimately the end of the first file? In that case, the code still doesn't do anything, because the new position is still equal to codemap::DUMMY_SP.
|
@pnkfelix review ping |
|
@nrc looks good to me r=me when you are done addressing comments |
So if a filemap's last byte is at position n in the codemap, then n+1 will not refer to any filemap, and the next filemap will begin an n+2. This is useful for empty files, it means that every file (even empty ones) has a byte in the codemap. Closes rust-lang#23301, rust-lang#26504
This basically only affects modules which are empty (or only contain comments). Closes rust-lang#26755
|
📌 Commit f47d20a has been approved by |
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.
See commits for details