fix: parse syn::Lit instead of syn::Expr (#72)

mathematic-inc · May 14, 2024 · c3621f8 · c3621f8
1 parent a619bef
commit c3621f8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/tests/unformat.rs b/tests/unformat.rs
@@ -63,3 +63,14 @@ fn test_unformat_typed_named_captures() {
     );
     assert_eq!(addr, SocketAddr::from_str("127.0.0.1:3000").ok());
 }
+
+#[test]
+fn test_declmacro() {
+    macro_rules! test_declmacro {
+        ($fmt:literal, $input:expr) => {
+            unformat!($fmt, $input)
+        };
+    }
+
+    test_declmacro!("abc", "abcd");
+}
diff --git a/unfmt_macros/unfmt_macros.rs b/unfmt_macros/unfmt_macros.rs
@@ -11,7 +11,7 @@ use proc_macro2::Span;
 use quote::{quote, ToTokens};
 use syn::{
     parse::{Parse, ParseStream, Result},
-    parse_macro_input, parse_str, Expr, ExprLit, Ident, Lit, LitBool, LitByteStr, Token, TypePath,
+    parse_macro_input, parse_str, Expr, Ident, Lit, LitBool, LitByteStr, Token, TypePath,
 };
 
 struct Unformat {
@@ -24,14 +24,9 @@ struct Unformat {
 impl Parse for Unformat {
     fn parse(input: ParseStream) -> Result<Self> {
         #[allow(clippy::wildcard_enum_match_arm)]
-        let (pattern, is_pattern_str) = match input.parse::<Expr>()? {
-            Expr::Lit(ExprLit {
-                lit: Lit::Str(str), ..
-            }) => (str.value().into_bytes(), true),
-            Expr::Lit(ExprLit {
-                lit: Lit::ByteStr(byte_str),
-                ..
-            }) => (byte_str.value(), false),
+        let (pattern, is_pattern_str) = match input.parse::<Lit>()? {
+            Lit::Str(str) => (str.value().into_bytes(), true),
+            Lit::ByteStr(byte_str) => (byte_str.value(), false),
             _ => return Err(input.error("expected a string literal")),
         };