Merge remote-tracking branch 'upstream/main' into segmenter

Author: robertbastian

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
 ## Unreleased
-
+- Components
+    - `icu_properties`
+        - Fix some property constants (unicode-org#7269, unicode-org#7281, unicode-org#7284)
+        - Add conversions for `unicode_bidi::BidiClass` (unicode-org#7272)
+        - Add `IndicConjunctBreak` (unicode-org#7280)
 - Utils
   - Retire the `icu_harfbuzz` crate. The `icu_properties` and `icu_normalizer` types now directly implement the `harfbuzz-traits`
 

Cargo.lock

@@ -344,4 +344,5 @@ type_method_marked_deprecated.level = "allow" # allow deprecation in patch relea
 trait_method_marked_deprecated.level = "allow" # allow deprecation in patch releases
 type_marked_deprecated.level = "allow" # allow deprecation in patch releases
 struct_field_marked_deprecated = "allow" # allow deprecation in patch releases
+type_associated_const_marked_deprecated = "allow" # allow deprecation in patch releases
 enum_no_repr_variant_discriminant_changed = "allow" # we don't consider this breaking https://github.com/obi1kenobi/cargo-semver-checks/issues/1376

Cargo.toml

@@ -22,7 +22,7 @@ use criterion::{
 };
 use icu_calendar::{
     options::{DateAddOptions, Overflow},
-    types, AsCalendar, Calendar, Date,
+    types, AsCalendar, Calendar, Date, Iso,
 };
 
 fn bench_date<A: AsCalendar>(date: &mut Date<A>) {
@@ -48,7 +48,7 @@ fn bench_date<A: AsCalendar>(date: &mut Date<A>) {
     let _ = black_box(date.day_of_month());
 
     // Conversion to ISO.
-    let _ = black_box(date.to_iso());
+    let _ = black_box(date.to_calendar(Iso));
 }
 
 fn bench_calendar<C: Clone + Calendar>(
@@ -67,7 +67,7 @@ fn bench_calendar<C: Clone + Calendar>(
 
                 // Conversion from ISO
                 let date_iso = Date::try_new_iso(fx.year, fx.month, fx.day).unwrap();
-                let mut converted_date_calendar = Date::new_from_iso(date_iso, calendar.clone());
+                let mut converted_date_calendar = date_iso.to_calendar(calendar.clone());
 
                 bench_date(&mut instantiated_date_calendar);
                 bench_date(&mut converted_date_calendar);

components/calendar/README.md

@@ -21,7 +21,7 @@ struct FuzzInput {
 fuzz_target!(|data: FuzzInput| {
     if let Some(date) = data.ymd.to_date(data.cal, data.overflow_constrain) {
         let _ = date.day_of_month();
-        let _ = date.day_of_week();
+        let _ = date.weekday();
         let _ = date.day_of_year();
         let _ = date.days_in_month();
         let _ = date.days_in_year();

components/calendar/benches/date.rs

@@ -727,7 +727,7 @@ impl<C: AsCalendar<Calendar = AnyCalendar>> Date<C> {
     /// Convert this `Date<AnyCalendar>` to another `AnyCalendar`, if conversion is needed
     pub fn convert_any<'a>(&self, calendar: &'a AnyCalendar) -> Date<Ref<'a, AnyCalendar>> {
         if calendar.kind() != self.calendar.as_calendar().kind() {
-            Date::new_from_iso(self.to_iso(), Ref(calendar))
+            self.to_calendar(Ref(calendar))
         } else {
             Date {
                 inner: self.inner,
@@ -1540,6 +1540,16 @@ impl From<Roc> for AnyCalendar {
     }
 }
 
+impl<C: IntoAnyCalendar> Date<C> {
+    /// Type-erase the date, converting it to a date for [`AnyCalendar`]
+    pub fn to_any(self) -> Date<AnyCalendar> {
+        Date::from_raw(
+            self.calendar.date_to_any(&self.inner),
+            self.calendar.to_any(),
+        )
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1561,27 +1571,22 @@ mod tests {
                 )
             });
 
-        let roundtrip_year = date.year();
-        let roundtrip_month = date.month().value;
-        let roundtrip_day = date.day_of_month().0;
-
         assert_eq!(
             (month, day),
-            (roundtrip_month, roundtrip_day),
+            (date.month().value, date.day_of_month().0),
             "Failed to roundtrip for calendar {}",
             calendar.debug_name()
         );
 
         if let Some((era_code, era_index)) = era {
             let roundtrip_era_year = date.year().era().expect("year type should be era");
 
-            let roundtrip_year = roundtrip_year.era_year_or_related_iso();
             assert_eq!(
                 (era_code, era_index, year),
                 (
                     roundtrip_era_year.era.as_str(),
                     roundtrip_era_year.era_index,
-                    roundtrip_year
+                    roundtrip_era_year.year,
                 ),
                 "Failed to roundtrip era for calendar {}",
                 calendar.debug_name()
@@ -1595,10 +1600,9 @@ mod tests {
             );
         }
 
-        let iso = date.to_iso();
-        let reconstructed = Date::new_from_iso(iso, calendar);
         assert_eq!(
-            date, reconstructed,
+            Date::from_rata_die(date.to_rata_die(), calendar),
+            date,
             "Failed to roundtrip via iso with {era:?}, {year}, {month:?}, {day}"
         )
     }