refactor: add move check_align to parse_alignment#153189
Open
JayanAXHF wants to merge 1 commit intorust-lang:mainfrom
Open
refactor: add move check_align to parse_alignment#153189JayanAXHF wants to merge 1 commit intorust-lang:mainfrom
check_align to parse_alignment#153189JayanAXHF wants to merge 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
Some changes occurred in compiler/rustc_attr_parsing |
rustbot
added
A-attributes
JayanAXHF
added
C-cleanup
JonathanBrouwer
requested changes
Feb 27, 2026
| let max = Size::from_bits(cx.sess.target.pointer_width).signed_int_max() as u64; | ||
| // lit must be < 2^29 | ||
| let lit_u64 = literal.get().try_into().map_err(|_| "alignment larger than 2^29")?; | ||
| let align = Align::from_bytes(lit_u64).map_err(|_| "alignment larger than 2^29")?; |
Contributor
There was a problem hiding this comment.
Could you change this code back to how it was with the and_then so that the error message isn't duplicated?
| return Err("not a power of two"); | ||
| } | ||
| // alignment must not be larger than the pointer width (`isize::MAX`) | ||
| let max = Size::from_bits(cx.sess.target.pointer_width).signed_int_max() as u64; |
Contributor
There was a problem hiding this comment.
nit: Could you put this variable next to if statement where it is used?
| let lit_u64 = literal.get().try_into().map_err(|_| "alignment larger than 2^29")?; | ||
| let align = Align::from_bytes(lit_u64).map_err(|_| "alignment larger than 2^29")?; | ||
| if align.bytes() > max { | ||
| return Err("alignment larger than pointer width: {max}"); |
Contributor
There was a problem hiding this comment.
This is not how formatting works, you need to make this a format string :P
Member
Author
There was a problem hiding this comment.
ohhh how did that get though :3
Member
Author
There was a problem hiding this comment.
Turns out, since this needs to return a &'static str, i can't include the max in the error message
Contributor
There was a problem hiding this comment.
Returning a String is also fine :) I don't think this needs to return a 'static str, that's just what it happens to atm
Member
Author
There was a problem hiding this comment.
I think it needs the &'static str because session_diagnostics::InvalidAlignmentValue<'a> takes an &'a str. I could probably change that since it isn't used in many other places
Note: maybe a Cow<'static, str> would be better?
Contributor
There was a problem hiding this comment.
You can also just make that take a String :)
These are diagnostics so performance is not significant, just do what is easiest
| } | ||
| } | ||
|
|
||
| fn parse_alignment(node: &LitKind) -> Result<Align, &'static str> { |
Contributor
There was a problem hiding this comment.
You should just be able to remove the old check_align function, and do nothing in the place where it is called
rustbot
added
S-waiting-on-author
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Part of #153101
r? @JonathanBrouwer
PS: jonathan i'm not sure about what to do with
check_alignnow