From 601e3dac6cd71bf657c04fceb868540031e6db95 Mon Sep 17 00:00:00 2001
From: Seiichi Uchida <seuchida@gmail.com>
Date: Thu, 10 Aug 2017 09:17:03 +0900
Subject: [PATCH] Add reset_err_count() to errors::Handler

The motivation here is to allow rustfmt to recover from parse errors
after failing to parse macros.
---
 src/librustc_errors/lib.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
index 159d2c7a2df1c..62b1944e9cbd5 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -303,6 +303,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, "")
     }