review unicode-org#1

skius · Aug 31, 2023 · 8a0b90c · 8a0b90c
1 parent c14389e
commit 8a0b90c
Show file tree

Hide file tree

Showing 10 changed files with 333 additions and 379 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/experimental/transliteration/Cargo.toml b/experimental/transliteration/Cargo.toml
@@ -21,12 +21,12 @@ all-features = true
 
 [dependencies]
 icu_provider = { workspace = true, features = ["macros"] }
+icu_locid = { workspace = true }
 icu_collections = { workspace = true }
 icu_normalizer = { workspace = true }
 icu_casemap = { workspace = true }
 
 zerovec = { workspace = true, features = ["derive"] }
-zerofrom = { workspace = true, features = ["derive"] }
 yoke = { workspace = true, features = ["derive"] }
 databake = { workspace = true, optional = true, features = ["derive"] }
 litemap = { workspace = true }
@@ -43,7 +43,7 @@ criterion = "0.4.0"
 default = ["compiled_data"]
 std = []
 serde = ["dep:serde", "zerovec/serde", "icu_collections/serde"]
-datagen = ["serde", "dep:databake", "zerovec/databake", "icu_collections/databake"]
+datagen = ["serde", "dep:databake", "zerovec/databake", "icu_collections/databake", "std"]
 compiled_data = ["dep:icu_transliteration_data", "icu_normalizer/compiled_data", "icu_casemap/compiled_data"]
 
 [[bench]]

diff --git a/experimental/transliteration/benches/bench.rs b/experimental/transliteration/benches/bench.rs
@@ -4,7 +4,7 @@
 
 use criterion::{black_box, BenchmarkId, Criterion};
 use criterion::{criterion_group, criterion_main};
-use icu_provider::_internal::locid::Locale;
+use icu_locid::Locale;
 
 use icu_transliteration::Transliterator;
 

diff --git a/experimental/transliteration/src/lib.rs b/experimental/transliteration/src/lib.rs
@@ -32,7 +32,6 @@
 #![warn(missing_docs)]
 
 extern crate alloc;
-extern crate core;
 
 pub mod provider;
 

diff --git a/experimental/transliteration/src/provider.rs b/experimental/transliteration/src/provider.rs
@@ -21,6 +21,7 @@ use icu_collections::{
     codepointinvlist::{CodePointInversionList, CodePointInversionListULE},
     codepointinvliststringlist::CodePointInversionListAndStringListULE,
 };
+use icu_provider::prelude::*;
 use zerovec::*;
 
 #[cfg(feature = "compiled_data")]
@@ -33,7 +34,6 @@ const _: () = {
     mod icu {
         pub use crate as transliteration;
         pub use icu_collections as collections;
-        pub use icu_normalizer as normalizer;
     }
     icu_transliteration_data::impl_transliterator_rules_v1!(Baked);
 };