From 999f8dbe5012dfcd979fa723bcf763c67aecdbcf Mon Sep 17 00:00:00 2001 From: Benjamin Woodruff Date: Tue, 28 Oct 2025 10:53:16 -0700 Subject: [PATCH] chore: Remove some dead MagicAny serialization code from turbo_tasks::value --- .../crates/turbo-tasks/src/value_type.rs | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/turbopack/crates/turbo-tasks/src/value_type.rs b/turbopack/crates/turbo-tasks/src/value_type.rs index 5546d03438c66..c97188ebb1c03 100644 --- a/turbopack/crates/turbo-tasks/src/value_type.rs +++ b/turbopack/crates/turbo-tasks/src/value_type.rs @@ -2,7 +2,6 @@ use std::{ any::{Any, type_name}, fmt::{self, Debug, Display, Formatter}, hash::Hash, - sync::Arc, }; use auto_hash_map::{AutoMap, AutoSet}; @@ -10,16 +9,11 @@ use serde::{Deserialize, Serialize}; use tracing::Span; use crate::{ - RawVc, VcValueType, - id::TraitTypeId, - macro_helpers::NativeFunction, - magic_any::{AnyDeserializeSeed, MagicAny, MagicAnyDeserializeSeed}, - registry, - task::shared_reference::TypedSharedReference, + RawVc, VcValueType, id::TraitTypeId, macro_helpers::NativeFunction, + magic_any::AnyDeserializeSeed, registry, task::shared_reference::TypedSharedReference, vc::VcCellMode, }; -type MagicSerializationFn = fn(&dyn MagicAny) -> &dyn erased_serde::Serialize; type AnySerializationFn = fn(&(dyn Any + Sync + Send)) -> &dyn erased_serde::Serialize; type RawCellFactoryFn = fn(TypedSharedReference) -> RawVc; @@ -43,7 +37,6 @@ pub struct ValueType { trait_methods: AutoMap<&'static TraitMethod, &'static NativeFunction>, /// Functors for serialization - magic_serialization: Option<(MagicSerializationFn, MagicAnyDeserializeSeed)>, any_serialization: Option<(AnySerializationFn, AnyDeserializeSeed)>, /// An implementation of @@ -113,7 +106,6 @@ impl ValueType { global_name, traits: AutoSet::new(), trait_methods: AutoMap::new(), - magic_serialization: None, any_serialization: None, raw_cell: >::raw_cell, } @@ -130,24 +122,11 @@ impl ValueType { global_name, traits: AutoSet::new(), trait_methods: AutoMap::new(), - magic_serialization: None, any_serialization: Some((any_as_serialize::, AnyDeserializeSeed::new::())), raw_cell: >::raw_cell, } } - pub fn magic_as_serializable<'a>( - &self, - arc: &'a Arc, - ) -> Option<&'a dyn erased_serde::Serialize> { - if let Some(s) = self.magic_serialization { - let r: &dyn MagicAny = arc; - Some((s.0)(r)) - } else { - None - } - } - pub fn any_as_serializable<'a>( &self, arc: &'a triomphe::Arc, @@ -163,10 +142,6 @@ impl ValueType { self.any_serialization.is_some() } - pub fn get_magic_deserialize_seed(&self) -> Option { - self.magic_serialization.map(|s| s.1) - } - pub fn get_any_deserialize_seed(&self) -> Option { self.any_serialization.map(|s| s.1) }