Use marker names for baked output (#5061)

In Rust code we want to use Rust identifiers where possible. This aligns
macro and singleton names with the marker names.

All interesting changes are in the second commit.

Author: robertbastian

Cargo.lock

@@ -154,7 +154,7 @@ impl Chinese {
     pub const fn new() -> Self {
         Self {
             data: Some(DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_CALENDAR_CHINESECACHE_V1,
+                crate::provider::Baked::SINGLETON_CHINESE_CACHE_V1_MARKER,
             )),
         }
     }

components/calendar/src/chinese.rs

@@ -147,7 +147,7 @@ impl Dangi {
     pub const fn new() -> Self {
         Self {
             data: Some(DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_CALENDAR_DANGICACHE_V1,
+                crate::provider::Baked::SINGLETON_DANGI_CACHE_V1_MARKER,
             )),
         }
     }

components/calendar/src/dangi.rs

@@ -122,7 +122,7 @@ impl IslamicObservational {
     pub const fn new() -> Self {
         Self {
             data: Some(DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_CALENDAR_ISLAMICOBSERVATIONALCACHE_V1,
+                crate::provider::Baked::SINGLETON_ISLAMIC_OBSERVATIONAL_CACHE_V1_MARKER,
             )),
         }
     }
@@ -169,7 +169,7 @@ impl IslamicUmmAlQura {
     pub const fn new() -> Self {
         Self {
             data: Some(DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_CALENDAR_ISLAMICUMMALQURACACHE_V1,
+                crate::provider::Baked::SINGLETON_ISLAMIC_UMM_AL_QURA_CACHE_V1_MARKER,
             )),
         }
     }

components/calendar/src/islamic.rs

@@ -124,7 +124,7 @@ impl Japanese {
     pub const fn new() -> Self {
         Self {
             eras: DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_CALENDAR_JAPANESE_V1,
+                crate::provider::Baked::SINGLETON_JAPANESE_ERAS_V1_MARKER,
             ),
         }
     }
@@ -182,7 +182,7 @@ impl JapaneseExtended {
     pub const fn new() -> Self {
         Self(Japanese {
             eras: DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_CALENDAR_JAPANEXT_V1,
+                crate::provider::Baked::SINGLETON_JAPANESE_EXTENDED_ERAS_V1_MARKER,
             ),
         })
     }

components/calendar/src/japanese.rs

@@ -46,14 +46,14 @@ const _: () = {
         pub use icu_calendar_data::icu_locale as locale;
     }
     make_provider!(Baked);
-    impl_calendar_chinesecache_v1!(Baked);
-    impl_calendar_dangicache_v1!(Baked);
-    impl_calendar_islamicobservationalcache_v1!(Baked);
-    impl_calendar_islamicummalquracache_v1!(Baked);
-    impl_calendar_japanese_v1!(Baked);
-    impl_calendar_japanext_v1!(Baked);
-    impl_datetime_week_data_v1!(Baked);
-    impl_datetime_week_data_v2!(Baked);
+    impl_chinese_cache_v1_marker!(Baked);
+    impl_dangi_cache_v1_marker!(Baked);
+    impl_islamic_observational_cache_v1_marker!(Baked);
+    impl_islamic_umm_al_qura_cache_v1_marker!(Baked);
+    impl_japanese_eras_v1_marker!(Baked);
+    impl_japanese_extended_eras_v1_marker!(Baked);
+    impl_week_data_v1_marker!(Baked);
+    impl_week_data_v2_marker!(Baked);
 };
 
 #[cfg(feature = "datagen")]

components/calendar/src/provider.rs

@@ -74,7 +74,9 @@ impl CaseMapper {
     #[cfg(feature = "compiled_data")]
     pub const fn new() -> Self {
         Self {
-            data: DataPayload::from_static_ref(crate::provider::Baked::SINGLETON_PROPS_CASEMAP_V1),
+            data: DataPayload::from_static_ref(
+                crate::provider::Baked::SINGLETON_CASE_MAP_V1_MARKER,
+            ),
         }
     }
 

components/casemap/src/casemapper.rs

@@ -82,7 +82,7 @@ impl CaseMapCloser<CaseMapper> {
         Self {
             cm: CaseMapper::new(),
             unfold: DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_PROPS_CASEMAP_UNFOLD_V1,
+                crate::provider::Baked::SINGLETON_CASE_MAP_UNFOLD_V1_MARKER,
             ),
         }
     }
@@ -131,7 +131,7 @@ impl<CM: AsRef<CaseMapper>> CaseMapCloser<CM> {
         Self {
             cm: casemapper,
             unfold: DataPayload::from_static_ref(
-                crate::provider::Baked::SINGLETON_PROPS_CASEMAP_UNFOLD_V1,
+                crate::provider::Baked::SINGLETON_CASE_MAP_UNFOLD_V1_MARKER,
             ),
         }
     }

components/casemap/src/closer.rs

@@ -50,8 +50,8 @@ const _: () = {
         pub use icu_collections as collections;
     }
     make_provider!(Baked);
-    impl_props_casemap_v1!(Baked);
-    impl_props_casemap_unfold_v1!(Baked);
+    impl_case_map_v1_marker!(Baked);
+    impl_case_map_unfold_v1_marker!(Baked);
 };
 
 #[cfg(feature = "datagen")]

components/casemap/src/provider/mod.rs

@@ -73,15 +73,17 @@ impl Collator {
         Self::try_new_unstable_internal(
             &crate::provider::Baked,
             DataPayload::from_static_ref(
-                icu_normalizer::provider::Baked::SINGLETON_NORMALIZER_NFD_V1,
+                icu_normalizer::provider::Baked::SINGLETON_CANONICAL_DECOMPOSITION_DATA_V1_MARKER,
             ),
             DataPayload::from_static_ref(
-                icu_normalizer::provider::Baked::SINGLETON_NORMALIZER_NFDEX_V1,
+                icu_normalizer::provider::Baked::SINGLETON_CANONICAL_DECOMPOSITION_TABLES_V1_MARKER,
+            ),
+            DataPayload::from_static_ref(
+                crate::provider::Baked::SINGLETON_COLLATION_JAMO_V1_MARKER,
             ),
-            DataPayload::from_static_ref(crate::provider::Baked::SINGLETON_COLLATOR_JAMO_V1),
             || {
                 Ok(DataPayload::from_static_ref(
-                    crate::provider::Baked::SINGLETON_COLLATOR_PRIM_V1,
+                    crate::provider::Baked::SINGLETON_COLLATION_SPECIAL_PRIMARIES_V1_MARKER,
                 ))
             },
             locale,