Merge remote-tracking branch 'origin/main' into islamic-rest

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`
@@ -59,6 +60,9 @@
         - Add `ZeroTrieSimpleAsciiCursor` for manual iteration (https://github.com/unicode-org/icu4x/pull/4383)
     - `zerovec`
         - Change `ZeroHashMap` to use `twox-hash` (https://github.com/unicode-org/icu4x/pull/4592)
+    - `writeable`
+        - Add `TryWriteable` for fallibility (https://github.com/unicode-org/icu4x/pull/4787)
+        - Add `writeable_cmp_bytes` for more efficient comparison (https://github.com/unicode-org/icu4x/pull/4402)
 
 ## icu4x 1.4.x
 

CONTRIBUTING.md

@@ -30,21 +30,20 @@ ICU4X can be edited using any text editor capable of editing Rust code.
 
 Many ICU4X engineers use [Visual Studio Code](https://code.visualstudio.com/) with the [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer) extension.
 
-To build all code paths and improve build times in VSCode, we recommend the following settings. To add them, choose "Preferences: Open Workspace Settings (JSON)" from the command palette (Ctrl+Shift+P):
+To build all code paths, improve build times in VSCode, and prevent locking the target directory from command-line builds, we recommend the following settings. To add them, choose "Preferences: Open Workspace Settings (JSON)" from the command palette (Ctrl+Shift+P):
 
 ```json
 "settings": {
 	"rust-analyzer.cargo.features": "all",
 	"rust-analyzer.cargo.extraEnv": {
+		"CARGO_TARGET_DIR": "${workspaceFolder}/target/vscode",
 		"ICU4X_DATA_DIR": "../../../datagen/tests/data/baked"
 	}
 }
 ```
 
 Note: the path in `ICU4X_DATA_DIR` is relative to `provider/baked/*/src/lib.rs` and it causes VSCode to build ICU4X with only the `und` locale. This reduces build times but also makes some tests fail; to run them normally, run `cargo test --all-features` on the command line.
 
-Note: you might also consider setting a custom value to the `CARGO_TARGET_DIR` environment variable so that VSCode writes to a different target directory than other programs or the command line.
-
 ## Contributing a Pull Request
 
 The first step is to fork the repository to your namespace and create a branch off of the `main` branch to work with.
@@ -332,4 +331,4 @@ Please discuss first.
 [signing]: https://www.unicode.org/policies/licensing_policy.html#signing
 [unicode-license]: https://www.unicode.org/license.txt
 [sign-cla]: https://cla-assistant.io/unicode-org/.github
-[osi-Unicode-License-3.0]: https://opensource.org/license/unicode-license-v3/
+[osi-Unicode-License-3.0]: https://opensource.org/license/unicode-license-v3/

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
@@ -209,10 +208,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.git", rev = "bf3ebcbdfbd3ce5da2086801b47b54487b1b727c" }
-diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "bf3ebcbdfbd3ce5da2086801b47b54487b1b727c" }
-diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "bf3ebcbdfbd3ce5da2086801b47b54487b1b727c" }
-diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "bf3ebcbdfbd3ce5da2086801b47b54487b1b727c" }
+diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "3167e39e89ae612233706f1ade3d9e8a5c6ad358" }
+diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "3167e39e89ae612233706f1ade3d9e8a5c6ad358" }
+diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "3167e39e89ae612233706f1ade3d9e8a5c6ad358" }
+diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "3167e39e89ae612233706f1ade3d9e8a5c6ad358" }
 
 # Size optimized builds
 [profile.release-opt-size]