Unverified Commit 940f8892 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

Turbopack: Remove remaining dead implementations of serde traits (#86910)

I grepped for `Serialize` and `Deserialize`, and (because it's hard to automate this) went through everything by hand to try to remove as many unused trait implementations as possible.
parent c450169e
...@@ -6542,15 +6542,6 @@ dependencies = [ ...@@ -6542,15 +6542,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "serde_test"
version = "1.0.177"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "serde_urlencoded" name = "serde_urlencoded"
version = "0.7.1" version = "0.7.1"
...@@ -9124,8 +9115,6 @@ dependencies = [ ...@@ -9124,8 +9115,6 @@ dependencies = [
"bincode 2.0.1", "bincode 2.0.1",
"regex", "regex",
"regress", "regress",
"serde",
"serde_json",
"turbo-tasks", "turbo-tasks",
] ]
...@@ -9325,8 +9314,6 @@ dependencies = [ ...@@ -9325,8 +9314,6 @@ dependencies = [
"bytes", "bytes",
"futures", "futures",
"serde", "serde",
"serde_bytes",
"serde_test",
"turbo-tasks", "turbo-tasks",
] ]
...@@ -9385,7 +9372,6 @@ dependencies = [ ...@@ -9385,7 +9372,6 @@ dependencies = [
"rstest", "rstest",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"serde", "serde",
"serde_bytes",
"serde_json", "serde_json",
"serde_path_to_error", "serde_path_to_error",
"sha2", "sha2",
...@@ -9665,7 +9651,6 @@ dependencies = [ ...@@ -9665,7 +9651,6 @@ dependencies = [
"rstest", "rstest",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"serde", "serde",
"serde_bytes",
"serde_json", "serde_json",
"smallvec", "smallvec",
"swc_core", "swc_core",
......
...@@ -448,7 +448,6 @@ rstest = "0.16.0" ...@@ -448,7 +448,6 @@ rstest = "0.16.0"
rustc-hash = "2.1.1" rustc-hash = "2.1.1"
semver = "1.0.16" semver = "1.0.16"
serde = { version = "1.0.217", features = ["derive"] } serde = { version = "1.0.217", features = ["derive"] }
serde_bytes = "0.11.15"
serde_json = "1.0.138" serde_json = "1.0.138"
serde_path_to_error = "0.1.16" serde_path_to_error = "0.1.16"
serde_qs = "0.13.0" serde_qs = "0.13.0"
......
...@@ -29,7 +29,6 @@ DEALINGS IN THE SOFTWARE. ...@@ -29,7 +29,6 @@ DEALINGS IN THE SOFTWARE.
use anyhow::Context; use anyhow::Context;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use napi_derive::napi; use napi_derive::napi;
use serde::Serialize;
use swc_core::{ use swc_core::{
base::{config::JsMinifyOptions, try_with_handler}, base::{config::JsMinifyOptions, try_with_handler},
common::{FileName, GLOBALS, errors::ColorConfig}, common::{FileName, GLOBALS, errors::ColorConfig},
...@@ -46,13 +45,11 @@ pub struct MinifyTask { ...@@ -46,13 +45,11 @@ pub struct MinifyTask {
// Same as the swc_core::base::TransformOutput, but using our napi-rs v2's derived #[napi], while // Same as the swc_core::base::TransformOutput, but using our napi-rs v2's derived #[napi], while
// swc is already on napi-rs v3. // swc is already on napi-rs v3.
#[napi_derive::napi(object)] #[napi_derive::napi(object)]
#[derive(Debug, Serialize)] #[derive(Debug)]
pub struct TransformOutput { pub struct TransformOutput {
pub code: String, pub code: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub map: Option<String>, pub map: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub output: Option<String>, pub output: Option<String>,
pub diagnostics: std::vec::Vec<String>, pub diagnostics: std::vec::Vec<String>,
} }
......
...@@ -30,7 +30,7 @@ use next_core::tracing_presets::{ ...@@ -30,7 +30,7 @@ use next_core::tracing_presets::{
}; };
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use rand::Rng; use rand::Rng;
use serde::{Deserialize, Serialize}; use serde::Serialize;
use tokio::{io::AsyncWriteExt, runtime::Handle, time::Instant}; use tokio::{io::AsyncWriteExt, runtime::Handle, time::Instant};
use tracing::Instrument; use tracing::Instrument;
use tracing_subscriber::{Registry, layer::SubscriberExt, util::SubscriberInitExt}; use tracing_subscriber::{Registry, layer::SubscriberExt, util::SubscriberInitExt};
...@@ -1520,13 +1520,11 @@ pub fn project_compilation_events_subscribe( ...@@ -1520,13 +1520,11 @@ pub fn project_compilation_events_subscribe(
#[derive( #[derive(
Clone, Clone,
Debug, Debug,
Deserialize,
Eq, Eq,
Hash, Hash,
NonLocalValue, NonLocalValue,
OperationValue, OperationValue,
PartialEq, PartialEq,
Serialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
Encode, Encode,
......
...@@ -3,12 +3,9 @@ use std::{borrow::Cow, io::Write}; ...@@ -3,12 +3,9 @@ use std::{borrow::Cow, io::Write};
use anyhow::Result; use anyhow::Result;
use byteorder::{BE, WriteBytesExt}; use byteorder::{BE, WriteBytesExt};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize}; use serde::Serialize;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{FxIndexSet, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc};
FxIndexSet, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc,
trace::TraceRawVcs,
};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
File, FileContent, FileSystemPath, File, FileContent, FileSystemPath,
rope::{Rope, RopeBuilder}, rope::{Rope, RopeBuilder},
...@@ -25,9 +22,6 @@ use turbopack_core::{ ...@@ -25,9 +22,6 @@ use turbopack_core::{
use crate::route::ModuleGraphs; use crate::route::ModuleGraphs;
#[derive(
Default, Clone, Debug, Deserialize, Eq, NonLocalValue, PartialEq, Serialize, TraceRawVcs,
)]
pub struct EdgesData { pub struct EdgesData {
pub offsets: Vec<u32>, pub offsets: Vec<u32>,
pub data: Vec<u32>, pub data: Vec<u32>,
......
...@@ -69,10 +69,8 @@ use turbopack_core::{ ...@@ -69,10 +69,8 @@ use turbopack_core::{
source_map::SourceMapAsset, source_map::SourceMapAsset,
virtual_output::VirtualOutputAsset, virtual_output::VirtualOutputAsset,
}; };
use turbopack_ecmascript::{ use turbopack_ecmascript::single_file_ecmascript_output::SingleFileEcmascriptOutput;
resolve::cjs_resolve, single_file_ecmascript_output::SingleFileEcmascriptOutput, use turbopack_resolve::{ecmascript::cjs_resolve, resolve_options_context::ResolveOptionsContext};
};
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use crate::{ use crate::{
dynamic_imports::{NextDynamicChunkAvailability, collect_next_dynamic_chunks}, dynamic_imports::{NextDynamicChunkAvailability, collect_next_dynamic_chunks},
......
...@@ -5,7 +5,6 @@ use next_core::{ ...@@ -5,7 +5,6 @@ use next_core::{
next_server_component::server_component_module::NextServerComponentModule, next_server_component::server_component_module::NextServerComponentModule,
}; };
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, ResolvedVc, TryFlatJoinIterExt, Vc, debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, Vc, debug::ValueDebugFormat, trace::TraceRawVcs,
}; };
...@@ -13,17 +12,7 @@ use turbopack_core::{module::Module, module_graph::SingleModuleGraph}; ...@@ -13,17 +12,7 @@ use turbopack_core::{module::Module, module_graph::SingleModuleGraph};
use turbopack_css::chunk::CssChunkPlaceable; use turbopack_css::chunk::CssChunkPlaceable;
#[derive( #[derive(
Copy, Copy, Clone, Eq, PartialEq, TraceRawVcs, ValueDebugFormat, NonLocalValue, Encode, Decode,
Clone,
Serialize,
Deserialize,
Eq,
PartialEq,
TraceRawVcs,
ValueDebugFormat,
NonLocalValue,
Encode,
Decode,
)] )]
pub enum ClientManifestEntryType { pub enum ClientManifestEntryType {
EcmascriptClientReference { EcmascriptClientReference {
......
...@@ -25,7 +25,6 @@ use next_core::{ ...@@ -25,7 +25,6 @@ use next_core::{
next_app::ClientReferencesChunks, next_client_reference::EcmascriptClientReferenceModule, next_app::ClientReferencesChunks, next_client_reference::EcmascriptClientReferenceModule,
next_dynamic::NextDynamicEntryModule, next_dynamic::NextDynamicEntryModule,
}; };
use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Vc, FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Vc,
debug::ValueDebugFormat, trace::TraceRawVcs, debug::ValueDebugFormat, trace::TraceRawVcs,
...@@ -110,18 +109,7 @@ pub struct DynamicImportedChunks( ...@@ -110,18 +109,7 @@ pub struct DynamicImportedChunks(
>, >,
); );
#[derive( #[derive(Clone, PartialEq, Eq, ValueDebugFormat, TraceRawVcs, NonLocalValue, Encode, Decode)]
Clone,
PartialEq,
Eq,
ValueDebugFormat,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)]
pub enum DynamicImportEntriesMapType { pub enum DynamicImportEntriesMapType {
DynamicEntry(ResolvedVc<NextDynamicEntryModule>), DynamicEntry(ResolvedVc<NextDynamicEntryModule>),
ClientReference(ResolvedVc<EcmascriptClientReferenceModule>), ClientReference(ResolvedVc<EcmascriptClientReferenceModule>),
......
...@@ -4,7 +4,6 @@ use anyhow::{Context, Result, bail}; ...@@ -4,7 +4,6 @@ use anyhow::{Context, Result, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use either::Either; use either::Either;
use next_core::{get_next_package, next_server::get_tracing_compile_time_info}; use next_core::{get_next_package, next_server::get_tracing_compile_time_info};
use serde::{Deserialize, Serialize};
use serde_json::{Value, json}; use serde_json::{Value, json};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
...@@ -24,7 +23,7 @@ use turbopack_core::{ ...@@ -24,7 +23,7 @@ use turbopack_core::{
resolve::{origin::PlainResolveOrigin, parse::Request}, resolve::{origin::PlainResolveOrigin, parse::Request},
traced_asset::TracedAsset, traced_asset::TracedAsset,
}; };
use turbopack_ecmascript::resolve::cjs_resolve; use turbopack_resolve::ecmascript::cjs_resolve;
use crate::{ use crate::{
nft_json::{all_assets_from_entries_filtered, relativize_glob}, nft_json::{all_assets_from_entries_filtered, relativize_glob},
...@@ -32,18 +31,7 @@ use crate::{ ...@@ -32,18 +31,7 @@ use crate::{
}; };
#[derive( #[derive(
PartialEq, PartialEq, Eq, TraceRawVcs, NonLocalValue, Debug, Clone, Hash, TaskInput, Encode, Decode,
Eq,
TraceRawVcs,
NonLocalValue,
Deserialize,
Serialize,
Debug,
Clone,
Hash,
TaskInput,
Encode,
Decode,
)] )]
enum ServerNftType { enum ServerNftType {
Minimal, Minimal,
......
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
CollectiblesSource, FxIndexMap, NonLocalValue, OperationValue, OperationVc, ResolvedVc, CollectiblesSource, FxIndexMap, NonLocalValue, OperationValue, OperationVc, ResolvedVc,
...@@ -114,8 +113,6 @@ fn pick_route(entrypoints: OperationVc<Entrypoints>, key: RcStr, route: &Route) ...@@ -114,8 +113,6 @@ fn pick_route(entrypoints: OperationVc<Entrypoints>, key: RcStr, route: &Route)
Debug, Debug,
Clone, Clone,
TaskInput, TaskInput,
Serialize,
Deserialize,
TraceRawVcs, TraceRawVcs,
PartialEq, PartialEq,
Eq, Eq,
...@@ -208,33 +205,13 @@ async fn pick_endpoint( ...@@ -208,33 +205,13 @@ async fn pick_endpoint(
Ok(Vc::cell(endpoint)) Ok(Vc::cell(endpoint))
} }
#[derive( #[derive(TraceRawVcs, PartialEq, Eq, ValueDebugFormat, NonLocalValue, Encode, Decode)]
Serialize,
Deserialize,
TraceRawVcs,
PartialEq,
Eq,
ValueDebugFormat,
NonLocalValue,
Encode,
Decode,
)]
pub struct InstrumentationOperation { pub struct InstrumentationOperation {
pub node_js: OperationVc<OptionEndpoint>, pub node_js: OperationVc<OptionEndpoint>,
pub edge: OperationVc<OptionEndpoint>, pub edge: OperationVc<OptionEndpoint>,
} }
#[derive( #[derive(TraceRawVcs, PartialEq, Eq, ValueDebugFormat, NonLocalValue, Encode, Decode)]
Serialize,
Deserialize,
TraceRawVcs,
PartialEq,
Eq,
ValueDebugFormat,
NonLocalValue,
Encode,
Decode,
)]
pub struct MiddlewareOperation { pub struct MiddlewareOperation {
pub endpoint: OperationVc<OptionEndpoint>, pub endpoint: OperationVc<OptionEndpoint>,
pub is_proxy: bool, pub is_proxy: bool,
...@@ -259,17 +236,7 @@ pub enum RouteOperation { ...@@ -259,17 +236,7 @@ pub enum RouteOperation {
} }
#[derive( #[derive(
TraceRawVcs, TraceRawVcs, PartialEq, Eq, ValueDebugFormat, Clone, Debug, NonLocalValue, Encode, Decode,
Serialize,
Deserialize,
PartialEq,
Eq,
ValueDebugFormat,
Clone,
Debug,
NonLocalValue,
Encode,
Decode,
)] )]
pub struct AppPageRouteOperation { pub struct AppPageRouteOperation {
pub original_name: RcStr, pub original_name: RcStr,
......
...@@ -27,7 +27,6 @@ use next_core::{ ...@@ -27,7 +27,6 @@ use next_core::{
segment_config::ParseSegmentMode, segment_config::ParseSegmentMode,
util::{NextRuntime, get_asset_prefix_from_pathname, pages_function_name}, util::{NextRuntime, get_asset_prefix_from_pathname, pages_function_name},
}; };
use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
...@@ -64,9 +63,8 @@ use turbopack_core::{ ...@@ -64,9 +63,8 @@ use turbopack_core::{
source::Source, source::Source,
virtual_output::VirtualOutputAsset, virtual_output::VirtualOutputAsset,
}; };
use turbopack_ecmascript::resolve::esm_resolve;
use turbopack_nodejs::NodeJsChunkingContext; use turbopack_nodejs::NodeJsChunkingContext;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext; use turbopack_resolve::{ecmascript::esm_resolve, resolve_options_context::ResolveOptionsContext};
use crate::{ use crate::{
dynamic_imports::{ dynamic_imports::{
...@@ -587,19 +585,7 @@ struct PageEndpoint { ...@@ -587,19 +585,7 @@ struct PageEndpoint {
} }
#[derive( #[derive(
Copy, Copy, Clone, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs, NonLocalValue, Encode, Decode,
Clone,
Serialize,
Deserialize,
PartialEq,
Eq,
Hash,
Debug,
TaskInput,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)] )]
enum PageEndpointType { enum PageEndpointType {
Api, Api,
...@@ -611,40 +597,14 @@ enum PageEndpointType { ...@@ -611,40 +597,14 @@ enum PageEndpointType {
SsrOnly, SsrOnly,
} }
#[derive( #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs, Encode, Decode)]
Copy,
Clone,
Serialize,
Deserialize,
PartialEq,
Eq,
Hash,
Debug,
TaskInput,
TraceRawVcs,
Encode,
Decode,
)]
enum SsrChunkType { enum SsrChunkType {
Page, Page,
Data, Data,
Api, Api,
} }
#[derive( #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, TaskInput, TraceRawVcs, Encode, Decode)]
Copy,
Clone,
Debug,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
TaskInput,
TraceRawVcs,
Encode,
Decode,
)]
enum EmitManifests { enum EmitManifests {
/// Don't emit any manifests /// Don't emit any manifests
None, None,
......
...@@ -276,33 +276,13 @@ pub struct DefineEnv { ...@@ -276,33 +276,13 @@ pub struct DefineEnv {
pub nodejs: Vec<(RcStr, Option<RcStr>)>, pub nodejs: Vec<(RcStr, Option<RcStr>)>,
} }
#[derive( #[derive(TraceRawVcs, PartialEq, Eq, ValueDebugFormat, NonLocalValue, Encode, Decode)]
Serialize,
Deserialize,
TraceRawVcs,
PartialEq,
Eq,
ValueDebugFormat,
NonLocalValue,
Encode,
Decode,
)]
pub struct Middleware { pub struct Middleware {
pub endpoint: ResolvedVc<Box<dyn Endpoint>>, pub endpoint: ResolvedVc<Box<dyn Endpoint>>,
pub is_proxy: bool, pub is_proxy: bool,
} }
#[derive( #[derive(TraceRawVcs, PartialEq, Eq, ValueDebugFormat, NonLocalValue, Encode, Decode)]
Serialize,
Deserialize,
TraceRawVcs,
PartialEq,
Eq,
ValueDebugFormat,
NonLocalValue,
Encode,
Decode,
)]
pub struct Instrumentation { pub struct Instrumentation {
pub node_js: ResolvedVc<Box<dyn Endpoint>>, pub node_js: ResolvedVc<Box<dyn Endpoint>>,
pub edge: ResolvedVc<Box<dyn Endpoint>>, pub edge: ResolvedVc<Box<dyn Endpoint>>,
......
...@@ -2,7 +2,6 @@ use std::fmt::Display; ...@@ -2,7 +2,6 @@ use std::fmt::Display;
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
Completion, FxIndexMap, FxIndexSet, NonLocalValue, OperationVc, ResolvedVc, TryFlatJoinIterExt, Completion, FxIndexMap, FxIndexSet, NonLocalValue, OperationVc, ResolvedVc, TryFlatJoinIterExt,
...@@ -16,17 +15,7 @@ use turbopack_core::{ ...@@ -16,17 +15,7 @@ use turbopack_core::{
use crate::{operation::OptionEndpoint, paths::ServerPath, project::Project}; use crate::{operation::OptionEndpoint, paths::ServerPath, project::Project};
#[derive( #[derive(
TraceRawVcs, TraceRawVcs, PartialEq, Eq, ValueDebugFormat, Clone, Debug, NonLocalValue, Encode, Decode,
Serialize,
Deserialize,
PartialEq,
Eq,
ValueDebugFormat,
Clone,
Debug,
NonLocalValue,
Encode,
Decode,
)] )]
pub struct AppPageRoute { pub struct AppPageRoute {
pub original_name: RcStr, pub original_name: RcStr,
...@@ -78,17 +67,7 @@ pub trait Endpoint { ...@@ -78,17 +67,7 @@ pub trait Endpoint {
} }
#[derive( #[derive(
TraceRawVcs, TraceRawVcs, PartialEq, Eq, ValueDebugFormat, Clone, Debug, NonLocalValue, Encode, Decode,
Serialize,
Deserialize,
PartialEq,
Eq,
ValueDebugFormat,
Clone,
Debug,
NonLocalValue,
Encode,
Decode,
)] )]
pub enum EndpointGroupKey { pub enum EndpointGroupKey {
Instrumentation, Instrumentation,
...@@ -129,17 +108,7 @@ impl Display for EndpointGroupKey { ...@@ -129,17 +108,7 @@ impl Display for EndpointGroupKey {
} }
#[derive( #[derive(
TraceRawVcs, TraceRawVcs, PartialEq, Eq, ValueDebugFormat, Clone, Debug, NonLocalValue, Encode, Decode,
Serialize,
Deserialize,
PartialEq,
Eq,
ValueDebugFormat,
Clone,
Debug,
NonLocalValue,
Encode,
Decode,
)] )]
pub struct EndpointGroupEntry { pub struct EndpointGroupEntry {
pub endpoint: ResolvedVc<Box<dyn Endpoint>>, pub endpoint: ResolvedVc<Box<dyn Endpoint>>,
...@@ -147,17 +116,7 @@ pub struct EndpointGroupEntry { ...@@ -147,17 +116,7 @@ pub struct EndpointGroupEntry {
} }
#[derive( #[derive(
TraceRawVcs, TraceRawVcs, PartialEq, Eq, ValueDebugFormat, Clone, Debug, NonLocalValue, Encode, Decode,
Serialize,
Deserialize,
PartialEq,
Eq,
ValueDebugFormat,
Clone,
Debug,
NonLocalValue,
Encode,
Decode,
)] )]
pub struct EndpointGroup { pub struct EndpointGroup {
pub primary: Vec<EndpointGroupEntry>, pub primary: Vec<EndpointGroupEntry>,
......
...@@ -13,7 +13,6 @@ use std::{ ...@@ -13,7 +13,6 @@ use std::{
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
...@@ -30,8 +29,6 @@ pub use crate::next_app::{ ...@@ -30,8 +29,6 @@ pub use crate::next_app::{
Clone, Clone,
Debug, Debug,
Hash, Hash,
Serialize,
Deserialize,
PartialEq, PartialEq,
Eq, Eq,
PartialOrd, PartialOrd,
...@@ -137,8 +134,6 @@ impl Display for PageSegment { ...@@ -137,8 +134,6 @@ impl Display for PageSegment {
Clone, Clone,
Debug, Debug,
Hash, Hash,
Serialize,
Deserialize,
PartialEq, PartialEq,
Eq, Eq,
PartialOrd, PartialOrd,
...@@ -173,8 +168,6 @@ impl Display for PageType { ...@@ -173,8 +168,6 @@ impl Display for PageType {
PartialEq, PartialEq,
Eq, Eq,
Default, Default,
Serialize,
Deserialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
...@@ -355,8 +348,6 @@ impl PartialOrd for AppPage { ...@@ -355,8 +348,6 @@ impl PartialOrd for AppPage {
Clone, Clone,
Debug, Debug,
Hash, Hash,
Serialize,
Deserialize,
PartialEq, PartialEq,
Eq, Eq,
PartialOrd, PartialOrd,
...@@ -413,8 +404,6 @@ impl Display for PathSegment { ...@@ -413,8 +404,6 @@ impl Display for PathSegment {
PartialEq, PartialEq,
Eq, Eq,
Default, Default,
Serialize,
Deserialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
......
...@@ -9,7 +9,7 @@ use turbopack_core::{ ...@@ -9,7 +9,7 @@ use turbopack_core::{
resolve::{origin::PlainResolveOrigin, parse::Request}, resolve::{origin::PlainResolveOrigin, parse::Request},
source::Source, source::Source,
}; };
use turbopack_ecmascript::resolve::cjs_resolve; use turbopack_resolve::ecmascript::cjs_resolve;
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub enum RuntimeEntry { pub enum RuntimeEntry {
......
...@@ -2,7 +2,6 @@ use std::future::Future; ...@@ -2,7 +2,6 @@ use std::future::Future;
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use tracing::{Instrument, Level, Span}; use tracing::{Instrument, Level, Span};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
...@@ -31,8 +30,6 @@ use crate::{ ...@@ -31,8 +30,6 @@ use crate::{
Eq, Eq,
PartialEq, PartialEq,
Hash, Hash,
Serialize,
Deserialize,
Debug, Debug,
ValueDebugFormat, ValueDebugFormat,
TraceRawVcs, TraceRawVcs,
...@@ -51,8 +48,6 @@ pub struct ClientReference { ...@@ -51,8 +48,6 @@ pub struct ClientReference {
Eq, Eq,
PartialEq, PartialEq,
Hash, Hash,
Serialize,
Deserialize,
Debug, Debug,
ValueDebugFormat, ValueDebugFormat,
TraceRawVcs, TraceRawVcs,
...@@ -144,18 +139,7 @@ struct FindServerEntries { ...@@ -144,18 +139,7 @@ struct FindServerEntries {
include_binding_usage: bool, include_binding_usage: bool,
} }
#[derive( #[derive(Clone, Eq, PartialEq, Hash, Debug, ValueDebugFormat, TraceRawVcs, NonLocalValue)]
Clone,
Eq,
PartialEq,
Hash,
Serialize,
Deserialize,
Debug,
ValueDebugFormat,
TraceRawVcs,
NonLocalValue,
)]
enum FindServerEntriesNode { enum FindServerEntriesNode {
ClientReference, ClientReference,
ServerComponentEntry( ServerComponentEntry(
......
This diff is collapsed.
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize}; use serde::Deserialize;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, FxIndexSet, NonLocalValue, TaskInput, Vc, fxindexset, trace::TraceRawVcs, FxIndexMap, FxIndexSet, NonLocalValue, TaskInput, Vc, fxindexset, trace::TraceRawVcs,
...@@ -52,7 +52,6 @@ impl NextFontGoogleOptions { ...@@ -52,7 +52,6 @@ impl NextFontGoogleOptions {
PartialOrd, PartialOrd,
Ord, Ord,
Hash, Hash,
Serialize,
Deserialize, Deserialize,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
...@@ -65,16 +64,14 @@ pub(super) enum FontWeights { ...@@ -65,16 +64,14 @@ pub(super) enum FontWeights {
Fixed(Vec<u16>), Fixed(Vec<u16>),
} }
#[derive( #[derive(Debug, PartialEq, Eq, Deserialize, TraceRawVcs, NonLocalValue, Encode, Decode)]
Debug, PartialEq, Eq, Deserialize, Serialize, TraceRawVcs, NonLocalValue, Encode, Decode,
)]
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, NonLocalValue, Encode, Decode)] #[derive(Debug, PartialEq, Deserialize, TraceRawVcs, NonLocalValue, Encode, Decode)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub(super) struct Axis { pub(super) struct Axis {
pub tag: RcStr, pub tag: RcStr,
......
use std::fmt::Display; use std::fmt::{self, Display};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{NonLocalValue, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, trace::TraceRawVcs};
...@@ -10,13 +9,11 @@ pub(crate) enum FontResult<T> { ...@@ -10,13 +9,11 @@ pub(crate) enum FontResult<T> {
FontFileNotFound(FontFileNotFound), FontFileNotFound(FontFileNotFound),
} }
#[derive( #[derive(Debug, Eq, PartialEq, NonLocalValue, TraceRawVcs, Encode, Decode)]
Debug, Eq, PartialEq, Serialize, Deserialize, NonLocalValue, TraceRawVcs, Encode, Decode,
)]
pub(crate) struct FontFileNotFound(pub RcStr); pub(crate) struct FontFileNotFound(pub RcStr);
impl Display for FontFileNotFound { impl Display for FontFileNotFound {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "Font file not found: Can't resolve {}'", self.0) write!(f, "Font file not found: Can't resolve {}'", self.0)
} }
} }
use anyhow::{Context, Result, bail}; use anyhow::{Context, Result, bail};
use font_fallback::FontFallbackResult;
use indoc::formatdoc; use indoc::formatdoc;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
...@@ -21,21 +20,17 @@ use turbopack_core::{ ...@@ -21,21 +20,17 @@ use turbopack_core::{
virtual_source::VirtualSource, virtual_source::VirtualSource,
}; };
use self::{
font_fallback::get_font_fallbacks,
options::{FontDescriptors, NextFontLocalOptions, options_from_request},
stylesheet::build_stylesheet,
util::build_font_family_string,
};
use super::{
font_fallback::FontFallbacks,
util::{FontCssProperties, can_use_next_font},
};
use crate::{ use crate::{
next_app::metadata::split_extension, next_app::metadata::split_extension,
next_font::{ next_font::{
local::options::FontWeight, font_fallback::FontFallbacks,
util::{get_request_hash, get_request_id}, local::{
font_fallback::{FontFallbackResult, get_font_fallbacks},
options::{FontDescriptors, FontWeight, NextFontLocalOptions, options_from_request},
stylesheet::build_stylesheet,
util::build_font_family_string,
},
util::{FontCssProperties, can_use_next_font, get_request_hash, get_request_id},
}, },
}; };
......
...@@ -2,15 +2,13 @@ use std::{fmt::Display, str::FromStr}; ...@@ -2,15 +2,13 @@ use std::{fmt::Display, str::FromStr};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{NonLocalValue, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, TaskInput, Vc, trace::TraceRawVcs};
use super::request::{ use crate::next_font::local::request::{
AdjustFontFallback, NextFontLocalRequest, NextFontLocalRequestArguments, SrcDescriptor, AdjustFontFallback, NextFontLocalDeclaration, NextFontLocalRequest,
SrcRequest, NextFontLocalRequestArguments, SrcDescriptor, SrcRequest,
}; };
use crate::next_font::local::request::NextFontLocalDeclaration;
/// A normalized, Vc-friendly struct derived from validating and transforming /// A normalized, Vc-friendly struct derived from validating and transforming
/// [[NextFontLocalRequest]] /// [[NextFontLocalRequest]]
...@@ -57,13 +55,11 @@ impl NextFontLocalOptions { ...@@ -57,13 +55,11 @@ impl NextFontLocalOptions {
#[derive( #[derive(
Clone, Clone,
Debug, Debug,
Deserialize,
PartialEq, PartialEq,
Eq, Eq,
PartialOrd, PartialOrd,
Ord, Ord,
Hash, Hash,
Serialize,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
TaskInput, TaskInput,
...@@ -101,13 +97,11 @@ impl FontDescriptor { ...@@ -101,13 +97,11 @@ impl FontDescriptor {
#[derive( #[derive(
Clone, Clone,
Debug, Debug,
Deserialize,
PartialEq, PartialEq,
Eq, Eq,
PartialOrd, PartialOrd,
Ord, Ord,
Hash, Hash,
Serialize,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
TaskInput, TaskInput,
...@@ -130,8 +124,6 @@ pub(super) enum FontDescriptors { ...@@ -130,8 +124,6 @@ pub(super) enum FontDescriptors {
Eq, Eq,
PartialOrd, PartialOrd,
Ord, Ord,
Deserialize,
Serialize,
Hash, Hash,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
......
...@@ -22,7 +22,6 @@ pub(super) struct NextFontLocalRequest { ...@@ -22,7 +22,6 @@ pub(super) struct NextFontLocalRequest {
Ord, Ord,
Hash, Hash,
TaskInput, TaskInput,
Serialize,
Deserialize, Deserialize,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
......
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, fxindexmap, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, fxindexmap, trace::TraceRawVcs};
use turbopack::{ModuleAssetContext, module_options::CustomModuleType}; use turbopack::{ModuleAssetContext, module_options::CustomModuleType};
...@@ -25,8 +24,6 @@ use super::source_asset::StructuredImageFileSource; ...@@ -25,8 +24,6 @@ use super::source_asset::StructuredImageFileSource;
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize,
Encode, Encode,
Decode, Decode,
)] )]
......
...@@ -252,7 +252,7 @@ impl Default for MiddlewaresManifest { ...@@ -252,7 +252,7 @@ impl Default for MiddlewaresManifest {
)] )]
#[serde(rename_all = "camelCase", default)] #[serde(rename_all = "camelCase", default)]
pub struct ProxyMatcher { pub struct ProxyMatcher {
// When skipped next.js with fill that during merging. // When skipped, next.js will fill the field during merging.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub regexp: Option<RcStr>, pub regexp: Option<RcStr>,
#[serde(skip_serializing_if = "bool_is_true")] #[serde(skip_serializing_if = "bool_is_true")]
......
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use next_taskless::NEVER_EXTERNAL_RE; use next_taskless::NEVER_EXTERNAL_RE;
use serde::{Deserialize, Serialize};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{NonLocalValue, ResolvedVc, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, ResolvedVc, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
...@@ -334,9 +333,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -334,9 +333,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
} }
} }
#[derive( #[derive(TraceRawVcs, PartialEq, Eq, Debug, NonLocalValue, Encode, Decode)]
Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, Debug, NonLocalValue, Encode, Decode,
)]
pub struct PackagesGlobs { pub struct PackagesGlobs {
path_glob: ResolvedVc<Glob>, path_glob: ResolvedVc<Glob>,
request_glob: ResolvedVc<Glob>, request_glob: ResolvedVc<Glob>,
......
...@@ -10,7 +10,7 @@ use turbo_tasks::{FxIndexMap, NonLocalValue, OperationValue, ResolvedVc, trace:: ...@@ -10,7 +10,7 @@ use turbo_tasks::{FxIndexMap, NonLocalValue, OperationValue, ResolvedVc, trace::
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 crate::next_shared::transforms::module_rule_match_js_no_url;
#[derive( #[derive(
Clone, Clone,
......
...@@ -2,7 +2,7 @@ use std::{collections::BTreeSet, str::FromStr}; ...@@ -2,7 +2,7 @@ use std::{collections::BTreeSet, str::FromStr};
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize}; use serde::Deserialize;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{NonLocalValue, OperationValue, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, OperationValue, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
...@@ -42,7 +42,6 @@ pub(crate) mod sass; ...@@ -42,7 +42,6 @@ pub(crate) mod sass;
Ord, Ord,
Hash, Hash,
Deserialize, Deserialize,
Serialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
......
...@@ -2,7 +2,7 @@ use std::{borrow::Cow, future::Future}; ...@@ -2,7 +2,7 @@ use std::{borrow::Cow, future::Future};
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize}; use serde::Deserialize;
use serde_json::Value; use serde_json::Value;
use swc_core::{ use swc_core::{
common::{DUMMY_SP, GLOBALS, Span, Spanned, source_map::SmallPos}, common::{DUMMY_SP, GLOBALS, Span, Spanned, source_map::SmallPos},
...@@ -50,7 +50,6 @@ use crate::{ ...@@ -50,7 +50,6 @@ use crate::{
Copy, Copy,
Debug, Debug,
TraceRawVcs, TraceRawVcs,
Serialize,
Deserialize, Deserialize,
NonLocalValue, NonLocalValue,
Encode, Encode,
...@@ -73,7 +72,6 @@ pub enum NextSegmentDynamic { ...@@ -73,7 +72,6 @@ pub enum NextSegmentDynamic {
Copy, Copy,
Debug, Debug,
TraceRawVcs, TraceRawVcs,
Serialize,
Deserialize, Deserialize,
NonLocalValue, NonLocalValue,
Encode, Encode,
...@@ -92,18 +90,7 @@ pub enum NextSegmentFetchCache { ...@@ -92,18 +90,7 @@ pub enum NextSegmentFetchCache {
} }
#[derive( #[derive(
Default, Default, PartialEq, Eq, Clone, Copy, Debug, TraceRawVcs, NonLocalValue, Encode, Decode,
PartialEq,
Eq,
Clone,
Copy,
Debug,
TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)] )]
pub enum NextRevalidate { pub enum NextRevalidate {
#[default] #[default]
...@@ -308,19 +295,7 @@ impl Issue for NextSegmentConfigParsingIssue { ...@@ -308,19 +295,7 @@ impl Issue for NextSegmentConfigParsingIssue {
} }
#[derive( #[derive(
Debug, Debug, Clone, Copy, PartialEq, Eq, Hash, TaskInput, NonLocalValue, TraceRawVcs, Encode, Decode,
Clone,
Copy,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
TaskInput,
NonLocalValue,
TraceRawVcs,
Encode,
Decode,
)] )]
pub enum ParseSegmentMode { pub enum ParseSegmentMode {
Base, Base,
......
...@@ -3,7 +3,7 @@ use std::{fmt::Display, str::FromStr}; ...@@ -3,7 +3,7 @@ use std::{fmt::Display, str::FromStr};
use anyhow::{Result, anyhow, bail}; use anyhow::{Result, anyhow, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use next_taskless::{expand_next_js_template, expand_next_js_template_no_imports}; use next_taskless::{expand_next_js_template, expand_next_js_template_no_imports};
use serde::{Deserialize, Serialize, de::DeserializeOwned}; use serde::{Deserialize, de::DeserializeOwned};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{FxIndexMap, NonLocalValue, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{FxIndexMap, NonLocalValue, TaskInput, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::{File, FileContent, FileJsonContent, FileSystem, FileSystemPath, rope::Rope}; use turbo_tasks_fs::{File, FileContent, FileJsonContent, FileSystem, FileSystemPath, rope::Rope};
...@@ -58,20 +58,7 @@ pub fn defines(define_env: &FxIndexMap<RcStr, Option<RcStr>>) -> CompileTimeDefi ...@@ -58,20 +58,7 @@ pub fn defines(define_env: &FxIndexMap<RcStr, Option<RcStr>>) -> CompileTimeDefi
CompileTimeDefines(defines) CompileTimeDefines(defines)
} }
#[derive( #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, TaskInput, TraceRawVcs, Encode, Decode)]
Debug,
Clone,
Copy,
PartialEq,
Eq,
Hash,
TaskInput,
Serialize,
Deserialize,
TraceRawVcs,
Encode,
Decode,
)]
pub enum PathType { pub enum PathType {
PagesPage, PagesPage,
PagesApi, PagesApi,
...@@ -205,7 +192,6 @@ pub fn pages_function_name(page: impl Display) -> String { ...@@ -205,7 +192,6 @@ pub fn pages_function_name(page: impl Display) -> String {
Copy, Copy,
Debug, Debug,
TraceRawVcs, TraceRawVcs,
Serialize,
Deserialize, Deserialize,
Hash, Hash,
PartialOrd, PartialOrd,
...@@ -244,9 +230,7 @@ impl NextRuntime { ...@@ -244,9 +230,7 @@ impl NextRuntime {
} }
} }
#[derive( #[derive(PartialEq, Eq, Clone, Debug, TraceRawVcs, NonLocalValue, Encode, Decode)]
PartialEq, Eq, Clone, Debug, TraceRawVcs, Serialize, Deserialize, NonLocalValue, Encode, Decode,
)]
pub enum MiddlewareMatcherKind { pub enum MiddlewareMatcherKind {
Str(String), Str(String),
Matcher(ProxyMatcher), Matcher(ProxyMatcher),
......
...@@ -9,10 +9,7 @@ anyhow = { workspace = true } ...@@ -9,10 +9,7 @@ anyhow = { workspace = true }
bincode = { workspace = true } bincode = { workspace = true }
regex = { workspace = true } regex = { workspace = true }
regress = { workspace = true } regress = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
[lints] [lints]
workspace = true workspace = true
...@@ -10,14 +10,12 @@ use bincode::{ ...@@ -10,14 +10,12 @@ use bincode::{
error::{DecodeError, EncodeError}, error::{DecodeError, EncodeError},
impl_borrow_decode, impl_borrow_decode,
}; };
use serde::{Deserialize, Serialize};
/// A simple regular expression implementation following ecmascript semantics /// A simple regular expression implementation following ecmascript semantics
/// ///
/// Delegates to the `regex` crate when possible and `regress` otherwise. /// Delegates to the `regex` crate when possible and `regress` otherwise.
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone)]
#[turbo_tasks::value(eq = "manual", shared, serialization = "custom")] #[turbo_tasks::value(eq = "manual", shared, serialization = "custom")]
#[serde(into = "RegexForm", try_from = "RegexForm")]
pub struct EsRegex { pub struct EsRegex {
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
delegate: EsRegexImpl, delegate: EsRegexImpl,
...@@ -44,30 +42,6 @@ impl PartialEq for EsRegex { ...@@ -44,30 +42,6 @@ impl PartialEq for EsRegex {
} }
impl Eq for EsRegex {} impl Eq for EsRegex {}
impl TryFrom<RegexForm> for EsRegex {
type Error = anyhow::Error;
fn try_from(value: RegexForm) -> std::result::Result<Self, Self::Error> {
EsRegex::new(&value.pattern, &value.flags)
}
}
/// This is the serializable form for the `EsRegex` struct
#[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
struct RegexForm {
pattern: String,
flags: String,
}
impl From<EsRegex> for RegexForm {
fn from(value: EsRegex) -> Self {
Self {
pattern: value.pattern,
flags: value.flags,
}
}
}
impl Encode for EsRegex { impl Encode for EsRegex {
fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> { fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
self.pattern.encode(encoder)?; self.pattern.encode(encoder)?;
...@@ -235,11 +209,13 @@ mod tests { ...@@ -235,11 +209,13 @@ mod tests {
use super::{EsRegex, EsRegexImpl}; use super::{EsRegex, EsRegexImpl};
#[test] #[test]
fn round_trip_serialize() { fn round_trip_bincode() {
let regex = EsRegex::new("[a-z]", "i").unwrap(); let regex = EsRegex::new("[a-z]", "i").unwrap();
let serialized = serde_json::to_string(&regex).unwrap(); let config = bincode::config::standard();
let parsed = serde_json::from_str::<EsRegex>(&serialized).unwrap(); let encoded = bincode::encode_to_vec(&regex, config).unwrap();
assert_eq!(regex, parsed); let (decoded, len) = bincode::decode_from_slice::<EsRegex, _>(&encoded, config).unwrap();
assert_eq!(regex, decoded);
assert_eq!(len, encoded.len());
} }
#[test] #[test]
......
use std::{fs, path::PathBuf}; use std::{fs, path::PathBuf};
use lsp_types::{CallHierarchyIncomingCall, CallHierarchyItem, Range}; use lsp_types::{CallHierarchyIncomingCall, CallHierarchyItem, Range};
use serde::{Deserialize, Serialize};
/// A task that references another, with the range of the reference /// A task that references another, with the range of the reference
#[derive(Hash, PartialEq, Eq, serde::Deserialize, serde::Serialize, Clone, Debug)] #[derive(Hash, PartialEq, Eq, Deserialize, Serialize, Clone, Debug)]
pub struct IdentifierReference { pub struct IdentifierReference {
pub identifier: Identifier, pub identifier: Identifier,
pub references: Vec<Range>, // the places where this identifier is used pub references: Vec<Range>, // the places where this identifier is used
} }
/// identifies a task by its file, and range in the file /// identifies a task by its file, and range in the file
#[derive(Hash, PartialEq, Eq, serde::Deserialize, serde::Serialize, Clone)] #[derive(Hash, PartialEq, Eq, Deserialize, Serialize, Clone)]
pub struct Identifier { pub struct Identifier {
pub path: String, pub path: String,
// technically you can derive this from the name and range but it's easier to just store it // technically you can derive this from the name and range but it's easier to just store it
......
...@@ -4,7 +4,6 @@ use anyhow::Result; ...@@ -4,7 +4,6 @@ use anyhow::Result;
use arbitrary::Arbitrary; use arbitrary::Arbitrary;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize};
use turbo_tasks::{self, NonLocalValue, State, TaskInput, TurboTasks, Vc, trace::TraceRawVcs}; use turbo_tasks::{self, NonLocalValue, State, TaskInput, TurboTasks, Vc, trace::TraceRawVcs};
use turbo_tasks_malloc::TurboMalloc; use turbo_tasks_malloc::TurboMalloc;
...@@ -16,8 +15,6 @@ use turbo_tasks_malloc::TurboMalloc; ...@@ -16,8 +15,6 @@ use turbo_tasks_malloc::TurboMalloc;
Eq, Eq,
Hash, Hash,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize,
TraceRawVcs, TraceRawVcs,
TaskInput, TaskInput,
Encode, Encode,
...@@ -38,8 +35,6 @@ pub struct TaskReferenceSpec { ...@@ -38,8 +35,6 @@ pub struct TaskReferenceSpec {
Eq, Eq,
Hash, Hash,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize,
TraceRawVcs, TraceRawVcs,
TaskInput, TaskInput,
Encode, Encode,
......
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
CellId, KeyValuePair, SharedReference, TaskExecutionReason, TaskId, TraitTypeId, CellId, KeyValuePair, SharedReference, TaskExecutionReason, TaskId, TraitTypeId,
TypedSharedReference, ValueTypeId, TypedSharedReference, ValueTypeId,
...@@ -206,7 +205,7 @@ impl InProgressCellState { ...@@ -206,7 +205,7 @@ impl InProgressCellState {
} }
} }
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize, Encode, Decode)] #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Encode, Decode)]
pub struct AggregationNumber { pub struct AggregationNumber {
pub base: u32, pub base: u32,
pub distance: u32, pub distance: u32,
......
...@@ -4,24 +4,19 @@ ...@@ -4,24 +4,19 @@
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_tasks::{NonLocalValue, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, Vc, trace::TraceRawVcs};
use turbo_tasks_testing::{Registration, register, run_once}; use turbo_tasks_testing::{Registration, register, run_once};
static REGISTRATION: Registration = register!(); static REGISTRATION: Registration = register!();
#[derive( #[derive(Debug, Clone, PartialEq, Eq, NonLocalValue, TraceRawVcs, Encode, Decode)]
Debug, Clone, PartialEq, Eq, NonLocalValue, Serialize, Deserialize, TraceRawVcs, Encode, Decode,
)]
struct TaskReferenceSpec { struct TaskReferenceSpec {
task: u16, task: u16,
read: bool, read: bool,
read_strongly_consistent: bool, read_strongly_consistent: bool,
} }
#[derive( #[derive(Debug, Clone, PartialEq, Eq, NonLocalValue, TraceRawVcs, Encode, Decode)]
Debug, Clone, PartialEq, Eq, NonLocalValue, Serialize, Deserialize, TraceRawVcs, Encode, Decode,
)]
struct TaskSpec { struct TaskSpec {
references: Vec<TaskReferenceSpec>, references: Vec<TaskReferenceSpec>,
} }
......
...@@ -6,25 +6,13 @@ use std::sync::Arc; ...@@ -6,25 +6,13 @@ use std::sync::Arc;
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_tasks::{NonLocalValue, State, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, State, TaskInput, Vc, trace::TraceRawVcs};
use turbo_tasks_testing::{Registration, register, run_once}; use turbo_tasks_testing::{Registration, register, run_once};
static REGISTRATION: Registration = register!(); static REGISTRATION: Registration = register!();
#[derive( #[derive(
Clone, Clone, Debug, PartialEq, Eq, Hash, NonLocalValue, TraceRawVcs, TaskInput, Encode, Decode,
Debug,
PartialEq,
Eq,
Hash,
NonLocalValue,
Serialize,
Deserialize,
TraceRawVcs,
TaskInput,
Encode,
Decode,
)] )]
pub struct TaskReferenceSpec { pub struct TaskReferenceSpec {
task: u16, task: u16,
...@@ -34,18 +22,7 @@ pub struct TaskReferenceSpec { ...@@ -34,18 +22,7 @@ pub struct TaskReferenceSpec {
} }
#[derive( #[derive(
Clone, Clone, Debug, PartialEq, Eq, Hash, NonLocalValue, TraceRawVcs, TaskInput, Encode, Decode,
Debug,
PartialEq,
Eq,
Hash,
NonLocalValue,
Serialize,
Deserialize,
TraceRawVcs,
TaskInput,
Encode,
Decode,
)] )]
pub struct TaskSpec { pub struct TaskSpec {
references: Vec<TaskReferenceSpec>, references: Vec<TaskReferenceSpec>,
......
...@@ -17,8 +17,4 @@ bincode = { workspace = true } ...@@ -17,8 +17,4 @@ bincode = { workspace = true }
bytes = { workspace = true } bytes = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
serde_bytes = "0.11.9"
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
[dev-dependencies]
serde_test = "1.0.157"
...@@ -12,10 +12,9 @@ use bincode::{ ...@@ -12,10 +12,9 @@ use bincode::{
impl_borrow_decode, impl_borrow_decode,
}; };
use bytes::Bytes as CBytes; use bytes::Bytes as CBytes;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
/// Bytes is a thin wrapper around [bytes::Bytes], implementing easy /// Bytes is a thin wrapper around [bytes::Bytes], implementing easy
/// conversion to/from, ser/de support, and Vc containers. /// conversion to/from, bincode support, and Vc containers.
#[derive(Clone, Debug, Default)] #[derive(Clone, Debug, Default)]
#[turbo_tasks::value(transparent, serialization = "custom")] #[turbo_tasks::value(transparent, serialization = "custom")]
pub struct Bytes(#[turbo_tasks(trace_ignore)] CBytes); pub struct Bytes(#[turbo_tasks(trace_ignore)] CBytes);
...@@ -26,19 +25,6 @@ impl Bytes { ...@@ -26,19 +25,6 @@ impl Bytes {
} }
} }
impl Serialize for Bytes {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
serde_bytes::Bytes::new(&self.0).serialize(serializer)
}
}
impl<'de> Deserialize<'de> for Bytes {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
let bytes = serde_bytes::ByteBuf::deserialize(deserializer)?;
Ok(Bytes(bytes.into_vec().into()))
}
}
impl Encode for Bytes { impl Encode for Bytes {
fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> { fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
self[..].encode(encoder) self[..].encode(encoder)
...@@ -92,10 +78,8 @@ impl From<Bytes> for CBytes { ...@@ -92,10 +78,8 @@ impl From<Bytes> for CBytes {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use bytes::Bytes as CBytes; use super::*;
use serde_test::{Token, assert_tokens};
use super::Bytes;
impl PartialEq<&str> for Bytes { impl PartialEq<&str> for Bytes {
fn eq(&self, other: &&str) -> bool { fn eq(&self, other: &&str) -> bool {
self.0 == other self.0 == other
...@@ -112,12 +96,6 @@ mod tests { ...@@ -112,12 +96,6 @@ mod tests {
assert_eq!(Bytes::from(s), "foo"); assert_eq!(Bytes::from(s), "foo");
} }
#[test]
fn serde() {
let s = Bytes::from("test");
assert_tokens(&s, &[Token::Bytes(b"test")])
}
#[test] #[test]
fn bincode() { fn bincode() {
let s = Bytes::from("test"); let s = Bytes::from("test");
......
...@@ -13,7 +13,6 @@ use bincode::{ ...@@ -13,7 +13,6 @@ use bincode::{
error::{DecodeError, EncodeError}, error::{DecodeError, EncodeError},
}; };
use futures::{Stream as StreamTrait, StreamExt, TryStreamExt}; use futures::{Stream as StreamTrait, StreamExt, TryStreamExt};
use serde::{Deserialize, Deserializer, Serialize, Serializer};
/// Streams allow for streaming values from source to sink. /// Streams allow for streaming values from source to sink.
/// ///
...@@ -153,27 +152,6 @@ impl<T: Clone + PartialEq + Send> PartialEq for Stream<T> { ...@@ -153,27 +152,6 @@ impl<T: Clone + PartialEq + Send> PartialEq for Stream<T> {
} }
impl<T: Clone + Eq + Send> Eq for Stream<T> {} impl<T: Clone + Eq + Send> Eq for Stream<T> {}
impl<T: Clone + Serialize + Send> Serialize for Stream<T> {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
use serde::ser::Error;
let lock = self.inner.lock().map_err(Error::custom)?;
match &*lock {
StreamState {
pulled,
source: None,
} => pulled.serialize(serializer),
_ => Err(Error::custom("cannot serialize open stream")),
}
}
}
impl<'de, T: Clone + Send + Deserialize<'de>> Deserialize<'de> for Stream<T> {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
let data = <Vec<T>>::deserialize(deserializer)?;
Ok(Stream::new_closed(data))
}
}
impl<T: Clone + Encode + Send> Encode for Stream<T> { impl<T: Clone + Encode + Send> Encode for Stream<T> {
fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> { fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
let lock = self let lock = self
......
...@@ -2,11 +2,8 @@ use std::{hash::Hash, sync::LazyLock}; ...@@ -2,11 +2,8 @@ use std::{hash::Hash, sync::LazyLock};
use anyhow::Result; use anyhow::Result;
use quick_cache::sync::Cache; use quick_cache::sync::Cache;
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{ReadRef, Vc, duration_span, mark_session_dependent};
NonLocalValue, ReadRef, Vc, duration_span, mark_session_dependent, trace::TraceRawVcs,
};
use crate::{FetchError, FetchResult, HttpResponse, HttpResponseBody}; use crate::{FetchError, FetchResult, HttpResponse, HttpResponseBody};
...@@ -14,12 +11,6 @@ const MAX_CLIENTS: usize = 16; ...@@ -14,12 +11,6 @@ const MAX_CLIENTS: usize = 16;
static CLIENT_CACHE: LazyLock<Cache<ReadRef<FetchClientConfig>, reqwest::Client>> = static CLIENT_CACHE: LazyLock<Cache<ReadRef<FetchClientConfig>, reqwest::Client>> =
LazyLock::new(|| Cache::new(MAX_CLIENTS)); LazyLock::new(|| Cache::new(MAX_CLIENTS));
#[derive(Hash, PartialEq, Eq, Serialize, Deserialize, NonLocalValue, Debug, TraceRawVcs)]
pub enum ProxyConfig {
Http(RcStr),
Https(RcStr),
}
/// Represents the configuration needed to construct a [`reqwest::Client`]. /// Represents the configuration needed to construct a [`reqwest::Client`].
/// ///
/// This is used to cache clients keyed by their configuration, so the configuration should contain /// This is used to cache clients keyed by their configuration, so the configuration should contain
......
...@@ -9,7 +9,7 @@ mod response; ...@@ -9,7 +9,7 @@ mod response;
pub use crate::{ pub use crate::{
client::{ client::{
__test_only_reqwest_client_cache_clear, __test_only_reqwest_client_cache_len, __test_only_reqwest_client_cache_clear, __test_only_reqwest_client_cache_len,
FetchClientConfig, ProxyConfig, FetchClientConfig,
}, },
error::{FetchError, FetchErrorKind, FetchIssue}, error::{FetchError, FetchErrorKind, FetchIssue},
response::{FetchResult, HttpResponse, HttpResponseBody}, response::{FetchResult, HttpResponse, HttpResponseBody},
......
...@@ -41,7 +41,6 @@ parking_lot = { workspace = true } ...@@ -41,7 +41,6 @@ parking_lot = { workspace = true }
regex = { workspace = true } regex = { workspace = true }
rustc-hash = { workspace = true } rustc-hash = { workspace = true }
serde = { workspace = true, features = ["rc"] } serde = { workspace = true, features = ["rc"] }
serde_bytes = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
serde_path_to_error = { workspace = true } serde_path_to_error = { workspace = true }
tokio = { workspace = true } tokio = { workspace = true }
......
...@@ -8,7 +8,6 @@ use bincode::{ ...@@ -8,7 +8,6 @@ use bincode::{
error::{DecodeError, EncodeError}, error::{DecodeError, EncodeError},
}; };
use regex::bytes::{Regex, RegexBuilder}; use regex::bytes::{Regex, RegexBuilder};
use serde::{Deserialize, Serialize};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{TaskInput, Vc, trace::TraceRawVcs};
...@@ -27,8 +26,7 @@ use crate::globset::parse; ...@@ -27,8 +26,7 @@ use crate::globset::parse;
// separators // separators
#[turbo_tasks::value(eq = "manual", serialization = "custom")] #[turbo_tasks::value(eq = "manual", serialization = "custom")]
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone)]
#[serde(into = "GlobForm", try_from = "GlobForm")]
pub struct Glob { pub struct Glob {
glob: RcStr, glob: RcStr,
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
...@@ -70,19 +68,7 @@ impl<Context> Decode<Context> for Glob { ...@@ -70,19 +68,7 @@ impl<Context> Decode<Context> for Glob {
} }
#[derive( #[derive(
Serialize, Copy, Clone, PartialEq, Eq, Hash, Default, TaskInput, TraceRawVcs, Debug, Encode, Decode,
Deserialize,
Copy,
Clone,
PartialEq,
Eq,
Hash,
Default,
TaskInput,
TraceRawVcs,
Debug,
Encode,
Decode,
)] )]
pub struct GlobOptions { pub struct GlobOptions {
...@@ -94,28 +80,6 @@ pub struct GlobOptions { ...@@ -94,28 +80,6 @@ pub struct GlobOptions {
pub contains: bool, pub contains: bool,
} }
#[derive(Serialize, Deserialize)]
struct GlobForm {
glob: RcStr,
opts: GlobOptions,
}
impl From<Glob> for GlobForm {
fn from(value: Glob) -> Self {
Self {
glob: value.glob,
opts: value.opts,
}
}
}
impl TryFrom<GlobForm> for Glob {
type Error = anyhow::Error;
fn try_from(value: GlobForm) -> Result<Self, Self::Error> {
Glob::parse(value.glob, value.opts)
}
}
impl Glob { impl Glob {
// Returns true if the glob matches the given path. // Returns true if the glob matches the given path.
pub fn matches(&self, path: &str) -> bool { pub fn matches(&self, path: &str) -> bool {
......
use std::fmt::{Display, Formatter, Write}; use std::fmt::{Display, Formatter, Write};
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::Deserialize;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{NonLocalValue, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, trace::TraceRawVcs};
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, NonLocalValue)] #[derive(Debug, Clone, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue)]
pub struct UnparsableJson { pub struct UnparsableJson {
pub message: RcStr, pub message: RcStr,
pub path: Option<RcStr>, pub path: Option<RcStr>,
......
...@@ -51,7 +51,6 @@ use indexmap::IndexSet; ...@@ -51,7 +51,6 @@ use indexmap::IndexSet;
use jsonc_parser::{ParseOptions, parse_to_serde_value}; use jsonc_parser::{ParseOptions, parse_to_serde_value};
use mime::Mime; use mime::Mime;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use serde::{Deserialize, Serialize};
use serde_json::Value; use serde_json::Value;
use tokio::sync::{RwLock, RwLockReadGuard}; use tokio::sync::{RwLock, RwLockReadGuard};
use tracing::Instrument; use tracing::Instrument;
...@@ -253,36 +252,30 @@ struct DiskFileSystemApplyContext { ...@@ -253,36 +252,30 @@ struct DiskFileSystemApplyContext {
created_directories: FxHashSet<PathBuf>, created_directories: FxHashSet<PathBuf>,
} }
#[derive(Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, NonLocalValue, Encode, Decode)] #[derive(TraceRawVcs, ValueDebugFormat, NonLocalValue, Encode, Decode)]
struct DiskFileSystemInner { struct DiskFileSystemInner {
pub name: RcStr, pub name: RcStr,
pub root: RcStr, pub root: RcStr,
#[turbo_tasks(debug_ignore, trace_ignore)] #[turbo_tasks(debug_ignore, trace_ignore)]
#[serde(skip)]
#[bincode(skip)] #[bincode(skip)]
mutex_map: MutexMap<PathBuf>, mutex_map: MutexMap<PathBuf>,
#[turbo_tasks(debug_ignore, trace_ignore)] #[turbo_tasks(debug_ignore, trace_ignore)]
#[serde(skip)]
#[bincode(skip)] #[bincode(skip)]
invalidator_map: InvalidatorMap, invalidator_map: InvalidatorMap,
#[turbo_tasks(debug_ignore, trace_ignore)] #[turbo_tasks(debug_ignore, trace_ignore)]
#[serde(skip)]
#[bincode(skip)] #[bincode(skip)]
dir_invalidator_map: InvalidatorMap, dir_invalidator_map: InvalidatorMap,
/// Lock that makes invalidation atomic. It will keep a write lock during /// Lock that makes invalidation atomic. It will keep a write lock during
/// watcher invalidation and a read lock during other operations. /// watcher invalidation and a read lock during other operations.
#[turbo_tasks(debug_ignore, trace_ignore)] #[turbo_tasks(debug_ignore, trace_ignore)]
#[serde(skip)]
#[bincode(skip)] #[bincode(skip)]
invalidation_lock: RwLock<()>, invalidation_lock: RwLock<()>,
/// Semaphore to limit the maximum number of concurrent file operations. /// Semaphore to limit the maximum number of concurrent file operations.
#[turbo_tasks(debug_ignore, trace_ignore)] #[turbo_tasks(debug_ignore, trace_ignore)]
#[serde(skip, default = "create_read_semaphore")]
#[bincode(skip, default = "create_read_semaphore")] #[bincode(skip, default = "create_read_semaphore")]
read_semaphore: tokio::sync::Semaphore, read_semaphore: tokio::sync::Semaphore,
/// Semaphore to limit the maximum number of concurrent file operations. /// Semaphore to limit the maximum number of concurrent file operations.
#[turbo_tasks(debug_ignore, trace_ignore)] #[turbo_tasks(debug_ignore, trace_ignore)]
#[serde(skip, default = "create_write_semaphore")]
#[bincode(skip, default = "create_write_semaphore")] #[bincode(skip, default = "create_write_semaphore")]
write_semaphore: tokio::sync::Semaphore, write_semaphore: tokio::sync::Semaphore,
...@@ -1702,19 +1695,7 @@ pub struct RealPathResult { ...@@ -1702,19 +1695,7 @@ pub struct RealPathResult {
/// Errors that can occur when resolving a path with symlinks. /// Errors that can occur when resolving a path with symlinks.
/// Many of these can be transient conditions that might happen when package managers are running. /// Many of these can be transient conditions that might happen when package managers are running.
#[derive( #[derive(Debug, Clone, Hash, Eq, PartialEq, NonLocalValue, TraceRawVcs, Encode, Decode)]
Debug,
Clone,
Hash,
Eq,
PartialEq,
Serialize,
Deserialize,
NonLocalValue,
TraceRawVcs,
Encode,
Decode,
)]
pub enum RealPathResultError { pub enum RealPathResultError {
TooManySymlinks, TooManySymlinks,
CycleDetected, CycleDetected,
...@@ -1880,8 +1861,6 @@ impl FileContent { ...@@ -1880,8 +1861,6 @@ impl FileContent {
bitflags! { bitflags! {
#[derive( #[derive(
Default, Default,
Serialize,
Deserialize,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
DeterministicHash, DeterministicHash,
...@@ -2317,19 +2296,7 @@ pub enum FileLinesContent { ...@@ -2317,19 +2296,7 @@ pub enum FileLinesContent {
NotFound, NotFound,
} }
#[derive( #[derive(Hash, Clone, Debug, PartialEq, Eq, TraceRawVcs, NonLocalValue, Encode, Decode)]
Hash,
Clone,
Debug,
PartialEq,
Eq,
TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
pub enum RawDirectoryEntry { pub enum RawDirectoryEntry {
File, File,
Directory, Directory,
......
use std::{collections::hash_map::Entry, hash::Hash, marker::PhantomData}; use std::{collections::hash_map::Entry, hash::Hash};
use parking_lot::Mutex; use parking_lot::Mutex;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use turbo_tasks::event::Event; use turbo_tasks::event::Event;
pub struct MutexMap<K> { pub struct MutexMap<K> {
...@@ -81,25 +80,3 @@ impl<K: Eq + Hash> Drop for MutexMapGuard<'_, K> { ...@@ -81,25 +80,3 @@ impl<K: Eq + Hash> Drop for MutexMapGuard<'_, K> {
} }
} }
} }
impl<K> Serialize for MutexMap<K> {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
serializer.serialize_unit()
}
}
impl<'de, K> Deserialize<'de> for MutexMap<K> {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
struct Visitor<K>(PhantomData<MutexMap<K>>);
impl<K> serde::de::Visitor<'_> for Visitor<K> {
type Value = MutexMap<K>;
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
formatter.write_str("a unit")
}
fn visit_unit<E: serde::de::Error>(self) -> Result<Self::Value, E> {
Ok(MutexMap::default())
}
}
deserializer.deserialize_unit(Visitor(std::marker::PhantomData))
}
}
...@@ -20,8 +20,6 @@ use bincode::{ ...@@ -20,8 +20,6 @@ use bincode::{
}; };
use bytes::Bytes; use bytes::Bytes;
use futures::Stream; use futures::Stream;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use serde_bytes::ByteBuf;
use tokio::io::{AsyncRead, ReadBuf}; use tokio::io::{AsyncRead, ReadBuf};
use triomphe::Arc; use triomphe::Arc;
use turbo_tasks_hash::{DeterministicHash, DeterministicHasher}; use turbo_tasks_hash::{DeterministicHash, DeterministicHasher};
...@@ -393,27 +391,6 @@ impl DeterministicHash for Rope { ...@@ -393,27 +391,6 @@ impl DeterministicHash for Rope {
} }
} }
impl Serialize for Rope {
/// Ropes are always serialized into contiguous strings, because
/// deserialization won't deduplicate and share the Arcs (being the only
/// possible owner of a individual "shared" data doesn't make sense).
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let bytes = self.to_bytes();
match bytes {
Cow::Borrowed(b) => serde_bytes::Bytes::new(b).serialize(serializer),
Cow::Owned(b) => ByteBuf::from(b).serialize(serializer),
}
}
}
impl<'de> Deserialize<'de> for Rope {
/// Deserializes strings into a contiguous, immutable Rope.
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
let bytes = ByteBuf::deserialize(deserializer)?.into_vec();
Ok(Rope::from(bytes))
}
}
/// Encode as a len + raw bytes format using the encoder's [`bincode::enc::write::Writer`]. Encoding /// Encode as a len + raw bytes format using the encoder's [`bincode::enc::write::Writer`]. Encoding
/// [`Rope::to_bytes`] instead would be easier, but would require copying to an intermediate buffer. /// [`Rope::to_bytes`] instead would be easier, but would require copying to an intermediate buffer.
/// ///
......
...@@ -18,7 +18,6 @@ use notify::{ ...@@ -18,7 +18,6 @@ use notify::{
event::{MetadataKind, ModifyKind, RenameMode}, event::{MetadataKind, ModifyKind, RenameMode},
}; };
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use serde::{Deserialize, Serialize};
use tracing::instrument; use tracing::instrument;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
...@@ -61,9 +60,8 @@ static WATCH_RECURSIVE_MODE: LazyLock<RecursiveMode> = LazyLock::new(|| { ...@@ -61,9 +60,8 @@ static WATCH_RECURSIVE_MODE: LazyLock<RecursiveMode> = LazyLock::new(|| {
} }
}); });
#[derive(Serialize, Deserialize, Encode, Decode)] #[derive(Encode, Decode)]
pub(crate) struct DiskWatcher { pub(crate) struct DiskWatcher {
#[serde(skip)]
#[bincode(skip)] #[bincode(skip)]
state: State, state: State,
} }
......
use std::{collections::VecDeque, hash::Hash}; use std::{collections::VecDeque, hash::Hash};
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use serde::{Deserialize, Serialize};
use turbo_tasks_macros::{TraceRawVcs, ValueDebugFormat}; use turbo_tasks_macros::{TraceRawVcs, ValueDebugFormat};
use super::graph_store::{GraphNode, GraphStore}; use crate::{
use crate::{self as turbo_tasks, NonLocalValue}; self as turbo_tasks, NonLocalValue,
graph::graph_store::{GraphNode, GraphStore},
};
/// A graph traversal that builds an adjacency map /// A graph traversal that builds an adjacency map
#[derive(Debug, Clone, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat)] #[derive(Debug, Clone, TraceRawVcs, ValueDebugFormat)]
#[serde(bound(
serialize = "T: Serialize + Eq + Hash",
deserialize = "T: Deserialize<'de> + Eq + Hash"
))]
pub struct AdjacencyMap<T> { pub struct AdjacencyMap<T> {
adjacency_map: FxHashMap<T, Vec<T>>, adjacency_map: FxHashMap<T, Vec<T>>,
roots: Vec<T>, roots: Vec<T>,
......
...@@ -14,7 +14,6 @@ use bincode::{ ...@@ -14,7 +14,6 @@ use bincode::{
impl_borrow_decode, impl_borrow_decode,
}; };
use indexmap::map::Entry; use indexmap::map::Entry;
use serde::{Deserialize, Serialize, de::Visitor};
use tokio::runtime::Handle; use tokio::runtime::Handle;
use turbo_dyn_eq_hash::{ use turbo_dyn_eq_hash::{
DynEq, DynHash, impl_eq_for_dyn, impl_hash_for_dyn, impl_partial_eq_for_dyn, DynEq, DynHash, impl_eq_for_dyn, impl_hash_for_dyn, impl_partial_eq_for_dyn,
...@@ -113,44 +112,6 @@ impl TraceRawVcs for Invalidator { ...@@ -113,44 +112,6 @@ impl TraceRawVcs for Invalidator {
} }
} }
impl Serialize for Invalidator {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
serializer.serialize_newtype_struct("Invalidator", &self.task)
}
}
impl<'de> Deserialize<'de> for Invalidator {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
struct V;
impl<'de> Visitor<'de> for V {
type Value = Invalidator;
fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "an Invalidator")
}
fn visit_newtype_struct<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
where
D: serde::Deserializer<'de>,
{
Ok(Invalidator {
task: TaskId::deserialize(deserializer)?,
turbo_tasks: with_turbo_tasks(Arc::downgrade),
handle: tokio::runtime::Handle::current(),
})
}
}
deserializer.deserialize_newtype_struct("Invalidator", V)
}
}
impl Encode for Invalidator { impl Encode for Invalidator {
fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> { fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
Encode::encode(&self.task, encoder) Encode::encode(&self.task, encoder)
......
...@@ -1738,7 +1738,7 @@ pub(crate) async fn read_task_cell( ...@@ -1738,7 +1738,7 @@ pub(crate) async fn read_task_cell(
/// ///
/// Mutations should not outside of the task that that owns this cell. Doing so /// Mutations should not outside of the task that that owns this cell. Doing so
/// is a logic error, and may lead to incorrect caching behavior. /// is a logic error, and may lead to incorrect caching behavior.
#[derive(Clone, Copy, Serialize, Deserialize)] #[derive(Clone, Copy)]
pub struct CurrentCellRef { pub struct CurrentCellRef {
current_task: TaskId, current_task: TaskId,
index: CellId, index: CellId,
......
use std::{any::Any, collections::VecDeque, fmt::Display, sync::Arc, time::Duration}; use std::{any::Any, collections::VecDeque, fmt::Display, sync::Arc, time::Duration};
use dashmap::DashMap; use dashmap::DashMap;
use serde::Serialize;
use tokio::sync::{Mutex, mpsc}; use tokio::sync::{Mutex, mpsc};
pub trait CompilationEvent: Sync + Send + Any { pub trait CompilationEvent: Sync + Send + Any {
...@@ -132,7 +133,7 @@ impl CompilationEventQueue { ...@@ -132,7 +133,7 @@ impl CompilationEventQueue {
} }
} }
#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, serde::Serialize, serde::Deserialize)] #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Serialize)]
pub enum Severity { pub enum Severity {
Info, Info,
Trace, Trace,
...@@ -155,7 +156,7 @@ impl Display for Severity { ...@@ -155,7 +156,7 @@ impl Display for Severity {
} }
} }
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] #[derive(Debug, Clone, Serialize)]
/// Compilation event that is used to log the duration of a task /// Compilation event that is used to log the duration of a task
pub struct TimingEvent { pub struct TimingEvent {
/// Message of the event without the timing information /// Message of the event without the timing information
...@@ -205,7 +206,7 @@ impl CompilationEvent for TimingEvent { ...@@ -205,7 +206,7 @@ impl CompilationEvent for TimingEvent {
} }
} }
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] #[derive(Debug, Clone, Serialize)]
pub struct DiagnosticEvent { pub struct DiagnosticEvent {
pub message: String, pub message: String,
pub severity: Severity, pub severity: Severity,
......
...@@ -8,7 +8,6 @@ use std::{ ...@@ -8,7 +8,6 @@ use std::{
use auto_hash_map::AutoSet; use auto_hash_map::AutoSet;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use parking_lot::{Mutex, MutexGuard}; use parking_lot::{Mutex, MutexGuard};
use serde::{Deserialize, Serialize};
use tracing::trace_span; use tracing::trace_span;
use crate::{ use crate::{
...@@ -16,7 +15,7 @@ use crate::{ ...@@ -16,7 +15,7 @@ use crate::{
mark_stateful, trace::TraceRawVcs, mark_stateful, trace::TraceRawVcs,
}; };
#[derive(Serialize, Deserialize, Encode, Decode)] #[derive(Encode, Decode)]
struct StateInner<T> { struct StateInner<T> {
value: T, value: T,
invalidators: AutoSet<Invalidator>, invalidators: AutoSet<Invalidator>,
...@@ -161,7 +160,7 @@ mod parking_lot_mutex_bincode { ...@@ -161,7 +160,7 @@ mod parking_lot_mutex_bincode {
/// [strong consistency]: crate::OperationVc::read_strongly_consistent /// [strong consistency]: crate::OperationVc::read_strongly_consistent
/// [`OperationVc`]: crate::OperationVc /// [`OperationVc`]: crate::OperationVc
/// [`OperationValue`]: crate::OperationValue /// [`OperationValue`]: crate::OperationValue
#[derive(Serialize, Deserialize, Encode, Decode)] #[derive(Encode, Decode)]
pub struct State<T> { pub struct State<T> {
serialization_invalidator: SerializationInvalidator, serialization_invalidator: SerializationInvalidator,
#[bincode(with = "parking_lot_mutex_bincode")] #[bincode(with = "parking_lot_mutex_bincode")]
...@@ -272,10 +271,9 @@ impl<T: PartialEq> State<T> { ...@@ -272,10 +271,9 @@ impl<T: PartialEq> State<T> {
} }
} }
#[derive(Serialize, Deserialize, Encode, Decode)] #[derive(Encode, Decode)]
#[bincode(bounds = "")] #[bincode(bounds = "")]
pub struct TransientState<T> { pub struct TransientState<T> {
#[serde(skip, default = "default_transient_state_inner")]
#[bincode(skip, default = "default_transient_state_inner")] #[bincode(skip, default = "default_transient_state_inner")]
inner: Mutex<StateInner<Option<T>>>, inner: Mutex<StateInner<Option<T>>>,
} }
......
...@@ -21,7 +21,6 @@ use bincode::{ ...@@ -21,7 +21,6 @@ use bincode::{
error::{DecodeError, EncodeError}, error::{DecodeError, EncodeError},
}; };
use pin_project_lite::pin_project; use pin_project_lite::pin_project;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
pub use crate::{ pub use crate::{
id_factory::{IdFactory, IdFactoryWithReuse}, id_factory::{IdFactory, IdFactoryWithReuse},
...@@ -79,33 +78,6 @@ impl PartialEq for SharedError { ...@@ -79,33 +78,6 @@ impl PartialEq for SharedError {
impl Eq for SharedError {} impl Eq for SharedError {}
impl Serialize for SharedError {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let mut v = vec![self.to_string()];
let mut source = self.source();
while let Some(s) = source {
v.push(s.to_string());
source = s.source();
}
Serialize::serialize(&v, serializer)
}
}
impl<'de> Deserialize<'de> for SharedError {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
use serde::de::Error;
let mut messages = <Vec<String>>::deserialize(deserializer)?;
let msg = messages
.pop()
.ok_or_else(|| Error::custom("expected at least 1 error message"))?;
let mut e = anyhow!(msg);
while let Some(message) = messages.pop() {
e = e.context(message);
}
Ok(SharedError::new(e))
}
}
impl Encode for SharedError { impl Encode for SharedError {
fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> { fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
let mut v = vec![self.to_string()]; let mut v = vec![self.to_string()];
......
...@@ -2,7 +2,6 @@ use std::mem::replace; ...@@ -2,7 +2,6 @@ use std::mem::replace;
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, NonLocalValue, ValueToString, Vc, trace::TraceRawVcs}; use turbo_tasks::{FxIndexMap, NonLocalValue, ValueToString, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::{FileContent, FileLine, FileLinesContent, rope::Rope}; use turbo_tasks_fs::{FileContent, FileLine, FileLinesContent, rope::Rope};
...@@ -12,18 +11,14 @@ use turbopack_core::{ ...@@ -12,18 +11,14 @@ use turbopack_core::{
source_map::{GenerateSourceMap, OriginalToken, SourceMap, SyntheticToken, Token}, source_map::{GenerateSourceMap, OriginalToken, SourceMap, SyntheticToken, Token},
}; };
#[derive( #[derive(Clone, Debug, Eq, NonLocalValue, PartialEq, TraceRawVcs, Encode, Decode)]
Clone, Debug, Deserialize, Eq, NonLocalValue, PartialEq, Serialize, TraceRawVcs, Encode, Decode,
)]
pub struct ChunkPartRange { pub struct ChunkPartRange {
pub line: u32, pub line: u32,
pub start_column: u32, pub start_column: u32,
pub end_column: u32, pub end_column: u32,
} }
#[derive( #[derive(Clone, Debug, Eq, NonLocalValue, PartialEq, TraceRawVcs, Encode, Decode)]
Clone, Debug, Deserialize, Eq, NonLocalValue, PartialEq, Serialize, TraceRawVcs, Encode, Decode,
)]
pub struct ChunkPart { pub struct ChunkPart {
pub source: RcStr, pub source: RcStr,
pub real_size: u32, pub real_size: u32,
......
use anyhow::{Context, Result, bail}; use anyhow::{Context, Result, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
...@@ -61,8 +60,6 @@ pub const CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR: &str = ...@@ -61,8 +60,6 @@ pub const CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR: &str =
PartialEq, PartialEq,
Eq, Eq,
Hash, Hash,
Serialize,
Deserialize,
TraceRawVcs, TraceRawVcs,
DeterministicHash, DeterministicHash,
NonLocalValue, NonLocalValue,
......
...@@ -7,7 +7,6 @@ use std::{ ...@@ -7,7 +7,6 @@ use std::{
use anyhow::anyhow; use anyhow::anyhow;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use clap::{Args, Parser, ValueEnum}; use clap::{Args, Parser, ValueEnum};
use serde::{Deserialize, Serialize};
use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
use turbopack_core::issue::IssueSeverity; use turbopack_core::issue::IssueSeverity;
...@@ -43,8 +42,6 @@ impl Arguments { ...@@ -43,8 +42,6 @@ impl Arguments {
ValueEnum, ValueEnum,
PartialEq, PartialEq,
Eq, Eq,
Serialize,
Deserialize,
Hash, Hash,
TaskInput, TaskInput,
NonLocalValue, NonLocalValue,
...@@ -167,20 +164,6 @@ pub struct BuildArguments { ...@@ -167,20 +164,6 @@ pub struct BuildArguments {
#[derive(Clone, Copy, PartialEq, Eq, Debug)] #[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub struct IssueSeverityCliOption(pub IssueSeverity); pub struct IssueSeverityCliOption(pub IssueSeverity);
impl serde::Serialize for IssueSeverityCliOption {
fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
serializer.serialize_str(&self.0.to_string())
}
}
impl<'de> serde::Deserialize<'de> for IssueSeverityCliOption {
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
let s = String::deserialize(deserializer)?;
<IssueSeverityCliOption as std::str::FromStr>::from_str(&s)
.map_err(serde::de::Error::custom)
}
}
impl ValueEnum for IssueSeverityCliOption { impl ValueEnum for IssueSeverityCliOption {
fn value_variants<'a>() -> &'a [Self] { fn value_variants<'a>() -> &'a [Self] {
const VARIANTS: [IssueSeverityCliOption; 8] = [ const VARIANTS: [IssueSeverityCliOption; 8] = [
......
...@@ -3,24 +3,12 @@ use std::{env::current_dir, path::PathBuf}; ...@@ -3,24 +3,12 @@ use std::{env::current_dir, path::PathBuf};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use dunce::canonicalize; use dunce::canonicalize;
use serde::{Deserialize, Serialize};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{NonLocalValue, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, TaskInput, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::{DiskFileSystem, FileSystem}; use turbo_tasks_fs::{DiskFileSystem, FileSystem};
#[derive( #[derive(
Clone, Clone, Debug, TaskInput, Hash, PartialEq, Eq, NonLocalValue, TraceRawVcs, Encode, Decode,
Debug,
TaskInput,
Hash,
PartialEq,
Eq,
NonLocalValue,
Serialize,
Deserialize,
TraceRawVcs,
Encode,
Decode,
)] )]
pub enum EntryRequest { pub enum EntryRequest {
Relative(RcStr), Relative(RcStr),
......
...@@ -32,7 +32,6 @@ ref-cast = "1.0.20" ...@@ -32,7 +32,6 @@ ref-cast = "1.0.20"
rustc-hash = { workspace = true } rustc-hash = { workspace = true }
regex = { workspace = true } regex = { workspace = true }
serde = { workspace = true, features = ["rc"] } serde = { workspace = true, features = ["rc"] }
serde_bytes = { workspace = true }
serde_json = { workspace = true, features = ["preserve_order", "raw_value"] } serde_json = { workspace = true, features = ["preserve_order", "raw_value"] }
smallvec = { workspace = true } smallvec = { workspace = true }
swc_sourcemap = { workspace = true } swc_sourcemap = { workspace = true }
......
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use bitfield::bitfield; use bitfield::bitfield;
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
use crate::chunk::available_modules::{AvailableModules, AvailableModulesSet}; use crate::chunk::available_modules::{AvailableModules, AvailableModulesSet};
bitfield! { bitfield! {
#[derive(Clone, Copy, Default, TaskInput, TraceRawVcs, NonLocalValue, Serialize, Deserialize, PartialEq, Eq, Hash, Encode, Decode)] #[derive(Clone, Copy, Default, TaskInput, TraceRawVcs, NonLocalValue, PartialEq, Eq, Hash, Encode, Decode)]
pub struct AvailabilityFlags(u8); pub struct AvailabilityFlags(u8);
impl Debug; impl Debug;
pub is_in_async_module, set_is_in_async_module: 0; pub is_in_async_module, set_is_in_async_module: 0;
} }
#[derive( #[derive(
Eq, Eq, PartialEq, Hash, Clone, Copy, Debug, TaskInput, TraceRawVcs, NonLocalValue, Encode, Decode,
PartialEq,
Hash,
Clone,
Copy,
Debug,
TaskInput,
TraceRawVcs,
NonLocalValue,
Serialize,
Deserialize,
Encode,
Decode,
)] )]
pub struct AvailabilityInfo { pub struct AvailabilityInfo {
flags: AvailabilityFlags, flags: AvailabilityFlags,
......
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, ValueToString, Vc, FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, ValueToString, Vc,
trace::TraceRawVcs, trace::TraceRawVcs,
...@@ -14,19 +13,7 @@ use crate::{ ...@@ -14,19 +13,7 @@ use crate::{
}; };
#[derive( #[derive(
Debug, Debug, Copy, Clone, Hash, PartialEq, Eq, TraceRawVcs, NonLocalValue, TaskInput, Encode, Decode,
Copy,
Clone,
Hash,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
TaskInput,
Encode,
Decode,
)] )]
pub enum AvailableModuleItem { pub enum AvailableModuleItem {
Module(ResolvedVc<Box<dyn ChunkableModule>>), Module(ResolvedVc<Box<dyn ChunkableModule>>),
......
...@@ -4,7 +4,6 @@ use anyhow::Result; ...@@ -4,7 +4,6 @@ use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use either::Either; use either::Either;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize};
use smallvec::{SmallVec, smallvec}; use smallvec::{SmallVec, smallvec};
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryFlatJoinIterExt, TryJoinIterExt, FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryFlatJoinIterExt, TryJoinIterExt,
...@@ -50,18 +49,7 @@ pub async fn attach_async_info_to_chunkable_module( ...@@ -50,18 +49,7 @@ pub async fn attach_async_info_to_chunkable_module(
} }
#[derive( #[derive(
Debug, Debug, Clone, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue, TaskInput, Encode, Decode,
Clone,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
TaskInput,
Encode,
Decode,
)] )]
pub enum ChunkItemOrBatchWithAsyncModuleInfo { pub enum ChunkItemOrBatchWithAsyncModuleInfo {
ChunkItem(ChunkItemWithAsyncModuleInfo), ChunkItem(ChunkItemWithAsyncModuleInfo),
......
...@@ -3,7 +3,6 @@ use std::future::IntoFuture; ...@@ -3,7 +3,6 @@ use std::future::IntoFuture;
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize};
use smallvec::{SmallVec, smallvec}; use smallvec::{SmallVec, smallvec};
use tracing::{Instrument, Level}; use tracing::{Instrument, Level};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
...@@ -12,10 +11,9 @@ use turbo_tasks::{ ...@@ -12,10 +11,9 @@ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, debug::ValueDebugFormat, trace::TraceRawVcs,
}; };
use super::{Chunk, ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext};
use crate::{ use crate::{
chunk::{ chunk::{
batch_info, Chunk, ChunkItem, ChunkItemWithAsyncModuleInfo, ChunkType, ChunkingContext, batch_info,
chunk_item_batch::{ chunk_item_batch::{
ChunkItemBatchGroup, ChunkItemBatchWithAsyncModuleInfo, ChunkItemBatchGroup, ChunkItemBatchWithAsyncModuleInfo,
ChunkItemOrBatchWithAsyncModuleInfo, ChunkItemOrBatchWithAsyncModuleInfo,
...@@ -50,18 +48,7 @@ struct BatchChunkItemsWithInfo( ...@@ -50,18 +48,7 @@ struct BatchChunkItemsWithInfo(
FxHashMap<ChunkItemOrBatchWithAsyncModuleInfo, ResolvedVc<ChunkItemsWithInfo>>, FxHashMap<ChunkItemOrBatchWithAsyncModuleInfo, ResolvedVc<ChunkItemsWithInfo>>,
); );
#[derive( #[derive(Clone, PartialEq, Eq, TraceRawVcs, NonLocalValue, ValueDebugFormat, Encode, Decode)]
Clone,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
ValueDebugFormat,
Encode,
Decode,
)]
enum ChunkItemOrBatchWithInfo { enum ChunkItemOrBatchWithInfo {
ChunkItem { ChunkItem {
chunk_item: ChunkItemWithAsyncModuleInfo, chunk_item: ChunkItemWithAsyncModuleInfo,
......
...@@ -35,7 +35,6 @@ use crate::{ ...@@ -35,7 +35,6 @@ use crate::{
PartialEq, PartialEq,
Eq, Eq,
Hash, Hash,
Serialize,
Deserialize, Deserialize,
TraceRawVcs, TraceRawVcs,
DeterministicHash, DeterministicHash,
...@@ -228,8 +227,6 @@ pub struct EntryChunkGroupResult { ...@@ -228,8 +227,6 @@ pub struct EntryChunkGroupResult {
PartialEq, PartialEq,
Eq, Eq,
Hash, Hash,
Serialize,
Deserialize,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
TaskInput, TaskInput,
......
...@@ -23,7 +23,7 @@ use turbo_tasks::{ ...@@ -23,7 +23,7 @@ use turbo_tasks::{
}; };
use turbo_tasks_hash::DeterministicHash; use turbo_tasks_hash::DeterministicHash;
pub use self::{ pub use crate::chunk::{
chunk_item_batch::{ chunk_item_batch::{
ChunkItemBatchGroup, ChunkItemBatchWithAsyncModuleInfo, ChunkItemBatchGroup, ChunkItemBatchWithAsyncModuleInfo,
ChunkItemOrBatchWithAsyncModuleInfo, batch_info, ChunkItemOrBatchWithAsyncModuleInfo, batch_info,
...@@ -149,19 +149,7 @@ impl MergeableModules { ...@@ -149,19 +149,7 @@ impl MergeableModules {
/// Whether a given module needs to be exposed (depending on how it is imported by other modules) /// Whether a given module needs to be exposed (depending on how it is imported by other modules)
#[derive( #[derive(
Copy, Copy, Clone, Debug, PartialEq, Eq, TraceRawVcs, NonLocalValue, TaskInput, Hash, Encode, Decode,
Clone,
Debug,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
TaskInput,
Hash,
Encode,
Decode,
)] )]
pub enum MergeableModuleExposure { pub enum MergeableModuleExposure {
// This module is only used from within the current group, and only individual exports are // This module is only used from within the current group, and only individual exports are
...@@ -513,18 +501,7 @@ impl AsyncModuleInfo { ...@@ -513,18 +501,7 @@ impl AsyncModuleInfo {
} }
#[derive( #[derive(
Serialize, Debug, Clone, PartialEq, Eq, Hash, TraceRawVcs, TaskInput, NonLocalValue, Encode, Decode,
Deserialize,
Debug,
Clone,
PartialEq,
Eq,
Hash,
TraceRawVcs,
TaskInput,
NonLocalValue,
Encode,
Decode,
)] )]
pub struct ChunkItemWithAsyncModuleInfo { pub struct ChunkItemWithAsyncModuleInfo {
pub chunk_item: ResolvedVc<Box<dyn ChunkItem>>, pub chunk_item: ResolvedVc<Box<dyn ChunkItem>>,
......
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, NonLocalValue, ResolvedVc, Vc, trace::TraceRawVcs}; use turbo_tasks::{FxIndexMap, NonLocalValue, ResolvedVc, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
...@@ -224,19 +223,7 @@ impl CompileTimeDefines { ...@@ -224,19 +223,7 @@ impl CompileTimeDefines {
} }
} }
#[derive( #[derive(Debug, Clone, Copy, PartialEq, Eq, TraceRawVcs, NonLocalValue, Encode, Decode)]
Debug,
Clone,
Copy,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)]
pub enum InputRelativeConstant { pub enum InputRelativeConstant {
// The project relative directory name of the source file // The project relative directory name of the source file
DirName, DirName,
......
...@@ -4,7 +4,6 @@ use anyhow::Result; ...@@ -4,7 +4,6 @@ use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, ReadRef, ResolvedVc, TaskInput, ValueToString, Vc, trace::TraceRawVcs, NonLocalValue, ReadRef, ResolvedVc, TaskInput, ValueToString, Vc, trace::TraceRawVcs,
...@@ -24,8 +23,6 @@ use crate::resolve::ModulePart; ...@@ -24,8 +23,6 @@ use crate::resolve::ModulePart;
Eq, Eq,
PartialEq, PartialEq,
TraceRawVcs, TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue, NonLocalValue,
Encode, Encode,
Decode, Decode,
......
...@@ -282,19 +282,7 @@ impl CapturedIssues { ...@@ -282,19 +282,7 @@ impl CapturedIssues {
} }
#[derive( #[derive(
Clone, Clone, Copy, Debug, PartialEq, Eq, Hash, TaskInput, TraceRawVcs, NonLocalValue, Encode, Decode,
Copy,
Debug,
PartialEq,
Eq,
Serialize,
Deserialize,
Hash,
TaskInput,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)] )]
pub struct IssueSource { pub struct IssueSource {
source: ResolvedVc<Box<dyn Source>>, source: ResolvedVc<Box<dyn Source>>,
...@@ -303,19 +291,7 @@ pub struct IssueSource { ...@@ -303,19 +291,7 @@ pub struct IssueSource {
/// The end position is the first character after the range /// The end position is the first character after the range
#[derive( #[derive(
Clone, Clone, Copy, Debug, PartialEq, Eq, Hash, TaskInput, TraceRawVcs, NonLocalValue, Encode, Decode,
Copy,
Debug,
PartialEq,
Eq,
Serialize,
Deserialize,
Hash,
TaskInput,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)] )]
enum SourceRange { enum SourceRange {
LineColumn(SourcePos, SourcePos), LineColumn(SourcePos, SourcePos),
......
...@@ -9,7 +9,6 @@ use either::Either; ...@@ -9,7 +9,6 @@ use either::Either;
use indexmap::map::Entry; use indexmap::map::Entry;
use roaring::RoaringBitmap; use roaring::RoaringBitmap;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
...@@ -23,18 +22,7 @@ use crate::{ ...@@ -23,18 +22,7 @@ use crate::{
module_graph::{GraphTraversalAction, ModuleGraphRef, RefData}, module_graph::{GraphTraversalAction, ModuleGraphRef, RefData},
}; };
#[derive( #[derive(Clone, Debug, Default, PartialEq, TraceRawVcs, ValueDebugFormat, Encode, Decode)]
Clone,
Debug,
Default,
PartialEq,
Serialize,
Deserialize,
TraceRawVcs,
ValueDebugFormat,
Encode,
Decode,
)]
#[repr(transparent)] #[repr(transparent)]
pub struct RoaringBitmapWrapper( pub struct RoaringBitmapWrapper(
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
...@@ -127,18 +115,7 @@ impl ChunkGroupInfo { ...@@ -127,18 +115,7 @@ impl ChunkGroupInfo {
} }
#[derive( #[derive(
Debug, Debug, Clone, Hash, TaskInput, PartialEq, Eq, TraceRawVcs, NonLocalValue, Encode, Decode,
Clone,
Hash,
TaskInput,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)] )]
pub enum ChunkGroupEntry { pub enum ChunkGroupEntry {
/// e.g. a page /// e.g. a page
...@@ -175,19 +152,7 @@ impl ChunkGroupEntry { ...@@ -175,19 +152,7 @@ impl ChunkGroupEntry {
} }
} }
#[derive( #[derive(Debug, Clone, Hash, TaskInput, PartialEq, Eq, TraceRawVcs, Encode, Decode)]
Debug,
Clone,
Hash,
TaskInput,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
Encode,
Decode,
)]
pub enum ChunkGroup { pub enum ChunkGroup {
/// e.g. a page /// e.g. a page
Entry(Vec<ResolvedVc<Box<dyn Module>>>), Entry(Vec<ResolvedVc<Box<dyn Module>>>),
...@@ -305,7 +270,7 @@ impl ChunkGroup { ...@@ -305,7 +270,7 @@ impl ChunkGroup {
} }
} }
#[derive(Debug, Clone, Hash, PartialEq, Eq, Serialize, Deserialize, Encode, Decode)] #[derive(Debug, Clone, Hash, PartialEq, Eq, Encode, Decode)]
pub enum ChunkGroupKey { pub enum ChunkGroupKey {
/// e.g. a page /// e.g. a page
Entry(Vec<ResolvedVc<Box<dyn Module>>>), Entry(Vec<ResolvedVc<Box<dyn Module>>>),
...@@ -368,7 +333,7 @@ impl ChunkGroupKey { ...@@ -368,7 +333,7 @@ impl ChunkGroupKey {
} }
} }
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Encode, Decode)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Encode, Decode)]
pub struct ChunkGroupId(u32); pub struct ChunkGroupId(u32);
impl From<usize> for ChunkGroupId { impl From<usize> for ChunkGroupId {
......
...@@ -96,8 +96,6 @@ unsafe impl NonLocalValue for GraphNodeIndex {} ...@@ -96,8 +96,6 @@ unsafe impl NonLocalValue for GraphNodeIndex {}
Ord, Ord,
Hash, Hash,
PartialEq, PartialEq,
Serialize,
Deserialize,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
Encode, Encode,
...@@ -953,18 +951,7 @@ impl ModuleGraph { ...@@ -953,18 +951,7 @@ impl ModuleGraph {
} }
#[derive( #[derive(
Clone, Clone, Debug, PartialEq, Eq, Hash, TaskInput, TraceRawVcs, NonLocalValue, Encode, Decode,
Debug,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
TaskInput,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)] )]
pub struct SingleModuleGraphWithBindingUsage { pub struct SingleModuleGraphWithBindingUsage {
pub graph: ResolvedVc<SingleModuleGraph>, pub graph: ResolvedVc<SingleModuleGraph>,
...@@ -1631,7 +1618,7 @@ impl SingleModuleGraph { ...@@ -1631,7 +1618,7 @@ impl SingleModuleGraph {
} }
} }
#[derive(Clone, Debug, Serialize, Deserialize, TraceRawVcs, NonLocalValue, Encode, Decode)] #[derive(Clone, Debug, Serialize, Deserialize, TraceRawVcs, NonLocalValue)]
pub enum SingleModuleGraphNode { pub enum SingleModuleGraphNode {
Module(ResolvedVc<Box<dyn Module>>), Module(ResolvedVc<Box<dyn Module>>),
// Models a module that is referenced but has already been visited by an earlier graph. // Models a module that is referenced but has already been visited by an earlier graph.
......
...@@ -47,19 +47,7 @@ impl ModuleOrBatch { ...@@ -47,19 +47,7 @@ impl ModuleOrBatch {
} }
#[derive( #[derive(
Debug, Debug, Copy, Clone, Hash, PartialEq, Eq, TraceRawVcs, NonLocalValue, TaskInput, Encode, Decode,
Copy,
Clone,
Hash,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
TaskInput,
Encode,
Decode,
)] )]
pub enum ChunkableModuleOrBatch { pub enum ChunkableModuleOrBatch {
Module(ResolvedVc<Box<dyn ChunkableModule>>), Module(ResolvedVc<Box<dyn ChunkableModule>>),
......
...@@ -49,7 +49,7 @@ pub struct ModuleBatchesGraphEdge { ...@@ -49,7 +49,7 @@ pub struct ModuleBatchesGraphEdge {
pub module: Option<ResolvedVc<Box<dyn Module>>>, pub module: Option<ResolvedVc<Box<dyn Module>>>,
} }
#[derive(Debug, Clone, Serialize, Deserialize, TraceRawVcs, NonLocalValue, Encode, Decode)] #[derive(Debug, Clone, TraceRawVcs, NonLocalValue, Encode, Decode)]
struct EntriesList( struct EntriesList(
#[bincode(with = "turbo_bincode::indexset")] pub FxIndexSet<ResolvedVc<Box<dyn Module>>>, #[bincode(with = "turbo_bincode::indexset")] pub FxIndexSet<ResolvedVc<Box<dyn Module>>>,
); );
......
...@@ -4,7 +4,6 @@ use anyhow::Result; ...@@ -4,7 +4,6 @@ use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use indexmap::map::Entry; use indexmap::map::Entry;
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, FxIndexSet, NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, ValueToString, FxIndexMap, FxIndexSet, NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, ValueToString,
...@@ -24,18 +23,7 @@ use crate::{ ...@@ -24,18 +23,7 @@ use crate::{
}; };
#[derive( #[derive(
TaskInput, TaskInput, Debug, Clone, PartialEq, Eq, Hash, NonLocalValue, TraceRawVcs, Encode, Decode,
Debug,
Clone,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
NonLocalValue,
TraceRawVcs,
Encode,
Decode,
)] )]
pub struct StyleGroupsConfig { pub struct StyleGroupsConfig {
pub max_chunk_size: usize, pub max_chunk_size: usize,
......
...@@ -2,7 +2,6 @@ use std::fmt::Display; ...@@ -2,7 +2,6 @@ use std::fmt::Display;
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, NonLocalValue, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{FxIndexMap, NonLocalValue, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
...@@ -36,8 +35,6 @@ impl InnerAssets { ...@@ -36,8 +35,6 @@ impl InnerAssets {
Eq, Eq,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize,
Debug, Debug,
Default, Default,
Clone, Clone,
...@@ -54,19 +51,7 @@ pub enum CommonJsReferenceSubType { ...@@ -54,19 +51,7 @@ pub enum CommonJsReferenceSubType {
} }
#[derive( #[derive(
PartialEq, PartialEq, Eq, TraceRawVcs, NonLocalValue, Debug, Clone, Copy, Hash, TaskInput, Encode, Decode,
Eq,
TraceRawVcs,
NonLocalValue,
Serialize,
Deserialize,
Debug,
Clone,
Copy,
Hash,
TaskInput,
Encode,
Decode,
)] )]
pub enum ImportWithType { pub enum ImportWithType {
Json, Json,
...@@ -78,8 +63,6 @@ pub enum ImportWithType { ...@@ -78,8 +63,6 @@ pub enum ImportWithType {
Eq, Eq,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize,
Debug, Debug,
Default, Default,
Clone, Clone,
...@@ -220,8 +203,6 @@ impl ImportContext { ...@@ -220,8 +203,6 @@ impl ImportContext {
Eq, Eq,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize,
Debug, Debug,
Default, Default,
Clone, Clone,
...@@ -250,8 +231,6 @@ pub enum CssReferenceSubType { ...@@ -250,8 +231,6 @@ pub enum CssReferenceSubType {
Eq, Eq,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize,
Debug, Debug,
Default, Default,
Clone, Clone,
...@@ -270,19 +249,7 @@ pub enum UrlReferenceSubType { ...@@ -270,19 +249,7 @@ pub enum UrlReferenceSubType {
} }
#[derive( #[derive(
PartialEq, PartialEq, Eq, TraceRawVcs, NonLocalValue, Debug, Clone, Copy, Hash, TaskInput, Encode, Decode,
Eq,
TraceRawVcs,
NonLocalValue,
Serialize,
Deserialize,
Debug,
Clone,
Copy,
Hash,
TaskInput,
Encode,
Decode,
)] )]
pub enum TypeScriptReferenceSubType { pub enum TypeScriptReferenceSubType {
Custom(u8), Custom(u8),
...@@ -290,19 +257,7 @@ pub enum TypeScriptReferenceSubType { ...@@ -290,19 +257,7 @@ pub enum TypeScriptReferenceSubType {
} }
#[derive( #[derive(
PartialEq, PartialEq, Eq, TraceRawVcs, NonLocalValue, Debug, Clone, Copy, Hash, TaskInput, Encode, Decode,
Eq,
TraceRawVcs,
NonLocalValue,
Serialize,
Deserialize,
Debug,
Clone,
Copy,
Hash,
TaskInput,
Encode,
Decode,
)] )]
pub enum WorkerReferenceSubType { pub enum WorkerReferenceSubType {
WebWorker, WebWorker,
...@@ -316,19 +271,7 @@ pub enum WorkerReferenceSubType { ...@@ -316,19 +271,7 @@ pub enum WorkerReferenceSubType {
// TODO(sokra) this was next.js specific values. We want to solve this in a // TODO(sokra) this was next.js specific values. We want to solve this in a
// different way. // different way.
#[derive( #[derive(
PartialEq, PartialEq, Eq, TraceRawVcs, NonLocalValue, Debug, Clone, Copy, Hash, TaskInput, Encode, Decode,
Eq,
TraceRawVcs,
NonLocalValue,
Serialize,
Deserialize,
Debug,
Clone,
Copy,
Hash,
TaskInput,
Encode,
Decode,
)] )]
pub enum EntryReferenceSubType { pub enum EntryReferenceSubType {
Web, Web,
...@@ -352,8 +295,6 @@ pub enum EntryReferenceSubType { ...@@ -352,8 +295,6 @@ pub enum EntryReferenceSubType {
Eq, Eq,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize,
Debug, Debug,
Default, Default,
Clone, Clone,
......
...@@ -15,7 +15,7 @@ use turbo_tasks::{ ...@@ -15,7 +15,7 @@ use turbo_tasks::{
trace::{TraceRawVcs, TraceRawVcsContext}, trace::{TraceRawVcs, TraceRawVcsContext},
}; };
use super::pattern::Pattern; use crate::resolve::pattern::Pattern;
/// A map of [`AliasPattern`]s to the [`Template`]s they resolve to. /// A map of [`AliasPattern`]s to the [`Template`]s they resolve to.
/// ///
...@@ -25,8 +25,7 @@ use super::pattern::Pattern; ...@@ -25,8 +25,7 @@ use super::pattern::Pattern;
/// ///
/// If the pattern does not have a wildcard character, it will only match the /// If the pattern does not have a wildcard character, it will only match the
/// exact string, and return the template as-is. /// exact string, and return the template as-is.
#[derive(Clone, Serialize, Deserialize, Encode, Decode)] #[derive(Clone, Encode, Decode)]
#[serde(transparent)]
#[bincode( #[bincode(
encode_bounds = "T: Serialize", encode_bounds = "T: Serialize",
decode_bounds = "T: DeserializeOwned", decode_bounds = "T: DeserializeOwned",
......
...@@ -2,7 +2,6 @@ use std::{collections::BTreeMap, future::Future, pin::Pin}; ...@@ -2,7 +2,6 @@ use std::{collections::BTreeMap, future::Future, pin::Pin};
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
FxIndexSet, NonLocalValue, ResolvedVc, TryJoinIterExt, ValueToString, Vc, FxIndexSet, NonLocalValue, ResolvedVc, TryJoinIterExt, ValueToString, Vc,
...@@ -41,20 +40,7 @@ pub enum ResolveModules { ...@@ -41,20 +40,7 @@ pub enum ResolveModules {
}, },
} }
#[derive( #[derive(TraceRawVcs, Hash, PartialEq, Eq, Clone, Copy, Debug, NonLocalValue, Encode, Decode)]
TraceRawVcs,
Hash,
PartialEq,
Eq,
Clone,
Copy,
Debug,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
pub enum ConditionValue { pub enum ConditionValue {
Set, Set,
Unset, Unset,
...@@ -74,19 +60,7 @@ impl From<bool> for ConditionValue { ...@@ -74,19 +60,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( #[derive(TraceRawVcs, Hash, PartialEq, Eq, Clone, Debug, NonLocalValue, Encode, Decode)]
TraceRawVcs,
Hash,
PartialEq,
Eq,
Clone,
Debug,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
pub enum ResolveIntoPackage { pub enum ResolveIntoPackage {
/// Using the [exports] field. /// Using the [exports] field.
/// ///
...@@ -104,19 +78,7 @@ pub enum ResolveIntoPackage { ...@@ -104,19 +78,7 @@ pub enum ResolveIntoPackage {
} }
// The different ways to resolve a request within a package // The different ways to resolve a request within a package
#[derive( #[derive(TraceRawVcs, Hash, PartialEq, Eq, Clone, Debug, NonLocalValue, Encode, Decode)]
TraceRawVcs,
Hash,
PartialEq,
Eq,
Clone,
Debug,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
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),
......
...@@ -8,12 +8,11 @@ use serde_json::Value; ...@@ -8,12 +8,11 @@ use serde_json::Value;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::FxIndexMap; use turbo_tasks::FxIndexMap;
use super::{ use crate::resolve::{
alias_map::{AliasMap, AliasMapIter, AliasPattern, AliasTemplate}, alias_map::{AliasKey, AliasMap, AliasMapIter, AliasPattern, AliasTemplate},
options::ConditionValue, options::ConditionValue,
pattern::Pattern, pattern::Pattern,
}; };
use crate::resolve::alias_map::AliasKey;
/// A small helper type to differentiate parsing exports and imports fields. /// A small helper type to differentiate parsing exports and imports fields.
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
...@@ -364,7 +363,7 @@ impl<'a> Iterator for ResultsIterMut<'a> { ...@@ -364,7 +363,7 @@ impl<'a> Iterator for ResultsIterMut<'a> {
} }
/// Content of an "exports" field in a package.json /// Content of an "exports" field in a package.json
#[derive(PartialEq, Eq, Serialize, Deserialize, Encode, Decode)] #[derive(PartialEq, Eq, Encode, Decode)]
pub struct ExportsField(AliasMap<SubpathValue>); pub struct ExportsField(AliasMap<SubpathValue>);
impl TryFrom<&Value> for ExportsField { impl TryFrom<&Value> for ExportsField {
...@@ -458,7 +457,7 @@ impl Deref for ExportsField { ...@@ -458,7 +457,7 @@ impl Deref for ExportsField {
} }
/// Content of an "imports" field in a package.json /// Content of an "imports" field in a package.json
#[derive(PartialEq, Eq, Serialize, Deserialize, Encode, Decode)] #[derive(PartialEq, Eq, Encode, Decode)]
pub struct ImportsField(AliasMap<SubpathValue>); pub struct ImportsField(AliasMap<SubpathValue>);
impl TryFrom<&Value> for ImportsField { impl TryFrom<&Value> for ImportsField {
......
...@@ -12,7 +12,6 @@ use either::Either; ...@@ -12,7 +12,6 @@ use either::Either;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use ref_cast::RefCast; use ref_cast::RefCast;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use swc_sourcemap::{DecodedMap, SourceMap as RegularMap, SourceMapBuilder, SourceMapIndex}; use swc_sourcemap::{DecodedMap, SourceMap as RegularMap, SourceMapBuilder, SourceMapIndex};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc}; use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
...@@ -682,24 +681,6 @@ impl Deref for CrateMapWrapper { ...@@ -682,24 +681,6 @@ impl Deref for CrateMapWrapper {
} }
} }
impl Serialize for CrateMapWrapper {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
use serde::ser::Error;
let mut bytes = vec![];
self.0.to_writer(&mut bytes).map_err(Error::custom)?;
serializer.serialize_bytes(bytes.as_slice())
}
}
impl<'de> Deserialize<'de> for CrateMapWrapper {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
use serde::de::Error;
let bytes = <&[u8]>::deserialize(deserializer)?;
let map = DecodedMap::from_reader(bytes).map_err(Error::custom)?;
Ok(CrateMapWrapper(map))
}
}
impl Encode for CrateMapWrapper { impl Encode for CrateMapWrapper {
fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> { fn encode<E: Encoder>(&self, encoder: &mut E) -> Result<(), EncodeError> {
let mut bytes = Vec::new(); let mut bytes = Vec::new();
......
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize}; use serde::Serialize;
use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
use turbo_tasks_hash::DeterministicHash; use turbo_tasks_hash::DeterministicHash;
...@@ -21,7 +21,6 @@ const U8_CR: u8 = 0x0D; ...@@ -21,7 +21,6 @@ const U8_CR: u8 = 0x0D;
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
Serialize, Serialize,
Deserialize,
DeterministicHash, DeterministicHash,
NonLocalValue, NonLocalValue,
Encode, Encode,
......
use std::fmt::Display; use std::fmt::Display;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_tasks::{NonLocalValue, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, Vc, trace::TraceRawVcs};
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
...@@ -174,20 +173,7 @@ impl CompileTarget { ...@@ -174,20 +173,7 @@ impl CompileTarget {
} }
} }
#[derive( #[derive(PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, NonLocalValue, Encode, Decode)]
PartialEq,
Eq,
Hash,
Debug,
Copy,
Clone,
TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
#[repr(u8)] #[repr(u8)]
#[non_exhaustive] #[non_exhaustive]
pub enum Arch { pub enum Arch {
...@@ -228,20 +214,7 @@ impl Display for Arch { ...@@ -228,20 +214,7 @@ impl Display for Arch {
} }
} }
#[derive( #[derive(PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, NonLocalValue, Encode, Decode)]
PartialEq,
Eq,
Hash,
Debug,
Copy,
Clone,
TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
#[repr(u8)] #[repr(u8)]
#[non_exhaustive] #[non_exhaustive]
pub enum Platform { pub enum Platform {
...@@ -278,20 +251,7 @@ impl Display for Platform { ...@@ -278,20 +251,7 @@ impl Display for Platform {
} }
} }
#[derive( #[derive(PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, NonLocalValue, Encode, Decode)]
PartialEq,
Eq,
Hash,
Debug,
Copy,
Clone,
TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
#[repr(u8)] #[repr(u8)]
pub enum Endianness { pub enum Endianness {
Big, Big,
...@@ -313,20 +273,7 @@ impl Display for Endianness { ...@@ -313,20 +273,7 @@ impl Display for Endianness {
} }
} }
#[derive( #[derive(PartialEq, Eq, Hash, Debug, Copy, Clone, TraceRawVcs, NonLocalValue, Encode, Decode)]
PartialEq,
Eq,
Hash,
Debug,
Copy,
Clone,
TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
#[repr(u8)] #[repr(u8)]
pub enum Libc { pub enum Libc {
Glibc, Glibc,
......
...@@ -15,14 +15,11 @@ pub(crate) mod process; ...@@ -15,14 +15,11 @@ pub(crate) mod process;
pub(crate) mod references; pub(crate) mod references;
pub(crate) mod util; pub(crate) mod util;
pub use asset::CssModuleAsset;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
pub use module_asset::ModuleCssAsset;
use serde::{Deserialize, Serialize};
use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
pub use self::process::*;
use crate::references::import::ImportAssetReference; use crate::references::import::ImportAssetReference;
pub use crate::{asset::CssModuleAsset, module_asset::ModuleCssAsset, process::*};
#[derive( #[derive(
PartialOrd, PartialOrd,
...@@ -34,8 +31,6 @@ use crate::references::import::ImportAssetReference; ...@@ -34,8 +31,6 @@ use crate::references::import::ImportAssetReference;
Copy, Copy,
Clone, Clone,
Default, Default,
Serialize,
Deserialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
......
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use mime_guess::mime::TEXT_HTML_UTF_8; use mime_guess::mime::TEXT_HTML_UTF_8;
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, Vc, trace::TraceRawVcs, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, Vc, trace::TraceRawVcs,
...@@ -21,18 +20,7 @@ use turbopack_core::{ ...@@ -21,18 +20,7 @@ use turbopack_core::{
}; };
#[derive( #[derive(
Clone, Clone, Debug, Eq, Hash, NonLocalValue, PartialEq, TaskInput, TraceRawVcs, Encode, Decode,
Debug,
Deserialize,
Eq,
Hash,
NonLocalValue,
PartialEq,
Serialize,
TaskInput,
TraceRawVcs,
Encode,
Decode,
)] )]
pub struct DevHtmlEntry { pub struct DevHtmlEntry {
pub chunkable_module: ResolvedVc<Box<dyn ChunkableModule>>, pub chunkable_module: ResolvedVc<Box<dyn ChunkableModule>>,
......
...@@ -13,7 +13,7 @@ use turbopack_core::{ ...@@ -13,7 +13,7 @@ use turbopack_core::{
output::{OutputAsset, OutputAssetsReference, OutputAssetsSet}, output::{OutputAsset, OutputAssetsReference, OutputAssetsSet},
}; };
use super::{ use crate::source::{
ContentSource, ContentSourceContent, ContentSourceData, ContentSourceSideEffect, ContentSource, ContentSourceContent, ContentSourceData, ContentSourceSideEffect,
GetContentSourceContent, GetContentSourceContent,
route_tree::{BaseSegment, RouteTree, RouteTrees, RouteType}, route_tree::{BaseSegment, RouteTree, RouteTrees, RouteType},
......
...@@ -3,11 +3,10 @@ use turbo_rcstr::{RcStr, rcstr}; ...@@ -3,11 +3,10 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc}; use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use turbopack_core::introspect::{Introspectable, IntrospectableChildren}; use turbopack_core::introspect::{Introspectable, IntrospectableChildren};
use super::{ use crate::source::{
ContentSource, ContentSource, ContentSources,
route_tree::{RouteTree, RouteTrees}, route_tree::{RouteTree, RouteTrees},
}; };
use crate::source::ContentSources;
/// Combines multiple [ContentSource]s by trying all content sources in order. /// Combines multiple [ContentSource]s by trying all content sources in order.
/// ///
......
...@@ -3,12 +3,11 @@ use turbo_rcstr::{RcStr, rcstr}; ...@@ -3,12 +3,11 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{Completion, ResolvedVc, State, Vc}; use turbo_tasks::{Completion, ResolvedVc, State, Vc};
use turbopack_core::introspect::{Introspectable, IntrospectableChildren}; use turbopack_core::introspect::{Introspectable, IntrospectableChildren};
use super::{ use crate::source::{
ContentSource, ContentSourceData, ContentSourceDataVary, ContentSourceSideEffect, ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary,
GetContentSourceContent, ContentSourceSideEffect, ContentSources, GetContentSourceContent,
route_tree::{MapGetContentSourceContent, RouteTree, RouteTrees}, route_tree::{MapGetContentSourceContent, RouteTree, RouteTrees},
}; };
use crate::source::{ContentSourceContent, ContentSources};
/// Combines two [ContentSource]s like the [CombinedContentSource], but only /// Combines two [ContentSource]s like the [CombinedContentSource], but only
/// allows to serve from the second source when the first source has /// allows to serve from the second source when the first source has
......
use std::{collections::BTreeMap, hash::Hash, mem::replace, ops::DerefMut}; use std::{collections::BTreeMap, hash::Hash, mem::replace, ops::DerefMut};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
/// A parsed query string from a http request /// A parsed query string from a http request
...@@ -13,33 +12,18 @@ use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs}; ...@@ -13,33 +12,18 @@ use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
Default, Default,
Hash, Hash,
TraceRawVcs, TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue, NonLocalValue,
TaskInput, TaskInput,
Encode, Encode,
Decode, Decode,
)] )]
#[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( #[derive(
Clone, Clone, Debug, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue, TaskInput, Encode, Decode,
Debug,
PartialEq,
Eq,
Hash,
TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue,
TaskInput,
Encode,
Decode,
)] )]
#[serde(untagged)]
pub enum HeaderValue { pub enum HeaderValue {
SingleString(String), SingleString(String),
SingleBytes(Vec<u8>), SingleBytes(Vec<u8>),
......
...@@ -4,7 +4,7 @@ use turbo_tasks::{ResolvedVc, Vc}; ...@@ -4,7 +4,7 @@ use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::introspect::{Introspectable, IntrospectableChildren}; use turbopack_core::introspect::{Introspectable, IntrospectableChildren};
use super::{ use crate::source::{
ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary, ContentSources, ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary, ContentSources,
GetContentSourceContent, GetContentSourceContent,
route_tree::{MapGetContentSourceContent, RouteTree}, route_tree::{MapGetContentSourceContent, RouteTree},
......
...@@ -3,7 +3,7 @@ use turbo_rcstr::{RcStr, rcstr}; ...@@ -3,7 +3,7 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc}; use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::introspect::{Introspectable, IntrospectableChildren}; use turbopack_core::introspect::{Introspectable, IntrospectableChildren};
use super::{ContentSource, route_tree::RouteTree}; use crate::source::{ContentSource, route_tree::RouteTree};
/// A functor to get a [ContentSource]. Will be invoked when needed when using /// A functor to get a [ContentSource]. Will be invoked when needed when using
/// [LazyInstantiatedContentSource]. /// [LazyInstantiatedContentSource].
......
...@@ -17,7 +17,6 @@ use std::collections::BTreeSet; ...@@ -17,7 +17,6 @@ use std::collections::BTreeSet;
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use futures::{TryStreamExt, stream::Stream as StreamTrait}; use futures::{TryStreamExt, stream::Stream as StreamTrait};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
Completion, NonLocalValue, OperationVc, ResolvedVc, TaskInput, Upcast, ValueDefault, Vc, Completion, NonLocalValue, OperationVc, ResolvedVc, TaskInput, Upcast, ValueDefault, Vc,
...@@ -185,8 +184,6 @@ impl HeaderList { ...@@ -185,8 +184,6 @@ impl HeaderList {
Eq, Eq,
NonLocalValue, NonLocalValue,
TraceRawVcs, TraceRawVcs,
Serialize,
Deserialize,
Clone, Clone,
Debug, Debug,
Hash, Hash,
...@@ -264,19 +261,7 @@ impl ValueDefault for Body { ...@@ -264,19 +261,7 @@ impl ValueDefault for Body {
} }
/// Filter function that describes which information is required. /// Filter function that describes which information is required.
#[derive( #[derive(Debug, Clone, PartialEq, Eq, TraceRawVcs, Hash, NonLocalValue, Encode, Decode)]
Debug,
Clone,
PartialEq,
Eq,
TraceRawVcs,
Hash,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)]
pub enum ContentSourceDataFilter { pub enum ContentSourceDataFilter {
All, All,
Subset(BTreeSet<String>), Subset(BTreeSet<String>),
...@@ -501,9 +486,7 @@ impl ContentSource for NoContentSource { ...@@ -501,9 +486,7 @@ impl ContentSource for NoContentSource {
} }
} }
#[derive( #[derive(Debug, Clone, PartialEq, Eq, TraceRawVcs, NonLocalValue, Encode, Decode)]
Debug, Clone, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, Encode, Decode,
)]
pub enum RewriteType { pub enum RewriteType {
Location { Location {
/// The new path and query used to lookup content. This _does not_ need to be the original /// The new path and query used to lookup content. This _does not_ need to be the original
......
use std::{collections::BTreeMap, hash::Hash, ops::DerefMut}; use std::{collections::BTreeMap, hash::Hash, ops::DerefMut};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize}; use serde::Deserialize;
use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
use crate::source::ContentSourceDataFilter; use crate::source::ContentSourceDataFilter;
...@@ -15,13 +15,11 @@ use crate::source::ContentSourceDataFilter; ...@@ -15,13 +15,11 @@ use crate::source::ContentSourceDataFilter;
Default, Default,
Hash, Hash,
TraceRawVcs, TraceRawVcs,
Serialize,
Deserialize, Deserialize,
NonLocalValue, NonLocalValue,
Encode, Encode,
Decode, Decode,
)] )]
#[serde(transparent)]
pub struct Query(BTreeMap<String, QueryValue>); pub struct Query(BTreeMap<String, QueryValue>);
// This type contains no VCs so the default implementation works. // This type contains no VCs so the default implementation works.
...@@ -57,17 +55,7 @@ impl DerefMut for Query { ...@@ -57,17 +55,7 @@ impl DerefMut for Query {
} }
#[derive( #[derive(
Clone, Clone, Debug, PartialEq, Eq, Hash, TraceRawVcs, Deserialize, NonLocalValue, Encode, Decode,
Debug,
PartialEq,
Eq,
Hash,
TraceRawVcs,
Serialize,
Deserialize,
NonLocalValue,
Encode,
Decode,
)] )]
#[serde(untagged)] #[serde(untagged)]
pub enum QueryValue { pub enum QueryValue {
......
use hyper::{HeaderMap, Uri}; use hyper::{HeaderMap, Uri};
use turbo_tasks::{NonLocalValue, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, trace::TraceRawVcs};
use super::Body; use crate::source::Body;
/// A request to a content source. /// A request to a content source.
#[derive(Debug, Clone, NonLocalValue, TraceRawVcs)] #[derive(Debug, Clone, NonLocalValue, TraceRawVcs)]
......
...@@ -11,7 +11,7 @@ use hyper::{ ...@@ -11,7 +11,7 @@ use hyper::{
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{OperationVc, ResolvedVc, TransientInstance, Vc}; use turbo_tasks::{OperationVc, ResolvedVc, TransientInstance, Vc};
use super::{ use crate::source::{
ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary, ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary,
GetContentSourceContent, GetContentSourceContents, HeaderList, ProxyResult, RewriteType, GetContentSourceContent, GetContentSourceContents, HeaderList, ProxyResult, RewriteType,
StaticContent, StaticContent,
......
...@@ -2,7 +2,6 @@ use std::{fmt::Write, mem::replace}; ...@@ -2,7 +2,6 @@ use std::{fmt::Write, mem::replace};
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, ValueToString, Vc, FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryJoinIterExt, ValueToString, Vc,
...@@ -14,18 +13,7 @@ use crate::source::{GetContentSourceContent, GetContentSourceContents}; ...@@ -14,18 +13,7 @@ use crate::source::{GetContentSourceContent, GetContentSourceContents};
/// The type of the route. This will decide about the remaining segments of the /// The type of the route. This will decide about the remaining segments of the
/// route after the base. /// route after the base.
#[derive( #[derive(
TaskInput, TaskInput, Clone, Debug, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue, Encode, Decode,
Clone,
Debug,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)] )]
pub enum RouteType { pub enum RouteType {
Exact, Exact,
...@@ -36,18 +24,7 @@ pub enum RouteType { ...@@ -36,18 +24,7 @@ pub enum RouteType {
/// Some normal segment of a route. /// Some normal segment of a route.
#[derive( #[derive(
TaskInput, TaskInput, Clone, Debug, PartialEq, Eq, Hash, TraceRawVcs, NonLocalValue, Encode, Decode,
Clone,
Debug,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)] )]
pub enum BaseSegment { pub enum BaseSegment {
Static(RcStr), Static(RcStr),
......
...@@ -5,12 +5,11 @@ use turbo_rcstr::{RcStr, rcstr}; ...@@ -5,12 +5,11 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc}; use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use turbopack_core::introspect::{Introspectable, IntrospectableChildren}; use turbopack_core::introspect::{Introspectable, IntrospectableChildren};
use super::{ use crate::source::{
ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary, ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary, ContentSources,
GetContentSourceContent, GetContentSourceContent,
route_tree::{BaseSegment, RouteTree, RouteTrees}, route_tree::{BaseSegment, MapGetContentSourceContent, RouteTree, RouteTrees},
}; };
use crate::source::{ContentSources, route_tree::MapGetContentSourceContent};
/// Binds different ContentSources to different subpaths. /// Binds different ContentSources to different subpaths.
/// ///
......
...@@ -9,7 +9,7 @@ use turbopack_core::{ ...@@ -9,7 +9,7 @@ use turbopack_core::{
version::VersionedContentExt, version::VersionedContentExt,
}; };
use super::{ use crate::source::{
ContentSource, ContentSourceContent, ContentSourceData, GetContentSourceContent, ContentSource, ContentSourceContent, ContentSourceData, GetContentSourceContent,
route_tree::{BaseSegment, RouteTree, RouteTrees, RouteType}, route_tree::{BaseSegment, RouteTree, RouteTrees, RouteType},
}; };
......
...@@ -2,7 +2,7 @@ use anyhow::Result; ...@@ -2,7 +2,7 @@ use anyhow::Result;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{OperationVc, ResolvedVc, TryJoinIterExt, Vc}; use turbo_tasks::{OperationVc, ResolvedVc, TryJoinIterExt, Vc};
use super::{ use crate::source::{
ContentSourceContent, ContentSourceData, ContentSourceDataVary, GetContentSourceContent, ContentSourceContent, ContentSourceData, ContentSourceDataVary, GetContentSourceContent,
GetContentSourceContents, Rewrite, RewriteType, GetContentSourceContents, Rewrite, RewriteType,
}; };
......
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, Vc, trace::TraceRawVcs}; use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, Vc, trace::TraceRawVcs};
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
...@@ -12,18 +11,7 @@ use turbopack_core::{ ...@@ -12,18 +11,7 @@ use turbopack_core::{
use crate::chunk::EcmascriptChunkItemWithAsyncInfo; use crate::chunk::EcmascriptChunkItemWithAsyncInfo;
#[derive( #[derive(
Debug, Debug, Clone, Hash, PartialEq, Eq, TraceRawVcs, NonLocalValue, TaskInput, Encode, Decode,
Clone,
Hash,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
TaskInput,
Encode,
Decode,
)] )]
pub enum EcmascriptChunkItemOrBatchWithAsyncInfo { pub enum EcmascriptChunkItemOrBatchWithAsyncInfo {
ChunkItem(EcmascriptChunkItemWithAsyncInfo), ChunkItem(EcmascriptChunkItemWithAsyncInfo),
......
...@@ -2,7 +2,6 @@ use std::io::Write; ...@@ -2,7 +2,6 @@ use std::io::Write;
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use smallvec::SmallVec; use smallvec::SmallVec;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
...@@ -177,19 +176,7 @@ impl EcmascriptChunkItemContent { ...@@ -177,19 +176,7 @@ impl EcmascriptChunkItemContent {
} }
} }
#[derive( #[derive(PartialEq, Eq, Default, Debug, Clone, TraceRawVcs, NonLocalValue, Encode, Decode)]
PartialEq,
Eq,
Default,
Debug,
Clone,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
Encode,
Decode,
)]
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,
...@@ -206,18 +193,7 @@ pub struct EcmascriptChunkItemOptions { ...@@ -206,18 +193,7 @@ pub struct EcmascriptChunkItemOptions {
} }
#[derive( #[derive(
Serialize, Debug, Clone, PartialEq, Eq, Hash, TraceRawVcs, TaskInput, NonLocalValue, Encode, Decode,
Deserialize,
Debug,
Clone,
PartialEq,
Eq,
Hash,
TraceRawVcs,
TaskInput,
NonLocalValue,
Encode,
Decode,
)] )]
pub struct EcmascriptChunkItemWithAsyncInfo { pub struct EcmascriptChunkItemWithAsyncInfo {
pub chunk_item: ResolvedVc<Box<dyn EcmascriptChunkItem>>, pub chunk_item: ResolvedVc<Box<dyn EcmascriptChunkItem>>,
......
...@@ -46,18 +46,11 @@ use std::{ ...@@ -46,18 +46,11 @@ use std::{
use anyhow::{Context, Result, anyhow, bail}; use anyhow::{Context, Result, anyhow, bail};
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use chunk::EcmascriptChunkItem;
use code_gen::{CodeGeneration, CodeGenerationHoistedStmt};
use either::Either; use either::Either;
use itertools::Itertools; use itertools::Itertools;
use parse::{ParseResult, parse};
use path_visitor::ApplyVisitors;
use references::esm::UrlRewriteBehavior;
pub use references::{AnalyzeEcmascriptModuleResult, TURBOPACK_HELPER};
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use serde::{Deserialize, Serialize}; use serde::Deserialize;
use smallvec::SmallVec; use smallvec::SmallVec;
pub use static_code::StaticEcmascriptCode;
use swc_core::{ use swc_core::{
atoms::Atom, atoms::Atom,
base::SwcComments, base::SwcComments,
...@@ -80,10 +73,6 @@ use swc_core::{ ...@@ -80,10 +73,6 @@ use swc_core::{
quote, quote,
}; };
use tracing::{Instrument, Level, instrument}; use tracing::{Instrument, Level, instrument};
pub use transform::{
CustomTransformer, EcmascriptInputTransform, EcmascriptInputTransforms, TransformContext,
TransformPlugin,
};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
FxDashMap, FxIndexMap, IntoTraitRef, NonLocalValue, ReadRef, ResolvedVc, TaskInput, FxDashMap, FxIndexMap, IntoTraitRef, NonLocalValue, ReadRef, ResolvedVc, TaskInput,
...@@ -112,28 +101,35 @@ use turbopack_core::{ ...@@ -112,28 +101,35 @@ use turbopack_core::{
source::Source, source::Source,
source_map::GenerateSourceMap, source_map::GenerateSourceMap,
}; };
// TODO remove this
pub use turbopack_resolve::ecmascript as resolve;
use self::chunk::{EcmascriptChunkItemContent, EcmascriptChunkType, EcmascriptExports};
use crate::{ use crate::{
analyzer::graph::EvalContext, analyzer::graph::EvalContext,
chunk::{ chunk::{
EcmascriptChunkPlaceable, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
EcmascriptChunkType, EcmascriptExports,
placeable::{SideEffectsDeclaration, get_side_effect_free_declaration}, placeable::{SideEffectsDeclaration, get_side_effect_free_declaration},
}, },
code_gen::{CodeGens, ModifiableAst}, code_gen::{CodeGeneration, CodeGenerationHoistedStmt, CodeGens, ModifiableAst},
merged_module::MergedEcmascriptModule, merged_module::MergedEcmascriptModule,
parse::generate_js_source_map, parse::{ParseResult, generate_js_source_map, parse},
path_visitor::ApplyVisitors,
references::{ references::{
analyze_ecmascript_module, analyze_ecmascript_module,
async_module::OptionAsyncModule, async_module::OptionAsyncModule,
esm::{base::EsmAssetReferences, export}, esm::{UrlRewriteBehavior, base::EsmAssetReferences, export},
}, },
side_effect_optimization::reference::EcmascriptModulePartReference, side_effect_optimization::reference::EcmascriptModulePartReference,
swc_comments::{CowComments, ImmutableComments}, swc_comments::{CowComments, ImmutableComments},
transform::{remove_directives, remove_shebang}, transform::{remove_directives, remove_shebang},
}; };
pub use crate::{
references::{AnalyzeEcmascriptModuleResult, TURBOPACK_HELPER},
static_code::StaticEcmascriptCode,
transform::{
CustomTransformer, EcmascriptInputTransform, EcmascriptInputTransforms, TransformContext,
TransformPlugin,
},
};
#[derive( #[derive(
Eq, Eq,
...@@ -146,7 +142,6 @@ use crate::{ ...@@ -146,7 +142,6 @@ use crate::{
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
NonLocalValue, NonLocalValue,
Serialize,
Deserialize, Deserialize,
Encode, Encode,
Decode, Decode,
...@@ -168,7 +163,6 @@ pub enum SpecifiedModuleType { ...@@ -168,7 +163,6 @@ pub enum SpecifiedModuleType {
Clone, Clone,
Copy, Copy,
Default, Default,
Serialize,
Deserialize, Deserialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
...@@ -193,7 +187,6 @@ pub enum TreeShakingMode { ...@@ -193,7 +187,6 @@ pub enum TreeShakingMode {
Clone, Clone,
Copy, Copy,
Default, Default,
Serialize,
Deserialize, Deserialize,
TaskInput, TaskInput,
TraceRawVcs, TraceRawVcs,
...@@ -232,19 +225,7 @@ pub struct OptionTreeShaking(pub Option<TreeShakingMode>); ...@@ -232,19 +225,7 @@ pub struct OptionTreeShaking(pub Option<TreeShakingMode>);
/// The constant to replace `typeof window` with. /// The constant to replace `typeof window` with.
#[derive( #[derive(
Copy, Copy, Clone, PartialEq, Eq, Debug, Hash, TraceRawVcs, NonLocalValue, TaskInput, Encode, Decode,
Clone,
PartialEq,
Eq,
Debug,
Hash,
Serialize,
Deserialize,
TraceRawVcs,
NonLocalValue,
TaskInput,
Encode,
Decode,
)] )]
pub enum TypeofWindow { pub enum TypeofWindow {
Object, Object,
......
...@@ -2,7 +2,6 @@ use std::mem::take; ...@@ -2,7 +2,6 @@ use std::mem::take;
use anyhow::Result; use anyhow::Result;
use bincode::{Decode, Encode}; use bincode::{Decode, Encode};
use serde::{Deserialize, Serialize};
use swc_core::{ use swc_core::{
common::DUMMY_SP, common::DUMMY_SP,
ecma::{ ecma::{
...@@ -90,18 +89,7 @@ impl ValueToString for AmdDefineAssetReference { ...@@ -90,18 +89,7 @@ impl ValueToString for AmdDefineAssetReference {
impl ChunkableModuleReference for AmdDefineAssetReference {} impl ChunkableModuleReference for AmdDefineAssetReference {}
#[derive( #[derive(
ValueDebugFormat, ValueDebugFormat, Debug, PartialEq, Eq, TraceRawVcs, Clone, NonLocalValue, Hash, Encode, Decode,
Debug,
PartialEq,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
Clone,
NonLocalValue,
Hash,
Encode,
Decode,
)] )]
pub enum AmdDefineDependencyElement { pub enum AmdDefineDependencyElement {
Request { Request {
...@@ -118,8 +106,6 @@ pub enum AmdDefineDependencyElement { ...@@ -118,8 +106,6 @@ pub enum AmdDefineDependencyElement {
Debug, Debug,
PartialEq, PartialEq,
Eq, Eq,
Serialize,
Deserialize,
TraceRawVcs, TraceRawVcs,
Copy, Copy,
Clone, Clone,
...@@ -135,17 +121,7 @@ pub enum AmdDefineFactoryType { ...@@ -135,17 +121,7 @@ pub enum AmdDefineFactoryType {
} }
#[derive( #[derive(
PartialEq, PartialEq, Eq, TraceRawVcs, ValueDebugFormat, NonLocalValue, Hash, Debug, Encode, Decode,
Eq,
Serialize,
Deserialize,
TraceRawVcs,
ValueDebugFormat,
NonLocalValue,
Hash,
Debug,
Encode,
Decode,
)] )]
pub struct AmdDefineWithDependenciesCodeGen { pub struct AmdDefineWithDependenciesCodeGen {
dependencies_requests: Vec<AmdDefineDependencyElement>, dependencies_requests: Vec<AmdDefineDependencyElement>,
......
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