diff options
| author | bors <bors@rust-lang.org> | 2022-02-07 15:32:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-07 15:32:19 +0000 |
| commit | f52c31840df7ec9c9350baff51a8964b20b5e1ba (patch) | |
| tree | a7ea66705f0f42dc17756f1a63b91f3faa2a5139 /library/test/src/formatters/json.rs | |
| parent | c5e414843ebfe25674d8e18a5369d6249fdee741 (diff) | |
| parent | a6c48108ad2a5bbfb161818a047e4497dde0afea (diff) | |
| download | rust-f52c31840df7ec9c9350baff51a8964b20b5e1ba.tar.gz rust-f52c31840df7ec9c9350baff51a8964b20b5e1ba.zip | |
Auto merge of #93738 - m-ou-se:rollup-zjyd2et, r=m-ou-se
Rollup of 13 pull requests
Successful merges:
- #88313 (Make the pre-commit script pre-push instead)
- #91530 (Suggest 1-tuple parentheses on exprs without existing parens)
- #92724 (Cleanup c_str.rs)
- #93208 (Impl {Add,Sub,Mul,Div,Rem,BitXor,BitOr,BitAnd}Assign<$t> for Wrapping<$t> for rust 1.60.0)
- #93394 (Don't allow {} to refer to implicit captures in format_args.)
- #93416 (remove `allow_fail` test flag)
- #93487 (Fix linking stage1 toolchain in `./x.py setup`)
- #93673 (Linkify sidebar headings for sibling items)
- #93680 (Drop json::from_reader)
- #93682 (Update tracking issue for `const_fn_trait_bound`)
- #93722 (Use shallow clones for submodules managed by rustbuild, not just bootstrap.py)
- #93723 (Rerun bootstrap's build script when RUSTC changes)
- #93737 (bootstrap: prefer using '--config' over 'RUST_BOOTSTRAP_CONFIG')
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/test/src/formatters/json.rs')
| -rw-r--r-- | library/test/src/formatters/json.rs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/library/test/src/formatters/json.rs b/library/test/src/formatters/json.rs index 424d3ef7b41..c089bfc4791 100644 --- a/library/test/src/formatters/json.rs +++ b/library/test/src/formatters/json.rs @@ -124,15 +124,6 @@ impl<T: Write> OutputFormatter for JsonFormatter<T> { self.write_event("test", desc.name.as_slice(), "ignored", exec_time, stdout, None) } - TestResult::TrAllowedFail => self.write_event( - "test", - desc.name.as_slice(), - "allowed_failure", - exec_time, - stdout, - None, - ), - TestResult::TrBench(ref bs) => { let median = bs.ns_iter_summ.median as usize; let deviation = (bs.ns_iter_summ.max - bs.ns_iter_summ.min) as usize; @@ -172,14 +163,12 @@ impl<T: Write> OutputFormatter for JsonFormatter<T> { \"event\": \"{}\", \ \"passed\": {}, \ \"failed\": {}, \ - \"allowed_fail\": {}, \ \"ignored\": {}, \ \"measured\": {}, \ \"filtered_out\": {}", if state.failed == 0 { "ok" } else { "failed" }, state.passed, - state.failed + state.allowed_fail, - state.allowed_fail, + state.failed, state.ignored, state.measured, state.filtered_out, |