From e48125fc9c01961ee9199eef6d16c1f51d29e5f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 07:29:26 +0000
Subject: [PATCH 1/2] build(deps): bump bstr from 0.2.17 to 1.0.1

Bumps [bstr](https://github.com/BurntSushi/bstr) from 0.2.17 to 1.0.1.
- [Release notes](https://github.com/BurntSushi/bstr/releases)
- [Commits](https://github.com/BurntSushi/bstr/compare/0.2.17...1.0.1)

---
updated-dependencies:
- dependency-name: bstr
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock            | 13 ++++++++++---
 src/uu/cut/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5bbe40fa8..5ada4968b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -172,13 +172,14 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "0.2.17"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd"
 dependencies = [
- "lazy_static",
  "memchr",
+ "once_cell",
  "regex-automata",
+ "serde",
 ]
 
 [[package]]
@@ -1845,6 +1846,12 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "serde"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
+
 [[package]]
 name = "sha1"
 version = "0.10.5"
diff --git a/src/uu/cut/Cargo.toml b/src/uu/cut/Cargo.toml
index 9f3185d71..e8b5034ec 100644
--- a/src/uu/cut/Cargo.toml
+++ b/src/uu/cut/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/cut.rs"
 clap = { version = "4.0", features = ["wrap_help", "cargo"] }
 uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
 memchr = "2"
-bstr = "0.2"
+bstr = "1.0"
 atty = "0.2"
 
 [[bin]]

From 3e907e0c06771571a9a31c9d442b0a3010988a23 Mon Sep 17 00:00:00 2001
From: Niyaz Nigmatullin <niyaz.nigmatullin@gmail.com>
Date: Mon, 17 Oct 2022 11:00:23 +0300
Subject: [PATCH 2/2] Fix usage of `for_byte_record_with_terminator` from
 `bstr`

---
 src/uu/cut/src/cut.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs
index ecbf3470a..92d89e8be 100644
--- a/src/uu/cut/src/cut.rs
+++ b/src/uu/cut/src/cut.rs
@@ -145,7 +145,7 @@ fn list_to_ranges(list: &str, complement: bool) -> Result<Vec<Range>, String> {
 
 fn cut_bytes<R: Read>(reader: R, ranges: &[Range], opts: &Options) -> UResult<()> {
     let newline_char = if opts.zero_terminated { b'\0' } else { b'\n' };
-    let buf_in = BufReader::new(reader);
+    let mut buf_in = BufReader::new(reader);
     let mut out = stdout_writer();
     let delim = opts
         .out_delim
@@ -189,7 +189,7 @@ fn cut_fields_delimiter<R: Read>(
     newline_char: u8,
     out_delim: &str,
 ) -> UResult<()> {
-    let buf_in = BufReader::new(reader);
+    let mut buf_in = BufReader::new(reader);
     let mut out = stdout_writer();
     let input_delim_len = delim.len();
 
@@ -273,7 +273,7 @@ fn cut_fields<R: Read>(reader: R, ranges: &[Range], opts: &FieldOptions) -> URes
         );
     }
 
-    let buf_in = BufReader::new(reader);
+    let mut buf_in = BufReader::new(reader);
     let mut out = stdout_writer();
     let delim_len = opts.delimiter.len();