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

.github/workflows/artifacts-build.yml

@@ -574,7 +574,7 @@ jobs:
 
   gh-pages:
     name: "Deploy to GitHub Pages"
-    needs: [rust-docs, cpp-docs, ts-docs, dart-docs, wasm-demo, bench-perf, bench-memory, bench-datasize] # bench-binsize
+    needs: [rust-docs, cpp-docs, ts-docs, dart-docs, wasm-demo, bench-perf, bench-memory] # bench-binsize
     # Run this even when one of the above jobs failed. This is so we can at least push the other artifacts.
     if: (success() || failure()) && (github.ref == 'refs/heads/main' && github.repository == 'unicode-org/icu4x')
     runs-on: 'ubuntu-latest'

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - `icu_datetime`
   - Fix incorrect assertion in week-of-year formatting (https://github.com/unicode-org/icu4x/issues/4977)
+  - Fix Japanese calendar Gregorian era year 0 (https://github.com/unicode-org/icu4x/issues/4968)
 
 ## icu4x 1.5 (May 28, 2024)
 

Cargo.toml

@@ -39,6 +39,7 @@ members = [
     "provider/core/macros",
     "provider/datagen",
     "provider/fs",
+    "provider/registry",
 
     # Baked data
     "provider/baked/calendar",
@@ -152,6 +153,7 @@ icu_provider_macros = { version = "~1.5.0", path = "provider/core/macros", defau
 icu_provider_adapters = { version = "~1.5.0", path = "provider/adapters", default-features = false }
 icu_provider_blob = { version = "~1.5.0", path = "provider/blob", default-features = false }
 icu_provider_fs = { version = "~1.5.0", path = "provider/fs/", default-features = false }
+icu_registry = { version = "~1.5.0", path = "provider/registry/", default-features = false }
 
 # Baked data
 icu_calendar_data = { version = "~1.5.0", path = "provider/baked/calendar", default-features = false }

components/calendar/examples/iso_date_manipulations.rs

@@ -9,7 +9,7 @@
 
 icu_benchmark_macros::static_setup!();
 
-use icu_calendar::{Calendar, CalendarError, Date, Iso};
+use icu_calendar::{Calendar, Date, Iso, RangeError};
 
 const DATES_ISO: &[(i32, u8, u8)] = &[
     (1970, 1, 1),
@@ -41,7 +41,7 @@ fn print<A: Calendar>(_date_input: &Date<A>) {
     }
 }
 
-fn tuple_to_iso_date(date: (i32, u8, u8)) -> Result<Date<Iso>, CalendarError> {
+fn tuple_to_iso_date(date: (i32, u8, u8)) -> Result<Date<Iso>, RangeError> {
     Date::try_new_iso_date(date.0, date.1, date.2)
 }
 

components/calendar/examples/iso_datetime_manipulations.rs

@@ -9,7 +9,7 @@
 
 icu_benchmark_macros::static_setup!();
 
-use icu_calendar::{Calendar, CalendarError, DateTime, Iso};
+use icu_calendar::{Calendar, DateError, DateTime, Iso};
 
 const DATETIMES_ISO: &[(i32, u8, u8, u8, u8, u8)] = &[
     (1970, 1, 1, 3, 5, 12),
@@ -44,7 +44,7 @@ fn print<A: Calendar>(_datetime_input: &DateTime<A>) {
     }
 }
 
-fn tuple_to_iso_datetime(date: (i32, u8, u8, u8, u8, u8)) -> Result<DateTime<Iso>, CalendarError> {
+fn tuple_to_iso_datetime(date: (i32, u8, u8, u8, u8, u8)) -> Result<DateTime<Iso>, DateError> {
     DateTime::try_new_iso_datetime(date.0, date.1, date.2, date.3, date.4, date.5)
 }