Replace magic numbers with constants in CollationSpecialPrimaries deserialization#8083
Merged
Merged
Conversation
Member
Author
|
This seems like a good change because it makes the code on main a little bit more parallel with the code on 2.1/2.2 |
sffc
requested review from
Manishearth and
robertbastian
and removed request for
echeran and
hsivonen
Manishearth
approved these changes
Jun 16, 2026
…eserialization Defines NUM_PRIMARIES and COMPRESSIBLE_BYTES_LEN constants on CollationSpecialPrimaries and uses them in the custom Deserialize implementation to avoid magic numbers, making the deserialization logic self-documenting. Co-authored-by: Gemini <176961590+gemini-code-assist[bot]@users.noreply.github.com>
sffc
force-pushed
the
cleanup-collator-constants-main
branch
from
04bd62f to
95d5f95
Compare
Manishearth
approved these changes
Jun 16, 2026
Comment on lines
642
to
+644
| // `variant_count` isn't stable yet: | ||
| // https://github.com/rust-lang/rust/issues/73662 | ||
| .split_at_checked(MaxVariable::Currency as usize + 1) | ||
| .split_at_checked(CollationSpecialPrimaries::NUM_PRIMARIES) |
Member
There was a problem hiding this comment.
issue: the "variant_count isn't stable yet" comment should be moved to the constant. it would also make more sense for the constant to live on MaxVariable, and be called something like VARIANT_COUNT, or fn variant_count().
| #[cfg(feature = "serde")] | ||
| impl CollationSpecialPrimaries<'_> { | ||
| /// The number of real special primaries (Space, Punctuation, Symbol, Currency). | ||
| pub(crate) const NUM_PRIMARIES: usize = MaxVariable::Currency as usize + 1; // 4 |
Member
There was a problem hiding this comment.
I'd be happier with this way of variant counting if this lived next to the enum
Comment on lines
+618
to
+619
| /// The length of the compressible bytes array (256 bits packed in 16 u16s). | ||
| pub(crate) const COMPRESSIBLE_BYTES_LEN: usize = 16; |
Member
There was a problem hiding this comment.
Suggested change
| /// The length of the compressible bytes array (256 bits packed in 16 u16s). | |
| pub(crate) const COMPRESSIBLE_BYTES_LEN: usize = 16; | |
| /// The length of the compressible bytes array (256 bits packed in `u16`s). | |
| pub(crate) const COMPRESSIBLE_BYTES_LEN: usize = 256 / u16::BITS; |
Member
There was a problem hiding this comment.
that said, the / u16::BITS could also be moved to the use site, with this just being 256, the number of bytes that are compressible, without worrying about how they are packed
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
3 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.
See #8075
Defines
NUM_PRIMARIESandCOMPRESSIBLE_BYTES_LENconstants onCollationSpecialPrimariesand uses them in the customDeserializeimplementation to avoid magic numbers, making the deserialization logic self-documenting.This addresses reviewer feedback regarding magic numbers in the collation data handling.
🤖 This pull request was created by an AI agent working with @sffc.
Changelog
CollationSpecialPrimariesdeserialization.