Fix options

Author: andrew

crates/structre_proc_macros/mod.rs

@@ -183,10 +183,14 @@ fn gen_named_fields(
                 }
                 field_tokens.push(quote!(#name: match captures.get(#cap_index) {
                     Some(m) => {
-                        < #p as std:: str:: FromStr >:: from_str(m.as_str()).map_err(| e | structre:: Error:: Field {
-                            field: #path,
-                            error: e.to_string()
-                        }) ?
+                        Some(
+                            < #p as std:: str:: FromStr >:: from_str(
+                                m.as_str()
+                            ).map_err(| e | structre:: Error:: Field {
+                                field: #path,
+                                error: e.to_string()
+                            }) ?
+                        )
                     },
                     None => None,
                 }));
@@ -250,10 +254,14 @@ fn gen_unnamed_fields(
                 }
                 out.push(quote!(match captures.get(#cap_index) {
                     Some(m) => {
-                        < #p as std:: str:: FromStr >:: from_str(m.as_str()).map_err(| e | structre:: Error:: Field {
-                            field: #path,
-                            error: e.to_string()
-                        }) ?
+                        Some(
+                            < #p as std:: str:: FromStr >:: from_str(
+                                m.as_str()
+                            ).map_err(| e | structre:: Error:: Field {
+                                field: #path,
+                                error: e.to_string()
+                            }) ?
+                        )
                     },
                     None => None,
                 }));

crates/structre_tests/tests/test.rs

@@ -50,6 +50,17 @@ fn uncapture_named() {
     assert_eq!(v.a, "a");
 }
 
+#[test]
+fn test_struct_opt() {
+    #[structre("(?P<a>a)?")]
+    struct Parsed {
+        a: Option<String>,
+    }
+
+    let v = Parsed::from_str("a").unwrap();
+    assert_eq!(v.a.as_ref().map(|x| x.as_str()), Some("a"));
+}
+
 #[test]
 fn test_enum() {
     #[structre("(?P<A>a)|(?P<b>b)")]