diff options
| author | bors <bors@rust-lang.org> | 2016-01-26 13:26:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-26 13:26:08 +0000 |
| commit | 5d6e8fcedac1184a28031ee0cf63e2d862e4536f (patch) | |
| tree | 73ca828212a1d995b4cab760b207964f9c6e8231 /src/libsyntax/errors | |
| parent | 43c1a173a874f5513db58b2f5321489a00087484 (diff) | |
| parent | b6faae11f46b18221555759d3e6fad12cbd0ee97 (diff) | |
| download | rust-5d6e8fcedac1184a28031ee0cf63e2d862e4536f.tar.gz rust-5d6e8fcedac1184a28031ee0cf63e2d862e4536f.zip | |
Auto merge of #31214 - Manishearth:rollup, r=Manishearth
- Successful merges: #31172, #31177, #31211 - Failed merges:
Diffstat (limited to 'src/libsyntax/errors')
| -rw-r--r-- | src/libsyntax/errors/emitter.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/errors/emitter.rs b/src/libsyntax/errors/emitter.rs index c21bf1e6a1f..51013d68930 100644 --- a/src/libsyntax/errors/emitter.rs +++ b/src/libsyntax/errors/emitter.rs @@ -10,7 +10,7 @@ use self::Destination::*; -use codemap::{self, COMMAND_LINE_SP, COMMAND_LINE_EXPN, Pos, Span}; +use codemap::{self, COMMAND_LINE_SP, COMMAND_LINE_EXPN, DUMMY_SP, Pos, Span}; use diagnostics; use errors::{Level, RenderSpan, DiagnosticBuilder}; @@ -109,8 +109,8 @@ impl Emitter for EmitterWriter { lvl: Level) { let error = match sp { Some(COMMAND_LINE_SP) => self.emit_(FileLine(COMMAND_LINE_SP), msg, code, lvl), + Some(DUMMY_SP) | None => print_diagnostic(&mut self.dst, "", lvl, msg, code), Some(sp) => self.emit_(FullSpan(sp), msg, code, lvl), - None => print_diagnostic(&mut self.dst, "", lvl, msg, code), }; if let Err(e) = error { |