Replace DataLocale by LanguageIdentifier on DataRequest

components/calendar/src/any_calendar.rs

@@ -1073,33 +1073,24 @@ impl AnyCalendarKind {
             .and_then(Self::get_for_bcp47_value)
     }
 
-    /// Extract the calendar component from a [`DataLocale`]
-    ///
-    /// Returns `None` if the calendar is not specified or unknown. If you prefer an error, use
-    /// [`CalendarError::unknown_any_calendar_kind`].
-    fn get_for_data_locale(l: &DataLocale) -> Option<Self> {
-        l.get_unicode_ext(&key!("ca"))
-            .and_then(|v| Self::get_for_bcp47_value(&v))
-    }
-
     // Do not make public, this will eventually need fallback
     // data from the provider
     fn from_data_locale_with_fallback(l: &DataLocale) -> Self {
-        if let Some(kind) = Self::get_for_data_locale(l) {
-            kind
-        } else {
-            let lang = l.language();
-            if lang == language!("th") {
-                Self::Buddhist
-            // Other known fallback routes for currently-unsupported calendars
-            // } else if lang == language!("sa") {
-            //     Self::IslamicUmalqura
-            // } else if lang == language!("af") || lang == language!("ir") {
-            //     Self::Persian
-            } else {
-                Self::Gregorian
-            }
-        }
+        l.keywords
+            .get(&key!("ca"))
+            .and_then(Self::get_for_bcp47_value)
+            .unwrap_or_else(|| {
+                if l.id.language == language!("th") {
+                    Self::Buddhist
+                // Other known fallback routes for currently-unsupported calendars
+                // } else if lang == language!("sa") {
+                //     Self::IslamicUmalqura
+                // } else if lang == language!("af") || lang == language!("ir") {
+                //     Self::Persian
+                } else {
+                    Self::Gregorian
+                }
+            })
     }
 }
 

components/calendar/src/week_of.rs

