From 4acf3bca037e1392830408788c7691e303a6a6fe Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 6 Oct 2025 13:17:59 -0700 Subject: [PATCH 1/2] Remove HijriSimulatedMecca / islamic-rgsa The spec doesn't have it anymore Change-Id: I6a6a6964444bf7d9c9c44a0a25d5db674f97ab1e --- src/builtins/core/calendar.rs | 5 +- src/builtins/core/plain_month_day.rs | 50 +++++++++---------- src/parsed_intermediates.rs | 3 ++ temporal_capi/bindings/c/AnyCalendarKind.d.h | 15 +++--- .../cpp/temporal_rs/AnyCalendarKind.d.hpp | 30 ++++++----- .../cpp/temporal_rs/AnyCalendarKind.hpp | 1 - temporal_capi/src/calendar.rs | 3 +- 7 files changed, 51 insertions(+), 56 deletions(-) diff --git a/src/builtins/core/calendar.rs b/src/builtins/core/calendar.rs index 44cc06bda..c33aa68e0 100644 --- a/src/builtins/core/calendar.rs +++ b/src/builtins/core/calendar.rs @@ -90,8 +90,6 @@ impl Calendar { pub const HIJRI_TABULAR_THURSDAY: Self = Self::new(AnyCalendarKind::HijriTabularTypeIIThursday); /// The Hijri Umm al-Qura calendar pub const HIJRI_UMM_AL_QURA: Self = Self::new(AnyCalendarKind::HijriUmmAlQura); - /// The Hijri simulated calendar - pub const HIJRI_SIMULATED: Self = Self::new(AnyCalendarKind::HijriSimulatedMecca); /// The ISO 8601 calendar pub const ISO: Self = Self::new(AnyCalendarKind::Iso); /// The Japanese calendar @@ -135,7 +133,8 @@ impl Calendar { } } AnyCalendarKind::HijriSimulatedMecca => { - const { &AnyCalendar::HijriSimulated(Hijri::new_simulated_mecca()) } + // This calendar is currently unsupported by Temporal + &AnyCalendar::Iso(Iso) } AnyCalendarKind::HijriTabularTypeIIThursday => { const { diff --git a/src/builtins/core/plain_month_day.rs b/src/builtins/core/plain_month_day.rs index b60372bce..4aea90b13 100644 --- a/src/builtins/core/plain_month_day.rs +++ b/src/builtins/core/plain_month_day.rs @@ -528,34 +528,30 @@ mod tests { #[test] /// This test is for calendars where we don't wish to hardcode dates; but we do wish to know - /// that monthcodes can be constructed without issue - fn automated_reference_year() { + /// that monthcodes can be constructed without issue (currently only UAQ) + fn automated_uaq_reference_year() { let reference_iso = IsoDate::new_unchecked(1972, 12, 31); - for cal in [ - AnyCalendarKind::HijriSimulatedMecca, - AnyCalendarKind::HijriUmmAlQura, - ] { - let calendar = Calendar::new(cal); - for month in 1..=12 { - for day in [29, 30] { - let month_code = crate::builtins::calendar::month_to_month_code(month).unwrap(); - - let calendar_fields = CalendarFields { - month_code: Some(month_code), - day: Some(day), - ..Default::default() - }; - - let md = calendar - .month_day_from_fields(calendar_fields, Overflow::Reject) - .unwrap(); - - assert!( - md.iso <= reference_iso, - "Reference ISO for {month}-{day} must be before 1972-12-31, found, {:?}", - md.iso, - ); - } + + let calendar = Calendar::new(AnyCalendarKind::HijriUmmAlQura); + for month in 1..=12 { + for day in [29, 30] { + let month_code = crate::builtins::calendar::month_to_month_code(month).unwrap(); + + let calendar_fields = CalendarFields { + month_code: Some(month_code), + day: Some(day), + ..Default::default() + }; + + let md = calendar + .month_day_from_fields(calendar_fields, Overflow::Reject) + .unwrap(); + + assert!( + md.iso <= reference_iso, + "Reference ISO for {month}-{day} must be before 1972-12-31, found, {:?}", + md.iso, + ); } } } diff --git a/src/parsed_intermediates.rs b/src/parsed_intermediates.rs index c4ff2cc0d..db3024388 100644 --- a/src/parsed_intermediates.rs +++ b/src/parsed_intermediates.rs @@ -24,6 +24,9 @@ use ixdtf::records::UtcOffsetRecordOrZ; fn extract_kind(calendar: Option<&[u8]>) -> TemporalResult { Ok(calendar .map(Calendar::try_kind_from_utf8) + // Note that this will successfully parse AnyCalendarKind::HijriSimulatedMecca + // However, Calendar::new will immediately turn it into an ISO calendar, + // so we don't need to do anything here. .transpose()? .unwrap_or(AnyCalendarKind::Iso)) } diff --git a/temporal_capi/bindings/c/AnyCalendarKind.d.h b/temporal_capi/bindings/c/AnyCalendarKind.d.h index 44bed28e1..e138f882e 100644 --- a/temporal_capi/bindings/c/AnyCalendarKind.d.h +++ b/temporal_capi/bindings/c/AnyCalendarKind.d.h @@ -22,14 +22,13 @@ typedef enum AnyCalendarKind { AnyCalendarKind_Hebrew = 7, AnyCalendarKind_Indian = 8, AnyCalendarKind_HijriTabularTypeIIFriday = 9, - AnyCalendarKind_HijriSimulatedMecca = 10, - AnyCalendarKind_HijriTabularTypeIIThursday = 11, - AnyCalendarKind_HijriUmmAlQura = 12, - AnyCalendarKind_Iso = 13, - AnyCalendarKind_Japanese = 14, - AnyCalendarKind_JapaneseExtended = 15, - AnyCalendarKind_Persian = 16, - AnyCalendarKind_Roc = 17, + AnyCalendarKind_HijriTabularTypeIIThursday = 10, + AnyCalendarKind_HijriUmmAlQura = 11, + AnyCalendarKind_Iso = 12, + AnyCalendarKind_Japanese = 13, + AnyCalendarKind_JapaneseExtended = 14, + AnyCalendarKind_Persian = 15, + AnyCalendarKind_Roc = 16, } AnyCalendarKind; typedef struct AnyCalendarKind_option {union { AnyCalendarKind ok; }; bool is_ok; } AnyCalendarKind_option; diff --git a/temporal_capi/bindings/cpp/temporal_rs/AnyCalendarKind.d.hpp b/temporal_capi/bindings/cpp/temporal_rs/AnyCalendarKind.d.hpp index d7d93fd33..760ee856f 100644 --- a/temporal_capi/bindings/cpp/temporal_rs/AnyCalendarKind.d.hpp +++ b/temporal_capi/bindings/cpp/temporal_rs/AnyCalendarKind.d.hpp @@ -29,14 +29,13 @@ namespace capi { AnyCalendarKind_Hebrew = 7, AnyCalendarKind_Indian = 8, AnyCalendarKind_HijriTabularTypeIIFriday = 9, - AnyCalendarKind_HijriSimulatedMecca = 10, - AnyCalendarKind_HijriTabularTypeIIThursday = 11, - AnyCalendarKind_HijriUmmAlQura = 12, - AnyCalendarKind_Iso = 13, - AnyCalendarKind_Japanese = 14, - AnyCalendarKind_JapaneseExtended = 15, - AnyCalendarKind_Persian = 16, - AnyCalendarKind_Roc = 17, + AnyCalendarKind_HijriTabularTypeIIThursday = 10, + AnyCalendarKind_HijriUmmAlQura = 11, + AnyCalendarKind_Iso = 12, + AnyCalendarKind_Japanese = 13, + AnyCalendarKind_JapaneseExtended = 14, + AnyCalendarKind_Persian = 15, + AnyCalendarKind_Roc = 16, }; typedef struct AnyCalendarKind_option {union { AnyCalendarKind ok; }; bool is_ok; } AnyCalendarKind_option; @@ -57,14 +56,13 @@ class AnyCalendarKind { Hebrew = 7, Indian = 8, HijriTabularTypeIIFriday = 9, - HijriSimulatedMecca = 10, - HijriTabularTypeIIThursday = 11, - HijriUmmAlQura = 12, - Iso = 13, - Japanese = 14, - JapaneseExtended = 15, - Persian = 16, - Roc = 17, + HijriTabularTypeIIThursday = 10, + HijriUmmAlQura = 11, + Iso = 12, + Japanese = 13, + JapaneseExtended = 14, + Persian = 15, + Roc = 16, }; AnyCalendarKind(): value(Value::Buddhist) {} diff --git a/temporal_capi/bindings/cpp/temporal_rs/AnyCalendarKind.hpp b/temporal_capi/bindings/cpp/temporal_rs/AnyCalendarKind.hpp index 810aae25a..94007ae30 100644 --- a/temporal_capi/bindings/cpp/temporal_rs/AnyCalendarKind.hpp +++ b/temporal_capi/bindings/cpp/temporal_rs/AnyCalendarKind.hpp @@ -44,7 +44,6 @@ inline temporal_rs::AnyCalendarKind temporal_rs::AnyCalendarKind::FromFFI(tempor case temporal_rs::capi::AnyCalendarKind_Hebrew: case temporal_rs::capi::AnyCalendarKind_Indian: case temporal_rs::capi::AnyCalendarKind_HijriTabularTypeIIFriday: - case temporal_rs::capi::AnyCalendarKind_HijriSimulatedMecca: case temporal_rs::capi::AnyCalendarKind_HijriTabularTypeIIThursday: case temporal_rs::capi::AnyCalendarKind_HijriUmmAlQura: case temporal_rs::capi::AnyCalendarKind_Iso: diff --git a/temporal_capi/src/calendar.rs b/temporal_capi/src/calendar.rs index 5184609e5..b06dce941 100644 --- a/temporal_capi/src/calendar.rs +++ b/temporal_capi/src/calendar.rs @@ -18,7 +18,6 @@ pub mod ffi { Hebrew, Indian, HijriTabularTypeIIFriday, - HijriSimulatedMecca, HijriTabularTypeIIThursday, HijriUmmAlQura, Iso, @@ -33,6 +32,8 @@ pub mod ffi { let value = icu_locale::extensions::unicode::Value::try_from_utf8(s).ok()?; let algorithm = CalendarAlgorithm::try_from(&value).ok()?; match icu_calendar::AnyCalendarKind::try_from(algorithm) { + // islamic-rgsa / simulated-mecca is supported by ICU4X but not Temporal + Ok(icu_calendar::AnyCalendarKind::HijriSimulatedMecca) => None, Ok(c) => Some(c.into()), Err(()) if algorithm == CalendarAlgorithm::Hijri(None) => { Some(Self::HijriTabularTypeIIFriday) From 98eaae254428e9a92dd3d8fcac5d68381a6d1d5a Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 6 Oct 2025 13:08:22 -0700 Subject: [PATCH 2/2] Update to ICU4X main Change-Id: I6a6a696403478e64430a0cd00bb881c4416b5caa --- Cargo.lock | 131 +++++++++++++++++----------------- Cargo.toml | 16 ++--- src/builtins/core/calendar.rs | 2 +- 3 files changed, 74 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d156226f9..479a20aa8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -125,7 +125,7 @@ dependencies = [ "serde_json", "syn", "timezone_provider", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] @@ -168,7 +168,7 @@ dependencies = [ [[package]] name = "calendrical_calculations" version = "0.2.2" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "core_maths", "displaydoc", @@ -272,7 +272,7 @@ dependencies = [ [[package]] name = "databake" version = "0.2.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "databake-derive", "proc-macro2", @@ -282,7 +282,7 @@ dependencies = [ [[package]] name = "databake-derive" version = "0.2.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "proc-macro2", "quote", @@ -439,49 +439,47 @@ dependencies = [ [[package]] name = "icu_calendar" version = "2.0.4" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ - "calendrical_calculations 0.2.2 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "calendrical_calculations 0.2.2 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "displaydoc", "icu_calendar_data", "icu_locale", - "icu_locale_core 2.0.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "icu_locale_core 2.0.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "icu_provider", - "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] name = "icu_calendar_data" version = "2.0.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" [[package]] name = "icu_collections" version = "2.0.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "displaydoc", - "potential_utf 0.1.3 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "yoke 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "zerofrom 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "potential_utf 0.1.3 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "yoke 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerofrom 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] name = "icu_locale" version = "2.0.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ - "displaydoc", "icu_collections", - "icu_locale_core 2.0.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "icu_locale_core 2.0.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "icu_locale_data", "icu_provider", - "potential_utf 0.1.3 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "potential_utf 0.1.3 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] @@ -499,34 +497,35 @@ dependencies = [ [[package]] name = "icu_locale_core" version = "2.0.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "displaydoc", - "litemap 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "litemap 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "serde", + "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] name = "icu_locale_data" version = "2.0.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" [[package]] name = "icu_provider" version = "2.0.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "displaydoc", - "icu_locale_core 2.0.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "icu_locale_core 2.0.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "serde", "stable_deref_trait", - "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "yoke 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "zerofrom 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "yoke 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerofrom 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "zerotrie", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] @@ -569,7 +568,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "ixdtf" version = "0.6.3" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" [[package]] name = "jiff-tzdb" @@ -608,9 +607,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "litemap" version = "0.8.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -661,10 +660,11 @@ checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" [[package]] name = "potential_utf" version = "0.1.3" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ - "serde", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "serde_core", + "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] @@ -870,7 +870,7 @@ dependencies = [ "num-traits", "temporal_rs", "timezone_provider", - "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "zoneinfo64", ] @@ -887,9 +887,9 @@ dependencies = [ "num-traits", "resb", "timezone_provider", - "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "web-time", - "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "writeable 0.6.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "zoneinfo64", ] @@ -902,11 +902,11 @@ dependencies = [ "jiff-tzdb", "serde", "serde_json", - "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "tinystr 0.8.1 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "tzif", "yoke 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "zerotrie", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "zoneinfo64", "zoneinfo_rs", ] @@ -924,12 +924,12 @@ dependencies = [ [[package]] name = "tinystr" version = "0.8.1" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "databake", "displaydoc", - "serde", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "serde_core", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] @@ -1234,7 +1234,7 @@ checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "writeable" version = "0.6.1" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" [[package]] name = "yoke" @@ -1251,12 +1251,11 @@ dependencies = [ [[package]] name = "yoke" version = "0.8.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ - "serde", "stable_deref_trait", - "yoke-derive 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "zerofrom 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "yoke-derive 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerofrom 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] @@ -1274,7 +1273,7 @@ dependencies = [ [[package]] name = "yoke-derive" version = "0.8.0" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "proc-macro2", "quote", @@ -1294,9 +1293,9 @@ dependencies = [ [[package]] name = "zerofrom" version = "0.1.6" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ - "zerofrom-derive 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "zerofrom-derive 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] @@ -1314,7 +1313,7 @@ dependencies = [ [[package]] name = "zerofrom-derive" version = "0.1.6" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "proc-macro2", "quote", @@ -1325,13 +1324,13 @@ dependencies = [ [[package]] name = "zerotrie" version = "0.2.2" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "databake", "displaydoc", - "litemap 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "serde", - "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "litemap 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "serde_core", + "zerovec 0.11.4 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", ] [[package]] @@ -1346,19 +1345,19 @@ dependencies = [ [[package]] name = "zerovec" version = "0.11.4" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "databake", "serde", - "yoke 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", - "zerofrom 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c)", + "yoke 0.8.0 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", + "zerofrom 0.1.6 (git+https://github.com/unicode-org/icu4x?rev=5a56323558)", "zerovec-derive", ] [[package]] name = "zerovec-derive" version = "0.11.1" -source = "git+https://github.com/unicode-org/icu4x?rev=0f9fd3dd847a5a4682f7ec8a300555a7d761258c#0f9fd3dd847a5a4682f7ec8a300555a7d761258c" +source = "git+https://github.com/unicode-org/icu4x?rev=5a56323558#5a56323558fb5732046be79ef2119278ce26758e" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index b9d4cf63e..e3a342ee4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,22 +34,22 @@ timezone_provider = { version = "~0.1.0", path = "./provider" } zoneinfo_rs = { version = "~0.0.17", path = "./zoneinfo" } # Dependencies -tinystr = { git = "https://github.com/unicode-org/icu4x", rev = "0f9fd3dd847a5a4682f7ec8a300555a7d761258c" } -icu_calendar = { git = "https://github.com/unicode-org/icu4x", rev = "0f9fd3dd847a5a4682f7ec8a300555a7d761258c", default-features = false } -icu_locale = { git = "https://github.com/unicode-org/icu4x", rev = "0f9fd3dd847a5a4682f7ec8a300555a7d761258c" } +tinystr = { git = "https://github.com/unicode-org/icu4x", rev = "5a56323558" } +icu_calendar = { git = "https://github.com/unicode-org/icu4x", rev = "5a56323558", default-features = false } +icu_locale = { git = "https://github.com/unicode-org/icu4x", rev = "5a56323558" } rustc-hash = "2.1.0" num-traits = { version = "0.2.19", default-features = false } -ixdtf = { git = "https://github.com/unicode-org/icu4x", rev = "0f9fd3dd847a5a4682f7ec8a300555a7d761258c" } +ixdtf = { git = "https://github.com/unicode-org/icu4x", rev = "5a56323558" } iana-time-zone = "0.1.64" log = "0.4.28" tzif = "0.4.0" jiff-tzdb = "0.1.4" combine = "4.6.7" web-time = "1.1.0" -zerovec = { git = "https://github.com/unicode-org/icu4x", rev = "0f9fd3dd847a5a4682f7ec8a300555a7d761258c" } -databake = { git = "https://github.com/unicode-org/icu4x", rev = "0f9fd3dd847a5a4682f7ec8a300555a7d761258c" } -zerotrie = { git = "https://github.com/unicode-org/icu4x", rev = "0f9fd3dd847a5a4682f7ec8a300555a7d761258c" } -writeable = { git = "https://github.com/unicode-org/icu4x", rev = "0f9fd3dd847a5a4682f7ec8a300555a7d761258c" } +zerovec = { git = "https://github.com/unicode-org/icu4x", rev = "5a56323558" } +databake = { git = "https://github.com/unicode-org/icu4x", rev = "5a56323558" } +zerotrie = { git = "https://github.com/unicode-org/icu4x", rev = "5a56323558" } +writeable = { git = "https://github.com/unicode-org/icu4x", rev = "5a56323558" } zoneinfo64 = "0.2.0" # Diplomat diff --git a/src/builtins/core/calendar.rs b/src/builtins/core/calendar.rs index c33aa68e0..50296ed7c 100644 --- a/src/builtins/core/calendar.rs +++ b/src/builtins/core/calendar.rs @@ -106,7 +106,7 @@ impl Calendar { AnyCalendarKind::Buddhist => &AnyCalendar::Buddhist(Buddhist), AnyCalendarKind::Chinese => const { &AnyCalendar::Chinese(LunarChinese::new_china()) }, AnyCalendarKind::Coptic => &AnyCalendar::Coptic(Coptic), - AnyCalendarKind::Dangi => const { &AnyCalendar::Dangi(LunarChinese::new_dangi()) }, + AnyCalendarKind::Dangi => const { &AnyCalendar::Dangi(LunarChinese::new_korea()) }, AnyCalendarKind::Ethiopian => { const { &AnyCalendar::Ethiopian(Ethiopian::new_with_era_style(