Add caching for the rest of the islamic calendars (‫عید مبارک!!‬) (#4785

) Fixes #3933 Uses work from #4770 on the remaining 3 calendars عید مبارک!!
unicode-org · Apr 19, 2024 · cb7e915 · cb7e915
1 parent 827128d
commit cb7e915
Show file tree

Hide file tree

Showing 22 changed files with 1,353 additions and 195 deletions.
diff --git a/components/calendar/benches/convert.rs b/components/calendar/benches/convert.rs
@@ -89,7 +89,7 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/civil",
-        icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+        icu::calendar::islamic::IslamicCivil::new(),
     );
 
     #[cfg(feature = "bench")]
@@ -103,7 +103,7 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/tabular",
-        icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+        icu::calendar::islamic::IslamicTabular::new(),
     );
 
     group.finish();

diff --git a/components/calendar/benches/date.rs b/components/calendar/benches/date.rs
@@ -222,13 +222,13 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/civil",
         &fxs,
-        icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+        icu::calendar::islamic::IslamicCivil::new(),
         |y, m, d| {
             Date::try_new_islamic_civil_date_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+                icu::calendar::islamic::IslamicCivil::new(),
             )
             .unwrap()
         },
@@ -239,13 +239,13 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/tabular",
         &fxs,
-        icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+        icu::calendar::islamic::IslamicTabular::new(),
         |y, m, d| {
             Date::try_new_islamic_tabular_date_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+                icu::calendar::islamic::IslamicTabular::new(),
             )
             .unwrap()
         },

diff --git a/components/calendar/benches/datetime.rs b/components/calendar/benches/datetime.rs
@@ -186,7 +186,7 @@ fn datetime_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/civil",
         &fxs,
