diff options
| author | bors <bors@rust-lang.org> | 2019-04-16 02:34:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-16 02:34:16 +0000 |
| commit | 7cb933a616b64303a022a97487c3d658ff4b17ed (patch) | |
| tree | 8511447ba40f597798c8658892724deef7101543 /src/tools/compiletest | |
| parent | 2975a3c4befa8ad610da2e3c5f5de351d6d70a2b (diff) | |
| parent | dc08f5519ff05a562f3ab5eda9b9b8fbc0cecfff (diff) | |
| download | rust-7cb933a616b64303a022a97487c3d658ff4b17ed.tar.gz rust-7cb933a616b64303a022a97487c3d658ff4b17ed.zip | |
Auto merge of #59990 - bjorn3:nicer_compiletest_errors, r=alexcrichton
Use resume_unwind instead of panic!() for nicer compiletest errors cc https://github.com/rust-lang/rust/pull/58783#issuecomment-477287606
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 79868a781fd..369bb3fefe5 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -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(())); } } |