Syn library update

contracts/examples/adder/src/adder.rs

@@ -1,7 +1,6 @@
 #![no_std]
 
 multiversx_sc::imports!();
-
 /// One of the simplest smart contracts possible,
 /// it holds a single variable in storage, which anyone can increment.
 #[multiversx_sc::contract]

data/codec-derive/Cargo.toml

@@ -23,5 +23,5 @@ default = ["syn/full", "syn/parsing", "syn/extra-traits"]
 [dependencies]
 proc-macro2 = "1.0.66"
 quote = "1.0.33"
-syn = "1.0"
+syn = "2.0.39"
 hex = "0.4"

framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs

@@ -16,7 +16,7 @@ use crate::derive::TypeAbi;
 /// - EGLD (can be zero in case of no payment whatsoever);
 /// - Multi-ESDT (one or more ESDT transfers).
 #[derive(
-    TopDecode, TopEncode, NestedDecode, NestedEncode, TypeAbi, Clone, PartialEq, Eq, Debug,
+    TopDecode, TopEncode, TypeAbi, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug,
 )]
 pub enum EgldOrMultiEsdtPayment<M: ManagedTypeApi> {
     Egld(BigUint<M>),

framework/derive/Cargo.toml

@@ -16,7 +16,7 @@ categories = ["cryptography::cryptocurrencies", "development-tools::procedural-m
 [dependencies]
 proc-macro2 = "1.0.66"
 quote = "1.0.33"
-syn = "1.0"
+syn = "2.0.39"
 hex = "0.4"
 radix_trie = "0.2.1"
 

framework/derive/src/generate/auto_impl_proxy.rs

@@ -3,10 +3,10 @@ use crate::{
     model::{AutoImpl, ContractTrait, Method, MethodImpl},
     parse::split_path_last,
 };
-use syn::{punctuated::Punctuated, token::Colon2};
+use syn::{punctuated::Punctuated, token::PathSep};
 
 /// Path to a Rust module containing a contract call proxy.
-pub type ProxyModulePath = Punctuated<syn::PathSegment, Colon2>;
+pub type ProxyModulePath = Punctuated<syn::PathSegment, PathSep>;
 
 pub struct ProxyGetterReturnType {
     pub module_path: ProxyModulePath,

framework/derive/src/lib.rs

@@ -49,14 +49,12 @@ pub fn proxy(
 #[proc_macro_derive(TypeAbi)]
 pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse(input).unwrap();
-
     type_abi_derive::type_abi_derive(&ast)
 }
 
 #[proc_macro_derive(ManagedVecItem)]
 pub fn managed_vec_item_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = syn::parse(input).unwrap();
-
     managed_vec_item_derive::managed_vec_item_derive(&ast)
 }
 

framework/derive/src/macro_contract.rs

@@ -8,10 +8,10 @@ pub fn process_contract(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    let args_input = parse_macro_input!(args as syn::AttributeArgs);
-    let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
+    let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
+
+    let contract = parse_contract_trait(args, &proc_input);
 
-    let contract = parse_contract_trait(args_input, proc_input);
     validate_contract(&contract);
 
     let contract_impl = contract_implementation(&contract, true);

framework/derive/src/macro_module.rs

@@ -8,10 +8,9 @@ pub fn process_module(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    let args_input = parse_macro_input!(args as syn::AttributeArgs);
     let proc_input = &parse_macro_input!(new_input as syn::ItemTrait);
 
-    let contract = parse_contract_trait(args_input, proc_input);
+    let contract = parse_contract_trait(args, proc_input);
     validate_contract(&contract);
 
     let contract_impl = contract_implementation(&contract, false);

framework/derive/src/macro_proxy.rs

@@ -11,10 +11,9 @@ pub fn process_proxy(
     input: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     let new_input = trait_preprocessing(input);
-    let args_input = parse_macro_input!(args as syn::AttributeArgs);
     let proc_input = parse_macro_input!(new_input as syn::ItemTrait);
 
-    let contract = parse_contract_trait(args_input, &proc_input);
+    let contract = parse_contract_trait(args, &proc_input);
     validate_contract(&contract);
 
     let proxy_impl = proxy_implementation(&contract, true);

framework/derive/src/model/supertrait.rs

@@ -1,7 +1,7 @@
-use syn::{punctuated::Punctuated, token::Colon2};
+use syn::{punctuated::Punctuated, token::PathSep};
 
 /// Path to a Rust module containing a contract module.
-pub type ModulePath = Punctuated<syn::PathSegment, Colon2>;
+pub type ModulePath = Punctuated<syn::PathSegment, PathSep>;
 
 #[derive(Clone, Debug)]
 pub struct Supertrait {

framework/derive/src/parse/argument_parse.rs

@@ -1,7 +1,7 @@
 use super::attributes::*;
 use crate::model::{ArgMetadata, ArgPaymentMetadata, MethodArgument};
 
-pub fn extract_method_args(m: &syn::TraitItemMethod) -> Vec<MethodArgument> {
+pub fn extract_method_args(m: &syn::TraitItemFn) -> Vec<MethodArgument> {
     if m.sig.inputs.is_empty() {
         missing_self_panic(m);
     }
@@ -29,7 +29,7 @@ pub fn extract_method_args(m: &syn::TraitItemMethod) -> Vec<MethodArgument> {
         .collect()
 }
 
-fn missing_self_panic(m: &syn::TraitItemMethod) -> ! {
+fn missing_self_panic(m: &syn::TraitItemFn) -> ! {
     panic!(
         "Trait method `{}` must have `&self` as its first argument.",
         m.sig.ident