From e6e9610d1fabd38c6a24e7137a08daf877466a5b Mon Sep 17 00:00:00 2001
From: Kodi Craft <kodi@kdcf.me>
Date: Thu, 20 Jun 2024 15:26:17 +0200
Subject: [PATCH] Define macro logic with proc_macro2 instead of proc_macro

---
 src/lib.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 0d08eda..98a08af 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,18 +17,22 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
-use syn::{parse_macro_input, spanned::Spanned, DeriveInput, Field, Ident};
+use syn::{parse2, spanned::Spanned, DeriveInput, Field, Ident};
 
 #[proc_macro_derive(Protocol)]
-pub fn derive_protocol(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
+pub fn derive_protocol_derive(input: TokenStream) -> TokenStream {
+    let expanded = derive_protocol(input.into());
+    TokenStream::from(expanded)
+}
+
+fn derive_protocol(input: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
+    let input = parse2::<DeriveInput>(input).unwrap();
     // Must be on an enum
     let enum_ = match &input.data {
         syn::Data::Enum(e) => e,
         _ => {
             return syn::Error::new(input.span(), "Protocol can only be derived on enums")
                 .to_compile_error()
-                .into()
         }
     };
     let name = &input.ident;
@@ -60,8 +64,7 @@ pub fn derive_protocol(input: TokenStream) -> TokenStream {
                 variant.span(),
                 "Every variant on a protocol must have exactly 2 fields",
             )
-            .to_compile_error()
-            .into();
+            .to_compile_error();
         }
 
         let var_name = ident_to_snake_case(&variant.ident);
@@ -230,7 +233,7 @@ pub fn derive_protocol(input: TokenStream) -> TokenStream {
         #server_trait
         #client_struct
     };
-    expanded.into()
+    expanded
 }
 
 fn ident_to_snake_case(ident: &Ident) -> Ident {