Unverified Commit 5eec78a1 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: remove unused module references (#93335)

- SingleModuleReference is dead code, never actually called
- SingleOutputAssetReference was created, but never actually did anything because of the ChunkingType being None
parent b8c3e861
...@@ -16,7 +16,7 @@ use crate::{ ...@@ -16,7 +16,7 @@ use crate::{
expand_output_assets, expand_output_assets,
}, },
raw_module::RawModule, raw_module::RawModule,
resolve::{BindingUsage, ExportUsage, ImportUsage, ModuleResolveResult, RequestKey}, resolve::{BindingUsage, ExportUsage, ImportUsage, ModuleResolveResult},
}; };
pub mod source_map; pub mod source_map;
...@@ -56,35 +56,6 @@ impl ModuleReferences { ...@@ -56,35 +56,6 @@ impl ModuleReferences {
} }
} }
/// A reference that always resolves to a single module.
#[turbo_tasks::value]
#[derive(ValueToString)]
#[value_to_string(self.description)]
pub struct SingleModuleReference {
module: ResolvedVc<Box<dyn Module>>,
description: RcStr,
}
#[turbo_tasks::value_impl]
impl ModuleReference for SingleModuleReference {
#[turbo_tasks::function]
fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
*ModuleResolveResult::module(self.module)
}
}
#[turbo_tasks::value_impl]
impl SingleModuleReference {
/// Create a new instance that resolves to the given module.
#[turbo_tasks::function]
pub fn new(module: ResolvedVc<Box<dyn Module>>, description: RcStr) -> Vc<Self> {
Self::cell(SingleModuleReference {
module,
description,
})
}
}
#[turbo_tasks::value] #[turbo_tasks::value]
#[derive(ValueToString)] #[derive(ValueToString)]
#[value_to_string(self.description)] #[value_to_string(self.description)]
...@@ -132,38 +103,6 @@ impl ModuleReference for SingleChunkableModuleReference { ...@@ -132,38 +103,6 @@ impl ModuleReference for SingleChunkableModuleReference {
} }
} }
/// A reference that always resolves to a single module.
#[turbo_tasks::value]
#[derive(ValueToString)]
#[value_to_string(self.description)]
pub struct SingleOutputAssetReference {
asset: ResolvedVc<Box<dyn OutputAsset>>,
description: RcStr,
}
#[turbo_tasks::value_impl]
impl ModuleReference for SingleOutputAssetReference {
#[turbo_tasks::function]
fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
*ModuleResolveResult::output_asset(RequestKey::default(), self.asset)
}
}
#[turbo_tasks::value_impl]
impl SingleOutputAssetReference {
/// Create a new `Vc<SingleOutputAssetReference>` that resolves to the given asset.
#[turbo_tasks::function]
pub fn new(asset: ResolvedVc<Box<dyn OutputAsset>>, description: RcStr) -> Vc<Self> {
Self::cell(SingleOutputAssetReference { asset, description })
}
/// The [`Vc<Box<dyn OutputAsset>>`][OutputAsset] that this reference resolves to.
#[turbo_tasks::function]
pub fn asset(&self) -> Vc<Box<dyn OutputAsset>> {
*self.asset
}
}
/// Aggregates all [Module]s referenced by an [Module]. [ModuleReference] /// Aggregates all [Module]s referenced by an [Module]. [ModuleReference]
/// This does not include transitively references [Module]s, but it includes /// This does not include transitively references [Module]s, but it includes
/// primary and secondary [Module]s referenced. /// primary and secondary [Module]s referenced.
......
use anyhow::Result; use anyhow::{Result, bail};
use indoc::formatdoc; use indoc::formatdoc;
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
...@@ -14,7 +14,7 @@ use turbopack_core::{ ...@@ -14,7 +14,7 @@ use turbopack_core::{
ModuleGraph, chunk_group_info::ChunkGroup, module_batch::ChunkableModuleOrBatch, ModuleGraph, chunk_group_info::ChunkGroup, module_batch::ChunkableModuleOrBatch,
}, },
output::OutputAssetsWithReferenced, output::OutputAssetsWithReferenced,
reference::{ModuleReferences, SingleModuleReference}, reference::ModuleReferences,
}; };
use crate::{ use crate::{
...@@ -118,14 +118,7 @@ impl Module for AsyncLoaderModule { ...@@ -118,14 +118,7 @@ impl Module for AsyncLoaderModule {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> { async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> {
Ok(Vc::cell(vec![ResolvedVc::upcast( bail!("AsyncLoaderModule::references should never be called")
SingleModuleReference::new(
*ResolvedVc::upcast(self.await?.inner),
rcstr!("async module"),
)
.to_resolved()
.await?,
)]))
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -13,7 +13,6 @@ use turbopack_core::{ ...@@ -13,7 +13,6 @@ use turbopack_core::{
ModuleGraph, chunk_group_info::ChunkGroup, module_batch::ChunkableModuleOrBatch, ModuleGraph, chunk_group_info::ChunkGroup, module_batch::ChunkableModuleOrBatch,
}, },
output::OutputAssetsWithReferenced, output::OutputAssetsWithReferenced,
reference::{ModuleReferences, SingleOutputAssetReference},
}; };
use crate::{ use crate::{
...@@ -145,29 +144,6 @@ impl Module for ManifestAsyncModule { ...@@ -145,29 +144,6 @@ impl Module for ManifestAsyncModule {
Vc::cell(None) Vc::cell(None)
} }
#[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<ModuleReferences>> {
let assets = self.chunk_group().expand_all_assets().await?;
Ok(Vc::cell(
assets
.into_iter()
.copied()
.map(|chunk| async move {
Ok(ResolvedVc::upcast(
SingleOutputAssetReference::new(
*chunk,
manifest_chunk_reference_description(),
)
.to_resolved()
.await?,
))
})
.try_join()
.await?,
))
}
#[turbo_tasks::function] #[turbo_tasks::function]
fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> { fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
ModuleSideEffects::SideEffectFree.cell() ModuleSideEffects::SideEffectFree.cell()
......
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