Remove HijriSimulated from DTF (#6400)

#6330

Author: robertbastian

components/calendar/src/any_calendar.rs

@@ -781,7 +781,7 @@ impl AnyCalendarKind {
         } else if region == Some(region!("AF")) || region == Some(region!("IR")) {
             AnyCalendarKind::Persian
         } else if region == Some(region!("SA")) && algo == Some(CalendarAlgorithm::Hijri(None)) {
-            AnyCalendarKind::HijriSimulatedMecca
+            AnyCalendarKind::HijriUmmAlQura
         } else {
             AnyCalendarKind::Gregorian
         }

components/datetime/src/external_loaders.rs

@@ -106,7 +106,6 @@ where
     P: DataProvider<icu_calendar::provider::CalendarJapaneseModernV1>
         + DataProvider<icu_calendar::provider::CalendarChineseV1>
         + DataProvider<icu_calendar::provider::CalendarDangiV1>
-        + DataProvider<icu_calendar::provider::CalendarHijriSimulatedMeccaV1>
         + DataProvider<icu_calendar::provider::CalendarHijriUmmalquraV1>
         + ?Sized,
 {

components/datetime/src/scaffold/calendar.rs

@@ -284,7 +284,7 @@ pub(crate) enum FormattableAnyCalendarKind {
     Hebrew,
     Indian,
     HijriTabularCivil,
-    HijriSimulatedMecca,
+    // _NOT_ HijriSimulatedMecca
     HijriTabularAstronomical,
     HijriUmmAlQura,
     Japanese,
@@ -307,7 +307,7 @@ impl FormattableAnyCalendarKind {
             Hebrew => Self::Hebrew,
             Indian => Self::Indian,
             HijriTabularCivil => Self::HijriTabularCivil,
-            HijriSimulatedMecca => Self::HijriSimulatedMecca,
+            HijriSimulatedMecca => return None,
             HijriTabularAstronomical => Self::HijriTabularAstronomical,
             HijriUmmAlQura => Self::HijriUmmAlQura,
             Iso => return None,
@@ -332,7 +332,7 @@ impl FormattableAnyCalendarKind {
             }
         }
         // Calendar not specified or not supported by DateTimeFormatter
-        // Currently this is CalendarAlgorithm::Iso8601
+        // Currently this is CalendarAlgorithm::Iso8601, CalendarAlgorithm::Hijri(Rgsa)
         // Let AnyCalendarKind constructor select an appropriate fallback
         prefs.calendar_algorithm = None;
         let kind = AnyCalendarKind::new((&prefs).into());
@@ -393,7 +393,6 @@ impl FormattableAnyCalendar {
             HijriTabularCivil => {
                 AnyCalendar::HijriTabularCivil(cal::HijriTabular::new_civil_epoch())
             }
-            HijriSimulatedMecca => AnyCalendar::HijriSimulated(cal::HijriSimulated::new_mecca()),
             HijriTabularAstronomical => {
                 AnyCalendar::HijriTabularAstronomical(cal::HijriTabular::new_astronomical_epoch())
             }
@@ -429,9 +428,6 @@ impl FormattableAnyCalendar {
             HijriTabularCivil => {
                 AnyCalendar::HijriTabularCivil(cal::HijriTabular::new_civil_epoch())
             }
-            HijriSimulatedMecca => AnyCalendar::HijriSimulated(
-                cal::HijriSimulated::try_new_mecca_with_buffer_provider(provider)?,
-            ),
             HijriTabularAstronomical => {
                 AnyCalendar::HijriTabularAstronomical(cal::HijriTabular::new_astronomical_epoch())
             }
@@ -456,7 +452,6 @@ impl FormattableAnyCalendar {
             + DataProvider<icu_calendar::provider::CalendarJapaneseModernV1>
             + DataProvider<icu_calendar::provider::CalendarChineseV1>
             + DataProvider<icu_calendar::provider::CalendarDangiV1>
-            + DataProvider<icu_calendar::provider::CalendarHijriSimulatedMeccaV1>
             + DataProvider<icu_calendar::provider::CalendarHijriUmmalquraV1>,
     {
         use FormattableAnyCalendarKind::*;
@@ -475,9 +470,6 @@ impl FormattableAnyCalendar {
             HijriTabularCivil => {
                 AnyCalendar::HijriTabularCivil(cal::HijriTabular::new_civil_epoch())
             }
-            HijriSimulatedMecca => {
-                AnyCalendar::HijriSimulated(cal::HijriSimulated::try_new_mecca_unstable(provider)?)
-            }
             HijriTabularAstronomical => {
                 AnyCalendar::HijriTabularAstronomical(cal::HijriTabular::new_astronomical_epoch())
             }
@@ -574,7 +566,7 @@ where
             Gregorian => H::Gregorian::bind(p).load_bound(req),
             Hebrew => H::Hebrew::bind(p).load_bound(req),
             Indian => H::Indian::bind(p).load_bound(req),
-            HijriTabularCivil | HijriTabularAstronomical | HijriSimulatedMecca | HijriUmmAlQura => {
+            HijriTabularCivil | HijriTabularAstronomical | HijriUmmAlQura => {
                 H::Hijri::bind(p).load_bound(req)
             }
             Japanese => H::Japanese::bind(p).load_bound(req),
@@ -593,9 +585,7 @@ where
             Gregorian => H::Gregorian::INFO,
             Hebrew => H::Hebrew::INFO,
             Indian => H::Indian::INFO,
-            HijriTabularCivil | HijriTabularAstronomical | HijriSimulatedMecca | HijriUmmAlQura => {
-                H::Hijri::INFO
-            }
+            HijriTabularCivil | HijriTabularAstronomical | HijriUmmAlQura => H::Hijri::INFO,
             Japanese => H::Japanese::INFO,
             Persian => H::Persian::INFO,
             Roc => H::Roc::INFO,

components/datetime/src/scaffold/fieldset_traits.rs

@@ -8,8 +8,7 @@ use crate::{
 };
 use icu_calendar::{
     provider::{
-        CalendarChineseV1, CalendarDangiV1, CalendarHijriSimulatedMeccaV1,
-        CalendarHijriUmmalquraV1, CalendarJapaneseModernV1,
+        CalendarChineseV1, CalendarDangiV1, CalendarHijriUmmalquraV1, CalendarJapaneseModernV1,
     },
     types::{DayOfMonth, DayOfYear, MonthInfo, Weekday, YearInfo},
     Date, Iso,
@@ -508,7 +507,6 @@ impl<T> AllFixedCalendarExternalDataMarkers for T where
 pub trait AllAnyCalendarExternalDataMarkers:
     DataProvider<CalendarChineseV1>
     + DataProvider<CalendarDangiV1>
-    + DataProvider<CalendarHijriSimulatedMeccaV1>
     + DataProvider<CalendarHijriUmmalquraV1>
     + DataProvider<CalendarJapaneseModernV1>
     + DataProvider<DecimalSymbolsV1>
@@ -520,7 +518,6 @@ impl<T> AllAnyCalendarExternalDataMarkers for T where
     T: ?Sized
         + DataProvider<CalendarChineseV1>
         + DataProvider<CalendarDangiV1>
-        + DataProvider<CalendarHijriSimulatedMeccaV1>
         + DataProvider<CalendarHijriUmmalquraV1>
         + DataProvider<CalendarJapaneseModernV1>
         + DataProvider<DecimalSymbolsV1>

components/datetime/tests/datetime.rs

@@ -248,7 +248,7 @@ fn assert_fixture_element<C>(
 
     if matches!(
         input.date.calendar().kind(),
-        AnyCalendarKind::JapaneseExtended
+        AnyCalendarKind::JapaneseExtended | AnyCalendarKind::HijriSimulatedMecca
     ) {
         // Not supported with FormattableAnyCalendar
         return;

ffi/dart/test/icu_test.dart

@@ -95,11 +95,11 @@ void main() {
       VariantOffsetsCalculator(),
     );
 
-    var locale = Locale.fromString('de-u-ca-islamic-rgsa');
+    var locale = Locale.fromString('de-u-ca-islamic-umalqura');
 
     ///// DateFormatter /////
 
-    expect(DateFormatter.md(locale).formatIso(zonedDateTimeIso.date), '14.07.');
+    expect(DateFormatter.md(locale).formatIso(zonedDateTimeIso.date), '15.07.');
 
     ///// TimeFormatter /////
 
@@ -117,7 +117,7 @@ void main() {
       DateTimeFormatter.ymdet(
         locale,
       ).formatIso(zonedDateTimeIso.date, zonedDateTimeIso.time),
-      'Mi., 14. Raj. 1446 AH, 14:32:12',
+      'Mi., 15. Raj. 1446 AH, 14:32:12',
     );
 
     expect(
@@ -126,7 +126,7 @@ void main() {
         length: DateTimeLength.long,
         timePrecision: TimePrecision.minute,
       ).formatIso(zonedDateTimeIso.date, zonedDateTimeIso.time),
-      'Mittwoch, 14. Radschab 1446 AH, 14:32',
+      'Mittwoch, 15. Radschab 1446 AH, 14:32',
     );
 
     expect(
@@ -136,7 +136,7 @@ void main() {
       ),
       throwsA(
         DateTimeMismatchedCalendarError(
-          thisKind: CalendarKind.hijriSimulatedMecca,
+          thisKind: CalendarKind.hijriUmmAlQura,
           dateKind: CalendarKind.buddhist,
         ),
       ),
@@ -145,19 +145,19 @@ void main() {
     expect(
       DateTimeFormatter.ymdet(locale).formatSameCalendar(
         zonedDateTimeBuddhist.date.toCalendar(
-          Calendar(CalendarKind.hijriSimulatedMecca),
+          Calendar(CalendarKind.hijriUmmAlQura),
         ),
         zonedDateTimeBuddhist.time,
       ),
-      'Do., 25. Raj. 1447 AH, 05:32:12',
+      'Do., 26. Raj. 1447 AH, 05:32:12',
     );
 
     expect(
       DateTimeFormatter.ymdet(locale).formatIso(
         zonedDateTimeBuddhist.date.toIso(),
         zonedDateTimeBuddhist.time,
       ),
-      'Do., 25. Raj. 1447 AH, 05:32:12',
+      'Do., 26. Raj. 1447 AH, 05:32:12',
     );
 
     ///// DateTimeFormatterGregorian /////
@@ -192,7 +192,7 @@ void main() {
         locale,
         DateFormatter.md(locale),
       ).formatIso(zonedDateTimeIso.date, zonedDateTimeIso.zone),
-      '14.07. Mitteleuropäische Zeit',
+      '15.07. Mitteleuropäische Zeit',
     );
 
     expect(
@@ -229,7 +229,7 @@ void main() {
         zonedDateTimeIso.time,
         zonedDateTimeIso.zone,
       ),
-      'Mi., 14. Raj. 1446 AH, 14:32:12 Mitteleuropäische Zeit',
+      'Mi., 15. Raj. 1446 AH, 14:32:12 Mitteleuropäische Zeit',
     );
 
     expect(
@@ -253,7 +253,7 @@ void main() {
         zonedDateTimeIso.time,
         zonedDateTimeIso.zone,
       ),
-      '14. Radschab 1446 AH, 14:32:12 MEZ',
+      '15. Radschab 1446 AH, 14:32:12 MEZ',
     );
 
     expect(
@@ -265,7 +265,7 @@ void main() {
         zonedDateTimeIso.time,
         zonedDateTimeIso.zone,
       ),
-      '14.07.46 AH, 14:32:12 MEZ',
+      '15.07.46 AH, 14:32:12 MEZ',
     );
 
     ///// ZonedDateTimeFormatterGregorian /////