Merge branch 'main' into iana-canon-2

unicode-org · Apr 23, 2024 · 0a5c746 · 0a5c746
2 parents 4e9d5ee + c271c85
commit 0a5c746
Show file tree

Hide file tree

Showing 91 changed files with 3,539 additions and 911 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
     - Make `CldrCalendar` trait sealed except with experimental feature (https://github.com/unicode-org/icu4x/pull/4392)
   - `icu_calendar`
     - New `DateTime::local_unix_epoch()` convenience constructor (https://github.com/unicode-org/icu4x/pull/4479)
+    - Improved approximation for Persian calendrical calculations (https://github.com/unicode-org/icu4x/issues/4713)
   - `icu_datetime`
     - `FormattedDateTime` and `FormattedZonedDateTime` now implement `Clone` and `Copy` (https://github.com/unicode-org/icu4x/pull/4476)
   - `icu_locid`

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -87,7 +87,6 @@ members = [
     "tools/ffi_coverage",
     "tools/testdata-scripts",
     "tools/md-tests",
-    "ffi/dart/tools/datagen",
     "tools/graveyard",
 ]
 # Note: Workspaces in subdirectories, such as tutorials/crates, are

diff --git a/components/calendar/benches/convert.rs b/components/calendar/benches/convert.rs
@@ -89,7 +89,7 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/civil",
-        icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+        icu::calendar::islamic::IslamicCivil::new(),
     );
 
     #[cfg(feature = "bench")]
@@ -103,7 +103,7 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/tabular",
-        icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+        icu::calendar::islamic::IslamicTabular::new(),
     );
 
     group.finish();

diff --git a/components/calendar/benches/date.rs b/components/calendar/benches/date.rs
@@ -222,13 +222,13 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/civil",
         &fxs,
-        icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+        icu::calendar::islamic::IslamicCivil::new(),
         |y, m, d| {
             Date::try_new_islamic_civil_date_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+                icu::calendar::islamic::IslamicCivil::new(),
             )
             .unwrap()
         },
@@ -239,13 +239,13 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/tabular",
         &fxs,
-        icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+        icu::calendar::islamic::IslamicTabular::new(),
         |y, m, d| {
             Date::try_new_islamic_tabular_date_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+                icu::calendar::islamic::IslamicTabular::new(),
             )
             .unwrap()
         },

diff --git a/components/calendar/benches/datetime.rs b/components/calendar/benches/datetime.rs
@@ -186,7 +186,7 @@ fn datetime_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/civil",
         &fxs,
-        icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+        icu::calendar::islamic::IslamicCivil::new(),
         |y, m, d, h, min, s| {
             DateTime::try_new_islamic_civil_datetime_with_calendar(
                 y,
@@ -195,7 +195,7 @@ fn datetime_benches(c: &mut Criterion) {
                 h,
                 min,
                 s,
-                icu::calendar::islamic::IslamicCivil::new_always_calculating(),
+                icu::calendar::islamic::IslamicCivil::new(),
             )
             .unwrap()
         },
@@ -206,7 +206,7 @@ fn datetime_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/tabular",
         &fxs,
-        icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+        icu::calendar::islamic::IslamicTabular::new(),
         |y, m, d, h, min, s| {
             DateTime::try_new_islamic_tabular_datetime_with_calendar(
                 y,
@@ -215,7 +215,7 @@ fn datetime_benches(c: &mut Criterion) {
                 h,
                 min,
                 s,
-                icu::calendar::islamic::IslamicTabular::new_always_calculating(),
+                icu::calendar::islamic::IslamicTabular::new(),
             )
             .unwrap()
         },