Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions turbopack/crates/turbo-tasks/src/value_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,18 @@ use std::{
any::{Any, type_name},
fmt::{self, Debug, Display, Formatter},
hash::Hash,
sync::Arc,
};

use auto_hash_map::{AutoMap, AutoSet};
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;

Expand All @@ -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
Expand Down Expand Up @@ -113,7 +106,6 @@ impl ValueType {
global_name,
traits: AutoSet::new(),
trait_methods: AutoMap::new(),
magic_serialization: None,
any_serialization: None,
raw_cell: <T::CellMode as VcCellMode<T>>::raw_cell,
}
Expand All @@ -130,24 +122,11 @@ impl ValueType {
global_name,
traits: AutoSet::new(),
trait_methods: AutoMap::new(),
magic_serialization: None,
any_serialization: Some((any_as_serialize::<T>, AnyDeserializeSeed::new::<T>())),
raw_cell: <T::CellMode as VcCellMode<T>>::raw_cell,
}
}

pub fn magic_as_serializable<'a>(
&self,
arc: &'a Arc<dyn MagicAny>,
) -> 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<dyn Any + Sync + Send>,
Expand All @@ -163,10 +142,6 @@ impl ValueType {
self.any_serialization.is_some()
}

pub fn get_magic_deserialize_seed(&self) -> Option<MagicAnyDeserializeSeed> {
self.magic_serialization.map(|s| s.1)
}

pub fn get_any_deserialize_seed(&self) -> Option<AnyDeserializeSeed> {
self.any_serialization.map(|s| s.1)
}
Expand Down
Loading