back to i64

Author: robertbastian

components/calendar/src/cal/chinese/simple.rs

@@ -83,22 +83,19 @@ impl super::LunarChineseYearData {
             base_moment: LocalMoment,
             duration: Milliseconds,
         ) -> LocalMoment {
-            let diff_millis = (rata_die - base_moment.rata_die) as i128
-                * MILLISECONDS_IN_EPHEMERIS_DAY as i128
-                - base_moment.local_milliseconds as i128;
+            let diff_millis = (rata_die - base_moment.rata_die) * MILLISECONDS_IN_EPHEMERIS_DAY
+                - base_moment.local_milliseconds as i64;
 
-            let num_periods = (diff_millis + MILLISECONDS_IN_EPHEMERIS_DAY as i128 - 1)
-                .div_euclid(duration.0 as i128);
+            let num_periods =
+                (diff_millis + MILLISECONDS_IN_EPHEMERIS_DAY - 1).div_euclid(duration.0);
 
-            let millis = base_moment.rata_die.to_i64_date() as i128
-                * MILLISECONDS_IN_EPHEMERIS_DAY as i128
-                + base_moment.local_milliseconds as i128
-                + num_periods * duration.0 as i128;
+            let millis = base_moment.rata_die.to_i64_date() * MILLISECONDS_IN_EPHEMERIS_DAY
+                + base_moment.local_milliseconds as i64
+                + num_periods * duration.0;
 
-            let rata_die =
-                (millis / MILLISECONDS_IN_EPHEMERIS_DAY as i128) as i64 - (millis < 0) as i64;
-            let local_milliseconds = (millis % MILLISECONDS_IN_EPHEMERIS_DAY as i128) as i64
-                + (millis < 0) as i64 * MILLISECONDS_IN_EPHEMERIS_DAY as i64;
+            let rata_die = millis / MILLISECONDS_IN_EPHEMERIS_DAY - (millis < 0) as i64;
+            let local_milliseconds = millis % MILLISECONDS_IN_EPHEMERIS_DAY
+                + (millis < 0) as i64 * MILLISECONDS_IN_EPHEMERIS_DAY;
 
             LocalMoment {
                 rata_die: RataDie::new(rata_die),
@@ -168,3 +165,18 @@ impl super::LunarChineseYearData {
         LunarChineseYearData::new(related_iso, start_day, month_lengths, leap_month)
     }
 }
+
+#[test]
+fn bounds() {
+    LunarChineseYearData::simple(UTC_PLUS_9, 292_277_025);
+    assert!(
+        std::panic::catch_unwind(|| LunarChineseYearData::simple(UTC_PLUS_9, 292_277_026)).is_err()
+    );
+
+    LunarChineseYearData::simple(BEIJING_UTC_OFFSET, -292_275_024);
+    assert!(std::panic::catch_unwind(|| LunarChineseYearData::simple(
+        BEIJING_UTC_OFFSET,
+        -292_275_025
+    ))
+    .is_err());
+}

components/calendar/src/calendar_arithmetic.rs

@@ -15,8 +15,8 @@ use core::marker::PhantomData;
 use core::ops::RangeInclusive;
 use tinystr::tinystr;
 
-/// The range ±2³⁰. We use i32::MIN since it is -2³¹
-const VALID_YEAR_RANGE: RangeInclusive<i32> = (i32::MIN / 2)..=-(i32::MIN / 2);
+/// The range ±2²⁷. We use i32::MIN since it is -2³¹
+const VALID_YEAR_RANGE: RangeInclusive<i32> = (i32::MIN / 16)..=-(i32::MIN / 16);
 
 #[derive(Debug)]
 #[allow(clippy::exhaustive_structs)] // this type is stable

components/calendar/src/date.rs

@@ -126,7 +126,7 @@ impl<A: AsCalendar> Date<A> {
     ///
     /// The year is `extended_year` if no era is provided.
     ///
-    /// This function will not accept year/extended_year values that are outside of the range `[-2³⁰, 2³⁰]`,
+    /// This function will not accept year/extended_year values that are outside of the range `[-2²⁷, 2²⁷]`,
     /// regardless of the calendar, instead returning a [`DateError::Range`]. See [`Date::try_from_fields()`] for more
     /// information.
     #[inline]
@@ -150,8 +150,8 @@ impl<A: AsCalendar> Date<A> {
     /// and fill in missing fields. See [`DateFromFieldsOptions`] for more information.
     ///
     /// This function will not accept year/extended_year values that are outside of the range `[-2²⁷, 2²⁷]`,
-    /// regardless of the calendar, instead returning a [`DateError::Range`]. This allows us to to keep
-    /// all operations on [`Date`]s infallible by staying clear of integer limits.
+    /// regardless of the calendar, instead returning a [`DateError::Range`]. This is to prevent
+    /// overflowing behaviors near the extreme values of the `i32` range.
     /// Currently, calendar-specific `Date::try_new_calendarname()` constructors
     /// do not do this, and it is possible to obtain such extreme dates via calendar conversion or arithmetic,
     /// though [we may change that behavior in the future](https://github.com/unicode-org/icu4x/issues/7076).