1
Fork 0

Simplify the syntax for macros generated by rustc_queries

- Disallow multiple macros callbacks in the same invocation. In practice, this was never used.
- Remove the `[]` brackets around the macro name
- Require an `ident`, not an arbitrary `tt`
This commit is contained in:
Joshua Nelson 2022-08-24 00:02:37 -05:00
parent e188868014
commit 7b8e2a52ff
5 changed files with 10 additions and 10 deletions

View file

@ -400,15 +400,15 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
TokenStream::from(quote! {
#[macro_export]
macro_rules! rustc_query_append {
([$($macro:tt)*]) => {
$($macro)* {
($macro:ident !) => {
$macro! {
#query_stream
}
}
}
macro_rules! rustc_dep_node_append {
([$($macro:tt)*][$($other:tt)*]) => {
$($macro)*(
($macro:ident! [$($other:tt)*]) => {
$macro!(
$($other)*
#dep_node_def_stream
@ -417,8 +417,8 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
}
#[macro_export]
macro_rules! rustc_cached_queries {
($($macro:tt)*) => {
$($macro)*(#cached_queries);
( $macro:ident! ) => {
$macro!(#cached_queries);
}
}
#[macro_export]