Skip to content

Always generate fast-mode data for NFD and NFKD tries #7222

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Always generate fast-mode data for NFD and NFKD tries #7222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dc2bb1
Always generate fast-mode data for NFD and NFKD tries
hsivonen Nov 6, 2025
76cf7d3
Fix mappings in provider/source/src/tests/data.rs
hsivonen Nov 6, 2025
5a65b06
Update testdata globs
hsivonen Nov 6, 2025
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
4 changes: 2 additions & 2 deletions provider/data/normalizer/data/normalizer_nfd_data_v1.rs.data
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/data/normalizer/data/normalizer_nfkd_data_v1.rs.data
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/data/normalizer/fingerprints.csv
View file
Open in desktop
Copy link
Member

@robertbastian robertbastian Nov 6, 2025

Choose a reason for hiding this comment

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

observation: 23% and 18% size increase

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
normalizer/nfc/v1, <singleton>, 5332B, 5310B, dd048e68b718a993
normalizer/nfd/data/v1, <singleton>, 28208B, 28144B, a37d3c274c030323
normalizer/nfd/data/v1, <singleton>, 34912B, 34848B, 933447e5c056e49c
Copy link
Member

@Manishearth Manishearth Nov 6, 2025

Choose a reason for hiding this comment

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

I'm surprised that the toml files didn't change but the generated data did.

normalizer/nfd/supplement/v1, <singleton>, 4486B, 4403B, a587960aa6faa95c
normalizer/nfd/tables/v1, <singleton>, 2177B, 2133B, 8818c6d23b22796a
normalizer/nfkd/data/v1, <singleton>, 43400B, 43336B, 855553ea574c0178
normalizer/nfkd/data/v1, <singleton>, 51488B, 51424B, a5a4848d32dd13f8
normalizer/nfkd/tables/v1, <singleton>, 5865B, 5821B, 7f50ce23df00365d
normalizer/uts46/data/v1, <singleton>, 56552B, 56493B, 2f3422c2c9cc708b
4 changes: 2 additions & 2 deletions provider/data/normalizer/stubdata/normalizer_nfd_data_v1.rs.data
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/data/normalizer/stubdata/normalizer_nfkd_data_v1.rs.data
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion provider/source/src/normalizer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//! exported from ICU.

use crate::SourceDataProvider;
use crate::TrieType;
use icu::collections::char16trie::Char16Trie;
use icu::collections::codepointtrie::CodePointTrie;
use icu::normalizer::provider::*;
Expand All @@ -26,7 +27,11 @@ macro_rules! normalization_provider {
let $toml_data: &normalizer_serde::$serde_struct =
self.icuexport()?.read_and_parse_toml(&format!(
"norm/{}/{}.toml",
self.trie_type(),
if $file_name == "nfd" || $file_name == "nfkd" {
Copy link
Member

@Manishearth Manishearth Nov 6, 2025

Choose a reason for hiding this comment

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

nit: link to issue or otherwise document why

TrieType::Fast
} else {
self.trie_type()
Copy link
Member

@robertbastian robertbastian Nov 6, 2025

Choose a reason for hiding this comment

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

suggestion: document that the trie_type does not apply to these.

https://unicode-org.github.io/icu4x/rustdoc/icu_provider_source/struct.SourceDataProvider.html#method.with_fast_tries

},
$file_name
))?;

Expand Down
4 changes: 2 additions & 2 deletions provider/source/src/tests/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,9 +574,9 @@ impl SourceDataProvider {
("collation/implicithan/zh_zhuyin_data.toml", include_bytes!("../../tests/data/icuexport/collation/implicithan/zh_zhuyin_data.toml").as_slice()),
("norm/small/compositions.toml", include_bytes!("../../tests/data/icuexport/norm/small/compositions.toml").as_slice()),
("norm/small/decompositionex.toml", include_bytes!("../../tests/data/icuexport/norm/small/decompositionex.toml").as_slice()),
("norm/small/nfd.toml", include_bytes!("../../tests/data/icuexport/norm/small/nfd.toml").as_slice()),
("norm/fast/nfd.toml", include_bytes!("../../tests/data/icuexport/norm/fast/nfd.toml").as_slice()),
("norm/small/nfdex.toml", include_bytes!("../../tests/data/icuexport/norm/small/nfdex.toml").as_slice()),
("norm/small/nfkd.toml", include_bytes!("../../tests/data/icuexport/norm/small/nfkd.toml").as_slice()),
("norm/fast/nfkd.toml", include_bytes!("../../tests/data/icuexport/norm/fast/nfkd.toml").as_slice()),
("norm/small/nfkdex.toml", include_bytes!("../../tests/data/icuexport/norm/small/nfkdex.toml").as_slice()),
("norm/small/uts46d.toml", include_bytes!("../../tests/data/icuexport/norm/small/uts46d.toml").as_slice()),
("segmenter/dictionary/burmesedict.toml", include_bytes!("../../tests/data/icuexport/segmenter/dictionary/burmesedict.toml").as_slice()),
Expand Down
0 .../tests/data/icuexport/norm/small/nfd.toml → ...e/tests/data/icuexport/norm/fast/nfd.toml
View file
Open in desktop
Copy link
Member

@robertbastian robertbastian Nov 6, 2025

Choose a reason for hiding this comment

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

why is there no change here?

Copy link
Member

@Manishearth Manishearth Nov 6, 2025

Choose a reason for hiding this comment

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

Perhaps icuexportdata has a bug?

Copy link
Member

@robertbastian robertbastian Nov 6, 2025

Choose a reason for hiding this comment

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

ah CI is failing, these files are wrong

Copy link
Member

@Manishearth Manishearth Nov 6, 2025

Choose a reason for hiding this comment

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

Ah, well.

I bet the new data is generated off of the real files, it's just the test data that didn't get updated correctly.

File renamed without changes.
0 ...tests/data/icuexport/norm/small/nfkd.toml → .../tests/data/icuexport/norm/fast/nfkd.toml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tools/make/download-repo-sources/globs.rs.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ const ICUEXPORTDATA_GLOB: &[&str] = &[
"collation/implicithan/zh_zhuyin_data.toml",
"norm/small/compositions.toml",
"norm/small/decompositionex.toml",
"norm/small/nfd.toml",
"norm/fast/nfd.toml",
"norm/small/nfdex.toml",
"norm/small/nfkd.toml",
"norm/fast/nfkd.toml",
"norm/small/nfkdex.toml",
"norm/small/uts46d.toml",
"segmenter/dictionary/burmesedict.toml",
Expand Down
Loading