Merge branch 'main' into eras

Author: robertbastian

.github/workflows/artifacts-build.yml

@@ -267,8 +267,6 @@ jobs:
       run: |
         npm -C ffi/npm ci
         npm -C tutorials/web-demo ci
-      env: 
-        PINNED_CI_NIGHTLY: nightly-2024-07-23
 
     - name: Run Webpack
       run: npm -C tutorials/web-demo run build

.github/workflows/build-test.yml

@@ -280,6 +280,11 @@ jobs:
     - name: Show the selected Rust toolchain
       run: rustup show
 
+    # Job-specific dependencies
+    # TODO: Remove on 2025-05-05, when clang-19 is in ubuntu-latest (https://github.com/actions/runner-images/issues/11895)
+    - name: Install LLD and Clang
+      run: sudo apt-get install lld-19 clang-19
+
     # Actual job
     - name: Run `cargo make ci-job-test-c`
       run: cargo make ci-job-test-c
@@ -310,6 +315,11 @@ jobs:
     - name: Show the selected Rust toolchain
       run: rustup show
 
+    # Job-specific dependencies
+    # TODO: Remove on 2025-05-05, when clang-19 is in ubuntu-latest (https://github.com/actions/runner-images/issues/11895)
+    - name: Install LLD
+      run: sudo apt-get install lld-19
+
     # Actual job
     - name: Run `cargo make ci-job-test-js`
       run: cargo make ci-job-test-js

.github/workflows/coverage.yml

@@ -29,7 +29,7 @@ jobs:
 
       - uses:                   actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
         with:
-          toolchain:            nightly-2024-07-23
+          toolchain:            nightly-2024-09-01
           override:             true
 
       - run: cargo test --all-features --no-fail-fast

CHANGELOG.md

@@ -17,6 +17,7 @@ Some major changes worth highlighting:
         - Rename `Islamic` calendars to `Hijri` (unicode-org#6214)
         - Collapse `IslamicCivil` into `IslamicTabular` (unicode-org#6384)
         - Rename `IslamicObservational` to `IslamicSimulated`
+        - Rename `wrap_calendar_in_*` APIs to `as_borrowed`, `into_ref_counted`, `into_atomic_ref_counted` (unicode-org#6392)
     - `icu_collections`
         - Remove some panics from `CodePointTrie`, which should no longer pull in panic machinery even with arithmetic panics enabled for lookup (unicode-org#6204)
 - Data model and providers

CONTRIBUTING.md

@@ -112,7 +112,7 @@ Our wider testsuite is organized as `ci-job-foo` make tasks corresponding to eac
 <br/>
 
  - `ci-job-test-c`: Runs all C/C++ FFI tests; mostly important if you're changing the FFI interface.
-     + Requires `clang-18` and `lld-18` with the `gold` plugin (APT packages `llvm-18` and `lld-18`).
+     + Requires `clang-19` and `lld-19` with the `gold` plugin (APT packages `llvm-19` and `lld-19`).
  - `ci-job-test-js`: Runs all JS/WASM/Node FFI tests; mostly important if you're changing the FFI interface.
      + Requires Node.js version 16.18.0. This may not the one offered by the package manager; get it from the NodeJS website or `nvm`.
  - `ci-job-nostd`: Builds ICU4X for a `#[no_std]` target to verify that it's compatible.

Cargo.lock

@@ -214,10 +214,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" }
 
 # The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."`
 # Diplomat must be published preceding a new ICU4X release but may use git versions in between
-diplomat = { git = "https://github.com/rust-diplomat/diplomat", rev = "76b030df6326070c314a5d6cacedf3357a5ed590", default-features = false }
-diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "76b030df6326070c314a5d6cacedf3357a5ed590", default-features = false }
-diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "76b030df6326070c314a5d6cacedf3357a5ed590", default-features = false }
-diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "76b030df6326070c314a5d6cacedf3357a5ed590", default-features = false }
+diplomat = { git = "https://github.com/rust-diplomat/diplomat", rev = "f67862a22def6cb7954aa51e102630e019c99165", default-features = false }
+diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "f67862a22def6cb7954aa51e102630e019c99165", default-features = false }
+diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "f67862a22def6cb7954aa51e102630e019c99165", default-features = false }
+diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "f67862a22def6cb7954aa51e102630e019c99165", default-features = false }
 
 # EXTERNAL DEPENDENCIES
 #
