Unverified Commit 1df28819 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

fix(turbo-tasks-macros): Always use the correct trait method in TaskInput (#70812)

Without this, method resolution will look for an inherent impl on the type or it autoderefs to first, as inherent impls are preferred over trait methods.

For `Vc<T>` this is fine, as the function signature is the same, but for `ResolvedVc<T>`, this causes us to autoderef to `Vc::resolve(...)`, which returns `Vc<T>` instead of `ResolvedVc<T>`.

This can lead to confusing error messages inside the macro if you try to `#[derive(TaskInput)]` for a type containing `ResolvedVc<T>`.

General best-practice for macros is to be as specific as possible with things like methods.
parent bba71906
...@@ -59,7 +59,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream { ...@@ -59,7 +59,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream {
capture, capture,
quote! { quote! {
{#( {#(
#fields.is_resolved() && turbo_tasks::TaskInput::is_resolved(#fields) &&
)* true} )* true}
}, },
) )
...@@ -70,7 +70,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream { ...@@ -70,7 +70,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream {
capture, capture,
quote! { quote! {
{#( {#(
#fields.is_resolved() && turbo_tasks::TaskInput::is_resolved(#fields) &&
)* true} )* true}
}, },
) )
...@@ -85,7 +85,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream { ...@@ -85,7 +85,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream {
capture, capture,
quote! { quote! {
{#( {#(
#fields.is_transient() || turbo_tasks::TaskInput::is_transient(#fields) ||
)* false} )* false}
}, },
) )
...@@ -96,7 +96,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream { ...@@ -96,7 +96,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream {
capture, capture,
quote! { quote! {
{#( {#(
#fields.is_transient() || turbo_tasks::TaskInput::is_transient(#fields) ||
)* false} )* false}
}, },
) )
...@@ -112,7 +112,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream { ...@@ -112,7 +112,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream {
quote! { quote! {
{ {
#( #(
let #fields = #fields.resolve().await?; let #fields = turbo_tasks::TaskInput::resolve(#fields).await?;
)* )*
Ok(#ident { #(#fields),* }) Ok(#ident { #(#fields),* })
} }
...@@ -126,7 +126,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream { ...@@ -126,7 +126,7 @@ pub fn derive_task_input(input: TokenStream) -> TokenStream {
quote! { quote! {
{ {
#( #(
let #fields = #fields.resolve().await?; let #fields = turbo_tasks::TaskInput::resolve(#fields).await?;
)* )*
Ok(#ident(#(#fields),*)) Ok(#ident(#(#fields),*))
} }
......
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