Merge remote-tracking branch 'upstream/main' into stateful-surpasses

# Conflicts:
#	components/calendar/src/calendar_arithmetic.rs

Author: poulsbo

components/calendar/src/cal/coptic.rs

@@ -2,8 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::calendar_arithmetic::ArithmeticDate;
-use crate::calendar_arithmetic::DateFieldsResolver;
+use crate::calendar_arithmetic::{ArithmeticDate, DateFieldsResolver, MinMonths};
 use crate::error::{
     DateAddError, DateError, DateFromFieldsError, EcmaReferenceYearError, UnknownEraError,
 };
@@ -68,8 +67,9 @@ impl DateFieldsResolver for Coptic {
     }
 
     #[inline]
-    fn min_months_from_inner(_start: Self::YearInfo, years: i64) -> i64 {
-        13 * years
+    fn min_months_from_inner(_start: Self::YearInfo, years: i64) -> MinMonths {
+        // This calendar is defined as having 13 months per year, this never changes.
+        MinMonths::Guaranteed(13 * years)
     }
 
     #[inline]

components/calendar/src/cal/east_asian_traditional.rs

@@ -2,8 +2,9 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::calendar_arithmetic::{ArithmeticDate, ToExtendedYear};
-use crate::calendar_arithmetic::{DateFieldsResolver, PackWithMD};
+use crate::calendar_arithmetic::{
+    ArithmeticDate, DateFieldsResolver, MinMonths, PackWithMD, ToExtendedYear,
+};
 use crate::error::{
     DateAddError, DateError, DateFromFieldsError, EcmaReferenceYearError, LunisolarDateError,
     MonthError, UnknownEraError,
@@ -609,9 +610,17 @@ impl<R: Rules> DateFieldsResolver for EastAsianTraditional<R> {
     }
 
     #[inline]
-    fn min_months_from_inner(_start: Self::YearInfo, years: i64) -> i64 {
-        // TODO(#7077) This is not verified, and the error is not constant bounded
-        12 * years + (years / 3)
+    fn min_months_from_inner(_start: Self::YearInfo, years: i64) -> MinMonths {
+        // TODO(#7077) Try to turn this into a guarantee
+        MinMonths::Guessed {
+            // This is a somewhat conservative guess that leads to an unbounded
+            // error for larger and larger year spans.
+            guess: 12 * years + (years / 3),
+            // We can guarantee 12 months per year, this is a fundamental property
+            // of East Asian Traditional calendars and assumed in the behavior of
+            // EastAsianTraditionalYear
+            guarantee: 12 * years,
+        }
     }
 
     #[inline]

components/calendar/src/cal/ethiopian.rs

@@ -4,7 +4,7 @@
 
 use crate::cal::coptic::CopticDateInner;
 use crate::cal::Coptic;
-use crate::calendar_arithmetic::{ArithmeticDate, DateFieldsResolver};
+use crate::calendar_arithmetic::{ArithmeticDate, DateFieldsResolver, MinMonths};
 use crate::error::{
     DateAddError, DateError, DateFromFieldsError, EcmaReferenceYearError, UnknownEraError,
 };
@@ -95,7 +95,7 @@ impl DateFieldsResolver for Ethiopian {
     }
 
     #[inline]
-    fn min_months_from_inner(start: Self::YearInfo, years: i64) -> i64 {
+    fn min_months_from_inner(start: Self::YearInfo, years: i64) -> MinMonths {
         Coptic::min_months_from_inner(start, years)
     }
 

components/calendar/src/cal/hebrew.rs

@@ -2,7 +2,9 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::calendar_arithmetic::{ArithmeticDate, DateFieldsResolver, PackWithMD, ToExtendedYear};
+use crate::calendar_arithmetic::{
+    ArithmeticDate, DateFieldsResolver, MinMonths, PackWithMD, ToExtendedYear,
+};
 use crate::error::{
     DateAddError, DateError, DateFromFieldsError, EcmaReferenceYearError, LunisolarDateError,
     MonthError, UnknownEraError,
@@ -135,7 +137,7 @@ impl DateFieldsResolver for Hebrew {
     }
 
     #[inline]
-    fn min_months_from_inner(_start: HebrewYear, years: i64) -> i64 {
+    fn min_months_from_inner(_start: HebrewYear, years: i64) -> MinMonths {
         // The Hebrew Metonic cycle is 7 leap years every 19 years,
         // which comes out to 235 months per 19 years.
         //
@@ -160,7 +162,7 @@ impl DateFieldsResolver for Hebrew {
         // is 4: year 8->11->14->17. In that time the error will accumulate to 6/19, which is not
         // enough to create a "two year leap month" in our calculation. So this calculation cannot go past
         // the actual cycle of the Hebrew calendar.
-        235 * years / 19
+        MinMonths::Guaranteed(235 * years / 19)
     }
 
     #[inline]

components/calendar/src/calendar_arithmetic.rs

@@ -183,6 +183,17 @@ impl PackWithMD for i32 {
     }
 }
 
+/// A lower bound for the number of months in `years` years, for use in `until`.
+pub(crate) enum MinMonths {
+    /// This number is guaranteed to be correct based on documented checking of invariants
+    ///
+    /// It is ok for ICU4X to `debug_assert` on things deriving from the correctness of this calculation
+    Guaranteed(i64),
+    /// This number is not guaranteed. Code should check that it is not too large, and if not,
+    /// fall back to the `guarantee` value (which *is* guaranteed).
+    Guessed { guess: i64, guarantee: i64 },
+}
+
 /// Trait for converting from era codes, month codes, and other fields to year/month/day ordinals.
 pub(crate) trait DateFieldsResolver: Calendar {
     /// This stores the year as either an i32, or a type containing more
@@ -242,9 +253,13 @@ pub(crate) trait DateFieldsResolver: Calendar {
     /// is bounded by a constant with respect to `years`.
     ///
     /// The default impl is for non-lunisolar calendars with 12 months!
+    ///
+    /// `until()` will debug assert if this ever returns a value greater than the
+    /// month diff betweeen two dates as a Guarantee. If such a value is returned as a Guess,
+    /// it will simply be slow
     #[inline]
-    fn min_months_from_inner(_start: Self::YearInfo, years: i64) -> i64 {
-        12 * years
+    fn min_months_from_inner(_start: Self::YearInfo, years: i64) -> MinMonths {
+        MinMonths::Guaranteed(12 * years)
     }
 
     /// Calculates the ordinal month for the given year and month code.
@@ -923,7 +938,7 @@ impl<C: DateFieldsResolver> ArithmeticDate<C> {
         cal: &C,
         options: DateDifferenceOptions,
     ) -> DateDuration {
-        // Fast path for day/week diffs
+        // Non-spec optimization: fast path for day/week diffs
         // Avoids quadratic behavior in surpasses() for days/weeks
         if matches!(
             options.largest_unit,
@@ -949,6 +964,7 @@ impl<C: DateFieldsResolver> ArithmeticDate<C> {
 
         let mut surpasses_checker = SurpassesChecker::new(self, other, sign, cal);
 
+        // Preparation for non-specced optimization:
         // We don't want to spend time incrementally bumping it up one year
         // at a time, so let's pre-guess a year delta that is guaranteed to not
         // surpass.
@@ -976,9 +992,10 @@ impl<C: DateFieldsResolver> ArithmeticDate<C> {
         let mut years = 0;
         if matches!(options.largest_unit, Some(DateDurationUnit::Years)) {
             let mut candidate_years = sign;
+
+            // Non-spec optimization: try to fast-forward candidate_years to
+            // a year value that does not surpass
             if min_years != 0 {
-                // Optimization: we start with min_years since it is guaranteed to not
-                // surpass.
                 candidate_years = min_years
             };
 
@@ -1002,13 +1019,25 @@ impl<C: DateFieldsResolver> ArithmeticDate<C> {
             Some(DateDurationUnit::Years) | Some(DateDurationUnit::Months)
         ) {
             let mut candidate_months = sign;
+
+            // Non-spec optimization: try to fast-forward candidate_months to
+            // a month value that does not surpass
             if options.largest_unit == Some(DateDurationUnit::Months) && min_years != 0 {
                 // If largest_unit = Months, then compute the calendar-specific minimum number of
-                // months corresponding to min_years. For solar calendars, this is 12 * min_years.
-                // For the Hebrew calendar, a leap month is added for 7 out of 19 years. East Asian
-                // Calendars do not provide a specialized implementation of `min_months_from()`
-                // because it would be too expensive to calculate; they default to 12 * min_years.
-                let min_months = self.min_months_from(min_years);
+                // months corresponding to min_years.
+                let min_months = match self.min_months_from(min_years) {
+                    MinMonths::Guaranteed(m) => m,
+                    // In case it's a guess, check that the guess is in range,
+                    // and if it's not, return the guarantee
+                    MinMonths::Guessed { guess, guarantee } => {
+                        if surpasses_checker.surpasses_months(guess) {
+                            // surpasses, so it's not in range
+                            guarantee
+                        } else {
+                            guess
+                        }
+                    }
+                };
 
                 // clippy rejected: debug_assert!(!surpasses_checker.surpasses_months(min_months));
                 #[cfg(debug_assertions)]
@@ -1066,7 +1095,7 @@ impl<C: DateFieldsResolver> ArithmeticDate<C> {
     }
 
     /// The minimum number of months over `years` years, starting from `self.year()`.
-    pub(crate) fn min_months_from(self, years: i64) -> i64 {
+    pub(crate) fn min_months_from(self, years: i64) -> MinMonths {
         C::min_months_from_inner(self.year(), years)
     }
 }