Skip to content

Commit 50a4698

Browse files
authored
chore(turbopack): Fix a few syntactic nits (#77310)
Noticed some opportunities for minor cleanup while reading through some of this code.
1 parent d874f01 commit 50a4698

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

turbopack/crates/turbo-tasks-backend/src/backend/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
979979
if !parent_task.is_transient() {
980980
let parent_task_type = self.lookup_task_type(parent_task);
981981
panic!(
982-
"Calling transient function {} from persistent function function {} is not allowed",
982+
"Calling transient function {} from persistent function {} is not allowed",
983983
task_type.get_name(),
984984
parent_task_type.map_or("unknown", |t| t.get_name())
985985
);
@@ -1068,7 +1068,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
10681068
task.invalidate_serialization();
10691069
}
10701070

1071-
fn get_task_description(&self, task_id: TaskId) -> std::string::String {
1071+
fn get_task_description(&self, task_id: TaskId) -> String {
10721072
self.lookup_task_type(task_id).map_or_else(
10731073
|| format!("{task_id:?} transient"),
10741074
|task_type| task_type.to_string(),
@@ -2047,7 +2047,7 @@ impl<B: BackingStorage> Backend for TurboTasksBackend<B> {
20472047
self.0.invalidate_serialization(task_id, turbo_tasks);
20482048
}
20492049

2050-
fn get_task_description(&self, task: TaskId) -> std::string::String {
2050+
fn get_task_description(&self, task: TaskId) -> String {
20512051
self.0.get_task_description(task)
20522052
}
20532053

turbopack/crates/turbopack-node/src/transforms/postcss.rs

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ use crate::{
4343
struct PostCssProcessingResult {
4444
css: String,
4545
map: Option<String>,
46-
#[turbo_tasks(trace_ignore)]
4746
assets: Option<Vec<EmittedAsset>>,
4847
}
4948

turbopack/crates/turbopack-node/src/transforms/util.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use anyhow::Result;
44
use serde::{Deserialize, Serialize};
55
use serde_json::Value as JsonValue;
66
use turbo_rcstr::RcStr;
7-
use turbo_tasks::{ResolvedVc, TryJoinIterExt};
7+
use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, TryJoinIterExt};
88
use turbo_tasks_fs::{File, FileContent, FileSystem};
99
use turbopack_core::{
1010
asset::AssetContent, server_fs::ServerFileSystem, virtual_source::VirtualSource,
1111
};
1212

13-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
13+
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone, TraceRawVcs, NonLocalValue)]
1414
#[serde(rename_all = "camelCase")]
1515
pub struct EmittedAsset {
1616
file: RcStr,

0 commit comments

Comments
 (0)