Turbopack: Remove remaining dead implementations of serde traits

Author: bgw

Cargo.lock

@@ -446,7 +446,6 @@ rstest = "0.16.0"
 rustc-hash = "2.1.1"
 semver = "1.0.16"
 serde = { version = "1.0.217", features = ["derive"] }
-serde_bytes = "0.11.15"
 serde_json = "1.0.138"
 serde_path_to_error = "0.1.16"
 serde_qs = "0.13.0"

Cargo.toml

@@ -29,7 +29,6 @@ DEALINGS IN THE SOFTWARE.
 use anyhow::Context;
 use napi::bindgen_prelude::*;
 use napi_derive::napi;
-use serde::Serialize;
 use swc_core::{
     base::{config::JsMinifyOptions, try_with_handler},
     common::{FileName, GLOBALS, errors::ColorConfig},
@@ -46,13 +45,11 @@ pub struct MinifyTask {
 // Same as the swc_core::base::TransformOutput, but using our napi-rs v2's derived #[napi], while
 // swc is already on napi-rs v3.
 #[napi_derive::napi(object)]
-#[derive(Debug, Serialize)]
+#[derive(Debug)]
 pub struct TransformOutput {
     pub code: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub map: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub output: Option<String>,
     pub diagnostics: std::vec::Vec<String>,
 }

crates/napi/src/minify.rs

@@ -30,7 +30,7 @@ use next_core::tracing_presets::{
 };
 use once_cell::sync::Lazy;
 use rand::Rng;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use tokio::{io::AsyncWriteExt, runtime::Handle, time::Instant};
 use tracing::Instrument;
 use tracing_subscriber::{Registry, layer::SubscriberExt, util::SubscriberInitExt};
@@ -1520,13 +1520,11 @@ pub fn project_compilation_events_subscribe(
 #[derive(
     Clone,
     Debug,
-    Deserialize,
     Eq,
     Hash,
     NonLocalValue,
     OperationValue,
     PartialEq,
-    Serialize,
     TaskInput,
     TraceRawVcs,
     Encode,

crates/napi/src/next_api/project.rs

@@ -3,12 +3,9 @@ use std::{borrow::Cow, io::Write};
 use anyhow::Result;
 use byteorder::{BE, WriteBytesExt};
 use rustc_hash::FxHashMap;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use turbo_rcstr::RcStr;
-use turbo_tasks::{
-    FxIndexSet, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc,
-    trace::TraceRawVcs,
-};
+use turbo_tasks::{FxIndexSet, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc};
 use turbo_tasks_fs::{
     File, FileContent, FileSystemPath,
     rope::{Rope, RopeBuilder},
@@ -25,9 +22,6 @@ use turbopack_core::{
 
 use crate::route::ModuleGraphs;
 
-#[derive(
-    Default, Clone, Debug, Deserialize, Eq, NonLocalValue, PartialEq, Serialize, TraceRawVcs,
-)]
 pub struct EdgesData {
     pub offsets: Vec<u32>,
     pub data: Vec<u32>,

crates/next-api/src/analyze.rs

@@ -69,10 +69,8 @@ use turbopack_core::{
     source_map::SourceMapAsset,
     virtual_output::VirtualOutputAsset,
 };
-use turbopack_ecmascript::{
-    resolve::cjs_resolve, single_file_ecmascript_output::SingleFileEcmascriptOutput,
-};
-use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
+use turbopack_ecmascript::single_file_ecmascript_output::SingleFileEcmascriptOutput;
+use turbopack_resolve::{ecmascript::cjs_resolve, resolve_options_context::ResolveOptionsContext};
 
 use crate::{
     dynamic_imports::{NextDynamicChunkAvailability, collect_next_dynamic_chunks},

crates/next-api/src/app.rs

@@ -5,25 +5,14 @@ use next_core::{
     next_server_component::server_component_module::NextServerComponentModule,
 };
 use rustc_hash::FxHashMap;
-use serde::{Deserialize, Serialize};
 use turbo_tasks::{
     NonLocalValue, ResolvedVc, TryFlatJoinIterExt, Vc, debug::ValueDebugFormat, trace::TraceRawVcs,
 };
 use turbopack_core::{module::Module, module_graph::SingleModuleGraph};
 use turbopack_css::chunk::CssChunkPlaceable;
 
 #[derive(
-    Copy,
-    Clone,
-    Serialize,
-    Deserialize,
-    Eq,
-    PartialEq,
-    TraceRawVcs,
-    ValueDebugFormat,
-    NonLocalValue,
-    Encode,
-    Decode,
+    Copy, Clone, Eq, PartialEq, TraceRawVcs, ValueDebugFormat, NonLocalValue, Encode, Decode,
 )]
 pub enum ClientManifestEntryType {
     EcmascriptClientReference {

crates/next-api/src/client_references.rs

@@ -25,7 +25,6 @@ use next_core::{
     next_app::ClientReferencesChunks, next_client_reference::EcmascriptClientReferenceModule,
     next_dynamic::NextDynamicEntryModule,
 };
-use serde::{Deserialize, Serialize};
 use turbo_tasks::{
     FxIndexMap, NonLocalValue, ReadRef, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Vc,
     debug::ValueDebugFormat, trace::TraceRawVcs,
@@ -110,18 +109,7 @@ pub struct DynamicImportedChunks(
     >,
 );
 
-#[derive(
-    Clone,
-    PartialEq,
-    Eq,
-    ValueDebugFormat,
-    Serialize,
-    Deserialize,
-    TraceRawVcs,
-    NonLocalValue,
-    Encode,
-    Decode,
-)]
+#[derive(Clone, PartialEq, Eq, ValueDebugFormat, TraceRawVcs, NonLocalValue, Encode, Decode)]
 pub enum DynamicImportEntriesMapType {
     DynamicEntry(ResolvedVc<NextDynamicEntryModule>),
     ClientReference(ResolvedVc<EcmascriptClientReferenceModule>),

crates/next-api/src/dynamic_imports.rs

@@ -4,7 +4,6 @@ use anyhow::{Context, Result, bail};
 use bincode::{Decode, Encode};
 use either::Either;
 use next_core::{get_next_package, next_server::get_tracing_compile_time_info};
-use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use turbo_rcstr::RcStr;
 use turbo_tasks::{
@@ -24,26 +23,15 @@ use turbopack_core::{
     resolve::{origin::PlainResolveOrigin, parse::Request},
     traced_asset::TracedAsset,
 };
-use turbopack_ecmascript::resolve::cjs_resolve;
+use turbopack_resolve::ecmascript::cjs_resolve;
 
 use crate::{
     nft_json::{all_assets_from_entries_filtered, relativize_glob},
     project::Project,
 };
 
 #[derive(
-    PartialEq,
-    Eq,
-    TraceRawVcs,
-    NonLocalValue,
-    Deserialize,
-    Serialize,
-    Debug,
-    Clone,
-    Hash,
-    TaskInput,
-    Encode,
-    Decode,
+    PartialEq, Eq, TraceRawVcs, NonLocalValue, Debug, Clone, Hash, TaskInput, Encode, Decode,
 )]
 enum ServerNftType {
     Minimal,

crates/next-api/src/next_server_nft.rs

@@ -1,6 +1,5 @@
 use anyhow::Result;
 use bincode::{Decode, Encode};
-use serde::{Deserialize, Serialize};
 use turbo_rcstr::RcStr;
 use turbo_tasks::{
     CollectiblesSource, FxIndexMap, NonLocalValue, OperationValue, OperationVc, ResolvedVc,
@@ -114,8 +113,6 @@ fn pick_route(entrypoints: OperationVc<Entrypoints>, key: RcStr, route: &Route)
     Debug,
     Clone,
     TaskInput,
-    Serialize,
-    Deserialize,
     TraceRawVcs,
     PartialEq,
     Eq,
@@ -208,33 +205,13 @@ async fn pick_endpoint(
     Ok(Vc::cell(endpoint))
 }
 
-#[derive(
-    Serialize,
-    Deserialize,
-    TraceRawVcs,
-    PartialEq,
-    Eq,
-    ValueDebugFormat,
-    NonLocalValue,
-    Encode,
-    Decode,
-)]
+#[derive(TraceRawVcs, PartialEq, Eq, ValueDebugFormat, NonLocalValue, Encode, Decode)]
 pub struct InstrumentationOperation {
     pub node_js: OperationVc<OptionEndpoint>,
     pub edge: OperationVc<OptionEndpoint>,
 }
 
-#[derive(
-    Serialize,
-    Deserialize,
-    TraceRawVcs,
-    PartialEq,
-    Eq,
-    ValueDebugFormat,
-    NonLocalValue,
-    Encode,
-    Decode,
-)]
+#[derive(TraceRawVcs, PartialEq, Eq, ValueDebugFormat, NonLocalValue, Encode, Decode)]
 pub struct MiddlewareOperation {
     pub endpoint: OperationVc<OptionEndpoint>,
     pub is_proxy: bool,
@@ -259,17 +236,7 @@ pub enum RouteOperation {
 }
 
 #[derive(
-    TraceRawVcs,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    ValueDebugFormat,
-    Clone,
-    Debug,
-    NonLocalValue,
-    Encode,
-    Decode,
+    TraceRawVcs, PartialEq, Eq, ValueDebugFormat, Clone, Debug, NonLocalValue, Encode, Decode,
 )]
 pub struct AppPageRouteOperation {
     pub original_name: RcStr,