From 275f3f732bdae59087c621121a37fb2ddd23910f Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:44:23 +0200 Subject: [PATCH] Adding `datagen` feature to meta crate (#5047) This has two advantages: * The rustdoc for `icu::datetime` will match that of `icu_datetime`. * It improves the feature matrix of `icu_datagen` and the future `icu_datagen_provider`, in particular because the `icu/experimental` feature can be used in conjunction with the `icu/datagen` feature --- Cargo.lock | 14 ------- components/icu/Cargo.toml | 15 +++++++ provider/datagen/Cargo.toml | 39 +------------------ provider/datagen/src/driver.rs | 14 +++---- provider/datagen/src/lib.rs | 24 ++++++------ provider/datagen/src/provider.rs | 2 +- .../src/provider/tests/make_testdata.rs | 8 ++-- .../transform/cldr/calendar/chinese_based.rs | 2 +- .../src/transform/cldr/calendar/islamic.rs | 2 +- .../src/transform/cldr/calendar/japanese.rs | 4 +- .../src/transform/cldr/characters/mod.rs | 8 ++-- .../src/transform/cldr/cldr_serde/ca.rs | 2 +- .../cldr/cldr_serde/coverage_levels.rs | 2 +- .../cldr/cldr_serde/likely_subtags.rs | 2 +- .../cldr/cldr_serde/locale_resource.rs | 2 +- .../cldr/cldr_serde/parent_locales.rs | 2 +- .../cldr/cldr_serde/plural_ranges.rs | 2 +- .../src/transform/cldr/cldr_serde/plurals.rs | 2 +- .../cldr/cldr_serde/time_zones/bcp47_tzid.rs | 2 +- .../cldr/cldr_serde/time_zones/meta_zones.rs | 2 +- .../transform/cldr/cldr_serde/transforms.rs | 2 +- .../transform/cldr/cldr_serde/week_data.rs | 10 ++--- .../src/transform/cldr/currency/essentials.rs | 12 +++--- .../src/transform/cldr/currency/extended.rs | 6 +-- .../src/transform/cldr/datetime/mod.rs | 24 ++++++------ .../src/transform/cldr/datetime/neo.rs | 14 ++++--- .../transform/cldr/datetime/neo_skeleton.rs | 16 ++++---- .../src/transform/cldr/datetime/patterns.rs | 6 +-- .../src/transform/cldr/datetime/skeletons.rs | 10 ++--- .../src/transform/cldr/datetime/symbols.rs | 4 +- .../src/transform/cldr/datetime/week_data.rs | 16 ++++---- .../src/transform/cldr/decimal/compact.rs | 6 +-- .../cldr/decimal/compact_decimal_pattern.rs | 4 +- .../transform/cldr/decimal/decimal_pattern.rs | 2 +- .../datagen/src/transform/cldr/decimal/mod.rs | 8 ++-- .../src/transform/cldr/decimal/symbols.rs | 6 +-- .../transform/cldr/displaynames/language.rs | 6 +-- .../src/transform/cldr/displaynames/region.rs | 8 ++-- .../src/transform/cldr/displaynames/script.rs | 6 +-- .../transform/cldr/displaynames/variant.rs | 6 +-- .../src/transform/cldr/fallback/mod.rs | 6 +-- .../datagen/src/transform/cldr/list/mod.rs | 8 ++-- .../cldr/locale_canonicalizer/aliases.rs | 12 +++--- .../locale_canonicalizer/directionality.rs | 4 +- .../locale_canonicalizer/likely_subtags.rs | 14 +++---- .../datagen/src/transform/cldr/percent/mod.rs | 6 +-- .../person_names_format_data_providers.rs | 4 +- .../datagen/src/transform/cldr/plurals/mod.rs | 8 ++-- .../src/transform/cldr/relativetime/mod.rs | 4 +- provider/datagen/src/transform/cldr/source.rs | 12 +++--- .../src/transform/cldr/time_zones/convert.rs | 8 ++-- .../src/transform/cldr/time_zones/mod.rs | 10 ++--- .../src/transform/cldr/time_zones/names.rs | 6 +-- .../src/transform/cldr/transforms/mod.rs | 6 +-- .../datagen/src/transform/cldr/units/data.rs | 6 +-- .../src/transform/cldr/units/helpers.rs | 6 +-- .../datagen/src/transform/cldr/units/info.rs | 6 +-- .../icuexport/collator/collator_serde.rs | 2 +- .../src/transform/icuexport/collator/mod.rs | 32 +++++++-------- .../src/transform/icuexport/normalizer/mod.rs | 8 ++-- .../icuexport/normalizer/normalizer_serde.rs | 2 +- .../src/transform/icuexport/ucase/mod.rs | 6 +-- .../transform/icuexport/ucase/ucase_serde.rs | 2 +- .../transform/icuexport/uprops/bidi_data.rs | 16 ++++---- .../transform/icuexport/uprops/bin_cp_set.rs | 10 ++--- .../transform/icuexport/uprops/bin_uniset.rs | 12 +++--- .../icuexport/uprops/enum_codepointtrie.rs | 12 +++--- .../src/transform/icuexport/uprops/script.rs | 10 ++--- .../icuexport/uprops/uprops_serde.rs | 2 +- provider/datagen/src/transform/mod.rs | 2 +- .../src/transform/segmenter/dictionary.rs | 4 +- .../datagen/src/transform/segmenter/lstm.rs | 6 +-- .../datagen/src/transform/segmenter/mod.rs | 10 ++--- provider/datagen/tests/test-options.rs | 8 ++-- 74 files changed, 280 insertions(+), 312 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8cdf1bfe4f9..e9b4cab908a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1113,29 +1113,15 @@ dependencies = [ "either", "elsa", "icu", - "icu_calendar", - "icu_casemap", "icu_codepointtrie_builder", - "icu_collator", "icu_collections", - "icu_datetime", - "icu_decimal", - "icu_experimental", - "icu_list", - "icu_locale", - "icu_locale_core", - "icu_normalizer", "icu_pattern", - "icu_plurals", - "icu_properties", "icu_provider", "icu_provider_adapters", "icu_provider_baked", "icu_provider_blob", "icu_provider_fs", "icu_registry", - "icu_segmenter", - "icu_timezone", "itertools", "litemap", "log", diff --git a/components/icu/Cargo.toml b/components/icu/Cargo.toml index 3d2f359fd35..c105332d5dd 100644 --- a/components/icu/Cargo.toml +++ b/components/icu/Cargo.toml @@ -107,6 +107,21 @@ compiled_data = [ "icu_timezone/compiled_data", "icu_experimental?/compiled_data", ] +datagen = [ + "icu_calendar/datagen", + "icu_casemap/datagen", + "icu_collator/datagen", + "icu_datetime/datagen", + "icu_decimal/datagen", + "icu_list/datagen", + "icu_locale/datagen", + "icu_normalizer/datagen", + "icu_plurals/datagen", + "icu_properties/datagen", + "icu_segmenter/datagen", + "icu_timezone/datagen", + "icu_experimental?/datagen", +] serde_human = [ "icu_list/serde_human" ] diff --git a/provider/datagen/Cargo.toml b/provider/datagen/Cargo.toml index 5b79a9863a2..2e3bf4b6cc0 100644 --- a/provider/datagen/Cargo.toml +++ b/provider/datagen/Cargo.toml @@ -34,7 +34,7 @@ all-features = true # DatagenDriver displaydoc = { workspace = true } -icu_locale_core = { workspace = true, features = ["std"] } +icu = { workspace = true } icu_provider = { workspace = true, features = ["std", "logging", "datagen"]} log = { workspace = true } memchr = { workspace = true } @@ -47,22 +47,6 @@ icu_provider_blob = { workspace = true, features = ["export"], optional = true } icu_provider_fs = { workspace = true, features = ["export"], optional = true } icu_provider_baked = { workspace = true, features = ["export"], optional = true } -# The components are needed for the registry, provider, baked exporter, with different features -icu = { workspace = true } -icu_calendar = { workspace = true } -icu_casemap = { workspace = true } -icu_collator = { workspace = true } -icu_datetime = { workspace = true } -icu_decimal = { workspace = true } -icu_list = { workspace = true } -icu_locale = { workspace = true } -icu_normalizer = { workspace = true } -icu_plurals = { workspace = true } -icu_properties = { workspace = true } -icu_segmenter = { workspace = true } -icu_timezone = { workspace = true } -icu_experimental = { workspace = true, optional = true } - # DatagenProvider ## ICU infrastructure @@ -101,21 +85,7 @@ simple_logger = { workspace = true } [features] default = ["use_wasm", "networking", "rayon", "fs_exporter", "blob_exporter", "baked_exporter", "provider"] provider = [ - "icu_calendar/datagen", - "icu_casemap/datagen", - "icu_collator/datagen", - "icu_datetime/datagen", - "icu_decimal/datagen", - "icu_experimental?/datagen", - "icu_list/datagen", - "icu_locale/datagen", - "icu_locale_core/serde", - "icu_normalizer/datagen", - "icu_plurals/datagen", - "icu_properties/datagen", - "icu_segmenter/datagen", - "icu_segmenter/lstm", - "icu_timezone/datagen", + "icu/datagen", "dep:calendrical_calculations", "dep:icu_codepointtrie_builder", "dep:icu_collections", @@ -149,11 +119,6 @@ use_wasm = ["icu_codepointtrie_builder?/wasm"] use_icu4c = ["icu_codepointtrie_builder?/icu4c"] networking = ["dep:ureq"] experimental_components = [ - "dep:icu_experimental", - # For registry - "icu_datetime/experimental", - # For registry - "icu_plurals/experimental", # Only required if both provider and experimental are enabled, but that's not expressible with features "dep:num-bigint", "dep:num-rational", diff --git a/provider/datagen/src/driver.rs b/provider/datagen/src/driver.rs index 29f51f0b381..82827c87e21 100644 --- a/provider/datagen/src/driver.rs +++ b/provider/datagen/src/driver.rs @@ -4,11 +4,11 @@ use crate::rayon_prelude::*; use displaydoc::Display; -use icu_locale::fallback::LocaleFallbackIterator; -use icu_locale::LocaleFallbacker; -use icu_locale_core::extensions::unicode::key; -use icu_locale_core::LanguageIdentifier; -use icu_locale_core::ParseError; +use icu::locale::extensions::unicode::key; +use icu::locale::fallback::LocaleFallbackIterator; +use icu::locale::LanguageIdentifier; +use icu::locale::LocaleFallbacker; +use icu::locale::ParseError; use icu_provider::datagen::*; use icu_provider::prelude::*; use std::collections::HashMap; @@ -1094,7 +1094,7 @@ impl fmt::Display for DisplayDuration { #[test] fn test_collation_filtering() { - use icu_locale_core::langid; + use icu::locale::langid; use std::collections::BTreeSet; #[derive(Debug)] @@ -1177,7 +1177,7 @@ fn test_collation_filtering() { for cas in cases { let resolved_locales = select_locales_for_marker( &crate::provider::DatagenProvider::new_testing(), - icu_collator::provider::CollationDataV1Marker::INFO, + icu::collator::provider::CollationDataV1Marker::INFO, &LocalesWithOrWithoutFallback::WithoutFallback { langids: [cas.language.clone()].into_iter().collect(), }, diff --git a/provider/datagen/src/lib.rs b/provider/datagen/src/lib.rs index 5a10993985c..64a79478e30 100644 --- a/provider/datagen/src/lib.rs +++ b/provider/datagen/src/lib.rs @@ -101,7 +101,7 @@ pub mod prelude { DatagenDriver, DeduplicationStrategy, FallbackOptions, LocaleFamily, NoFallbackOptions, }; #[doc(no_inline)] - pub use icu_locale_core::{langid, LanguageIdentifier}; + pub use icu::locale::{langid, LanguageIdentifier}; #[doc(no_inline)] pub use icu_provider::{datagen::DataExporter, DataMarker, DataMarkerInfo}; } @@ -150,7 +150,7 @@ macro_rules! cb { /// # use icu_provider::DataMarker; /// assert_eq!( /// icu_datagen::marker("list/and@1"), - /// Some(icu_list::provider::AndListV1Marker::INFO), + /// Some(icu::list::provider::AndListV1Marker::INFO), /// ); /// ``` pub fn marker>(string: S) -> Option { @@ -278,9 +278,9 @@ fn test_markers() { "trash", ]), vec![ - icu_list::provider::AndListV1Marker::INFO, - icu_datetime::provider::calendar::GregorianDateLengthsV1Marker::INFO, - icu_decimal::provider::DecimalSymbolsV1Marker::INFO, + icu::list::provider::AndListV1Marker::INFO, + icu::datetime::provider::calendar::GregorianDateLengthsV1Marker::INFO, + icu::decimal::provider::DecimalSymbolsV1Marker::INFO, ] ); } @@ -290,13 +290,13 @@ fn test_markers_from_bin() { assert_eq!( markers_from_bin_inner(include_bytes!("../tests/data/tutorial_buffer.wasm")), vec![ - icu_datetime::provider::calendar::GregorianDateLengthsV1Marker::INFO, - icu_datetime::provider::calendar::GregorianDateSymbolsV1Marker::INFO, - icu_datetime::provider::calendar::TimeLengthsV1Marker::INFO, - icu_datetime::provider::calendar::TimeSymbolsV1Marker::INFO, - icu_calendar::provider::WeekDataV1Marker::INFO, - icu_decimal::provider::DecimalSymbolsV1Marker::INFO, - icu_plurals::provider::OrdinalV1Marker::INFO, + icu::datetime::provider::calendar::GregorianDateLengthsV1Marker::INFO, + icu::datetime::provider::calendar::GregorianDateSymbolsV1Marker::INFO, + icu::datetime::provider::calendar::TimeLengthsV1Marker::INFO, + icu::datetime::provider::calendar::TimeSymbolsV1Marker::INFO, + icu::calendar::provider::WeekDataV1Marker::INFO, + icu::decimal::provider::DecimalSymbolsV1Marker::INFO, + icu::plurals::provider::OrdinalV1Marker::INFO, ] ); } diff --git a/provider/datagen/src/provider.rs b/provider/datagen/src/provider.rs index ac6d4900f65..dff1d719ffa 100644 --- a/provider/datagen/src/provider.rs +++ b/provider/datagen/src/provider.rs @@ -275,7 +275,7 @@ impl DatagenProvider { pub fn locales_for_coverage_levels( &self, levels: impl IntoIterator, - ) -> Result, DataError> { + ) -> Result, DataError> { self.cldr()?.locales(levels) } } diff --git a/provider/datagen/src/provider/tests/make_testdata.rs b/provider/datagen/src/provider/tests/make_testdata.rs index ca41a25de0e..696b517487d 100644 --- a/provider/datagen/src/provider/tests/make_testdata.rs +++ b/provider/datagen/src/provider/tests/make_testdata.rs @@ -121,7 +121,7 @@ struct ZeroCopyCheckExporter { // Every entry in this list is a bug that needs to be addressed before stabilization. const EXPECTED_VIOLATIONS: &[DataMarkerInfo] = &[ // https://github.com/unicode-org/icu4x/issues/1678 - icu_datetime::provider::calendar::DateSkeletonPatternsV1Marker::INFO, + icu::datetime::provider::calendar::DateSkeletonPatternsV1Marker::INFO, ]; // Types in this list can be zero-copy deserialized (and do not contain allocated data), @@ -133,9 +133,9 @@ const EXPECTED_TRANSIENT_VIOLATIONS: &[DataMarkerInfo] = &[ // Regex DFAs need to be validated, which involved creating a BTreeMap. // If required we could avoid this using one of the approaches in // https://github.com/unicode-org/icu4x/pulls/3697. - icu_list::provider::AndListV1Marker::INFO, - icu_list::provider::OrListV1Marker::INFO, - icu_list::provider::UnitListV1Marker::INFO, + icu::list::provider::AndListV1Marker::INFO, + icu::list::provider::OrListV1Marker::INFO, + icu::list::provider::UnitListV1Marker::INFO, ]; impl DataExporter for ZeroCopyCheckExporter { diff --git a/provider/datagen/src/transform/cldr/calendar/chinese_based.rs b/provider/datagen/src/transform/cldr/calendar/chinese_based.rs index fcaea7264c9..efd401a1c33 100644 --- a/provider/datagen/src/transform/cldr/calendar/chinese_based.rs +++ b/provider/datagen/src/transform/cldr/calendar/chinese_based.rs @@ -6,7 +6,7 @@ use std::collections::HashSet; use crate::provider::DatagenProvider; use calendrical_calculations::chinese_based::{Chinese, ChineseBased, Dangi}; -use icu_calendar::provider::chinese_based::*; +use icu::calendar::provider::chinese_based::*; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; diff --git a/provider/datagen/src/transform/cldr/calendar/islamic.rs b/provider/datagen/src/transform/cldr/calendar/islamic.rs index 46697ad576d..4172b395fd2 100644 --- a/provider/datagen/src/transform/cldr/calendar/islamic.rs +++ b/provider/datagen/src/transform/cldr/calendar/islamic.rs @@ -9,7 +9,7 @@ use calendrical_calculations::islamic::{ IslamicBasedMarker, ObservationalIslamicMarker, SaudiIslamicMarker, }; use calendrical_calculations::iso; -use icu_calendar::provider::islamic::*; +use icu::calendar::provider::islamic::*; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; diff --git a/provider/datagen/src/transform/cldr/calendar/japanese.rs b/provider/datagen/src/transform/cldr/calendar/japanese.rs index 65debfe7aa4..b05e78f3f19 100644 --- a/provider/datagen/src/transform/cldr/calendar/japanese.rs +++ b/provider/datagen/src/transform/cldr/calendar/japanese.rs @@ -4,8 +4,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; -use icu_calendar::provider::*; -use icu_locale_core::langid; +use icu::calendar::provider::*; +use icu::locale::langid; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; use std::collections::BTreeMap; diff --git a/provider/datagen/src/transform/cldr/characters/mod.rs b/provider/datagen/src/transform/cldr/characters/mod.rs index 49f7b8aac5e..d2d4edfd2b0 100644 --- a/provider/datagen/src/transform/cldr/characters/mod.rs +++ b/provider/datagen/src/transform/cldr/characters/mod.rs @@ -8,8 +8,8 @@ use std::marker::PhantomData; use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_collections::codepointinvliststringlist::CodePointInversionListAndStringList; -use icu_properties::provider::*; +use icu::collections::codepointinvliststringlist::CodePointInversionListAndStringList; +use icu::properties::provider::*; use icu_provider::prelude::*; use itertools::Itertools; @@ -322,8 +322,8 @@ fn string_to_prop_unicodeset(s: &str) -> PropertyUnicodeSetV1<'static> { #[cfg(test)] mod tests { use super::*; - use icu_locale_core::langid; - use icu_properties::sets::UnicodeSetData; + use icu::locale::langid; + use icu::properties::sets::UnicodeSetData; #[test] fn test_parse_exemplar_chars() { diff --git a/provider/datagen/src/transform/cldr/cldr_serde/ca.rs b/provider/datagen/src/transform/cldr/cldr_serde/ca.rs index 1c47a568687..66d16f3cd0e 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/ca.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/ca.rs @@ -9,7 +9,7 @@ //! Sample file: //! -use icu_datetime::provider::neo::marker_attrs::{Context, Length, PatternLength}; +use icu::datetime::provider::neo::marker_attrs::{Context, Length, PatternLength}; use serde::Deserialize; use std::borrow::Cow; use std::collections::BTreeMap; diff --git a/provider/datagen/src/transform/cldr/cldr_serde/coverage_levels.rs b/provider/datagen/src/transform/cldr/cldr_serde/coverage_levels.rs index 650589b2d64..3241b1c8fc7 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/coverage_levels.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/coverage_levels.rs @@ -10,5 +10,5 @@ use std::collections::HashMap; pub(in crate::provider) struct Resource { #[serde(rename = "coverageLevels")] pub(in crate::provider) coverage_levels: - HashMap, + HashMap, } diff --git a/provider/datagen/src/transform/cldr/cldr_serde/likely_subtags.rs b/provider/datagen/src/transform/cldr/cldr_serde/likely_subtags.rs index f5d9f7c2c20..cd6c12edcf7 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/likely_subtags.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/likely_subtags.rs @@ -7,7 +7,7 @@ //! Sample file: //! -use icu_locale_core::LanguageIdentifier; +use icu::locale::LanguageIdentifier; use serde::Deserialize; use std::collections::HashMap; diff --git a/provider/datagen/src/transform/cldr/cldr_serde/locale_resource.rs b/provider/datagen/src/transform/cldr/cldr_serde/locale_resource.rs index c385f7758b4..a8c2512f37a 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/locale_resource.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/locale_resource.rs @@ -4,7 +4,7 @@ use std::marker::PhantomData; -use icu_locale_core::LanguageIdentifier; +use icu::locale::LanguageIdentifier; use serde::de::Error; use serde::de::MapAccess; use serde::de::Visitor; diff --git a/provider/datagen/src/transform/cldr/cldr_serde/parent_locales.rs b/provider/datagen/src/transform/cldr/cldr_serde/parent_locales.rs index b99f5aba85e..05e816a4417 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/parent_locales.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/parent_locales.rs @@ -7,7 +7,7 @@ //! Sample file: //! -use icu_locale_core::LanguageIdentifier; +use icu::locale::LanguageIdentifier; use serde::Deserialize; use std::collections::{BTreeMap, HashMap}; diff --git a/provider/datagen/src/transform/cldr/cldr_serde/plural_ranges.rs b/provider/datagen/src/transform/cldr/cldr_serde/plural_ranges.rs index 35aa9e13bbd..ef272fc7949 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/plural_ranges.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/plural_ranges.rs @@ -7,7 +7,7 @@ //! Sample file: //! -use icu_locale_core::LanguageIdentifier; +use icu::locale::LanguageIdentifier; use serde::{de::Visitor, Deserialize}; use std::collections::HashMap; diff --git a/provider/datagen/src/transform/cldr/cldr_serde/plurals.rs b/provider/datagen/src/transform/cldr/cldr_serde/plurals.rs index d988a763b78..f9ad72f176e 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/plurals.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/plurals.rs @@ -7,7 +7,7 @@ //! Sample file: //! -use icu_locale_core::LanguageIdentifier; +use icu::locale::LanguageIdentifier; use serde::Deserialize; use std::collections::HashMap; diff --git a/provider/datagen/src/transform/cldr/cldr_serde/time_zones/bcp47_tzid.rs b/provider/datagen/src/transform/cldr/cldr_serde/time_zones/bcp47_tzid.rs index d63d41e17b2..1e931846fa4 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/time_zones/bcp47_tzid.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/time_zones/bcp47_tzid.rs @@ -7,7 +7,7 @@ //! Sample file: //! -use icu_datetime::provider::time_zones::TimeZoneBcp47Id; +use icu::datetime::provider::time_zones::TimeZoneBcp47Id; use serde::Deserialize; use std::collections::BTreeMap; diff --git a/provider/datagen/src/transform/cldr/cldr_serde/time_zones/meta_zones.rs b/provider/datagen/src/transform/cldr/cldr_serde/time_zones/meta_zones.rs index d33bb81aa6a..600d1a7fdac 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/time_zones/meta_zones.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/time_zones/meta_zones.rs @@ -7,7 +7,7 @@ //! Sample file: //! -use icu_datetime::provider::time_zones::MetazoneId; +use icu::datetime::provider::time_zones::MetazoneId; use serde::Deserialize; use std::collections::BTreeMap; diff --git a/provider/datagen/src/transform/cldr/cldr_serde/transforms.rs b/provider/datagen/src/transform/cldr/cldr_serde/transforms.rs index 608d280adea..d4ad3a89c8f 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/transforms.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/transforms.rs @@ -4,7 +4,7 @@ use std::fmt::Display; -use icu_locale_core::Locale; +use icu::locale::Locale; use serde::{Deserialize, Deserializer}; #[derive(PartialEq, Debug, Deserialize)] diff --git a/provider/datagen/src/transform/cldr/cldr_serde/week_data.rs b/provider/datagen/src/transform/cldr/cldr_serde/week_data.rs index 6231099f3a3..44bc4d5f60f 100644 --- a/provider/datagen/src/transform/cldr/cldr_serde/week_data.rs +++ b/provider/datagen/src/transform/cldr/cldr_serde/week_data.rs @@ -8,7 +8,7 @@ //! `` use core::convert::TryFrom; -use icu_locale_core::{subtags::region, subtags::Region}; +use icu::locale::{subtags::region, subtags::Region}; use serde::{Deserialize, Deserializer}; use std::collections::BTreeMap; use std::num::ParseIntError; @@ -26,9 +26,9 @@ pub(in crate::provider) enum Weekday { Sun, } -impl From<&Weekday> for icu_calendar::types::IsoWeekday { +impl From<&Weekday> for icu::calendar::types::IsoWeekday { fn from(day: &Weekday) -> Self { - use icu_calendar::types::IsoWeekday; + use icu::calendar::types::IsoWeekday; match day { Weekday::Mon => IsoWeekday::Monday, Weekday::Tue => IsoWeekday::Tuesday, @@ -41,7 +41,7 @@ impl From<&Weekday> for icu_calendar::types::IsoWeekday { } } -impl From for icu_calendar::types::IsoWeekday { +impl From for icu::calendar::types::IsoWeekday { fn from(day: Weekday) -> Self { (&day).into() } @@ -51,7 +51,7 @@ impl From for icu_calendar::types::IsoWeekday { /// /// For example the "AD" in "weekData": { "minDays": { "AD": 4, } } /// -/// The contained types are strings rather than [`icu_locale_core::subtags::Region`] +/// The contained types are strings rather than [`icu::locale::subtags::Region`] /// to avoid an extra parsing step of the variant in data providers. #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] pub(in crate::provider) enum Territory { diff --git a/provider/datagen/src/transform/cldr/currency/essentials.rs b/provider/datagen/src/transform/cldr/currency/essentials.rs index 43e1ac289a6..51359fb9360 100644 --- a/provider/datagen/src/transform/cldr/currency/essentials.rs +++ b/provider/datagen/src/transform/cldr/currency/essentials.rs @@ -25,12 +25,12 @@ use icu_pattern::DoublePlaceholderKey; use icu_pattern::Pattern; use icu_pattern::PatternItemCow; -use icu_experimental::dimension::provider::ule::MAX_PLACEHOLDER_INDEX; -use icu_properties::sets::load_for_general_category_group; -use icu_properties::GeneralCategoryGroup; +use icu::experimental::dimension::provider::ule::MAX_PLACEHOLDER_INDEX; +use icu::properties::sets::load_for_general_category_group; +use icu::properties::GeneralCategoryGroup; use icu_provider::DataProvider; -use icu_experimental::dimension::provider::currency::*; +use icu::experimental::dimension::provider::currency::*; use icu_provider::prelude::*; /// Returns the pattern selection for a currency. @@ -347,8 +347,8 @@ fn test_basic() { (short_placeholder, narrow_placeholder) } - use icu_experimental::dimension::provider::currency::*; - use icu_locale_core::langid; + use icu::experimental::dimension::provider::currency::*; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/cldr/currency/extended.rs b/provider/datagen/src/transform/cldr/currency/extended.rs index 3b771006920..7e7bfe58f37 100644 --- a/provider/datagen/src/transform/cldr/currency/extended.rs +++ b/provider/datagen/src/transform/cldr/currency/extended.rs @@ -9,11 +9,11 @@ use std::borrow::Cow; use std::collections::BTreeMap; use std::collections::HashSet; -use icu_experimental::dimension::provider::extended_currency::Count; +use icu::experimental::dimension::provider::extended_currency::Count; use icu_provider::datagen::IterableDataProvider; use tinystr::TinyAsciiStr; -use icu_experimental::dimension::provider::extended_currency::*; +use icu::experimental::dimension::provider::extended_currency::*; use icu_provider::prelude::*; use icu_provider::DataProvider; @@ -121,7 +121,7 @@ impl IterableDataProvider for DatagenProvider { #[test] fn test_basic() { - use icu_locale_core::langid; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); let en: DataPayload = provider diff --git a/provider/datagen/src/transform/cldr/datetime/mod.rs b/provider/datagen/src/transform/cldr/datetime/mod.rs index bf836b3d3a9..70abb0146f8 100644 --- a/provider/datagen/src/transform/cldr/datetime/mod.rs +++ b/provider/datagen/src/transform/cldr/datetime/mod.rs @@ -6,10 +6,10 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; use either::Either; -use icu_datetime::provider::calendar::*; -use icu_locale_core::extensions::unicode::Value; -use icu_locale_core::extensions::unicode::{key, value}; -use icu_locale_core::LanguageIdentifier; +use icu::datetime::provider::calendar::*; +use icu::locale::extensions::unicode::Value; +use icu::locale::extensions::unicode::{key, value}; +use icu::locale::LanguageIdentifier; use icu_provider::prelude::*; use std::collections::HashMap; use std::collections::HashSet; @@ -23,10 +23,10 @@ mod symbols; pub(in crate::provider) mod week_data; pub(in crate::provider) static SUPPORTED_CALS: OnceLock< - HashMap, + HashMap, > = OnceLock::new(); -fn supported_cals() -> &'static HashMap { +fn supported_cals() -> &'static HashMap { SUPPORTED_CALS.get_or_init(|| { [ (value!("buddhist"), "buddhist"), @@ -252,8 +252,8 @@ macro_rules! impl_data_provider { // TODO(#3212): Remove if $marker::INFO == TimeLengthsV1Marker::INFO { r.retain(|(l, _)| { - l.get_langid() != icu_locale_core::langid!("byn") - && l.get_langid() != icu_locale_core::langid!("ssy") + l.get_langid() != icu::locale::langid!("byn") + && l.get_langid() != icu::locale::langid!("ssy") }); } @@ -394,7 +394,7 @@ impl_data_provider!( #[cfg(test)] mod test { use super::*; - use icu_locale_core::langid; + use icu::locale::langid; #[test] fn test_basic_patterns() { @@ -428,8 +428,8 @@ mod test { #[test] fn test_datetime_skeletons() { - use icu_datetime::pattern::runtime::{Pattern, PluralPattern}; - use icu_plurals::PluralCategory; + use icu::datetime::pattern::runtime::{Pattern, PluralPattern}; + use icu::plurals::PluralCategory; use std::convert::TryFrom; let provider = DatagenProvider::new_testing(); @@ -471,7 +471,7 @@ mod test { #[test] fn test_basic_symbols() { - use icu_calendar::types::MonthCode; + use icu::calendar::types::MonthCode; use tinystr::tinystr; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/cldr/datetime/neo.rs b/provider/datagen/src/transform/cldr/datetime/neo.rs index cdb77004f70..298d48f6882 100644 --- a/provider/datagen/src/transform/cldr/datetime/neo.rs +++ b/provider/datagen/src/transform/cldr/datetime/neo.rs @@ -6,12 +6,14 @@ use super::supported_cals; use crate::provider::transform::cldr::cldr_serde::ca; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_datetime::pattern::{self, CoarseHourCycle}; +use icu::datetime::pattern::{self, CoarseHourCycle}; -use icu_datetime::provider::calendar::{patterns::GenericLengthPatternsV1, DateSkeletonPatternsV1}; -use icu_datetime::provider::neo::marker_attrs::{self, Context, Length, PatternLength}; -use icu_datetime::provider::neo::*; -use icu_locale_core::{ +use icu::datetime::provider::calendar::{ + patterns::GenericLengthPatternsV1, DateSkeletonPatternsV1, +}; +use icu::datetime::provider::neo::marker_attrs::{self, Context, Length, PatternLength}; +use icu::datetime::provider::neo::*; +use icu::locale::{ extensions::unicode::{value, Value}, LanguageIdentifier, }; @@ -534,7 +536,7 @@ fn months_convert( /// Given a lengthpattern, apply any numeric overrides it may have to `pattern` fn apply_numeric_overrides(lp: &ca::LengthPattern, pattern: &mut pattern::runtime::Pattern) { - use icu_datetime::fields::{self, FieldLength, FieldNumericOverrides::*, FieldSymbol}; + use icu::datetime::fields::{self, FieldLength, FieldNumericOverrides::*, FieldSymbol}; let ca::LengthPattern::WithNumberingSystems { ref numbering_systems, .. diff --git a/provider/datagen/src/transform/cldr/datetime/neo_skeleton.rs b/provider/datagen/src/transform/cldr/datetime/neo_skeleton.rs index e6f8869d44a..9ad972fb2a8 100644 --- a/provider/datagen/src/transform/cldr/datetime/neo_skeleton.rs +++ b/provider/datagen/src/transform/cldr/datetime/neo_skeleton.rs @@ -6,16 +6,16 @@ use std::collections::HashSet; use crate::provider::{DatagenProvider, IterableDataProviderCached}; use either::Either; -use icu_datetime::neo_skeleton::{ +use icu::datetime::neo_skeleton::{ NeoDateComponents, NeoDateSkeleton, NeoSkeletonLength, NeoTimeComponents, NeoTimeSkeleton, }; -use icu_datetime::pattern::runtime::PatternPlurals; -use icu_datetime::provider::calendar::{DateLengthsV1, DateSkeletonPatternsV1, TimeLengthsV1}; -use icu_datetime::provider::neo::TimeNeoSkeletonPatternsV1Marker; -use icu_datetime::provider::neo::*; -use icu_datetime::DateTimeFormatterOptions; -use icu_locale_core::extensions::unicode::{value, Value}; -use icu_locale_core::LanguageIdentifier; +use icu::datetime::pattern::runtime::PatternPlurals; +use icu::datetime::provider::calendar::{DateLengthsV1, DateSkeletonPatternsV1, TimeLengthsV1}; +use icu::datetime::provider::neo::TimeNeoSkeletonPatternsV1Marker; +use icu::datetime::provider::neo::*; +use icu::datetime::DateTimeFormatterOptions; +use icu::locale::extensions::unicode::{value, Value}; +use icu::locale::LanguageIdentifier; use icu_provider::prelude::*; use tinystr::TinyAsciiStr; diff --git a/provider/datagen/src/transform/cldr/datetime/patterns.rs b/provider/datagen/src/transform/cldr/datetime/patterns.rs index 6f7641f0167..9e0cc980758 100644 --- a/provider/datagen/src/transform/cldr/datetime/patterns.rs +++ b/provider/datagen/src/transform/cldr/datetime/patterns.rs @@ -3,9 +3,9 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::provider::transform::cldr::cldr_serde; -use icu_datetime::pattern; -use icu_datetime::pattern::CoarseHourCycle; -use icu_datetime::provider::calendar::*; +use icu::datetime::pattern; +use icu::datetime::pattern::CoarseHourCycle; +use icu::datetime::provider::calendar::*; impl From<&cldr_serde::ca::LengthPatterns> for patterns::LengthPatternsV1<'_> { fn from(other: &cldr_serde::ca::LengthPatterns) -> Self { diff --git a/provider/datagen/src/transform/cldr/datetime/skeletons.rs b/provider/datagen/src/transform/cldr/datetime/skeletons.rs index 0d1338cd906..71d95c9fd3c 100644 --- a/provider/datagen/src/transform/cldr/datetime/skeletons.rs +++ b/provider/datagen/src/transform/cldr/datetime/skeletons.rs @@ -3,11 +3,11 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::provider::transform::cldr::cldr_serde; -use icu_datetime::pattern::runtime::{PatternPlurals, PluralPattern}; -use icu_datetime::provider::calendar::*; -use icu_datetime::skeleton::reference::Skeleton; -use icu_datetime::skeleton::SkeletonError; -use icu_plurals::PluralCategory; +use icu::datetime::pattern::runtime::{PatternPlurals, PluralPattern}; +use icu::datetime::provider::calendar::*; +use icu::datetime::skeleton::reference::Skeleton; +use icu::datetime::skeleton::SkeletonError; +use icu::plurals::PluralCategory; use std::collections::HashMap; use std::convert::TryFrom; diff --git a/provider/datagen/src/transform/cldr/datetime/symbols.rs b/provider/datagen/src/transform/cldr/datetime/symbols.rs index 92530db904e..623f3f11807 100644 --- a/provider/datagen/src/transform/cldr/datetime/symbols.rs +++ b/provider/datagen/src/transform/cldr/datetime/symbols.rs @@ -3,8 +3,8 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::provider::transform::cldr::cldr_serde::{self, ca}; -use icu_calendar::types::MonthCode; -use icu_datetime::provider::calendar::*; +use icu::calendar::types::MonthCode; +use icu::datetime::provider::calendar::*; use std::borrow::Cow; use std::collections::BTreeMap; use tinystr::{tinystr, TinyStr16, TinyStr4}; diff --git a/provider/datagen/src/transform/cldr/datetime/week_data.rs b/provider/datagen/src/transform/cldr/datetime/week_data.rs index b75a6bad582..8cf294f7a7e 100644 --- a/provider/datagen/src/transform/cldr/datetime/week_data.rs +++ b/provider/datagen/src/transform/cldr/datetime/week_data.rs @@ -8,10 +8,10 @@ use crate::provider::transform::cldr::cldr_serde::{ }; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_calendar::provider::{ +use icu::calendar::provider::{ WeekDataV1, WeekDataV1Marker, WeekDataV2, WeekDataV2Marker, WeekdaySet, }; -use icu_locale_core::LanguageIdentifier; +use icu::locale::LanguageIdentifier; use icu_provider::prelude::*; use std::collections::HashSet; @@ -81,8 +81,8 @@ impl DataProvider for DatagenProvider { #[test] fn basic_cldr_week_data() { - use icu_calendar::types::IsoWeekday; - use icu_locale_core::langid; + use icu::calendar::types::IsoWeekday; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); @@ -148,7 +148,7 @@ impl DataProvider for DatagenProvider { .read_and_parse("supplemental/weekData.json")?; let week_data = &week_data.supplemental.week_data; - let first_weekday: icu_calendar::types::IsoWeekday = week_data + let first_weekday: icu::calendar::types::IsoWeekday = week_data .first_day .get(&territory) .or_else(|| week_data.first_day.get(&DEFAULT_TERRITORY)) @@ -206,9 +206,9 @@ impl IterableDataProviderCached for DatagenProvider { #[test] fn test_basic_cldr_week_data_v2() { - use icu_calendar::provider::WeekdaySet; - use icu_calendar::types::IsoWeekday::*; - use icu_locale_core::langid; + use icu::calendar::provider::WeekdaySet; + use icu::calendar::types::IsoWeekday::*; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/cldr/decimal/compact.rs b/provider/datagen/src/transform/cldr/decimal/compact.rs index 35c516c972d..f652f2290ea 100644 --- a/provider/datagen/src/transform/cldr/decimal/compact.rs +++ b/provider/datagen/src/transform/cldr/decimal/compact.rs @@ -5,8 +5,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_experimental::compactdecimal::provider::*; -use icu_locale_core::{extensions::unicode::key, subtags::Subtag}; +use icu::experimental::compactdecimal::provider::*; +use icu::locale::{extensions::unicode::key, subtags::Subtag}; use icu_provider::prelude::*; use std::collections::HashSet; use std::convert::TryFrom; @@ -127,7 +127,7 @@ impl IterableDataProviderCached for Datage mod tests { use super::*; - use icu_locale_core::langid; + use icu::locale::langid; use std::borrow::Cow; use zerofrom::ZeroFrom; use zerovec::ule::AsULE; diff --git a/provider/datagen/src/transform/cldr/decimal/compact_decimal_pattern.rs b/provider/datagen/src/transform/cldr/decimal/compact_decimal_pattern.rs index 028e3ae8a1d..9b8399cebf7 100644 --- a/provider/datagen/src/transform/cldr/decimal/compact_decimal_pattern.rs +++ b/provider/datagen/src/transform/cldr/decimal/compact_decimal_pattern.rs @@ -3,8 +3,8 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::provider::transform::cldr::cldr_serde::numbers::DecimalFormat; -use icu_experimental::compactdecimal::provider::CompactDecimalPatternDataV1; -use icu_experimental::compactdecimal::provider::*; +use icu::experimental::compactdecimal::provider::CompactDecimalPatternDataV1; +use icu::experimental::compactdecimal::provider::*; use itertools::Itertools; use std::borrow::Cow; use std::collections::BTreeMap; diff --git a/provider/datagen/src/transform/cldr/decimal/decimal_pattern.rs b/provider/datagen/src/transform/cldr/decimal/decimal_pattern.rs index 977af2181c4..6df889047b4 100644 --- a/provider/datagen/src/transform/cldr/decimal/decimal_pattern.rs +++ b/provider/datagen/src/transform/cldr/decimal/decimal_pattern.rs @@ -7,7 +7,7 @@ //! Spec reference: use displaydoc::Display; -use icu_decimal::provider::AffixesV1; +use icu::decimal::provider::AffixesV1; #[cfg(feature = "experimental_components")] use icu_pattern::{DoublePlaceholderKey, PatternItemCow}; use itertools::Itertools; diff --git a/provider/datagen/src/transform/cldr/decimal/mod.rs b/provider/datagen/src/transform/cldr/decimal/mod.rs index 89d053a5414..4f8f2e0007e 100644 --- a/provider/datagen/src/transform/cldr/decimal/mod.rs +++ b/provider/datagen/src/transform/cldr/decimal/mod.rs @@ -6,10 +6,10 @@ use std::collections::HashSet; use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; -use icu_locale::subtags::Subtag; -use icu_locale_core::extensions::unicode::key; -use icu_locale_core::extensions::unicode::Value; -use icu_locale_core::LanguageIdentifier; +use icu::locale::extensions::unicode::key; +use icu::locale::extensions::unicode::Value; +use icu::locale::subtags::Subtag; +use icu::locale::LanguageIdentifier; use icu_provider::prelude::*; use tinystr::TinyAsciiStr; diff --git a/provider/datagen/src/transform/cldr/decimal/symbols.rs b/provider/datagen/src/transform/cldr/decimal/symbols.rs index 74cded9d679..70f963f43e7 100644 --- a/provider/datagen/src/transform/cldr/decimal/symbols.rs +++ b/provider/datagen/src/transform/cldr/decimal/symbols.rs @@ -5,8 +5,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_decimal::provider::*; -use icu_locale_core::{extensions::unicode::key, subtags::Subtag}; +use icu::decimal::provider::*; +use icu::locale::{extensions::unicode::key, subtags::Subtag}; use icu_provider::prelude::*; use std::borrow::Cow; use std::collections::HashSet; @@ -99,7 +99,7 @@ impl TryFrom> for DecimalSymbolsV1<'static> { #[test] fn test_basic() { - use icu_locale_core::langid; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/cldr/displaynames/language.rs b/provider/datagen/src/transform/cldr/displaynames/language.rs index 4540579da72..27708b44a96 100644 --- a/provider/datagen/src/transform/cldr/displaynames/language.rs +++ b/provider/datagen/src/transform/cldr/displaynames/language.rs @@ -6,8 +6,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_experimental::displaynames::provider::*; -use icu_locale_core::subtags::Language; +use icu::experimental::displaynames::provider::*; +use icu::locale::subtags::Language; use icu_provider::prelude::*; use std::collections::{BTreeMap, HashSet}; use zerovec::ule::UnvalidatedStr; @@ -205,7 +205,7 @@ impl From<&cldr_serde::displaynames::language::Resource> for LocaleDisplayNamesV #[cfg(test)] mod tests { use super::*; - use icu_locale_core::{langid, subtags::language}; + use icu::locale::{langid, subtags::language}; #[test] fn test_basic_lang_display_names() { diff --git a/provider/datagen/src/transform/cldr/displaynames/region.rs b/provider/datagen/src/transform/cldr/displaynames/region.rs index ebaf999d9f1..5a0ec6bd679 100644 --- a/provider/datagen/src/transform/cldr/displaynames/region.rs +++ b/provider/datagen/src/transform/cldr/displaynames/region.rs @@ -6,8 +6,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; use core::convert::TryFrom; -use icu_experimental::displaynames::provider::*; -use icu_locale_core::subtags::Region; +use icu::experimental::displaynames::provider::*; +use icu::locale::subtags::Region; use icu_provider::prelude::*; use std::collections::{BTreeMap, HashSet}; use std::str::FromStr; @@ -61,7 +61,7 @@ const ALT_SUBSTRING: &str = "-alt-"; const SHORT_SUBSTRING: &str = "-alt-short"; impl TryFrom<&cldr_serde::displaynames::region::Resource> for RegionDisplayNamesV1<'static> { - type Error = icu_locale_core::ParseError; + type Error = icu::locale::ParseError; fn try_from(other: &cldr_serde::displaynames::region::Resource) -> Result { let mut names = BTreeMap::new(); let mut short_names = BTreeMap::new(); @@ -91,7 +91,7 @@ impl TryFrom<&cldr_serde::displaynames::region::Resource> for RegionDisplayNames #[cfg(test)] mod tests { use super::*; - use icu_locale_core::{langid, subtags::region}; + use icu::locale::{langid, subtags::region}; #[test] fn test_basic() { diff --git a/provider/datagen/src/transform/cldr/displaynames/script.rs b/provider/datagen/src/transform/cldr/displaynames/script.rs index 81c246bafa2..6220bf437c9 100644 --- a/provider/datagen/src/transform/cldr/displaynames/script.rs +++ b/provider/datagen/src/transform/cldr/displaynames/script.rs @@ -6,8 +6,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; use core::convert::TryFrom; -use icu_experimental::displaynames::provider::*; -use icu_locale_core::{subtags::Script, ParseError}; +use icu::experimental::displaynames::provider::*; +use icu::locale::{subtags::Script, ParseError}; use icu_provider::prelude::*; use std::collections::{BTreeMap, HashSet}; use std::str::FromStr; @@ -93,7 +93,7 @@ impl TryFrom<&cldr_serde::displaynames::script::Resource> for ScriptDisplayNames #[cfg(test)] mod tests { use super::*; - use icu_locale_core::{langid, subtags::script}; + use icu::locale::{langid, subtags::script}; #[test] fn test_basic_script_display_names() { diff --git a/provider/datagen/src/transform/cldr/displaynames/variant.rs b/provider/datagen/src/transform/cldr/displaynames/variant.rs index 1ba4ce80602..5f974e744e2 100644 --- a/provider/datagen/src/transform/cldr/displaynames/variant.rs +++ b/provider/datagen/src/transform/cldr/displaynames/variant.rs @@ -6,8 +6,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; use core::convert::TryFrom; -use icu_experimental::displaynames::provider::*; -use icu_locale_core::{subtags::Variant, ParseError}; +use icu::experimental::displaynames::provider::*; +use icu::locale::{subtags::Variant, ParseError}; use icu_provider::prelude::*; use std::collections::{BTreeMap, HashSet}; use std::str::FromStr; @@ -83,7 +83,7 @@ impl TryFrom<&cldr_serde::displaynames::variant::Resource> for VariantDisplayNam #[cfg(test)] mod tests { use super::*; - use icu_locale_core::{langid, subtags::variant}; + use icu::locale::{langid, subtags::variant}; #[test] fn test_basic_variant_display_names() { diff --git a/provider/datagen/src/transform/cldr/fallback/mod.rs b/provider/datagen/src/transform/cldr/fallback/mod.rs index e9195d9fa18..d8d3685f243 100644 --- a/provider/datagen/src/transform/cldr/fallback/mod.rs +++ b/provider/datagen/src/transform/cldr/fallback/mod.rs @@ -6,8 +6,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use super::locale_canonicalizer::likely_subtags::LikelySubtagsResources; -use icu_locale::provider::*; -use icu_locale_core::{ +use icu::locale::provider::*; +use icu::locale::{ subtags::{Language, Region, Script}, LanguageIdentifier, }; @@ -163,7 +163,7 @@ impl From<&cldr_serde::parent_locales::Resource> for LocaleFallbackParentsV1<'st #[test] fn test_basic() { - use icu_locale_core::{ + use icu::locale::{ langid, subtags::{language, region, script}, }; diff --git a/provider/datagen/src/transform/cldr/list/mod.rs b/provider/datagen/src/transform/cldr/list/mod.rs index 810e2440796..a4192aa057a 100644 --- a/provider/datagen/src/transform/cldr/list/mod.rs +++ b/provider/datagen/src/transform/cldr/list/mod.rs @@ -5,8 +5,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_list::provider::*; -use icu_locale_core::subtags::language; +use icu::list::provider::*; +use icu::locale::subtags::language; use icu_provider::prelude::*; use std::borrow::Cow; use std::collections::HashSet; @@ -89,11 +89,11 @@ fn load>>( // Cannot cache this because it depends on `selff`. However we don't expect many Hebrew locales. let non_hebrew = SerdeDFA::new(Cow::Owned(format!( "[^{}]", - icu_properties::maps::load_script(selff) + icu::properties::maps::load_script(selff) .map_err(|e| DataError::custom("data for CodePointTrie of Script") .with_display_context(&e))? .as_borrowed() - .get_set_for_value(icu_properties::Script::Hebrew) + .get_set_for_value(icu::properties::Script::Hebrew) .as_borrowed() .iter_ranges() .map(|range| format!(r#"\u{:04x}-\u{:04x}"#, range.start(), range.end())) diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs index 2c94dcb1917..ba14512f39e 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs @@ -4,8 +4,8 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; -use icu_locale::provider::*; -use icu_locale_core::{ +use icu::locale::provider::*; +use icu::locale::{ subtags::{self, language}, LanguageIdentifier, }; @@ -282,10 +282,10 @@ impl From<&cldr_serde::aliases::Resource> for AliasesV2<'_> { #[test] fn test_appendix_c_cmp() { - let en = icu_locale_core::langid!("en-GB"); - let ca = icu_locale_core::langid!("ca"); + let en = icu::locale::langid!("en-GB"); + let ca = icu::locale::langid!("ca"); let und = "und-hepburn-heploc".parse::().unwrap(); - let fr = icu_locale_core::langid!("fr-CA"); + let fr = icu::locale::langid!("fr-CA"); let mut rules = vec![&en, &ca, &und, &fr]; rules.sort_unstable_by_key(|&l| appendix_c_cmp(l)); @@ -295,7 +295,7 @@ fn test_appendix_c_cmp() { #[test] fn test_basic() { - use icu_locale_core::subtags::{language, region, script}; + use icu::locale::subtags::{language, region, script}; let provider = DatagenProvider::new_testing(); let data: DataResponse = provider.load(Default::default()).unwrap(); diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs index 33073055c68..c9befed92ce 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs @@ -6,7 +6,7 @@ use std::collections::HashSet; use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; -use icu_locale::provider::*; +use icu::locale::provider::*; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; @@ -52,7 +52,7 @@ impl From<&cldr_serde::directionality::Resource> for ScriptDirectionV1<'_> { #[test] fn test_basic() { - use icu_locale_core::subtags::script; + use icu::locale::subtags::script; let provider = DatagenProvider::new_testing(); let data: DataResponse = provider.load(Default::default()).unwrap(); diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs index dbc9f65e320..1314fac74a8 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs @@ -5,9 +5,9 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::CoverageLevel; use crate::provider::DatagenProvider; -use icu_locale::provider::*; -use icu_locale_core::subtags::Language; -use icu_locale_core::LanguageIdentifier; +use icu::locale::provider::*; +use icu::locale::subtags::Language; +use icu::locale::LanguageIdentifier; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; use std::collections::{BTreeMap, HashSet}; @@ -256,16 +256,16 @@ pub(in crate::provider) fn transform<'x>( .map(|(k, v)| (k.to_unvalidated(), v)) .collect(), und: und.unwrap_or(( - icu_locale_core::subtags::language!("und"), - icu_locale_core::subtags::script!("Zzzz"), - icu_locale_core::subtags::region!("ZZ"), + icu::locale::subtags::language!("und"), + icu::locale::subtags::script!("Zzzz"), + icu::locale::subtags::region!("ZZ"), )), } } #[test] fn test_basic() { - use icu_locale_core::subtags::{language, region, script}; + use icu::locale::subtags::{language, region, script}; let provider = DatagenProvider::new_testing(); let result_common: DataResponse = diff --git a/provider/datagen/src/transform/cldr/percent/mod.rs b/provider/datagen/src/transform/cldr/percent/mod.rs index 233ae44bf28..8a2c7edd20c 100644 --- a/provider/datagen/src/transform/cldr/percent/mod.rs +++ b/provider/datagen/src/transform/cldr/percent/mod.rs @@ -8,7 +8,7 @@ use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_experimental::dimension::provider::percent::*; +use icu::experimental::dimension::provider::percent::*; use icu_provider::prelude::*; use icu_provider::DataProvider; use tinystr::tinystr; @@ -109,8 +109,8 @@ fn extract_percent_essentials<'data>( #[test] fn test_basic() { - use icu_experimental::dimension::provider::percent::*; - use icu_locale_core::langid; + use icu::experimental::dimension::provider::percent::*; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/cldr/personnames/person_names_format_data_providers.rs b/provider/datagen/src/transform/cldr/personnames/person_names_format_data_providers.rs index b93100f9441..9ffeb2bd350 100644 --- a/provider/datagen/src/transform/cldr/personnames/person_names_format_data_providers.rs +++ b/provider/datagen/src/transform/cldr/personnames/person_names_format_data_providers.rs @@ -6,7 +6,7 @@ use core::convert::TryFrom; use std::borrow::Cow; use std::collections::HashSet; -use icu_experimental::personnames::provider::*; +use icu::experimental::personnames::provider::*; use icu_provider::prelude::*; use zerovec::VarZeroVec; @@ -153,7 +153,7 @@ impl TryFrom<&'_ Resource> for PersonNamesFormatV1<'_> { #[cfg(test)] mod tests { - use icu_locale_core::langid; + use icu::locale::langid; use zerofrom::ZeroFrom; use super::*; diff --git a/provider/datagen/src/transform/cldr/plurals/mod.rs b/provider/datagen/src/transform/cldr/plurals/mod.rs index 3ea2e22db8f..a95bb75839b 100644 --- a/provider/datagen/src/transform/cldr/plurals/mod.rs +++ b/provider/datagen/src/transform/cldr/plurals/mod.rs @@ -8,8 +8,8 @@ use std::collections::HashSet; use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_plurals::rules::runtime::ast::Rule; -use icu_plurals::{provider::*, PluralCategory}; +use icu::plurals::rules::runtime::ast::Rule; +use icu::plurals::{provider::*, PluralCategory}; use icu_provider::prelude::*; use zerovec::ZeroMap; @@ -177,7 +177,7 @@ impl From<&cldr_serde::plural_ranges::LocalePluralRanges> for PluralRangesV1<'st #[test] fn test_basic() { - use icu_locale_core::langid; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); @@ -207,7 +207,7 @@ fn test_basic() { #[test] fn test_ranges() { - use icu_locale_core::langid; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/cldr/relativetime/mod.rs b/provider/datagen/src/transform/cldr/relativetime/mod.rs index 8876142251d..2592b0a4414 100644 --- a/provider/datagen/src/transform/cldr/relativetime/mod.rs +++ b/provider/datagen/src/transform/cldr/relativetime/mod.rs @@ -7,7 +7,7 @@ use std::borrow::Borrow; use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_experimental::relativetime::provider::*; +use icu::experimental::relativetime::provider::*; use icu_provider::prelude::*; use std::collections::{BTreeMap, HashMap, HashSet}; use std::str::FromStr; @@ -198,7 +198,7 @@ make_data_provider!( #[cfg(test)] mod tests { use super::*; - use icu_locale_core::langid; + use icu::locale::langid; #[test] fn test_basic() { diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs index deeab061d13..6ab9619a35c 100644 --- a/provider/datagen/src/transform/cldr/source.rs +++ b/provider/datagen/src/transform/cldr/source.rs @@ -6,13 +6,13 @@ use crate::provider::source::SerdeCache; use crate::provider::CoverageLevel; -use icu_calendar::provider::EraStartDate; -use icu_locale::provider::{ +use icu::calendar::provider::EraStartDate; +use icu::locale::provider::{ LikelySubtagsExtendedV1Marker, LikelySubtagsForLanguageV1Marker, LikelySubtagsForScriptRegionV1Marker, }; -use icu_locale::LocaleExpander; -use icu_locale_core::LanguageIdentifier; +use icu::locale::LanguageIdentifier; +use icu::locale::LocaleExpander; use icu_provider::prelude::*; use icu_provider::DataError; use icu_provider_adapters::any_payload::AnyPayloadProvider; @@ -33,7 +33,7 @@ pub(in crate::provider) struct CldrCache { #[cfg(feature = "experimental_components")] // used by transforms/mod.rs pub(in crate::provider) transforms: OnceLock< - Result, DataError>, + Result, DataError>, >, } @@ -91,7 +91,7 @@ impl CldrCache { pub(in crate::provider) fn locales( &self, levels: impl IntoIterator, - ) -> Result, DataError> { + ) -> Result, DataError> { let levels = levels.into_iter().collect::>(); Ok(self .serde_cache diff --git a/provider/datagen/src/transform/cldr/time_zones/convert.rs b/provider/datagen/src/transform/cldr/time_zones/convert.rs index d5e74e69550..2666247afd8 100644 --- a/provider/datagen/src/transform/cldr/time_zones/convert.rs +++ b/provider/datagen/src/transform/cldr/time_zones/convert.rs @@ -10,13 +10,13 @@ use cldr_serde::time_zones::meta_zones::MetazoneAliasData; use cldr_serde::time_zones::meta_zones::MetazoneForPeriod; use cldr_serde::time_zones::meta_zones::ZonePeriod; use cldr_serde::time_zones::time_zone_names::*; -use icu_calendar::DateTime; -use icu_datetime::provider::time_zones::{ +use icu::calendar::DateTime; +use icu::datetime::provider::time_zones::{ ExemplarCitiesV1, MetazoneGenericNamesLongV1, MetazoneGenericNamesShortV1, MetazoneId, MetazoneSpecificNamesLongV1, MetazoneSpecificNamesShortV1, TimeZoneBcp47Id, TimeZoneFormatsV1, }; -use icu_timezone::provider::MetazonePeriodV1; -use icu_timezone::ZoneVariant; +use icu::timezone::provider::MetazonePeriodV1; +use icu::timezone::ZoneVariant; use std::borrow::Cow; use std::collections::BTreeMap; use tinystr::TinyStr8; diff --git a/provider/datagen/src/transform/cldr/time_zones/mod.rs b/provider/datagen/src/transform/cldr/time_zones/mod.rs index 4fc9381808b..5796081de22 100644 --- a/provider/datagen/src/transform/cldr/time_zones/mod.rs +++ b/provider/datagen/src/transform/cldr/time_zones/mod.rs @@ -9,10 +9,10 @@ use cldr_serde::time_zones::bcp47_tzid::Bcp47TzidAliasData; use cldr_serde::time_zones::meta_zones::MetazoneAliasData; use cldr_serde::time_zones::meta_zones::ZonePeriod; use cldr_serde::time_zones::time_zone_names::TimeZoneNames; -use icu_datetime::provider::time_zones::*; -use icu_datetime::provider::time_zones::{MetazoneId, TimeZoneBcp47Id}; +use icu::datetime::provider::time_zones::*; +use icu::datetime::provider::time_zones::{MetazoneId, TimeZoneBcp47Id}; +use icu::timezone::provider::*; use icu_provider::prelude::*; -use icu_timezone::provider::*; use std::collections::BTreeMap; use std::collections::HashSet; @@ -102,14 +102,14 @@ impl_data_provider!( #[cfg(test)] mod tests { - use icu_timezone::ZoneVariant; + use icu::timezone::ZoneVariant; use tinystr::tinystr; use super::*; #[test] fn basic_cldr_time_zones() { - use icu_locale_core::langid; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/cldr/time_zones/names.rs b/provider/datagen/src/transform/cldr/time_zones/names.rs index fa081ecfc01..0bba3e8b595 100644 --- a/provider/datagen/src/transform/cldr/time_zones/names.rs +++ b/provider/datagen/src/transform/cldr/time_zones/names.rs @@ -5,10 +5,10 @@ use super::convert::{compute_bcp47_tzids_btreemap, compute_canonical_tzids_btreemap}; use crate::provider::transform::cldr::cldr_serde; use crate::provider::DatagenProvider; +use icu::timezone::provider::names::*; +use icu::timezone::TimeZoneBcp47Id; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; -use icu_timezone::provider::names::*; -use icu_timezone::TimeZoneBcp47Id; use std::collections::BTreeMap; use std::collections::BTreeSet; use std::collections::HashSet; @@ -259,7 +259,7 @@ fn test_normalize_canonicalize_iana_coverage() { .unwrap(); let iana2bcp = &compute_bcp47_tzids_btreemap(&resource.keyword.u.time_zones.values); - let mapper = icu_timezone::TimeZoneIdMapper::try_new_unstable(&provider).unwrap(); + let mapper = icu::timezone::TimeZoneIdMapper::try_new_unstable(&provider).unwrap(); let mapper = mapper.as_borrowed(); for iana_id in iana2bcp.keys() { diff --git a/provider/datagen/src/transform/cldr/transforms/mod.rs b/provider/datagen/src/transform/cldr/transforms/mod.rs index ed7cc3c7615..ae9e671cc7c 100644 --- a/provider/datagen/src/transform/cldr/transforms/mod.rs +++ b/provider/datagen/src/transform/cldr/transforms/mod.rs @@ -5,9 +5,9 @@ use super::cldr_serde::transforms; use super::source::CldrCache; use crate::provider::DatagenProvider; -use icu_experimental::transliterate::provider::*; -use icu_experimental::transliterate::RuleCollection; -use icu_locale_core::Locale; +use icu::experimental::transliterate::provider::*; +use icu::experimental::transliterate::RuleCollection; +use icu::locale::Locale; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; use std::collections::HashSet; diff --git a/provider/datagen/src/transform/cldr/units/data.rs b/provider/datagen/src/transform/cldr/units/data.rs index 73d8f1dc5c9..d78ed06454e 100644 --- a/provider/datagen/src/transform/cldr/units/data.rs +++ b/provider/datagen/src/transform/cldr/units/data.rs @@ -8,11 +8,11 @@ use crate::provider::transform::cldr::cldr_serde::units::data::Patterns; use crate::provider::transform::cldr::cldr_serde::{self}; use crate::provider::DatagenProvider; -use icu_experimental::dimension::provider::units::{ +use icu::experimental::dimension::provider::units::{ Count, UnitsDisplayNameV1, UnitsDisplayNameV1Marker, }; -use icu_locale::LanguageIdentifier; +use icu::locale::LanguageIdentifier; use icu_provider::DataMarkerAttributes; use icu_provider::{ datagen::IterableDataProvider, DataError, DataLocale, DataPayload, DataProvider, DataRequest, @@ -143,7 +143,7 @@ impl IterableDataProvider for DatagenProvider { #[test] fn test_basic() { - use icu_locale_core::langid; + use icu::locale::langid; use icu_provider::prelude::*; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/cldr/units/helpers.rs b/provider/datagen/src/transform/cldr/units/helpers.rs index aaf8cc38c20..1f7d62ddeda 100644 --- a/provider/datagen/src/transform/cldr/units/helpers.rs +++ b/provider/datagen/src/transform/cldr/units/helpers.rs @@ -5,9 +5,9 @@ use core::str::FromStr; use std::collections::{BTreeMap, VecDeque}; -use icu_experimental::units::measureunit::MeasureUnitParser; -use icu_experimental::units::provider::{ConversionInfo, Exactness, Sign}; -use icu_experimental::units::ratio::IcuRatio; +use icu::experimental::units::measureunit::MeasureUnitParser; +use icu::experimental::units::provider::{ConversionInfo, Exactness, Sign}; +use icu::experimental::units::ratio::IcuRatio; use icu_provider::DataError; use num_traits::One; use num_traits::Signed; diff --git a/provider/datagen/src/transform/cldr/units/info.rs b/provider/datagen/src/transform/cldr/units/info.rs index d9d6dd5890d..ef04a5d52c6 100644 --- a/provider/datagen/src/transform/cldr/units/info.rs +++ b/provider/datagen/src/transform/cldr/units/info.rs @@ -9,7 +9,7 @@ use crate::provider::transform::cldr::{ units::helpers::ScientificNumber, }; use crate::provider::DatagenProvider; -use icu_experimental::units::{ +use icu::experimental::units::{ measureunit::MeasureUnitParser, provider::{ConversionInfo, UnitsInfoV1, UnitsInfoV1Marker}, }; @@ -105,8 +105,8 @@ impl IterableDataProvider for DatagenProvider { #[test] fn test_basic() { - use icu_experimental::units::provider::*; - use icu_locale_core::langid; + use icu::experimental::units::provider::*; + use icu::locale::langid; use icu_provider::prelude::*; use num_bigint::BigUint; use num_rational::Ratio; diff --git a/provider/datagen/src/transform/icuexport/collator/collator_serde.rs b/provider/datagen/src/transform/icuexport/collator/collator_serde.rs index ecd7e55a4f1..ed5321abb8f 100644 --- a/provider/datagen/src/transform/icuexport/collator/collator_serde.rs +++ b/provider/datagen/src/transform/icuexport/collator/collator_serde.rs @@ -2,7 +2,7 @@ // called LICENSE at the top level of the ICU4X source tree // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). -use icu_collections::codepointtrie::toml::CodePointTrieToml; +use icu::collections::codepointtrie::toml::CodePointTrieToml; /// Serde counterpart for `CollationDataV1`. #[derive(serde::Deserialize)] diff --git a/provider/datagen/src/transform/icuexport/collator/mod.rs b/provider/datagen/src/transform/icuexport/collator/mod.rs index 157d0d5310c..d49d9bf780c 100644 --- a/provider/datagen/src/transform/icuexport/collator/mod.rs +++ b/provider/datagen/src/transform/icuexport/collator/mod.rs @@ -7,16 +7,16 @@ use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_collator::provider::*; -use icu_collections::codepointtrie::CodePointTrie; -use icu_locale::provider::CollationFallbackSupplementV1Marker; -use icu_locale::provider::LocaleFallbackSupplementV1; -use icu_locale_core::extensions::unicode::{key, value}; -use icu_locale_core::subtags::language; -use icu_locale_core::subtags::Language; -use icu_locale_core::subtags::Region; -use icu_locale_core::subtags::Script; -use icu_locale_core::LanguageIdentifier; +use icu::collator::provider::*; +use icu::collections::codepointtrie::CodePointTrie; +use icu::locale::extensions::unicode::{key, value}; +use icu::locale::provider::CollationFallbackSupplementV1Marker; +use icu::locale::provider::LocaleFallbackSupplementV1; +use icu::locale::subtags::language; +use icu::locale::subtags::Language; +use icu::locale::subtags::Region; +use icu::locale::subtags::Script; +use icu::locale::LanguageIdentifier; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; use std::collections::HashSet; @@ -231,7 +231,7 @@ collation_provider!( CollationDataV1Marker, CollationData, "_data", - icu_collator::provider::CollationDataV1 { + icu::collator::provider::CollationDataV1 { trie: CodePointTrie::::try_from(&toml_data.trie) .map_err(|e| DataError::custom("trie conversion").with_display_context(&e))?, contexts: ZeroVec::alloc_from_slice(&toml_data.contexts), @@ -243,7 +243,7 @@ collation_provider!( CollationDiacriticsV1Marker, CollationDiacritics, "_dia", - icu_collator::provider::CollationDiacriticsV1 { + icu::collator::provider::CollationDiacriticsV1 { secondaries: ZeroVec::alloc_from_slice(&toml_data.secondaries), } ), @@ -251,7 +251,7 @@ collation_provider!( CollationJamoV1Marker, CollationJamo, "_jamo", - icu_collator::provider::CollationJamoV1 { + icu::collator::provider::CollationJamoV1 { ce32s: ZeroVec::alloc_from_slice(&toml_data.ce32s), } ), @@ -259,7 +259,7 @@ collation_provider!( CollationMetadataV1Marker, CollationMetadata, "_meta", - icu_collator::provider::CollationMetadataV1 { + icu::collator::provider::CollationMetadataV1 { bits: toml_data.bits, } ), @@ -267,7 +267,7 @@ collation_provider!( CollationReorderingV1Marker, CollationReordering, "_reord", - icu_collator::provider::CollationReorderingV1 { + icu::collator::provider::CollationReorderingV1 { min_high_no_reorder: toml_data.min_high_no_reorder, reorder_table: ZeroVec::alloc_from_slice(&toml_data.reorder_table), reorder_ranges: ZeroVec::alloc_from_slice(&toml_data.reorder_ranges), @@ -277,7 +277,7 @@ collation_provider!( CollationSpecialPrimariesV1Marker, CollationSpecialPrimaries, "_prim", - icu_collator::provider::CollationSpecialPrimariesV1 { + icu::collator::provider::CollationSpecialPrimariesV1 { last_primaries: ZeroVec::alloc_from_slice(&toml_data.last_primaries), numeric_primary: toml_data.numeric_primary, } diff --git a/provider/datagen/src/transform/icuexport/normalizer/mod.rs b/provider/datagen/src/transform/icuexport/normalizer/mod.rs index 8bf2f6058af..e7cd9198a9d 100644 --- a/provider/datagen/src/transform/icuexport/normalizer/mod.rs +++ b/provider/datagen/src/transform/icuexport/normalizer/mod.rs @@ -6,9 +6,9 @@ //! exported from ICU. use crate::provider::DatagenProvider; -use icu_collections::char16trie::Char16Trie; -use icu_collections::codepointtrie::CodePointTrie; -use icu_normalizer::provider::*; +use icu::collections::char16trie::Char16Trie; +use icu::collections::codepointtrie::CodePointTrie; +use icu::normalizer::provider::*; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; use std::collections::HashSet; @@ -19,7 +19,7 @@ mod normalizer_serde; macro_rules! normalization_provider { ($marker:ident, $serde_struct:ident, $file_name:literal, $conversion:expr, $toml_data:ident) => { - use icu_normalizer::provider::$marker; + use icu::normalizer::provider::$marker; impl DataProvider<$marker> for DatagenProvider { fn load(&self, req: DataRequest) -> Result, DataError> { diff --git a/provider/datagen/src/transform/icuexport/normalizer/normalizer_serde.rs b/provider/datagen/src/transform/icuexport/normalizer/normalizer_serde.rs index 165ef66c96c..9b742bd64b1 100644 --- a/provider/datagen/src/transform/icuexport/normalizer/normalizer_serde.rs +++ b/provider/datagen/src/transform/icuexport/normalizer/normalizer_serde.rs @@ -2,7 +2,7 @@ // called LICENSE at the top level of the ICU4X source tree // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). -use icu_collections::codepointtrie::toml::CodePointTrieToml; +use icu::collections::codepointtrie::toml::CodePointTrieToml; #[derive(serde::Deserialize)] pub(in crate::provider) struct DecompositionData { diff --git a/provider/datagen/src/transform/icuexport/ucase/mod.rs b/provider/datagen/src/transform/icuexport/ucase/mod.rs index a1208eb6121..3d745aff2a4 100644 --- a/provider/datagen/src/transform/icuexport/ucase/mod.rs +++ b/provider/datagen/src/transform/icuexport/ucase/mod.rs @@ -6,9 +6,9 @@ //! exported from ICU. use crate::provider::DatagenProvider; -use icu_casemap::provider::{CaseMapUnfoldV1, CaseMapUnfoldV1Marker, CaseMapV1, CaseMapV1Marker}; -use icu_collections::codepointtrie::toml::CodePointDataSlice; -use icu_collections::codepointtrie::CodePointTrieHeader; +use icu::casemap::provider::{CaseMapUnfoldV1, CaseMapUnfoldV1Marker, CaseMapV1, CaseMapV1Marker}; +use icu::collections::codepointtrie::toml::CodePointDataSlice; +use icu::collections::codepointtrie::CodePointTrieHeader; use icu_provider::prelude::*; use std::collections::HashSet; use std::convert::TryFrom; diff --git a/provider/datagen/src/transform/icuexport/ucase/ucase_serde.rs b/provider/datagen/src/transform/icuexport/ucase/ucase_serde.rs index 8e8a5ec7114..6c1d65f9538 100644 --- a/provider/datagen/src/transform/icuexport/ucase/ucase_serde.rs +++ b/provider/datagen/src/transform/icuexport/ucase/ucase_serde.rs @@ -2,7 +2,7 @@ // called LICENSE at the top level of the ICU4X source tree // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). -use icu_collections::codepointtrie::toml::CodePointTrieToml; +use icu::collections::codepointtrie::toml::CodePointTrieToml; #[derive(serde::Deserialize)] pub(in crate::provider) struct Exceptions { diff --git a/provider/datagen/src/transform/icuexport/uprops/bidi_data.rs b/provider/datagen/src/transform/icuexport/uprops/bidi_data.rs index 36c5599b566..264c681f0f9 100644 --- a/provider/datagen/src/transform/icuexport/uprops/bidi_data.rs +++ b/provider/datagen/src/transform/icuexport/uprops/bidi_data.rs @@ -5,7 +5,7 @@ use std::collections::HashSet; use crate::provider::DatagenProvider; -use icu_properties::provider::bidi_data::BidiAuxiliaryPropertiesV1Marker; +use icu::properties::provider::bidi_data::BidiAuxiliaryPropertiesV1Marker; use icu_provider::datagen::*; use icu_provider::prelude::*; @@ -35,13 +35,13 @@ impl DataProvider for DatagenProvider { &self, req: DataRequest, ) -> Result, DataError> { - use icu_codepointtrie_builder::{CodePointTrieBuilder, CodePointTrieBuilderData}; - use icu_collections::codepointinvlist::CodePointInversionListBuilder; - use icu_collections::codepointtrie::CodePointTrie; - use icu_collections::codepointtrie::TrieType; - use icu_properties::provider::bidi_data::{ + use icu::collections::codepointinvlist::CodePointInversionListBuilder; + use icu::collections::codepointtrie::CodePointTrie; + use icu::collections::codepointtrie::TrieType; + use icu::properties::provider::bidi_data::{ BidiAuxiliaryPropertiesV1, MirroredPairedBracketData, }; + use icu_codepointtrie_builder::{CodePointTrieBuilder, CodePointTrieBuilderData}; self.check_req::(req)?; @@ -120,8 +120,8 @@ impl IterableDataProvider for DatagenProvider { #[cfg(test)] mod tests { use super::*; - use icu_properties::bidi_data::{BidiAuxiliaryProperties, BidiPairingProperties}; - use icu_properties::provider::bidi_data::BidiAuxiliaryPropertiesV1Marker; + use icu::properties::bidi_data::{BidiAuxiliaryProperties, BidiPairingProperties}; + use icu::properties::provider::bidi_data::BidiAuxiliaryPropertiesV1Marker; #[test] fn test_bidi_data_provider() { diff --git a/provider/datagen/src/transform/icuexport/uprops/bin_cp_set.rs b/provider/datagen/src/transform/icuexport/uprops/bin_cp_set.rs index 9be1e0c6c81..2d6ce5512f2 100644 --- a/provider/datagen/src/transform/icuexport/uprops/bin_cp_set.rs +++ b/provider/datagen/src/transform/icuexport/uprops/bin_cp_set.rs @@ -3,8 +3,8 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::provider::DatagenProvider; -use icu_collections::codepointinvlist::CodePointInversionListBuilder; -use icu_properties::provider::*; +use icu::collections::codepointinvlist::CodePointInversionListBuilder; +use icu::properties::provider::*; use icu_provider::datagen::*; use icu_provider::prelude::*; use std::collections::HashSet; @@ -134,9 +134,9 @@ expand!( #[test] fn test_basic() { - use icu_collections::codepointinvlist::CodePointInversionList; - use icu_properties::provider::PropertyCodePointSetV1; - use icu_properties::provider::WhiteSpaceV1Marker; + use icu::collections::codepointinvlist::CodePointInversionList; + use icu::properties::provider::PropertyCodePointSetV1; + use icu::properties::provider::WhiteSpaceV1Marker; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/icuexport/uprops/bin_uniset.rs b/provider/datagen/src/transform/icuexport/uprops/bin_uniset.rs index 89dcefcd4a9..9c6dbed0a1e 100644 --- a/provider/datagen/src/transform/icuexport/uprops/bin_uniset.rs +++ b/provider/datagen/src/transform/icuexport/uprops/bin_uniset.rs @@ -3,9 +3,9 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::provider::DatagenProvider; -use icu_collections::codepointinvlist::CodePointInversionListBuilder; -use icu_collections::codepointinvliststringlist::CodePointInversionListAndStringList; -use icu_properties::provider::*; +use icu::collections::codepointinvlist::CodePointInversionListBuilder; +use icu::collections::codepointinvliststringlist::CodePointInversionListAndStringList; +use icu::properties::provider::*; use icu_provider::datagen::*; use icu_provider::prelude::*; use std::collections::HashSet; @@ -75,9 +75,9 @@ expand!((BasicEmojiV1Marker, "Basic_Emoji")); #[test] fn test_basic() { - use icu_collections::codepointinvliststringlist::CodePointInversionListAndStringList; - use icu_properties::provider::BasicEmojiV1Marker; - use icu_properties::provider::PropertyUnicodeSetV1; + use icu::collections::codepointinvliststringlist::CodePointInversionListAndStringList; + use icu::properties::provider::BasicEmojiV1Marker; + use icu::properties::provider::PropertyUnicodeSetV1; let provider = DatagenProvider::new_testing(); diff --git a/provider/datagen/src/transform/icuexport/uprops/enum_codepointtrie.rs b/provider/datagen/src/transform/icuexport/uprops/enum_codepointtrie.rs index 751bb61fd67..6b9cee673f4 100644 --- a/provider/datagen/src/transform/icuexport/uprops/enum_codepointtrie.rs +++ b/provider/datagen/src/transform/icuexport/uprops/enum_codepointtrie.rs @@ -3,8 +3,8 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::provider::DatagenProvider; -use icu_collections::codepointtrie::CodePointTrie; -use icu_properties::provider::{names::*, *}; +use icu::collections::codepointtrie::CodePointTrie; +use icu::properties::provider::{names::*, *}; use icu_provider::datagen::*; use icu_provider::prelude::*; use std::collections::BTreeMap; @@ -380,7 +380,7 @@ impl DataProvider for DatagenProvider { &self, req: DataRequest, ) -> Result, DataError> { - use icu_properties::GeneralCategoryGroup; + use icu::properties::GeneralCategoryGroup; use zerovec::ule::AsULE; self.check_req::(req)?; @@ -525,11 +525,11 @@ expand!( #[cfg(test)] mod tests { use super::*; - use icu_collections::codepointtrie::CodePointTrie; - use icu_properties::provider::{ + use icu::collections::codepointtrie::CodePointTrie; + use icu::properties::provider::{ GeneralCategoryV1Marker, PropertyCodePointMapV1, ScriptV1Marker, }; - use icu_properties::{GeneralCategory, Script}; + use icu::properties::{GeneralCategory, Script}; // A test of the UnicodeProperty General_Category is truly a test of the // `GeneralCategory` Rust enum, not the `GeneralCategoryGroup` Rust enum, diff --git a/provider/datagen/src/transform/icuexport/uprops/script.rs b/provider/datagen/src/transform/icuexport/uprops/script.rs index 2080f162ce5..6536208890e 100644 --- a/provider/datagen/src/transform/icuexport/uprops/script.rs +++ b/provider/datagen/src/transform/icuexport/uprops/script.rs @@ -3,12 +3,12 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::provider::DatagenProvider; -use icu_collections::codepointtrie::CodePointTrie; -use icu_properties::provider::{ +use icu::collections::codepointtrie::CodePointTrie; +use icu::properties::provider::{ ScriptWithExtensionsPropertyV1, ScriptWithExtensionsPropertyV1Marker, }; -use icu_properties::script::ScriptWithExt; -use icu_properties::Script; +use icu::properties::script::ScriptWithExt; +use icu::properties::Script; use icu_provider::datagen::*; use icu_provider::prelude::*; use std::collections::HashSet; @@ -73,7 +73,7 @@ impl IterableDataProvider for DatagenProvi #[cfg(test)] mod tests { use super::*; - use icu_properties::script::ScriptWithExtensions; + use icu::properties::script::ScriptWithExtensions; #[test] fn test_script_val_from_script_extensions() { diff --git a/provider/datagen/src/transform/icuexport/uprops/uprops_serde.rs b/provider/datagen/src/transform/icuexport/uprops/uprops_serde.rs index 43cc37be2de..66b55e02f95 100644 --- a/provider/datagen/src/transform/icuexport/uprops/uprops_serde.rs +++ b/provider/datagen/src/transform/icuexport/uprops/uprops_serde.rs @@ -2,7 +2,7 @@ // called LICENSE at the top level of the ICU4X source tree // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). -use icu_collections::codepointtrie::toml::CodePointTrieToml; +use icu::collections::codepointtrie::toml::CodePointTrieToml; pub(in crate::provider) mod binary { #[derive(serde::Deserialize)] diff --git a/provider/datagen/src/transform/mod.rs b/provider/datagen/src/transform/mod.rs index d38674a8cda..9ee426addd0 100644 --- a/provider/datagen/src/transform/mod.rs +++ b/provider/datagen/src/transform/mod.rs @@ -44,7 +44,7 @@ impl DatagenProvider { #[test] fn test_missing_locale() { - use icu_locale_core::langid; + use icu::locale::langid; let provider = DatagenProvider::new_testing(); assert!(DataProvider::::load( &provider, diff --git a/provider/datagen/src/transform/segmenter/dictionary.rs b/provider/datagen/src/transform/segmenter/dictionary.rs index a24ec41eed4..5e4670ec69f 100644 --- a/provider/datagen/src/transform/segmenter/dictionary.rs +++ b/provider/datagen/src/transform/segmenter/dictionary.rs @@ -4,10 +4,10 @@ use crate::provider::DatagenProvider; use crate::provider::IterableDataProviderCached; -use icu_locale_core::langid; +use icu::locale::langid; +use icu::segmenter::provider::*; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; -use icu_segmenter::provider::*; use std::collections::HashSet; use std::fmt::Debug; use zerovec::ZeroVec; diff --git a/provider/datagen/src/transform/segmenter/lstm.rs b/provider/datagen/src/transform/segmenter/lstm.rs index eff874a0c14..64e27c3fc3c 100644 --- a/provider/datagen/src/transform/segmenter/lstm.rs +++ b/provider/datagen/src/transform/segmenter/lstm.rs @@ -5,10 +5,10 @@ //! This module contains provider implementations backed by LSTM segmentation data. use crate::provider::{DatagenProvider, IterableDataProviderCached}; -use icu_locale_core::langid; +use icu::locale::langid; +use icu::segmenter::provider::*; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; -use icu_segmenter::provider::*; use ndarray::{Array, Array1, Array2, ArrayBase, Dim, Dimension, OwnedRepr}; use std::collections::{HashMap, HashSet}; use std::fmt::Debug; @@ -225,9 +225,9 @@ impl IterableDataProviderCached for DatagenProvider #[cfg(test)] mod tests { use super::*; + use icu::segmenter::LineSegmenter; use icu_provider_adapters::any_payload::AnyPayloadProvider; use icu_provider_adapters::fork::ForkByMarkerProvider; - use icu_segmenter::LineSegmenter; #[test] fn thai_word_break_with_grapheme_model() { diff --git a/provider/datagen/src/transform/segmenter/mod.rs b/provider/datagen/src/transform/segmenter/mod.rs index 2da80b5575e..ab390f05b36 100644 --- a/provider/datagen/src/transform/segmenter/mod.rs +++ b/provider/datagen/src/transform/segmenter/mod.rs @@ -8,16 +8,16 @@ #![allow(unused_imports)] use crate::provider::DatagenProvider; -use icu_codepointtrie_builder::{CodePointTrieBuilder, CodePointTrieBuilderData}; -use icu_collections::codepointtrie; -use icu_properties::{ +use icu::collections::codepointtrie; +use icu::properties::{ maps, sets, CanonicalCombiningClass, EastAsianWidth, GeneralCategory, GraphemeClusterBreak, IndicSyllabicCategory, LineBreak, Script, SentenceBreak, WordBreak, }; +use icu::segmenter::provider::*; +use icu::segmenter::WordType; +use icu_codepointtrie_builder::{CodePointTrieBuilder, CodePointTrieBuilderData}; use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; -use icu_segmenter::provider::*; -use icu_segmenter::WordType; use std::collections::HashSet; use std::fmt::Debug; use std::sync::OnceLock; diff --git a/provider/datagen/tests/test-options.rs b/provider/datagen/tests/test-options.rs index b105c0bd104..b3400be2ea4 100644 --- a/provider/datagen/tests/test-options.rs +++ b/provider/datagen/tests/test-options.rs @@ -8,9 +8,9 @@ mod testutil; use std::collections::BTreeMap; use std::collections::HashSet; +use icu::locale::provider::*; use icu_datagen::prelude::*; use icu_datagen::FallbackOptions; -use icu_locale::provider::*; use icu_provider::datagen::*; use icu_provider::hello_world::*; use icu_provider::make_exportable_provider; @@ -76,7 +76,7 @@ impl DataProvider for TestingProvider { &self, req: DataRequest, ) -> Result, DataError> { - icu_locale::provider::Baked.load(req) + icu::locale::provider::Baked.load(req) } } @@ -85,7 +85,7 @@ impl DataProvider for TestingProvider { &self, req: DataRequest, ) -> Result, DataError> { - icu_locale::provider::Baked.load(req) + icu::locale::provider::Baked.load(req) } } @@ -94,7 +94,7 @@ impl DataProvider for TestingProvider { &self, req: DataRequest, ) -> Result, DataError> { - icu_locale::provider::Baked.load(req) + icu::locale::provider::Baked.load(req) } }