Merge pull request #3215 from bandprotocol/Fix-syn-new-version

Update code for syn new version

obi/obi-rs/obi-derive-internal/Cargo.toml

@@ -1,12 +1,12 @@
     [package]
 name = "obi-derive-internal"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Band Protocol <[email protected]>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 proc-macro2 = "1"
-syn = {version = "1", features = ["full", "fold"] }
+syn = {version = "1.0.62", features = ["full", "fold"] }
 quote = "1"

obi/obi-rs/obi-derive-internal/src/helpers.rs

@@ -1,8 +1,8 @@
+use proc_macro2::TokenStream;
 use quote::quote;
-use syn::export::TokenStream2;
 use syn::Generics;
 
-pub fn declaration(ident_str: &String, generics: &Generics) -> (TokenStream2, Vec<TokenStream2>) {
+pub fn declaration(ident_str: &String, generics: &Generics) -> (TokenStream, Vec<TokenStream>) {
     let (_, _, where_clause_generics) = generics.split_for_impl();
     // Generate function that returns the name of the type.
     let mut declaration_params = vec![];

obi/obi-rs/obi-derive-internal/src/struct_dec.rs

@@ -1,14 +1,14 @@
+use proc_macro2::TokenStream;
 use quote::quote;
-use syn::export::TokenStream2;
 use syn::{Fields, ItemStruct};
 
-pub fn struct_dec(input: &ItemStruct) -> syn::Result<TokenStream2> {
+pub fn struct_dec(input: &ItemStruct) -> syn::Result<TokenStream> {
     let name = &input.ident;
     let generics = &input.generics;
-    let mut decode_field_types = TokenStream2::new();
+    let mut decode_field_types = TokenStream::new();
     let return_value = match &input.fields {
         Fields::Named(fields) => {
-            let mut body = TokenStream2::new();
+            let mut body = TokenStream::new();
             for field in &fields.named {
                 let field_name = field.ident.as_ref().unwrap();
                 let delta = {
@@ -27,7 +27,7 @@ pub fn struct_dec(input: &ItemStruct) -> syn::Result<TokenStream2> {
             }
         }
         Fields::Unnamed(fields) => {
-            let mut body = TokenStream2::new();
+            let mut body = TokenStream::new();
             for _ in 0..fields.unnamed.len() {
                 let delta = quote! {
                     obi::OBIDecode::decode(buf)?,

obi/obi-rs/obi-derive-internal/src/struct_enc.rs

@@ -1,12 +1,12 @@
+use proc_macro2::{Span, TokenStream};
 use quote::quote;
-use syn::export::{Span, TokenStream2};
 use syn::{Fields, Index, ItemStruct};
 
-pub fn struct_enc(input: &ItemStruct) -> syn::Result<TokenStream2> {
+pub fn struct_enc(input: &ItemStruct) -> syn::Result<TokenStream> {
     let name = &input.ident;
     let generics = &input.generics;
-    let mut body = TokenStream2::new();
-    let mut encode_field_types = TokenStream2::new();
+    let mut body = TokenStream::new();
+    let mut encode_field_types = TokenStream::new();
     match &input.fields {
         Fields::Named(fields) => {
             for field in &fields.named {
@@ -52,7 +52,7 @@ pub fn struct_enc(input: &ItemStruct) -> syn::Result<TokenStream2> {
 mod tests {
     use super::*;
 
-    fn assert_eq(expected: TokenStream2, actual: TokenStream2) {
+    fn assert_eq(expected: TokenStream, actual: TokenStream) {
         assert_eq!(expected.to_string(), actual.to_string())
     }
 

obi/obi-rs/obi-derive-internal/src/struct_schema.rs

@@ -1,9 +1,9 @@
 use crate::helpers::declaration;
-use quote::quote;
-use syn::export::{ToTokens, TokenStream2};
+use proc_macro2::TokenStream;
+use quote::{quote, ToTokens};
 use syn::{Fields, ItemStruct};
 
-pub fn process_struct(input: &ItemStruct) -> syn::Result<TokenStream2> {
+pub fn process_struct(input: &ItemStruct) -> syn::Result<TokenStream> {
     let name = &input.ident;
     let name_str = name.to_token_stream().to_string();
     let generics = &input.generics;
@@ -13,8 +13,8 @@ pub fn process_struct(input: &ItemStruct) -> syn::Result<TokenStream2> {
 
     // Generate function that returns the schema of required types.
     let mut fields_vec = vec![];
-    let mut struct_fields = TokenStream2::new();
-    let mut add_definitions_recursively_rec = TokenStream2::new();
+    let mut struct_fields = TokenStream::new();
+    let mut add_definitions_recursively_rec = TokenStream::new();
     match &input.fields {
         Fields::Named(fields) => {
             for field in &fields.named {
@@ -58,7 +58,7 @@ pub fn process_struct(input: &ItemStruct) -> syn::Result<TokenStream2> {
     let where_clause = if !where_clause.is_empty() {
         quote! { where #(#where_clause),*}
     } else {
-        TokenStream2::new()
+        TokenStream::new()
     };
     Ok(quote! {
         impl #impl_generics obi::OBISchema for #name #ty_generics #where_clause {
@@ -76,7 +76,7 @@ pub fn process_struct(input: &ItemStruct) -> syn::Result<TokenStream2> {
 mod tests {
     use super::*;
 
-    fn assert_eq(expected: TokenStream2, actual: TokenStream2) {
+    fn assert_eq(expected: TokenStream, actual: TokenStream) {
         assert_eq!(expected.to_string(), actual.to_string())
     }
 

obi/obi-rs/obi-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "obi-derive"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Band Protocol <[email protected]>"]
 edition = "2018"
 
@@ -11,5 +11,5 @@ proc-macro = true
 
 [dependencies]
 obi-derive-internal = { path = "../obi-derive-internal"}
-syn = {version = "1", features = ["full", "fold"] }
+syn = {version = "1.0.62", features = ["full", "fold"] }
 quote = "0.3.15"

obi/obi-rs/obi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "obi"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Band Protocol <[email protected]>"]
 edition = "2018"