dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #41942 - tommyip:master, r=Mark-Simulacrum 

Fix unexpected panic with the -Z treat-err-as-bug option

This fix an issue where the compiler panics even if there is no error when passed with the `-Z treat-err-as-bug` option.

Fixes #35886.

r? @Mark-Simulacrum
This commit is contained in:
Mark Simulacrum 2017-05-12 18:57:37 -06:00 committed by GitHub
parent 6e29059c3e 7a03b4c75a
commit c17811cce3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_errors/diagnostic_builder.rs
View File

@ -99,7 +99,10 @@ impl<'a> DiagnosticBuilder<'a> {
self.handler.emitter.borrow_mut().emit(&self);
self.cancel();
self.handler.panic_if_treat_err_as_bug();
if self.level == Level::Error {
self.handler.panic_if_treat_err_as_bug();
}
// if self.is_fatal() {
// panic!(FatalError);