From a68db3ac02fbfa2154cb2c8029c39e89d24c2792 Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Wed, 5 Jul 2023 11:08:13 -0400
Subject: [PATCH] deps: drop temporary patch and move to bstr 1.6

Now that regex 1.9 is out, we can depend on it from crates.io.
---
 Cargo.lock                 | 27 +++++++++++++--------------
 Cargo.toml                 |  7 +------
 crates/cli/Cargo.toml      |  2 +-
 crates/globset/Cargo.toml  |  2 +-
 crates/printer/Cargo.toml  |  2 +-
 crates/regex/Cargo.toml    |  2 +-
 crates/searcher/Cargo.toml |  2 +-
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4ab7ee66..8efad796 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,13 +25,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bstr"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
- "once_cell",
- "regex-automata 0.1.10",
+ "regex-automata",
  "serde",
 ]
 
@@ -200,7 +199,7 @@ dependencies = [
  "bstr",
  "grep-matcher",
  "log",
- "regex-automata 0.3.0",
+ "regex-automata",
  "regex-syntax",
 ]
 
@@ -374,23 +373,21 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.0",
+ "regex-automata",
  "regex-syntax",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
 [[package]]
 name = "regex-automata"
 version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -399,7 +396,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
 
 [[package]]
 name = "ripgrep"
diff --git a/Cargo.toml b/Cargo.toml
index 5bc66336..47de6848 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,11 +19,6 @@ autotests = false
 edition = "2018"
 rust-version = "1.65"
 
-[patch.crates-io]
-regex = { path = "/home/andrew/rust/regex" }
-regex-automata = { path = "/home/andrew/rust/regex/regex-automata" }
-regex-syntax = { path = "/home/andrew/rust/regex/regex-syntax" }
-
 [[bin]]
 bench = false
 path = "crates/core/main.rs"
@@ -47,7 +42,7 @@ members = [
 ]
 
 [dependencies]
-bstr = "1.1.0"
+bstr = "1.6.0"
 grep = { version = "0.2.12", path = "crates/grep" }
 ignore = { version = "0.4.19", path = "crates/ignore" }
 lazy_static = "1.1.0"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index d9cc3444..c6c5f611 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -14,7 +14,7 @@ license = "Unlicense OR MIT"
 edition = "2018"
 
 [dependencies]
-bstr = "1.1.0"
+bstr = "1.6.0"
 globset = { version = "0.4.10", path = "../globset" }
 lazy_static = "1.1.0"
 log = "0.4.5"
diff --git a/crates/globset/Cargo.toml b/crates/globset/Cargo.toml
index e6ce3078..ad710e5c 100644
--- a/crates/globset/Cargo.toml
+++ b/crates/globset/Cargo.toml
@@ -21,7 +21,7 @@ bench = false
 
 [dependencies]
 aho-corasick = "1.0.2"
-bstr = { version = "1.5.0", default-features = false, features = ["std"] }
+bstr = { version = "1.6.0", default-features = false, features = ["std"] }
 fnv = "1.0.6"
 log = { version = "0.4.5", optional = true }
 regex = { version = "1.8.3", default-features = false, features = ["perf", "std"] }
diff --git a/crates/printer/Cargo.toml b/crates/printer/Cargo.toml
index c7054250..e557d08d 100644
--- a/crates/printer/Cargo.toml
+++ b/crates/printer/Cargo.toml
@@ -20,7 +20,7 @@ serde1 = ["base64", "serde", "serde_json"]
 
 [dependencies]
 base64 = { version = "0.20.0", optional = true }
-bstr = "1.1.0"
+bstr = "1.6.0"
 grep-matcher = { version = "0.1.6", path = "../matcher" }
 grep-searcher = { version = "0.1.11", path = "../searcher" }
 termcolor = "1.0.4"
diff --git a/crates/regex/Cargo.toml b/crates/regex/Cargo.toml
index a844ad5c..280eacf0 100644
--- a/crates/regex/Cargo.toml
+++ b/crates/regex/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2021"
 
 [dependencies]
 aho-corasick = "1.0.2"
-bstr = "1.5.0"
+bstr = "1.6.0"
 grep-matcher = { version = "0.1.6", path = "../matcher" }
 log = "0.4.19"
 regex-automata = { version = "0.3.0" }
diff --git a/crates/searcher/Cargo.toml b/crates/searcher/Cargo.toml
index 46653b36..68864cee 100644
--- a/crates/searcher/Cargo.toml
+++ b/crates/searcher/Cargo.toml
@@ -14,7 +14,7 @@ license = "Unlicense OR MIT"
 edition = "2018"
 
 [dependencies]
-bstr = { version = "1.1.0", default-features = false, features = ["std"] }
+bstr = { version = "1.6.0", default-features = false, features = ["std"] }
 bytecount = "0.6"
 encoding_rs = "0.8.14"
 encoding_rs_io = "0.1.6"