serialize ids as u32s

Author: lukesandberg

turbopack/crates/turbo-tasks/src/id.rs

@@ -39,7 +39,14 @@ macro_rules! define_id {
             pub const unsafe fn new_unchecked(id: $primitive) -> Self {
                 Self { id: unsafe { NonZero::<$primitive>::new_unchecked(id) } }
             }
-
+            /// Constructs a wrapper type from the numeric identifier.
+            ///
+            /// # Safety
+            ///
+            /// The passed `id` must not be zero.
+            pub fn new(id: $primitive) -> Option<Self> {
+                NonZero::<$primitive>::new(id).map(|id| Self{id})
+            }
             /// Allows `const` conversion to a [`NonZeroU64`], useful with
             /// [`crate::id_factory::IdFactory::new_const`].
             pub const fn to_non_zero_u64(self) -> NonZeroU64 {
@@ -153,13 +160,13 @@ impl TaskId {
 }
 
 macro_rules! make_serializable {
-    ($ty:ty, $get_global_name:path, $get_id:path, $visitor_name:ident) => {
+    ($ty:ty, $get_global_name:path, $visitor_name:ident) => {
         impl Serialize for $ty {
             fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where
                 S: serde::Serializer,
             {
-                serializer.serialize_str($get_global_name(*self))
+                serializer.serialize_u32(self.id.into())
             }
         }
 
@@ -168,7 +175,7 @@ macro_rules! make_serializable {
             where
                 D: serde::Deserializer<'de>,
             {
-                deserializer.deserialize_str($visitor_name)
+                deserializer.deserialize_u32($visitor_name)
             }
         }
 
@@ -178,14 +185,15 @@ macro_rules! make_serializable {
             type Value = $ty;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-                formatter.write_str(concat!("a name of a registered ", stringify!($ty)))
+                formatter.write_str(concat!("an id of a registered ", stringify!($ty)))
             }
 
-            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+            fn visit_u32<E>(self, v: u32) -> Result<Self::Value, E>
             where
                 E: serde::de::Error,
             {
-                $get_id(v).ok_or_else(|| E::unknown_variant(v, &[]))
+                Self::Value::new(v)
+                    .ok_or_else(|| E::unknown_variant(&format!("{v}"), &["a non zero u32"]))
             }
         }
 
@@ -203,12 +211,10 @@ macro_rules! make_serializable {
 make_serializable!(
     ValueTypeId,
     registry::get_value_type_global_name,
-    registry::get_value_type_id_by_global_name,
     ValueTypeVisitor
 );
 make_serializable!(
     TraitTypeId,
     registry::get_trait_type_global_name,
-    registry::get_trait_type_id_by_global_name,
     TraitTypeVisitor
 );

turbopack/crates/turbo-tasks/src/registry.rs

@@ -145,13 +145,6 @@ pub fn get_trait_type_id(trait_type: &'static TraitType) -> TraitTypeId {
     }
 }
 
-pub fn get_trait_type_id_by_global_name(global_name: &str) -> Option<TraitTypeId> {
-    TRAITS
-        .global_name_to_trait
-        .get(global_name)
-        .map(|(id, _)| *id)
-}
-
 pub fn get_trait(id: TraitTypeId) -> &'static TraitType {
     TRAITS.id_to_trait[*id as usize - 1]
 }