Skip to content

Commit 899bac4

Browse files
Remove Umm-al-Qura data struct (#6404)
Given that clients shouldn't use custom data for this, we can hardcode this data and have a nicer API and better optimisations.
1 parent 0562ccb commit 899bac4

File tree

21 files changed

+875
-2827
lines changed

21 files changed

+875
-2827
lines changed

components/calendar/benches/date.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,7 @@ fn date_benches(c: &mut Criterion) {
242242
"calendar/islamic/ummalqura",
243243
&fxs,
244244
icu::calendar::cal::HijriUmmAlQura::new(),
245-
|y, m, d| {
246-
Date::try_new_ummalqura_with_calendar(
247-
y,
248-
m,
249-
d,
250-
icu::calendar::cal::HijriUmmAlQura::new(),
251-
)
252-
.unwrap()
253-
},
245+
|y, m, d| Date::try_new_ummalqura(y, m, d).unwrap(),
254246
);
255247

256248
bench_calendar(

components/calendar/src/any_calendar.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,7 @@ impl AnyCalendar {
610610
HijriTabularEpoch::Thursday,
611611
))
612612
}
613-
AnyCalendarKind::HijriUmmAlQura => {
614-
AnyCalendar::HijriUmmAlQura(HijriUmmAlQura::try_new_with_buffer_provider(provider)?)
615-
}
613+
AnyCalendarKind::HijriUmmAlQura => AnyCalendar::HijriUmmAlQura(HijriUmmAlQura::new()),
616614
AnyCalendarKind::Iso => AnyCalendar::Iso(Iso),
617615
AnyCalendarKind::Japanese => {
618616
AnyCalendar::Japanese(Japanese::try_new_with_buffer_provider(provider)?)
@@ -633,7 +631,6 @@ impl AnyCalendar {
633631
+ DataProvider<crate::provider::CalendarChineseV1>
634632
+ DataProvider<crate::provider::CalendarDangiV1>
635633
+ DataProvider<crate::provider::CalendarHijriSimulatedMeccaV1>
636-
+ DataProvider<crate::provider::CalendarHijriUmmalquraV1>
637634
+ ?Sized,
638635
{
639636
Ok(match kind {
@@ -665,9 +662,7 @@ impl AnyCalendar {
665662
HijriTabularEpoch::Thursday,
666663
))
667664
}
668-
AnyCalendarKind::HijriUmmAlQura => {
669-
AnyCalendar::HijriUmmAlQura(HijriUmmAlQura::try_new_unstable(provider)?)
670-
}
665+
AnyCalendarKind::HijriUmmAlQura => AnyCalendar::HijriUmmAlQura(HijriUmmAlQura::new()),
671666
AnyCalendarKind::Iso => AnyCalendar::Iso(Iso),
672667
AnyCalendarKind::Japanese => {
673668
AnyCalendar::Japanese(Japanese::try_new_unstable(provider)?)
@@ -804,7 +799,7 @@ impl AnyCalendarKind {
804799
} else if region == Some(region!("AF")) || region == Some(region!("IR")) {
805800
AnyCalendarKind::Persian
806801
} else if region == Some(region!("SA")) && algo == Some(CalendarAlgorithm::Hijri(None)) {
807-
AnyCalendarKind::HijriUmmAlQura
802+
AnyCalendarKind::HijriSimulatedMecca
808803
} else {
809804
AnyCalendarKind::Gregorian
810805
}

0 commit comments

Comments
 (0)