development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-25 10:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove with_either_contains.

Browse source 
It isn't needed anymore, and I would prefer to not keep around unused code.
It can always be added back if ever needed again.
This commit is contained in:
Eric Huss 2021-06-15 17:48:05 -07:00
parent e132bb53ab
commit 6dff99781d
2 changed files with 4 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/cargo-test-support/src/lib.rs
View file

@ -475,7 +475,6 @@ pub struct Execs {
expect_exit_code: Option<i32>,
expect_stdout_contains: Vec<String>,
expect_stderr_contains: Vec<String>,
expect_either_contains: Vec<String>,
expect_stdout_contains_n: Vec<(String, usize)>,
expect_stdout_not_contains: Vec<String>,
expect_stderr_not_contains: Vec<String>,
@ -540,15 +539,6 @@ impl Execs {
self
}
/// Verifies that either stdout or stderr contains the given contiguous
/// lines somewhere in its output.
///
/// See [`compare`] for supported patterns.
pub fn with_either_contains<S: ToString>(&mut self, expected: S) -> &mut Self {
self.expect_either_contains.push(expected.to_string());
self
}
/// Verifies that stdout contains the given contiguous lines somewhere in
/// its output, and should be repeated `number` times.
///
@ -806,7 +796,6 @@ impl Execs {
&& self.expect_stderr.is_none()
&& self.expect_stdout_contains.is_empty()
&& self.expect_stderr_contains.is_empty()
&& self.expect_either_contains.is_empty()
&& self.expect_stdout_contains_n.is_empty()
&& self.expect_stdout_not_contains.is_empty()
&& self.expect_stderr_not_contains.is_empty()
@ -917,23 +906,6 @@ impl Execs {
for expect in self.expect_stderr_unordered.iter() {
compare::match_unordered(expect, stderr, cwd)?;
}
for expect in self.expect_either_contains.iter() {
let match_std = compare::match_contains(expect, stdout, cwd);
let match_err = compare::match_contains(expect, stderr, cwd);
if let (Err(_), Err(_)) = (match_std, match_err) {
bail!(
"expected to find:\n\
{}\n\n\
did not find in either output.
--- stdout\n{}\n
--- stderr\n{}\n",
expect,
stdout,
stderr,
);
}
}
for (with, without) in self.expect_stderr_with_without.iter() {
compare::match_with_without(stderr, with, without, cwd)?;
}
@ -967,7 +939,6 @@ pub fn execs() -> Execs {
expect_exit_code: Some(0),
expect_stdout_contains: Vec::new(),
expect_stderr_contains: Vec::new(),
expect_either_contains: Vec::new(),
expect_stdout_contains_n: Vec::new(),
expect_stdout_not_contains: Vec::new(),
expect_stderr_not_contains: Vec::new(),

8
tests/testsuite/bench.rs
View file

@ -346,12 +346,12 @@ fn cargo_bench_failing_test() {
[FINISHED] bench [optimized] target(s) in [..]
[RUNNING] [..] (target/release/deps/foo-[..][EXE])",
)
.with_either_contains(
.with_stdout_contains(
"[..]thread '[..]' panicked at 'assertion failed: `(left == right)`[..]",
)
.with_either_contains("[..]left: `\"hello\"`[..]")
.with_either_contains("[..]right: `\"nope\"`[..]")
.with_either_contains("[..]src/main.rs:15[..]")
.with_stdout_contains("[..]left: `\"hello\"`[..]")
.with_stdout_contains("[..]right: `\"nope\"`[..]")
.with_stdout_contains("[..]src/main.rs:15[..]")
.with_status(101)
.run();
}