user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shorten some lines so this can pass the tidy checks

Browse source
This commit is contained in:
Paul Woolcock 2017-05-25 11:36:18 -04:00
parent 60dd83ea85
commit 76d605255b
2 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/librustdoc/html/markdown.rs
View file

@ -1135,23 +1135,27 @@ mod tests {
})
}
fn v() -> Vec<String> {
Vec::new()
}
// marker | should_panic| no_run| ignore| rust | test_harness| compile_fail
// | allow_fail | error_codes
t("", false, false, false, true, false, false, false, Vec::new());
t("rust", false, false, false, true, false, false, false, Vec::new());
t("sh", false, false, false, false, false, false, false, Vec::new());
t("ignore", false, false, true, true, false, false, false, Vec::new());
t("should_panic", true, false, false, true, false, false, false, Vec::new());
t("no_run", false, true, false, true, false, false, false, Vec::new());
t("test_harness", false, false, false, true, true, false, false, Vec::new());
t("compile_fail", false, true, false, true, false, true, false, Vec::new());
t("allow_fail", false, false, false, true, false, false, true, Vec::new());
t("{.no_run .example}", false, true, false, true, false, false, false, Vec::new());
t("{.sh .should_panic}", true, false, false, false, false, false, false, Vec::new());
t("{.example .rust}", false, false, false, true, false, false, false, Vec::new());
t("{.test_harness .rust}", false, false, false, true, true, false, false, Vec::new());
t("text, no_run", false, true, false, false, false, false, false, Vec::new());
t("text,no_run", false, true, false, false, false, false, false, Vec::new());
t("", false, false, false, true, false, false, false, v());
t("rust", false, false, false, true, false, false, false, v());
t("sh", false, false, false, false, false, false, false, v());
t("ignore", false, false, true, true, false, false, false, v());
t("should_panic", true, false, false, true, false, false, false, v());
t("no_run", false, true, false, true, false, false, false, v());
t("test_harness", false, false, false, true, true, false, false, v());
t("compile_fail", false, true, false, true, false, true, false, v());
t("allow_fail", false, false, false, true, false, false, true, v());
t("{.no_run .example}", false, true, false, true, false, false, false, v());
t("{.sh .should_panic}", true, false, false, false, false, false, false, v());
t("{.example .rust}", false, false, false, true, false, false, false, v());
t("{.test_harness .rust}", false, false, false, true, true, false, false, v());
t("text, no_run", false, true, false, false, false, false, false, v());
t("text,no_run", false, true, false, false, false, false, false, v());
}
#[test]

18
src/libtest/lib.rs
View file

@ -771,7 +771,8 @@ impl<T: Write> ConsoleTestState<T> {
}
pub fn write_run_finish(&mut self) -> io::Result<bool> {
assert!(self.passed + self.failed + self.ignored + self.measured + self.allowed_fail == self.total);
assert!(self.passed + self.failed + self.ignored + self.measured +
self.allowed_fail == self.total);
if self.options.display_output {
self.write_outputs()?;
@ -788,13 +789,14 @@ impl<T: Write> ConsoleTestState<T> {
} else {
self.write_pretty("FAILED", term::color::RED)?;
}
let s = format!(". {} passed; {} failed; {} allowed to fail; {} ignored; {} measured; {} filtered out\n\n",
self.passed,
self.failed,
self.allowed_fail,
self.ignored,
self.measured,
self.filtered_out);
let s = format!(
". {} passed; {} failed ({} allowed); {} ignored; {} measured; {} filtered out\n\n",
self.passed,
self.failed,
self.allowed_fail,
self.ignored,
self.measured,
self.filtered_out);
self.write_plain(&s)?;
return Ok(success);
}