Unverified Commit e0987559 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

refactor(turbopack): Add `NonLocalValue` derives to types deriving TraceRawVcs (#73714)

Types that implement `TraceRawVcs` do so because they aren't a `VcValueType`, but they are used inside of a `VcValueType`.

We have a similar issue for the `NonLocalValue` (formerly `ResolvedValue`) marker trait. We need it to be implemented for all things included inside of `VcValueType`s, so that we can know that `VcValueType`s do not recursively contain potentially-local `Vc`s.

I started this PR by adding `NonLocalValue` to all things that explicitly derive `TraceRawVcs`:

```
sg run --lang rust --pattern '#[derive($$$BEFORE TraceRawVcs $$$AFTER)]' --rewrite '#[derive($$$BEFORE TraceRawVcs $$$AFTER, NonLocalValue)]' --update-all
fastmod ',, NonLocalValue' ', NonLocalValue'       # fix up some double comments caused by the astgrep transform above
```

And then I went through doing the following:
- Adding imports of `NonLocalValue`.
- Removing the `NonLocalValue` in cases where it's not easy for the struct to implement it yet.
- Adding `non_local` options to `#[turbo_task::value]` macros in places where it would help us derive `NonLocalValue` somewhere else.
- In a few cases removed some `#[turbo_tasks(trace_ignore)]`s in favor of adding a proper `TraceRawVcs` and `NonLocalValue` implementations.

Included with this are a few improvements to the `turbo-tasks` and `turbo-tasks-macros` crates:

- Fixed an issue where `rust-analyzer` (but not `cargo check`) would report a warning about `non_snake_case` inside the derive macro.
- Remove some type bounds from the `AdjacencyMap` struct (see #72823 for an explaination) and implement `NonLocalValue` on it.
- Implement `NonLocalValue` (and `TraceRawVcs`) on a few more primitive types.
parent 7db3bf73
...@@ -40,8 +40,8 @@ use serde::{Deserialize, Serialize}; ...@@ -40,8 +40,8 @@ use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
fxindexmap, fxindexset, trace::TraceRawVcs, Completion, FxIndexSet, ResolvedVc, TryJoinIterExt, fxindexmap, fxindexset, trace::TraceRawVcs, Completion, FxIndexSet, NonLocalValue, ResolvedVc,
Value, ValueToString, Vc, TryJoinIterExt, Value, ValueToString, Vc,
}; };
use turbo_tasks_env::{CustomProcessEnv, ProcessEnv}; use turbo_tasks_env::{CustomProcessEnv, ProcessEnv};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
...@@ -746,7 +746,7 @@ fn server_utils_modifier() -> Vc<RcStr> { ...@@ -746,7 +746,7 @@ fn server_utils_modifier() -> Vc<RcStr> {
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
struct OutputAssetsWithAvailability((ResolvedVc<OutputAssets>, AvailabilityInfo)); struct OutputAssetsWithAvailability((ResolvedVc<OutputAssets>, AvailabilityInfo));
#[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TraceRawVcs)] #[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TraceRawVcs, NonLocalValue)]
enum AppPageEndpointType { enum AppPageEndpointType {
Html, Html,
Rsc, Rsc,
......
...@@ -101,13 +101,13 @@ fn wrap( ...@@ -101,13 +101,13 @@ fn wrap(
OperationVc::new(wrap_endpoint(endpoint, op)) OperationVc::new(wrap_endpoint(endpoint, op))
} }
#[derive(Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, ValueDebugFormat)] #[derive(Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, ValueDebugFormat, NonLocalValue)]
pub struct InstrumentationOperation { pub struct InstrumentationOperation {
pub node_js: OperationVc<Box<dyn Endpoint>>, pub node_js: OperationVc<Box<dyn Endpoint>>,
pub edge: OperationVc<Box<dyn Endpoint>>, pub edge: OperationVc<Box<dyn Endpoint>>,
} }
#[derive(Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, ValueDebugFormat)] #[derive(Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, ValueDebugFormat, NonLocalValue)]
pub struct MiddlewareOperation { pub struct MiddlewareOperation {
pub endpoint: OperationVc<Box<dyn Endpoint>>, pub endpoint: OperationVc<Box<dyn Endpoint>>,
} }
...@@ -130,7 +130,17 @@ pub enum RouteOperation { ...@@ -130,7 +130,17 @@ pub enum RouteOperation {
Conflict, Conflict,
} }
#[derive(TraceRawVcs, Serialize, Deserialize, PartialEq, Eq, ValueDebugFormat, Clone, Debug)] #[derive(
TraceRawVcs,
Serialize,
Deserialize,
PartialEq,
Eq,
ValueDebugFormat,
Clone,
Debug,
NonLocalValue,
)]
pub struct AppPageRouteOperation { pub struct AppPageRouteOperation {
pub original_name: String, pub original_name: String,
pub html_endpoint: OperationVc<Box<dyn Endpoint>>, pub html_endpoint: OperationVc<Box<dyn Endpoint>>,
......
...@@ -32,7 +32,8 @@ use serde::{Deserialize, Serialize}; ...@@ -32,7 +32,8 @@ use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
fxindexmap, trace::TraceRawVcs, Completion, FxIndexMap, ResolvedVc, TaskInput, Value, Vc, fxindexmap, trace::TraceRawVcs, Completion, FxIndexMap, NonLocalValue, ResolvedVc, TaskInput,
Value, Vc,
}; };
use turbo_tasks_fs::{ use turbo_tasks_fs::{
self, File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem, self, File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem,
...@@ -631,7 +632,17 @@ struct PageEndpoint { ...@@ -631,7 +632,17 @@ struct PageEndpoint {
} }
#[derive( #[derive(
Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs, Copy,
Clone,
Serialize,
Deserialize,
PartialEq,
Eq,
Hash,
Debug,
TaskInput,
TraceRawVcs,
NonLocalValue,
)] )]
enum PageEndpointType { enum PageEndpointType {
Api, Api,
...@@ -641,7 +652,17 @@ enum PageEndpointType { ...@@ -641,7 +652,17 @@ enum PageEndpointType {
} }
#[derive( #[derive(
Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs, Copy,
Clone,
Serialize,
Deserialize,
PartialEq,
Eq,
Hash,
Debug,
TaskInput,
TraceRawVcs,
NonLocalValue,
)] )]
enum SsrChunkType { enum SsrChunkType {
Page, Page,
......
...@@ -3,7 +3,7 @@ use next_core::{all_assets_from_entries, next_manifests::AssetBinding}; ...@@ -3,7 +3,7 @@ use next_core::{all_assets_from_entries, next_manifests::AssetBinding};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, TryFlatJoinIterExt, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
...@@ -11,7 +11,7 @@ use turbopack_core::{ ...@@ -11,7 +11,7 @@ use turbopack_core::{
}; };
/// A reference to a server file with content hash for change detection /// A reference to a server file with content hash for change detection
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs)] #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
pub struct ServerPath { pub struct ServerPath {
/// Relative to the root_path /// Relative to the root_path
pub path: String, pub path: String,
......
...@@ -28,8 +28,8 @@ use turbo_tasks::{ ...@@ -28,8 +28,8 @@ use turbo_tasks::{
fxindexmap, fxindexmap,
graph::{AdjacencyMap, GraphTraversal}, graph::{AdjacencyMap, GraphTraversal},
trace::TraceRawVcs, trace::TraceRawVcs,
Completion, Completions, FxIndexMap, IntoTraitRef, ReadRef, ResolvedVc, State, TaskInput, Completion, Completions, FxIndexMap, IntoTraitRef, NonLocalValue, ReadRef, ResolvedVc, State,
TransientInstance, TryFlatJoinIterExt, Value, Vc, TaskInput, TransientInstance, TryFlatJoinIterExt, Value, Vc,
}; };
use turbo_tasks_env::{EnvMap, ProcessEnv}; use turbo_tasks_env::{EnvMap, ProcessEnv};
use turbo_tasks_fs::{DiskFileSystem, FileSystem, FileSystemPath, VirtualFileSystem}; use turbo_tasks_fs::{DiskFileSystem, FileSystem, FileSystemPath, VirtualFileSystem};
...@@ -72,7 +72,9 @@ use crate::{ ...@@ -72,7 +72,9 @@ use crate::{
versioned_content_map::{OutputAssetsOperation, VersionedContentMap}, versioned_content_map::{OutputAssetsOperation, VersionedContentMap},
}; };
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)] #[derive(
Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue,
)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct DraftModeOptions { pub struct DraftModeOptions {
pub preview_mode_id: RcStr, pub preview_mode_id: RcStr,
...@@ -81,7 +83,18 @@ pub struct DraftModeOptions { ...@@ -81,7 +83,18 @@ pub struct DraftModeOptions {
} }
#[derive( #[derive(
Debug, Default, Serialize, Deserialize, Copy, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs, Debug,
Default,
Serialize,
Deserialize,
Copy,
Clone,
TaskInput,
PartialEq,
Eq,
Hash,
TraceRawVcs,
NonLocalValue,
)] )]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct WatchOptions { pub struct WatchOptions {
...@@ -93,7 +106,9 @@ pub struct WatchOptions { ...@@ -93,7 +106,9 @@ pub struct WatchOptions {
pub poll_interval: Option<Duration>, pub poll_interval: Option<Duration>,
} }
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)] #[derive(
Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue,
)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct ProjectOptions { pub struct ProjectOptions {
/// A root path from which all files must be nested under. Trying to access /// A root path from which all files must be nested under. Trying to access
...@@ -135,7 +150,9 @@ pub struct ProjectOptions { ...@@ -135,7 +150,9 @@ pub struct ProjectOptions {
pub browserslist_query: RcStr, pub browserslist_query: RcStr,
} }
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)] #[derive(
Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue,
)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct PartialProjectOptions { pub struct PartialProjectOptions {
/// A root path from which all files must be nested under. Trying to access /// A root path from which all files must be nested under. Trying to access
...@@ -174,7 +191,9 @@ pub struct PartialProjectOptions { ...@@ -174,7 +191,9 @@ pub struct PartialProjectOptions {
pub preview_props: Option<DraftModeOptions>, pub preview_props: Option<DraftModeOptions>,
} }
#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)] #[derive(
Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue,
)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct DefineEnv { pub struct DefineEnv {
pub client: Vec<(RcStr, RcStr)>, pub client: Vec<(RcStr, RcStr)>,
......
...@@ -9,7 +9,8 @@ use swc_core::{ ...@@ -9,7 +9,8 @@ use swc_core::{
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, util::WrapFuture, ResolvedVc, TryJoinIterExt, ValueDefault, Vc, trace::TraceRawVcs, util::WrapFuture, NonLocalValue, ResolvedVc, TryJoinIterExt, ValueDefault,
Vc,
}; };
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
...@@ -29,7 +30,9 @@ use turbopack_ecmascript::{ ...@@ -29,7 +30,9 @@ use turbopack_ecmascript::{
use crate::{app_structure::AppPageLoaderTree, util::NextRuntime}; use crate::{app_structure::AppPageLoaderTree, util::NextRuntime};
#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(
Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum NextSegmentDynamic { pub enum NextSegmentDynamic {
#[default] #[default]
...@@ -39,7 +42,9 @@ pub enum NextSegmentDynamic { ...@@ -39,7 +42,9 @@ pub enum NextSegmentDynamic {
ForceStatic, ForceStatic,
} }
#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(
Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum NextSegmentFetchCache { pub enum NextSegmentFetchCache {
#[default] #[default]
...@@ -52,7 +57,9 @@ pub enum NextSegmentFetchCache { ...@@ -52,7 +57,9 @@ pub enum NextSegmentFetchCache {
ForceNoStore, ForceNoStore,
} }
#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(
Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
pub enum NextRevalidate { pub enum NextRevalidate {
#[default] #[default]
Never, Never,
......
...@@ -15,7 +15,7 @@ use std::{ ...@@ -15,7 +15,7 @@ use std::{
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, TaskInput}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, TaskInput};
pub use crate::next_app::{ pub use crate::next_app::{
app_client_references_chunks::{get_app_client_references_chunks, ClientReferencesChunks}, app_client_references_chunks::{get_app_client_references_chunks, ClientReferencesChunks},
...@@ -38,6 +38,7 @@ pub use crate::next_app::{ ...@@ -38,6 +38,7 @@ pub use crate::next_app::{
Ord, Ord,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue,
)] )]
pub enum PageSegment { pub enum PageSegment {
/// e.g. `/dashboard` /// e.g. `/dashboard`
...@@ -142,6 +143,7 @@ impl Display for PageSegment { ...@@ -142,6 +143,7 @@ impl Display for PageSegment {
Ord, Ord,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue,
)] )]
pub enum PageType { pub enum PageType {
Page, Page,
...@@ -161,7 +163,17 @@ impl Display for PageType { ...@@ -161,7 +163,17 @@ impl Display for PageType {
/// intercepting routes, parallel routes and route/page suffixes that are not /// intercepting routes, parallel routes and route/page suffixes that are not
/// part of the pathname. /// part of the pathname.
#[derive( #[derive(
Clone, Debug, Hash, PartialEq, Eq, Default, Serialize, Deserialize, TaskInput, TraceRawVcs, Clone,
Debug,
Hash,
PartialEq,
Eq,
Default,
Serialize,
Deserialize,
TaskInput,
TraceRawVcs,
NonLocalValue,
)] )]
pub struct AppPage(pub Vec<PageSegment>); pub struct AppPage(pub Vec<PageSegment>);
...@@ -335,6 +347,7 @@ impl PartialOrd for AppPage { ...@@ -335,6 +347,7 @@ impl PartialOrd for AppPage {
Ord, Ord,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue,
)] )]
pub enum PathSegment { pub enum PathSegment {
/// e.g. `/dashboard` /// e.g. `/dashboard`
...@@ -376,7 +389,17 @@ impl Display for PathSegment { ...@@ -376,7 +389,17 @@ impl Display for PathSegment {
/// Does not include internal modifiers as it's the equivalent of the http /// Does not include internal modifiers as it's the equivalent of the http
/// request path. /// request path.
#[derive( #[derive(
Clone, Debug, Hash, PartialEq, Eq, Default, Serialize, Deserialize, TaskInput, TraceRawVcs, Clone,
Debug,
Hash,
PartialEq,
Eq,
Default,
Serialize,
Deserialize,
TaskInput,
TraceRawVcs,
NonLocalValue,
)] )]
pub struct AppPath(pub Vec<PathSegment>); pub struct AppPath(pub Vec<PathSegment>);
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ use anyhow::Result; ...@@ -2,7 +2,7 @@ use anyhow::Result;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, Vc};
pub(crate) struct DefaultFallbackFont { pub(crate) struct DefaultFallbackFont {
pub name: RcStr, pub name: RcStr,
...@@ -79,7 +79,7 @@ impl FontFallbacks { ...@@ -79,7 +79,7 @@ impl FontFallbacks {
/// An adjustment to be made to a fallback font to approximate the geometry of /// An adjustment to be made to a fallback font to approximate the geometry of
/// the main webfont. Rendered as e.g. `ascent-override: 56.8%;` in the /// the main webfont. Rendered as e.g. `ascent-override: 56.8%;` in the
/// stylesheet /// stylesheet
#[derive(Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[derive(Debug, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
pub(crate) struct FontAdjustment { pub(crate) struct FontAdjustment {
pub ascent: f64, pub ascent: f64,
pub descent: f64, pub descent: f64,
......
...@@ -5,7 +5,7 @@ use once_cell::sync::Lazy; ...@@ -5,7 +5,7 @@ use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::issue::{IssueExt, IssueSeverity, StyledString}; use turbopack_core::issue::{IssueExt, IssueSeverity, StyledString};
...@@ -37,7 +37,7 @@ pub(super) struct FontMetricsMapEntry { ...@@ -37,7 +37,7 @@ pub(super) struct FontMetricsMapEntry {
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub(super) struct FontMetricsMap(pub HashMap<RcStr, FontMetricsMapEntry>); pub(super) struct FontMetricsMap(pub HashMap<RcStr, FontMetricsMapEntry>);
#[derive(Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[derive(Debug, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
struct Fallback { struct Fallback {
pub font_family: RcStr, pub font_family: RcStr,
pub adjustment: Option<FontAdjustment>, pub adjustment: Option<FontAdjustment>,
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexset, trace::TraceRawVcs, FxIndexMap, FxIndexSet, Value, Vc}; use turbo_tasks::{
fxindexset, trace::TraceRawVcs, FxIndexMap, FxIndexSet, NonLocalValue, Value, Vc,
};
use super::request::{NextFontRequest, OneOrManyStrings}; use super::request::{NextFontRequest, OneOrManyStrings};
...@@ -41,21 +43,31 @@ impl NextFontGoogleOptions { ...@@ -41,21 +43,31 @@ impl NextFontGoogleOptions {
} }
#[derive( #[derive(
Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, TraceRawVcs, Clone,
Debug,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
)] )]
pub(super) enum FontWeights { pub(super) enum FontWeights {
Variable, Variable,
Fixed(Vec<u16>), Fixed(Vec<u16>),
} }
#[derive(Debug, PartialEq, Eq, Deserialize, Serialize, TraceRawVcs)] #[derive(Debug, PartialEq, Eq, Deserialize, Serialize, TraceRawVcs, NonLocalValue)]
pub(super) struct FontDataEntry { pub(super) struct FontDataEntry {
pub weights: Vec<RcStr>, pub weights: Vec<RcStr>,
pub styles: Vec<RcStr>, pub styles: Vec<RcStr>,
pub axes: Option<Vec<Axis>>, pub axes: Option<Vec<Axis>>,
} }
#[derive(Debug, PartialEq, Deserialize, Serialize, TraceRawVcs)] #[derive(Debug, PartialEq, Deserialize, Serialize, TraceRawVcs, NonLocalValue)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub(super) struct Axis { pub(super) struct Axis {
pub tag: RcStr, pub tag: RcStr,
......
...@@ -3,7 +3,7 @@ use std::{fmt::Display, str::FromStr}; ...@@ -3,7 +3,7 @@ use std::{fmt::Display, str::FromStr};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, Value, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, Value, Vc};
use super::request::{ use super::request::{
AdjustFontFallback, NextFontLocalRequest, NextFontLocalRequestArguments, SrcDescriptor, AdjustFontFallback, NextFontLocalRequest, NextFontLocalRequestArguments, SrcDescriptor,
...@@ -50,7 +50,17 @@ impl NextFontLocalOptions { ...@@ -50,7 +50,17 @@ impl NextFontLocalOptions {
/// Describes an individual font file's path, weight, style, etc. Derived from /// Describes an individual font file's path, weight, style, etc. Derived from
/// the `src` field or top-level object provided by the user /// the `src` field or top-level object provided by the user
#[derive( #[derive(
Clone, Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TraceRawVcs, Clone,
Debug,
Deserialize,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Serialize,
TraceRawVcs,
NonLocalValue,
)] )]
pub(super) struct FontDescriptor { pub(super) struct FontDescriptor {
pub weight: Option<FontWeight>, pub weight: Option<FontWeight>,
...@@ -81,7 +91,17 @@ impl FontDescriptor { ...@@ -81,7 +91,17 @@ impl FontDescriptor {
} }
#[derive( #[derive(
Clone, Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, TraceRawVcs, Clone,
Debug,
Deserialize,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Serialize,
TraceRawVcs,
NonLocalValue,
)] )]
pub(super) enum FontDescriptors { pub(super) enum FontDescriptors {
/// `One` is a special case when the user did not provide a `src` field and /// `One` is a special case when the user did not provide a `src` field and
...@@ -93,7 +113,17 @@ pub(super) enum FontDescriptors { ...@@ -93,7 +113,17 @@ pub(super) enum FontDescriptors {
} }
#[derive( #[derive(
Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, Hash, TraceRawVcs, Clone,
Debug,
PartialEq,
Eq,
PartialOrd,
Ord,
Deserialize,
Serialize,
Hash,
TraceRawVcs,
NonLocalValue,
)] )]
pub(super) enum FontWeight { pub(super) enum FontWeight {
Variable(RcStr, RcStr), Variable(RcStr, RcStr),
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::trace::TraceRawVcs; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue};
/// The top-most structure encoded into the query param in requests to /// The top-most structure encoded into the query param in requests to
/// `next/font/local` generated by the next/font swc transform. e.g. /// `next/font/local` generated by the next/font swc transform. e.g.
...@@ -47,7 +47,17 @@ pub(super) struct SrcDescriptor { ...@@ -47,7 +47,17 @@ pub(super) struct SrcDescriptor {
/// The user's desired fallback font /// The user's desired fallback font
#[derive( #[derive(
Clone, Debug, Deserialize, Hash, Ord, PartialOrd, PartialEq, Eq, Serialize, TraceRawVcs, Clone,
Debug,
Deserialize,
Hash,
Ord,
PartialOrd,
PartialEq,
Eq,
Serialize,
TraceRawVcs,
NonLocalValue,
)] )]
pub(super) enum AdjustFontFallback { pub(super) enum AdjustFontFallback {
Arial, Arial,
......
...@@ -8,7 +8,8 @@ use anyhow::{Context, Result}; ...@@ -8,7 +8,8 @@ use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, FxIndexMap, FxIndexSet, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, Vc, trace::TraceRawVcs, FxIndexMap, FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TaskInput,
TryJoinIterExt, Vc,
}; };
use turbo_tasks_fs::{File, FileSystemPath}; use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
...@@ -161,6 +162,7 @@ impl Default for MiddlewaresManifest { ...@@ -161,6 +162,7 @@ impl Default for MiddlewaresManifest {
TraceRawVcs, TraceRawVcs,
Serialize, Serialize,
Deserialize, Deserialize,
NonLocalValue,
)] )]
#[serde(rename_all = "camelCase", default)] #[serde(rename_all = "camelCase", default)]
pub struct MiddlewareMatcher { pub struct MiddlewareMatcher {
...@@ -327,6 +329,7 @@ pub enum ActionManifestModuleId<'a> { ...@@ -327,6 +329,7 @@ pub enum ActionManifestModuleId<'a> {
TraceRawVcs, TraceRawVcs,
Serialize, Serialize,
Deserialize, Deserialize,
NonLocalValue,
)] )]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum ActionLayer { pub enum ActionLayer {
......
...@@ -5,13 +5,15 @@ use async_trait::async_trait; ...@@ -5,13 +5,15 @@ use async_trait::async_trait;
use modularize_imports::{modularize_imports, PackageConfig}; use modularize_imports::{modularize_imports, PackageConfig};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use swc_core::ecma::ast::Program; use swc_core::ecma::ast::Program;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, ResolvedVc}; use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, NonLocalValue, ResolvedVc};
use turbopack::module_options::{ModuleRule, ModuleRuleEffect}; use turbopack::module_options::{ModuleRule, ModuleRuleEffect};
use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext}; use turbopack_ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext};
use super::module_rule_match_js_no_url; use super::module_rule_match_js_no_url;
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs)] #[derive(
Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue,
)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct ModularizeImportPackageConfig { pub struct ModularizeImportPackageConfig {
pub transform: Transform, pub transform: Transform,
...@@ -21,7 +23,9 @@ pub struct ModularizeImportPackageConfig { ...@@ -21,7 +23,9 @@ pub struct ModularizeImportPackageConfig {
pub skip_default_conversion: bool, pub skip_default_conversion: bool,
} }
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs)] #[derive(
Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue,
)]
#[serde(untagged)] #[serde(untagged)]
pub enum Transform { pub enum Transform {
#[default] #[default]
......
...@@ -8,8 +8,8 @@ use swc_core::{ ...@@ -8,8 +8,8 @@ use swc_core::{
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, util::WrapFuture, FxIndexMap, FxIndexSet, ResolvedVc, TaskInput, trace::TraceRawVcs, util::WrapFuture, FxIndexMap, FxIndexSet, NonLocalValue, ResolvedVc,
ValueDefault, ValueToString, Vc, TaskInput, ValueDefault, ValueToString, Vc,
}; };
use turbo_tasks_fs::{ use turbo_tasks_fs::{
self, json::parse_json_rope_with_source_context, rope::Rope, util::join_path, File, self, json::parse_json_rope_with_source_context, rope::Rope, util::join_path, File,
...@@ -151,6 +151,7 @@ pub async fn foreign_code_context_condition( ...@@ -151,6 +151,7 @@ pub async fn foreign_code_context_condition(
PartialOrd, PartialOrd,
Ord, Ord,
TaskInput, TaskInput,
NonLocalValue,
)] )]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]
pub enum NextRuntime { pub enum NextRuntime {
......
...@@ -12,7 +12,7 @@ use crate::{ ...@@ -12,7 +12,7 @@ use crate::{
/// "subdirectory" in the given root [FileSystem]. /// "subdirectory" in the given root [FileSystem].
/// ///
/// Caveat: The `child_path` itself is not visible as a directory entry. /// Caveat: The `child_path` itself is not visible as a directory entry.
#[turbo_tasks::value] #[turbo_tasks::value(non_local)]
pub struct AttachedFileSystem { pub struct AttachedFileSystem {
root_fs: ResolvedVc<Box<dyn FileSystem>>, root_fs: ResolvedVc<Box<dyn FileSystem>>,
// we turn this into a string because creating a FileSystemPath requires the filesystem which // we turn this into a string because creating a FileSystemPath requires the filesystem which
......
...@@ -9,7 +9,7 @@ use crate::{ ...@@ -9,7 +9,7 @@ use crate::{
LinkContent, LinkContent,
}; };
#[turbo_tasks::value(serialization = "none", cell = "new", eq = "manual")] #[turbo_tasks::value(serialization = "none", cell = "new", eq = "manual", non_local)]
pub struct EmbeddedFileSystem { pub struct EmbeddedFileSystem {
name: RcStr, name: RcStr,
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
......
...@@ -3,10 +3,10 @@ use std::mem::take; ...@@ -3,10 +3,10 @@ use std::mem::take;
use anyhow::{anyhow, bail, Context, Result}; use anyhow::{anyhow, bail, Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, TryJoinIterExt, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, TryJoinIterExt, Vc};
use unicode_segmentation::GraphemeCursor; use unicode_segmentation::GraphemeCursor;
#[derive(PartialEq, Eq, Debug, Clone, TraceRawVcs, Serialize, Deserialize)] #[derive(PartialEq, Eq, Debug, Clone, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
enum GlobPart { enum GlobPart {
/// `/**/`: Matches any path of directories /// `/**/`: Matches any path of directories
AnyDirectories, AnyDirectories,
...@@ -42,7 +42,7 @@ enum GlobPart { ...@@ -42,7 +42,7 @@ enum GlobPart {
// Note: a/**/b does match a/b, so we need some special logic about path // Note: a/**/b does match a/b, so we need some special logic about path
// separators // separators
#[turbo_tasks::value] #[turbo_tasks::value(non_local)]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Glob { pub struct Glob {
expression: Vec<GlobPart>, expression: Vec<GlobPart>,
......
...@@ -5,13 +5,12 @@ use std::{ ...@@ -5,13 +5,12 @@ use std::{
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::trace::TraceRawVcs; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue};
use crate::{rope::Rope, source_context::get_source_context}; use crate::{rope::Rope, source_context::get_source_context};
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs)] #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
pub struct UnparseableJson { pub struct UnparseableJson {
#[turbo_tasks(trace_ignore)]
pub message: Cow<'static, str>, pub message: Cow<'static, str>,
pub path: Option<String>, pub path: Option<String>,
/// The start line and column of the error. /// The start line and column of the error.
......
...@@ -60,7 +60,7 @@ use tracing::Instrument; ...@@ -60,7 +60,7 @@ use tracing::Instrument;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, effect, mark_session_dependent, mark_stateful, trace::TraceRawVcs, debug::ValueDebugFormat, effect, mark_session_dependent, mark_stateful, trace::TraceRawVcs,
Completion, Invalidator, ReadRef, ResolvedVc, ValueToString, Vc, Completion, Invalidator, NonLocalValue, ReadRef, ResolvedVc, ValueToString, Vc,
}; };
use turbo_tasks_hash::{ use turbo_tasks_hash::{
hash_xxh3_hash128, hash_xxh3_hash64, DeterministicHash, DeterministicHasher, hash_xxh3_hash128, hash_xxh3_hash64, DeterministicHash, DeterministicHasher,
...@@ -173,7 +173,7 @@ pub fn validate_path_length(path: &Path) -> Result<Cow<'_, Path>> { ...@@ -173,7 +173,7 @@ pub fn validate_path_length(path: &Path) -> Result<Cow<'_, Path>> {
}) })
} }
#[turbo_tasks::value_trait] #[turbo_tasks::value_trait(non_local)]
pub trait FileSystem: ValueToString { pub trait FileSystem: ValueToString {
/// Returns the path to the root of the file system. /// Returns the path to the root of the file system.
fn root(self: Vc<Self>) -> Vc<FileSystemPath> { fn root(self: Vc<Self>) -> Vc<FileSystemPath> {
...@@ -188,7 +188,7 @@ pub trait FileSystem: ValueToString { ...@@ -188,7 +188,7 @@ pub trait FileSystem: ValueToString {
fn metadata(self: Vc<Self>, fs_path: Vc<FileSystemPath>) -> Vc<FileMeta>; fn metadata(self: Vc<Self>, fs_path: Vc<FileSystemPath>) -> Vc<FileMeta>;
} }
#[derive(Serialize, Deserialize, TraceRawVcs, ValueDebugFormat)] #[derive(Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
struct DiskFileSystemInner { struct DiskFileSystemInner {
pub name: RcStr, pub name: RcStr,
pub root: RcStr, pub root: RcStr,
...@@ -348,7 +348,7 @@ impl DiskFileSystemInner { ...@@ -348,7 +348,7 @@ impl DiskFileSystemInner {
} }
} }
#[turbo_tasks::value(cell = "new", eq = "manual")] #[turbo_tasks::value(cell = "new", eq = "manual", non_local)]
pub struct DiskFileSystem { pub struct DiskFileSystem {
inner: Arc<DiskFileSystemInner>, inner: Arc<DiskFileSystemInner>,
} }
...@@ -944,7 +944,7 @@ impl ValueToString for DiskFileSystem { ...@@ -944,7 +944,7 @@ impl ValueToString for DiskFileSystem {
} }
} }
#[turbo_tasks::value] #[turbo_tasks::value(non_local)]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct FileSystemPath { pub struct FileSystemPath {
pub fs: ResolvedVc<Box<dyn FileSystem>>, pub fs: ResolvedVc<Box<dyn FileSystem>>,
...@@ -2100,7 +2100,7 @@ impl FileContent { ...@@ -2100,7 +2100,7 @@ impl FileContent {
} }
/// A file's content interpreted as a JSON value. /// A file's content interpreted as a JSON value.
#[turbo_tasks::value(shared, serialization = "none")] #[turbo_tasks::value(shared, serialization = "none", non_local)]
pub enum FileJsonContent { pub enum FileJsonContent {
Content(Value), Content(Value),
Unparseable(Box<UnparseableJson>), Unparseable(Box<UnparseableJson>),
...@@ -2167,7 +2167,7 @@ pub enum FileLinesContent { ...@@ -2167,7 +2167,7 @@ pub enum FileLinesContent {
NotFound, NotFound,
} }
#[derive(Hash, Clone, Debug, PartialEq, Eq, TraceRawVcs, Serialize, Deserialize)] #[derive(Hash, Clone, Debug, PartialEq, Eq, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
pub enum InternalDirectoryEntry { pub enum InternalDirectoryEntry {
File(RcStr), File(RcStr),
Directory(RcStr), Directory(RcStr),
...@@ -2176,7 +2176,9 @@ pub enum InternalDirectoryEntry { ...@@ -2176,7 +2176,9 @@ pub enum InternalDirectoryEntry {
Error, Error,
} }
#[derive(Hash, Clone, Copy, Debug, PartialEq, Eq, TraceRawVcs, Serialize, Deserialize)] #[derive(
Hash, Clone, Copy, Debug, PartialEq, Eq, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
pub enum DirectoryEntry { pub enum DirectoryEntry {
File(ResolvedVc<FileSystemPath>), File(ResolvedVc<FileSystemPath>),
Directory(ResolvedVc<FileSystemPath>), Directory(ResolvedVc<FileSystemPath>),
...@@ -2277,7 +2279,7 @@ impl DirectoryContent { ...@@ -2277,7 +2279,7 @@ impl DirectoryContent {
} }
} }
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared, non_local)]
pub struct NullFileSystem; pub struct NullFileSystem;
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
......
...@@ -4,7 +4,7 @@ use turbo_tasks::{Completion, ValueDefault, ValueToString, Vc}; ...@@ -4,7 +4,7 @@ use turbo_tasks::{Completion, ValueDefault, ValueToString, Vc};
use super::{DirectoryContent, FileContent, FileMeta, FileSystem, FileSystemPath, LinkContent}; use super::{DirectoryContent, FileContent, FileMeta, FileSystem, FileSystemPath, LinkContent};
#[turbo_tasks::value] #[turbo_tasks::value(non_local)]
pub struct VirtualFileSystem { pub struct VirtualFileSystem {
pub name: RcStr, pub name: RcStr,
} }
......
...@@ -45,11 +45,11 @@ pub fn assert_fields_impl_trait( ...@@ -45,11 +45,11 @@ pub fn assert_fields_impl_trait(
// we reproduce the field types here to ensure any generics get used // we reproduce the field types here to ensure any generics get used
struct #assertion_struct_ident #impl_generics (#(#field_types),*) #where_clause; struct #assertion_struct_ident #impl_generics (#(#field_types),*) #where_clause;
#[allow(non_snake_case)]
impl #impl_generics #assertion_struct_ident #ty_generics #where_clause { impl #impl_generics #assertion_struct_ident #ty_generics #where_clause {
fn #assertion_fn_ident< fn #assertion_fn_ident<
Expected: #trait_path + ?Sized Expected: #trait_path + ?Sized
>() {} >() {}
#[allow(non_snake_case)]
fn field_types() { fn field_types() {
#(#assertion_calls)* #(#assertion_calls)*
} }
......
...@@ -4,14 +4,16 @@ use anyhow::{anyhow, Result}; ...@@ -4,14 +4,16 @@ use anyhow::{anyhow, Result};
use auto_hash_map::AutoSet; use auto_hash_map::AutoSet;
use parking_lot::Mutex; use parking_lot::Mutex;
use tracing::{Instrument, Span}; use tracing::{Instrument, Span};
use turbo_tasks_macros::{TraceRawVcs, ValueDebugFormat};
use crate::{ use crate::{
self as turbo_tasks, emit, self as turbo_tasks,
debug::ValueDebugFormat,
emit,
event::{Event, EventListener}, event::{Event, EventListener},
manager::turbo_tasks_future_scope, manager::turbo_tasks_future_scope,
trace::TraceRawVcs,
util::SharedError, util::SharedError,
CollectiblesSource, ReadRef, ResolvedVc, TryJoinIterExt, Vc, CollectiblesSource, NonLocalValue, ReadRef, ResolvedVc, TryJoinIterExt, Vc,
}; };
/// A trait to emit a task effect as collectible. This trait only has one /// A trait to emit a task effect as collectible. This trait only has one
...@@ -218,7 +220,7 @@ pub async fn get_effects(source: impl CollectiblesSource) -> Result<Effects> { ...@@ -218,7 +220,7 @@ pub async fn get_effects(source: impl CollectiblesSource) -> Result<Effects> {
/// Captured effects from an operation. This struct can be used to return Effects from a turbo-tasks /// Captured effects from an operation. This struct can be used to return Effects from a turbo-tasks
/// function and apply them later. /// function and apply them later.
#[derive(TraceRawVcs, Default, ValueDebugFormat)] #[derive(TraceRawVcs, Default, ValueDebugFormat, NonLocalValue)]
pub struct Effects { pub struct Effects {
#[turbo_tasks(trace_ignore, debug_ignore)] #[turbo_tasks(trace_ignore, debug_ignore)]
effects: Vec<ReadRef<EffectInstance>>, effects: Vec<ReadRef<EffectInstance>>,
......
use std::collections::{HashMap, HashSet, VecDeque}; use std::{
collections::{HashMap, HashSet, VecDeque},
hash::Hash,
};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks_macros::{TraceRawVcs, ValueDebugFormat}; use turbo_tasks_macros::{TraceRawVcs, ValueDebugFormat};
use super::graph_store::{GraphNode, GraphStore}; use super::graph_store::{GraphNode, GraphStore};
use crate as turbo_tasks; use crate::{self as turbo_tasks, NonLocalValue};
/// A graph traversal that builds an adjacency map /// A graph traversal that builds an adjacency map
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat)] #[derive(Debug, Clone, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat)]
pub struct AdjacencyMap<T> #[serde(bound(
where serialize = "T: Serialize + Eq + Hash",
T: Eq + std::hash::Hash + Clone, deserialize = "T: Deserialize<'de> + Eq + Hash"
{ ))]
pub struct AdjacencyMap<T> {
adjacency_map: HashMap<T, Vec<T>>, adjacency_map: HashMap<T, Vec<T>>,
roots: Vec<T>, roots: Vec<T>,
} }
unsafe impl<T> NonLocalValue for AdjacencyMap<T> where T: NonLocalValue {}
impl<T> PartialEq for AdjacencyMap<T>
where
T: Eq + Hash,
{
fn eq(&self, other: &Self) -> bool {
self.adjacency_map == other.adjacency_map && self.roots == other.roots
}
}
impl<T> Eq for AdjacencyMap<T> where T: Eq + Hash {}
impl<T> Default for AdjacencyMap<T> impl<T> Default for AdjacencyMap<T>
where where
T: Eq + std::hash::Hash + Clone, T: Eq + Hash + Clone,
{ {
fn default() -> Self { fn default() -> Self {
Self::new() Self::new()
...@@ -27,7 +44,7 @@ where ...@@ -27,7 +44,7 @@ where
impl<T> AdjacencyMap<T> impl<T> AdjacencyMap<T>
where where
T: Eq + std::hash::Hash + Clone, T: Eq + Hash + Clone,
{ {
/// Creates a new adjacency map /// Creates a new adjacency map
pub fn new() -> Self { pub fn new() -> Self {
...@@ -50,7 +67,7 @@ where ...@@ -50,7 +67,7 @@ where
impl<T> GraphStore for AdjacencyMap<T> impl<T> GraphStore for AdjacencyMap<T>
where where
T: Eq + std::hash::Hash + Clone, T: Eq + Hash + Clone,
{ {
type Node = T; type Node = T;
type Handle = T; type Handle = T;
...@@ -71,7 +88,7 @@ where ...@@ -71,7 +88,7 @@ where
impl<T> AdjacencyMap<T> impl<T> AdjacencyMap<T>
where where
T: Eq + std::hash::Hash + Clone, T: Eq + Hash + Clone,
{ {
/// Returns an owned iterator over the nodes in reverse topological order, /// Returns an owned iterator over the nodes in reverse topological order,
/// starting from the roots. /// starting from the roots.
...@@ -142,7 +159,7 @@ enum ReverseTopologicalPass { ...@@ -142,7 +159,7 @@ enum ReverseTopologicalPass {
/// from the roots. /// from the roots.
pub struct IntoReverseTopologicalIter<T> pub struct IntoReverseTopologicalIter<T>
where where
T: Eq + std::hash::Hash + Clone, T: Eq + Hash + Clone,
{ {
adjacency_map: HashMap<T, Vec<T>>, adjacency_map: HashMap<T, Vec<T>>,
stack: Vec<(ReverseTopologicalPass, T)>, stack: Vec<(ReverseTopologicalPass, T)>,
...@@ -151,7 +168,7 @@ where ...@@ -151,7 +168,7 @@ where
impl<T> Iterator for IntoReverseTopologicalIter<T> impl<T> Iterator for IntoReverseTopologicalIter<T>
where where
T: Eq + std::hash::Hash + Clone, T: Eq + Hash + Clone,
{ {
type Item = T; type Item = T;
...@@ -229,7 +246,7 @@ where ...@@ -229,7 +246,7 @@ where
/// from the roots. /// from the roots.
pub struct ReverseTopologicalIter<'graph, T> pub struct ReverseTopologicalIter<'graph, T>
where where
T: Eq + std::hash::Hash + Clone, T: Eq + Hash + Clone,
{ {
adjacency_map: &'graph HashMap<T, Vec<T>>, adjacency_map: &'graph HashMap<T, Vec<T>>,
stack: Vec<(ReverseTopologicalPass, &'graph T)>, stack: Vec<(ReverseTopologicalPass, &'graph T)>,
...@@ -238,7 +255,7 @@ where ...@@ -238,7 +255,7 @@ where
impl<'graph, T> Iterator for ReverseTopologicalIter<'graph, T> impl<'graph, T> Iterator for ReverseTopologicalIter<'graph, T>
where where
T: Eq + std::hash::Hash + Clone, T: Eq + Hash + Clone,
{ {
type Item = &'graph T; type Item = &'graph T;
......
...@@ -37,7 +37,10 @@ macro_rules! impl_auto_marker_trait { ...@@ -37,7 +37,10 @@ macro_rules! impl_auto_marker_trait {
::turbo_rcstr::RcStr, ::turbo_rcstr::RcStr,
); );
$crate::marker_trait::impl_marker_trait!($trait: ::std::path::Path, ::std::path::PathBuf); $crate::marker_trait::impl_marker_trait!($trait: ::std::path::Path, ::std::path::PathBuf);
$crate::marker_trait::impl_marker_trait!($trait: ::serde_json::Value); $crate::marker_trait::impl_marker_trait!(
$trait:
::serde_json::Value, ::serde_json::Map<String, ::serde_json::Value>
);
$crate::marker_trait::impl_marker_trait_tuple!($trait: E D C B A Z Y X W V U T); $crate::marker_trait::impl_marker_trait_tuple!($trait: E D C B A Z Y X W V U T);
...@@ -55,12 +58,20 @@ macro_rules! impl_auto_marker_trait { ...@@ -55,12 +58,20 @@ macro_rules! impl_auto_marker_trait {
unsafe impl<K: $trait, V: $trait> $trait for ::std::collections::BTreeMap<K, V> {} unsafe impl<K: $trait, V: $trait> $trait for ::std::collections::BTreeMap<K, V> {}
unsafe impl<K: $trait, V: $trait, S> $trait for ::indexmap::IndexMap<K, V, S> {} unsafe impl<K: $trait, V: $trait, S> $trait for ::indexmap::IndexMap<K, V, S> {}
unsafe impl<T: $trait + ?Sized> $trait for ::std::boxed::Box<T> {} unsafe impl<T: $trait + ?Sized> $trait for ::std::boxed::Box<T> {}
unsafe impl<T: $trait + ?Sized> $trait for std::sync::Arc<T> {} unsafe impl<T: $trait + ?Sized> $trait for ::std::sync::Arc<T> {}
unsafe impl<B: $trait + ::std::borrow::ToOwned + ?Sized> $trait
for ::std::borrow::Cow<'_, B> {}
unsafe impl<T: $trait, E: $trait> $trait for ::std::result::Result<T, E> {} unsafe impl<T: $trait, E: $trait> $trait for ::std::result::Result<T, E> {}
unsafe impl<T: $trait + ?Sized> $trait for ::std::sync::Mutex<T> {} unsafe impl<T: $trait + ?Sized> $trait for ::std::sync::Mutex<T> {}
unsafe impl<T: $trait + ?Sized> $trait for ::std::cell::RefCell<T> {} unsafe impl<T: $trait + ?Sized> $trait for ::std::cell::RefCell<T> {}
unsafe impl<T: ?Sized> $trait for ::std::marker::PhantomData<T> {} unsafe impl<T: ?Sized> $trait for ::std::marker::PhantomData<T> {}
unsafe impl<T> $trait for $crate::ReadRef<T>
where
T: $crate::VcValueType,
<<T as $crate::VcValueType>::Read as $crate::VcRead<T>>::Target: $trait
{}
unsafe impl<T: $trait + ?Sized> $trait for &T {} unsafe impl<T: $trait + ?Sized> $trait for &T {}
unsafe impl<T: $trait + ?Sized> $trait for &mut T {} unsafe impl<T: $trait + ?Sized> $trait for &mut T {}
} }
......
use std::{ use std::{
borrow::Cow,
cell::RefCell, cell::RefCell,
collections::{BTreeMap, BTreeSet, HashMap, HashSet}, collections::{BTreeMap, BTreeSet, HashMap, HashSet},
marker::PhantomData, marker::PhantomData,
...@@ -74,7 +75,7 @@ ignore!( ...@@ -74,7 +75,7 @@ ignore!(
); );
ignore!((), str, String, Duration, anyhow::Error, RcStr); ignore!((), str, String, Duration, anyhow::Error, RcStr);
ignore!(Path, PathBuf); ignore!(Path, PathBuf);
ignore!(serde_json::Value); ignore!(serde_json::Value, serde_json::Map<String, serde_json::Value>);
impl<T: ?Sized> TraceRawVcs for PhantomData<T> { impl<T: ?Sized> TraceRawVcs for PhantomData<T> {
fn trace_raw_vcs(&self, _trace_context: &mut TraceRawVcsContext) {} fn trace_raw_vcs(&self, _trace_context: &mut TraceRawVcsContext) {}
...@@ -208,6 +209,12 @@ impl<T: TraceRawVcs + ?Sized> TraceRawVcs for Arc<T> { ...@@ -208,6 +209,12 @@ impl<T: TraceRawVcs + ?Sized> TraceRawVcs for Arc<T> {
} }
} }
impl<B: TraceRawVcs + ToOwned + ?Sized> TraceRawVcs for Cow<'_, B> {
fn trace_raw_vcs(&self, trace_context: &mut TraceRawVcsContext) {
TraceRawVcs::trace_raw_vcs(&**self, trace_context);
}
}
impl TraceRawVcs for RawVc { impl TraceRawVcs for RawVc {
fn trace_raw_vcs(&self, trace_context: &mut TraceRawVcsContext) { fn trace_raw_vcs(&self, trace_context: &mut TraceRawVcsContext) {
trace_context.list.push(*self); trace_context.list.push(*self);
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexMap, ResolvedVc, TryFlatJoinIterExt, debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexMap, NonLocalValue, ResolvedVc,
TryJoinIterExt, ValueToString, Vc, TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc,
}; };
use turbo_tasks_hash::Xxh3Hash64Hasher; use turbo_tasks_hash::Xxh3Hash64Hasher;
use super::ChunkItem; use super::ChunkItem;
#[derive(PartialEq, Eq, TraceRawVcs, Copy, Clone, Serialize, Deserialize, ValueDebugFormat)] #[derive(
PartialEq, Eq, TraceRawVcs, Copy, Clone, Serialize, Deserialize, ValueDebugFormat, NonLocalValue,
)]
pub struct AvailableChunkItemInfo { pub struct AvailableChunkItemInfo {
pub is_async: bool, pub is_async: bool,
} }
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, TaskInput, Upcast, Value, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, TaskInput, Upcast, Value, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbo_tasks_hash::DeterministicHash; use turbo_tasks_hash::DeterministicHash;
...@@ -27,6 +27,7 @@ use crate::{ ...@@ -27,6 +27,7 @@ use crate::{
Deserialize, Deserialize,
TraceRawVcs, TraceRawVcs,
DeterministicHash, DeterministicHash,
NonLocalValue,
)] )]
pub enum MinifyType { pub enum MinifyType {
#[default] #[default]
...@@ -46,6 +47,7 @@ pub enum MinifyType { ...@@ -46,6 +47,7 @@ pub enum MinifyType {
Deserialize, Deserialize,
TraceRawVcs, TraceRawVcs,
DeterministicHash, DeterministicHash,
NonLocalValue,
)] )]
pub enum ChunkGroupType { pub enum ChunkGroupType {
Entry, Entry,
......
...@@ -25,8 +25,8 @@ use turbo_tasks::{ ...@@ -25,8 +25,8 @@ use turbo_tasks::{
debug::ValueDebugFormat, debug::ValueDebugFormat,
graph::{AdjacencyMap, GraphTraversal, GraphTraversalResult, Visit, VisitControlFlow}, graph::{AdjacencyMap, GraphTraversal, GraphTraversalResult, Visit, VisitControlFlow},
trace::TraceRawVcs, trace::TraceRawVcs,
FxIndexMap, FxIndexSet, ReadRef, ResolvedVc, TaskInput, TryFlatJoinIterExt, TryJoinIterExt, FxIndexMap, FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryFlatJoinIterExt,
Upcast, ValueToString, Vc, TryJoinIterExt, Upcast, ValueToString, Vc,
}; };
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbo_tasks_hash::DeterministicHash; use turbo_tasks_hash::DeterministicHash;
...@@ -50,7 +50,7 @@ use crate::{ ...@@ -50,7 +50,7 @@ use crate::{
}; };
/// A module id, which can be a number or string /// A module id, which can be a number or string
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared, non_local)]
#[derive(Debug, Clone, Hash, Ord, PartialOrd, DeterministicHash)] #[derive(Debug, Clone, Hash, Ord, PartialOrd, DeterministicHash)]
#[serde(untagged)] #[serde(untagged)]
pub enum ModuleId { pub enum ModuleId {
...@@ -234,7 +234,9 @@ pub async fn chunk_content( ...@@ -234,7 +234,9 @@ pub async fn chunk_content(
chunk_content_internal_parallel(chunking_context, chunk_entries, availability_info).await chunk_content_internal_parallel(chunking_context, chunk_entries, availability_info).await
} }
#[derive(Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs, Debug)] #[derive(
Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs, Debug, NonLocalValue,
)]
enum InheritAsyncEdge { enum InheritAsyncEdge {
/// The chunk item is in the current chunk group and async module info need /// The chunk item is in the current chunk group and async module info need
/// to be computed for it /// to be computed for it
......
...@@ -3,7 +3,9 @@ use std::{fmt::Write, ops::Deref}; ...@@ -3,7 +3,9 @@ use std::{fmt::Write, ops::Deref};
use anyhow::Result; use anyhow::Result;
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, ReadRef, ResolvedVc, Vc}; use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ReadRef, ResolvedVc, Vc,
};
use turbo_tasks_fs::{FileContent, FileJsonContent, FileSystemPath}; use turbo_tasks_fs::{FileContent, FileJsonContent, FileSystemPath};
use super::issue::Issue; use super::issue::Issue;
...@@ -12,7 +14,7 @@ use crate::issue::{IssueExt, IssueStage, OptionStyledString, StyledString}; ...@@ -12,7 +14,7 @@ use crate::issue::{IssueExt, IssueStage, OptionStyledString, StyledString};
/// PackageJson wraps the parsed JSON content of a `package.json` file. The /// PackageJson wraps the parsed JSON content of a `package.json` file. The
/// wrapper is necessary so that we can reference the [FileJsonContent]'s inner /// wrapper is necessary so that we can reference the [FileJsonContent]'s inner
/// [serde_json::Value] without cloning it. /// [serde_json::Value] without cloning it.
#[derive(PartialEq, Eq, ValueDebugFormat, TraceRawVcs)] #[derive(PartialEq, Eq, ValueDebugFormat, TraceRawVcs, NonLocalValue)]
pub struct PackageJson(ReadRef<FileJsonContent>); pub struct PackageJson(ReadRef<FileJsonContent>);
impl Deref for PackageJson { impl Deref for PackageJson {
......
...@@ -15,6 +15,7 @@ use turbo_rcstr::RcStr; ...@@ -15,6 +15,7 @@ use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::{internal::PassthroughDebug, ValueDebugFormat, ValueDebugFormatString}, debug::{internal::PassthroughDebug, ValueDebugFormat, ValueDebugFormatString},
trace::{TraceRawVcs, TraceRawVcsContext}, trace::{TraceRawVcs, TraceRawVcsContext},
NonLocalValue,
}; };
use super::pattern::Pattern; use super::pattern::Pattern;
...@@ -574,7 +575,7 @@ impl AliasPattern { ...@@ -574,7 +575,7 @@ impl AliasPattern {
} }
} }
#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
enum AliasKey { enum AliasKey {
Exact, Exact,
Wildcard { suffix: RcStr }, Wildcard { suffix: RcStr },
......
...@@ -11,8 +11,8 @@ use serde::{Deserialize, Serialize}; ...@@ -11,8 +11,8 @@ use serde::{Deserialize, Serialize};
use tracing::{Instrument, Level}; use tracing::{Instrument, Level};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
fxindexmap, trace::TraceRawVcs, FxIndexMap, FxIndexSet, ResolvedVc, TaskInput, TryJoinIterExt, fxindexmap, trace::TraceRawVcs, FxIndexMap, FxIndexSet, NonLocalValue, ResolvedVc, TaskInput,
Value, ValueToString, Vc, TryJoinIterExt, Value, ValueToString, Vc,
}; };
use turbo_tasks_fs::{ use turbo_tasks_fs::{
util::normalize_request, FileSystemEntryType, FileSystemPath, RealPathResult, util::normalize_request, FileSystemEntryType, FileSystemPath, RealPathResult,
...@@ -386,7 +386,17 @@ impl Display for ExternalTraced { ...@@ -386,7 +386,17 @@ impl Display for ExternalTraced {
} }
#[derive( #[derive(
Copy, Clone, Debug, Eq, PartialEq, Hash, Serialize, Deserialize, TraceRawVcs, TaskInput, Copy,
Clone,
Debug,
Eq,
PartialEq,
Hash,
Serialize,
Deserialize,
TraceRawVcs,
TaskInput,
NonLocalValue,
)] )]
pub enum ExternalType { pub enum ExternalType {
Url, Url,
...@@ -1269,7 +1279,7 @@ pub async fn find_context_file_or_package_key( ...@@ -1269,7 +1279,7 @@ pub async fn find_context_file_or_package_key(
} }
} }
#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, Debug)] #[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, Debug, NonLocalValue)]
enum FindPackageItem { enum FindPackageItem {
PackageDirectory(ResolvedVc<FileSystemPath>), PackageDirectory(ResolvedVc<FileSystemPath>),
PackageFile(ResolvedVc<FileSystemPath>), PackageFile(ResolvedVc<FileSystemPath>),
......
...@@ -4,8 +4,8 @@ use anyhow::{bail, Result}; ...@@ -4,8 +4,8 @@ use anyhow::{bail, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexSet, ResolvedVc, TryJoinIterExt, Value, debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexSet, NonLocalValue, ResolvedVc,
ValueToString, Vc, TryJoinIterExt, Value, ValueToString, Vc,
}; };
use turbo_tasks_fs::{glob::Glob, FileSystemPath}; use turbo_tasks_fs::{glob::Glob, FileSystemPath};
...@@ -21,13 +21,22 @@ use crate::resolve::{parse::Request, plugin::AfterResolvePlugin, ExternalTraced} ...@@ -21,13 +21,22 @@ use crate::resolve::{parse::Request, plugin::AfterResolvePlugin, ExternalTraced}
#[derive(Hash, Debug)] #[derive(Hash, Debug)]
pub struct LockedVersions {} pub struct LockedVersions {}
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent, non_local)]
#[derive(Debug)] #[derive(Debug)]
pub struct ExcludedExtensions(pub FxIndexSet<RcStr>); pub struct ExcludedExtensions(pub FxIndexSet<RcStr>);
/// A location where to resolve modules. /// A location where to resolve modules.
#[derive( #[derive(
TraceRawVcs, Hash, PartialEq, Eq, Clone, Debug, Serialize, Deserialize, ValueDebugFormat, TraceRawVcs,
Hash,
PartialEq,
Eq,
Clone,
Debug,
Serialize,
Deserialize,
ValueDebugFormat,
NonLocalValue,
)] )]
pub enum ResolveModules { pub enum ResolveModules {
/// when inside of path, use the list of directories to /// when inside of path, use the list of directories to
...@@ -40,7 +49,9 @@ pub enum ResolveModules { ...@@ -40,7 +49,9 @@ pub enum ResolveModules {
}, },
} }
#[derive(TraceRawVcs, Hash, PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize)] #[derive(
TraceRawVcs, Hash, PartialEq, Eq, Clone, Copy, Debug, Serialize, Deserialize, NonLocalValue,
)]
pub enum ConditionValue { pub enum ConditionValue {
Set, Set,
Unset, Unset,
...@@ -60,7 +71,7 @@ impl From<bool> for ConditionValue { ...@@ -60,7 +71,7 @@ impl From<bool> for ConditionValue {
pub type ResolutionConditions = BTreeMap<RcStr, ConditionValue>; pub type ResolutionConditions = BTreeMap<RcStr, ConditionValue>;
/// The different ways to resolve a package, as described in package.json. /// The different ways to resolve a package, as described in package.json.
#[derive(TraceRawVcs, Hash, PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] #[derive(TraceRawVcs, Hash, PartialEq, Eq, Clone, Debug, Serialize, Deserialize, NonLocalValue)]
pub enum ResolveIntoPackage { pub enum ResolveIntoPackage {
/// Using the [exports] field. /// Using the [exports] field.
/// ///
...@@ -78,7 +89,7 @@ pub enum ResolveIntoPackage { ...@@ -78,7 +89,7 @@ pub enum ResolveIntoPackage {
} }
// The different ways to resolve a request withing a package // The different ways to resolve a request withing a package
#[derive(TraceRawVcs, Hash, PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] #[derive(TraceRawVcs, Hash, PartialEq, Eq, Clone, Debug, Serialize, Deserialize, NonLocalValue)]
pub enum ResolveInPackage { pub enum ResolveInPackage {
/// Using a alias field which allows to map requests /// Using a alias field which allows to map requests
AliasField(RcStr), AliasField(RcStr),
......
...@@ -6,7 +6,7 @@ use turbo_tasks::{ResolvedVc, TryJoinIterExt, Value, ValueToString, Vc}; ...@@ -6,7 +6,7 @@ use turbo_tasks::{ResolvedVc, TryJoinIterExt, Value, ValueToString, Vc};
use super::pattern::Pattern; use super::pattern::Pattern;
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared, non_local)]
#[derive(Hash, Clone, Debug)] #[derive(Hash, Clone, Debug)]
pub enum Request { pub enum Request {
Raw { Raw {
......
...@@ -18,7 +18,7 @@ use turbo_tasks_fs::{ ...@@ -18,7 +18,7 @@ use turbo_tasks_fs::{
LinkContent, LinkType, LinkContent, LinkType,
}; };
#[turbo_tasks::value(shared, serialization = "auto_for_input")] #[turbo_tasks::value(shared, serialization = "auto_for_input", non_local)]
#[derive(Hash, Clone, Debug, Default)] #[derive(Hash, Clone, Debug, Default)]
pub enum Pattern { pub enum Pattern {
Constant(RcStr), Constant(RcStr),
......
...@@ -5,7 +5,7 @@ use turbo_tasks_fs::{ ...@@ -5,7 +5,7 @@ use turbo_tasks_fs::{
DirectoryContent, FileContent, FileMeta, FileSystem, FileSystemPath, LinkContent, DirectoryContent, FileContent, FileMeta, FileSystem, FileSystemPath, LinkContent,
}; };
#[turbo_tasks::value] #[turbo_tasks::value(non_local)]
pub struct ServerFileSystem {} pub struct ServerFileSystem {}
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, TaskInput}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, TaskInput};
use turbo_tasks_hash::DeterministicHash; use turbo_tasks_hash::DeterministicHash;
/// LINE FEED (LF), one of the basic JS line terminators. /// LINE FEED (LF), one of the basic JS line terminators.
...@@ -22,6 +22,7 @@ const U8_CR: u8 = 0x0D; ...@@ -22,6 +22,7 @@ const U8_CR: u8 = 0x0D;
Serialize, Serialize,
Deserialize, Deserialize,
DeterministicHash, DeterministicHash,
NonLocalValue,
)] )]
pub struct SourcePos { pub struct SourcePos {
/// The line, 0-indexed. /// The line, 0-indexed.
......
use std::fmt::Display; use std::fmt::Display;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, Vc};
#[turbo_tasks::value(shared, serialization = "auto_for_input")] #[turbo_tasks::value(shared, serialization = "auto_for_input")]
#[derive(Hash, Debug, Copy, Clone)] #[derive(Hash, Debug, Copy, Clone)]
...@@ -172,7 +172,9 @@ impl CompileTarget { ...@@ -172,7 +172,9 @@ impl CompileTarget {
} }
} }
#[derive(PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, Serialize, Deserialize)] #[derive(
PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
#[repr(u8)] #[repr(u8)]
#[non_exhaustive] #[non_exhaustive]
pub enum Arch { pub enum Arch {
...@@ -213,7 +215,9 @@ impl Display for Arch { ...@@ -213,7 +215,9 @@ impl Display for Arch {
} }
} }
#[derive(PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, Serialize, Deserialize)] #[derive(
PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
#[repr(u8)] #[repr(u8)]
#[non_exhaustive] #[non_exhaustive]
pub enum Platform { pub enum Platform {
...@@ -250,7 +254,9 @@ impl Display for Platform { ...@@ -250,7 +254,9 @@ impl Display for Platform {
} }
} }
#[derive(PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, Serialize, Deserialize)] #[derive(
PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
#[repr(u8)] #[repr(u8)]
pub enum Endianness { pub enum Endianness {
Big, Big,
...@@ -272,7 +278,9 @@ impl Display for Endianness { ...@@ -272,7 +278,9 @@ impl Display for Endianness {
} }
} }
#[derive(PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, Serialize, Deserialize)] #[derive(
PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
#[repr(u8)] #[repr(u8)]
pub enum Libc { pub enum Libc {
Glibc, Glibc,
......
...@@ -3,8 +3,8 @@ use std::sync::Arc; ...@@ -3,8 +3,8 @@ use std::sync::Arc;
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, IntoTraitRef, ReadRef, ResolvedVc, State, debug::ValueDebugFormat, trace::TraceRawVcs, IntoTraitRef, NonLocalValue, ReadRef, ResolvedVc,
TraitRef, Vc, State, TraitRef, Vc,
}; };
use turbo_tasks_fs::{FileContent, LinkType}; use turbo_tasks_fs::{FileContent, LinkType};
use turbo_tasks_hash::{encode_hex, hash_xxh3_hash64}; use turbo_tasks_hash::{encode_hex, hash_xxh3_hash64};
...@@ -188,7 +188,7 @@ pub enum Update { ...@@ -188,7 +188,7 @@ pub enum Update {
} }
/// A total update to a versioned object. /// A total update to a versioned object.
#[derive(PartialEq, Eq, Debug, Clone, TraceRawVcs, ValueDebugFormat)] #[derive(PartialEq, Eq, Debug, Clone, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct TotalUpdate { pub struct TotalUpdate {
/// The version this update will bring the object to. /// The version this update will bring the object to.
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
...@@ -196,7 +196,7 @@ pub struct TotalUpdate { ...@@ -196,7 +196,7 @@ pub struct TotalUpdate {
} }
/// A partial update to a versioned object. /// A partial update to a versioned object.
#[derive(PartialEq, Eq, Debug, Clone, TraceRawVcs, ValueDebugFormat)] #[derive(PartialEq, Eq, Debug, Clone, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct PartialUpdate { pub struct PartialUpdate {
/// The version this update will bring the object to. /// The version this update will bring the object to.
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
......
...@@ -19,7 +19,7 @@ pub(crate) mod util; ...@@ -19,7 +19,7 @@ pub(crate) mod util;
pub use asset::CssModuleAsset; pub use asset::CssModuleAsset;
pub use module_asset::ModuleCssAsset; pub use module_asset::ModuleCssAsset;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, TaskInput}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, TaskInput};
pub use self::process::*; pub use self::process::*;
use crate::references::import::ImportAssetReference; use crate::references::import::ImportAssetReference;
...@@ -38,6 +38,7 @@ use crate::references::import::ImportAssetReference; ...@@ -38,6 +38,7 @@ use crate::references::import::ImportAssetReference;
Deserialize, Deserialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue,
)] )]
pub enum CssModuleAssetType { pub enum CssModuleAssetType {
/// Default parsing mode. /// Default parsing mode.
......
...@@ -33,8 +33,8 @@ use socket2::{Domain, Protocol, Socket, Type}; ...@@ -33,8 +33,8 @@ use socket2::{Domain, Protocol, Socket, Type};
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
use tracing::{event, info_span, Instrument, Level, Span}; use tracing::{event, info_span, Instrument, Level, Span};
use turbo_tasks::{ use turbo_tasks::{
apply_effects, run_once_with_reason, trace::TraceRawVcs, util::FormatDuration, TurboTasksApi, apply_effects, run_once_with_reason, trace::TraceRawVcs, util::FormatDuration, NonLocalValue,
Vc, TurboTasksApi, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
error::PrettyPrintError, error::PrettyPrintError,
...@@ -61,7 +61,7 @@ where ...@@ -61,7 +61,7 @@ where
} }
} }
#[derive(TraceRawVcs, Debug)] #[derive(TraceRawVcs, Debug, NonLocalValue)]
pub struct DevServerBuilder { pub struct DevServerBuilder {
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
pub addr: SocketAddr, pub addr: SocketAddr,
...@@ -69,7 +69,7 @@ pub struct DevServerBuilder { ...@@ -69,7 +69,7 @@ pub struct DevServerBuilder {
server: Builder<AddrIncoming>, server: Builder<AddrIncoming>,
} }
#[derive(TraceRawVcs)] #[derive(TraceRawVcs, NonLocalValue)]
pub struct DevServer { pub struct DevServer {
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
pub addr: SocketAddr, pub addr: SocketAddr,
......
use std::{collections::BTreeMap, hash::Hash, mem::replace, ops::DerefMut}; use std::{collections::BTreeMap, hash::Hash, mem::replace, ops::DerefMut};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::trace::TraceRawVcs; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue};
/// A parsed query string from a http request /// A parsed query string from a http request
#[derive(Clone, Debug, PartialEq, Eq, Default, Hash, TraceRawVcs, Serialize, Deserialize)] #[derive(
Clone, Debug, PartialEq, Eq, Default, Hash, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
#[serde(transparent)] #[serde(transparent)]
pub struct Headers(BTreeMap<String, HeaderValue>); pub struct Headers(BTreeMap<String, HeaderValue>);
/// The value of an http header. HTTP headers might contain non-utf-8 bytes. An /// The value of an http header. HTTP headers might contain non-utf-8 bytes. An
/// header might also occur multiple times. /// header might also occur multiple times.
#[derive(Clone, Debug, PartialEq, Eq, Hash, TraceRawVcs, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Eq, Hash, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
#[serde(untagged)] #[serde(untagged)]
pub enum HeaderValue { pub enum HeaderValue {
SingleString(String), SingleString(String),
......
...@@ -19,7 +19,8 @@ use futures::{stream::Stream as StreamTrait, TryStreamExt}; ...@@ -19,7 +19,8 @@ use futures::{stream::Stream as StreamTrait, TryStreamExt};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, util::SharedError, Completion, ResolvedVc, Upcast, Value, ValueDefault, Vc, trace::TraceRawVcs, util::SharedError, Completion, NonLocalValue, ResolvedVc, Upcast, Value,
ValueDefault, Vc,
}; };
use turbo_tasks_bytes::{Bytes, Stream, StreamRead}; use turbo_tasks_bytes::{Bytes, Stream, StreamRead};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
...@@ -250,7 +251,7 @@ impl ValueDefault for Body { ...@@ -250,7 +251,7 @@ impl ValueDefault for Body {
} }
/// Filter function that describes which information is required. /// Filter function that describes which information is required.
#[derive(Debug, Clone, PartialEq, Eq, TraceRawVcs, Hash, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, TraceRawVcs, Hash, Serialize, Deserialize, NonLocalValue)]
pub enum ContentSourceDataFilter { pub enum ContentSourceDataFilter {
All, All,
Subset(BTreeSet<String>), Subset(BTreeSet<String>),
......
use std::{collections::BTreeMap, hash::Hash, ops::DerefMut}; use std::{collections::BTreeMap, hash::Hash, ops::DerefMut};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::trace::TraceRawVcs; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue};
use super::ContentSourceDataFilter; use super::ContentSourceDataFilter;
/// A parsed query string from a http request /// A parsed query string from a http request
#[derive(Clone, Debug, PartialEq, Eq, Default, Hash, TraceRawVcs, Serialize, Deserialize)] #[derive(
Clone, Debug, PartialEq, Eq, Default, Hash, TraceRawVcs, Serialize, Deserialize, NonLocalValue,
)]
#[serde(transparent)] #[serde(transparent)]
pub struct Query(BTreeMap<String, QueryValue>); pub struct Query(BTreeMap<String, QueryValue>);
...@@ -34,7 +36,7 @@ impl DerefMut for Query { ...@@ -34,7 +36,7 @@ impl DerefMut for Query {
} }
} }
#[derive(Clone, Debug, PartialEq, Eq, Hash, TraceRawVcs, Serialize, Deserialize)] #[derive(Clone, Debug, PartialEq, Eq, Hash, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
#[serde(untagged)] #[serde(untagged)]
pub enum QueryValue { pub enum QueryValue {
/// Simple string value, might be an empty string when there is no value /// Simple string value, might be an empty string when there is no value
......
...@@ -4,15 +4,17 @@ use anyhow::Result; ...@@ -4,15 +4,17 @@ use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
fxindexmap, trace::TraceRawVcs, FxIndexMap, ResolvedVc, TaskInput, TryJoinIterExt, fxindexmap, trace::TraceRawVcs, FxIndexMap, NonLocalValue, ResolvedVc, TaskInput,
ValueToString, Vc, TryJoinIterExt, ValueToString, Vc,
}; };
use super::{GetContentSourceContent, GetContentSourceContents}; use super::{GetContentSourceContent, GetContentSourceContents};
/// The type of the route. THis will decide about the remaining segements of the /// The type of the route. THis will decide about the remaining segements of the
/// route after the base. /// route after the base.
#[derive(TaskInput, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs)] #[derive(
TaskInput, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs, NonLocalValue,
)]
pub enum RouteType { pub enum RouteType {
Exact, Exact,
CatchAll, CatchAll,
...@@ -21,7 +23,9 @@ pub enum RouteType { ...@@ -21,7 +23,9 @@ pub enum RouteType {
} }
/// Some normal segment of a route. /// Some normal segment of a route.
#[derive(TaskInput, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs)] #[derive(
TaskInput, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, TraceRawVcs, NonLocalValue,
)]
pub enum BaseSegment { pub enum BaseSegment {
Static(RcStr), Static(RcStr),
Dynamic, Dynamic,
......
...@@ -14,10 +14,10 @@ use swc_core::{ ...@@ -14,10 +14,10 @@ use swc_core::{
visit::FoldWith, visit::FoldWith,
}, },
}; };
use turbo_tasks::{trace::TraceRawVcs, ValueDefault, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ValueDefault, Vc};
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
#[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum EmotionLabelKind { pub enum EmotionLabelKind {
DevOnly, DevOnly,
...@@ -27,7 +27,7 @@ pub enum EmotionLabelKind { ...@@ -27,7 +27,7 @@ pub enum EmotionLabelKind {
//[TODO]: need to support importmap, there are type mismatch between //[TODO]: need to support importmap, there are type mismatch between
//next.config.js to swc's emotion options //next.config.js to swc's emotion options
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared, non_local)]
#[derive(Default, Clone, Debug)] #[derive(Default, Clone, Debug)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct EmotionTransformConfig { pub struct EmotionTransformConfig {
......
...@@ -5,10 +5,10 @@ use async_trait::async_trait; ...@@ -5,10 +5,10 @@ use async_trait::async_trait;
use modularize_imports::{modularize_imports, Config, PackageConfig}; use modularize_imports::{modularize_imports, Config, PackageConfig};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use swc_core::ecma::ast::Program; use swc_core::ecma::ast::Program;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap}; use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, NonLocalValue};
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct ModularizeImportPackageConfig { pub struct ModularizeImportPackageConfig {
pub transform: String, pub transform: String,
......
...@@ -5,11 +5,11 @@ use async_trait::async_trait; ...@@ -5,11 +5,11 @@ use async_trait::async_trait;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use swc_core::{common::FileName, ecma::ast::Program}; use swc_core::{common::FileName, ecma::ast::Program};
use swc_relay::RelayLanguageConfig; use swc_relay::RelayLanguageConfig;
use turbo_tasks::trace::TraceRawVcs; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct RelayConfig { pub struct RelayConfig {
pub src: String, pub src: String,
...@@ -17,7 +17,7 @@ pub struct RelayConfig { ...@@ -17,7 +17,7 @@ pub struct RelayConfig {
pub language: Option<RelayLanguage>, pub language: Option<RelayLanguage>,
} }
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
#[serde(rename_all = "lowercase")] #[serde(rename_all = "lowercase")]
pub enum RelayLanguage { pub enum RelayLanguage {
TypeScript, TypeScript,
......
...@@ -9,7 +9,7 @@ use swc_core::{ ...@@ -9,7 +9,7 @@ use swc_core::{
use turbo_tasks::{ValueDefault, Vc}; use turbo_tasks::{ValueDefault, Vc};
use turbopack_ecmascript::{CustomTransformer, TransformContext}; use turbopack_ecmascript::{CustomTransformer, TransformContext};
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared, non_local)]
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
#[serde(default, rename_all = "camelCase")] #[serde(default, rename_all = "camelCase")]
pub struct StyledComponentsTransformConfig { pub struct StyledComponentsTransformConfig {
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::trace::TraceRawVcs; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue};
#[derive(Serialize, Deserialize, Debug, Clone, Copy, Hash, PartialEq, Eq, TraceRawVcs)] #[derive(
Serialize, Deserialize, Debug, Clone, Copy, Hash, PartialEq, Eq, TraceRawVcs, NonLocalValue,
)]
pub enum RuntimeType { pub enum RuntimeType {
Development, Development,
Production, Production,
......
...@@ -2,7 +2,7 @@ use std::io::Write; ...@@ -2,7 +2,7 @@ use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, Upcast, ValueToString, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, Upcast, ValueToString, Vc};
use turbo_tasks_fs::{rope::Rope, FileSystemPath}; use turbo_tasks_fs::{rope::Rope, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkItem, ChunkItemExt, ChunkingContext}, chunk::{AsyncModuleInfo, ChunkItem, ChunkItemExt, ChunkingContext},
...@@ -181,7 +181,9 @@ impl EcmascriptChunkItemContent { ...@@ -181,7 +181,9 @@ impl EcmascriptChunkItemContent {
} }
} }
#[derive(PartialEq, Eq, Default, Debug, Clone, Serialize, Deserialize, TraceRawVcs)] #[derive(
PartialEq, Eq, Default, Debug, Clone, Serialize, Deserialize, TraceRawVcs, NonLocalValue,
)]
pub struct EcmascriptChunkItemOptions { pub struct EcmascriptChunkItemOptions {
/// Whether this chunk item should be in "use strict" mode. /// Whether this chunk item should be in "use strict" mode.
pub strict: bool, pub strict: bool,
......
...@@ -60,8 +60,8 @@ pub use transform::{ ...@@ -60,8 +60,8 @@ pub use transform::{
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, FxIndexMap, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, Value, trace::TraceRawVcs, FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt,
ValueToString, Vc, Value, ValueToString, Vc,
}; };
use turbo_tasks_fs::{rope::Rope, FileJsonContent, FileSystemPath}; use turbo_tasks_fs::{rope::Rope, FileJsonContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
...@@ -117,6 +117,7 @@ pub enum SpecifiedModuleType { ...@@ -117,6 +117,7 @@ pub enum SpecifiedModuleType {
Serialize, Serialize,
Deserialize, Deserialize,
TraceRawVcs, TraceRawVcs,
NonLocalValue,
)] )]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum TreeShakingMode { pub enum TreeShakingMode {
......
...@@ -12,8 +12,8 @@ use swc_core::{ ...@@ -12,8 +12,8 @@ use swc_core::{
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, ReadRef, ResolvedVc, TryJoinIterExt, Value, debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ReadRef, ResolvedVc,
ValueToString, Vc, TryJoinIterExt, Value, ValueToString, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{ChunkableModuleReference, ChunkingContext}, chunk::{ChunkableModuleReference, ChunkingContext},
...@@ -83,7 +83,17 @@ impl ValueToString for AmdDefineAssetReference { ...@@ -83,7 +83,17 @@ impl ValueToString for AmdDefineAssetReference {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl ChunkableModuleReference for AmdDefineAssetReference {} impl ChunkableModuleReference for AmdDefineAssetReference {}
#[derive(ValueDebugFormat, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, Clone)] #[derive(
ValueDebugFormat,
Debug,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
Clone,
NonLocalValue,
)]
pub enum AmdDefineDependencyElement { pub enum AmdDefineDependencyElement {
Request { Request {
request: ResolvedVc<Request>, request: ResolvedVc<Request>,
...@@ -95,7 +105,16 @@ pub enum AmdDefineDependencyElement { ...@@ -95,7 +105,16 @@ pub enum AmdDefineDependencyElement {
} }
#[derive( #[derive(
ValueDebugFormat, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, Copy, Clone, ValueDebugFormat,
Debug,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
Copy,
Clone,
NonLocalValue,
)] )]
pub enum AmdDefineFactoryType { pub enum AmdDefineFactoryType {
Unknown, Unknown,
......
...@@ -6,7 +6,8 @@ use swc_core::{ ...@@ -6,7 +6,8 @@ use swc_core::{
quote, quote,
}; };
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, FxIndexSet, ReadRef, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Vc, trace::TraceRawVcs, FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TryFlatJoinIterExt,
TryJoinIterExt, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
...@@ -21,7 +22,9 @@ use crate::code_gen::{CodeGeneration, CodeGenerationHoistedStmt}; ...@@ -21,7 +22,9 @@ use crate::code_gen::{CodeGeneration, CodeGenerationHoistedStmt};
/// Information needed for generating the async module wrapper for /// Information needed for generating the async module wrapper for
/// [EcmascriptChunkItem](crate::chunk::EcmascriptChunkItem)s. /// [EcmascriptChunkItem](crate::chunk::EcmascriptChunkItem)s.
#[derive(PartialEq, Eq, Default, Debug, Clone, Serialize, Deserialize, TraceRawVcs)] #[derive(
PartialEq, Eq, Default, Debug, Clone, Serialize, Deserialize, TraceRawVcs, NonLocalValue,
)]
pub struct AsyncModuleOptions { pub struct AsyncModuleOptions {
pub has_top_level_await: bool, pub has_top_level_await: bool,
} }
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use swc_core::quote; use swc_core::quote;
use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, ResolvedVc, Vc}; use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, Vc};
use turbopack_core::chunk::ChunkingContext; use turbopack_core::chunk::ChunkingContext;
use super::AstPath; use super::AstPath;
...@@ -10,7 +10,7 @@ use crate::{ ...@@ -10,7 +10,7 @@ use crate::{
create_visitor, create_visitor,
}; };
#[derive(PartialEq, Eq, TraceRawVcs, Serialize, Deserialize, ValueDebugFormat)] #[derive(PartialEq, Eq, TraceRawVcs, Serialize, Deserialize, ValueDebugFormat, NonLocalValue)]
enum DynamicExpressionType { enum DynamicExpressionType {
Promise, Promise,
Normal, Normal,
......
...@@ -16,7 +16,8 @@ use swc_core::{ ...@@ -16,7 +16,8 @@ use swc_core::{
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, FxIndexMap, ResolvedVc, TryFlatJoinIterExt, ValueToString, Vc, trace::TraceRawVcs, FxIndexMap, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, ValueToString,
Vc,
}; };
use turbo_tasks_fs::glob::Glob; use turbo_tasks_fs::glob::Glob;
use turbopack_core::{ use turbopack_core::{
...@@ -107,7 +108,7 @@ pub async fn all_known_export_names( ...@@ -107,7 +108,7 @@ pub async fn all_known_export_names(
Ok(Vc::cell(export_names.esm_exports.keys().cloned().collect())) Ok(Vc::cell(export_names.esm_exports.keys().cloned().collect()))
} }
#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
pub enum FoundExportType { pub enum FoundExportType {
Found, Found,
Dynamic, Dynamic,
......
...@@ -3,7 +3,7 @@ use std::{fmt::Display, io::Write}; ...@@ -3,7 +3,7 @@ use std::{fmt::Display, io::Write};
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, TaskInput, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, TaskInput, Vc};
use turbo_tasks_fs::{glob::Glob, rope::RopeBuilder, FileContent, FileSystem, VirtualFileSystem}; use turbo_tasks_fs::{glob::Glob, rope::RopeBuilder, FileContent, FileSystem, VirtualFileSystem};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
...@@ -29,7 +29,17 @@ fn layer() -> Vc<RcStr> { ...@@ -29,7 +29,17 @@ fn layer() -> Vc<RcStr> {
} }
#[derive( #[derive(
Copy, Clone, Debug, Eq, PartialEq, Serialize, Deserialize, TraceRawVcs, TaskInput, Hash, Copy,
Clone,
Debug,
Eq,
PartialEq,
Serialize,
Deserialize,
TraceRawVcs,
TaskInput,
Hash,
NonLocalValue,
)] )]
pub enum CachedExternalType { pub enum CachedExternalType {
CommonJs, CommonJs,
......
...@@ -3216,7 +3216,7 @@ async fn resolve_as_webpack_runtime( ...@@ -3216,7 +3216,7 @@ async fn resolve_as_webpack_runtime(
} }
// TODO enable serialization // TODO enable serialization
#[turbo_tasks::value(transparent, serialization = "none")] #[turbo_tasks::value(transparent, serialization = "none", non_local)]
pub struct AstPath(#[turbo_tasks(trace_ignore)] Vec<AstParentKind>); pub struct AstPath(#[turbo_tasks(trace_ignore)] Vec<AstParentKind>);
pub static TURBOPACK_HELPER: Lazy<JsWord> = Lazy::new(|| "__turbopack-helper__".into()); pub static TURBOPACK_HELPER: Lazy<JsWord> = Lazy::new(|| "__turbopack-helper__".into());
......
...@@ -12,7 +12,8 @@ use swc_core::{ ...@@ -12,7 +12,8 @@ use swc_core::{
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexMap, ResolvedVc, TryJoinIterExt, Value, Vc, debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexMap, NonLocalValue, ResolvedVc,
TryJoinIterExt, Value, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, ModuleId}, chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, ModuleId},
...@@ -29,7 +30,7 @@ use turbopack_core::{ ...@@ -29,7 +30,7 @@ use turbopack_core::{
use super::util::{request_to_string, throw_module_not_found_expr}; use super::util::{request_to_string, throw_module_not_found_expr};
use crate::{references::util::throw_module_not_found_error_expr, utils::module_id_to_lit}; use crate::{references::util::throw_module_not_found_error_expr, utils::module_id_to_lit};
#[derive(PartialEq, Eq, ValueDebugFormat, TraceRawVcs, Serialize, Deserialize)] #[derive(PartialEq, Eq, ValueDebugFormat, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
pub(crate) enum SinglePatternMapping { pub(crate) enum SinglePatternMapping {
/// Invalid request. /// Invalid request.
Invalid, Invalid,
......
...@@ -17,7 +17,7 @@ use image::{ ...@@ -17,7 +17,7 @@ use image::{
use mime::Mime; use mime::Mime;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_with::{serde_as, DisplayFromStr}; use serde_with::{serde_as, DisplayFromStr};
use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, ResolvedVc, Vc}; use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
error::PrettyPrintError, error::PrettyPrintError,
...@@ -28,7 +28,7 @@ use turbopack_core::{ ...@@ -28,7 +28,7 @@ use turbopack_core::{
use self::svg::calculate; use self::svg::calculate;
/// Small placeholder version of the image. /// Small placeholder version of the image.
#[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat)] #[derive(PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct BlurPlaceholder { pub struct BlurPlaceholder {
pub data_url: String, pub data_url: String,
pub width: u32, pub width: u32,
......
...@@ -24,7 +24,7 @@ fn modifier() -> Vc<RcStr> { ...@@ -24,7 +24,7 @@ fn modifier() -> Vc<RcStr> {
Vc::cell("mdx".into()) Vc::cell("mdx".into())
} }
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared, non_local)]
#[derive(Hash, Debug, Clone)] #[derive(Hash, Debug, Clone)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub enum MdxParseConstructs { pub enum MdxParseConstructs {
...@@ -35,7 +35,7 @@ pub enum MdxParseConstructs { ...@@ -35,7 +35,7 @@ pub enum MdxParseConstructs {
/// Subset of mdxjs::Options to allow to inherit turbopack's jsx-related configs /// Subset of mdxjs::Options to allow to inherit turbopack's jsx-related configs
/// into mdxjs. This is thin, near straightforward subset of mdxjs::Options to /// into mdxjs. This is thin, near straightforward subset of mdxjs::Options to
/// enable turbo tasks. /// enable turbo tasks.
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared, non_local)]
#[derive(Hash, Debug, Clone)] #[derive(Hash, Debug, Clone)]
#[serde(rename_all = "camelCase", default)] #[serde(rename_all = "camelCase", default)]
pub struct MdxTransformOptions { pub struct MdxTransformOptions {
......
...@@ -3,7 +3,7 @@ use indoc::formatdoc; ...@@ -3,7 +3,7 @@ use indoc::formatdoc;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
fxindexmap, trace::TraceRawVcs, Completion, Completions, ResolvedVc, TaskInput, fxindexmap, trace::TraceRawVcs, Completion, Completions, NonLocalValue, ResolvedVc, TaskInput,
TryFlatJoinIterExt, Value, Vc, TryFlatJoinIterExt, Value, Vc,
}; };
use turbo_tasks_bytes::stream::SingleValue; use turbo_tasks_bytes::stream::SingleValue;
...@@ -47,7 +47,18 @@ struct PostCssProcessingResult { ...@@ -47,7 +47,18 @@ struct PostCssProcessingResult {
} }
#[derive( #[derive(
Default, Copy, Clone, PartialEq, Eq, Hash, Debug, TraceRawVcs, Serialize, Deserialize, TaskInput, Default,
Copy,
Clone,
PartialEq,
Eq,
Hash,
Debug,
TraceRawVcs,
Serialize,
Deserialize,
TaskInput,
NonLocalValue,
)] )]
pub enum PostCssConfigLocation { pub enum PostCssConfigLocation {
#[default] #[default]
......
...@@ -8,7 +8,8 @@ use serde_json::{json, Value as JsonValue}; ...@@ -8,7 +8,8 @@ use serde_json::{json, Value as JsonValue};
use serde_with::serde_as; use serde_with::serde_as;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, Completion, ResolvedVc, TaskInput, TryJoinIterExt, Value, ValueToString, Vc, trace::TraceRawVcs, Completion, NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, Value,
ValueToString, Vc,
}; };
use turbo_tasks_bytes::stream::SingleValue; use turbo_tasks_bytes::stream::SingleValue;
use turbo_tasks_env::ProcessEnv; use turbo_tasks_env::ProcessEnv;
...@@ -74,15 +75,14 @@ struct WebpackLoadersProcessingResult { ...@@ -74,15 +75,14 @@ struct WebpackLoadersProcessingResult {
assets: Option<Vec<EmittedAsset>>, assets: Option<Vec<EmittedAsset>>,
} }
#[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
pub struct WebpackLoaderItem { pub struct WebpackLoaderItem {
pub loader: RcStr, pub loader: RcStr,
#[turbo_tasks(trace_ignore)]
pub options: serde_json::Map<String, serde_json::Value>, pub options: serde_json::Map<String, serde_json::Value>,
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[turbo_tasks::value(shared, transparent)] #[turbo_tasks::value(shared, transparent, non_local)]
pub struct WebpackLoaderItems(pub Vec<WebpackLoaderItem>); pub struct WebpackLoaderItems(pub Vec<WebpackLoaderItem>);
#[turbo_tasks::value] #[turbo_tasks::value]
......
...@@ -12,8 +12,8 @@ use dunce::canonicalize; ...@@ -12,8 +12,8 @@ use dunce::canonicalize;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
apply_effects, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, Completion, ResolvedVc, apply_effects, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, Completion,
TryJoinIterExt, TurboTasks, Value, Vc, NonLocalValue, ResolvedVc, TryJoinIterExt, TurboTasks, Value, Vc,
}; };
use turbo_tasks_bytes::stream::SingleValue; use turbo_tasks_bytes::stream::SingleValue;
use turbo_tasks_env::CommandLineProcessEnv; use turbo_tasks_env::CommandLineProcessEnv;
...@@ -193,7 +193,17 @@ async fn run_inner( ...@@ -193,7 +193,17 @@ async fn run_inner(
Ok(*run_result.await?.js_result) Ok(*run_result.await?.js_result)
} }
#[derive(PartialEq, Eq, Debug, Default, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat)] #[derive(
PartialEq,
Eq,
Debug,
Default,
Serialize,
Deserialize,
TraceRawVcs,
ValueDebugFormat,
NonLocalValue,
)]
#[serde(rename_all = "camelCase", deny_unknown_fields)] #[serde(rename_all = "camelCase", deny_unknown_fields)]
struct TestOptions { struct TestOptions {
tree_shaking_mode: Option<TreeShakingMode>, tree_shaking_mode: Option<TreeShakingMode>,
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, TaskInput, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, ResolvedVc, TaskInput, Vc};
use turbo_tasks_fs::{File, FileContent}; use turbo_tasks_fs::{File, FileContent};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
...@@ -21,6 +21,7 @@ use turbopack_core::{ ...@@ -21,6 +21,7 @@ use turbopack_core::{
Deserialize, Deserialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue,
)] )]
pub enum WebAssemblySourceType { pub enum WebAssemblySourceType {
/// Binary WebAssembly files (.wasm). /// Binary WebAssembly files (.wasm).
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::trace::TraceRawVcs; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue};
use turbopack_core::reference_type::ReferenceType; use turbopack_core::reference_type::ReferenceType;
#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
pub enum MatchMode { pub enum MatchMode {
// Match all but internal references. // Match all but internal references.
NonInternal, NonInternal,
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, ResolvedVc, ValueDefault, Vc}; use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, NonLocalValue, ResolvedVc, ValueDefault, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
chunk::MinifyType, condition::ContextCondition, environment::Environment, chunk::MinifyType, condition::ContextCondition, environment::Environment,
...@@ -15,7 +15,7 @@ use turbopack_node::{ ...@@ -15,7 +15,7 @@ use turbopack_node::{
use super::ModuleRule; use super::ModuleRule;
#[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
pub struct LoaderRuleItem { pub struct LoaderRuleItem {
pub loaders: ResolvedVc<WebpackLoaderItems>, pub loaders: ResolvedVc<WebpackLoaderItems>,
pub rename_as: Option<RcStr>, pub rename_as: Option<RcStr>,
...@@ -38,14 +38,14 @@ pub struct WebpackLoadersOptions { ...@@ -38,14 +38,14 @@ pub struct WebpackLoadersOptions {
/// The kind of decorators transform to use. /// The kind of decorators transform to use.
/// [TODO]: might need bikeshed for the name (Ecma) /// [TODO]: might need bikeshed for the name (Ecma)
#[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
pub enum DecoratorsKind { pub enum DecoratorsKind {
Legacy, Legacy,
Ecma, Ecma,
} }
/// The types when replacing `typeof window` with a constant. /// The types when replacing `typeof window` with a constant.
#[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize)] #[derive(Clone, PartialEq, Eq, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue)]
pub enum TypeofWindow { pub enum TypeofWindow {
Object, Object,
Undefined, Undefined,
......
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