From ac8fecbbf2e3be6dc3fca2ebc1a31a046d57553a Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Thu, 5 Jan 2023 08:19:33 -0500
Subject: deps: upgrade bstr to 1.1

---
 Cargo.lock                         | 7 ++++---
 Cargo.toml                         | 2 +-
 crates/cli/Cargo.toml              | 2 +-
 crates/core/config.rs              | 2 +-
 crates/globset/Cargo.toml          | 2 +-
 crates/printer/Cargo.toml          | 2 +-
 crates/regex/Cargo.toml            | 2 +-
 crates/searcher/Cargo.toml         | 2 +-
 crates/searcher/src/line_buffer.rs | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d3ff942a..0f0fbdf3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,13 +36,14 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bstr"
-version = "0.2.17"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
 dependencies = [
- "lazy_static",
  "memchr",
+ "once_cell",
  "regex-automata",
+ "serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 91a4010f..a5ad0f6f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ members = [
 ]
 
 [dependencies]
-bstr = "0.2.12"
+bstr = "1.1.0"
 grep = { version = "0.2.8", path = "crates/grep" }
 ignore = { version = "0.4.18", path = "crates/ignore" }
 lazy_static = "1.1.0"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index e84c632b..2bdb3bf4 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 
 [dependencies]
 atty = "0.2.11"
-bstr = "0.2.0"
+bstr = "1.1.0"
 globset = { version = "0.4.9", path = "../globset" }
 lazy_static = "1.1.0"
 log = "0.4.5"
diff --git a/crates/core/config.rs b/crates/core/config.rs
index d9c5970b..f55c1cae 100644
--- a/crates/core/config.rs
+++ b/crates/core/config.rs
@@ -80,7 +80,7 @@ fn parse<P: AsRef<Path>>(
 fn parse_reader<R: io::Read>(
     rdr: R,
 ) -> Result<(Vec<OsString>, Vec<Box<dyn Error>>)> {
-    let bufrdr = io::BufReader::new(rdr);
+    let mut bufrdr = io::BufReader::new(rdr);
     let (mut args, mut errs) = (vec![], vec![]);
     let mut line_number = 0;
     bufrdr.for_byte_line_with_terminator(|line| {
diff --git a/crates/globset/Cargo.toml b/crates/globset/Cargo.toml
index c53802e2..aecef29c 100644
--- a/crates/globset/Cargo.toml
+++ b/crates/globset/Cargo.toml
@@ -21,7 +21,7 @@ bench = false
 
 [dependencies]
 aho-corasick = "0.7.3"
-bstr = { version = "0.2.0", default-features = false, features = ["std"] }
+bstr = { version = "1.1.0", default-features = false, features = ["std"] }
 fnv = "1.0.6"
 log = { version = "0.4.5", optional = true }
 regex = { version = "1.1.5", default-features = false, features = ["perf", "std"] }
diff --git a/crates/printer/Cargo.toml b/crates/printer/Cargo.toml
index 61bfcaf1..6765d539 100644
--- a/crates/printer/Cargo.toml
+++ b/crates/printer/Cargo.toml
@@ -20,7 +20,7 @@ serde1 = ["base64", "serde", "serde_json"]
 
 [dependencies]
 base64 = { version = "0.13.0", optional = true }
-bstr = "0.2.0"
+bstr = "1.1.0"
 grep-matcher = { version = "0.1.5", path = "../matcher" }
 grep-searcher = { version = "0.1.8", path = "../searcher" }
 termcolor = "1.0.4"
diff --git a/crates/regex/Cargo.toml b/crates/regex/Cargo.toml
index 150bb6f8..7939978c 100644
--- a/crates/regex/Cargo.toml
+++ b/crates/regex/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 
 [dependencies]
 aho-corasick = "0.7.3"
-bstr = "0.2.10"
+bstr = "1.1.0"
 grep-matcher = { version = "0.1.5", path = "../matcher" }
 log = "0.4.5"
 regex = "1.1"
diff --git a/crates/searcher/Cargo.toml b/crates/searcher/Cargo.toml
index 3fd719d8..228f906c 100644
--- a/crates/searcher/Cargo.toml
+++ b/crates/searcher/Cargo.toml
@@ -14,7 +14,7 @@ license = "Unlicense OR MIT"
 edition = "2018"
 
 [dependencies]
-bstr = { version = "0.2.0", default-features = false, features = ["std"] }
+bstr = { version = "1.1.0", default-features = false, features = ["std"] }
 bytecount = "0.6"
 encoding_rs = "0.8.14"
 encoding_rs_io = "0.1.6"
diff --git a/crates/searcher/src/line_buffer.rs b/crates/searcher/src/line_buffer.rs
index 7aa4cb83..aaa81d26 100644
--- a/crates/searcher/src/line_buffer.rs
+++ b/crates/searcher/src/line_buffer.rs
@@ -481,7 +481,7 @@ impl LineBuffer {
         }
 
         let roll_len = self.end - self.pos;
-        self.buf.copy_within_str(self.pos..self.end, 0);
+        self.buf.copy_within(self.pos..self.end, 0);
         self.pos = 0;
         self.last_lineterm = roll_len;
         self.end = roll_len;
-- 
cgit v1.2.3