From f8880772495d2e9e27c29a7874271e1f48a4bcd4 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Tue, 16 May 2023 14:54:11 +0200
Subject: [PATCH] gccrs: libproc_macro: Rename Procmacro subtypes
Rename procedural macro specializations without the "payload" suffix.
Those types will be reused in several places where the old suffix might
be counterintuitive.
libgrust/ChangeLog:
* libproc_macro/proc_macro.h (struct CustomDerivePayload):
Rename from CustomDerivePayload to...
(struct CustomDerive): ... CustomDerive
(struct AttrPayload): Rename from AttrPayload to ...
(struct Attribute): ... Attribute
(struct BangPayload): Rename from BangPayload to ...
(struct Bang): ... Bang
(union ProcmacroPayload): Update union with new names.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
---
libgrust/libproc_macro/proc_macro.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libgrust/libproc_macro/proc_macro.h b/libgrust/libproc_macro/proc_macro.h
index dcd2e6926c6b..673f7a932f1f 100644
--- a/libgrust/libproc_macro/proc_macro.h
+++ b/libgrust/libproc_macro/proc_macro.h
@@ -39,7 +39,7 @@ using CustomDeriveMacro = TokenStream (*) (TokenStream);
using AttributeMacro = TokenStream (*) (TokenStream, TokenStream);
using BangMacro = TokenStream (*) (TokenStream);
-struct CustomDerivePayload
+struct CustomDerive
{
// TODO: UTF-8 function name
const char *trait_name;
@@ -49,14 +49,14 @@ struct CustomDerivePayload
CustomDeriveMacro macro;
};
-struct AttrPayload
+struct Attribute
{
// TODO: UTF-8 function name
const char *name;
AttributeMacro macro;
};
-struct BangPayload
+struct Bang
{
const char *name;
BangMacro macro;
@@ -72,9 +72,9 @@ enum ProcmacroTag
union ProcmacroPayload
{
- CustomDerivePayload custom_derive;
- AttrPayload attribute;
- BangPayload bang;
+ CustomDerive custom_derive;
+ Attribute attribute;
+ Bang bang;
};
struct Procmacro
--
GitLab