drop lazy_regex dep

Cargo.lock

@@ -30,15 +30,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -130,7 +121,6 @@ dependencies = [
  "clap",
  "futures",
  "git2",
- "lazy-regex",
  "rbx_asset",
  "rbx_binary",
  "rbx_dom_weak",
@@ -938,29 +928,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "lazy-regex"
-version = "3.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60c7310b93682b36b98fa7ea4de998d3463ccbebd94d935d6b48ba5b6ffa7126"
-dependencies = [
- "lazy-regex-proc_macros",
- "once_cell",
- "regex",
-]
-
-[[package]]
-name = "lazy-regex-proc_macros"
-version = "3.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ba01db5ef81e17eb10a5e0f2109d1b3a3e29bac3070fdbd7d156bf7dbd206a1"
-dependencies = [
- "proc-macro2",
- "quote",
- "regex",
- "syn",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1350,7 +1317,7 @@ dependencies = [
  "once_cell",
  "socket2 0.5.10",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1553,24 +1520,20 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
- "aho-corasick",
- "memchr",
  "regex-automata",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
- "aho-corasick",
- "memchr",
  "regex-syntax",
 ]
 
@@ -1667,10 +1630,10 @@ name = "rox_compiler"
 version = "0.1.0"
 dependencies = [
  "futures",
- "lazy-regex",
  "rayon",
  "rbx_dom_weak",
  "rbx_xml",
+ "regex",
  "tokio",
 ]
 

Cargo.toml

@@ -11,7 +11,6 @@ anyhow = "1.0.75"
 clap = { version = "4.4.2", features = ["derive"] }
 futures = "0.3.30"
 git2 = { version = "0.20.0", optional = true }
-lazy-regex = "3.1.0"
 rbx_asset = { path = "rbx_asset", features = ["gzip", "rustls-tls"], default-features = false }
 rbx_binary = "1.0.0"
 rbx_dom_weak = "3.0.0"

rox_compiler/Cargo.toml

@@ -10,7 +10,7 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 
 [dependencies]
 futures = "0.3.30"
-lazy-regex = "3.1.0"
+regex = { version = "1.11.3", default-features = false }
 rayon = "1.8.0"
 rbx_dom_weak = "3.0.0"
 rbx_xml = "1.0.0"

rox_compiler/src/common.rs

@@ -28,6 +28,16 @@ impl std::fmt::Display for PropertiesOverride{
 	}
 }
 
-pub(crate) fn sanitize(s:&str)->std::borrow::Cow<'_,str>{
-	lazy_regex::regex!(r"[^A-Za-z0-9.-]").replace_all(s,"_")
+#[macro_export]
+macro_rules! lazy_regex{
+	($r:literal)=>{{
+		use regex::Regex;
+		use std::sync::LazyLock;
+		static RE:LazyLock<Regex>=LazyLock::new(||Regex::new($r).unwrap());
+		&RE
+	}};
+}
+
+pub(crate) fn sanitize(s:&str)->std::borrow::Cow<'_,str>{
+	lazy_regex!(r"[^A-Za-z0-9.-]").replace_all(s,"_")
 }

rox_compiler/src/compile.rs

@@ -2,6 +2,7 @@ use std::path::{Path,PathBuf};
 use futures::{StreamExt, TryStreamExt};
 use tokio::io::AsyncReadExt;
 
+use crate::lazy_regex;
 use crate::common::{sanitize,Style,PropertiesOverride};
 
 //holy smokes what am I doing lmao
@@ -202,7 +203,7 @@ impl ScriptWithOverrides{
 		let mut count=0;
 		for line in source.lines(){
 			//only string type properties are supported atm
-			if let Some(captures)=lazy_regex::regex!(r#"^\-\-\s*Properties\.([A-Za-z]\w*)\s*\=\s*"(\w+)"$"#)
+			if let Some(captures)=lazy_regex!(r#"^\-\-\s*Properties\.([A-Za-z]\w*)\s*\=\s*"(\w+)"$"#)
 			.captures(line){
 				count+=line.len();
 				match &captures[1]{
@@ -339,7 +340,7 @@ impl CompileNode{
 		//reject goobers
 		let is_goober=matches!(style,Some(Style::Rojo));
 		let (ext_len,file_discernment)={
-			if let Some(captures)=lazy_regex::regex!(r"^.*(\.module\.lua|\.client\.lua|\.server\.lua)$")
+			if let Some(captures)=lazy_regex!(r"^.*(\.module\.lua|\.client\.lua|\.server\.lua)$")
 			.captures(file_name.as_str()){
 				let ext=&captures[1];
 				(ext.len(),match ext{
@@ -353,7 +354,7 @@ impl CompileNode{
 					".server.lua"=>FileDiscernment::Script(ScriptHint::Script),
 					_=>panic!("Regex failed"),
 				})
-			}else if let Some(captures)=lazy_regex::regex!(r"^.*(\.rbxmx|\.lua)$")
+			}else if let Some(captures)=lazy_regex!(r"^.*(\.rbxmx|\.lua)$")
 			.captures(file_name.as_str()){
 				let ext=&captures[1];
 				(ext.len(),match ext{