Allow using marker names in datagen (#5060)

#4991

Author: robertbastian

components/datetime/tests/data/gen.sh

@@ -1,6 +1,13 @@
 #!/bin/sh
 cargo run -p icu4x-datagen -- \
---markers "datetime/gregory/datelengths@1" "datetime/gregory/datesymbols@1" "datetime/timelengths@1" "datetime/timesymbols@1" "decimal/symbols@1" "time_zone/formats@1" "time_zone/specific_short@1" \
+--markers \
+GregorianDateLengthsV1Marker \
+GregorianDateSymbolsV1Marker \
+TimeLengthsV1Marker \
+TimeSymbolsV1Marker \
+DecimalSymbolsV1Marker \
+TimeZoneFormatsV1Marker \
+MetazoneSpecificNamesShortV1Marker \
 --locales en \
 --format blob2 \
 --out $(dirname $0)/blob.postcard \

components/experimental/tests/transliterate/data/gen.sh

@@ -1,8 +1,9 @@
 #!/bin/sh
 cargo run -p icu4x-datagen --features experimental_components -- \
---markers "transliterator/rules@1" \
+--markers TransliteratorRulesV1Marker \
 --locales full \
---runtime-fallback-location external \
+--deduplication none \
+--no-internal-fallback \
 --cldr-root $(dirname $0)/../../../../../provider/datagen/tests/data/cldr \
 --format mod \
 --out $(dirname $0)/baked \

provider/datagen/src/lib.rs

@@ -159,14 +159,20 @@ macro_rules! cb {
             let lookup = LOOKUP.get_or_init(|| {
                 [
                     ("core/helloworld@1", Ok(icu_provider::hello_world::HelloWorldV1Marker::INFO)),
+                    (stringify!(icu_provider::hello_world::HelloWorldV1Marker).split("::").last().unwrap().trim(), Ok(icu_provider::hello_world::HelloWorldV1Marker::INFO)),
                     $(
                         ($path, Ok(<$marker>::INFO)),
+                        (stringify!($marker).split("::").last().unwrap().trim(), Ok(<$marker>::INFO)),
                     )+
                     $(
                         #[cfg(feature = "experimental_components")]
                         ($epath, Ok(<$emarker>::INFO)),
+                        #[cfg(feature = "experimental_components")]
+                        (stringify!($emarker).split("::").last().unwrap().trim(), Ok(<$emarker>::INFO)),
                         #[cfg(not(feature = "experimental_components"))]
                         ($epath, Err(stringify!(feature = "experimental_components"))),
+                        #[cfg(not(feature = "experimental_components"))]
+                        (stringify!($emarker).split("::").last().unwrap().trim(), Err(stringify!(feature = "experimental_components"))),
                     )+
 
                 ]

provider/datagen/src/transform/cldr/calendar/japanese.rs

@@ -99,7 +99,7 @@ impl DatagenProvider {
                 return Err(DataError::custom(
                     "Era data has changed! This can be for two reasons: Either the CLDR locale data for Japanese eras has \
                     changed in an incompatible way, or there is a new Japanese era. Run \
-                    `ICU4X_SKIP_JAPANESE_INTEGRITY_CHECK=1 cargo run -p icu4x-datagen -- --markers calendar/japanext@1 --format dir --syntax json \
+                    `ICU4X_SKIP_JAPANESE_INTEGRITY_CHECK=1 cargo run -p icu4x-datagen -- --markers JapaneseErasV1Marker --format dir --syntax json \
                     --out provider/datagen/data/japanese-golden --pretty --overwrite` in the icu4x repo and inspect the diff to \
                     check which situation it is. If a new era has been introduced, commit the diff, if not, it's likely that japanese.rs \
                     in icu_datagen will need to be updated to handle the data changes."

tools/make/data.toml

@@ -39,18 +39,18 @@ exit_on_error true
 
 exec --fail-on-error cargo build -p icu4x-datagen --no-default-features --features fs_exporter,blob_exporter,baked_exporter,networking,provider
 
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" --locales full --format dir --syntax json --out provider/fs/tests/data/json --overwrite
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" --locales full --format dir --syntax bincode --out provider/fs/tests/data/bincode --overwrite
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" --locales full --format dir --syntax postcard --out provider/fs/tests/data/postcard --overwrite
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker --locales full --format dir --syntax json --out provider/fs/tests/data/json --overwrite
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker --locales full --format dir --syntax bincode --out provider/fs/tests/data/bincode --overwrite
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker --locales full --format dir --syntax postcard --out provider/fs/tests/data/postcard --overwrite
 
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" --locales full --format blob --overwrite --out provider/blob/tests/data/v1.postcard
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" --locales full --format blob2 --overwrite --out provider/blob/tests/data/v2.postcard
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker --locales full --format blob --overwrite --out provider/blob/tests/data/v1.postcard
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker --locales full --format blob2 --overwrite --out provider/blob/tests/data/v2.postcard
 
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" --locales full --format mod --pretty --overwrite --no-internal-fallback --deduplication none --out provider/baked/tests/data
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker --locales full --format mod --pretty --overwrite --no-internal-fallback --deduplication none --out provider/baked/tests/data
 
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" "fallback/likelysubtags@1" "fallback/parents@1" "fallback/supplement/co@1" --locales full --format blob --out provider/adapters/tests/data/blob.postcard --overwrite
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" --without-fallback --locales de --format dir --syntax json --out provider/adapters/tests/data/langtest/de --overwrite
-exec --fail-on-error target/debug/icu4x-datagen --markers "core/helloworld@1" --without-fallback --locales ro --format dir --syntax json --out provider/adapters/tests/data/langtest/ro --overwrite
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker "fallback/likelysubtags@1" "fallback/parents@1" "fallback/supplement/co@1" --locales full --format blob --out provider/adapters/tests/data/blob.postcard --overwrite
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker --without-fallback --locales de --format dir --syntax json --out provider/adapters/tests/data/langtest/de --overwrite
+exec --fail-on-error target/debug/icu4x-datagen --markers HelloWorldV1Marker --without-fallback --locales ro --format dir --syntax json --out provider/adapters/tests/data/langtest/ro --overwrite
 '''
 
 [tasks.testdata-check]