From: Esteban Küber <esteban@kuber.com.ar>
Date: Thu, 7 Mar 2019 16:09:41 +0000 (-0800)
Subject: fix bad logic
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a7563a30c0576761a0770b196e9effbaaf846be8;p=rust.git

fix bad logic
---

diff --git a/src/librustc_errors/diagnostic_builder.rs b/src/librustc_errors/diagnostic_builder.rs
index a995d808bc4..c8d47339fb3 100644
--- a/src/librustc_errors/diagnostic_builder.rs
+++ b/src/librustc_errors/diagnostic_builder.rs
@@ -103,7 +103,9 @@ pub fn emit(&mut self) {
     /// Buffers the diagnostic for later emission, unless handler
     /// has disabled such buffering.
     pub fn buffer(mut self, buffered_diagnostics: &mut Vec<Diagnostic>) {
-        if self.handler.flags.dont_buffer_diagnostics || self.handler.treat_err_as_bug() {
+        if self.handler.flags.dont_buffer_diagnostics ||
+            self.handler.flags.treat_err_as_bug.is_some()
+        {
             self.emit();
             return;
         }
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
index 3992d2908c7..7c7698ddd3d 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -657,8 +657,7 @@ pub fn print_error_count(&self) {
             1 => "aborting due to previous error".to_string(),
             _ => format!("aborting due to {} previous errors", self.err_count())
         };
-        let err_as_bug = self.flags.treat_err_as_bug.unwrap_or(0);
-        if self.err_count() >= err_as_bug {
+        if self.treat_err_as_bug() {
             return;
         }