Replace static_init with OnceLock

Author: andrew

Cargo.toml

@@ -1,9 +1,9 @@
 [workspace]
 resolver = "2"
-members = ["crates/structre", "crates/structre_proc_macros"]
+members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 license = "ISC"
 repository = "https://github.com/andrewbaxter/structre"

crates/structre/Cargo.toml

@@ -9,5 +9,4 @@ readme.workspace = true
 
 [dependencies]
 regex = { version = "1", default-features = false, features = ["std"] }
-static_init = "1"
-structre_proc_macros = { path = "../structre_proc_macros", version = "=0.1.1" }
+structre_proc_macros = { path = "../structre_proc_macros", version = "=0.1.2" }

crates/structre/src/lib.rs

@@ -5,7 +5,6 @@ use {
 };
 pub use {
     structre_proc_macros::structre,
-    static_init,
     regex,
 };
 

crates/structre_proc_macros/mod.rs

@@ -590,10 +590,10 @@ fn gen_root(regex_span: Span, regex_raw: &str, ast: syn::DeriveInput) -> Result<
             type Err = structre::Error;
             fn from_str(input:& str) -> Result < #name,
             structre:: Error > {
-                #[
-                    structre::static_init::dynamic
-                ] static RE: structre:: regex:: Regex = regex:: Regex:: new(#regex_raw).unwrap();
-                let captures = RE.captures(input).ok_or(structre::Error::NoMatch)?;
+                static RE: std::sync::OnceLock<structre::regex::Regex> = std::sync::OnceLock::new();
+                let captures = RE.get_or_init(
+                    || structre:: regex:: Regex:: new(#regex_raw).unwrap()
+                ).captures(input).ok_or(structre::Error::NoMatch) ?;
                 #root
             }
         }

crates/structre_tests/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "structre_tests"
+publish = false
+
+[dependencies]
+structre = { path = "../structre" }

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

@@ -1,6 +1,10 @@
+#![cfg(test)]
+
+extern crate structre;
+
 use {
-    structre::structre,
     std::str::FromStr,
+    structre::structre,
 };
 
 #[test]