Skip to content
Permalink
Browse files

Address review comments + Fix rebase

  • Loading branch information
petrochenkov committed Jan 3, 2020
1 parent 6bd6a20 commit 5bf810599306fd880b0946ecb3e1ec37ca72762f
Showing with 4 additions and 3 deletions.
  1. +2 −1 src/librustc_errors/lib.rs
  2. +2 −2 src/librustdoc/core.rs
@@ -746,7 +746,8 @@ impl HandlerInner {
!this.emitted_diagnostics.insert(diagnostic_hash)
};

// Only emit the diagnostic if we haven't already emitted an equivalent one.
// Only emit the diagnostic if we've been asked to deduplicate and
// haven't already emitted an equivalent diagnostic.
if !(self.flags.deduplicate_diagnostics && already_emitted(self)) {
self.emitter.emit_diagnostic(diagnostic);
if diagnostic.is_error() {
@@ -184,7 +184,7 @@ pub fn new_handler(
debugging_opts.terminal_width,
false,
)
.ui_testing(debugging_opts.ui_testing),
.ui_testing(debugging_opts.ui_testing()),
)
}
ErrorOutputType::Json { pretty, json_rendered } => {
@@ -193,7 +193,7 @@ pub fn new_handler(
});
Box::new(
JsonEmitter::stderr(None, source_map, pretty, json_rendered, false)
.ui_testing(debugging_opts.ui_testing),
.ui_testing(debugging_opts.ui_testing()),
)
}
};

0 comments on commit 5bf8105

Please sign in to comment.
You can’t perform that action at this time.