Refactor props to all be in props module, remove most custom ULEs (#5555

) Some progress on #5127. Now there are only two `make_ule`s in zerovec, for enums. Followups from #5548
unicode-org · Sep 18, 2024 · 73d4f18 · 73d4f18
1 parent 4c28a99
commit 73d4f18
Show file tree

Hide file tree

Showing 28 changed files with 292 additions and 321 deletions.
diff --git a/components/properties/src/props.rs b/components/properties/src/props.rs
diff --git a/components/properties/src/provider.rs b/components/properties/src/provider.rs
@@ -17,7 +17,6 @@
 
 pub mod bidi;
 pub mod names;
-pub mod props;
 
 pub use names::{
     BidiClassNameToValueV1Marker, BidiClassValueToLongNameV1Marker,
@@ -41,6 +40,7 @@ pub use names::{
     WordBreakValueToShortNameV1Marker,
 };
 
+pub use crate::props::gc::GeneralCategoryULE;
 pub use bidi::BidiAuxiliaryPropertiesV1Marker;
 
 use crate::script::ScriptWithExt;

diff --git a/components/properties/src/provider/props.rs b/components/properties/src/provider/props.rs
diff --git a/components/properties/src/script.rs b/components/properties/src/script.rs
@@ -6,7 +6,6 @@
 //! values in an efficient structure.
 
 use crate::props::Script;
-use crate::provider::props::ScriptULE;
 use crate::provider::*;
 
 use core::iter::FromIterator;
@@ -51,7 +50,7 @@ impl ScriptWithExt {
 }
 
 impl AsULE for ScriptWithExt {
-    type ULE = ScriptULE;
+    type ULE = <u16 as AsULE>::ULE;
 
     #[inline]
     fn to_unaligned(self) -> Self::ULE {

diff --git a/provider/data/properties/data/bidi_class_v1_marker.rs.data b/provider/data/properties/data/bidi_class_v1_marker.rs.data