@@ -65,7 +65,7 @@ impl WeekCalculator {
             DataProvider::<WeekDataV1Marker>::load(
                 &provider.as_downcasting(),
                 DataRequest {
-                    locale,
+                    langid: &locale.id,
                     ..Default::default()
                 },
             )
@@ -85,7 +85,7 @@ impl WeekCalculator {
             DataProvider::<WeekDataV1Marker>::load(
                 &provider.as_deserializing(),
                 DataRequest {
-                    locale,
+                    langid: &locale.id,
                     ..Default::default()
                 },
             )
@@ -102,7 +102,7 @@ impl WeekCalculator {
     {
         provider
             .load(DataRequest {
-                locale,
+                langid: &locale.id,
                 ..Default::default()
             })
             .and_then(DataResponse::take_payload)

components/collator/Cargo.toml

@@ -21,6 +21,7 @@ all-features = true
 [dependencies]
 displaydoc = { workspace = true }
 icu_collections = { workspace = true }
+icu_locale_core = { workspace = true }
 icu_normalizer = { workspace = true }
 icu_properties = { workspace = true }
 icu_provider = { workspace = true, features = ["macros"] }

components/collator/benches/bench.rs

@@ -5,15 +5,7 @@
 use criterion::{black_box, criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
 
 use icu::collator::*;
-use icu::locale::Locale;
-use icu_provider::DataLocale;
-
-fn to_data_locale(locale_str: &str) -> DataLocale {
-    locale_str
-        .parse::<Locale>()
-        .expect("Failed to parse locale")
-        .into()
-}
+use icu::locale::locale;
 
 pub fn collator_with_locale(criterion: &mut Criterion) {
     // Load file content in reverse order vector.
@@ -99,36 +91,36 @@ pub fn collator_with_locale(criterion: &mut Criterion) {
         Strength::Identical,
     ];
     let performance_parameters = [
-        (to_data_locale("en_US"), vec![&content_latin], &all_strength),
-        (to_data_locale("da_DK"), vec![&content_latin], &all_strength),
-        (to_data_locale("fr_CA"), vec![&content_latin], &all_strength),
+        (locale!("en_US"), vec![&content_latin], &all_strength),
+        (locale!("da_DK"), vec![&content_latin], &all_strength),
+        (locale!("fr_CA"), vec![&content_latin], &all_strength),
         (
-            to_data_locale("ja_JP"),
+            locale!("ja_JP"),
             vec![&content_latin, &content_jp_h, &content_jp_k, &content_asian],
             &all_strength,
         ),
         (
-            to_data_locale("zh-u-co-pinyin"),
+            locale!("zh-u-co-pinyin"),
             vec![&content_latin, &content_chinese],
             &all_strength,
         ), // zh_CN
         (
-            to_data_locale("zh-u-co-stroke"),
+            locale!("zh-u-co-stroke"),
             vec![&content_latin, &content_chinese],
             &all_strength,
         ), // zh_TW
         (
-            to_data_locale("ru_RU"),
+            locale!("ru_RU"),
             vec![&content_latin, &content_russian],
             &all_strength,
         ),
         (
-            to_data_locale("th"),
+            locale!("th"),
             vec![&content_latin, &content_thai],
             &all_strength,
         ),
         (
-            to_data_locale("ko_KR"),
+            locale!("ko_KR"),
             vec![&content_latin, &content_korean],
             &all_strength,
         ),
@@ -137,6 +129,7 @@ pub fn collator_with_locale(criterion: &mut Criterion) {
         let (locale_under_bench, files_under_bench, benched_strength) = perf_parameter;
 
         let mut group = criterion.benchmark_group(locale_under_bench.to_string());
+        let locale_under_bench = locale_under_bench.into();
 
         for content_under_bench in files_under_bench {
             let (file_name, elements) = black_box(content_under_bench);

components/collator/src/comparison.rs

@@ -24,6 +24,7 @@ use crate::provider::CollationSpecialPrimariesV1Marker;
 use crate::{AlternateHandling, CollatorOptions, MaxVariable, ResolvedCollatorOptions, Strength};
 use core::cmp::Ordering;
 use core::convert::TryFrom;
+use icu_locale_core::extensions::unicode::key;
 use icu_normalizer::provider::CanonicalDecompositionDataV1Marker;
 use icu_normalizer::provider::CanonicalDecompositionTablesV1Marker;
 use icu_normalizer::Decomposition;
@@ -145,25 +146,61 @@ impl Collator {
             + ?Sized,
     {
         let req = DataRequest {
-            locale,
-            ..Default::default()
+            langid: &locale.id,
+            key_attributes: &locale
+                .keywords
+                .get(&key!("co"))
+                .map(DataKeyAttributes::from_unicode_value)
+                .unwrap_or_default(),
+            metadata: {
+                let mut metadata = DataRequestMetadata::default();
+                metadata.silent = true;
+                metadata
+            },
         };
 
-        let metadata_payload: DataPayload<crate::provider::CollationMetadataV1Marker> =
-            provider.load(req)?.take_payload()?;
+        let metadata_payload: DataPayload<crate::provider::CollationMetadataV1Marker> = provider
+            .load(req)
+            .or_else(|_| {
+                provider.load(DataRequest {
+                    langid: req.langid,
+                    ..Default::default()
+                })
+            })?
+            .take_payload()?;
 
         let metadata = metadata_payload.get();
 
         let tailoring: Option<DataPayload<crate::provider::CollationDataV1Marker>> =
             if metadata.tailored() {
-                Some(provider.load(req)?.take_payload()?)
+                Some(
+                    provider
+                        .load(req)
+                        .or_else(|_| {
+                            provider.load(DataRequest {
+                                langid: req.langid,
+                                ..Default::default()
+                            })
+                        })?
+                        .take_payload()?,
+                )
             } else {
                 None
             };
 
         let reordering: Option<DataPayload<crate::provider::CollationReorderingV1Marker>> =
             if metadata.reordering() {
-                Some(provider.load(req)?.take_payload()?)
+                Some(
+                    provider
+                        .load(req)
+                        .or_else(|_| {
+                            provider.load(DataRequest {
+                                langid: req.langid,
+                                ..Default::default()
+                            })
+                        })?
+                        .take_payload()?,
+                )
             } else {
                 None
             };

components/collator/src/provider.rs

@@ -116,7 +116,6 @@ fn data_ce_to_primary(data_ce: u64, c: char) -> u32 {
 #[icu_provider::data_struct(marker(
     CollationDataV1Marker,
     "collator/data@1",
-    extension_key = "co",
     fallback_by = "collation",
     fallback_supplement = "collation"
 ))]
@@ -232,7 +231,6 @@ impl<'data> CollationDataV1<'data> {
 #[icu_provider::data_struct(marker(
     CollationDiacriticsV1Marker,
     "collator/dia@1",
-    extension_key = "co",
     fallback_by = "collation",
     fallback_supplement = "collation",
 ))]
@@ -276,7 +274,6 @@ pub struct CollationJamoV1<'data> {
 #[icu_provider::data_struct(marker(
     CollationReorderingV1Marker,
     "collator/reord@1",
-    extension_key = "co",
     fallback_by = "collation",
     fallback_supplement = "collation"
 ))]
@@ -366,7 +363,6 @@ impl<'data> CollationReorderingV1<'data> {
 #[icu_provider::data_struct(marker(
     CollationMetadataV1Marker,
     "collator/meta@1",
-    extension_key = "co",
     fallback_by = "collation",
     fallback_supplement = "collation"
 ))]