summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2020-11-02 10:06:13 -0500
committerAndrew Gallant <jamslam@gmail.com>2020-11-02 10:52:51 -0500
commita28bb1e9531c238e730150c454585ed0d5ebcdb5 (patch)
treea9eff05d6f9b7e534b10ba4a1da04292fc910952 /tests
parent3ef63dacbed48e9c569722059922f37964a9494e (diff)
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/binary.rs16
-rw-r--r--tests/misc.rs6
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/binary.rs b/tests/binary.rs
index b16dcf9d..89914165 100644
--- a/tests/binary.rs
+++ b/tests/binary.rs
@@ -40,7 +40,7 @@ rgtest!(after_match1_implicit, |dir: Dir, mut cmd: TestCommand| {
let expected = "\
hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
-WARNING: stopped searching binary file hay after match (found \"\\u{0}\" byte around offset 9741)
+WARNING: stopped searching binary file hay after match (found \"\\0\" byte around offset 9741)
";
eqnice!(expected, cmd.stdout());
});
@@ -53,7 +53,7 @@ rgtest!(after_match1_explicit, |dir: Dir, mut cmd: TestCommand| {
let expected = "\
1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
-Binary file matches (found \"\\u{0}\" byte around offset 9741)
+Binary file matches (found \"\\0\" byte around offset 9741)
";
eqnice!(expected, cmd.stdout());
});
@@ -64,7 +64,7 @@ rgtest!(after_match1_stdin, |_: Dir, mut cmd: TestCommand| {
let expected = "\
1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
-Binary file matches (found \"\\u{0}\" byte around offset 9741)
+Binary file matches (found \"\\0\" byte around offset 9741)
";
eqnice!(expected, cmd.pipe(HAY));
});
@@ -85,7 +85,7 @@ rgtest!(after_match1_implicit_binary, |dir: Dir, mut cmd: TestCommand| {
let expected = "\
hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
-Binary file hay matches (found \"\\u{0}\" byte around offset 9741)
+Binary file hay matches (found \"\\0\" byte around offset 9741)
";
eqnice!(expected, cmd.stdout());
});
@@ -200,7 +200,7 @@ rgtest!(after_match2_implicit, |dir: Dir, mut cmd: TestCommand| {
let expected = "\
hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle
-WARNING: stopped searching binary file hay after match (found \"\\u{0}\" byte around offset 9741)
+WARNING: stopped searching binary file hay after match (found \"\\0\" byte around offset 9741)
";
eqnice!(expected, cmd.stdout());
});
@@ -240,7 +240,7 @@ rgtest!(before_match1_explicit, |dir: Dir, mut cmd: TestCommand| {
cmd.args(&["--no-mmap", "-n", "Heaven", "hay"]);
let expected = "\
-Binary file matches (found \"\\u{0}\" byte around offset 9741)
+Binary file matches (found \"\\0\" byte around offset 9741)
";
eqnice!(expected, cmd.stdout());
});
@@ -253,7 +253,7 @@ rgtest!(before_match1_implicit_binary, |dir: Dir, mut cmd: TestCommand| {
cmd.args(&["--no-mmap", "-n", "--binary", "Heaven", "-g", "hay"]);
let expected = "\
-Binary file hay matches (found \"\\u{0}\" byte around offset 9741)
+Binary file hay matches (found \"\\0\" byte around offset 9741)
";
eqnice!(expected, cmd.stdout());
});
@@ -288,7 +288,7 @@ rgtest!(before_match2_explicit, |dir: Dir, mut cmd: TestCommand| {
cmd.args(&["--no-mmap", "-n", "a medical student", "hay"]);
let expected = "\
-Binary file matches (found \"\\u{0}\" byte around offset 9741)
+Binary file matches (found \"\\0\" byte around offset 9741)
";
eqnice!(expected, cmd.stdout());
});
diff --git a/tests/misc.rs b/tests/misc.rs
index 9ec1107e..a61be0b5 100644
--- a/tests/misc.rs
+++ b/tests/misc.rs
@@ -788,7 +788,7 @@ rgtest!(unrestricted3, |dir: Dir, mut cmd: TestCommand| {
cmd.arg("-uuu").arg("foo");
let expected = "\
-Binary file hay matches (found \"\\u{0}\" byte around offset 3)
+Binary file hay matches (found \"\\0\" byte around offset 3)
";
eqnice!(expected, cmd.stdout());
});
@@ -1001,7 +1001,7 @@ rgtest!(binary_convert, |dir: Dir, mut cmd: TestCommand| {
cmd.arg("--no-mmap").arg("foo").arg("file");
let expected = "\
-Binary file matches (found \"\\u{0}\" byte around offset 3)
+Binary file matches (found \"\\0\" byte around offset 3)
";
eqnice!(expected, cmd.stdout());
});
@@ -1011,7 +1011,7 @@ rgtest!(binary_convert_mmap, |dir: Dir, mut cmd: TestCommand| {
cmd.arg("--mmap").arg("foo").arg("file");
let expected = "\
-Binary file matches (found \"\\u{0}\" byte around offset 3)
+Binary file matches (found \"\\0\" byte around offset 3)
";
eqnice!(expected, cmd.stdout());
});