Refactor to make code slightly prettier

unicode-org · Oct 20, 2023 · 3d39124 · 3d39124
1 parent d13b663
commit 3d39124
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 35 deletions.
diff --git a/components/datetime/src/provider/calendar/symbols.rs b/components/datetime/src/provider/calendar/symbols.rs
@@ -252,6 +252,25 @@ macro_rules! symbols {
                 #[cfg_attr(feature = "serde", serde(borrow))]
                 pub stand_alone: Option<StandAloneWidthsV1<'data>>,
             }
+
+            impl<'data> ContextsV1<'data> {
+                /// Convenience function to return stand-alone abbreviated as an `Option<&>`.
+                pub(crate) fn stand_alone_abbreviated(&self) -> Option<&SymbolsV1<'data>> {
+                    self.stand_alone.as_ref().and_then(|x| x.abbreviated.as_ref())
+                }
+                /// Convenience function to return stand-alone wide as an `Option<&>`.
+                pub(crate) fn stand_alone_wide(&self) -> Option<&SymbolsV1<'data>> {
+                    self.stand_alone.as_ref().and_then(|x| x.wide.as_ref())
+                }
+                /// Convenience function to return stand-alone narrow as an `Option<&>`.
+                pub(crate) fn stand_alone_narrow(&self) -> Option<&SymbolsV1<'data>> {
+                    self.stand_alone.as_ref().and_then(|x| x.narrow.as_ref())
+                }
+                /// Convenience function to return stand-alone short as an `Option<&>`.
+                pub(crate) fn stand_alone_short(&self) -> Option<&SymbolsV1<'data>> {
+                    self.stand_alone.as_ref().and_then(|x| x.short.as_ref())
+                }
+            }
         }
     };
 }

diff --git a/components/datetime/src/provider/neo/transform.rs b/components/datetime/src/provider/neo/transform.rs
@@ -37,21 +37,9 @@ where
     let new_payload = payload.map_project_cloned(|payload, _| {
         use subtag_consts::*;
         let result = match subtag {
-            STADLN_ABBR => payload
-                .months
-                .stand_alone
-                .as_ref()
-                .and_then(|x| x.abbreviated.as_ref()),
-            STADLN_WIDE => payload
-                .months
-                .stand_alone
-                .as_ref()
-                .and_then(|x| x.wide.as_ref()),
-            STADLN_NARW => payload
-                .months
-                .stand_alone
-                .as_ref()
-                .and_then(|x| x.narrow.as_ref()),
+            STADLN_ABBR => payload.months.stand_alone_abbreviated(),
+            STADLN_WIDE => payload.months.stand_alone_wide(),
+            STADLN_NARW => payload.months.stand_alone_narrow(),
             _ => None,
         };
         if let Some(result) = result {
@@ -87,26 +75,10 @@ where
     let new_payload = payload.map_project_cloned(|payload, _| {
         use subtag_consts::*;
         let result = match subtag {
-            STADLN_ABBR => payload
-                .weekdays
-                .stand_alone
-                .as_ref()
-                .and_then(|x| x.abbreviated.as_ref()),
-            STADLN_WIDE => payload
-                .weekdays
-                .stand_alone
-                .as_ref()
-                .and_then(|x| x.wide.as_ref()),
-            STADLN_NARW => payload
-                .weekdays
-                .stand_alone
-                .as_ref()
-                .and_then(|x| x.narrow.as_ref()),
-            STADLN_SHRT => payload
-                .weekdays
-                .stand_alone
-                .as_ref()
-                .and_then(|x| x.short.as_ref()),
+            STADLN_ABBR => payload.weekdays.stand_alone_abbreviated(),
+            STADLN_WIDE => payload.weekdays.stand_alone_wide(),
+            STADLN_NARW => payload.weekdays.stand_alone_narrow(),
+            STADLN_SHRT => payload.weekdays.stand_alone_short(),
             _ => None,
         };
         if let Some(result) = result {