-
Notifications
You must be signed in to change notification settings - Fork 27.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix collectibles counting (vercel/turborepo#8778)
### Description fix a bunch of cases where collectibles were not correctly counted ### Testing Instructions <!-- Give a quick description of steps to test your changes. -->
- Loading branch information
Showing
9 changed files
with
151 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| #![feature(arbitrary_self_types)] | ||
|
|
||
| use anyhow::{bail, Result}; | ||
| use turbo_tasks::{emit, CollectiblesSource, RcStr, State, ValueToString, Vc}; | ||
| use turbo_tasks_testing::{register, run}; | ||
|
|
||
| register!(); | ||
|
|
||
| #[tokio::test] | ||
| async fn recompute() { | ||
| run! { | ||
| let input = ChangingInput { | ||
| state: State::new(1), | ||
| }.cell(); | ||
| let output = compute(input, 100); | ||
| let read = output.await?; | ||
| assert_eq!(read.value, 42); | ||
| assert_eq!(read.collectible, "1"); | ||
|
|
||
| for i in 2..100 { | ||
| input.await?.state.set(i); | ||
| let read = output.strongly_consistent().await?; | ||
| assert_eq!(read.value, 42); | ||
| assert_eq!(read.collectible, i.to_string()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[turbo_tasks::value] | ||
| struct ChangingInput { | ||
| state: State<u32>, | ||
| } | ||
|
|
||
| #[turbo_tasks::value] | ||
| struct Output { | ||
| value: u32, | ||
| collectible: String, | ||
| } | ||
|
|
||
| #[turbo_tasks::value] | ||
| struct Collectible { | ||
| value: u32, | ||
| } | ||
|
|
||
| #[turbo_tasks::value_impl] | ||
| impl ValueToString for Collectible { | ||
| #[turbo_tasks::function] | ||
| fn to_string(&self) -> Vc<RcStr> { | ||
| Vc::cell(self.value.to_string().into()) | ||
| } | ||
| } | ||
|
|
||
| #[turbo_tasks::function] | ||
| fn inner_compute(input: Vc<ChangingInput>) -> Vc<u32> { | ||
| inner_compute2(input, 1000) | ||
| } | ||
|
|
||
| #[turbo_tasks::function] | ||
| async fn inner_compute2(input: Vc<ChangingInput>, innerness: u32) -> Result<Vc<u32>> { | ||
| if innerness > 0 { | ||
| return Ok(inner_compute2(input, innerness - 1)); | ||
| } | ||
| let collectible: Vc<Box<dyn ValueToString>> = Vc::upcast( | ||
| Collectible { | ||
| value: *input.await?.state.get(), | ||
| } | ||
| .cell(), | ||
| ); | ||
| emit(collectible); | ||
|
|
||
| Ok(Vc::cell(42)) | ||
| } | ||
|
|
||
| #[turbo_tasks::function] | ||
| async fn compute(input: Vc<ChangingInput>, innerness: u32) -> Result<Vc<Output>> { | ||
| if innerness > 0 { | ||
| return Ok(compute(input, innerness - 1)); | ||
| } | ||
| let operation = inner_compute(input); | ||
| let value = *operation.await?; | ||
| let collectibles = operation.peek_collectibles::<Box<dyn ValueToString>>(); | ||
| if collectibles.len() != 1 { | ||
| bail!("expected 1 collectible, found {}", collectibles.len()); | ||
| } | ||
| let first = *collectibles.iter().next().unwrap(); | ||
| let collectible = first.to_string().await?; | ||
| Ok(Output { | ||
| value, | ||
| collectible: collectible.to_string(), | ||
| } | ||
| .cell()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.