Merge branch 'main' into chinese-fmt

components/calendar/src/any_calendar.rs

@@ -146,6 +146,7 @@ macro_rules! match_cal_and_date {
             (&Self::Chinese(ref $cal_matched), &AnyDateInner::Chinese(ref $date_matched)) => $e,
             (&Self::Persian(ref $cal_matched), &AnyDateInner::Persian(ref $date_matched)) => $e,
             (&Self::Coptic(ref $cal_matched), &AnyDateInner::Coptic(ref $date_matched)) => $e,
+            (&Self::Roc(ref $cal_matched), &AnyDateInner::Roc(ref $date_matched)) => $e,
             (&Self::Iso(ref $cal_matched), &AnyDateInner::Iso(ref $date_matched)) => $e,
             _ => panic!(
                 "Found AnyCalendar with mixed calendar type {} and date type {}!",
@@ -266,6 +267,9 @@ impl Calendar for AnyCalendar {
             (Self::Persian(c), &mut AnyDateInner::Persian(ref mut d)) => {
                 c.offset_date(d, offset.cast_unit())
             }
+            (Self::Roc(c), &mut AnyDateInner::Roc(ref mut d)) => {
+                c.offset_date(d, offset.cast_unit())
+            }
             // This is only reached from misuse of from_raw, a semi-internal api
             #[allow(clippy::panic)]
             (_, d) => panic!(
@@ -349,6 +353,9 @@ impl Calendar for AnyCalendar {
             ) => c1
                 .until(d1, d2, c2, largest_unit, smallest_unit)
                 .cast_unit(),
+            (Self::Roc(c1), Self::Roc(c2), AnyDateInner::Roc(d1), AnyDateInner::Roc(d2)) => c1
+                .until(d1, d2, c2, largest_unit, smallest_unit)
+                .cast_unit(),
             (
                 Self::Coptic(c1),
                 Self::Coptic(c2),
@@ -735,7 +742,12 @@ impl AnyCalendarKind {
             b"ethiopic" => AnyCalendarKind::Ethiopian,
             b"ethioaa" => AnyCalendarKind::EthiopianAmeteAlem,
             b"persian" => AnyCalendarKind::Persian,
-            _ => return None,
+            b"roc" => AnyCalendarKind::Roc,
+            _ => {
+                // Log a warning when a calendar value is passed in but doesn't match any calendars
+                DataError::custom("bcp47_bytes did not match any calendars").with_debug_context(x);
+                return None;
+            }
         })
     }
     /// Construct from a BCP-47 [`Value`]
@@ -765,7 +777,11 @@ impl AnyCalendarKind {
             AnyCalendarKind::EthiopianAmeteAlem
         } else if *x == value!("persian") {
             AnyCalendarKind::Persian
+        } else if *x == value!("roc") {
+            AnyCalendarKind::Roc
         } else {
+            // Log a warning when a calendar value is passed in but doesn't match any calendars
+            DataError::custom("bcp47_value did not match any calendars").with_display_context(x);
             return None;
         })
     }
@@ -1000,6 +1016,18 @@ impl IntoAnyCalendar for Iso {
     }
 }
 
+impl IntoAnyCalendar for Roc {
+    fn to_any(self) -> AnyCalendar {
+        AnyCalendar::Roc(Roc)
+    }
+    fn to_any_cloned(&self) -> AnyCalendar {
+        AnyCalendar::Roc(Roc)
+    }
+    fn date_to_any(&self, d: &Self::DateInner) -> AnyDateInner {
+        AnyDateInner::Roc(*d)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1085,6 +1113,7 @@ mod tests {
         let japanese = AnyCalendar::new(AnyCalendarKind::Japanese);
         let japanext = AnyCalendar::new(AnyCalendarKind::JapaneseExtended);
         let persian = AnyCalendar::new(AnyCalendarKind::Persian);
+        let roc = AnyCalendar::new(AnyCalendarKind::Roc);
         let buddhist = Ref(&buddhist);
         let coptic = Ref(&coptic);
         let ethiopian = Ref(&ethiopian);
@@ -1095,6 +1124,7 @@ mod tests {
         let japanese = Ref(&japanese);
         let japanext = Ref(&japanext);
         let persian = Ref(&persian);
+        let roc = Ref(&roc);
 
         single_test_roundtrip(buddhist, "be", 100, "M03", 1);
         single_test_roundtrip(buddhist, "be", 2000, "M03", 1);
@@ -1249,5 +1279,9 @@ mod tests {
             1,
             CalendarError::UnknownMonthCode("M9".parse().unwrap(), "Persian"),
         );
+
+        single_test_roundtrip(roc, "roc", 10, "M05", 3);
+        single_test_roundtrip(roc, "roc-inverse", 15, "M01", 10);
+        single_test_roundtrip(roc, "roc", 100, "M10", 30);
     }
 }

components/calendar/src/roc.rs

@@ -89,7 +89,7 @@ impl Calendar for Roc {
             if year <= 0 {
                 return Err(CalendarError::OutOfRange);
             }
-            1 - (year + ROC_ERA_OFFSET)
+            1 - year + ROC_ERA_OFFSET
         } else {
             return Err(CalendarError::UnknownEra(era.0, self.debug_name()));
         };

components/datetime/data/config.json

@@ -17,6 +17,10 @@
             "datetime/japanese/datesymbols@1",
             "datetime/japanext/datelengths@1",
             "datetime/japanext/datesymbols@1",
+            "datetime/roc/datelengths@1",
+            "datetime/roc/datesymbols@1",
+            "datetime/persian/datelengths@1",
+            "datetime/persian/datesymbols@1",
             "datetime/skeletons@1",
             "datetime/timelengths@1",
             "datetime/timesymbols@1",