Unverified Commit 6ed4453c authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: improve cell order lint rule (#88498)

Addresses the comments on this PR: https://github.com/vercel/next.js/pull/88474#discussion_r2687626329

"Merge when ready" had striked again

This did actually find another violation
parent c1fc988f
...@@ -8,13 +8,16 @@ language: Rust ...@@ -8,13 +8,16 @@ language: Rust
rule: rule:
all: all:
- any: - any:
- pattern: $X.cell() - pattern: $_X.cell()
- pattern: $X.resolved_cell() - pattern: $_X.resolved_cell()
- pattern: ResolvedVc::cell($_X)
- pattern: Vc::cell($_X)
- inside: - inside:
stopBy: end stopBy: end
all: all:
- any: - any:
- pattern: 'async |$$$ARGS| $BODY' - pattern: 'async |$$$ARGS| $BODY'
- pattern: 'async move |$$$ARGS| $BODY'
- pattern: '|$$$ARGS| async { $$$BODY }' - pattern: '|$$$ARGS| async { $$$BODY }'
- pattern: '|$$$ARGS| async move { $$$BODY }' - pattern: '|$$$ARGS| async move { $$$BODY }'
- inside: - inside:
......
...@@ -116,14 +116,11 @@ impl EcmascriptDevChunkListContent { ...@@ -116,14 +116,11 @@ impl EcmascriptDevChunkListContent {
let by_merger = by_merger let by_merger = by_merger
.into_iter() .into_iter()
.map(|(merger, contents)| async move { .map(|(merger, contents)| (merger, Vc::cell(contents)))
.map(async |(merger, contents)| {
Ok(( Ok((
merger.to_resolved().await?, merger.to_resolved().await?,
merger merger.merge(contents).version().into_trait_ref().await?,
.merge(Vc::cell(contents))
.version()
.into_trait_ref()
.await?,
)) ))
}) })
.try_join() .try_join()
......
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