Skip to content

refactor(turbopack-core): Use ResolvedVc for IntrospectableModule and IntrospectableSource #74512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bgw merged 1 commit into from
Jan 9, 2025
Merged

refactor(turbopack-core): Use ResolvedVc for IntrospectableModule and IntrospectableSource #74512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions turbopack/crates/turbopack-core/src/introspect/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
use anyhow::Result;
use turbo_rcstr::RcStr;
use turbo_tasks::{ValueToString, Vc};
use turbo_tasks::{ResolvedVc, ValueToString, Vc};

use super::{
utils::{children_from_module_references, content_to_details},
Introspectable, IntrospectableChildren,
};
use crate::{asset::Asset, module::Module};

#[turbo_tasks::value(local)]
pub struct IntrospectableModule(Vc<Box<dyn Module>>);
#[turbo_tasks::value]
pub struct IntrospectableModule(ResolvedVc<Box<dyn Module>>);

#[turbo_tasks::value_impl]
impl IntrospectableModule {
#[turbo_tasks::function]
pub async fn new(asset: Vc<Box<dyn Module>>) -> Result<Vc<Box<dyn Introspectable>>> {
Ok(Vc::try_resolve_sidecast::<Box<dyn Introspectable>>(asset)
pub async fn new(asset: ResolvedVc<Box<dyn Module>>) -> Result<Vc<Box<dyn Introspectable>>> {
Ok(*ResolvedVc::try_sidecast::<Box<dyn Introspectable>>(asset)
.await?
.unwrap_or_else(|| Vc::upcast(IntrospectableModule(asset).cell())))
.unwrap_or_else(|| ResolvedVc::upcast(IntrospectableModule(asset).resolved_cell())))
}
}

Expand Down
12 changes: 6 additions & 6 deletions turbopack/crates/turbopack-core/src/introspect/source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
use anyhow::Result;
use turbo_rcstr::RcStr;
use turbo_tasks::{ValueToString, Vc};
use turbo_tasks::{ResolvedVc, ValueToString, Vc};

use super::{utils::content_to_details, Introspectable};
use crate::{asset::Asset, source::Source};

#[turbo_tasks::value(local)]
pub struct IntrospectableSource(Vc<Box<dyn Source>>);
#[turbo_tasks::value]
pub struct IntrospectableSource(ResolvedVc<Box<dyn Source>>);

#[turbo_tasks::value_impl]
impl IntrospectableSource {
#[turbo_tasks::function]
pub async fn new(asset: Vc<Box<dyn Source>>) -> Result<Vc<Box<dyn Introspectable>>> {
Ok(Vc::try_resolve_sidecast::<Box<dyn Introspectable>>(asset)
pub async fn new(asset: ResolvedVc<Box<dyn Source>>) -> Result<Vc<Box<dyn Introspectable>>> {
Ok(*ResolvedVc::try_sidecast::<Box<dyn Introspectable>>(asset)
.await?
.unwrap_or_else(|| Vc::upcast(IntrospectableSource(asset).cell())))
.unwrap_or_else(|| ResolvedVc::upcast(IntrospectableSource(asset).resolved_cell())))
}
}

Expand Down