Merge pull request #161 from theseus-rs/replace-regex-with-regex-lite

chore: replace regex with regex-lite to reduce dependencies

Author: brianheineman

Cargo.lock

@@ -45,7 +45,7 @@ postgres = "0.19.9"
 quick-xml = "0.37.1"
 r2d2_postgres = "0.18.1"
 rand = "0.8.5"
-regex = "1.11.1"
+regex-lite = "0.1.6"
 reqwest = { version = "0.12.12", default-features = false }
 reqwest-middleware = "0.4.0"
 reqwest-retry = "0.7.0"

Cargo.toml

@@ -19,7 +19,7 @@ liblzma = { workspace = true }
 md-5 = { workspace = true, optional = true }
 num-format = { workspace = true }
 quick-xml = { workspace = true, features = ["serialize"], optional = true }
-regex = { workspace = true }
+regex-lite = { workspace = true }
 reqwest = { workspace = true, default-features = false, features = ["json", "stream"] }
 reqwest-middleware = { workspace = true }
 reqwest-retry = { workspace = true }

postgresql_archive/Cargo.toml

@@ -3,7 +3,7 @@
 
 use crate::error::Result;
 use crate::{extractor, repository};
-use regex::Regex;
+use regex_lite::Regex;
 use semver::{Version, VersionReq};
 use std::path::{Path, PathBuf};
 use tracing::instrument;

postgresql_archive/src/archive.rs

@@ -1,7 +1,7 @@
 use crate::extractor::{tar_gz_extract, ExtractDirectories};
 use crate::Error::Unexpected;
 use crate::Result;
-use regex::Regex;
+use regex_lite::Regex;
 use std::fs::{create_dir_all, remove_dir_all, remove_file, rename};
 use std::path::{Path, PathBuf};
 use std::thread::sleep;

postgresql_archive/src/configuration/theseus/extractor.rs

@@ -1,7 +1,7 @@
 use crate::extractor::{tar_xz_extract, ExtractDirectories};
 use crate::Error::Unexpected;
 use crate::Result;
-use regex::Regex;
+use regex_lite::Regex;
 use std::fs::{create_dir_all, remove_dir_all, remove_file, rename};
 use std::io::Cursor;
 use std::path::{Path, PathBuf};

postgresql_archive/src/configuration/zonky/extractor.rs

@@ -48,9 +48,9 @@ pub enum Error {
     VersionNotFound(String),
 }
 
-/// Converts a [`regex::Error`] into an [`ParseError`](Error::ParseError)
-impl From<regex::Error> for Error {
-    fn from(error: regex::Error) -> Self {
+/// Converts a [`regex_lite::Error`] into an [`ParseError`](Error::ParseError)
+impl From<regex_lite::Error> for Error {
+    fn from(error: regex_lite::Error) -> Self {
         Error::ParseError(error.to_string())
     }
 }
@@ -125,9 +125,9 @@ mod test {
 
     #[test]
     fn test_from_regex_error() {
-        let regex_error = regex::Error::Syntax("test".to_string());
+        let regex_error = regex_lite::Regex::new("(?=a)").expect_err("regex error");
         let error = Error::from(regex_error);
-        assert_eq!(error.to_string(), "test");
+        assert_eq!(error.to_string(), "look-around is not supported");
     }
 
     #[tokio::test]

postgresql_archive/src/error.rs

@@ -1,5 +1,5 @@
 use crate::{Error, Result};
-use regex::Regex;
+use regex_lite::Regex;
 use std::fmt::Display;
 use std::path::PathBuf;
 

postgresql_archive/src/extractor/model.rs

@@ -98,7 +98,7 @@ pub fn get(url: &str) -> Result<ExtractFn> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use regex::Regex;
+    use regex_lite::Regex;
 
     #[test]
     fn test_register() -> Result<()> {

postgresql_archive/src/extractor/registry.rs

@@ -8,7 +8,7 @@ use crate::Error::{
 use crate::{hasher, matcher, Result};
 use async_trait::async_trait;
 use futures_util::StreamExt;
-use regex::Regex;
+use regex_lite::Regex;
 use reqwest::header::HeaderMap;
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
 use reqwest_retry::policies::ExponentialBackoff;