Fix any calendar checks (#6398)

`ZonedDateTime` has not been enforcing `AnyCalendarKind`s since
[#5150](https://github.com/unicode-org/icu4x/pull/5150/files#diff-a4f5d62814d01dd02fae0ad0975c4e7a978e185454bced0d1ea4830ff34829f5R114)
added formatting for it. #6384 then introduced a bug that wasn't caught
by tests.

Author: robertbastian

components/calendar/src/any_calendar.rs

@@ -1206,7 +1206,12 @@ impl From<Indian> for AnyCalendar {
 impl IntoAnyCalendar for HijriTabular {
     #[inline]
     fn to_any(self) -> AnyCalendar {
-        AnyCalendar::HijriTabularCivil(self)
+        match self.0 {
+            calendrical_calculations::islamic::ISLAMIC_EPOCH_FRIDAY => {
+                AnyCalendar::HijriTabularCivil(self)
+            }
+            _ => AnyCalendar::HijriTabularAstronomical(self),
+        }
     }
     #[inline]
     fn kind(&self) -> AnyCalendarKind {
@@ -1219,23 +1224,32 @@ impl IntoAnyCalendar for HijriTabular {
     }
     #[inline]
     fn from_any(any: AnyCalendar) -> Result<Self, AnyCalendar> {
-        if let AnyCalendar::HijriTabularCivil(cal) = any {
+        if let AnyCalendar::HijriTabularCivil(cal) | AnyCalendar::HijriTabularAstronomical(cal) =
+            any
+        {
             Ok(cal)
         } else {
             Err(any)
         }
     }
     #[inline]
     fn from_any_ref(any: &AnyCalendar) -> Option<&Self> {
-        if let AnyCalendar::HijriTabularCivil(cal) = any {
+        if let AnyCalendar::HijriTabularCivil(cal) | AnyCalendar::HijriTabularAstronomical(cal) =
+            any
+        {
             Some(cal)
         } else {
             None
         }
     }
     #[inline]
     fn date_to_any(&self, d: &Self::DateInner) -> AnyDateInner {
-        AnyDateInner::HijriTabularCivil(*d)
+        match self.0 {
+            calendrical_calculations::islamic::ISLAMIC_EPOCH_FRIDAY => {
+                AnyDateInner::HijriTabularCivil(*d)
+            }
+            _ => AnyDateInner::HijriTabularAstronomical(*d),
+        }
     }
 }
 

components/datetime/src/scaffold/calendar.rs

@@ -748,21 +748,17 @@ impl<C: Calendar, A: AsCalendar<Calendar = C>> InSameCalendar for DateTime<A> {
         &self,
         any_calendar_kind: AnyCalendarKind,
     ) -> Result<(), MismatchedCalendarError> {
-        if self.date.calendar().any_calendar_kind() == Some(any_calendar_kind) {
-            Ok(())
-        } else {
-            Err(MismatchedCalendarError {
-                this_kind: any_calendar_kind,
-                date_kind: self.date.calendar().any_calendar_kind(),
-            })
-        }
+        self.date.check_any_calendar_kind(any_calendar_kind)
     }
 }
 
 impl<C: Calendar, A: AsCalendar<Calendar = C>, Z> InSameCalendar for ZonedDateTime<A, Z> {
     #[inline]
-    fn check_any_calendar_kind(&self, _: AnyCalendarKind) -> Result<(), MismatchedCalendarError> {
-        Ok(())
+    fn check_any_calendar_kind(
+        &self,
+        any_calendar_kind: AnyCalendarKind,
+    ) -> Result<(), MismatchedCalendarError> {
+        self.date.check_any_calendar_kind(any_calendar_kind)
     }
 }
 

components/datetime/tests/datetime.rs

@@ -11,6 +11,7 @@ use icu_calendar::cal::{
     HijriUmmAlQura, Indian, Iso, Persian, Roc, {Ethiopian, EthiopianEraStyle},
     {Japanese, JapaneseExtended},
 };
+use icu_calendar::AnyCalendarKind;
 use icu_datetime::fieldsets::enums::*;
 use icu_datetime::scaffold::CldrCalendar;
 use icu_datetime::{
@@ -238,32 +239,38 @@ fn assert_fixture_element<C>(
     let any_dtf = DateTimeFormatter::try_new(prefs, field_set).expect(description);
 
     let output = dtf.format(&input);
-    let any_output = any_dtf.format_same_calendar(&any_input).unwrap();
-    let iso_any_output = any_dtf.format(&iso_any_input);
-
     assert_writeable_eq!(output, expected.expectation(), "{}", description);
+    let pattern = output.pattern();
+
+    if let Some(expected_pattern) = expected.pattern() {
+        assert_writeable_eq!(pattern, expected_pattern);
+    }
+
+    if matches!(
+        input.date.calendar().kind(),
+        AnyCalendarKind::JapaneseExtended
+    ) {
+        // Not supported with FormattableAnyCalendar
+        return;
+    }
 
+    let any_output = any_dtf.format_same_calendar(&any_input).unwrap();
     assert_writeable_eq!(
         any_output,
         expected.expectation(),
         "(DateTimeFormatter) {}",
         description
     );
+    assert_eq!(pattern, any_output.pattern());
 
+    let iso_any_output = any_dtf.format(&iso_any_input);
     assert_writeable_eq!(
         iso_any_output,
         expected.expectation(),
         "(DateTimeFormatter iso conversion) {}",
         description
     );
-
-    let pattern = output.pattern();
-    assert_eq!(pattern, any_output.pattern());
     assert_eq!(pattern, iso_any_output.pattern());
-
-    if let Some(expected_pattern) = expected.pattern() {
-        assert_writeable_eq!(pattern, expected_pattern);
-    }
 }
 
 fn test_fixture_with_time_zones(fixture_name: &str, file: &str) {

components/datetime/tests/fixtures/tests/components.json

@@ -29,6 +29,8 @@
                 "zh-u-ca-chinese-hc-h23": "2019己亥年腊月27星期二 08:25:07",
                 "en-u-ca-japanese-hc-h23": "Tuesday, January 21, 2 Reiwa, 08:25:07",
                 "ja-u-ca-japanese-hc-h23": "令和2年1月21日火曜日 8:25:07",
+                "en-u-ca-japanese-hc-h23-x-extended": "Tuesday, January 21, 2 Reiwa, 08:25:07",
+                "ja-u-ca-japanese-hc-h23-x-extended": "令和2年1月21日火曜日 8:25:07",
                 "en-u-ca-coptic-hc-h23": "Tuesday, Toba 12, 1736 ERA1, 08:25:07",
                 "fr-u-ca-coptic-hc-h23": "mardi 12 toubah 1736 ap. D., 08:25:07",
                 "en-u-ca-dangi-hc-h23": "Tuesday, Twelfth Month 27, 2019(ji-hai), 08:25:07",