Skip to content

Commit

Permalink
Rollup merge of rust-lang#43778 - topecongiro:handler-reset-err-count…
Browse files Browse the repository at this point in the history
…, r=arielb1

Add reset_err_count() to errors::Handler

The motivation here is to allow rustfmt to recover from parse errors after failing to parse macros (cc rust-lang/rustfmt#1742).
r? @nrc
  • Loading branch information
Ariel Ben-Yehuda authored Aug 29, 2017
2 parents f2d7045 + 601e3da commit 0f2bbed
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/librustc_errors/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@ impl Handler {
self.continue_after_error.set(continue_after_error);
}

// NOTE: DO NOT call this function from rustc, as it relies on `err_count` being non-zero
// if an error happened to avoid ICEs. This function should only be called from tools.
pub fn reset_err_count(&self) {
self.err_count.set(0);
}

pub fn struct_dummy<'a>(&'a self) -> DiagnosticBuilder<'a> {
DiagnosticBuilder::new(self, Level::Cancelled, "")
}
Expand Down

0 comments on commit 0f2bbed

Please sign in to comment.