Squashed commit of the following:

commit 7f84837 Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 19:31:59 2023 -0500 Update request.rs commit 905e697 Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 16:50:55 2023 -0700 gn-gen commit 1e52541 Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 16:50:06 2023 -0700 Update sizes (probably need to fix nightly sizes too) commit 45778ce Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 16:47:06 2023 -0700 Use the TinyStr variant commit 04ee1df Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 16:42:26 2023 -0700 Remove Default impl commit 3d83b95 Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 16:42:02 2023 -0700 Add impls based on Deref commit 3b14fbd Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 16:10:47 2023 -0700 Add 3-way enum (not using Stack variant yet) commit cda1498 Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 13:57:26 2023 -0700 Fix build post merge commit 71c1087 Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 13:56:30 2023 -0700 Support multipart auxiliary keys commit f31643a Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 13:17:17 2023 -0700 Use `+` for aux key commit dbefbf9 Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 13:04:55 2023 -0700 More more is_und commit f8e310e Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 13:03:07 2023 -0700 is_und in driver.rs (post merge cleanup) commit 33fad72 Merge: 5551d6b ea1ba9f Author: Shane F. Carr <shane@unicode.org> Date: Thu Aug 17 12:58:16 2023 -0700 Merge branch 'main' into auxkey Conflicts: provider/datagen/src/lib.rs commit 5551d6b Author: Shane F. Carr <shane@unicode.org> Date: Wed Aug 16 17:07:24 2023 -0700 fmt and refactor commit cd0d86c Author: Shane F. Carr <shane@unicode.org> Date: Wed Aug 16 17:00:56 2023 -0700 Fix baked_exporter.rs commit 241b563 Author: Shane F. Carr <shane@unicode.org> Date: Wed Aug 16 14:51:39 2023 -0700 Pull the separator character into a function where possible. commit 93f0969 Author: Shane F. Carr <shane@unicode.org> Date: Wed Aug 16 14:47:19 2023 -0700 Handle $ in baked_exporter commit 3493b75 Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 19:24:09 2023 -0700 Use is_und instead of is_empty more consistently in fallback iterator commit 52ab723 Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 19:19:23 2023 -0700 Add DataLocale::is_und; gen hello world testdata commit f36b405 Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 19:05:19 2023 -0700 Use auxiliary keys in HelloWorldProvider commit 54101ad Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 18:57:06 2023 -0700 Forbid the empty string in AuxiliaryKey commit d0e30e2 Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 18:54:44 2023 -0700 Docs, tests, cleanup commit 06e453c Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 18:29:18 2023 -0700 Change custom error type to DataError::KeyLocaleSyntax commit 6cb45f6 Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 18:18:00 2023 -0700 Make comparison operations work commit 59aa0b4 Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 15:55:52 2023 -0700 Start writing impl FromStr for DataLocale commit 3d36855 Author: Shane F. Carr <shane@unicode.org> Date: Tue Aug 15 13:23:16 2023 -0700 Initial auxiliary key APIs
unicode-org · robertbastian · Aug 23, 2023 · Aug 16, 2023 · Aug 16, 2023 · Aug 16, 2023
commit 73e86a84992f183220a5811e86e57aa5f7e21697
diff --git a/components/collator/data/data/macros/collator_reord_v1.data.rs b/components/collator/data/data/macros/collator_reord_v1.data.rs
diff --git a/components/datetime/data/data/macros/datetime_skeletons_v1.data.rs b/components/datetime/data/data/macros/datetime_skeletons_v1.data.rs
diff --git a/components/datetime/src/lib.rs b/components/datetime/src/lib.rs
@@ -206,9 +206,9 @@ mod tests {
     fn check_sizes() {
         check_size_of!(5800 | 4632, DateFormatter);
         check_size_of!(6792 | 5504, DateTimeFormatter);
-        check_size_of!(7904 | 6528, ZonedDateTimeFormatter);
+        check_size_of!(7904 | 6552, ZonedDateTimeFormatter);
         check_size_of!(1496 | 1344, TimeFormatter);
-        check_size_of!(1112 | 1024, TimeZoneFormatter);
+        check_size_of!(1112 | 1048, TimeZoneFormatter);
         check_size_of!(5752 | 4584, TypedDateFormatter::<Gregorian>);
         check_size_of!(6744 | 5456, TypedDateTimeFormatter::<Gregorian>);
 

diff --git a/experimental/displaynames/data/data/macros/displaynames_languages_v1.data.rs b/experimental/displaynames/data/data/macros/displaynames_languages_v1.data.rs
diff --git a/experimental/displaynames/data/data/macros/displaynames_locales_v1.data.rs b/experimental/displaynames/data/data/macros/displaynames_locales_v1.data.rs
diff --git a/experimental/displaynames/data/data/macros/displaynames_regions_v1.data.rs b/experimental/displaynames/data/data/macros/displaynames_regions_v1.data.rs
diff --git a/experimental/displaynames/data/data/macros/displaynames_scripts_v1.data.rs b/experimental/displaynames/data/data/macros/displaynames_scripts_v1.data.rs
diff --git a/experimental/displaynames/data/data/macros/displaynames_variants_v1.data.rs b/experimental/displaynames/data/data/macros/displaynames_variants_v1.data.rs
diff --git a/ffi/gn/Cargo.lock b/ffi/gn/Cargo.lock
diff --git a/ffi/gn/icu4x/BUILD.gn b/ffi/gn/icu4x/BUILD.gn
@@ -558,6 +558,7 @@ rust_library("icu_provider-v1_2_0") {
   deps += [ ":icu_locid-v1_2_0" ]
   deps += [ ":icu_provider_macros-v1_2_0($host_toolchain)" ]
   deps += [ ":stable_deref_trait-v1_2_0" ]
+  deps += [ ":tinystr-v0_7_1" ]
   deps += [ ":writeable-v0_5_2" ]
   deps += [ ":yoke-v0_7_1" ]
   deps += [ ":zerofrom-v0_1_2" ]

diff --git a/provider/adapters/src/fallback/mod.rs b/provider/adapters/src/fallback/mod.rs
@@ -223,7 +223,7 @@ impl<P> LocaleFallbackProvider<P> {
                     });
             }
             // If we just checked und, break out of the loop.
-            if fallback_iterator.get().is_empty() {
+            if fallback_iterator.get().is_und() {
                 break;
             }
             fallback_iterator.step();

diff --git a/provider/adapters/tests/data/blob.postcard b/provider/adapters/tests/data/blob.postcard
diff --git a/provider/blob/tests/data/hello_world.postcard b/provider/blob/tests/data/hello_world.postcard
diff --git a/provider/core/Cargo.toml b/provider/core/Cargo.toml
@@ -32,6 +32,7 @@ all-features = true
 displaydoc = { version = "0.2.3", default-features = false }
 icu_locid = { version = "1.2.0", path = "../../components/locid" }
 stable_deref_trait = { version = "1.2.0", default-features = false }
+tinystr = { version = "0.7.1", path = "../../utils/tinystr" }
 writeable = { version = "0.5.1", path = "../../utils/writeable" }
 yoke = { version = "0.7.1", path = "../../utils/yoke", features = ["derive"] }
 zerofrom = { version = "0.1.1", path = "../../utils/zerofrom", features = ["derive"] }

diff --git a/provider/core/src/error.rs b/provider/core/src/error.rs
@@ -47,6 +47,10 @@ pub enum DataErrorKind {
     #[displaydoc("Invalid state")]
     InvalidState,
 
+    /// The syntax of the [`DataKey`] or [`DataLocale`] was invalid.
+    #[displaydoc("Parse error for data key or data locale")]
+    KeyLocaleSyntax,
+
     /// An unspecified error occurred, such as a Serde error.
     ///
     /// Check debug logs for potentially more information.

diff --git a/provider/core/src/hello_world.rs b/provider/core/src/hello_world.rs
@@ -76,6 +76,25 @@ impl KeyedDataMarker for HelloWorldV1Marker {
 ///
 /// assert_eq!("Hallo Welt", german_hello_world.get().message);
 /// ```
+///
+/// Load the reverse string using an auxiliary key:
+///
+/// ```
+/// use icu_provider::hello_world::*;
+/// use icu_provider::prelude::*;
+///
+/// let reverse_hello_world: DataPayload<HelloWorldV1Marker> =
+///     HelloWorldProvider
+///         .load(DataRequest {
+///             locale: &"en+reverse".parse().unwrap(),
+///             metadata: Default::default(),
+///         })
+///         .expect("Loading should succeed")
+///         .take_payload()
+///         .expect("Data should be present");
+///
+/// assert_eq!("Olleh Dlrow", reverse_hello_world.get().message);
+/// ```
 #[derive(Debug, PartialEq, Default)]
 pub struct HelloWorldProvider;
 
@@ -88,11 +107,13 @@ impl HelloWorldProvider {
         ("de", "Hallo Welt"),
         ("el", "Καλημέρα κόσμε"),
         ("en", "Hello World"),
+        ("en+reverse", "Olleh Dlrow"),
         ("eo", "Saluton, Mondo"),
         ("fa", "سلام دنیا‎"),
         ("fi", "hei maailma"),
         ("is", "Halló, heimur"),
         ("ja", "こんにちは世界"),
+        ("ja+reverse", "界世はちにんこ"),
         ("la", "Ave, munde"),
         ("pt", "Olá, mundo"),
         ("ro", "Salut, lume"),
@@ -190,11 +211,7 @@ impl BufferProvider for HelloWorldJsonProvider {
 impl icu_provider::datagen::IterableDataProvider<HelloWorldV1Marker> for HelloWorldProvider {
     fn supported_locales(&self) -> Result<Vec<DataLocale>, DataError> {
         #[allow(clippy::unwrap_used)] // datagen
-        Ok(Self::DATA
-            .iter()
-            .map(|(s, _)| s.parse::<icu_locid::LanguageIdentifier>().unwrap())
-            .map(DataLocale::from)
-            .collect())
+        Ok(Self::DATA.iter().map(|(s, _)| s.parse().unwrap()).collect())
     }
 }
 
@@ -309,11 +326,13 @@ fn test_iter() {
             locale!("de").into(),
             locale!("el").into(),
             locale!("en").into(),
+            "en+reverse".parse().unwrap(),
             locale!("eo").into(),
             locale!("fa").into(),
             locale!("fi").into(),
             locale!("is").into(),
             locale!("ja").into(),
+            "ja+reverse".parse().unwrap(),
             locale!("la").into(),
             locale!("pt").into(),
             locale!("ro").into(),

diff --git a/provider/core/src/lib.rs b/provider/core/src/lib.rs
@@ -161,6 +161,7 @@ pub use crate::key::DataKey;
 pub use crate::key::DataKeyHash;
 pub use crate::key::DataKeyMetadata;
 pub use crate::key::DataKeyPath;
+pub use crate::request::AuxiliaryKeys;
 pub use crate::request::DataLocale;
 pub use crate::request::DataRequest;
 pub use crate::request::DataRequestMetadata;
@@ -206,6 +207,8 @@ pub mod prelude {
     #[doc(no_inline)]
     pub use crate::AsDynamicDataProviderAnyMarkerWrap;
     #[doc(no_inline)]
+    pub use crate::AuxiliaryKeys;
+    #[doc(no_inline)]
     pub use crate::BufferMarker;
     #[doc(no_inline)]
     pub use crate::BufferProvider;