From 22e64d43f975f91a9cfb44a977c67f05ba599036 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Wed, 1 Apr 2026 20:14:55 -0700 Subject: [PATCH 1/3] Update zoneinfo64 --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- provider/src/zoneinfo64.rs | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ca81da30..b11f3a83c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -719,12 +719,12 @@ dependencies = [ [[package]] name = "resb" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6572f8cee86c6a691a8a1cf8bbf7be8b3d0c02d9f8786ed1929f75e9910dbb" +checksum = "22d392791f3c6802a1905a509e9d1a6039cbbcb5e9e00e5a6d3661f7c874f390" dependencies = [ "potential_utf", - "serde", + "serde_core", ] [[package]] @@ -1329,9 +1329,9 @@ dependencies = [ [[package]] name = "zoneinfo64" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6916519e4a1cff59d49e0b902caed549d85dbbbf623a95af5c8320d5c08c6e13" +checksum = "ed6eb2607e906160c457fd573e9297e65029669906b9ac8fb1b5cd5e055f0705" dependencies = [ "calendrical_calculations", "icu_locale_core", diff --git a/Cargo.toml b/Cargo.toml index e8d8789ef..5b8fa9532 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ zerovec = "0.11.0" databake = "0.2.0" zerotrie = "0.2.0" writeable = "0.6.0" -zoneinfo64 = "0.2.0" +zoneinfo64 = "0.3.0" ixdtf = "0.6.4" # Diplomat diff --git a/provider/src/zoneinfo64.rs b/provider/src/zoneinfo64.rs index 0a439a8b9..afa3e1475 100644 --- a/provider/src/zoneinfo64.rs +++ b/provider/src/zoneinfo64.rs @@ -104,6 +104,7 @@ impl TimeZoneResolver for ZoneInfo64<'_> { }, ]) } + _ => return Err(TimeZoneProviderError::Assert("Found unknown PossibleOffset value")), }; Ok(result) } From 946404f976383e50445ca9c06747e5a65595302b Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Wed, 1 Apr 2026 20:19:20 -0700 Subject: [PATCH 2/3] Update diplomat --- Cargo.lock | 55 ++++++++++++++++++++++++++++++++++++------------------ Cargo.toml | 6 +++--- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b11f3a83c..59a3c8815 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,11 +69,11 @@ dependencies = [ [[package]] name = "askama" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4" +checksum = "9b8246bcbf8eb97abef10c2d92166449680d41d55c0fc6978a91dec2e3619608" dependencies = [ - "askama_derive", + "askama_macros", "itoa", "percent-encoding", "serde", @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f" +checksum = "2f9670bc84a28bb3da91821ef74226949ab63f1265aff7c751634f1dd0e6f97c" dependencies = [ "askama_parser", "basic-toml", @@ -97,16 +97,26 @@ dependencies = [ "syn", ] +[[package]] +name = "askama_macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0756b45480437dded0565dfc568af62ccce146fb6cfe902e808ba86e445f44f" +dependencies = [ + "askama_derive", +] + [[package]] name = "askama_parser" -version = "0.14.0" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358" +checksum = "5d0af3691ba3af77949c0b5a3925444b85cb58a0184cc7fec16c68ba2e7be868" dependencies = [ - "memchr", + "rustc-hash", "serde", "serde_derive", - "winnow", + "unicode-ident", + "winnow 1.0.1", ] [[package]] @@ -289,9 +299,9 @@ version = "0.2.1" [[package]] name = "diplomat" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9adb46b05e2f53dcf6a7dfc242e4ce9eb60c369b6b6eb10826a01e93167f59c6" +checksum = "7935649d00000f5c5d735448ad3dc07b9738160727017914cf42138b8e8e6611" dependencies = [ "diplomat_core", "proc-macro2", @@ -308,15 +318,15 @@ dependencies = [ [[package]] name = "diplomat-runtime" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0569bd3caaf13829da7ee4e83dbf9197a0e1ecd72772da6d08f0b4c9285c8d29" +checksum = "640d5943a101226437e9ad4ef2b4181d0ff053a86e77cc18ae73e8c729766ac3" [[package]] name = "diplomat-tool" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cff1547f90c8ccb45024e89f9597c1958d54e1374a28e5e33bc278244fc2b25" +checksum = "3a742eeda95cd614873b815c4577519b07b737e2dceaf65f47d983bbdaabc5d7" dependencies = [ "askama", "clap", @@ -336,9 +346,9 @@ dependencies = [ [[package]] name = "diplomat_core" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51731530ed7f2d4495019abc7df3744f53338e69e2863a6a64ae91821c763df1" +checksum = "9cf41b94101a4bce993febaf0098092b0bb31deaf0ecaf6e0a2562465f61b383" dependencies = [ "displaydoc", "either", @@ -961,7 +971,7 @@ dependencies = [ "serde_spanned", "toml_datetime", "toml_write", - "winnow", + "winnow 0.7.10", ] [[package]] @@ -1228,6 +1238,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +dependencies = [ + "memchr", +] + [[package]] name = "writeable" version = "0.6.2" diff --git a/Cargo.toml b/Cargo.toml index 5b8fa9532..00c80b6da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,9 +55,9 @@ zoneinfo64 = "0.3.0" ixdtf = "0.6.4" # Diplomat -diplomat-tool = { version = "0.14.0", default-features = false } -diplomat-runtime = { version = "0.14.0", default-features = false } -diplomat = { version = "0.14.0", default-features = false } +diplomat-tool = { version = "0.15.0", default-features = false } +diplomat-runtime = { version = "0.15.0", default-features = false } +diplomat = { version = "0.15.0", default-features = false } [package] From 1e7b9235e0c8bc5f1c2d07aed1c314a2abed2bea Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Wed, 1 Apr 2026 20:50:51 -0700 Subject: [PATCH 3/3] fmt --- provider/src/zoneinfo64.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/provider/src/zoneinfo64.rs b/provider/src/zoneinfo64.rs index afa3e1475..c686e7905 100644 --- a/provider/src/zoneinfo64.rs +++ b/provider/src/zoneinfo64.rs @@ -104,7 +104,11 @@ impl TimeZoneResolver for ZoneInfo64<'_> { }, ]) } - _ => return Err(TimeZoneProviderError::Assert("Found unknown PossibleOffset value")), + _ => { + return Err(TimeZoneProviderError::Assert( + "Found unknown PossibleOffset value", + )) + } }; Ok(result) }