diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index f9bc26997..7951d4df4 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -17,7 +17,7 @@ jobs: working-directory: jaq-json run: cargo check - - uses: dtolnay/rust-toolchain@1.64 + - uses: dtolnay/rust-toolchain@1.65 - name: Check jaq working-directory: jaq run: cargo check diff --git a/Cargo.lock b/Cargo.lock index 2a86d2c5f..89520524f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -303,7 +303,7 @@ dependencies = [ "jaq-json", "libm", "log", - "regex", + "regex-lite", "serde_json", "urlencoding", ] @@ -442,33 +442,10 @@ dependencies = [ ] [[package]] -name = "regex" -version = "1.9.4" +name = "regex-lite" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "remove_dir_all" diff --git a/jaq-std/Cargo.toml b/jaq-std/Cargo.toml index 8fc08b397..b9c3f8425 100644 --- a/jaq-std/Cargo.toml +++ b/jaq-std/Cargo.toml @@ -8,10 +8,11 @@ readme = "../README.md" description = "Standard library for jaq" repository = "https://github.com/01mf02/jaq" keywords = ["json", "query", "jq"] -rust-version = "1.63" +rust-version = "1.65" [features] default = ["std", "format", "log", "math", "regex", "time"] +regex = ["regex-lite"] std = [] format = ["aho-corasick", "base64", "urlencoding"] math = ["libm"] @@ -22,7 +23,7 @@ jaq-core = { version = "2.0.0-gamma", path = "../jaq-core" } hifijson = { version = "0.2.0", optional = true } chrono = { version = "0.4.38", default-features = false, features = ["alloc"], optional = true } -regex = { version = "1.9", optional = true } +regex-lite = { version = "0.1", optional = true } log = { version = "0.4.17", optional = true } libm = { version = "0.2.7", optional = true } aho-corasick = { version = "1.0", optional = true } diff --git a/jaq-std/src/regex.rs b/jaq-std/src/regex.rs index d57b85ac4..33783067a 100644 --- a/jaq-std/src/regex.rs +++ b/jaq-std/src/regex.rs @@ -2,7 +2,7 @@ use alloc::string::{String, ToString}; use alloc::vec::Vec; -use regex::{Error, Regex, RegexBuilder}; +use regex_lite::{self as regex, Error, Regex, RegexBuilder}; #[derive(Copy, Clone, Default)] pub struct Flags { diff --git a/jaq/Cargo.toml b/jaq/Cargo.toml index df97206e8..dc49979cb 100644 --- a/jaq/Cargo.toml +++ b/jaq/Cargo.toml @@ -9,7 +9,7 @@ description = "Just another JSON query tool" repository = "https://github.com/01mf02/jaq" keywords = ["json", "query", "jq"] categories = ["command-line-utilities", "compilers", "parser-implementations"] -rust-version = "1.64" +rust-version = "1.65" [features] default = ["mimalloc"]