Skip to content

Commit

Permalink
Merge pull request #4055 from niyaznigmatullin/bump_bstr-1.0.1
Browse files Browse the repository at this point in the history
Bump bstr 1.0.1
  • Loading branch information
sylvestre authored Oct 17, 2022
2 parents 15dc0aa + 3e907e0 commit 480f36f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
13 changes: 10 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/uu/cut/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
6 changes: 3 additions & 3 deletions src/uu/cut/src/cut.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down

0 comments on commit 480f36f

Please sign in to comment.