From d3182a67372d21fb4a706da70b672595f75ebdfe Mon Sep 17 00:00:00 2001 From: Stefan Holderbach Date: Mon, 23 Oct 2023 16:11:32 +0200 Subject: [PATCH] Revert "Bump regex from 1.9.6 to 1.10.2" (#10818) Reverts nushell/nushell#10812 This goes back to a version of `regex` and its dependencies that is shared with a lot of our other dependencies. Before this we did not duplicate big dependencies of `regex` that affect binary size and compile time. As there is no known bug or security problem we suffer from, we can wait on receiving the performance improvements to `regex` with the rest of our `regex` dependents. --- Cargo.lock | 26 +++++++------------------- crates/nu-command/Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49a2ba9310..2bc9833ba7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,7 +223,7 @@ dependencies = [ "num-traits", "parquet2", "regex", - "regex-syntax 0.7.5", + "regex-syntax", "rustc_version", "simdutf8", "streaming-iterator", @@ -450,7 +450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "regex-automata 0.3.9", + "regex-automata", "serde", ] @@ -4269,14 +4269,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata", + "regex-syntax", ] [[package]] @@ -4284,16 +4284,10 @@ name = "regex-automata" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] @@ -4302,12 +4296,6 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - [[package]] name = "relative-path" version = "1.9.0" diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml index 4a5444e754..49e25a4765 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml @@ -70,7 +70,7 @@ print-positions = "0.6" quick-xml = "0.30" rand = "0.8" rayon = "1.8" -regex = "1.10.2" +regex = "1.9.5" roxmltree = "0.18" rusqlite = { version = "0.29", features = ["bundled"], optional = true } same-file = "1.0"