Repository navigation
Fix human-readable serde deserialization of CollationSpecialPrimaries - #8551
Merged
Manishearth merged 2 commits intoOct 7, 2026
Merged
Manishearth merged 2 commits into
Manishearth merged 2 commits into
Conversation
…ecialPrimaries CollationSpecialPrimaries::serialize renames the concatenated field to "last_primaries", whereas CollationSpecialPrimaries::deserialize omitted rename = "last_primaries" and borrowed &'data ZeroSlice<u16>, which fails to deserialize from human-readable JSON sequences. Add rename = "last_primaries" and deserialize via ZeroVec<'data, u16> so both zero-copy binary formats and human-readable JSON formats round-trip.
Comment on lines
+636
to
656
| use alloc::borrow::Cow; | ||
| let (last_primaries, mut compressible_bytes) = match concatenated.into_cow() { | ||
| Cow::Borrowed(s) => { | ||
| let Some((l, c)) = s.split_at_checked(MaxVariable::VARIANT_COUNT) else { | ||
| return Err(serde::de::Error::custom("invalid")); | ||
| }; | ||
| ( | ||
| ZeroSlice::from_ule_slice(l).as_zerovec(), | ||
| ZeroSlice::from_ule_slice(c).as_zerovec(), | ||
| ) | ||
| } | ||
| Cow::Owned(v) => { | ||
| let Some((l, c)) = v.split_at_checked(MaxVariable::VARIANT_COUNT) else { | ||
| return Err(serde::de::Error::custom("invalid")); | ||
| }; | ||
| ( | ||
| ZeroSlice::from_ule_slice(l).as_zerovec().into_owned(), | ||
| ZeroSlice::from_ule_slice(c).as_zerovec().into_owned(), | ||
| ) | ||
| } | ||
| }; |
Member
There was a problem hiding this comment.
this diff seems unrelated to the issue this PR addresses. why?
Member
Author
There was a problem hiding this comment.
Because now it might deserialize as owned.
robertbastian
approved these changes
Oct 7, 2026
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
2 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.
CollationSpecialPrimaries::serialize renames the concatenated field to "last_primaries", whereas CollationSpecialPrimaries::deserialize omitted rename = "last_primaries" and borrowed &'data ZeroSlice, which fails to deserialize from human-readable JSON sequences.
Add rename = "last_primaries" and deserialize via ZeroVec<'data, u16> so both zero-copy binary formats and human-readable JSON formats round-trip.
Changelog
icu_collator: Fix human-readable serde deserialization of CollationSpecialPrimaries