From 87512693daf3b82dc5daa2ffa61aeb609792f35e Mon Sep 17 00:00:00 2001 From: Benjamin Woodruff Date: Fri, 4 Oct 2024 18:02:46 -0700 Subject: [PATCH] refactor(turbopack/next-{api,core}): Remove remaining uses of vc generics in non-test code --- crates/next-api/src/server_actions.rs | 6 +++--- .../next-core/src/next_app/app_client_references_chunks.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/next-api/src/server_actions.rs b/crates/next-api/src/server_actions.rs index 36de32b1d46c6..7463586569f2d 100644 --- a/crates/next-api/src/server_actions.rs +++ b/crates/next-api/src/server_actions.rs @@ -25,7 +25,7 @@ use turbopack_core::{ chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, EvaluatableAsset}, context::AssetContext, file_source::FileSource, - module::Module, + module::{Module, Modules}, output::OutputAsset, reference::primary_referenced_modules, reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType}, @@ -47,7 +47,7 @@ use turbopack_ecmascript::{ /// loader. pub(crate) async fn create_server_actions_manifest( rsc_entry: Vc>, - server_reference_modules: Vc>>>, + server_reference_modules: Vc, project_path: Vc, node_root: Vc, page_name: &str, @@ -171,7 +171,7 @@ async fn build_manifest( #[turbo_tasks::function] async fn get_actions( rsc_entry: Vc>, - server_reference_modules: Vc>>>, + server_reference_modules: Vc, asset_context: Vc>, ) -> Result> { async move { diff --git a/crates/next-core/src/next_app/app_client_references_chunks.rs b/crates/next-core/src/next_app/app_client_references_chunks.rs index cde55cd2faa37..9ddef1c09ab5b 100644 --- a/crates/next-core/src/next_app/app_client_references_chunks.rs +++ b/crates/next-core/src/next_app/app_client_references_chunks.rs @@ -4,7 +4,7 @@ use tracing::Instrument; use turbo_tasks::{RcStr, TryFlatJoinIterExt, TryJoinIterExt, Value, ValueToString, Vc}; use turbopack_core::{ chunk::{availability_info::AvailabilityInfo, ChunkingContext, ChunkingContextExt}, - module::Module, + module::{Module, Modules}, output::OutputAssets, }; @@ -313,7 +313,7 @@ pub async fn get_app_client_references_chunks( #[turbo_tasks::function] pub async fn get_app_server_reference_modules( app_client_reference_types: Vc, -) -> Result>>>> { +) -> Result> { Ok(Vc::cell( app_client_reference_types .await?