properties

components/experimental/Cargo.toml

@@ -33,7 +33,7 @@ icu_list = { workspace = true }
 icu_locale = { workspace = true }
 icu_normalizer = { workspace = true }
 icu_plurals = { workspace = true }
-icu_properties = { workspace = true }
+icu_properties = { workspace = true, features = ["alloc"] }
 
 databake = { workspace = true, optional = true, features = ["derive"] }
 either = { workspace = true }

components/icu/Cargo.toml

@@ -30,7 +30,7 @@ icu_list = { workspace = true }
 icu_locale = { workspace = true }
 icu_normalizer = { workspace = true }
 icu_plurals = { workspace = true }
-icu_properties = { workspace = true }
+icu_properties = { workspace = true, features = ["alloc"] }
 icu_segmenter = { workspace = true }
 icu_timezone = { workspace = true }
 icu_experimental = { workspace = true, optional = true }

components/properties/Cargo.toml

@@ -43,3 +43,4 @@ serde = ["dep:serde", "icu_locale_core/serde", "potential_utf/serde", "zerovec/s
 datagen = ["serde", "dep:databake", "potential_utf/databake", "zerovec/databake", "icu_collections/databake", "icu_locale_core/databake", "zerotrie/databake"]
 unicode_bidi = [ "dep:unicode-bidi" ]
 compiled_data = ["dep:icu_properties_data"]
+alloc = ["zerovec/alloc", "icu_collections/alloc"]

components/properties/src/code_point_map.rs

@@ -2,14 +2,15 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
+#[cfg(feature = "alloc")]
+use crate::code_point_set::CodePointSetData;
 use crate::props::GeneralCategory;
+use crate::props::GeneralCategoryGroup;
 use crate::provider::*;
-use crate::{code_point_set::CodePointSetData, props::GeneralCategoryGroup};
 use core::ops::RangeInclusive;
 use icu_collections::codepointtrie::{CodePointMapRange, CodePointTrie, TrieValue};
 use icu_provider::marker::ErasedMarker;
 use icu_provider::prelude::*;
-use zerovec::ule::UleError;
 
 /// A wrapper around code point map data.
 ///
@@ -85,7 +86,8 @@ impl<T: TrieValue> CodePointMapData<T> {
     /// assert_eq!(gc.get('木'), GeneralCategory::OtherLetter as u8);  // U+6728
     /// assert_eq!(gc.get('🎃'), GeneralCategory::OtherSymbol as u8);  // U+1F383 JACK-O-LANTERN
     /// ```
-    pub fn try_into_converted<P>(self) -> Result<CodePointMapData<P>, UleError>
+    #[cfg(feature = "alloc")]
+    pub fn try_into_converted<P>(self) -> Result<CodePointMapData<P>, zerovec::ule::UleError>
     where
         P: TrieValue,
     {
@@ -186,6 +188,7 @@ impl<'a, T: TrieValue> CodePointMapDataBorrowed<'a, T> {
     /// assert!(other_letter_set.contains('木')); // U+6728
     /// assert!(!other_letter_set.contains('🎃')); // U+1F383 JACK-O-LANTERN
     /// ```
+    #[cfg(feature = "alloc")]
     pub fn get_set_for_value(self, value: T) -> CodePointSetData {
         let set = self.map.get_set_for_value(value);
         CodePointSetData::from_code_point_inversion_list(set)
@@ -263,6 +266,7 @@ impl<'a, T: TrieValue> CodePointMapDataBorrowed<'a, T> {
 
 impl CodePointMapDataBorrowed<'_, GeneralCategory> {
     /// TODO
+    #[cfg(feature = "alloc")]
     pub fn get_set_for_value_group(self, value: GeneralCategoryGroup) -> crate::CodePointSetData {
         let matching_gc_ranges = self
             .iter_ranges()

components/properties/src/lib.rs

@@ -68,6 +68,7 @@
 )]
 #![warn(missing_docs)]
 
+#[cfg(feature = "alloc")]
 extern crate alloc;
 
 mod code_point_set;

components/properties/src/props.rs

@@ -3004,7 +3004,7 @@ make_emoji_set! {
 #[cfg(test)]
 mod test_enumerated_property_completeness {
     use super::*;
-    use alloc::collections::BTreeMap;
+    use std::collections::BTreeMap;
 
     fn check_enum<'a, T: NamedEnumeratedProperty>(
         lookup: &crate::provider::names::PropertyValueNameToEnumMap<'static>,

components/properties/src/provider.rs

@@ -45,7 +45,7 @@ use icu_collections::codepointinvliststringlist::CodePointInversionListAndString
 use icu_collections::codepointtrie::{CodePointMapRange, CodePointTrie, TrieValue};
 use icu_provider::prelude::*;
 use zerofrom::ZeroFrom;
-use zerovec::{ule::UleError, VarZeroVec, ZeroSlice};
+use zerovec::{VarZeroVec, ZeroSlice};
 
 #[cfg(feature = "compiled_data")]
 #[derive(Debug)]
@@ -528,7 +528,10 @@ impl<'data, T: TrieValue> PropertyCodePointMap<'data, T> {
     }
 
     #[inline]
-    pub(crate) fn try_into_converted<P>(self) -> Result<PropertyCodePointMap<'data, P>, UleError>
+    #[cfg(feature = "alloc")]
+    pub(crate) fn try_into_converted<P>(
+        self,
+    ) -> Result<PropertyCodePointMap<'data, P>, zerovec::ule::UleError>
     where
         P: TrieValue,
     {
@@ -540,6 +543,7 @@ impl<'data, T: TrieValue> PropertyCodePointMap<'data, T> {
     }
 
     #[inline]
+    #[cfg(feature = "alloc")]
     pub(crate) fn get_set_for_value(&self, value: T) -> CodePointInversionList<'static> {
         match *self {
             Self::CodePointTrie(ref t) => t.get_set_for_value(value),

components/properties/src/script.rs

@@ -8,8 +8,10 @@
 use crate::props::Script;
 use crate::provider::*;
 
+#[cfg(feature = "alloc")]
 use core::iter::FromIterator;
 use core::ops::RangeInclusive;
+#[cfg(feature = "alloc")]
 use icu_collections::codepointinvlist::CodePointInversionList;
 use icu_provider::prelude::*;
 use zerovec::{ule::AsULE, ZeroSlice};
@@ -641,6 +643,7 @@ impl<'a> ScriptWithExtensionsBorrowed<'a> {
     /// assert!(syriac.contains('\u{1DFA}')); // COMBINING DOT BELOW LEFT
     /// assert!(!syriac.contains('\u{1DFB}')); // COMBINING DELETION MARK
     /// ```
+    #[cfg(feature = "alloc")]
     pub fn get_script_extensions_set(self, script: Script) -> CodePointInversionList<'a> {
         CodePointInversionList::from_iter(self.get_script_extensions_ranges(script))
     }

ffi/capi/Cargo.toml

@@ -139,7 +139,7 @@ icu_list = { workspace = true, optional = true }
 icu_locale = { workspace = true, optional = true }
 icu_normalizer = { workspace = true, optional = true }
 icu_plurals = { workspace = true, optional = true }
-icu_properties = { workspace = true, features = ["unicode_bidi"], optional = true }
+icu_properties = { workspace = true, features = ["alloc", "unicode_bidi"], optional = true }
 icu_segmenter = { workspace = true, features = ["auto"], optional = true }
 icu_timezone = { workspace = true, features = ["ixdtf"], optional = true }
 icu_experimental = { workspace = true, optional = true }

tools/noalloctest/Cargo.toml

@@ -22,6 +22,7 @@ publish = false
 # Dependencies that should be no-alloc should go here
 icu_collections = { workspace = true }
 icu_locale_core = { workspace = true }
+icu_properties = { workspace = true }
 icu_provider = { workspace = true }
 icu_provider_baked = { workspace = true }
 litemap = { workspace = true }