From 7e093fc142498821140b37e1fc2b8a9c0b806da3 Mon Sep 17 00:00:00 2001
From: Robert Bastian <robertbastian@google.com>
Date: Thu, 20 Jul 2023 15:06:57 +0200
Subject: [PATCH] experimental_components

---
 provider/datagen/Cargo.toml | 16 ++++++++++++++--
 tools/make/data.toml        |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/provider/datagen/Cargo.toml b/provider/datagen/Cargo.toml
index 45347bac62c..5fe6ff41695 100644
--- a/provider/datagen/Cargo.toml
+++ b/provider/datagen/Cargo.toml
@@ -111,6 +111,12 @@ use_wasm = ["icu_codepointtrie_builder/wasm"]
 # rule based segmenter data will not be generated.
 use_icu4c = ["icu_codepointtrie_builder/icu4c"]
 networking = ["dep:ureq"]
+experimental_components = [
+    "icu_casemap",
+    "icu_compactdecimal",
+    "icu_displaynames",
+    "icu_relativetime",
+]
 
 [[bin]]
 name = "icu4x-datagen"
@@ -124,6 +130,12 @@ required-features = ["provider_fs", "use_wasm"]
 
 [package.metadata.cargo-all-features]
 # We don't need working CPT builders for check
-skip_feature_sets = [["use_icu4c"], ["use_wasm"]]
-always_include_features = ["icu_casemap", "icu_compactdecimal", "icu_displaynames", "icu_relativetime"]
+skip_feature_sets = [
+    ["use_icu4c"],
+    ["use_wasm"],
+    ["icu_casemap"],
+    ["icu_compactdecimal"],
+    ["icu_displaynames"],
+    ["icu_relativetime"],
+]
 max_combination_size = 3
diff --git a/tools/make/data.toml b/tools/make/data.toml
index 23c2b0487bf..065dff3ac62 100644
--- a/tools/make/data.toml
+++ b/tools/make/data.toml
@@ -23,7 +23,7 @@ args = [
     "test",
     "-p=icu_datagen",
     "--no-default-features",
-    "--features=provider_fs,use_wasm,rayon,icu_casemap,icu_compactdecimal,icu_displaynames,icu_relativetime",
+    "--features=provider_fs,use_wasm,rayon,experimental_components",
     "generate_json_and_verify_postcard",
     "--",
     "--nocapture"
@@ -86,11 +86,11 @@ script = '''
 exit_on_error true
 
 if array_is_empty ${@}
-    exec --fail-on-error cargo build -p icu_datagen --no-default-features --features rayon,provider_baked,bin,use_wasm,networking,icu_casemap,icu_displaynames,icu_relativetime,icu_compactdecimal --release
+    exec --fail-on-error cargo build -p icu_datagen --no-default-features --features rayon,provider_baked,bin,use_wasm,networking,experimental_components --release
     bin = set "target/release/icu4x-datagen"
     components = array components/calendar components/collator components/datetime components/decimal components/list components/locid_transform components/normalizer components/plurals components/properties components/segmenter components/timezone experimental/casemap experimental/compactdecimal experimental/displaynames experimental/relativetime
 else
-    exec --fail-on-error cargo build -p icu_datagen --no-default-features --features rayon,provider_baked,bin,use_wasm,networking,icu_casemap,icu_displaynames,icu_relativetime,icu_compactdecimal
+    exec --fail-on-error cargo build -p icu_datagen --no-default-features --features rayon,provider_baked,bin,use_wasm,networking,experimental_components
     bin = set "target/debug/icu4x-datagen"
     components = set ${@}
 end