mirror of
https://github.com/hanzoai/next.js.git
synced 2026-10-30 14:46:38 +00:00
### What? Remove the `Vc::resolve()` method and migrate all ~37 callsites across the turbopack and next crates to use `Vc::to_resolved()` instead. ### Why? `Vc::resolve()` returned `Result<Vc<T>>` — a resolved `Vc` with no static guarantee that it is resolved. This is a footgun: the type is indistinguishable from any other unresolved `Vc<T>`, so it's easy to accidentally lose the "resolved" property at a type boundary or store it in a struct without the compiler enforcing invariants. `Vc::to_resolved()` returns `Result<ResolvedVc<T>>`, which statically encodes the resolved guarantee in the type. `ResolvedVc<T>` implements `Deref<Target = Vc<T>>`, so it coerces seamlessly to `Vc<T>` at call sites that still need the plain type. Removing `Vc::resolve()` eliminates this footgun entirely and pushes callers toward the type-safe API. ### How? - Removed the `Vc::resolve()` method from `turbo-tasks/src/vc/mod.rs`. - Updated `Vc::to_resolved()` to construct the inner `Vc` directly via `self.node.resolve()` rather than calling `self.resolve()`. - Updated `Vc::debug_identifier` to go through `to_resolved()`. - Updated `TaskInput::resolve_input` for `Vc<T>` to use `to_resolved()`. - Updated all callsites across turbopack-core, turbopack-ecmascript, turbopack-resolve, turbopack-browser, turbopack-css, turbopack-node, turbopack-ecmascript-runtime, next-api, next-core, and test/fuzz files: - Where `ResolvedVc<T>` is usable (deref coercion handles method calls, or the value is stored in a `HashMap` etc.), simply replaced `.resolve()` with `.to_resolved()`. - Where a plain `Vc<T>` is strictly required by a callee signature, dereferenced with `*x.to_resolved().await?`. - Updated the `AfterResolvePluginWithCondition` type alias in `resolve/mod.rs` to use `ResolvedVc<AfterResolvePluginCondition>` now that the tuple member is produced by `to_resolved()`. - Updated doc comments referencing `Vc::resolve` to point to `Vc::to_resolved`. Verified with `cargo check --all-targets` — compiles cleanly with no errors. --------- Co-authored-by: Tobias Koppers <[email protected]> Co-authored-by: Claude <[email protected]>
171 lines
4.5 KiB
Rust
171 lines
4.5 KiB
Rust
#![feature(arbitrary_self_types)]
|
|
#![feature(arbitrary_self_types_pointers)]
|
|
#![allow(clippy::needless_return)] // tokio macro-generated code doesn't respect this
|
|
|
|
use std::sync::Arc;
|
|
|
|
use anyhow::Result;
|
|
use bincode::{Decode, Encode};
|
|
use turbo_tasks::{NonLocalValue, State, TaskInput, Vc, trace::TraceRawVcs};
|
|
use turbo_tasks_testing::{Registration, register, run_once};
|
|
|
|
static REGISTRATION: Registration = register!();
|
|
|
|
#[derive(
|
|
Clone, Debug, PartialEq, Eq, Hash, NonLocalValue, TraceRawVcs, TaskInput, Encode, Decode,
|
|
)]
|
|
pub struct TaskReferenceSpec {
|
|
task: u16,
|
|
chain: u8,
|
|
read: bool,
|
|
read_strongly_consistent: bool,
|
|
}
|
|
|
|
#[derive(
|
|
Clone, Debug, PartialEq, Eq, Hash, NonLocalValue, TraceRawVcs, TaskInput, Encode, Decode,
|
|
)]
|
|
pub struct TaskSpec {
|
|
references: Vec<TaskReferenceSpec>,
|
|
children: u8,
|
|
change: Option<Box<TaskSpec>>,
|
|
}
|
|
|
|
#[turbo_tasks::value(transparent)]
|
|
struct Iteration(State<usize>);
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_graph_bug() {
|
|
let mut nonce = 0;
|
|
run_once(®ISTRATION, move || {
|
|
// pass a nonce to re-run the test body on every turbo-tasks restart
|
|
nonce += 1;
|
|
async move {
|
|
test_graph_bug_operation(nonce)
|
|
.read_strongly_consistent()
|
|
.await
|
|
}
|
|
})
|
|
.await
|
|
.unwrap()
|
|
}
|
|
|
|
#[turbo_tasks::function(operation)]
|
|
async fn test_graph_bug_operation(nonce: u32) -> Result<Vc<()>> {
|
|
let _ = nonce; // ensure the nonce is part of our cache key
|
|
|
|
let spec = vec![
|
|
TaskSpec {
|
|
references: vec![TaskReferenceSpec {
|
|
task: 1,
|
|
chain: 0,
|
|
read: false,
|
|
read_strongly_consistent: false,
|
|
}],
|
|
children: 0,
|
|
change: Some(Box::new(TaskSpec {
|
|
references: vec![TaskReferenceSpec {
|
|
task: 1,
|
|
chain: 254,
|
|
read: false,
|
|
read_strongly_consistent: false,
|
|
}],
|
|
children: 0,
|
|
change: None,
|
|
})),
|
|
},
|
|
TaskSpec {
|
|
references: vec![],
|
|
children: 0,
|
|
change: None,
|
|
},
|
|
];
|
|
|
|
let it = *create_iteration().to_resolved().await?;
|
|
it.await?.set(0);
|
|
println!("🚀 Initial");
|
|
let task = run_task(Arc::new(spec), it, 0);
|
|
task.strongly_consistent().await?;
|
|
println!("🚀 Set iteration to 1");
|
|
it.await?.set(1);
|
|
task.strongly_consistent().await?;
|
|
println!("🚀 Finished strongly consistent wait");
|
|
|
|
Ok(Vc::cell(()))
|
|
}
|
|
|
|
#[turbo_tasks::function]
|
|
fn create_iteration() -> Vc<Iteration> {
|
|
Vc::cell(State::new(0))
|
|
}
|
|
|
|
#[turbo_tasks::function]
|
|
async fn run_task_chain(
|
|
spec: Arc<Vec<TaskSpec>>,
|
|
iteration: Vc<Iteration>,
|
|
from: u16,
|
|
ref_index: usize,
|
|
to: u16,
|
|
chain: u8,
|
|
) -> Result<Vc<()>> {
|
|
println!("run_task_chain(from: {from}, ref_index: {ref_index}, to: {to}, chain: {chain})");
|
|
if chain > 0 {
|
|
run_task_chain(spec, iteration, from, ref_index, to, chain - 1).await?;
|
|
} else {
|
|
run_task(spec, iteration, to).await?;
|
|
}
|
|
Ok(Vc::cell(()))
|
|
}
|
|
|
|
#[turbo_tasks::function]
|
|
async fn run_task(
|
|
spec: Arc<Vec<TaskSpec>>,
|
|
iteration: Vc<Iteration>,
|
|
task_index: u16,
|
|
) -> Result<Vc<()>> {
|
|
println!("run_task(task_index: {task_index})");
|
|
let mut task = &spec[task_index as usize];
|
|
if task.change.is_some() {
|
|
let iteration = iteration.await?;
|
|
let it = *iteration.get();
|
|
for _ in 0..it {
|
|
task = if let Some(change) = &task.change {
|
|
change
|
|
} else {
|
|
task
|
|
};
|
|
}
|
|
}
|
|
for i in 0..task.children {
|
|
run_task_child(task_index, i).await?;
|
|
}
|
|
for (i, reference) in task.references.iter().enumerate() {
|
|
let call = if reference.chain > 0 {
|
|
run_task_chain(
|
|
spec.clone(),
|
|
iteration,
|
|
task_index,
|
|
i,
|
|
reference.task,
|
|
reference.chain,
|
|
)
|
|
} else {
|
|
run_task(spec.clone(), iteration, reference.task)
|
|
};
|
|
if reference.read {
|
|
call.await?;
|
|
}
|
|
if reference.read_strongly_consistent {
|
|
call.strongly_consistent().await?;
|
|
}
|
|
}
|
|
Ok(Vc::cell(()))
|
|
}
|
|
|
|
#[turbo_tasks::function]
|
|
async fn run_task_child(from: u16, i: u8) -> Result<Vc<()>> {
|
|
println!("run_task_child(from: {from}, i: {i})");
|
|
let _ = from;
|
|
let _ = i;
|
|
Ok(Vc::cell(()))
|
|
}
|