Commit 1a80404b authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by Jiachi Liu

Turbopack: chore: Merge `turbo-tasks-macros-shared` crate into `turbo-tasks-macros` (#85917)

This was left over from the `turbo-tasks-build` crate, which @lukesandberg eliminated in favor of `inventory`. This crate was used for sharing code between `turbo-tasks-build` and `turbo-tasks-macros`.

We can just merge these crates together now.

Regarding compilation time: The dependency graph here is pretty linear, so I don't think there's any benefit from splitting these.
parent c601ffe3
...@@ -9385,16 +9385,6 @@ dependencies = [ ...@@ -9385,16 +9385,6 @@ dependencies = [
"regex", "regex",
"rustc-hash 2.1.1", "rustc-hash 2.1.1",
"syn 2.0.104", "syn 2.0.104",
"turbo-tasks-macros-shared",
]
[[package]]
name = "turbo-tasks-macros-shared"
version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.104",
] ]
[[package]] [[package]]
......
...@@ -308,7 +308,6 @@ turbo-tasks-fetch = { path = "turbopack/crates/turbo-tasks-fetch" } ...@@ -308,7 +308,6 @@ turbo-tasks-fetch = { path = "turbopack/crates/turbo-tasks-fetch" }
turbo-tasks-fs = { path = "turbopack/crates/turbo-tasks-fs" } turbo-tasks-fs = { path = "turbopack/crates/turbo-tasks-fs" }
turbo-tasks-hash = { path = "turbopack/crates/turbo-tasks-hash" } turbo-tasks-hash = { path = "turbopack/crates/turbo-tasks-hash" }
turbo-tasks-macros = { path = "turbopack/crates/turbo-tasks-macros" } turbo-tasks-macros = { path = "turbopack/crates/turbo-tasks-macros" }
turbo-tasks-macros-shared = { path = "turbopack/crates/turbo-tasks-macros-shared" }
turbo-tasks-testing = { path = "turbopack/crates/turbo-tasks-testing" } turbo-tasks-testing = { path = "turbopack/crates/turbo-tasks-testing" }
turbopack = { path = "turbopack/crates/turbopack" } turbopack = { path = "turbopack/crates/turbopack" }
turbopack-bench = { path = "turbopack/crates/turbopack-bench" } turbopack-bench = { path = "turbopack/crates/turbopack-bench" }
......
[package]
name = "turbo-tasks-macros-shared"
version = "0.1.0"
description = "TBD"
license = "MIT"
edition = "2024"
[lib]
bench = false
[lints]
workspace = true
[dependencies]
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true, features = ["full", "extra-traits", "visit"] }
# turbo-tasks-macros-shared
Shared utilities between `turbo-tasks-macros` and `turbo-tasks-build`.
#![feature(proc_macro_diagnostic)]
#![feature(box_patterns)]
mod expand;
mod generic_type_input;
mod ident;
mod primitive_input;
mod self_filter;
mod value_trait_arguments;
pub use expand::*;
pub use generic_type_input::GenericTypeInput;
pub use ident::*;
pub use primitive_input::PrimitiveInput;
pub use self_filter::is_self_used;
pub use value_trait_arguments::ValueTraitArguments;
...@@ -20,4 +20,3 @@ quote = { workspace = true } ...@@ -20,4 +20,3 @@ quote = { workspace = true }
regex = { workspace = true } regex = { workspace = true }
rustc-hash = { workspace = true } rustc-hash = { workspace = true }
syn = { workspace = true, features = ["full", "extra-traits", "visit", "visit-mut"] } syn = { workspace = true, features = ["full", "extra-traits", "visit", "visit-mut"] }
turbo-tasks-macros-shared = { workspace = true }
...@@ -2,7 +2,8 @@ use proc_macro::TokenStream; ...@@ -2,7 +2,8 @@ use proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use quote::quote; use quote::quote;
use syn::{Data, DeriveInput, FieldsNamed, FieldsUnnamed, parse_macro_input}; use syn::{Data, DeriveInput, FieldsNamed, FieldsUnnamed, parse_macro_input};
use turbo_tasks_macros_shared::{generate_exhaustive_destructuring, match_expansion};
use crate::expand::{generate_exhaustive_destructuring, match_expansion};
/// This macro generates the implementation of the `DeterministicHash` trait for /// This macro generates the implementation of the `DeterministicHash` trait for
/// a given type. /// a given type.
......
use proc_macro::TokenStream; use proc_macro::TokenStream;
use quote::quote; use quote::quote;
use syn::{DeriveInput, parse_macro_input, spanned::Spanned}; use syn::{DeriveInput, parse_macro_input, spanned::Spanned};
use turbo_tasks_macros_shared::{generate_exhaustive_destructuring, match_expansion};
use crate::expand::{generate_exhaustive_destructuring, match_expansion};
pub fn derive_task_input(input: TokenStream) -> TokenStream { pub fn derive_task_input(input: TokenStream) -> TokenStream {
let derive_input = parse_macro_input!(input as DeriveInput); let derive_input = parse_macro_input!(input as DeriveInput);
......
...@@ -2,9 +2,9 @@ use proc_macro::TokenStream; ...@@ -2,9 +2,9 @@ use proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use quote::quote; use quote::quote;
use syn::{DeriveInput, Field, FieldsNamed, FieldsUnnamed, parse_macro_input}; use syn::{DeriveInput, Field, FieldsNamed, FieldsUnnamed, parse_macro_input};
use turbo_tasks_macros_shared::{generate_destructuring, match_expansion};
use super::FieldAttributes; use super::FieldAttributes;
use crate::expand::{generate_destructuring, match_expansion};
pub fn filter_field(field: &Field) -> bool { pub fn filter_field(field: &Field) -> bool {
!FieldAttributes::from(field.attrs.as_slice()).trace_ignore !FieldAttributes::from(field.attrs.as_slice()).trace_ignore
......
...@@ -2,9 +2,9 @@ use proc_macro::TokenStream; ...@@ -2,9 +2,9 @@ use proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use quote::quote; use quote::quote;
use syn::{DeriveInput, Field, FieldsNamed, FieldsUnnamed, parse_macro_input}; use syn::{DeriveInput, Field, FieldsNamed, FieldsUnnamed, parse_macro_input};
use turbo_tasks_macros_shared::{generate_destructuring, match_expansion};
use super::FieldAttributes; use super::FieldAttributes;
use crate::expand::{generate_destructuring, match_expansion};
fn filter_field(field: &Field) -> bool { fn filter_field(field: &Field) -> bool {
!FieldAttributes::from(field.attrs.as_slice()).debug_ignore !FieldAttributes::from(field.attrs.as_slice()).debug_ignore
......
use proc_macro::TokenStream; use proc_macro::TokenStream;
use quote::quote; use quote::quote;
use syn::{ItemFn, parse_macro_input, parse_quote}; use syn::{ItemFn, parse_macro_input, parse_quote};
use turbo_tasks_macros_shared::{get_native_function_ident, is_self_used};
use crate::{ use crate::{
func::{DefinitionContext, FunctionArguments, NativeFn, TurboFn, filter_inline_attributes}, func::{DefinitionContext, FunctionArguments, NativeFn, TurboFn, filter_inline_attributes},
global_name::global_name, global_name::global_name,
ident::get_native_function_ident,
self_filter::is_self_used,
}; };
/// This macro generates the virtual function that powers turbo tasks. /// This macro generates the virtual function that powers turbo tasks.
......
...@@ -2,9 +2,11 @@ use proc_macro::TokenStream; ...@@ -2,9 +2,11 @@ use proc_macro::TokenStream;
use quote::quote; use quote::quote;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use syn::{GenericParam, Lifetime, Type, parse_macro_input, spanned::Spanned, visit_mut::VisitMut}; use syn::{GenericParam, Lifetime, Type, parse_macro_input, spanned::Spanned, visit_mut::VisitMut};
use turbo_tasks_macros_shared::{GenericTypeInput, get_type_ident};
use crate::{global_name::global_name, value_macro::value_type_and_register}; use crate::{
generic_type_input::GenericTypeInput, global_name::global_name, ident::get_type_ident,
value_macro::value_type_and_register,
};
pub fn generic_type(input: TokenStream) -> TokenStream { pub fn generic_type(input: TokenStream) -> TokenStream {
let mut input = parse_macro_input!(input as GenericTypeInput); let mut input = parse_macro_input!(input as GenericTypeInput);
......
...@@ -22,17 +22,6 @@ pub fn get_trait_type_ident(ident: &Ident) -> Ident { ...@@ -22,17 +22,6 @@ pub fn get_trait_type_ident(ident: &Ident) -> Ident {
) )
} }
pub fn get_impl_function_ident(struct_ident: &Ident, ident: &Ident) -> Ident {
Ident::new(
&format!(
"{}_IMPL_{}_FUNCTION",
struct_ident.to_string().to_uppercase(),
ident.to_string().to_uppercase()
),
ident.span(),
)
}
pub fn get_inherent_impl_function_ident(ty_ident: &Ident, fn_ident: &Ident) -> Ident { pub fn get_inherent_impl_function_ident(ty_ident: &Ident, fn_ident: &Ident) -> Ident {
Ident::new( Ident::new(
&format!( &format!(
...@@ -44,17 +33,6 @@ pub fn get_inherent_impl_function_ident(ty_ident: &Ident, fn_ident: &Ident) -> I ...@@ -44,17 +33,6 @@ pub fn get_inherent_impl_function_ident(ty_ident: &Ident, fn_ident: &Ident) -> I
) )
} }
pub fn get_inherent_impl_function_id_ident(ty_ident: &Ident, fn_ident: &Ident) -> Ident {
Ident::new(
&format!(
"{}_IMPL_{}_FUNCTION_ID",
ty_ident.to_string().to_uppercase(),
fn_ident.to_string().to_uppercase()
),
fn_ident.span(),
)
}
pub fn get_trait_impl_function_ident( pub fn get_trait_impl_function_ident(
struct_ident: &Ident, struct_ident: &Ident,
trait_ident: &Ident, trait_ident: &Ident,
...@@ -71,22 +49,6 @@ pub fn get_trait_impl_function_ident( ...@@ -71,22 +49,6 @@ pub fn get_trait_impl_function_ident(
) )
} }
pub fn get_trait_impl_function_id_ident(
struct_ident: &Ident,
trait_ident: &Ident,
ident: &Ident,
) -> Ident {
Ident::new(
&format!(
"{}_IMPL_TRAIT_{}_{}_FUNCTION_ID",
struct_ident.to_string().to_uppercase(),
trait_ident.to_string().to_uppercase(),
ident.to_string().to_uppercase()
),
ident.span(),
)
}
pub fn get_path_ident(path: &Path) -> Ident { pub fn get_path_ident(path: &Path) -> Ident {
let mut result = String::new(); let mut result = String::new();
......
...@@ -14,6 +14,13 @@ mod value_impl_macro; ...@@ -14,6 +14,13 @@ mod value_impl_macro;
mod value_macro; mod value_macro;
mod value_trait_macro; mod value_trait_macro;
mod expand;
mod generic_type_input;
mod ident;
mod primitive_input;
mod self_filter;
mod value_trait_arguments;
use proc_macro::TokenStream; use proc_macro::TokenStream;
use proc_macro_error::proc_macro_error; use proc_macro_error::proc_macro_error;
......
use proc_macro::TokenStream; use proc_macro::TokenStream;
use quote::quote; use quote::quote;
use syn::parse_macro_input; use syn::parse_macro_input;
use turbo_tasks_macros_shared::{PrimitiveInput, get_type_ident};
use crate::{global_name::global_name, value_macro::value_type_and_register}; use crate::{
global_name::global_name, ident::get_type_ident, primitive_input::PrimitiveInput,
value_macro::value_type_and_register,
};
pub fn primitive(input: TokenStream) -> TokenStream { pub fn primitive(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as PrimitiveInput); let input = parse_macro_input!(input as PrimitiveInput);
......
...@@ -8,10 +8,6 @@ use syn::{ ...@@ -8,10 +8,6 @@ use syn::{
parse_macro_input, parse_quote, parse_macro_input, parse_quote,
spanned::Spanned, spanned::Spanned,
}; };
use turbo_tasks_macros_shared::{
get_cast_to_fat_pointer_ident, get_inherent_impl_function_ident, get_path_ident,
get_trait_impl_function_ident, get_type_ident, is_self_used,
};
use crate::{ use crate::{
func::{ func::{
...@@ -19,6 +15,11 @@ use crate::{ ...@@ -19,6 +15,11 @@ use crate::{
split_function_attributes, split_function_attributes,
}, },
global_name::global_name, global_name::global_name,
ident::{
get_cast_to_fat_pointer_ident, get_inherent_impl_function_ident, get_path_ident,
get_trait_impl_function_ident, get_type_ident,
},
self_filter::is_self_used,
}; };
struct ValueImplArguments { struct ValueImplArguments {
......
...@@ -11,9 +11,8 @@ use syn::{ ...@@ -11,9 +11,8 @@ use syn::{
parse_macro_input, parse_quote, parse_macro_input, parse_quote,
spanned::Spanned, spanned::Spanned,
}; };
use turbo_tasks_macros_shared::get_value_type_ident;
use crate::global_name::global_name; use crate::{global_name::global_name, ident::get_value_type_ident};
enum CellMode { enum CellMode {
Compare, Compare,
......
...@@ -5,9 +5,6 @@ use syn::{ ...@@ -5,9 +5,6 @@ use syn::{
FnArg, ItemTrait, Pat, Receiver, TraitItem, TraitItemFn, parse_macro_input, parse_quote, FnArg, ItemTrait, Pat, Receiver, TraitItem, TraitItemFn, parse_macro_input, parse_quote,
spanned::Spanned, spanned::Spanned,
}; };
use turbo_tasks_macros_shared::{
ValueTraitArguments, get_trait_default_impl_function_ident, get_trait_type_ident, is_self_used,
};
use crate::{ use crate::{
func::{ func::{
...@@ -15,6 +12,9 @@ use crate::{ ...@@ -15,6 +12,9 @@ use crate::{
get_receiver_style, split_function_attributes, get_receiver_style, split_function_attributes,
}, },
global_name::global_name, global_name::global_name,
ident::{get_trait_default_impl_function_ident, get_trait_type_ident},
self_filter::is_self_used,
value_trait_arguments::ValueTraitArguments,
}; };
pub fn value_trait(args: TokenStream, input: TokenStream) -> TokenStream { pub fn value_trait(args: TokenStream, input: TokenStream) -> TokenStream {
......
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