Bump syn to v2.0.38 (#46)

SpriteOvO · Oct 27, 2023 · 0a2489c · 0a2489c
1 parent acfe95c
commit 0a2489c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/spdlog-macros/Cargo.toml b/spdlog-macros/Cargo.toml
@@ -17,4 +17,4 @@ proc-macro = true
 nom = "7.1.1"
 proc-macro2 = "1.0.47"
 quote = "1.0.21"
-syn = { version = "1.0.103", features = ["full"] }
+syn = { version = "2.0.38", features = ["full"] }
diff --git a/spdlog-macros/src/parse.rs b/spdlog-macros/src/parse.rs
@@ -194,8 +194,7 @@ pub(crate) struct CustomPatternMapping {
 
 impl Parse for CustomPatternMapping {
     fn parse(input: ParseStream) -> syn::Result<Self> {
-        let items: Punctuated<_, Token![,]> =
-            input.parse_terminated(CustomPatternMappingItem::parse)?;
+        let items = Punctuated::<CustomPatternMappingItem, Token![,]>::parse_terminated(input)?;
 
         let mapping_pairs = items.into_iter().fold(vec![], |mut prev, item| {
             prev.push((item.name, item.factory));

diff --git a/spdlog-macros/src/synthesis.rs b/spdlog-macros/src/synthesis.rs
@@ -6,7 +6,7 @@ use std::{
 
 use proc_macro2::{Span, TokenStream};
 use quote::ToTokens;
-use syn::{punctuated::Punctuated, token::Paren, Expr, ExprLit, ExprTuple, Lit, LitStr, Path};
+use syn::{Expr, ExprLit, Lit, LitStr, Path};
 
 use crate::parse::{
     PatternTemplate, PatternTemplateFormatter, PatternTemplateLiteral, PatternTemplateStyleRange,
@@ -126,14 +126,7 @@ impl Synthesiser {
         template: &PatternTemplate,
         mut style_range_seen: bool,
     ) -> Result<Expr, SynthesisError> {
-        let mut template_expr = ExprTuple {
-            attrs: Vec::new(),
-            paren_token: Paren {
-                span: Span::mixed_site(),
-            },
-            elems: Punctuated::new(),
-        };
-
+        let mut tuple_elems = Vec::with_capacity(template.tokens.len());
         for token in &template.tokens {
             let token_template_expr = match token {
                 PatternTemplateToken::Literal(literal_token) => {
@@ -150,10 +143,12 @@ impl Synthesiser {
                     self.build_style_range_template_pattern_expr(style_range_token)?
                 }
             };
-            template_expr.elems.push(token_template_expr);
+            tuple_elems.push(token_template_expr);
         }
 
-        Ok(Expr::Tuple(template_expr))
+        let stream = quote::quote! { ( #(#tuple_elems ,)* ) };
+        let expr = syn::parse2(stream).unwrap();
+        Ok(Expr::Tuple(expr))
     }
 
     fn build_literal_template_pattern_expr(