Unverified Commit fa422ce3 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

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

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the PR.
- Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to understand the PR)
- When linking to a Slack thread, you might want to share details of the conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
parent 7a1f0325
use anyhow::Result; use anyhow::Result;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ValueToString, Vc}; use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use super::{ use super::{
utils::{children_from_module_references, content_to_details}, utils::{children_from_module_references, content_to_details},
...@@ -8,16 +8,16 @@ use super::{ ...@@ -8,16 +8,16 @@ use super::{
}; };
use crate::{asset::Asset, module::Module}; use crate::{asset::Asset, module::Module};
#[turbo_tasks::value(local)] #[turbo_tasks::value]
pub struct IntrospectableModule(Vc<Box<dyn Module>>); pub struct IntrospectableModule(ResolvedVc<Box<dyn Module>>);
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl IntrospectableModule { impl IntrospectableModule {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn new(asset: Vc<Box<dyn Module>>) -> Result<Vc<Box<dyn Introspectable>>> { pub async fn new(asset: ResolvedVc<Box<dyn Module>>) -> Result<Vc<Box<dyn Introspectable>>> {
Ok(Vc::try_resolve_sidecast::<Box<dyn Introspectable>>(asset) Ok(*ResolvedVc::try_sidecast::<Box<dyn Introspectable>>(asset)
.await? .await?
.unwrap_or_else(|| Vc::upcast(IntrospectableModule(asset).cell()))) .unwrap_or_else(|| ResolvedVc::upcast(IntrospectableModule(asset).resolved_cell())))
} }
} }
......
use anyhow::Result; use anyhow::Result;
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ValueToString, Vc}; use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use super::{utils::content_to_details, Introspectable}; use super::{utils::content_to_details, Introspectable};
use crate::{asset::Asset, source::Source}; use crate::{asset::Asset, source::Source};
#[turbo_tasks::value(local)] #[turbo_tasks::value]
pub struct IntrospectableSource(Vc<Box<dyn Source>>); pub struct IntrospectableSource(ResolvedVc<Box<dyn Source>>);
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl IntrospectableSource { impl IntrospectableSource {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn new(asset: Vc<Box<dyn Source>>) -> Result<Vc<Box<dyn Introspectable>>> { pub async fn new(asset: ResolvedVc<Box<dyn Source>>) -> Result<Vc<Box<dyn Introspectable>>> {
Ok(Vc::try_resolve_sidecast::<Box<dyn Introspectable>>(asset) Ok(*ResolvedVc::try_sidecast::<Box<dyn Introspectable>>(asset)
.await? .await?
.unwrap_or_else(|| Vc::upcast(IntrospectableSource(asset).cell()))) .unwrap_or_else(|| ResolvedVc::upcast(IntrospectableSource(asset).resolved_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