add more data marker attributes to hello world testdata

Author: m4rch3n1ng

provider/baked/tests/data/hello_world_v1.rs.data

@@ -4,7 +4,7 @@
 /// `icu`'s `_unstable` constructors.
 ///
 /// Using this implementation will embed the following data in the binary's data segment:
-/// * 176B for the lookup data structure (27 data identifiers)
+/// * 229B for the lookup data structure (27 data identifiers)
 /// * 1100B[^1] for the actual data (27 unique structs)
 ///
 /// [^1]: these numbers can be smaller in practice due to linker deduplication
@@ -23,8 +23,8 @@ macro_rules! __impl_hello_world_v1 {
         #[clippy::msrv = "1.83"]
         impl $provider {
             const DATA_HELLO_WORLD_V1: icu_provider::baked::zerotrie::DataForVarULEs<icu_provider::hello_world::HelloWorldV1> = {
-                const TRIE: icu_provider::baked::zerotrie::ZeroTrieSimpleAscii<&'static [u8]> = icu_provider::baked::zerotrie::ZeroTrieSimpleAscii { store: b"\xCDbcdefijlprsvz\x02\x04\nCIKX[^fpsn\x80s\x81e\x82-AT\x83\xC3lno\x012\x84\x85\xC2\x1E-\treverse\x90\t\xC301G\x0C\x0F\xC201\x06\xC212\x01\x86\x879\x8842\x89B\x8A-u-sd-gbeng\x8B\x8C\xC2ai\x01\x8D\x8Es\x8Fa\x90\0\x1Ereverse\x90\na\x90\x01t\x90\x02\xC2ou\x02\x90\x03\x90\x04r\x90\x05-Latn\x90\x06i\x90\x07h\x90\x08" };
-                const VALUES: &'static zerovec::VarZeroSlice<<<icu_provider::hello_world::HelloWorldV1 as icu_provider::baked::zerotrie::DynamicDataMarker>::DataStruct as icu_provider::ule::MaybeAsVarULE>::EncodedStruct> = unsafe { zerovec::vecs::VarZeroSlice16::from_bytes_unchecked(b"\x1B\0\x19\0$\0.\09\0T\0_\0q\0\x80\0\x8F\0\x9E\0\xB1\0\xD8\0\xE6\0\xFA\0\x05\x01\x13\x01(\x012\x01=\x01H\x01\\\x01u\x01\x82\x01\x98\x01\xA4\x01\xAF\x01\xE0\xA6\x93\xE0\xA6\xB9\xE0\xA7\x87 \xE0\xA6\xAC\xE0\xA6\xBF\xE0\xA6\xB6\xE0\xA7\x8D\xE0\xA6\xACAhoj sv\xC4\x9BteHallo WeltServus Welt\xCE\x9A\xCE\xB1\xCE\xBB\xCE\xB7\xCE\xBC\xCE\xAD\xCF\x81\xCE\xB1 \xCE\xBA\xCF\x8C\xCF\x83\xCE\xBC\xCE\xB5Hello WorldHello from \xF0\x9F\x97\xBA\xEF\xB8\x8FHello from \xF0\x9F\x8C\x8DHello from \xF0\x9F\x8C\x8EHello from \xF0\x9F\x8C\x8FHello from \xF0\x9F\x87\xAC\xF0\x9F\x87\xA7Hello from \xF0\x9F\x8F\xB4\xF3\xA0\x81\xA7\xF3\xA0\x81\xA2\xF3\xA0\x81\xA5\xF3\xA0\x81\xAE\xF3\xA0\x81\xA7\xF3\xA0\x81\xBFSaluton, Mondo\xD8\xB3\xD9\x84\xD8\xA7\xD9\x85 \xD8\xAF\xD9\x86\xDB\x8C\xD8\xA7\xE2\x80\x8Ehei maailmaHall\xC3\xB3, heimur\xE3\x81\x93\xE3\x82\x93\xE3\x81\xAB\xE3\x81\xA1\xE3\x81\xAF\xE4\xB8\x96\xE7\x95\x8CAve, mundeOl\xC3\xA1, mundoSalut, lume\xD0\x9F\xD1\x80\xD0\xB8\xD0\xB2\xD0\xB5\xD1\x82, \xD0\xBC\xD0\xB8\xD1\x80\xD0\x9F\xD0\xBE\xD0\xB7\xD0\xB4\xD1\x80\xD0\xB0\xD0\xB2 \xD1\x81\xD0\xB2\xD0\xB5\xD1\x82\xD0\xB5Pozdrav sveteXin ch\xC3\xA0o th\xE1\xBA\xBF gi\xE1\xBB\x9Bi\xE4\xBD\xA0\xE5\xA5\xBD\xE4\xB8\x96\xE7\x95\x8COlleh Dlrow\xE7\x95\x8C\xE4\xB8\x96\xE3\x81\xAF\xE3\x81\xA1\xE3\x81\xAB\xE3\x82\x93\xE3\x81\x93") };
+                const TRIE: icu_provider::baked::zerotrie::ZeroTrieSimpleAscii<&'static [u8]> = icu_provider::baked::zerotrie::ZeroTrieSimpleAscii { store: b"\xCDbcdefijlprsvz\x02\x04\x15y\x87\x89\x95\x97\x99\x9F\xA7\xA9n\x80s\x81e\xC2\x1E-\x03de\x8CAT\x1Ede-AT\x8D\xC3lno\x04Y\x1Eel\x8E\xC2\x1E-\x0E\xC2er\x02n\x8Feverse\x90\t\xC301G\x18\x1F\xC201\x0E\xC212\x05\x1Een\x90\0\x1Een\x90\x019\x1Een\x90\x0242\x1Een\x90\x03B\xC2\x1E-\x07en-GB\x90\x04u-sd-gbeng\x1Een-GB\x90\x05\x1Eeo\x90\x06\xC2ai\x05\x1Efa\x90\x07\x1Efi\x90\x08s\x82a\x83\x1Ereverse\x90\na\x84t\x85\xC2ou\x01\x86\x87r\x88-Latn\x89i\x8Ah\x8B" };
+                const VALUES: &'static zerovec::VarZeroSlice<<<icu_provider::hello_world::HelloWorldV1 as icu_provider::baked::zerotrie::DynamicDataMarker>::DataStruct as icu_provider::ule::MaybeAsVarULE>::EncodedStruct> = unsafe { zerovec::vecs::VarZeroSlice16::from_bytes_unchecked(b"\x1B\0\x19\0$\x002\0G\0Q\0\\\0g\0{\0\x94\0\xA1\0\xB7\0\xC3\0\xCD\0\xD8\0\xF3\0\xFE\0\x10\x01\x1F\x01.\x01=\x01P\x01w\x01\x85\x01\x99\x01\xA4\x01\xAF\x01\xE0\xA6\x93\xE0\xA6\xB9\xE0\xA7\x87 \xE0\xA6\xAC\xE0\xA6\xBF\xE0\xA6\xB6\xE0\xA7\x8D\xE0\xA6\xACAhoj sv\xC4\x9BteHall\xC3\xB3, heimur\xE3\x81\x93\xE3\x82\x93\xE3\x81\xAB\xE3\x81\xA1\xE3\x81\xAF\xE4\xB8\x96\xE7\x95\x8CAve, mundeOl\xC3\xA1, mundoSalut, lume\xD0\x9F\xD1\x80\xD0\xB8\xD0\xB2\xD0\xB5\xD1\x82, \xD0\xBC\xD0\xB8\xD1\x80\xD0\x9F\xD0\xBE\xD0\xB7\xD0\xB4\xD1\x80\xD0\xB0\xD0\xB2 \xD1\x81\xD0\xB2\xD0\xB5\xD1\x82\xD0\xB5Pozdrav sveteXin ch\xC3\xA0o th\xE1\xBA\xBF gi\xE1\xBB\x9Bi\xE4\xBD\xA0\xE5\xA5\xBD\xE4\xB8\x96\xE7\x95\x8CHallo WeltServus Welt\xCE\x9A\xCE\xB1\xCE\xBB\xCE\xB7\xCE\xBC\xCE\xAD\xCF\x81\xCE\xB1 \xCE\xBA\xCF\x8C\xCF\x83\xCE\xBC\xCE\xB5Hello WorldHello from \xF0\x9F\x97\xBA\xEF\xB8\x8FHello from \xF0\x9F\x8C\x8DHello from \xF0\x9F\x8C\x8EHello from \xF0\x9F\x8C\x8FHello from \xF0\x9F\x87\xAC\xF0\x9F\x87\xA7Hello from \xF0\x9F\x8F\xB4\xF3\xA0\x81\xA7\xF3\xA0\x81\xA2\xF3\xA0\x81\xA5\xF3\xA0\x81\xAE\xF3\xA0\x81\xA7\xF3\xA0\x81\xBFSaluton, Mondo\xD8\xB3\xD9\x84\xD8\xA7\xD9\x85 \xD8\xAF\xD9\x86\xDB\x8C\xD8\xA7\xE2\x80\x8Ehei maailmaOlleh Dlrow\xE7\x95\x8C\xE4\xB8\x96\xE3\x81\xAF\xE3\x81\xA1\xE3\x81\xAB\xE3\x82\x93\xE3\x81\x93") };
                 unsafe { icu_provider::baked::zerotrie::DataForVarULEs::from_trie_and_values_unchecked(TRIE, VALUES) }
             };
         }

provider/blob/tests/data/v3.postcard

@@ -62,6 +62,8 @@ data_marker!(
     HelloWorldV1,
     HelloWorld<'static>,
     has_checksum = true,
+    #[cfg(feature = "export")]
+    attributes_domain = "hello",
 );
 
 /// A data provider returning Hello World strings in different languages.
@@ -113,26 +115,26 @@ impl HelloWorldProvider {
     const DATA: &'static [(&'static str, &'static str, &'static str)] = &[
         ("bn", "", "ওহে বিশ্ব"),
         ("cs", "", "Ahoj světe"),
-        ("de", "", "Hallo Welt"),
-        ("de-AT", "", "Servus Welt"),
-        ("el", "", "Καλημέρα κόσμε"),
-        ("en", "", "Hello World"),
+        ("de", "de", "Hallo Welt"),
+        ("de-AT", "de-AT", "Servus Welt"),
+        ("el", "el", "Καλημέρα κόσμε"),
+        ("en", "en", "Hello World"),
         // WORLD
-        ("en-001", "", "Hello from 🗺️"),
+        ("en-001", "en", "Hello from 🗺️"),
         // AFRICA
-        ("en-002", "", "Hello from 🌍"),
+        ("en-002", "en", "Hello from 🌍"),
         // AMERICAS
-        ("en-019", "", "Hello from 🌎"),
+        ("en-019", "en", "Hello from 🌎"),
         // ASIA
-        ("en-142", "", "Hello from 🌏"),
+        ("en-142", "en", "Hello from 🌏"),
         // GREAT BRITAIN
-        ("en-GB", "", "Hello from 🇬🇧"),
+        ("en-GB", "en-GB", "Hello from 🇬🇧"),
         // ENGLAND
-        ("en-GB-u-sd-gbeng", "", "Hello from 🏴󠁧󠁢󠁥󠁮󠁧󠁿"),
+        ("en-GB-u-sd-gbeng", "en-GB", "Hello from 🏴󠁧󠁢󠁥󠁮󠁧󠁿"),
         ("en", "reverse", "Olleh Dlrow"),
-        ("eo", "", "Saluton, Mondo"),
-        ("fa", "", "سلام دنیا‎"),
-        ("fi", "", "hei maailma"),
+        ("eo", "eo", "Saluton, Mondo"),
+        ("fa", "fa", "سلام دنیا‎"),
+        ("fi", "fi", "hei maailma"),
         ("is", "", "Halló, heimur"),
         ("ja", "", "こんにちは世界"),
         ("ja", "reverse", "界世はちにんこ"),
@@ -364,23 +366,62 @@ fn test_iter() {
         BTreeSet::from_iter([
             DataIdentifierCow::from_locale(locale!("bn").into()),
             DataIdentifierCow::from_locale(locale!("cs").into()),
-            DataIdentifierCow::from_locale(locale!("de").into()),
-            DataIdentifierCow::from_locale(locale!("de-AT").into()),
-            DataIdentifierCow::from_locale(locale!("el").into()),
-            DataIdentifierCow::from_locale(locale!("en").into()),
-            DataIdentifierCow::from_locale(locale!("en-001").into()),
-            DataIdentifierCow::from_locale(locale!("en-002").into()),
-            DataIdentifierCow::from_locale(locale!("en-019").into()),
-            DataIdentifierCow::from_locale(locale!("en-142").into()),
-            DataIdentifierCow::from_locale(locale!("en-GB").into()),
-            DataIdentifierCow::from_locale(locale!("en-GB-u-sd-gbeng").into()),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("de"),
+                locale!("de").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("de-AT"),
+                locale!("de-AT").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("el"),
+                locale!("el").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("en"),
+                locale!("en").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("en"),
+                locale!("en-001").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("en"),
+                locale!("en-002").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("en"),
+                locale!("en-019").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("en"),
+                locale!("en-142").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("en-GB"),
+                locale!("en-GB").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("en-GB"),
+                locale!("en-GB-u-sd-gbeng").into()
+            ),
             DataIdentifierCow::from_borrowed_and_owned(
                 DataMarkerAttributes::from_str_or_panic("reverse"),
                 locale!("en").into()
             ),
-            DataIdentifierCow::from_locale(locale!("eo").into()),
-            DataIdentifierCow::from_locale(locale!("fa").into()),
-            DataIdentifierCow::from_locale(locale!("fi").into()),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("eo"),
+                locale!("eo").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("fa"),
+                locale!("fa").into()
+            ),
+            DataIdentifierCow::from_borrowed_and_owned(
+                DataMarkerAttributes::from_str_or_panic("fi"),
+                locale!("fi").into()
+            ),
             DataIdentifierCow::from_locale(locale!("is").into()),
             DataIdentifierCow::from_locale(locale!("ja").into()),
             DataIdentifierCow::from_borrowed_and_owned(

provider/core/src/hello_world.rs

@@ -1111,7 +1111,10 @@ fn test_debug() {
     use crate::prelude::*;
     let resp = HelloWorldProvider
         .load(DataRequest {
-            id: DataIdentifierBorrowed::for_locale(&icu_locale_core::locale!("en").into()),
+            id: DataIdentifierBorrowed::for_marker_attributes_and_locale(
+                DataMarkerAttributes::from_str_or_panic("en"),
+                &icu_locale_core::locale!("en").into(),
+            ),
             ..Default::default()
         })
         .unwrap();