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

Author: bgw

turbopack/crates/turbopack-core/src/introspect/module.rs

@@ -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())))
     }
 }
 

turbopack/crates/turbopack-core/src/introspect/source.rs

@@ -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())))
     }
 }