compiletest: Add LineNumber newtype to avoid +1 magic here and there
#150205
+52
−15
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
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
rustbot
added
A-compiletest
Collaborator
3 tasks
rustbot
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
Enselic
force-pushed
the
line-no
branch
2 times, most recently
from
5a015a9 to
334900c
Compare
Enselic
changed the title
LineNo newtype to avoid +1 magic here and thereLineNumber newtype to avoid +1 magic here and there
This comment has been minimized.
This comment has been minimized.
Start small. If it works well we can increase usage bit by bit as time passes. Note that we keep using "0" to represent "no specific line" because changing to `Option<LineNumber>` everywhere is much bigger and noisier change. That can be done later if wanted.
Member
Author
|
I've done some additional verification and code cleanup and am happy with how this works and looks. Ready for review! |
This comment was marked as off-topic.
This comment was marked as off-topic.
rustbot
added
S-waiting-on-review
jieyouxu
approved these changes
Dec 23, 2025
Member
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
Zalathar
reviewed
Dec 23, 2025
Comment on lines
+8
to
+19
| /// Create a LineNumber from a zero-based line index. I.e. if `zero_based` | ||
| /// is `0` it means "the first line". | ||
| pub(crate) fn from_zero_based(zero_based: usize) -> Self { | ||
| // Ensure to panic on overflow. | ||
| LineNumber(zero_based.strict_add(1)) | ||
| } | ||
|
|
||
| pub(crate) fn from_one_based(one_based: usize) -> LineNumber { | ||
| // You can't pass zero here. Use .none() for "no specific line". | ||
| assert!(one_based > 0); | ||
| LineNumber(one_based) | ||
| } |
Member
There was a problem hiding this comment.
These constructors seem overly complicated and unnecessary to me.
From what I can tell, every call site would be made much simpler by just calling a single LineNumber::enumerate(..) method that always starts from 1.
Member
|
Good point re. the constructors. |
bors
added
S-waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
Start small. If it works well we can increase usage bit by bit as time passes.
My main motivation for doing this is to get rid of the
+ 1I otherwise have to add in #150201 on this line:But I think this is a nice general improvement by itself.
Note that we keep using "0" to represent "no specific line" because changing to
Option<LineNumber>everywhere is a very noisy and significant change. That can be changed later if wanted, but let's not do it now.