Check for None-delimited group in attribute value

serde-rs · Mar 20, 2023 · dd460f8 · dd460f8
1 parent c3d637f
commit dd460f8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/serde_derive/Cargo.toml b/serde_derive/Cargo.toml
@@ -24,7 +24,7 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = "2.0"
+syn = "2.0.3"
 
 [dev-dependencies]
 serde = { version = "1.0", path = "../serde" }

diff --git a/serde_derive/src/internals/attr.rs b/serde_derive/src/internals/attr.rs
@@ -1381,21 +1381,26 @@ fn get_lit_str2(
     meta_item_name: Symbol,
     meta: &ParseNestedMeta,
 ) -> syn::Result<Option<syn::LitStr>> {
-    match meta.value()?.parse()? {
-        syn::Expr::Lit(syn::ExprLit {
-            lit: syn::Lit::Str(lit),
-            ..
-        }) => Ok(Some(lit)),
-        expr => {
-            cx.error_spanned_by(
-                expr,
-                format!(
-                    "expected serde {} attribute to be a string: `{} = \"...\"`",
-                    attr_name, meta_item_name
-                ),
-            );
-            Ok(None)
-        }
+    let expr: syn::Expr = meta.value()?.parse()?;
+    let mut value = &expr;
+    while let syn::Expr::Group(e) = value {
+        value = &e.expr;
+    }
+    if let syn::Expr::Lit(syn::ExprLit {
+        lit: syn::Lit::Str(lit),
+        ..
+    }) = value
+    {
+        Ok(Some(lit.clone()))
+    } else {
+        cx.error_spanned_by(
+            expr,
+            format!(
+                "expected serde {} attribute to be a string: `{} = \"...\"`",
+                attr_name, meta_item_name
+            ),
+        );
+        Ok(None)
     }
 }