change

unicode-org · Jun 25, 2024 · 141701d · 141701d
1 parent 4168cf6
commit 141701d
Show file tree

Hide file tree

Showing 124 changed files with 1,613 additions and 1,518 deletions.
diff --git a/components/calendar/src/week_of.rs b/components/calendar/src/week_of.rs
@@ -65,7 +65,7 @@ impl WeekCalculator {
             DataProvider::<WeekDataV1Marker>::load(
                 &provider.as_downcasting(),
                 DataRequest {
-                    locale,
+                    id: DataIdentifierBorrowed::for_locale(locale),
                     ..Default::default()
                 },
             )
@@ -84,7 +84,7 @@ impl WeekCalculator {
             DataProvider::<WeekDataV1Marker>::load(
                 &provider.as_deserializing(),
                 DataRequest {
-                    locale,
+                    id: DataIdentifierBorrowed::for_locale(locale),
                     ..Default::default()
                 },
             )
@@ -100,7 +100,7 @@ impl WeekCalculator {
     {
         provider
             .load(DataRequest {
-                locale,
+                id: DataIdentifierBorrowed::for_locale(locale),
                 ..Default::default()
             })
             .map(|response| WeekCalculator {

diff --git a/components/collator/src/comparison.rs b/components/collator/src/comparison.rs
@@ -150,7 +150,7 @@ impl Collator {
             + ?Sized,
     {
         let req = DataRequest {
-            locale,
+            id: DataIdentifierBorrowed::for_locale(locale),
             ..Default::default()
         };
 

diff --git a/components/collator/tests/tests.rs b/components/collator/tests/tests.rs
@@ -1191,7 +1191,7 @@ fn test_nb_nn_no() {
         DataProvider::<CollationDataV1Marker>::load(
             &icu_collator::provider::Baked,
             DataRequest {
-                locale: &locale,
+                id: DataIdentifierBorrowed::for_locale(&locale),
                 ..Default::default()
             }
         )
@@ -1211,7 +1211,7 @@ fn test_nb_nn_no() {
         DataProvider::<CollationDataV1Marker>::load(
             &icu_collator::provider::Baked,
             DataRequest {
-                locale: &locale,
+                id: DataIdentifierBorrowed::for_locale(&locale),
                 ..Default::default()
             }
         )
@@ -1231,7 +1231,7 @@ fn test_nb_nn_no() {
         DataProvider::<CollationDataV1Marker>::load(
             &icu_collator::provider::Baked,
             DataRequest {
-                locale: &locale,
+                id: DataIdentifierBorrowed::for_locale(&locale),
                 ..Default::default()
             }
         )

diff --git a/components/datetime/src/calendar.rs b/components/datetime/src/calendar.rs
@@ -388,7 +388,7 @@ where
 {
     let payload = provider
         .load(DataRequest {
-            locale,
+            id: DataIdentifierBorrowed::for_locale(locale),
             ..Default::default()
         })?
         .payload;
@@ -405,7 +405,7 @@ where
 {
     let payload = provider
         .load(DataRequest {
-            locale,
+            id: DataIdentifierBorrowed::for_locale(locale),
             ..Default::default()
         })?
         .payload;
@@ -434,7 +434,7 @@ where
         + ?Sized,
 {
     let req = DataRequest {
-        locale,
+        id: DataIdentifierBorrowed::for_locale(locale),
         ..Default::default()
     };
     let payload = match kind {
@@ -555,7 +555,7 @@ where
         + ?Sized,
 {
     let req = DataRequest {
-        locale,
+        id: DataIdentifierBorrowed::for_locale(locale),
         ..Default::default()
     };
     let payload = match kind {

diff --git a/components/datetime/src/external_loaders.rs b/components/datetime/src/external_loaders.rs
@@ -35,6 +35,35 @@ pub(crate) trait AnyCalendarLoader {
     fn load(&self, locale: &DataLocale) -> Result<AnyCalendar, DataError>;
 }
 
+/// Helper for type resolution with optional loader arguments
+pub(crate) struct PhantomLoader {
+    _not_constructible: core::convert::Infallible,
+}
+
+impl FixedDecimalFormatterLoader for PhantomLoader {
+    fn load(
+        &self,
+        _locale: &DataLocale,
+        _options: FixedDecimalFormatterOptions,
+    ) -> Result<FixedDecimalFormatter, DataError> {
+        unreachable!() // not constructible
+    }
+}
+
+impl WeekCalculatorLoader for PhantomLoader {
+    #[inline]
+    fn load(&self, _locale: &DataLocale) -> Result<WeekCalculator, DataError> {
+        unreachable!() // not constructible
+    }
+}
+
+impl AnyCalendarLoader for PhantomLoader {
+    #[inline]
+    fn load(&self, _locale: &DataLocale) -> Result<AnyCalendar, DataError> {
+        unreachable!() // not constructible
+    }
+}
+
 /// Loader for types from other crates using compiled data.
 #[cfg(feature = "compiled_data")]
 pub(crate) struct ExternalLoaderCompiledData;

diff --git a/components/datetime/src/format/datetime.rs b/components/datetime/src/format/datetime.rs
@@ -956,7 +956,7 @@ mod tests {
 
         let locale = "en-u-ca-gregory".parse().unwrap();
         let req = DataRequest {
-            locale: &locale,
+            id: DataIdentifierBorrowed::for_locale(&locale),
             ..Default::default()
         };
         let date_data =

diff --git a/components/datetime/src/format/neo.rs b/components/datetime/src/format/neo.rs
@@ -1025,8 +1025,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
         };
         let payload = provider
             .load_bound(DataRequest {
-                locale,
-                marker_attributes: &DataMarkerAttributes::from_tinystr(
+                id: DataIdentifierBorrowed::for_marker_attributes_and_locale(
                     marker_attrs::symbol_attr_for(
                         marker_attrs::Context::Format,
                         match field_length {
@@ -1036,6 +1035,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
                             _ => return Err(SingleLoadError::UnsupportedField(field)),
                         },
                     ),
+                    locale,
                 ),
                 ..Default::default()
             })
@@ -1075,8 +1075,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
         };
         let payload = provider
             .load_bound(DataRequest {
-                locale,
-                marker_attributes: &DataMarkerAttributes::from_tinystr(
+                id: DataIdentifierBorrowed::for_marker_attributes_and_locale(
                     marker_attrs::symbol_attr_for(
                         match field_symbol {
                             fields::Month::Format => marker_attrs::Context::Format,
@@ -1089,6 +1088,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
                             _ => return Err(SingleLoadError::UnsupportedField(field)),
                         },
                     ),
+                    locale,
                 ),
                 ..Default::default()
             })
@@ -1127,8 +1127,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
         let payload = R::DayPeriodNames::load_from(
             provider,
             DataRequest {
-                locale,
-                marker_attributes: &DataMarkerAttributes::from_tinystr(
+                id: DataIdentifierBorrowed::for_marker_attributes_and_locale(
                     marker_attrs::symbol_attr_for(
                         marker_attrs::Context::Format,
                         match field_length {
@@ -1138,6 +1137,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
                             _ => return Err(SingleLoadError::UnsupportedField(field)),
                         },
                     ),
+                    locale,
                 ),
                 ..Default::default()
             },
@@ -1179,8 +1179,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
         };
         let payload = provider
             .load_bound(DataRequest {
-                locale,
-                marker_attributes: &DataMarkerAttributes::from_tinystr(
+                id: DataIdentifierBorrowed::for_marker_attributes_and_locale(
                     marker_attrs::symbol_attr_for(
                         match field_symbol {
                             // UTS 35 says that "e" and "E" have the same non-numeric names
@@ -1197,6 +1196,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
                             _ => return Err(SingleLoadError::UnsupportedField(field)),
                         },
                     ),
+                    locale,
                 ),
                 ..Default::default()
             })
@@ -1234,7 +1234,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
         let payload = R::ZoneGenericShortNames::load_from(
             provider,
             DataRequest {
-                locale,
+                id: DataIdentifierBorrowed::for_locale(locale),
                 ..Default::default()
             },
         )

diff --git a/components/datetime/src/neo.rs b/components/datetime/src/neo.rs
@@ -1286,7 +1286,7 @@ impl<R: DateTimeMarkers> NeoFormatter<R> {
     /// ```
     pub fn convert_and_format<'a, I>(&'a self, datetime: &I) -> FormattedNeoDateTime
     where
-        I: ConvertCalendar,
+        I: ?Sized + ConvertCalendar,
         I::Converted<'a>: NeoGetField<<R::D as DateMarkers>::YearInput>
             + NeoGetField<<R::D as DateMarkers>::MonthInput>
             + NeoGetField<<R::D as DateMarkers>::DayOfMonthInput>
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,7 @@ impl Collator { @@
                 + ?Sized,
         {
             let req = DataRequest {
-                locale,
+                id: DataIdentifierBorrowed::for_locale(locale),
                 ..Default::default()
             };
@@ Expand Down @@