-        icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+        icu::calendar::islamic::IslamicCivil::new(),
         |y, m, d, h, min, s| {
             DateTime::try_new_islamic_civil_datetime_with_calendar(
                 y,
@@ -195,7 +195,7 @@ fn datetime_benches(c: &mut Criterion) {
                 h,
                 min,
                 s,
-                icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+                icu::calendar::islamic::IslamicCivil::new(),
             )
             .unwrap()
         },
@@ -206,7 +206,7 @@ fn datetime_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/tabular",
         &fxs,
-        icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+        icu::calendar::islamic::IslamicTabular::new(),
         |y, m, d, h, min, s| {
             DateTime::try_new_islamic_tabular_datetime_with_calendar(
                 y,
@@ -215,7 +215,7 @@ fn datetime_benches(c: &mut Criterion) {
                 h,
                 min,
                 s,
-                icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+                icu::calendar::islamic::IslamicTabular::new(),
             )
             .unwrap()
         },

diff --git a/components/calendar/src/any_calendar.rs b/components/calendar/src/any_calendar.rs
@@ -590,7 +590,9 @@ impl AnyCalendar {
                 AnyCalendar::IslamicObservational(IslamicObservational::new())
             }
             AnyCalendarKind::IslamicTabular => AnyCalendar::IslamicTabular(IslamicTabular),
-            AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura),
+            AnyCalendarKind::IslamicUmmAlQura => {
+                AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura::new())
+            }
             AnyCalendarKind::Iso => AnyCalendar::Iso(Iso),
             AnyCalendarKind::Japanese => AnyCalendar::Japanese(Japanese::new()),
             AnyCalendarKind::JapaneseExtended => {
@@ -632,7 +634,9 @@ impl AnyCalendar {
                 IslamicObservational::try_new_with_any_provider(provider)?,
             ),
             AnyCalendarKind::IslamicTabular => AnyCalendar::IslamicTabular(IslamicTabular),
-            AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura),
+            AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(
+                IslamicUmmAlQura::try_new_with_any_provider(provider)?,
+            ),
             AnyCalendarKind::Iso => AnyCalendar::Iso(Iso),
             AnyCalendarKind::Japanese => {
                 AnyCalendar::Japanese(Japanese::try_new_with_any_provider(provider)?)
@@ -677,7 +681,9 @@ impl AnyCalendar {
                 IslamicObservational::try_new_with_buffer_provider(provider)?,
             ),
             AnyCalendarKind::IslamicTabular => AnyCalendar::IslamicTabular(IslamicTabular),
-            AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura),
+            AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(
+                IslamicUmmAlQura::try_new_with_buffer_provider(provider)?,
+            ),
             AnyCalendarKind::Iso => AnyCalendar::Iso(Iso),
             AnyCalendarKind::Japanese => {
                 AnyCalendar::Japanese(Japanese::try_new_with_buffer_provider(provider)?)
@@ -698,6 +704,7 @@ impl AnyCalendar {
             + DataProvider<crate::provider::ChineseCacheV1Marker>
             + DataProvider<crate::provider::DangiCacheV1Marker>
             + DataProvider<crate::provider::IslamicObservationalCacheV1Marker>
+            + DataProvider<crate::provider::IslamicUmmAlQuraCacheV1Marker>
             + ?Sized,
     {
         Ok(match kind {
@@ -719,7 +726,9 @@ impl AnyCalendar {
                 AnyCalendar::IslamicObservational(IslamicObservational::try_new_unstable(provider)?)
             }
             AnyCalendarKind::IslamicTabular => AnyCalendar::IslamicTabular(IslamicTabular),
-            AnyCalendarKind::IslamicUmmAlQura => AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura),
+            AnyCalendarKind::IslamicUmmAlQura => {
+                AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura::try_new_unstable(provider)?)
+            }
             AnyCalendarKind::Iso => AnyCalendar::Iso(Iso),
             AnyCalendarKind::Japanese => {
                 AnyCalendar::Japanese(Japanese::try_new_unstable(provider)?)
@@ -771,6 +780,7 @@ impl AnyCalendar {
             + DataProvider<crate::provider::ChineseCacheV1Marker>
             + DataProvider<crate::provider::DangiCacheV1Marker>
             + DataProvider<crate::provider::IslamicObservationalCacheV1Marker>
+            + DataProvider<crate::provider::IslamicUmmAlQuraCacheV1Marker>
             + ?Sized,
     {
         let kind = AnyCalendarKind::from_data_locale_with_fallback(locale);
@@ -1042,7 +1052,7 @@ impl AnyCalendarKind {
             AnyCalendarKind::IslamicCivil => IslamicCivil.debug_name(),
             AnyCalendarKind::IslamicObservational => IslamicObservational::DEBUG_NAME,
             AnyCalendarKind::IslamicTabular => IslamicTabular.debug_name(),
-            AnyCalendarKind::IslamicUmmAlQura => IslamicUmmAlQura.debug_name(),
+            AnyCalendarKind::IslamicUmmAlQura => IslamicUmmAlQura::DEBUG_NAME,
             AnyCalendarKind::Iso => Iso.debug_name(),
             AnyCalendarKind::Japanese => Japanese::DEBUG_NAME,
             AnyCalendarKind::JapaneseExtended => JapaneseExtended::DEBUG_NAME,
@@ -1221,10 +1231,10 @@ impl IntoAnyCalendar for Indian {
 
 impl IntoAnyCalendar for IslamicCivil {
     fn to_any(self) -> AnyCalendar {
-        AnyCalendar::IslamicCivil(IslamicCivil)
+        AnyCalendar::IslamicCivil(self)
     }
     fn to_any_cloned(&self) -> AnyCalendar {
-        AnyCalendar::IslamicCivil(IslamicCivil)
+        AnyCalendar::IslamicCivil(*self)
     }
     fn date_to_any(&self, d: &Self::DateInner) -> AnyDateInner {
         AnyDateInner::IslamicCivil(*d)
@@ -1245,10 +1255,10 @@ impl IntoAnyCalendar for IslamicObservational {
 
 impl IntoAnyCalendar for IslamicTabular {
     fn to_any(self) -> AnyCalendar {
-        AnyCalendar::IslamicTabular(IslamicTabular)
+        AnyCalendar::IslamicTabular(self)
     }
     fn to_any_cloned(&self) -> AnyCalendar {
-        AnyCalendar::IslamicTabular(IslamicTabular)
+        AnyCalendar::IslamicTabular(*self)
     }
     fn date_to_any(&self, d: &Self::DateInner) -> AnyDateInner {
         AnyDateInner::IslamicTabular(*d)
@@ -1257,10 +1267,10 @@ impl IntoAnyCalendar for IslamicTabular {
 
 impl IntoAnyCalendar for IslamicUmmAlQura {
     fn to_any(self) -> AnyCalendar {
-        AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura)
+        AnyCalendar::IslamicUmmAlQura(self)
     }
     fn to_any_cloned(&self) -> AnyCalendar {
-        AnyCalendar::IslamicUmmAlQura(IslamicUmmAlQura)
+        AnyCalendar::IslamicUmmAlQura(self.clone())
     }
     fn date_to_any(&self, d: &Self::DateInner) -> AnyDateInner {
         AnyDateInner::IslamicUmmAlQura(*d)