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

Fix transliterator fallback loading #5489

Merged
merged 5 commits into from
Sep 6, 2024
Merged

Fix transliterator fallback loading #5489

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03ce306
special
robertbastian Sep 4, 2024
5454a51
overrides
robertbastian Sep 5, 2024
a836996
fmt
robertbastian Sep 5, 2024
9c0ac6a
Merge branch 'main' into special
sffc Sep 6, 2024
2c4779b
fix merge
robertbastian Sep 6, 2024
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
99 changes: 43 additions & 56 deletions components/experimental/src/transliterate/transliterator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,7 @@ type Env = LiteMap<String, InternalTransliterator>;
/// let provider = collection.as_provider();
/// let t = Transliterator::try_new_with_override_unstable(
/// "und-t-und-x0-custom".parse().unwrap(),
/// |locale| {
/// if locale.normalizing_eq("und-t-und-x0-dep2") {
/// Some(Box::new(AsciiUpperTransliterator))
/// } else {
/// None
/// }
/// },
/// |locale| locale.normalizing_eq("und-t-und-x0-dep2").then_some(Ok(Box::new(AsciiUpperTransliterator))),
/// &provider,
/// )
/// .unwrap();
Expand Down Expand Up @@ -254,7 +248,7 @@ impl Transliterator {
{
Self::internal_try_new_with_override_unstable(
locale,
None::<&fn(&Locale) -> Option<Box<dyn CustomTransliterator>>>,
None::<&fn(&Locale) -> Option<Result<Box<dyn CustomTransliterator>, DataError>>>,
provider,
provider,
)
Expand Down Expand Up @@ -307,7 +301,7 @@ impl Transliterator {
+ DataProvider<CompatibilityDecompositionTablesV1Marker>
+ DataProvider<CanonicalCompositionsV1Marker>
+ ?Sized,
F: Fn(&Locale) -> Option<Box<dyn CustomTransliterator>>,
F: Fn(&Locale) -> Option<Result<Box<dyn CustomTransliterator>, DataError>>,
{
Self::internal_try_new_with_override_unstable(locale, Some(&lookup), provider, provider)
}
Expand All @@ -326,7 +320,7 @@ impl Transliterator {
+ DataProvider<CompatibilityDecompositionTablesV1Marker>
+ DataProvider<CanonicalCompositionsV1Marker>
+ ?Sized,
F: Fn(&Locale) -> Option<Box<dyn CustomTransliterator>>,
F: Fn(&Locale) -> Option<Result<Box<dyn CustomTransliterator>, DataError>>,
{
let payload = Transliterator::load_rbt(
#[allow(clippy::unwrap_used)] // infallible
Expand Down Expand Up @@ -369,19 +363,18 @@ impl Transliterator {
+ DataProvider<CompatibilityDecompositionTablesV1Marker>
+ DataProvider<CanonicalCompositionsV1Marker>
+ ?Sized,
F: Fn(&Locale) -> Option<Box<dyn CustomTransliterator>>,
F: Fn(&Locale) -> Option<Result<Box<dyn CustomTransliterator>, DataError>>,
{
for dep in rbt.deps() {
if !env.contains_key(&*dep) {
// 1. Insert a placeholder to avoid infinite recursion.
env.insert(dep.to_string(), InternalTransliterator::Null);
// 2. Load the transliterator, by checking
let internal_t = dep
let internal_t =
// a) hardcoded specials
.strip_prefix("x-")
.map(|special| Transliterator::load_special(special, normalizer_provider))
dep.strip_prefix("x-").and_then(|special| Transliterator::load_special(special, normalizer_provider))
// b) the user-provided override
.or_else(|| Transliterator::load_with_override(&dep, lookup?).transpose())
.or_else(|| Some(lookup?(&dep.parse().ok()?)?.map(InternalTransliterator::Dyn)))
// c) the data
.unwrap_or_else(|| {
let rbt = Transliterator::load_rbt(
Expand Down Expand Up @@ -411,7 +404,7 @@ impl Transliterator {
fn load_special<P>(
special: &str,
normalizer_provider: &P,
) -> Result<InternalTransliterator, DataError>
) -> Option<Result<InternalTransliterator, DataError>>
where
P: DataProvider<CanonicalDecompositionDataV1Marker>
+ DataProvider<CompatibilityDecompositionSupplementV1Marker>
Expand All @@ -422,53 +415,43 @@ impl Transliterator {
{
// TODO(#3909, #3910): add more
match special {
"any-nfc" => Ok(InternalTransliterator::Composing(
ComposingTransliterator::try_nfc(normalizer_provider)?,
)),
"any-nfkc" => Ok(InternalTransliterator::Composing(
ComposingTransliterator::try_nfkc(normalizer_provider)?,
)),
"any-nfd" => Ok(InternalTransliterator::Decomposing(
DecomposingTransliterator::try_nfd(normalizer_provider)?,
)),
"any-nfkd" => Ok(InternalTransliterator::Decomposing(
DecomposingTransliterator::try_nfkd(normalizer_provider)?,
)),
"any-null" => Ok(InternalTransliterator::Null),
"any-remove" => Ok(InternalTransliterator::Remove),
"any-hex/unicode" => Ok(InternalTransliterator::Hex(
"any-nfc" => Some(
ComposingTransliterator::try_nfc(normalizer_provider)
.map(InternalTransliterator::Composing),
),
"any-nfkc" => Some(
ComposingTransliterator::try_nfkc(normalizer_provider)
.map(InternalTransliterator::Composing),
),
"any-nfd" => Some(
DecomposingTransliterator::try_nfd(normalizer_provider)
.map(InternalTransliterator::Decomposing),
),
"any-nfkd" => Some(
DecomposingTransliterator::try_nfkd(normalizer_provider)
.map(InternalTransliterator::Decomposing),
),
"any-null" => Some(Ok(InternalTransliterator::Null)),
"any-remove" => Some(Ok(InternalTransliterator::Remove)),
"any-hex/unicode" => Some(Ok(InternalTransliterator::Hex(
hardcoded::HexTransliterator::new("U+", "", 4, Case::Upper),
)),
"any-hex/rust" => Ok(InternalTransliterator::Hex(
))),
"any-hex/rust" => Some(Ok(InternalTransliterator::Hex(
hardcoded::HexTransliterator::new("\\u{", "}", 2, Case::Lower),
)),
"any-hex/xml" => Ok(InternalTransliterator::Hex(
))),
"any-hex/xml" => Some(Ok(InternalTransliterator::Hex(
hardcoded::HexTransliterator::new("&#x", ";", 1, Case::Upper),
)),
"any-hex/perl" => Ok(InternalTransliterator::Hex(
))),
"any-hex/perl" => Some(Ok(InternalTransliterator::Hex(
hardcoded::HexTransliterator::new("\\x{", "}", 1, Case::Upper),
)),
"any-hex/plain" => Ok(InternalTransliterator::Hex(
))),
"any-hex/plain" => Some(Ok(InternalTransliterator::Hex(
hardcoded::HexTransliterator::new("", "", 4, Case::Upper),
)),
s => Err(DataError::custom("unavailable transliterator").with_debug_context(s)),
))),
_ => None,
}
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion (optional): invert load_with_override to also return Option<Result>

fn load_with_override<F>(
id: &str,
lookup: &F,
) -> Result<Option<InternalTransliterator>, DataError>
where
F: Fn(&Locale) -> Option<Box<dyn CustomTransliterator>>,
{
let locale: Locale = id.parse().map_err(|e| {
DataError::custom("invalid data: transliterator dependency is not a valid Locale")
.with_debug_context(&e)
})?;
Ok(lookup(&locale).map(InternalTransliterator::Dyn))
}

fn load_rbt<P>(
marker_attributes: &DataMarkerAttributes,
provider: &P,
Expand Down Expand Up @@ -1418,7 +1401,11 @@ mod tests {
let want_locale = "und-t-und-latn-d0-ascii".parse().unwrap();
let t = Transliterator::try_new_with_override_unstable(
"de-t-de-d0-ascii".parse().unwrap(),
|locale| locale.eq(&want_locale).then_some(Box::new(MaoamTranslit)),
|locale| {
locale
.eq(&want_locale)
.then_some(Ok(Box::new(MaoamTranslit)))
},
&TestingProvider,
)
.unwrap();
Expand Down