Skip to content

Commit a28bb1e

Browse files
committed
deps: bring in all semver updates
This brings in all other semver updates. This did require updating some tests, since bstr changed its debug output for NUL bytes to be a bit more idiomatic.
1 parent 3ef63da commit a28bb1e

3 files changed

Lines changed: 59 additions & 59 deletions

File tree

Cargo.lock

Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/binary.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ rgtest!(after_match1_implicit, |dir: Dir, mut cmd: TestCommand| {
4040

4141
let expected = "\
4242
hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
43-
WARNING: stopped searching binary file hay after match (found \"\\u{0}\" byte around offset 9741)
43+
WARNING: stopped searching binary file hay after match (found \"\\0\" byte around offset 9741)
4444
";
4545
eqnice!(expected, cmd.stdout());
4646
});
@@ -53,7 +53,7 @@ rgtest!(after_match1_explicit, |dir: Dir, mut cmd: TestCommand| {
5353

5454
let expected = "\
5555
1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
56-
Binary file matches (found \"\\u{0}\" byte around offset 9741)
56+
Binary file matches (found \"\\0\" byte around offset 9741)
5757
";
5858
eqnice!(expected, cmd.stdout());
5959
});
@@ -64,7 +64,7 @@ rgtest!(after_match1_stdin, |_: Dir, mut cmd: TestCommand| {
6464

6565
let expected = "\
6666
1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
67-
Binary file matches (found \"\\u{0}\" byte around offset 9741)
67+
Binary file matches (found \"\\0\" byte around offset 9741)
6868
";
6969
eqnice!(expected, cmd.pipe(HAY));
7070
});
@@ -85,7 +85,7 @@ rgtest!(after_match1_implicit_binary, |dir: Dir, mut cmd: TestCommand| {
8585

8686
let expected = "\
8787
hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
88-
Binary file hay matches (found \"\\u{0}\" byte around offset 9741)
88+
Binary file hay matches (found \"\\0\" byte around offset 9741)
8989
";
9090
eqnice!(expected, cmd.stdout());
9191
});
@@ -200,7 +200,7 @@ rgtest!(after_match2_implicit, |dir: Dir, mut cmd: TestCommand| {
200200

201201
let expected = "\
202202
hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
203-
WARNING: stopped searching binary file hay after match (found \"\\u{0}\" byte around offset 9741)
203+
WARNING: stopped searching binary file hay after match (found \"\\0\" byte around offset 9741)
204204
";
205205
eqnice!(expected, cmd.stdout());
206206
});
@@ -240,7 +240,7 @@ rgtest!(before_match1_explicit, |dir: Dir, mut cmd: TestCommand| {
240240
cmd.args(&["--no-mmap", "-n", "Heaven", "hay"]);
241241

242242
let expected = "\
243-
Binary file matches (found \"\\u{0}\" byte around offset 9741)
243+
Binary file matches (found \"\\0\" byte around offset 9741)
244244
";
245245
eqnice!(expected, cmd.stdout());
246246
});
@@ -253,7 +253,7 @@ rgtest!(before_match1_implicit_binary, |dir: Dir, mut cmd: TestCommand| {
253253
cmd.args(&["--no-mmap", "-n", "--binary", "Heaven", "-g", "hay"]);
254254

255255
let expected = "\
256-
Binary file hay matches (found \"\\u{0}\" byte around offset 9741)
256+
Binary file hay matches (found \"\\0\" byte around offset 9741)
257257
";
258258
eqnice!(expected, cmd.stdout());
259259
});
@@ -288,7 +288,7 @@ rgtest!(before_match2_explicit, |dir: Dir, mut cmd: TestCommand| {
288288
cmd.args(&["--no-mmap", "-n", "a medical student", "hay"]);
289289

290290
let expected = "\
291-
Binary file matches (found \"\\u{0}\" byte around offset 9741)
291+
Binary file matches (found \"\\0\" byte around offset 9741)
292292
";
293293
eqnice!(expected, cmd.stdout());
294294
});

tests/misc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ rgtest!(unrestricted3, |dir: Dir, mut cmd: TestCommand| {
788788
cmd.arg("-uuu").arg("foo");
789789

790790
let expected = "\
791-
Binary file hay matches (found \"\\u{0}\" byte around offset 3)
791+
Binary file hay matches (found \"\\0\" byte around offset 3)
792792
";
793793
eqnice!(expected, cmd.stdout());
794794
});
@@ -1001,7 +1001,7 @@ rgtest!(binary_convert, |dir: Dir, mut cmd: TestCommand| {
10011001
cmd.arg("--no-mmap").arg("foo").arg("file");
10021002

10031003
let expected = "\
1004-
Binary file matches (found \"\\u{0}\" byte around offset 3)
1004+
Binary file matches (found \"\\0\" byte around offset 3)
10051005
";
10061006
eqnice!(expected, cmd.stdout());
10071007
});
@@ -1011,7 +1011,7 @@ rgtest!(binary_convert_mmap, |dir: Dir, mut cmd: TestCommand| {
10111011
cmd.arg("--mmap").arg("foo").arg("file");
10121012

10131013
let expected = "\
1014-
Binary file matches (found \"\\u{0}\" byte around offset 3)
1014+
Binary file matches (found \"\\0\" byte around offset 3)
10151015
";
10161016
eqnice!(expected, cmd.stdout());
10171017
});

0 commit comments

Comments
 (0)