Make DataRequest.payload non-optional (#5037)

Fixes #2956
unicode-org · Jun 11, 2024 · 90727cc · 90727cc
1 parent 8a229de
commit 90727cc
Show file tree

Hide file tree

Showing 589 changed files with 1,258 additions and 1,583 deletions.
diff --git a/components/calendar/src/chinese.rs b/components/calendar/src/chinese.rs
@@ -174,7 +174,7 @@ impl Chinese {
         provider: &D,
     ) -> Result<Self, DataError> {
         Ok(Self {
-            data: Some(provider.load(Default::default())?.take_payload()?),
+            data: Some(provider.load(Default::default())?.payload),
         })
     }
 

diff --git a/components/calendar/src/dangi.rs b/components/calendar/src/dangi.rs
@@ -167,7 +167,7 @@ impl Dangi {
         provider: &D,
     ) -> Result<Self, DataError> {
         Ok(Self {
-            data: Some(provider.load(Default::default())?.take_payload()?),
+            data: Some(provider.load(Default::default())?.payload),
         })
     }
 

diff --git a/components/calendar/src/islamic.rs b/components/calendar/src/islamic.rs
@@ -142,7 +142,7 @@ impl IslamicObservational {
         provider: &D,
     ) -> Result<Self, DataError> {
         Ok(Self {
-            data: Some(provider.load(Default::default())?.take_payload()?),
+            data: Some(provider.load(Default::default())?.payload),
         })
     }
 
@@ -189,7 +189,7 @@ impl IslamicUmmAlQura {
         provider: &D,
     ) -> Result<Self, DataError> {
         Ok(Self {
-            data: Some(provider.load(Default::default())?.take_payload()?),
+            data: Some(provider.load(Default::default())?.payload),
         })
     }
 

diff --git a/components/calendar/src/japanese.rs b/components/calendar/src/japanese.rs
@@ -144,7 +144,7 @@ impl Japanese {
         provider: &D,
     ) -> Result<Self, DataError> {
         Ok(Self {
-            eras: provider.load(Default::default())?.take_payload()?,
+            eras: provider.load(Default::default())?.payload,
         })
     }
 
@@ -202,7 +202,7 @@ impl JapaneseExtended {
         provider: &D,
     ) -> Result<Self, DataError> {
         Ok(Self(Japanese {
-            eras: provider.load(Default::default())?.take_payload()?.cast(),
+            eras: provider.load(Default::default())?.payload.cast(),
         }))
     }
 

diff --git a/components/calendar/src/week_of.rs b/components/calendar/src/week_of.rs
@@ -69,8 +69,7 @@ impl WeekCalculator {
                     ..Default::default()
                 },
             )
-            .and_then(DataResponse::take_payload)
-            .map(|payload| payload.get().into())
+            .map(|response| response.payload.get().into())
             .map_err(|_| e)
         })
     }
@@ -89,8 +88,7 @@ impl WeekCalculator {
                     ..Default::default()
                 },
             )
-            .and_then(DataResponse::take_payload)
-            .map(|payload| payload.get().into())
+            .map(|response| response.payload.get().into())
             .map_err(|_| e)
         })
     }
@@ -105,11 +103,10 @@ impl WeekCalculator {
                 locale,
                 ..Default::default()
             })
-            .and_then(DataResponse::take_payload)
-            .map(|payload| WeekCalculator {
-                first_weekday: payload.get().first_weekday,
-                min_week_days: payload.get().min_week_days,
-                weekend: Some(payload.get().weekend),
+            .map(|response| WeekCalculator {
+                first_weekday: response.payload.get().first_weekday,
+                min_week_days: response.payload.get().min_week_days,
+                weekend: Some(response.payload.get().weekend),
             })
             .map_err(Into::into)
     }

diff --git a/components/casemap/src/casemapper.rs b/components/casemap/src/casemapper.rs
@@ -93,7 +93,7 @@ impl CaseMapper {
     where
         P: DataProvider<CaseMapV1Marker> + ?Sized,
     {
-        let data = provider.load(Default::default())?.take_payload()?;
+        let data = provider.load(Default::default())?.payload;
         Ok(Self { data })
     }
 

diff --git a/components/casemap/src/closer.rs b/components/casemap/src/closer.rs
@@ -103,7 +103,7 @@ impl CaseMapCloser<CaseMapper> {
         P: DataProvider<CaseMapV1Marker> + DataProvider<CaseMapUnfoldV1Marker> + ?Sized,
     {
         let cm = CaseMapper::try_new_unstable(provider)?;
-        let unfold = provider.load(Default::default())?.take_payload()?;
+        let unfold = provider.load(Default::default())?.payload;
         Ok(Self { cm, unfold })
     }
 }
@@ -142,7 +142,7 @@ impl<CM: AsRef<CaseMapper>> CaseMapCloser<CM> {
     where
         P: DataProvider<CaseMapV1Marker> + DataProvider<CaseMapUnfoldV1Marker> + ?Sized,
     {
-        let unfold = provider.load(Default::default())?.take_payload()?;
+        let unfold = provider.load(Default::default())?.payload;
         Ok(Self {
             cm: casemapper,
             unfold,

diff --git a/components/collator/src/comparison.rs b/components/collator/src/comparison.rs
@@ -115,10 +115,10 @@ impl Collator {
     {
         Self::try_new_unstable_internal(
             provider,
-            provider.load(Default::default())?.take_payload()?,
-            provider.load(Default::default())?.take_payload()?,
-            provider.load(Default::default())?.take_payload()?,
-            || provider.load(Default::default())?.take_payload(),
+            provider.load(Default::default())?.payload,
+            provider.load(Default::default())?.payload,
+            provider.load(Default::default())?.payload,
+            || provider.load(Default::default()).map(|r| r.payload),
             locale,
             options,
         )
@@ -149,20 +149,20 @@ impl Collator {
         };
 
         let metadata_payload: DataPayload<crate::provider::CollationMetadataV1Marker> =
-            provider.load(req)?.take_payload()?;
+            provider.load(req)?.payload;
 
         let metadata = metadata_payload.get();
 
         let tailoring: Option<DataPayload<crate::provider::CollationDataV1Marker>> =
             if metadata.tailored() {
-                Some(provider.load(req)?.take_payload()?)
+                Some(provider.load(req)?.payload)
             } else {
                 None
             };
 
         let reordering: Option<DataPayload<crate::provider::CollationReorderingV1Marker>> =
             if metadata.reordering() {
-                Some(provider.load(req)?.take_payload()?)
+                Some(provider.load(req)?.payload)
             } else {
                 None
             };
@@ -175,8 +175,7 @@ impl Collator {
             }
         }
 
-        let root: DataPayload<CollationDataV1Marker> =
-            provider.load(Default::default())?.take_payload()?;
+        let root: DataPayload<CollationDataV1Marker> = provider.load(Default::default())?.payload;
 
         let tailored_diacritics = metadata.tailored_diacritics();
         let diacritics: DataPayload<CollationDiacriticsV1Marker> = provider
@@ -185,7 +184,7 @@ impl Collator {
             } else {
                 Default::default()
             })?
-            .take_payload()?;
+            .payload;
 
         if tailored_diacritics {
             // In the tailored case we accept a shorter table in which case the tailoring is