From 59f7e56219e8dc776df730986869ab08df580889 Mon Sep 17 00:00:00 2001 From: Benjamin Woodruff Date: Wed, 19 Mar 2025 21:06:37 -0700 Subject: [PATCH] chore(turbopack): Fix a few syntactic nits --- turbopack/crates/turbo-tasks-backend/src/backend/mod.rs | 6 +++--- turbopack/crates/turbopack-node/src/transforms/postcss.rs | 1 - turbopack/crates/turbopack-node/src/transforms/util.rs | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/turbopack/crates/turbo-tasks-backend/src/backend/mod.rs b/turbopack/crates/turbo-tasks-backend/src/backend/mod.rs index 8e62f66e0d3c9..a3c9fa69ab575 100644 --- a/turbopack/crates/turbo-tasks-backend/src/backend/mod.rs +++ b/turbopack/crates/turbo-tasks-backend/src/backend/mod.rs @@ -979,7 +979,7 @@ impl TurboTasksBackendInner { if !parent_task.is_transient() { let parent_task_type = self.lookup_task_type(parent_task); panic!( - "Calling transient function {} from persistent function function {} is not allowed", + "Calling transient function {} from persistent function {} is not allowed", task_type.get_name(), parent_task_type.map_or("unknown", |t| t.get_name()) ); @@ -1068,7 +1068,7 @@ impl TurboTasksBackendInner { task.invalidate_serialization(); } - fn get_task_description(&self, task_id: TaskId) -> std::string::String { + fn get_task_description(&self, task_id: TaskId) -> String { self.lookup_task_type(task_id).map_or_else( || format!("{task_id:?} transient"), |task_type| task_type.to_string(), @@ -2047,7 +2047,7 @@ impl Backend for TurboTasksBackend { self.0.invalidate_serialization(task_id, turbo_tasks); } - fn get_task_description(&self, task: TaskId) -> std::string::String { + fn get_task_description(&self, task: TaskId) -> String { self.0.get_task_description(task) } diff --git a/turbopack/crates/turbopack-node/src/transforms/postcss.rs b/turbopack/crates/turbopack-node/src/transforms/postcss.rs index 47b3e08505443..48cf82f65ce15 100644 --- a/turbopack/crates/turbopack-node/src/transforms/postcss.rs +++ b/turbopack/crates/turbopack-node/src/transforms/postcss.rs @@ -43,7 +43,6 @@ use crate::{ struct PostCssProcessingResult { css: String, map: Option, - #[turbo_tasks(trace_ignore)] assets: Option>, } diff --git a/turbopack/crates/turbopack-node/src/transforms/util.rs b/turbopack/crates/turbopack-node/src/transforms/util.rs index bb25c0444b7f0..d863b955b5778 100644 --- a/turbopack/crates/turbopack-node/src/transforms/util.rs +++ b/turbopack/crates/turbopack-node/src/transforms/util.rs @@ -4,13 +4,13 @@ use anyhow::Result; use serde::{Deserialize, Serialize}; use serde_json::Value as JsonValue; use turbo_rcstr::RcStr; -use turbo_tasks::{ResolvedVc, TryJoinIterExt}; +use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, TryJoinIterExt}; use turbo_tasks_fs::{File, FileContent, FileSystem}; use turbopack_core::{ asset::AssetContent, server_fs::ServerFileSystem, virtual_source::VirtualSource, }; -#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)] +#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone, TraceRawVcs, NonLocalValue)] #[serde(rename_all = "camelCase")] pub struct EmittedAsset { file: RcStr,