Skip to content

Commit 73d4f18

Browse files
authored
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
1 parent 4c28a99 commit 73d4f18

28 files changed

+292
-321
lines changed

components/properties/src/props.rs

Lines changed: 266 additions & 24 deletions
Large diffs are not rendered by default.

components/properties/src/provider.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
1818
pub mod bidi;
1919
pub mod names;
20-
pub mod props;
2120

2221
pub use names::{
2322
BidiClassNameToValueV1Marker, BidiClassValueToLongNameV1Marker,
@@ -41,6 +40,7 @@ pub use names::{
4140
WordBreakValueToShortNameV1Marker,
4241
};
4342

43+
pub use crate::props::gc::GeneralCategoryULE;
4444
pub use bidi::BidiAuxiliaryPropertiesV1Marker;
4545

4646
use crate::script::ScriptWithExt;

components/properties/src/provider/props.rs

Lines changed: 0 additions & 270 deletions
This file was deleted.

components/properties/src/script.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
//! values in an efficient structure.
77
88
use crate::props::Script;
9-
use crate::provider::props::ScriptULE;
109
use crate::provider::*;
1110

1211
use core::iter::FromIterator;
@@ -51,7 +50,7 @@ impl ScriptWithExt {
5150
}
5251

5352
impl AsULE for ScriptWithExt {
54-
type ULE = ScriptULE;
53+
type ULE = <u16 as AsULE>::ULE;
5554

5655
#[inline]
5756
fn to_unaligned(self) -> Self::ULE {

provider/data/properties/data/bidi_class_v1_marker.rs.data

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)