bake

Author: robertbastian

Cargo.lock

@@ -10,19 +10,14 @@ publish = false
 
 [features]
 default = ["baked"]
-baked = []
-datagen = ["dep:databake", "icu_provider/export", "icu_collections/databake"]
+baked = ["dep:zerovec"]
+datagen = []
 
 [dependencies]
-icu_locale = { workspace = true }
 icu_properties = { workspace = true }
-icu_collections = { workspace = true, features = ["serde"] }
-icu_provider = { workspace = true, features = ["alloc"] }
-yoke = { workspace = true, features = ["derive"] }
-zerofrom = { workspace = true }
-unicode-bidi = { workspace = true, features = ["smallvec"] }
-serde = { workspace = true }
-databake = { workspace = true, features = ["derive"], optional = true }
+icu_collections = { workspace = true }
+unicode-bidi = { workspace = true }
+zerovec = { workspace = true, optional = true }
 
 [lints]
 workspace = true

unicode_data/Cargo.toml

@@ -8,67 +8,27 @@
 
 #![no_std]
 
-use icu_collections::codepointtrie::CodePointTrie;
 use icu_properties::props::{GeneralCategory, GraphemeClusterBreak, Script};
-use zerofrom::ZeroFrom;
 
-/// Baked data for the `CompositePropsV1` data provider.
+/// Baked data.
 #[cfg(feature = "baked")]
 pub mod generated;
 
-/// A data provider of `CompositePropsV1`.
-#[derive(Clone, Debug, Eq, PartialEq, yoke::Yokeable, ZeroFrom)]
-#[cfg_attr(feature = "datagen", derive(databake::Bake))]
-#[cfg_attr(feature = "datagen", databake(path = composite_props_marker))]
-pub struct CompositePropsV1Data<'data> {
-    trie: CodePointTrie<'data, u32>,
-}
-
-#[cfg(feature = "datagen")]
-icu_provider::data_struct!(CompositePropsV1Data<'_>);
-
-impl serde::Serialize for CompositePropsV1Data<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_newtype_struct("CompositePropsV1Data", &self.trie)
-    }
-}
+/// Lookup for [`Properties`]
+#[derive(Clone, Debug, Copy)]
+pub struct CompositeProps;
 
-impl<'de> serde::Deserialize<'de> for CompositePropsV1Data<'de> {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let trie = CodePointTrie::deserialize(deserializer)?;
-        Ok(CompositePropsV1Data { trie })
-    }
-}
-
-impl<'data> CompositePropsV1Data<'data> {
-    /// Creates a new `CompositePropsV1Data` from a `CodePointTrie`.
-    pub fn new(trie: CodePointTrie<'data, u32>) -> Self {
-        Self { trie }
-    }
-}
-
-icu_provider::data_marker!(
-    /// Marker for the composite multi-property trie (locale-invariant singleton)
-    CompositePropsV1,
-    CompositePropsV1Data<'static>,
-    is_singleton = true,
-);
-
-impl CompositePropsV1Data<'_> {
+#[cfg(feature = "baked")]
+impl CompositeProps {
     /// Returns the properties for a given character.
     #[inline(always)]
     pub fn properties(&self, ch: u32) -> Properties {
-        Properties(self.trie.get32(ch))
+        Properties(generated::COMPOSITE.get32(ch))
     }
 }
 
-impl unicode_bidi::BidiDataSource for CompositePropsV1Data<'_> {
+#[cfg(feature = "baked")]
+impl unicode_bidi::BidiDataSource for CompositeProps {
     fn bidi_class(&self, cp: char) -> unicode_bidi::BidiClass {
         self.properties(cp as u32).bidi_class()
     }

unicode_data/src/generated/composite/mod.rs

@@ -10,21 +10,19 @@ publish = false
 
 [dependencies]
 icu_locale = { workspace = true }
-icu_properties = { workspace = true, features = ["datagen"] }
+icu_properties = { workspace = true, features = ["compiled_data"] }
 icu_collections = { workspace = true, features = ["databake", "serde"] }
 icu_provider = { workspace = true, features = ["baked"] }
 icu_provider_source = { workspace = true, features = ["networking", "use_wasm"] }
 yoke = { workspace = true, features = ["derive"] }
 zerofrom = { workspace = true }
-unicode-bidi = { workspace = true, features = ["smallvec"] }
 unicode_data = { workspace = true, default-features = false, features = ["datagen"] }
-icu_normalizer = { workspace = true }
+icu_normalizer = { workspace = true, features = ["compiled_data"] }
 icu_segmenter = { workspace = true }
-icu_provider_export = { workspace = true, features = ["baked_exporter", "blob_exporter"] }
+icu_provider_export = { workspace = true, features = ["baked_exporter"] }
 serde = { workspace = true, features = ["derive"] }
 databake = { workspace = true, features = ["derive"] }
 icu_codepointtrie_builder = { workspace = true, features = ["wasm"] }
-icu_provider_adapters = { workspace = true, features = ["export"] }
 
 [lints]
 workspace = true