squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge pull request #3466 from topecongiro/discard-error-to-sink

Browse source 
Discard error report in silent_emitter
This commit is contained in:
Seiichi Uchida 2019-03-25 07:24:42 +09:00 committed by GitHub
commit 9b4344161b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/formatting.rs
View file

@ -7,7 +7,7 @@ use std::rc::Rc;
use std::time::{Duration, Instant};
use syntax::ast;
use syntax::errors::emitter::{ColorConfig, EmitterWriter};
use syntax::errors::emitter::{ColorConfig, Emitter};
use syntax::errors::{DiagnosticBuilder, Handler};
use syntax::parse::{self, ParseSess};
use syntax::source_map::{FilePathMapping, SourceMap, Span, DUMMY_SP};
@ -90,7 +90,7 @@ fn format_project<T: FormatHandler>(
timer = timer.done_parsing();
// Suppress error output if we have to do any further parsing.
let silent_emitter = silent_emitter(source_map);
let silent_emitter = silent_emitter();
parse_session.span_diagnostic = Handler::with_emitter(true, None, silent_emitter);
let mut context = FormatContext::new(&krate, report, parse_session, config, handler);
@ -672,18 +672,20 @@ fn parse_crate(
Err(ErrorKind::ParseError)
}
fn silent_emitter(source_map: Rc<SourceMap>) -> Box<EmitterWriter> {
Box::new(EmitterWriter::new(
Box::new(Vec::new()),
Some(source_map),
false,
false,
))
/// Emitter which discards every error.
struct SilentEmitter;
impl Emitter for SilentEmitter {
fn emit(&mut self, _db: &DiagnosticBuilder<'_>) {}
}
fn silent_emitter() -> Box<SilentEmitter> {
Box::new(SilentEmitter {})
}
fn make_parse_sess(source_map: Rc<SourceMap>, config: &Config) -> ParseSess {
let tty_handler = if config.hide_parse_errors() {
let silent_emitter = silent_emitter(source_map.clone());
let silent_emitter = silent_emitter();
Handler::with_emitter(true, None, silent_emitter)
} else {
let supports_color = term::stderr().map_or(false, |term| term.supports_color());