use RDs

Author: Manishearth

Cargo.lock

@@ -93,6 +93,7 @@ timezone_provider = { workspace = true }
 # System time feature
 web-time = { workspace = true, optional = true }
 iana-time-zone = { workspace = true, optional = true }
+calendrical_calculations = "0.2.4"
 
 [dev-dependencies]
 timezone_provider = { workspace = true, features = ["zoneinfo64", "experimental_tzif"] }

Cargo.toml

@@ -24,13 +24,13 @@ use icu_calendar::{
 };
 use icu_calendar::{
     cal::{HijriTabularEpoch, HijriTabularLeapYears},
+    options::DateDurationUnit as IcuUnit,
     options::{
         DateAddOptions, DateDifferenceOptions, DateFromFieldsOptions, MissingFieldsStrategy,
         Overflow as IcuOverflow,
     },
     preferences::CalendarAlgorithm,
     types::DateDuration as IcuDateDuration,
-    options::DateDurationUnit as IcuUnit,
     types::DateFields,
     Gregorian,
 };
@@ -152,8 +152,13 @@ impl Calendar {
                 const { &AnyCalendar::HijriUmmAlQura(Hijri::new_umm_al_qura()) }
             }
             AnyCalendarKind::Iso => &AnyCalendar::Iso(Iso),
-            #[allow(deprecated, reason = "need to match on JapaneseExtended for exhaustiveness")]
-            AnyCalendarKind::Japanese | AnyCalendarKind::JapaneseExtended => const { &AnyCalendar::Japanese(Japanese::new()) },
+            #[allow(
+                deprecated,
+                reason = "need to match on JapaneseExtended for exhaustiveness"
+            )]
+            AnyCalendarKind::Japanese | AnyCalendarKind::JapaneseExtended => {
+                const { &AnyCalendar::Japanese(Japanese::new()) }
+            }
             AnyCalendarKind::Persian => &AnyCalendar::Persian(Persian),
             AnyCalendarKind::Roc => &AnyCalendar::Roc(Roc),
             _ => {

src/builtins/core/calendar.rs

@@ -4,7 +4,7 @@ use core::fmt;
 use ixdtf::ParseError;
 use timezone_provider::TimeZoneProviderError;
 
-use icu_calendar::error::{DateFromFieldsError, DateAddError};
+use icu_calendar::error::{DateAddError, DateFromFieldsError};
 
 /// `TemporalError`'s error type.
 #[derive(Debug, Default, Clone, Copy, PartialEq)]
@@ -166,7 +166,6 @@ impl From<DateAddError> for TemporalError {
     }
 }
 
-
 impl From<ParseError> for TemporalError {
     fn from(error: ParseError) -> Self {
         TemporalError::range().with_enum(ErrorMessage::Ixdtf(error))
@@ -271,17 +270,19 @@ impl ErrorMessage {
             Self::Ixdtf(s) => ixdtf_error_to_static_string(s),
 
             Self::Icu4xDateFromFields(DateFromFieldsError::InvalidEra) => "Unknown era.",
-            Self::Icu4xDateFromFields(DateFromFieldsError::InvalidDay {..}) | Self::Icu4xDateAdd(DateAddError::InvalidDay {..}) => "Day out of range",
-            Self::Icu4xDateFromFields(DateFromFieldsError::InvalidOrdinalMonth {..})  => "Month out of range",
+            Self::Icu4xDateFromFields(DateFromFieldsError::InvalidDay { .. })
+            | Self::Icu4xDateAdd(DateAddError::InvalidDay { .. }) => "Day out of range",
+            Self::Icu4xDateFromFields(DateFromFieldsError::InvalidOrdinalMonth { .. }) => {
+                "Month out of range"
+            }
             Self::Icu4xDateFromFields(DateFromFieldsError::MonthCodeInvalidSyntax) => {
                 "Invalid month code."
             }
             Self::Icu4xDateFromFields(DateFromFieldsError::MonthNotInCalendar) => {
                 "Month code not in calendar."
             }
-            Self::Icu4xDateFromFields(DateFromFieldsError::MonthNotInYear) | Self::Icu4xDateAdd(DateAddError::MonthNotInYear) => {
-                "Month code not in year."
-            }
+            Self::Icu4xDateFromFields(DateFromFieldsError::MonthNotInYear)
+            | Self::Icu4xDateAdd(DateAddError::MonthNotInYear) => "Month code not in year.",
             Self::Icu4xDateFromFields(DateFromFieldsError::InconsistentYear) => {
                 "Inconsistent year."
             }

src/error.rs

@@ -507,9 +507,10 @@ impl IsoDate {
 impl IsoDate {
     /// Creates `[[ISOYear]]`, `[[isoMonth]]`, `[[isoDay]]` fields from `ICU4X`'s `Date<Iso>` struct.
     pub(crate) fn to_icu4x(self) -> IcuDate<Iso> {
-        let d = IcuDate::try_new_iso(self.year, self.month, self.day);
-        debug_assert!(d.is_ok(), "ICU4X ISODate conversion must not fail");
-        d.unwrap_or_else(|_| IcuDate::from_rata_die(icu_calendar::types::RataDie::new(0), Iso))
+        let rd = calendrical_calculations::gregorian::fixed_from_gregorian(
+            self.year, self.month, self.day,
+        );
+        IcuDate::from_rata_die(rd, Iso)
     }
 
     pub(crate) fn from_icu4x(date: <Iso as IcuCalendar>::DateInner) -> Self {