diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2012-06-06 19:00:34 -0700 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2012-06-06 19:00:34 -0700 |
| commit | 3b4cfdeee20eb54d43612fed461729ffa6f6d2ec (patch) | |
| tree | 0b41c070f1ce581842585fa307baec946af0e244 /src/libsyntax | |
| parent | 9c1910a66db95468608c9cc02a5012e3db7f4e09 (diff) | |
| parent | d542e67827e0ad1a3df5fd248d9c09997b5dcbba (diff) | |
| download | rust-3b4cfdeee20eb54d43612fed461729ffa6f6d2ec.tar.gz rust-3b4cfdeee20eb54d43612fed461729ffa6f6d2ec.zip | |
Merge remote-tracking branch 'mozilla/incoming'
Conflicts: src/rustc/middle/tstate/auxiliary.rs
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/diagnostic.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs index 6d54615e827..f58333c5599 100644 --- a/src/libsyntax/diagnostic.rs +++ b/src/libsyntax/diagnostic.rs @@ -86,11 +86,14 @@ impl codemap_handler of handler for handler_t { } fn has_errors() -> bool { self.err_count > 0u } fn abort_if_errors() { - if self.err_count > 0u { - let s = #fmt["aborting due to %u previous errors", - self.err_count]; - self.fatal(s); + let s; + alt self.err_count { + 0u { ret; } + 1u { s = "aborting due to previous error"; } + _ { s = #fmt["aborting due to %u previous errors", + self.err_count]; } } + self.fatal(s); } fn warn(msg: str) { self.emit(none, msg, warning); |