Audit more data markers (#6229)

Segmenter and properties #4991
unicode-org · Mar 5, 2025 · 19a1d38 · 19a1d38
1 parent 61950ac
commit 19a1d38
Show file tree

Hide file tree

Showing 881 changed files with 11,473 additions and 11,448 deletions.
diff --git a/components/calendar/src/provider.rs b/components/calendar/src/provider.rs
@@ -52,7 +52,7 @@ const _: () = {
     impl_calendar_islamic_ummalqura_v1!(Baked);
     impl_calendar_japanese_modern_v1!(Baked);
     impl_calendar_japanese_extended_v1!(Baked);
-    impl_calendar_week_v2!(Baked);
+    impl_calendar_week_v1!(Baked);
 };
 
 icu_provider::data_marker!(
@@ -71,8 +71,8 @@ icu_provider::data_marker!(
 );
 icu_provider::data_marker!(
     /// Week information
-    CalendarWeekV2,
-    "calendar/week/v2",
+    CalendarWeekV1,
+    "calendar/week/v1",
     WeekData,
     fallback_config = {
         let mut config = LocaleFallbackConfig::default();
@@ -90,7 +90,7 @@ pub const MARKERS: &[DataMarkerInfo] = &[
     CalendarIslamicUmmalquraV1::INFO,
     CalendarJapaneseModernV1::INFO,
     CalendarJapaneseExtendedV1::INFO,
-    CalendarWeekV2::INFO,
+    CalendarWeekV1::INFO,
 ];
 
 /// The date at which an era started

diff --git a/components/calendar/src/week_of.rs b/components/calendar/src/week_of.rs
@@ -47,9 +47,9 @@ impl WeekCalculator {
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::try_new)]
     pub fn try_new_unstable<P>(provider: &P, prefs: WeekPreferences) -> Result<Self, DataError>
     where
-        P: DataProvider<crate::provider::CalendarWeekV2> + ?Sized,
+        P: DataProvider<crate::provider::CalendarWeekV1> + ?Sized,
     {
-        let locale = CalendarWeekV2::make_locale(prefs.locale_preferences);
+        let locale = CalendarWeekV1::make_locale(prefs.locale_preferences);
         provider
             .load(DataRequest {
                 id: DataIdentifierBorrowed::for_locale(&locale),

diff --git a/components/casemap/src/titlecase.rs b/components/casemap/src/titlecase.rs
@@ -8,7 +8,7 @@ use crate::{CaseMapper, CaseMapperBorrowed};
 use alloc::string::String;
 use icu_locale_core::LanguageIdentifier;
 use icu_properties::props::{GeneralCategory, GeneralCategoryGroup};
-use icu_properties::provider::GeneralCategoryV1;
+use icu_properties::provider::PropertyEnumGeneralCategoryV1;
 use icu_properties::{CodePointMapData, CodePointMapDataBorrowed};
 use icu_provider::prelude::*;
 use writeable::Writeable;
@@ -223,7 +223,7 @@ impl TitlecaseMapper<CaseMapper> {
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::new)]
     pub fn try_new_unstable<P>(provider: &P) -> Result<Self, DataError>
     where
-        P: DataProvider<CaseMapV1> + DataProvider<GeneralCategoryV1> + ?Sized,
+        P: DataProvider<CaseMapV1> + DataProvider<PropertyEnumGeneralCategoryV1> + ?Sized,
     {
         let cm = CaseMapper::try_new_unstable(provider)?;
         let gc = icu_properties::CodePointMapData::<icu_properties::props::GeneralCategory>::try_new_unstable(provider)?;
@@ -272,7 +272,7 @@ impl<CM: AsRef<CaseMapper>> TitlecaseMapper<CM> {
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::new_with_mapper)]
     pub fn try_new_with_mapper_unstable<P>(provider: &P, casemapper: CM) -> Result<Self, DataError>
     where
-        P: DataProvider<CaseMapV1> + DataProvider<GeneralCategoryV1> + ?Sized,
+        P: DataProvider<CaseMapV1> + DataProvider<PropertyEnumGeneralCategoryV1> + ?Sized,
     {
         let gc = icu_properties::CodePointMapData::<icu_properties::props::GeneralCategory>::try_new_unstable(provider)?;
         Ok(Self { cm: casemapper, gc })

diff --git a/components/datetime/src/external_loaders.rs b/components/datetime/src/external_loaders.rs
@@ -87,7 +87,7 @@ pub(crate) struct ExternalLoaderUnstable<'a, P: ?Sized>(pub &'a P);
 impl<P> DecimalFormatterLoader for ExternalLoaderUnstable<'_, P>
 where
     P: ?Sized
-        + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+        + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
         + DataProvider<icu_decimal::provider::DecimalDigitsV1>,
 {
     #[inline]

diff --git a/components/datetime/src/pattern/names.rs b/components/datetime/src/pattern/names.rs
@@ -25,7 +25,7 @@ use icu_calendar::types::MonthCode;
 use icu_calendar::AnyCalendar;
 use icu_decimal::options::DecimalFormatterOptions;
 use icu_decimal::options::GroupingStrategy;
-use icu_decimal::provider::{DecimalDigitsV1, DecimalSymbolsV2};
+use icu_decimal::provider::{DecimalDigitsV1, DecimalSymbolsV1};
 use icu_decimal::DecimalFormatter;
 use icu_provider::prelude::*;
 
@@ -710,7 +710,7 @@ impl<C, FSet: DateTimeNamesMarker> FixedCalendarDateTimeNames<C, FSet> {
         prefs: DateTimeFormatterPreferences,
     ) -> Result<Self, DataError>
     where
-        P: DataProvider<DecimalSymbolsV2> + DataProvider<DecimalDigitsV1> + ?Sized,
+        P: DataProvider<DecimalSymbolsV1> + DataProvider<DecimalDigitsV1> + ?Sized,
     {
         let mut names = Self {
             prefs,
@@ -2024,7 +2024,7 @@ impl<C, FSet: DateTimeNamesMarker> FixedCalendarDateTimeNames<C, FSet> {
     #[inline]
     pub fn load_decimal_formatter<P>(&mut self, provider: &P) -> Result<&mut Self, DataError>
     where
-        P: DataProvider<DecimalSymbolsV2> + DataProvider<DecimalDigitsV1> + ?Sized,
+        P: DataProvider<DecimalSymbolsV1> + DataProvider<DecimalDigitsV1> + ?Sized,
     {
         self.inner
             .load_decimal_formatter(&ExternalLoaderUnstable(provider), self.prefs)?;
@@ -2105,7 +2105,7 @@ impl<C: CldrCalendar, FSet: DateTimeNamesMarker> FixedCalendarDateTimeNames<C, F
             + DataProvider<tz::MzSpecificLongV1>
             + DataProvider<tz::MzSpecificShortV1>
             + DataProvider<tz::MzPeriodV1>
-            + DataProvider<DecimalSymbolsV2>
+            + DataProvider<DecimalSymbolsV1>
             + DataProvider<DecimalDigitsV1>
             + ?Sized,
     {

diff --git a/components/datetime/src/scaffold/fieldset_traits.rs b/components/datetime/src/scaffold/fieldset_traits.rs
@@ -14,7 +14,7 @@ use icu_calendar::{
     types::{DayOfMonth, DayOfYearInfo, MonthInfo, Weekday, YearInfo},
     Date, Iso,
 };
-use icu_decimal::provider::{DecimalDigitsV1, DecimalSymbolsV2};
+use icu_decimal::provider::{DecimalDigitsV1, DecimalSymbolsV1};
 use icu_provider::{marker::NeverMarker, prelude::*};
 use icu_time::scaffold::IntoOption;
 use icu_time::{
@@ -523,12 +523,12 @@ where
 /// for datetime formatting with a fixed calendar.
 // This trait is implicitly sealed due to sealed supertraits
 pub trait AllFixedCalendarExternalDataMarkers:
-    DataProvider<DecimalSymbolsV2> + DataProvider<DecimalDigitsV1>
+    DataProvider<DecimalSymbolsV1> + DataProvider<DecimalDigitsV1>
 {
 }
 
 impl<T> AllFixedCalendarExternalDataMarkers for T where
-    T: ?Sized + DataProvider<DecimalSymbolsV2> + DataProvider<DecimalDigitsV1>
+    T: ?Sized + DataProvider<DecimalSymbolsV1> + DataProvider<DecimalDigitsV1>
 {
 }
 
@@ -542,7 +542,7 @@ pub trait AllAnyCalendarExternalDataMarkers:
     + DataProvider<CalendarIslamicUmmalquraV1>
     + DataProvider<CalendarJapaneseModernV1>
     + DataProvider<CalendarJapaneseExtendedV1>
-    + DataProvider<DecimalSymbolsV2>
+    + DataProvider<DecimalSymbolsV1>
     + DataProvider<DecimalDigitsV1>
 {
 }
@@ -555,7 +555,7 @@ impl<T> AllAnyCalendarExternalDataMarkers for T where
         + DataProvider<CalendarIslamicUmmalquraV1>
         + DataProvider<CalendarJapaneseModernV1>
         + DataProvider<CalendarJapaneseExtendedV1>
-        + DataProvider<DecimalSymbolsV2>
+        + DataProvider<DecimalSymbolsV1>
         + DataProvider<DecimalDigitsV1>
 {
 }

diff --git a/components/datetime/tests/data/gen.sh b/components/datetime/tests/data/gen.sh
@@ -5,7 +5,7 @@ GregorianDateLengthsV1 \
 GregorianDateSymbolsV1 \
 TimeLengthsV1 \
 TimeSymbolsV1 \
-DecimalSymbolsV2Marker \
+DecimalSymbolsV1Marker \
 TimeZoneFormatsV1 \
 MetazoneSpecificNamesShortV1 \
 --locales en \

diff --git a/components/decimal/src/grouper.rs b/components/decimal/src/grouper.rs
@@ -164,11 +164,11 @@ fn test_grouper() {
             };
             let digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
             struct Provider(RefCell<Option<DecimalSymbols<'static>>>, [char; 10]);
-            impl DataProvider<DecimalSymbolsV2> for Provider {
+            impl DataProvider<DecimalSymbolsV1> for Provider {
                 fn load(
                     &self,
                     _req: icu_provider::DataRequest,
-                ) -> Result<icu_provider::DataResponse<DecimalSymbolsV2>, icu_provider::DataError>
+                ) -> Result<icu_provider::DataResponse<DecimalSymbolsV1>, icu_provider::DataError>
                 {
                     Ok(DataResponse {
                         metadata: Default::default(),

diff --git a/components/decimal/src/lib.rs b/components/decimal/src/lib.rs
@@ -163,7 +163,7 @@ pub mod input {
 #[derive(Debug, Clone)]
 pub struct DecimalFormatter {
     options: options::DecimalFormatterOptions,
-    symbols: DataPayload<provider::DecimalSymbolsV2>,
+    symbols: DataPayload<provider::DecimalSymbolsV1>,
     digits: DataPayload<provider::DecimalDigitsV1>,
 }
 
@@ -181,13 +181,13 @@ impl DecimalFormatter {
 
     #[doc = icu_provider::gen_buffer_unstable_docs!(UNSTABLE, Self::try_new)]
     pub fn try_new_unstable<
-        D: DataProvider<provider::DecimalSymbolsV2> + DataProvider<provider::DecimalDigitsV1> + ?Sized,
+        D: DataProvider<provider::DecimalSymbolsV1> + DataProvider<provider::DecimalDigitsV1> + ?Sized,
     >(
         provider: &D,
         prefs: DecimalFormatterPreferences,
         options: options::DecimalFormatterOptions,
     ) -> Result<Self, DataError> {
-        let locale = provider::DecimalSymbolsV2::make_locale(prefs.locale_preferences);
+        let locale = provider::DecimalSymbolsV1::make_locale(prefs.locale_preferences);
         let provided_nu = prefs.numbering_system.as_ref().map(|s| s.as_str());
 
         // In case the user explicitly specified a numbering system, use digits from that numbering system. In case of explicitly specified numbering systems,
@@ -212,7 +212,7 @@ impl DecimalFormatter {
 
         if let Some(provided_nu) = provided_nu {
             // Load symbols for the locale/numsys pair provided
-            let symbols: DataPayload<provider::DecimalSymbolsV2> = provider
+            let symbols: DataPayload<provider::DecimalSymbolsV1> = provider
                 .load(DataRequest {
                     id: DataIdentifierBorrowed::for_marker_attributes_and_locale(
                         DataMarkerAttributes::from_str_or_panic(provided_nu),
@@ -259,7 +259,7 @@ impl DecimalFormatter {
                 digits,
             })
         } else {
-            let symbols: DataPayload<provider::DecimalSymbolsV2> = provider
+            let symbols: DataPayload<provider::DecimalSymbolsV1> = provider
                 .load(DataRequest {
                     id: DataIdentifierBorrowed::for_marker_attributes_and_locale(
                         DataMarkerAttributes::empty(),

diff --git a/components/decimal/src/provider.rs b/components/decimal/src/provider.rs
@@ -127,14 +127,14 @@ const _: () = {
         pub use icu_decimal_data::icu_locale as locale;
     }
     make_provider!(Baked);
-    impl_decimal_symbols_v2!(Baked);
+    impl_decimal_symbols_v1!(Baked);
     impl_decimal_digits_v1!(Baked);
 };
 
 icu_provider::data_marker!(
     /// Data marker for decimal symbols
-    DecimalSymbolsV2,
-    "decimal/symbols/v2",
+    DecimalSymbolsV1,
+    "decimal/symbols/v1",
     DecimalSymbols<'static>,
 );
 
@@ -150,7 +150,7 @@ icu_provider::data_marker!(
 
 #[cfg(feature = "datagen")]
 /// The latest minimum set of markers required by this component.
-pub const MARKERS: &[DataMarkerInfo] = &[DecimalSymbolsV2::INFO, DecimalDigitsV1::INFO];
+pub const MARKERS: &[DataMarkerInfo] = &[DecimalSymbolsV1::INFO, DecimalDigitsV1::INFO];
 
 /// A collection of settings expressing where to put grouping separators in a decimal number.
 /// For example, `1,000,000` has two grouping separators, positioned along every 3 digits.

diff --git a/components/experimental/src/compactdecimal/formatter.rs b/components/experimental/src/compactdecimal/formatter.rs
@@ -144,7 +144,7 @@ impl CompactDecimalFormatter {
     ) -> Result<Self, DataError>
     where
         D: DataProvider<ShortCompactDecimalFormatDataV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>
             + ?Sized,
@@ -230,7 +230,7 @@ impl CompactDecimalFormatter {
     ) -> Result<Self, DataError>
     where
         D: DataProvider<LongCompactDecimalFormatDataV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>
             + ?Sized,

diff --git a/components/experimental/src/dimension/currency/compact_formatter.rs b/components/experimental/src/dimension/currency/compact_formatter.rs
@@ -129,7 +129,7 @@ impl CompactCurrencyFormatter {
             + DataProvider<crate::dimension::provider::currency::CurrencyEssentialsV1>
             + DataProvider<crate::dimension::provider::currency_compact::ShortCurrencyCompactV1>
             + DataProvider<crate::compactdecimal::provider::ShortCompactDecimalFormatDataV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>,
     {

diff --git a/components/experimental/src/dimension/currency/formatter.rs b/components/experimental/src/dimension/currency/formatter.rs
@@ -102,7 +102,7 @@ impl CurrencyFormatter {
     where
         D: ?Sized
             + DataProvider<super::super::provider::currency::CurrencyEssentialsV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>,
     {
         let locale = CurrencyEssentialsV1::make_locale(prefs.locale_preferences);

diff --git a/components/experimental/src/dimension/currency/long_compact_formatter.rs b/components/experimental/src/dimension/currency/long_compact_formatter.rs
@@ -130,7 +130,7 @@ impl LongCompactCurrencyFormatter {
         D: ?Sized
             + DataProvider<crate::dimension::provider::extended_currency::CurrencyExtendedDataV1>
             + DataProvider<crate::dimension::provider::currency_patterns::CurrencyPatternsDataV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>
             + DataProvider<crate::compactdecimal::provider::LongCompactDecimalFormatDataV1>,

diff --git a/components/experimental/src/dimension/currency/long_formatter.rs b/components/experimental/src/dimension/currency/long_formatter.rs
@@ -104,7 +104,7 @@ impl LongCurrencyFormatter {
         D: ?Sized
             + DataProvider<super::super::provider::extended_currency::CurrencyExtendedDataV1>
             + DataProvider<super::super::provider::currency_patterns::CurrencyPatternsDataV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>,
     {

diff --git a/components/experimental/src/dimension/percent/formatter.rs b/components/experimental/src/dimension/percent/formatter.rs
@@ -84,7 +84,7 @@ impl PercentFormatter<DecimalFormatter> {
     where
         D: ?Sized
             + DataProvider<super::super::provider::percent::PercentEssentialsV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>,
     {
         let decimal_formatter = DecimalFormatter::try_new_unstable(

diff --git a/components/experimental/src/dimension/units/formatter.rs b/components/experimental/src/dimension/units/formatter.rs
@@ -134,7 +134,7 @@ impl UnitsFormatter {
     where
         D: ?Sized
             + DataProvider<super::super::provider::units::UnitsDisplayNameV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>,
     {

diff --git a/components/experimental/src/duration/formatter.rs b/components/experimental/src/duration/formatter.rs
@@ -13,7 +13,7 @@ use super::validated_options::Unit;
 use super::{provider, Duration};
 
 pub use super::validated_options::ValidatedDurationFormatterOptions;
-use icu_decimal::provider::{DecimalDigitsV1, DecimalSymbolsV2};
+use icu_decimal::provider::{DecimalDigitsV1, DecimalSymbolsV1};
 use icu_decimal::{DecimalFormatter, DecimalFormatterPreferences};
 use icu_list::{options::ListLength, ListFormatter, ListFormatterPreferences};
 use icu_locale_core::preferences::{
@@ -136,7 +136,7 @@ impl DurationUnitFormatter {
     fn try_new_unstable<
         D: ?Sized
             + DataProvider<UnitsDisplayNameV1>
-            + DataProvider<icu_decimal::provider::DecimalSymbolsV2>
+            + DataProvider<icu_decimal::provider::DecimalSymbolsV1>
             + DataProvider<icu_decimal::provider::DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>,
     >(
@@ -232,10 +232,10 @@ impl DurationFormatter {
     pub fn try_new_unstable<
         D: DataProvider<provider::DigitalDurationDataV1>
             + DataProvider<UnitsDisplayNameV1>
-            + DataProvider<DecimalSymbolsV2>
+            + DataProvider<DecimalSymbolsV1>
             + DataProvider<DecimalDigitsV1>
             + DataProvider<icu_plurals::provider::PluralsCardinalV1>
-            + DataProvider<icu_list::provider::ListUnitV2>
+            + DataProvider<icu_list::provider::ListUnitV1>
             + ?Sized,
     >(
         provider: &D,

diff --git a/components/experimental/src/personnames/formatter.rs b/components/experimental/src/personnames/formatter.rs
@@ -45,8 +45,8 @@ impl PersonNamesFormatter {
     ) -> Result<PersonNamesFormatter, PersonNamesFormatterError>
     where
         P: ?Sized
-            + DataProvider<icu_properties::provider::ScriptWithExtensionsPropertyV1>
-            + DataProvider<icu_properties::provider::ScriptValueToShortNameV1>
+            + DataProvider<icu_properties::provider::PropertyScriptWithExtensionsV1>
+            + DataProvider<icu_properties::provider::PropertyNameShortScriptV1>
             + DataProvider<icu_locale::provider::LocaleLikelySubtagsLanguageV1>
             + DataProvider<icu_locale::provider::LocaleParentsV1>,
     {

diff --git a/components/experimental/src/relativetime/relativetime.rs b/components/experimental/src/relativetime/relativetime.rs
@@ -4,7 +4,7 @@
 
 use fixed_decimal::{Decimal, Sign};
 use icu_decimal::{
-    options::DecimalFormatterOptions, provider::DecimalDigitsV1, provider::DecimalSymbolsV2,
+    options::DecimalFormatterOptions, provider::DecimalDigitsV1, provider::DecimalSymbolsV1,
     DecimalFormatter, DecimalFormatterPreferences,
 };
 use icu_locale_core::preferences::{define_preferences, prefs_convert};
@@ -179,7 +179,7 @@ macro_rules! constructor {
         where
             D: DataProvider<PluralsCardinalV1>
                 + DataProvider<$marker>
-                + DataProvider<DecimalSymbolsV2> + DataProvider<DecimalDigitsV1>
+                + DataProvider<DecimalSymbolsV1> + DataProvider<DecimalDigitsV1>
                 + ?Sized,
         {
             let locale = <$marker>::make_locale(prefs.locale_preferences);