@@ -271,7 +271,7 @@ serde-aux = { version = "4.0.0", default-features = false }
 
 ## External Deps Group 3: Dev and Datagen deps. Include default features.
 arraystring = "0.3.0"
-askama = "0.12"
+askama = "0.13"
 atoi = "2.0.0"
 bincode = "1.3.1" # Can be updated to 2.0 after MSRV 1.85
 clap = "4.2.0"

Cargo.toml

@@ -19,7 +19,7 @@ default_to_workspace = false
 # The toolchain that CI is being run in. Allows tests to change under beta/nightly.
 CI_TOOLCHAIN = { value = "pinned-stable", condition = { env_not_set = ["CI_TOOLCHAIN"]}}
 # The pinned nightly toolchain for jobs that require a nightly compiler.
-PINNED_CI_NIGHTLY = { value = "nightly-2024-07-23", condition = { env_not_set = ["PINNED_CI_NIGHTLY"] } }
+PINNED_CI_NIGHTLY = { value = "nightly-2025-02-17", condition = { env_not_set = ["PINNED_CI_NIGHTLY"] } }
 
 [tasks.quick]
 description = "Run quick version of all lints and builds (useful before pushing to GitHub)"

Makefile.toml

@@ -78,7 +78,10 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/civil",
-        icu::calendar::cal::HijriTabular::new_civil_epoch(),
+        icu::calendar::cal::HijriTabular::new(
+            icu::calendar::cal::HijriTabularEpoch::Friday,
+            icu::calendar::cal::HijriTabularLeapYears::TypeII,
+        ),
     );
 
     bench_calendar(
@@ -90,7 +93,10 @@ fn convert_benches(c: &mut Criterion) {
     bench_calendar(
         &mut group,
         "calendar/islamic/tabular",
-        icu::calendar::cal::HijriTabular::new_astronomical_epoch(),
+        icu::calendar::cal::HijriTabular::new(
+            icu::calendar::cal::HijriTabularEpoch::Thursday,
+            icu::calendar::cal::HijriTabularLeapYears::TypeII,
+        ),
     );
 
     group.finish();

components/calendar/benches/convert.rs

@@ -197,13 +197,19 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/civil",
         &fxs,
-        icu::calendar::cal::HijriTabular::new_civil_epoch(),
+        icu::calendar::cal::HijriTabular::new(
+            icu::calendar::cal::HijriTabularEpoch::Friday,
+            icu::calendar::cal::HijriTabularLeapYears::TypeII,
+        ),
         |y, m, d| {
             Date::try_new_hijri_tabular_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::cal::HijriTabular::new_civil_epoch(),
+                icu::calendar::cal::HijriTabular::new(
+                    icu::calendar::cal::HijriTabularEpoch::Friday,
+                    icu::calendar::cal::HijriTabularLeapYears::TypeII,
+                ),
             )
             .unwrap()
         },
@@ -213,13 +219,19 @@ fn date_benches(c: &mut Criterion) {
         &mut group,
         "calendar/islamic/tabular",
         &fxs,
-        icu::calendar::cal::HijriTabular::new_astronomical_epoch(),
+        icu::calendar::cal::HijriTabular::new(
+            icu::calendar::cal::HijriTabularEpoch::Thursday,
+            icu::calendar::cal::HijriTabularLeapYears::TypeII,
+        ),
         |y, m, d| {
             Date::try_new_hijri_tabular_with_calendar(
                 y,
                 m,
                 d,
-                icu::calendar::cal::HijriTabular::new_astronomical_epoch(),
+                icu::calendar::cal::HijriTabular::new(
+                    icu::calendar::cal::HijriTabularEpoch::Thursday,
+                    icu::calendar::cal::HijriTabularLeapYears::TypeII,
+                ),
             )
             .unwrap()
         },