fixup

Author: Frando

irpc-derive/src/lib.rs

@@ -236,13 +236,13 @@ pub fn rpc_requests(attr: TokenStream, item: TokenStream) -> TokenStream {
                 }
             },
             Some(name) => {
-                let struc = struct_from_variant_fields(name.clone(), &variant.fields);
+                let struc = struct_from_variant_fields(name.clone(), variant.fields.clone());
                 wrapper_types.push(quote! {
-                    #[derive(Debug, ::serde::Serialize, ::serde::Deserialize)]
+                    #[derive(::std::fmt::Debug, ::serde::Serialize, ::serde::Deserialize)]
                     #struc
                 });
                 let ty = type_from_ident(name);
-                variant.fields = fields_single_unnamed(ty.clone());
+                variant.fields = single_unnamed_field(ty.clone());
                 ty
             }
         };
@@ -292,7 +292,7 @@ pub fn rpc_requests(attr: TokenStream, item: TokenStream) -> TokenStream {
         // Create the message enum definition
         let message_enum = quote! {
             #[allow(missing_docs)]
-            #[derive(Debug)]
+            #[derive(::std::fmt::Debug)]
             #vis enum #message_enum_name {
                 #(#message_variants),*
             }
@@ -562,8 +562,7 @@ fn type_from_ident(ident: Ident) -> Type {
         },
     })
 }
-fn struct_from_variant_fields(name: Ident, fields: &Fields) -> syn::ItemStruct {
-    let mut fields = fields.clone();
+fn struct_from_variant_fields(name: Ident, mut fields: Fields) -> syn::ItemStruct {
     make_fields_public(&mut fields);
     let span = name.span();
     syn::ItemStruct {
@@ -577,19 +576,11 @@ fn struct_from_variant_fields(name: Ident, fields: &Fields) -> syn::ItemStruct {
             Fields::Unnamed(_) => Some(Token![;](span)),
             Fields::Named(_) => None,
         },
-        fields: fields.clone(),
+        fields,
     }
 }
 
-fn vis_pub() -> syn::Visibility {
-    syn::Visibility::Public(syn::VisPublic {
-        pub_token: syn::token::Pub {
-            span: proc_macro2::Span::call_site(),
-        },
-    })
-}
-
-fn fields_single_unnamed(ty: Type) -> Fields {
+fn single_unnamed_field(ty: Type) -> Fields {
     let field = syn::Field {
         attrs: vec![],
         vis: syn::Visibility::Inherited,
@@ -604,17 +595,20 @@ fn fields_single_unnamed(ty: Type) -> Fields {
 }
 
 fn make_fields_public(fields: &mut Fields) {
-    match fields {
-        Fields::Named(named) => {
-            for field in &mut named.named {
-                field.vis = vis_pub();
-            }
-        }
-        Fields::Unnamed(unnamed) => {
-            for field in &mut unnamed.unnamed {
-                field.vis = vis_pub();
-            }
-        }
-        Fields::Unit => {}
+    let inner = match fields {
+        Fields::Named(ref mut named) => named.named.iter_mut(),
+        Fields::Unnamed(ref mut unnamed) => unnamed.unnamed.iter_mut(),
+        Fields::Unit => return,
+    };
+    for field in inner {
+        field.vis = vis_pub();
     }
 }
+
+fn vis_pub() -> syn::Visibility {
+    syn::Visibility::Public(syn::VisPublic {
+        pub_token: syn::token::Pub {
+            span: proc_macro2::Span::call_site(),
+        },
+    })
+}