Skip to content

Commit ccab15a

Browse files
authored
Merge pull request #37 from avl/fix_procmacro_nonlocal
Change savefile-derive dummy constants to be anonymous
2 parents 2c5b36b + 154333f commit ccab15a

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

savefile-derive/src/lib.rs

+8-12
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,8 @@ fn savefile_derive_crate_serialize(input: DeriveInput) -> TokenStream {
598598
let saveerr = quote_spanned! {defspan=>
599599
Result<(),_savefile::prelude::SavefileError>
600600
};
601-
let magic = format!("_IMPL_SAVEFILE_SERIALIZE_FOR_{}", &name).to_string();
602-
let dummy_const = syn::Ident::new(&magic, proc_macro2::Span::call_site());
601+
602+
let dummy_const = syn::Ident::new("_", proc_macro2::Span::call_site());
603603

604604
let expanded = match &input.data {
605605
&syn::Data::Enum(ref enum1) => {
@@ -978,8 +978,7 @@ fn savefile_derive_crate_deserialize(input: DeriveInput) -> TokenStream {
978978
_savefile::prelude::SavefileError
979979
};
980980

981-
let magic = format!("_IMPL_SAVEFILE_DESERIALIZE_FOR_{}", &name).to_string();
982-
let dummy_const = syn::Ident::new(&magic, proc_macro2::Span::call_site());
981+
let dummy_const = syn::Ident::new("_", proc_macro2::Span::call_site());
983982

984983
let expanded = match &input.data {
985984
&syn::Data::Enum(ref enum1) => {
@@ -1117,8 +1116,7 @@ fn savefile_derive_crate_deserialize(input: DeriveInput) -> TokenStream {
11171116
fn implement_reprc_hardcoded_false(name: syn::Ident, generics: syn::Generics) -> TokenStream {
11181117
let defspan = proc_macro2::Span::call_site();
11191118

1120-
let magic = format!("_IMPL_SAVEFILE_REPRC_FOR_{}", &name).to_string();
1121-
let dummy_const = syn::Ident::new(&magic, proc_macro2::Span::call_site());
1119+
let dummy_const = syn::Ident::new("_", proc_macro2::Span::call_site());
11221120
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
11231121
let extra_where = get_extra_where_clauses(&generics, where_clause,quote!{_savefile::prelude::WithSchema});
11241122
let uses = quote_spanned! { defspan =>
@@ -1170,8 +1168,8 @@ fn implement_reprc(field_infos: Vec<FieldInfo>, generics: syn::Generics, name: s
11701168
let uses = quote_spanned! { defspan =>
11711169
extern crate savefile as _savefile;
11721170
};
1173-
let magic = format!("_IMPL_SAVEFILE_REPRC_FOR_{}", &name).to_string();
1174-
let dummy_const = syn::Ident::new(&magic, proc_macro2::Span::call_site());
1171+
1172+
let dummy_const = syn::Ident::new("_", proc_macro2::Span::call_site());
11751173

11761174
for field in field_infos.windows(2) {
11771175
let field_name1 = field[0].ident.as_ref().expect("Field was expected to have a name");
@@ -1553,8 +1551,7 @@ fn savefile_derive_crate_introspect(input: DeriveInput) -> TokenStream {
15531551
//let Field = quote_spanned! { defspan => _savefile::prelude::Field };
15541552
//let Variant = quote_spanned! { defspan => _savefile::prelude::Variant };
15551553

1556-
let magic = format!("_IMPL_SAVEFILE_INTROSPECT_FOR_{}", &name).to_string();
1557-
let dummy_const = syn::Ident::new(&magic, proc_macro2::Span::call_site());
1554+
let dummy_const = syn::Ident::new("_", proc_macro2::Span::call_site());
15581555

15591556
let expanded = match &input.data {
15601557
&syn::Data::Enum(ref enum1) => {
@@ -1837,8 +1834,7 @@ fn savefile_derive_crate_withschema(input: DeriveInput) -> TokenStream {
18371834
let Field = quote_spanned! { defspan => _savefile::prelude::Field };
18381835
let Variant = quote_spanned! { defspan => _savefile::prelude::Variant };
18391836

1840-
let magic = format!("_IMPL_SAVEFILE_WITHSCHEMA_FOR_{}", &name).to_string();
1841-
let dummy_const = syn::Ident::new(&magic, proc_macro2::Span::call_site());
1837+
let dummy_const = syn::Ident::new("_", proc_macro2::Span::call_site());
18421838

18431839
let expanded = match &input.data {
18441840
&syn::Data::Enum(ref enum1) => {

0 commit comments

Comments
 (0)