From c1d351f6eee7f870ce5216e824709dccbdf69dff Mon Sep 17 00:00:00 2001
From: mark <markm@cs.wisc.edu>
Date: Sat, 22 Jan 2022 18:49:12 -0600
Subject: [PATCH] rustc_error: make ErrorReported impossible to construct

There are a few places were we have to construct it, though, and a few
places that are more invasive to change. To do this, we create a
constructor with a long obvious name.
---
 src/parse/macros/lazy_static.rs | 2 +-
 src/parse/macros/mod.rs         | 2 +-
 src/parse/session.rs            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/parse/macros/lazy_static.rs b/src/parse/macros/lazy_static.rs
index 4c541de04be0..a8c2feec453c 100644
--- a/src/parse/macros/lazy_static.rs
+++ b/src/parse/macros/lazy_static.rs
@@ -16,7 +16,7 @@ macro_rules! parse_or {
         ($method:ident $(,)* $($arg:expr),* $(,)*) => {
             match parser.$method($($arg,)*) {
                 Ok(val) => {
-                    if parser.sess.span_diagnostic.has_errors() {
+                    if parser.sess.span_diagnostic.has_errors().is_some() {
                         parser.sess.span_diagnostic.reset_err_count();
                         return None;
                     } else {
diff --git a/src/parse/macros/mod.rs b/src/parse/macros/mod.rs
index fd738908170f..3728f3a19b44 100644
--- a/src/parse/macros/mod.rs
+++ b/src/parse/macros/mod.rs
@@ -28,7 +28,7 @@ macro_rules! parse_macro_arg {
             let mut cloned_parser = (*parser).clone();
             match $parser(&mut cloned_parser) {
                 Ok(x) => {
-                    if parser.sess.span_diagnostic.has_errors() {
+                    if parser.sess.span_diagnostic.has_errors().is_some() {
                         parser.sess.span_diagnostic.reset_err_count();
                     } else {
                         // Parsing succeeded.
diff --git a/src/parse/session.rs b/src/parse/session.rs
index 40a6d708d8cc..a34ceed3fc91 100644
--- a/src/parse/session.rs
+++ b/src/parse/session.rs
@@ -235,7 +235,7 @@ pub(super) fn can_reset_errors(&self) -> bool {
     }
 
     pub(super) fn has_errors(&self) -> bool {
-        self.parse_sess.span_diagnostic.has_errors()
+        self.parse_sess.span_diagnostic.has_errors().is_some()
     }
 
     pub(super) fn reset_errors(&self) {