Reorg, rewrite, bump deps, enums

Author: andrew

Cargo.toml

@@ -1,20 +1,10 @@
-[package]
-name = "structre"
-version = "0.0.4"
+[workspace]
+resolver = "2"
+members = ["crates/structre", "crates/structre_proc_macros"]
+
+[workspace.package]
+version = "0.1.0"
 edition = "2021"
 license = "ISC"
-description = "Static-checked parsing of regexes into structs"
-homepage = "https://github.com/andrewbaxter/structre"
 repository = "https://github.com/andrewbaxter/structre"
 readme = "readme.md"
-
-[workspace]
-members = ["src/proc_macros"]
-
-[features]
-default = ["unicode"]
-unicode = ["structre_proc_macros/unicode", "regex/unicode"]
-
-[dependencies]
-regex = { version = "1.7.0", default-features = false, features = ["std"] }
-structre_proc_macros = { path = "src/proc_macros", version = "0.0.3" }

crates/structre/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "structre"
+description = "Static-checked parsing of regexes into structs"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+readme.workspace = true
+
+[features]
+default = ["unicode"]
+unicode = ["structre_proc_macros/unicode", "regex/unicode"]
+
+[dependencies]
+regex = { version = "1", default-features = false, features = ["std"] }
+static_init = "1"
+structre_proc_macros = { path = "../structre_proc_macros" }

src/lib.rs renamed to crates/structre/src/lib.rs

@@ -1,13 +1,15 @@
-use structre::structre;
+use {
+    structre::structre,
+    std::str::FromStr,
+};
 
 #[cfg(feature = "unicode")]
 #[test]
 fn match_() {
     #[structre("(a)(44)")]
     struct Parsed(String, u32);
 
-    let pre = Parsed::parser();
-    let v = pre.parse("a44").unwrap();
+    let v = Parsed::from_str("a44").unwrap();
     assert_eq!(v.0, "a");
     assert_eq!(v.1, 44);
 }
@@ -21,8 +23,7 @@ fn named() {
         b: u32,
     }
 
-    let pre = Parsed::parser();
-    let v = pre.parse("a44").unwrap();
+    let v = Parsed::from_str("a44").unwrap();
     assert_eq!(v.a, "a");
     assert_eq!(v.b, 44);
 }
@@ -33,8 +34,7 @@ fn uncapture() {
     #[structre("(?:(a))")]
     struct Parsed(String);
 
-    let pre = Parsed::parser();
-    let v = pre.parse("a").unwrap();
+    let v = Parsed::from_str("a").unwrap();
     assert_eq!(v.0, "a");
 }
 
@@ -46,7 +46,22 @@ fn uncapture_named() {
         a: String,
     }
 
-    let pre = Parsed::parser();
-    let v = pre.parse("a").unwrap();
+    let v = Parsed::from_str("a").unwrap();
     assert_eq!(v.a, "a");
 }
+
+#[cfg(feature = "unicode")]
+#[test]
+fn test_enum() {
+    #[structre("(?P<A>a)|(?P<b>b)")]
+    #[derive(PartialEq, Eq, Debug)]
+    enum Parsed {
+        A(String),
+        B {
+            b: String,
+        },
+    }
+
+    let v = Parsed::from_str("a").unwrap();
+    assert_eq!(v, Parsed::A("a".to_string()));
+}

tests/test.rs renamed to crates/structre/tests/test.rs

@@ -0,0 +1,27 @@
+[package]
+name = "structre_proc_macros"
+description = "Static-checked parsing of regexes into structs (helper crate)"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+readme.workspace = true
+
+[lib]
+proc-macro = true
+path = "mod.rs"
+
+[features]
+default = ["unicode"]
+unicode = []
+
+[dependencies]
+flowcontrol = "0.2"
+litrs = "0.4"
+proc-macro2 = "1"
+quote = "1"
+regex-syntax = "0.8"
+syn = "2"
+
+[dev-dependencies]
+genemichaels = "0.5.0-pre1"