squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #92361 - vacuus:doctest-run-test-out-lines, r=CraftSpider

Browse source 
Remove `collect` in `doctest::run_test`
This commit is contained in:
bors 2022-03-25 04:01:00 +00:00
parent 661e8beec1 48438ce1ae
commit 4ce257ff19
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/librustdoc/doctest.rs
View file

@ -399,7 +399,7 @@ fn run_test(
eprint!("{}", self.0);
}
}
let mut out_lines = str::from_utf8(&output.stderr)
let mut out = str::from_utf8(&output.stderr)
.unwrap()
.lines()
.filter(|l| {
@ -410,15 +410,15 @@ fn run_test(
true
}
})
.collect::<Vec<_>>();
.intersperse_with(|| "\n")
.collect::<String>();
// Add a \n to the end to properly terminate the last line,
// but only if there was output to be printed
if !out_lines.is_empty() {
out_lines.push("");
if !out.is_empty() {
out.push('\n');
}
let out = out_lines.join("\n");
let _bomb = Bomb(&out);
match (output.status.success(), lang_string.compile_fail) {
(true, true) => {