Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #93621

Merged
merged 14 commits into from
Feb 3, 2022
Merged

Rollup of 7 pull requests #93621

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4413141
rustdoc: Fix ICE report
ehuss Dec 27, 2021
73ad8df
Deduplicate lines in long const-eval stack trace
compiler-errors Jan 12, 2022
2d7ffbb
Factor convenience functions out of main printer implementation
dtolnay Jan 21, 2022
891368f
Make rustc use `RUST_BACKTRACE=full` by default
Aaron1011 Feb 2, 2022
08be313
Use Option::then in two places
est31 Feb 2, 2022
088474a
fix: Remove extra newlines from junit output
last-partizan Feb 1, 2022
3b52cca
Correct incorrect description of preorder traversals.
JakobDegen Feb 3, 2022
9298bd8
Rollup merge of #92310 - ehuss:rustdoc-ice, r=estebank
JohnTitor Feb 3, 2022
2fe9f76
Rollup merge of #92802 - compiler-errors:deduplicate-stack-trace, r=o…
JohnTitor Feb 3, 2022
761705e
Rollup merge of #93515 - dtolnay:convenience, r=davidtwco
JohnTitor Feb 3, 2022
333d3d6
Rollup merge of #93566 - Aaron1011:rustc-backtrace, r=davidtwco
JohnTitor Feb 3, 2022
7712dfd
Rollup merge of #93589 - est31:option_then, r=cjgillot
JohnTitor Feb 3, 2022
95efb2b
Rollup merge of #93600 - last-partizan:fix-junit-formatter, r=yaahc
JohnTitor Feb 3, 2022
38adea9
Rollup merge of #93606 - JakobDegen:mischaracterized-preorder, r=oli-obk
JohnTitor Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Remove extra newlines from junit output
  • Loading branch information
@last-partizan
last-partizan committed Feb 2, 2022
commit 088474a408c19180badba6705367520daf4efc2b
3 changes: 1 addition & 2 deletions library/test/src/formatters/junit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ impl<T: Write> OutputFormatter for JunitFormatter<T> {
_shuffle_seed: Option<u64>,
) -> io::Result<()> {
// We write xml header on run start
self.out.write_all(b"\n")?;
self.write_message("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
}

Expand Down Expand Up @@ -138,7 +137,7 @@ impl<T: Write> OutputFormatter for JunitFormatter<T> {
self.write_message("</testsuite>")?;
self.write_message("</testsuites>")?;

self.out.write_all(b"\n\n")?;
self.out.write_all(b"\n")?;

Ok(state.failed == 0)
}
Expand Down