pen Cleaning up the workspace (#3938)

Cargo.toml

@@ -5,69 +5,72 @@
 [workspace]
 resolver = "2"
 members = [
+    # KEEP IN SYNC WITH workspace.dependencies and docs/tutorials/testing/patch.toml
+
+    # Components
     "components/calendar",
-    "components/calendar/data",
     "components/casemap",
-    "components/casemap/data",
     "components/collator",
-    "components/collator/data",
     "components/collections",
     "components/collections/codepointtrie_builder",
     "components/datetime",
-    "components/datetime/data",
     "components/decimal",
-    "components/decimal/data",
     "components/icu",
     "components/list",
-    "components/list/data",
     "components/locid_transform",
-    "components/locid_transform/data",
     "components/locid",
     "components/normalizer",
-    "components/normalizer/data",
     "components/plurals",
-    "components/plurals/data",
     "components/properties",
-    "components/properties/data",
     "components/segmenter",
-    "components/segmenter/data",
     "components/timezone",
-    "components/timezone/data",
-    "experimental/bies",
     "experimental/compactdecimal",
-    "experimental/compactdecimal/data",
     "experimental/displaynames",
-    "experimental/displaynames/data",
-    "experimental/harfbuzz",
-    "experimental/ixdtf",
     "experimental/personnames",
     "experimental/relativetime",
-    "experimental/relativetime/data",
     "experimental/single_number_formatter",
-    "experimental/single_number_formatter/data",
     "experimental/transliteration",
     "experimental/transliterator_parser",
     "experimental/unicodeset_parser",
     "experimental/unitsconversion",
+
+    # Components data
+    "components/calendar/data",
+    "components/casemap/data",
+    "components/collator/data",
+    "components/datetime/data",
+    "components/decimal/data",
+    "components/list/data",
+    "components/locid_transform/data",
+    "components/normalizer/data",
+    "components/plurals/data",
+    "components/properties/data",
+    "components/segmenter/data",
+    "components/timezone/data",
+    "experimental/compactdecimal/data",
+    "experimental/displaynames/data",
+    "experimental/relativetime/data",
+    "experimental/single_number_formatter/data",
     "experimental/unitsconversion/data",
-    "experimental/zerotrie",
+
+    # FFI
     "ffi/capi_cdylib",
     "ffi/capi_staticlib",
     "ffi/diplomat",
     "ffi/ecma402",
     "ffi/freertos",
+    "experimental/harfbuzz",
+
+    # Provider
     "provider/adapters",
     "provider/blob",
     "provider/core",
     "provider/datagen",
     "provider/fs",
     "provider/macros",
-    "tools/benchmark/binsize",
-    "tools/benchmark/macros",
-    "tools/benchmark/memory",
-    "tools/depcheck",
-    "tools/ffi_coverage",
-    "tools/testdata-scripts",
+
+    # Utils
+    "utils/crlify",
     "utils/databake",
     "utils/databake/derive",
     "utils/deduplicating_array",
@@ -83,6 +86,17 @@ members = [
     "utils/zerofrom/derive",
     "utils/zerovec",
     "utils/zerovec/derive",
+    "experimental/bies",
+    "experimental/ixdtf",
+    "experimental/zerotrie",
+
+    # Tools
+    "tools/benchmark/binsize",
+    "tools/benchmark/macros",
+    "tools/benchmark/memory",
+    "tools/depcheck",
+    "tools/ffi_coverage",
+    "tools/testdata-scripts",
 ]
 # Note: Workspaces in subdirectories, such as docs/tutorials/crates, are
 # implicitly excluded from the main workspace.
@@ -116,10 +130,13 @@ include = [
     "tests/**/*",
     "Cargo.toml",
     "LICENSE",
-    "README.md"
+    "README.md",
 ]
 
 [workspace.dependencies]
+# KEEP IN SYNC WITH workspace.members and docs/tutorials/testing/patch.toml
+
+# Components
 icu = { version = "~1.2.0", path = "components/icu", default-features = false }
 icu_calendar = { version = "~1.2.0", path = "components/calendar", default-features = false }
 icu_casemap = { version = "~1.2.0", path = "components/casemap", default-features = false }
@@ -136,16 +153,17 @@ icu_plurals = { version = "~1.2.0", path = "components/plurals", default-feature
 icu_properties = { version = "~1.2.0", path = "components/properties", default-features = false }
 icu_segmenter = { version = "~1.2.0", path = "components/segmenter", default-features = false }
 icu_timezone = { version = "~1.2.0", path = "components/timezone", default-features = false }
-
 icu_compactdecimal = { version = "0.2.0", path = "experimental/compactdecimal", default-features = false }
 icu_displaynames = { version = "0.10.0", path = "experimental/displaynames", default-features = false }
+icu_personnames = { version = "0.0.0", path = "experimental/personnames", default-features = false }
 icu_relativetime = { version = "0.1.0", path = "experimental/relativetime", default-features = false }
-icu_singlenumberformatter = { version = "0.1.0", path = "experimental/single_number_formatter", default-features = false}
+icu_singlenumberformatter = { version = "0.0.0", path = "experimental/single_number_formatter", default-features = false }
 icu_transliteration = { version = "0.0.0", path = "experimental/transliteration", default-features = false }
 icu_transliterator_parser = { version = "0.0.0", path = "experimental/transliterator_parser", default-features = false }
 icu_unicodeset_parser = { version = "0.0.0", path = "experimental/unicodeset_parser", default-features = false }
-icu_unitsconversion = { version = "1.2.0", path = "experimental/unitsconversion", default-features = false }
+icu_unitsconversion = { version = "0.0.0", path = "experimental/unitsconversion", default-features = false }
 
+# Components data
 icu_calendar_data = { version = "~1.2.0", path = "components/calendar/data", default-features = false }
 icu_casemap_data = { version = "~1.2.0", path = "components/casemap/data", default-features = false }
 icu_collator_data = { version = "~1.2.0", path = "components/collator/data", default-features = false }
@@ -155,43 +173,59 @@ icu_list_data = { version = "~1.2.0", path = "components/list/data", default-fea
 icu_locid_transform_data = { version = "~1.2.0", path = "components/locid_transform/data", default-features = false }
 icu_normalizer_data = { version = "~1.2.0", path = "components/normalizer/data", default-features = false }
 icu_plurals_data = { version = "~1.2.0", path = "components/plurals/data", default-features = false }
-icu_properties_data = { version = "~1.2.0", path = "components/properties/data", default-features = false}
+icu_properties_data = { version = "~1.2.0", path = "components/properties/data", default-features = false }
 icu_segmenter_data = { version = "~1.2.0", path = "components/segmenter/data", default-features = false }
 icu_timezone_data = { version = "~1.2.0", path = "components/timezone/data", default-features = false }
-
 icu_compactdecimal_data = { version = "~1.2.0", path = "experimental/compactdecimal/data", default-features = false }
 icu_displaynames_data = { version = "~1.2.0", path = "experimental/displaynames/data", default-features = false }
 icu_relativetime_data = { version = "1.2.0", path = "experimental/relativetime/data", default-features = false }
-icu_singlenumberformatter_data = { version = "~1.2.0", path = "experimental/single_number_formatter/data", default-features = false}
+icu_singlenumberformatter_data = { version = "~1.2.0", path = "experimental/single_number_formatter/data", default-features = false }
 icu_transliteration_data = { version = "0.0.0", path = "experimental/transliteration/data", default-features = false }
 
+# FFI
 icu_capi = { version = "~1.2.0", path = "ffi/diplomat", default-features = false }
 icu_capi_cdylib = { version = "~1.2.0", path = "ffi/capi_cdylib", default-features = false }
 icu_capi_staticlib = { version = "~1.2.0", path = "ffi/capi_staticlib", default-features = false }
+icu4x_ecma402 = { version = "0.8.0", path = "ffi/ecma402", default-features = false }
+icu_freertos = { version = "~1.2.0", path = "ffi/freertos", default-features = false }
+icu_harfbuzz = { version = "~1.2.0", path = "experimental/harfbuzz", default-features = false }
 
+# Provider
 icu_datagen = { version = "~1.2.0", path = "provider/datagen", default-features = false }
 icu_provider = { version = "~1.2.0", path = "provider/core", default-features = false }
 icu_provider_adapters = { version = "~1.2.0", path = "provider/adapters", default-features = false }
 icu_provider_blob = { version = "~1.2.0", path = "provider/blob", default-features = false }
 icu_provider_fs = { version = "~1.2.0", path = "provider/fs/", default-features = false }
 icu_provider_macros = { version = "~1.2.0", path = "provider/macros", default-features = false }
 
+# Utils
 crlify = { version = "1.0.1", path = "utils/crlify", default-features = false }
 databake = { version = "0.1.3", path = "utils/databake", default-features = false }
 databake-derive = { version = "0.1.3", path = "utils/databake/derive", default-features = false }
 deduplicating_array = { version = "0.1.3", path = "utils/deduplicating_array", default-features = false }
 fixed_decimal = { version = "0.5.2", path = "utils/fixed_decimal", default-features = false }
 litemap = { version = "0.7.0", path = "utils/litemap", default-features = false }
+icu_pattern = { version = "0.0.0", path = "utils/pattern", default-features = false }
 tinystr = { version = "0.7.1", path = "utils/tinystr", default-features = false }
+tzif = { version = "0.0.0", path = "utils/tzif", default-features = false }
 writeable = { version = "0.5.1", path = "utils/writeable/", default-features = false }
 yoke = { version = "0.7.1", path = "utils/yoke", default-features = false }
 yoke-derive = { version = "0.7.1", path = "utils/yoke/derive", default-features = false }
-zerovec = { version = "0.9.4", path = "utils/zerovec", default-features = false }
-zerovec-derive = { version = "0.9.4", path = "utils/zerovec/derive", default-features = false }
 zerofrom = { version = "0.1.1", path = "utils/zerofrom", default-features = false }
 zerofrom-derive = { version = "0.1.1", path = "utils/zerofrom/derive", default-features = false }
+zerovec = { version = "0.9.4", path = "utils/zerovec", default-features = false }
+zerovec-derive = { version = "0.9.4", path = "utils/zerovec/derive", default-features = false }
+bies = { version = "0.2.1", path = "experimental/bies", default-features = false }
+ixdtf = { version = "0.1.0", path = "experimental/ixdtf", default-features = false }
+zerotrie = { version = "0.0.0", path = "experimental/zerotrie", default-features = false }
 
+# 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
 
 # LTO is needed for WASM and other size-optimized builds,
 # and it improve the performance of benchmarks

components/collator/Cargo.toml

@@ -52,10 +52,6 @@ serde = ["dep:serde", "zerovec/serde", "icu_properties/serde", "icu_normalizer/s
 datagen = ["serde", "dep:databake", "zerovec/databake", "icu_properties/datagen", "icu_normalizer/datagen", "icu_collections/databake"]
 compiled_data = ["dep:icu_collator_data", "icu_normalizer/compiled_data", "dep:icu_locid_transform"]
 
-[[test]]
-name = "tests"
-path = "tests/tests.rs"
-
 [[bench]]
 name = "bench"
 harness = false

components/collections/Cargo.toml

@@ -69,7 +69,3 @@ path = "src/codepointtrie/benches/iai_cpt.rs"
 name = "inv_list"
 harness = false
 path = "src/codepointinvlist/benches/inv_list.rs"
-
-[[example]]
-name = "unicode_bmp_blocks_selector"
-path = "src/codepointinvlist/examples/unicode_bmp_blocks_selector.rs"

components/normalizer/Cargo.toml

@@ -52,10 +52,6 @@ datagen = ["serde", "dep:databake", "icu_collections/databake", "zerovec/databak
 experimental = []
 compiled_data = ["dep:icu_normalizer_data", "icu_properties/compiled_data"]
 
-[[test]]
-name = "tests"
-path = "tests/tests.rs"
-
 [[bench]]
 name = "bench"
 harness = false