Baked: Change DataStore to return DataPayload (#6135)

Toward #5230

Reduces the diff in #6133

Not intended to be controversial.

Autosubmit = true

Author: sffc

provider/baked/src/binary_search.rs

@@ -123,7 +123,7 @@ impl<K: BinarySearchKey, M: DataMarker> super::DataStore<M> for Data<K, M> {
         &self,
         id: DataIdentifierBorrowed,
         attributes_prefix_match: bool,
-    ) -> Option<&'static M::DataStruct> {
+    ) -> Option<DataPayload<M>> {
         self.0
             .binary_search_by(|&(k, _)| K::cmp(k, id))
             .or_else(|e| {
@@ -136,6 +136,7 @@ impl<K: BinarySearchKey, M: DataMarker> super::DataStore<M> for Data<K, M> {
             // Safety: binary_search returns in-bounds indices when returning Ok.
             // The err case in `or_else` above only returns in-bounds Ok values
             .map(|i| unsafe { self.0.get_unchecked(i) }.1)
+            .map(DataPayload::from_static_ref)
             .ok()
     }
 

provider/baked/src/export.rs

@@ -658,7 +658,7 @@ impl DataExporter for BakedExporter {
                             #search
 
                             Ok(icu_provider::DataResponse {
-                                payload: icu_provider::DataPayload::from_static_ref(payload),
+                                payload,
                                 metadata
                             })
                         }

provider/baked/src/lib.rs

@@ -21,7 +21,7 @@ pub trait DataStore<M: DataMarker> {
         &self,
         req: DataIdentifierBorrowed,
         attributes_prefix_match: bool,
-    ) -> Option<&'static M::DataStruct>;
+    ) -> Option<DataPayload<M>>;
 
     #[cfg(feature = "alloc")]
     type IterReturn: Iterator<Item = DataIdentifierCow<'static>>;

provider/baked/src/zerotrie.rs

@@ -81,7 +81,7 @@ impl<M: DataMarker> super::DataStore<M> for Data<M> {
         &self,
         id: DataIdentifierBorrowed,
         attributes_prefix_match: bool,
-    ) -> Option<&'static <M>::DataStruct> {
+    ) -> Option<DataPayload<M>> {
         use writeable::Writeable;
         let mut cursor = self.trie.cursor();
         let _is_ascii = id.locale.write_to(&mut cursor);
@@ -101,6 +101,7 @@ impl<M: DataMarker> super::DataStore<M> for Data<M> {
         }
         // Safety: Allowed since `i` came from the trie and the field safety invariant
         .map(|i| unsafe { self.values.get_unchecked(i) })
+        .map(DataPayload::from_static_ref)
     }
 
     #[cfg(feature = "alloc")]

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

@@ -27,7 +27,7 @@ macro_rules! __impl_hello_world_v1 {
             fn load(&self, req: icu_provider::DataRequest) -> Result<icu_provider::DataResponse<icu_provider::hello_world::HelloWorldV1>, icu_provider::DataError> {
                 let metadata = icu_provider::DataResponseMetadata::default().with_checksum(1234u64);
                 let Some(payload) = icu_provider_baked::DataStore::get(&Self::DATA_HELLO_WORLD_V1, req.id, req.metadata.attributes_prefix_match) else { return Err(icu_provider::DataErrorKind::IdentifierNotFound.with_req(<icu_provider::hello_world::HelloWorldV1 as icu_provider::DataMarker>::INFO, req)) };
-                Ok(icu_provider::DataResponse { payload: icu_provider::DataPayload::from_static_ref(payload), metadata })
+                Ok(icu_provider::DataResponse { payload, metadata })
             }
         }
     };