Removing baked crate (#1900)

unicode-org · May 18, 2022 · 1459779 · 1459779
1 parent c351282
commit 1459779
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 369 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/provider/testdata/Cargo.toml b/provider/testdata/Cargo.toml
@@ -147,7 +147,6 @@ denylist = ["bench"]
 icu_provider = { version = "0.6", path = "../core" }
 icu_provider_blob = { version = "0.6", path = "../blob", optional = true }
 icu_provider_fs = { version = "0.6", path = "../fs", optional = true }
-baked = { path = "./data/baked", optional = true }
 
 # bin feature
 clap = { version = "2.33", optional = true }
@@ -167,6 +166,9 @@ serde_json = { version = "1.0", optional = true, default-features = false, featu
 displaydoc = { version = "0.2.3", default-features = false, optional = true }
 writeable = { version = "0.4", path = "../../utils/writeable", optional = true }
 
+# crabbake deps
+icu_list = { version = "0.6", path = "../../components/list", optional = true }
+
 [dev-dependencies]
 icu_plurals = { version = "0.6", path = "../../components/plurals" }
 
@@ -184,7 +186,7 @@ metadata = [
 ]
 fs = ["icu_provider/deserialize_json", "icu_provider_fs", "std"]
 static = ["icu_provider_blob"]
-baked = ["dep:baked"]
+baked = ["icu_list"]
 std = []
 bin = [
     "clap",

diff --git a/provider/testdata/data/baked/Cargo.toml b/provider/testdata/data/baked/Cargo.toml
diff --git a/provider/testdata/data/baked/LICENSE b/provider/testdata/data/baked/LICENSE
diff --git a/...stdata/data/baked/src/data/list/and_v1.rs → provider/testdata/data/baked/list/and_v1.rs b/...stdata/data/baked/src/data/list/and_v1.rs → provider/testdata/data/baked/list/and_v1.rs
diff --git a/.../testdata/data/baked/src/data/list/mod.rs → provider/testdata/data/baked/list/mod.rs b/.../testdata/data/baked/src/data/list/mod.rs → provider/testdata/data/baked/list/mod.rs
diff --git a/...estdata/data/baked/src/data/list/or_v1.rs → provider/testdata/data/baked/list/or_v1.rs b/...estdata/data/baked/src/data/list/or_v1.rs → provider/testdata/data/baked/list/or_v1.rs
diff --git a/...tdata/data/baked/src/data/list/unit_v1.rs → provider/testdata/data/baked/list/unit_v1.rs b/...tdata/data/baked/src/data/list/unit_v1.rs → provider/testdata/data/baked/list/unit_v1.rs
diff --git a/provider/testdata/data/baked/src/data/mod.rs → provider/testdata/data/baked/mod.rs b/provider/testdata/data/baked/src/data/mod.rs → provider/testdata/data/baked/mod.rs
diff --git a/provider/testdata/data/baked/src/lib.rs b/provider/testdata/data/baked/src/lib.rs
diff --git a/provider/testdata/src/bin/datagen.rs b/provider/testdata/src/bin/datagen.rs
@@ -31,7 +31,7 @@ fn main() {
     ));
 
     let mod_out = icu_datagen::Out::Module {
-        mod_directory: paths::data_root().join("baked/src/data"),
+        mod_directory: paths::data_root().join("baked"),
         pretty: true,
         insert_feature_gates: false,
     };

diff --git a/provider/testdata/src/lib.rs b/provider/testdata/src/lib.rs
@@ -125,6 +125,12 @@ pub fn get_smaller_postcard_provider() -> icu_provider_blob::StaticDataProvider
     .unwrap()
 }
 
+#[cfg(feature = "baked")]
+mod baked {
+    #![allow(clippy::unwrap_used, clippy::exhaustive_structs)]
+    include!(concat!(env!("CARGO_MANIFEST_DIR"), "/data/baked/mod.rs"));
+}
+
 #[cfg(feature = "baked")]
 pub fn get_baked_provider() -> &'static baked::BakedDataProvider {
     baked::PROVIDER

diff --git a/tools/scripts/tidy.toml b/tools/scripts/tidy.toml
@@ -107,7 +107,7 @@ script = '''
 exit_on_error true
 
 glob_pattern = set "./**/Cargo.toml"
-skip_paths = set_new "provider/testdata/data/baked/Cargo.toml"
+skip_paths = set_new
 
 template = canonicalize README.tpl