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.

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

Moving some transliteration datagen logic into the crate #4029

Merged
merged 20 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
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
5 changes: 0 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ icu_compactdecimal_data = { version = "~1.2.0", path = "experimental/compactdeci
icu_displaynames_data = { version = "~1.2.0", path = "experimental/displaynames/data", default-features = false }
icu_relativetime_data = { version = "1.2.0", path = "experimental/relativetime/data", default-features = false }
icu_singlenumberformatter_data = { version = "~1.2.0", path = "experimental/single_number_formatter/data", default-features = false }
icu_transliterate_data = { version = "0.0.0", path = "experimental/transliterate/data", default-features = false }

# FFI
icu_capi = { version = "~1.2.0", path = "ffi/diplomat", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions components/calendar/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/casemap/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/collator/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/datetime/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/decimal/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/list/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/locid_transform/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/normalizer/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/plurals/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/properties/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/segmenter/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/timezone/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/tutorials/testing/patch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ icu_compactdecimal_data = { path = "../../experimental/compactdecimal/data" }
icu_displaynames_data = { path = "../../experimental/displaynames/data" }
icu_relativetime_data = { path = "../../experimental/relativetime/data" }
icu_singlenumberformatter_data = { path = "../../experimental/single_number_formatter/data"}
icu_transliterate_data = { path = "../../experimental/transliterate/data" }

# FFI
icu_capi = { path = "../../ffi/diplomat" }
Expand Down
1 change: 1 addition & 0 deletions experimental/compactdecimal/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions experimental/displaynames/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions experimental/relativetime/data/data/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions experimental/transliterate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ log = "0.4"
serde = { version = "1.0", features = ["derive"], optional = true, default-features = false }
displaydoc = { version = "0.2.3", default-features = false }

icu_transliterate_data = { workspace = true, optional = true }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
criterion = "0.4.0"

Expand All @@ -48,8 +46,8 @@ bench = false
default = ["compiled_data"]
std = []
serde = ["dep:serde", "zerovec/serde", "icu_collections/serde"]
datagen = ["serde", "dep:databake", "zerovec/databake", "icu_collections/databake", "std", "icu_properties", "icu_unicodeset_parser"]
compiled_data = ["dep:icu_transliterate_data", "icu_normalizer/compiled_data", "icu_properties/compiled_data"]
datagen = ["serde", "dep:databake", "zerovec/databake", "icu_collections/databake", "std", "icu_properties", "icu_unicodeset_parser", "icu_provider/datagen"]
compiled_data = ["icu_normalizer/compiled_data", "icu_properties/compiled_data"]
bench = []

[[bench]]
Expand Down
6 changes: 4 additions & 2 deletions experimental/transliterate/benches/bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ use icu_locid::Locale;

use icu_transliterate::Transliterator;

include!("../tests/data/baked/mod.rs");

struct BenchDataContent {
pub num: usize,
pub name: String,
Expand All @@ -32,7 +34,7 @@ fn bench_data_from_sources(locale_str: &str, source: &str) -> Vec<BenchDataConte
.map(|(idx, input)| BenchDataContent {
num: idx + 1,
name: locale_str.to_string(),
translit: Transliterator::try_new(locale.clone()).unwrap(),
translit: Transliterator::try_new_unstable(locale.clone(), &BakedDataProvider).unwrap(),
input,
})
.collect()
Expand All @@ -43,7 +45,7 @@ fn bench_data() -> Vec<BenchDataContent> {
let mut bench_data = Vec::new();
bench_data.extend(bench_data_from_sources(
"und-Arab-t-und-beng",
include_str!("../tests/cldr_testData/und-Arab-t-und-beng.txt"),
include_str!("../tests/data/fixtures/und-Arab-t-und-beng.txt"),
));

bench_data.into_iter().take(5).collect()
Expand Down
17 changes: 0 additions & 17 deletions experimental/transliterate/data/Cargo.toml

This file was deleted.

44 changes: 0 additions & 44 deletions experimental/transliterate/data/LICENSE

This file was deleted.

11 changes: 0 additions & 11 deletions experimental/transliterate/data/README.md

This file was deleted.

10 changes: 0 additions & 10 deletions experimental/transliterate/data/build.rs

This file was deleted.

19 changes: 0 additions & 19 deletions experimental/transliterate/data/config.json

This file was deleted.

31 changes: 0 additions & 31 deletions experimental/transliterate/data/data/macros.rs

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions experimental/transliterate/data/data/mod.rs

This file was deleted.

13 changes: 0 additions & 13 deletions experimental/transliterate/data/src/lib.rs

This file was deleted.

Loading
Loading