Shorten integer type of day_of_month, week_of_month, week_of_year (#5702

)

CHANGELOG.md

@@ -8,6 +8,7 @@
   - `icu_calendar`
     - Consistently name calendar-specific `Date`/`DateTime` functions that have a calendar argument (https://github.com/unicode-org/icu4x/pull/5692)
     - Move all calendar types to `cal` module (https://github.com/unicode-org/icu4x/pull/5701)
+    - Shorten integer types returned by `day_of_month()`, `week_of_month()`, and `week_of_year()` to `u8` (https://github.com/unicode-org/icu4x/pull/5702)
   - `icu_collections`
   - `icu_normalizer`
   - `icu_datetime`

components/calendar/src/any_calendar.rs

@@ -1864,7 +1864,6 @@ mod tests {
 
     use super::*;
     use crate::Ref;
-    use core::convert::TryInto;
 
     fn single_test_roundtrip(
         calendar: Ref<AnyCalendar>,
@@ -1889,7 +1888,7 @@ mod tests {
         let roundtrip_era = roundtrip_year.formatting_era().unwrap_or(era);
         let roundtrip_year = roundtrip_year.era_year_or_extended();
         let roundtrip_month = date.month().standard_code;
-        let roundtrip_day = date.day_of_month().0.try_into().expect("Must fit in u8");
+        let roundtrip_day = date.day_of_month().0;
 
         assert_eq!(
             (era, year, month, day),

components/calendar/src/buddhist.rs

@@ -342,7 +342,7 @@ mod test {
         );
         assert_eq!(
             buddhist1.day_of_month().0,
-            buddhist_day as u32,
+            buddhist_day,
             "Iso -> Buddhist day check failed for case: {case:?}"
         );
 
@@ -361,7 +361,7 @@ mod test {
         );
         assert_eq!(
             iso2.day_of_month().0,
-            iso_day as u32,
+            iso_day,
             "Buddhist -> Iso day check failed for case: {case:?}"
         );
     }

components/calendar/src/calendar_arithmetic.rs

@@ -300,7 +300,7 @@ impl<C: CalendarArithmetic> ArithmeticDate<C> {
 
     #[inline]
     pub fn day_of_month(&self) -> types::DayOfMonth {
-        types::DayOfMonth(self.day.into())
+        types::DayOfMonth(self.day)
     }
 
     /// The [`types::MonthInfo`] for the current month (with month code) for a solar calendar

components/calendar/src/chinese.rs

@@ -285,7 +285,7 @@ impl Calendar for Chinese {
 
     /// The calendar-specific day-of-month represented by `date`
     fn day_of_month(&self, date: &Self::DateInner) -> types::DayOfMonth {
-        types::DayOfMonth(date.0 .0.day as u32)
+        types::DayOfMonth(date.0 .0.day)
     }
 
     /// Information of the day of the year
@@ -666,7 +666,7 @@ mod test {
             iso_day: u8,
             expected_year: i32,
             expected_month: u8,
-            expected_day: u32,
+            expected_day: u8,
         }
 
         let cases = [
@@ -1006,7 +1006,7 @@ mod test {
             expected_rel_iso: i32,
             expected_cyclic: u8,
             expected_month: u8,
-            expected_day: u32,
+            expected_day: u8,
         }
 
         let cases = [

components/calendar/src/dangi.rs

@@ -266,7 +266,7 @@ impl Calendar for Dangi {
     }
 
     fn day_of_month(&self, date: &Self::DateInner) -> crate::types::DayOfMonth {
-        types::DayOfMonth(date.0 .0.day as u32)
+        types::DayOfMonth(date.0 .0.day)
     }
 
     fn day_of_year_info(&self, date: &Self::DateInner) -> crate::types::DayOfYearInfo {
@@ -492,7 +492,7 @@ mod test {
             expected_rel_iso: i32,
             expected_cyclic: u8,
             expected_month: u8,
-            expected_day: u32,
+            expected_day: u8,
         }
 
         let cases = [

components/calendar/src/gregorian.rs

@@ -374,7 +374,7 @@ mod test {
         expected_year: i32,
         expected_era: Era,
         expected_month: u8,
-        expected_day: u32,
+        expected_day: u8,
     }
 
     fn check_test_case(case: TestCase) {

components/calendar/src/indian.rs

@@ -329,7 +329,7 @@ mod tests {
             "{y}-{m}-{d}: ISO month did not match"
         );
         assert_eq!(
-            iso.day_of_month().0 as u8,
+            iso.day_of_month().0,
             iso_d,
             "{y}-{m}-{d}: ISO day did not match"
         );
@@ -376,7 +376,7 @@ mod tests {
         iso_day: u8,
         expected_year: i32,
         expected_month: u8,
-        expected_day: u32,
+        expected_day: u8,
     }
 
     fn check_case(case: TestCase) {

components/calendar/src/julian.rs

@@ -420,7 +420,7 @@ mod test {
             expected_year: i32,
             expected_era: Era,
             expected_month: u8,
-            expected_day: u32,
+            expected_day: u8,
         }
 
         let cases = [

components/calendar/src/persian.rs

@@ -534,7 +534,7 @@ mod tests {
 
     // From https://calendar.ut.ac.ir/Fa/News/Data/Doc/KabiseShamsi1206-1498-new.pdf
     // Plain text version at https://github.com/roozbehp/persiancalendar/blob/main/kabise.txt
-    static CALENDAR_UT_AC_IR_TEST_DATA: [(i32, bool, i32, u8, u32); 293] = [
+    static CALENDAR_UT_AC_IR_TEST_DATA: [(i32, bool, i32, u8, u8); 293] = [
         (1206, false, 1827, 3, 22),
         (1207, false, 1828, 3, 21),
         (1208, false, 1829, 3, 21),

components/calendar/src/roc.rs

@@ -300,7 +300,7 @@ mod test {
         expected_year: i32,
         expected_era: Era,
         expected_month: u8,
-        expected_day: u32,
+        expected_day: u8,
     }
 
     fn check_test_case(case: TestCase) {

components/calendar/src/types.rs

@@ -331,22 +331,22 @@ pub struct DayOfYearInfo {
 /// A day number in a month. Usually 1-based.
 #[allow(clippy::exhaustive_structs)] // this is a newtype
 #[derive(Clone, Copy, Debug, PartialEq)]
-pub struct DayOfMonth(pub u32);
+pub struct DayOfMonth(pub u8);
 
 /// A week number in a month. Usually 1-based.
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[allow(clippy::exhaustive_structs)] // this is a newtype
-pub struct WeekOfMonth(pub u32);
+pub struct WeekOfMonth(pub u8);
 
 /// A week number in a year. Usually 1-based.
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[allow(clippy::exhaustive_structs)] // this is a newtype
-pub struct WeekOfYear(pub u32);
+pub struct WeekOfYear(pub u8);
 
 /// A day of week in month. 1-based.
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[allow(clippy::exhaustive_structs)] // this is a newtype
-pub struct DayOfWeekInMonth(pub u32);
+pub struct DayOfWeekInMonth(pub u8);
 
 impl From<DayOfMonth> for DayOfWeekInMonth {
     fn from(day_of_month: DayOfMonth) -> Self {

components/calendar/src/week_of.rs

@@ -84,7 +84,11 @@ impl WeekCalculator {
     ///
     /// [1]: https://www.unicode.org/reports/tr35/tr35-55/tr35-dates.html#Date_Patterns_Week_Of_Year
     pub fn week_of_month(&self, day_of_month: DayOfMonth, iso_weekday: IsoWeekday) -> WeekOfMonth {
-        WeekOfMonth(simple_week_of(self.first_weekday, day_of_month.0 as u16, iso_weekday) as u32)
+        WeekOfMonth(simple_week_of(
+            self.first_weekday,
+            day_of_month.0 as u16,
+            iso_weekday,
+        ))
     }
 
     /// Returns the week of year according to the weekday and [`DayOfYearInfo`].
@@ -169,7 +173,7 @@ enum RelativeWeek {
     /// A week that is assigned to the last week of the previous year/month. e.g. 2021-01-01 is week 54 of 2020 per the ISO calendar.
     LastWeekOfPreviousUnit,
     /// A week that's assigned to the current year/month. The offset is 1-based. e.g. 2021-01-11 is week 2 of 2021 per the ISO calendar so would be WeekOfCurrentUnit(2).
-    WeekOfCurrentUnit(u16),
+    WeekOfCurrentUnit(u8),
     /// A week that is assigned to the first week of the next year/month. e.g. 2019-12-31 is week 1 of 2020 per the ISO calendar.
     FirstWeekOfNextUnit,
 }
@@ -213,15 +217,15 @@ impl UnitInfo {
     }
 
     /// Returns the number of weeks in this unit according to `calendar`.
-    fn num_weeks(&self, calendar: &WeekCalculator) -> u16 {
+    fn num_weeks(&self, calendar: &WeekCalculator) -> u8 {
         let first_week_offset = self.first_week_offset(calendar);
         let num_days_including_first_week =
             (self.duration_days as i32) - (first_week_offset as i32);
         debug_assert!(
             num_days_including_first_week >= 0,
             "Unit is shorter than a week."
         );
-        ((num_days_including_first_week + 7 - (calendar.min_week_days as i32)) / 7) as u16
+        ((num_days_including_first_week + 7 - (calendar.min_week_days as i32)) / 7) as u8
     }
 
     /// Returns the week number for the given day in this unit.
@@ -232,7 +236,7 @@ impl UnitInfo {
             return RelativeWeek::LastWeekOfPreviousUnit;
         }
 
-        let week_number = (1 + days_since_first_week / 7) as u16;
+        let week_number = (1 + days_since_first_week / 7) as u8;
         if week_number > self.num_weeks(calendar) {
             return RelativeWeek::FirstWeekOfNextUnit;
         }
@@ -257,7 +261,7 @@ pub enum RelativeUnit {
 #[allow(clippy::exhaustive_structs)] // this type is stable
 pub struct WeekOf {
     /// Week of month/year. 1 based.
-    pub week: u16,
+    pub week: u8,
     /// The month/year that this week is in, relative to the month/year of the input date.
     pub unit: RelativeUnit,
 }
@@ -316,7 +320,7 @@ pub fn week_of(
 ///  - first_weekday: The first day of a week.
 ///  - day: 1-based day of the month or year.
 ///  - week_day: The weekday of `day`.
-pub fn simple_week_of(first_weekday: IsoWeekday, day: u16, week_day: IsoWeekday) -> u16 {
+pub fn simple_week_of(first_weekday: IsoWeekday, day: u16, week_day: IsoWeekday) -> u8 {
     let calendar = WeekCalculator {
         first_weekday,
         min_week_days: 1,