From 801fb303ec17c8f3ecb620105e9beca5b700338c Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Fri, 12 May 2023 10:51:39 -0700
Subject: [PATCH] Use DataPayload::cast() where possible (#3429)

---
 components/properties/src/props.rs | 8 ++++----
 components/properties/src/sets.rs  | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/components/properties/src/props.rs b/components/properties/src/props.rs
index ebf57b914d7..4cc1de1ac8c 100644
--- 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
index 4a7b7b373fd..6308b373bc5 100644
--- 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`]