Merge branch 'main' into add-percent-formatter

Cargo.toml

@@ -83,14 +83,14 @@ members = [
     "utils/zerovec/derive",
 
     # Tools
-    "tools/bakeddata-scripts",
     "tools/benchmark/binsize",
     "tools/benchmark/macros",
     "tools/benchmark/memory",
-    "tools/depcheck",
-    "tools/diplomat-gen",
-    "tools/ffi_coverage",
-    "tools/testdata-scripts",
+    "tools/make/bakeddata",
+    "tools/make/depcheck",
+    "tools/make/diplomat-coverage",
+    "tools/make/diplomat-gen",
+    "tools/make/download-repo-sources",
     "tools/md-tests",
 ]
 # Note: Workspaces in subdirectories, such as tutorials/crates, are
@@ -200,18 +200,16 @@ zerovec-derive = { version = "0.10.2", path = "utils/zerovec/derive", default-fe
 
 # Tools
 icu_benchmark_macros = { path = "tools/benchmark/macros" }
-# icu_benchmark_binsize never used as a dep
-# icu_benchmark_memory never used as a dep
-# depcheck never used as a dep
-# ffi_coverage never used as a dep
-# testdata-scripts never used as a dep
+# bench-binsize never used as a dep
+# bench-memory never used as a dep
+# make/* never used as a dep
 
 # 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 = "3b875c676f60a892eeb818c6a0f6f10086c69a24" }
-diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "3b875c676f60a892eeb818c6a0f6f10086c69a24" }
-diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "3b875c676f60a892eeb818c6a0f6f10086c69a24" }
-diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "3b875c676f60a892eeb818c6a0f6f10086c69a24" }
+diplomat = { git = "https://github.com/rust-diplomat/diplomat", rev = "bd491cb7da695486588e0345f45c95345c79a9ee" }
+diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "bd491cb7da695486588e0345f45c95345c79a9ee" }
+diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "bd491cb7da695486588e0345f45c95345c79a9ee" }
+diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "bd491cb7da695486588e0345f45c95345c79a9ee" }
 
 # EXTERNAL DEPENDENCIES
 #

components/calendar/Cargo.toml

@@ -24,6 +24,7 @@ calendrical_calculations = { workspace = true }
 displaydoc = { workspace = true }
 icu_provider = { workspace = true, features = ["macros"] }
 icu_locale_core = { workspace = true }
+ixdtf = { workspace = true, optional = true }
 tinystr = { workspace = true, features = ["alloc", "zerovec"] }
 zerovec = { workspace = true, features = ["derive"] }
 writeable = { workspace = true }
@@ -46,7 +47,8 @@ criterion = { workspace = true }
 
 
 [features]
-default = ["compiled_data"]
+default = ["compiled_data", "ixdtf"]
+ixdtf = ["dep:ixdtf"]
 logging = ["calendrical_calculations/logging"]
 std = ["icu_provider/std", "icu_locale_core/std", "calendrical_calculations/std"]
 serde = ["dep:serde", "zerovec/serde", "tinystr/serde", "icu_provider/serde"]