Skip to content

Commit

Permalink
Auto merge of #59990 - bjorn3:nicer_compiletest_errors, r=alexcrichton
Browse files Browse the repository at this point in the history
Use resume_unwind instead of panic!() for nicer compiletest errors

cc rust-lang/rust#58783 (comment)
  • Loading branch information
bors committed Apr 16, 2019
2 parents 4a2c111 + 74653f2 commit c49a974
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3466,7 +3466,9 @@ impl ProcRes {
\n",
self.status, self.cmdline, self.stdout, self.stderr
);
panic!();
// Use resume_unwind instead of panic!() to prevent a panic message + backtrace from
// compiletest, which is unnecessary noise.
std::panic::resume_unwind(Box::new(()));
}
}

Expand Down

0 comments on commit c49a974

Please sign in to comment.