tor-browser

commit cb03592107ea8ccf52ece21f3bc14f5ebf0dd492
parent ae30782baeea84bca02c69163a4217e8ae9c8ab8
Author: André Bargull <andre.bargull@gmail.com>
Date:   Tue, 25 Nov 2025 15:19:41 +0000

Bug 2000225 - Part 17: Remove unused CalendarDate code. r=platform-i18n-reviewers,dminor

And remove unused error-status out-param from `monthCodeFrom`.

Clean-up in preparation for part 18.

Differential Revision: https://phabricator.services.mozilla.com/D273826

Diffstat:
M
intl/components/src/calendar/ICU4XCalendar.cpp
 | 
30
++----------------------------
M
intl/components/src/calendar/ICU4XCalendar.h
 | 
9
+--------
M
intl/components/src/calendar/ICU4XChineseBasedCalendar.cpp
 | 
6
+-----
M
intl/components/src/calendar/ISODate.h
 | 
6
------

4 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/intl/components/src/calendar/ICU4XCalendar.cpp b/intl/components/src/calendar/ICU4XCalendar.cpp
@@ -211,29 +211,7 @@ UniqueICU4XDate ICU4XCalendar::createICU4XDate(const ISODate& date,
   return dt;
 }
 
-UniqueICU4XDate ICU4XCalendar::createICU4XDate(const CalendarDate& date,
-                                               UErrorCode& status) const {
-  MOZ_ASSERT(U_SUCCESS(status));
-
-  auto* calendar = getICU4XCalendar(status);
-  if (U_FAILURE(status)) {
-    return nullptr;
-  }
-
-  auto era = eraName(date.year);
-
-  auto dt =
-      CreateDateFromCodes(calendar, era, date.year, date.monthCode, date.day);
-  if (!dt) {
-    status = U_INTERNAL_PROGRAM_ERROR;
-  }
-  return dt;
-}
-
-MonthCode ICU4XCalendar::monthCodeFrom(const icu4x::capi::Date* date,
-                                       UErrorCode& status) {
-  MOZ_ASSERT(U_SUCCESS(status));
-
+MonthCode ICU4XCalendar::monthCodeFrom(const icu4x::capi::Date* date) {
   // Storage for the largest valid month code and the terminating NUL-character.
   // DiplomatWrite doesn't have std::span version.
   // https://github.com/rust-diplomat/diplomat/issues/866
@@ -399,11 +377,7 @@ int32_t ICU4XCalendar::internalGetMonth(UErrorCode& status) const {
       return 0;
     }
 
-    MonthCode monthCode = monthCodeFrom(date.get(), status);
-    if (U_FAILURE(status)) {
-      return 0;
-    }
-
+    MonthCode monthCode = monthCodeFrom(date.get());
     month = monthCode.ordinal() - 1;
     isLeapMonth = monthCode.isLeapMonth();
   }
diff --git a/intl/components/src/calendar/ICU4XCalendar.h b/intl/components/src/calendar/ICU4XCalendar.h
@@ -79,8 +79,7 @@ class ICU4XCalendar : public icu::Calendar {
   /**
    * Return the month code of |date|.
    */
-  static MonthCode monthCodeFrom(const icu4x::capi::Date* date,
-                                 UErrorCode& status);
+  static MonthCode monthCodeFrom(const icu4x::capi::Date* date);
 
   /**
    * Create a new ICU4X date object from an ISO date.
@@ -88,12 +87,6 @@ class ICU4XCalendar : public icu::Calendar {
   UniqueICU4XDate createICU4XDate(const ISODate& date,
                                   UErrorCode& status) const;
 
-  /**
-   * Create a new ICU4X date object from a calendar date.
-   */
-  UniqueICU4XDate createICU4XDate(const CalendarDate& date,
-                                  UErrorCode& status) const;
-
  public:
   ICU4XCalendar() = delete;
   virtual ~ICU4XCalendar();
diff --git a/intl/components/src/calendar/ICU4XChineseBasedCalendar.cpp b/intl/components/src/calendar/ICU4XChineseBasedCalendar.cpp
@@ -95,11 +95,7 @@ void ICU4XChineseBasedCalendar::handleComputeFields(int32_t julianDay,
   }
   MOZ_ASSERT(date);
 
-  MonthCode monthCode = monthCodeFrom(date.get(), status);
-  if (U_FAILURE(status)) {
-    return;
-  }
-
+  MonthCode monthCode = monthCodeFrom(date.get());
   int32_t extendedYear = icu4x::capi::icu4x_Date_extended_year_mv1(date.get());
   int32_t month = icu4x::capi::icu4x_Date_ordinal_month_mv1(date.get());
   int32_t dayOfMonth = icu4x::capi::icu4x_Date_day_of_month_mv1(date.get());
diff --git a/intl/components/src/calendar/ISODate.h b/intl/components/src/calendar/ISODate.h
@@ -16,12 +16,6 @@ struct ISODate final {
   int32_t day = 0;
 };
 
-struct CalendarDate final {
-  int32_t year = 0;
-  MonthCode monthCode = {};
-  int32_t day = 0;
-};
-
 inline int32_t FloorDiv(int32_t dividend, int32_t divisor) {
   int32_t quotient = dividend / divisor;
   int32_t remainder = dividend % divisor;