Use DataPayload::cast() where possible (#3429)

unicode-org · May 12, 2023 · 801fb30 · 801fb30
1 parent 84f5014
commit 801fb30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/components/properties/src/props.rs b/components/properties/src/props.rs
@@ -112,7 +112,7 @@ impl<T: TrieValue> PropertyValueNameToEnumMapper<T> {
  M: DataMarker<Yokeable = PropertyValueNameToEnumMapV1<'static>>,
  {
  Self {
- map: data.map_project(|m, _| m),
+ map: data.cast(),
  markers: PhantomData,
  }
  }
@@ -329,7 +329,7 @@ impl<T: TrieValue> PropertyEnumToValueNameSparseMapper<T> {
  M: DataMarker<Yokeable = PropertyEnumToValueNameSparseMapV1<'static>>,
  {
  Self {
- map: data.map_project(|m, _| m),
+ map: data.cast(),
  markers: PhantomData,
  }
  }
@@ -437,7 +437,7 @@ impl<T: TrieValue> PropertyEnumToValueNameLinearMapper<T> {
  M: DataMarker<Yokeable = PropertyEnumToValueNameLinearMapV1<'static>>,
  {
  Self {
- map: data.map_project(|m, _| m),
+ map: data.cast(),
  markers: PhantomData,
  }
  }
@@ -531,7 +531,7 @@ impl<T: TrieValue> PropertyEnumToValueNameLinearTiny4Mapper<T> {
  M: DataMarker<Yokeable = PropertyEnumToValueNameLinearTiny4MapV1<'static>>,
  {
  Self {
- map: data.map_project(|m, _| m),
+ map: data.cast(),
  markers: PhantomData,
  }
  }

diff --git a/components/properties/src/sets.rs b/components/properties/src/sets.rs
@@ -76,9 +76,7 @@ impl CodePointSetData {
  where
  M: DataMarker<Yokeable = PropertyCodePointSetV1<'static>>,
  {
- Self {
- data: data.map_project(|m, _| m),
- }
+ Self { data: data.cast() }
  }
 
  /// Construct a new owned [`CodePointInversionList`]
@@ -247,9 +245,7 @@ impl UnicodeSetData {
  where
  M: DataMarker<Yokeable = PropertyUnicodeSetV1<'static>>,
  {
- Self {
- data: data.map_project(|m, _| m),
- }
+ Self { data: data.cast() }
  }
 
  /// Construct a new owned [`CodePointInversionListAndStringList`]