Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use UnvalidatedStr for casemap unfold keys #3690

Merged
merged 1 commit into from
Jul 17, 2023
Merged

Use UnvalidatedStr for casemap unfold keys #3690

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions experimental/casemap/src/provider/unfold.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#[cfg(feature = "datagen")]
use alloc::string::String;
use icu_provider::prelude::*;
use zerovec::ule::UnvalidatedStr;
use zerovec::ZeroMap;

/// Reverse case folding data. Maps from multi-character strings back
Expand All @@ -28,7 +29,7 @@ use zerovec::ZeroMap;
pub struct CaseMapUnfoldData<'data> {
#[cfg_attr(feature = "serde", serde(borrow))]
/// The actual map. Maps from strings to a list of codepoints, stored as a contiguous UTF-8 string
pub map: ZeroMap<'data, str, str>,
pub map: ZeroMap<'data, UnvalidatedStr, str>,
}

impl<'data> CaseMapUnfoldData<'data> {
Expand Down Expand Up @@ -75,7 +76,10 @@ impl<'data> CaseMapUnfoldData<'data> {
.ok_or(DataError::custom("Unfold: unpaired surrogate in key"))?;
let val = Self::decode_string(&row[string_width..])
.ok_or(DataError::custom("Unfold: unpaired surrogate in value"))?;
if map.try_append(key.as_ref(), val.as_ref()).is_some() {
if map
.try_append(UnvalidatedStr::from_str(&key), val.as_ref())
.is_some()
{
return Err(DataError::custom("Unfold: keys not sorted/unique"));
}
}
Expand All @@ -92,6 +96,6 @@ impl<'data> CaseMapUnfoldData<'data> {
// Given a string, returns another string representing the set of characters
// that case fold to that string.
pub(crate) fn get(&self, key: &str) -> Option<&str> {
self.map.get(key)
self.map.get(UnvalidatedStr::from_str(key))
}
}
Loading