Unverified Commit 40a4c3b7 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

refactor(turbopack/next-api): Implement NonLocalValue for TracedDiGraph and…

refactor(turbopack/next-api): Implement NonLocalValue for TracedDiGraph and SingleModuleGraph (#74506)

This allows `SingleModuleGraph` to implement `NonLocalValue`, removing the 'local' opt-out on the `turbo_tasks::value` macro.
parent c6ac0b9f
...@@ -29,7 +29,7 @@ use crate::{ ...@@ -29,7 +29,7 @@ use crate::{
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ModuleSet(pub HashSet<ResolvedVc<Box<dyn Module>>>); pub struct ModuleSet(pub HashSet<ResolvedVc<Box<dyn Module>>>);
#[turbo_tasks::value(cell = "new", eq = "manual", into = "new", local)] #[turbo_tasks::value(cell = "new", eq = "manual", into = "new")]
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct SingleModuleGraph { pub struct SingleModuleGraph {
graph: TracedDiGraph<SingleModuleGraphNode, ChunkingType>, graph: TracedDiGraph<SingleModuleGraphNode, ChunkingType>,
...@@ -387,13 +387,18 @@ impl SingleModuleGraphNode { ...@@ -387,13 +387,18 @@ impl SingleModuleGraphNode {
} }
#[derive(Clone, Debug, ValueDebugFormat, Serialize, Deserialize)] #[derive(Clone, Debug, ValueDebugFormat, Serialize, Deserialize)]
struct TracedDiGraph<N: TraceRawVcs, E: TraceRawVcs>(DiGraph<N, E>); struct TracedDiGraph<N, E>(DiGraph<N, E>);
impl<N: TraceRawVcs, E: TraceRawVcs> Default for TracedDiGraph<N, E> { impl<N, E> Default for TracedDiGraph<N, E> {
fn default() -> Self { fn default() -> Self {
Self(Default::default()) Self(Default::default())
} }
} }
impl<N: TraceRawVcs, E: TraceRawVcs> TraceRawVcs for TracedDiGraph<N, E> {
impl<N, E> TraceRawVcs for TracedDiGraph<N, E>
where
N: TraceRawVcs,
E: TraceRawVcs,
{
fn trace_raw_vcs(&self, trace_context: &mut TraceRawVcsContext) { fn trace_raw_vcs(&self, trace_context: &mut TraceRawVcsContext) {
for node in self.0.node_weights() { for node in self.0.node_weights() {
node.trace_raw_vcs(trace_context); node.trace_raw_vcs(trace_context);
...@@ -403,13 +408,21 @@ impl<N: TraceRawVcs, E: TraceRawVcs> TraceRawVcs for TracedDiGraph<N, E> { ...@@ -403,13 +408,21 @@ impl<N: TraceRawVcs, E: TraceRawVcs> TraceRawVcs for TracedDiGraph<N, E> {
} }
} }
} }
impl<N: TraceRawVcs, E: TraceRawVcs> Deref for TracedDiGraph<N, E> {
impl<N, E> Deref for TracedDiGraph<N, E> {
type Target = DiGraph<N, E>; type Target = DiGraph<N, E>;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.0 &self.0
} }
} }
unsafe impl<N, E> NonLocalValue for TracedDiGraph<N, E>
where
N: NonLocalValue,
E: NonLocalValue,
{
}
#[derive(PartialEq, Eq, Debug)] #[derive(PartialEq, Eq, Debug)]
pub enum GraphTraversalAction { pub enum GraphTraversalAction {
/// Continue visiting children /// Continue visiting children
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment