Collapse HijriCivil into HijriTabular (#6384)

#6330

Author: robertbastian

CHANGELOG.md

@@ -7,6 +7,7 @@
         - ...
     - `icu_calendar`
         - Rename `Islamic` calendars to `Hijri` (unicode-org#6214)
+        - Collapse `IslamicCivil` into `IslamicTabular` (unicode-org#6384)
     - `icu_collections`
         - Remove some panics from `CodePointTrie`, which should no longer pull in panic machinery even with arithmetic panics enabled for lookup (unicode-org#6204)
 - Data model and providers

components/calendar/benches/convert.rs

@@ -78,7 +78,7 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/civil",
-        icu::calendar::cal::HijriCivil::new(),
+        icu::calendar::cal::HijriTabular::new_civil_epoch(),
     );
 
     bench_calendar(
@@ -90,7 +90,7 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/tabular",
-        icu::calendar::cal::HijriTabular::new(),
+        icu::calendar::cal::HijriTabular::new_astronomical_epoch(),
     );
 
     group.finish();

components/calendar/benches/date.rs

@@ -197,24 +197,29 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/civil",
         &fxs,
-        icu::calendar::cal::HijriCivil::new(),
+        icu::calendar::cal::HijriTabular::new_civil_epoch(),
         |y, m, d| {
-            Date::try_new_hijri_civil_with_calendar(y, m, d, icu::calendar::cal::HijriCivil::new())
-                .unwrap()
+            Date::try_new_hijri_tabular_with_calendar(
+                y,
+                m,
+                d,
+                icu::calendar::cal::HijriTabular::new_civil_epoch(),
+            )
+            .unwrap()
         },
     );
 
     bench_calendar(
         &mut group,
         "calendar/islamic/tabular",
         &fxs,
-        icu::calendar::cal::HijriTabular::new(),
+        icu::calendar::cal::HijriTabular::new_astronomical_epoch(),
         |y, m, d| {
             Date::try_new_hijri_tabular_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::cal::HijriTabular::new(),
+                icu::calendar::cal::HijriTabular::new_astronomical_epoch(),
             )
             .unwrap()
         },