Remove has_errors_or_span_delayed_bugs.

There are four closely related methods tracking the existence of certain
kinds of methods:
- `has_errors`: errors
- `has_errors_or_lint_errors`: errors + lint errors
- `has_errors_or_span_delayed_bugs`: errors + span_delayed_bugs
- `is_compilation_going_to_fail`: errors + lint errors + span_delayed_bugs

The third one is pretty weird. There's no obvious reason why you'd want
that particular combination, and all the code relating to error count is
very messy in general. So this commit just removes it. Most uses are
replaced with `is_compilation_going_to_fail`, but one is replaced with
`has_errors_or_lint_errors`. These seemed most appropriate to me, though
it's hard to say for sure due to the aforementioned messiness.

Author: nnethercote

compiler/rustc_errors/src/lib.rs

@@ -955,16 +955,6 @@ impl DiagCtxt {
         })
     }
 
-    pub fn has_errors_or_span_delayed_bugs(&self) -> Option<ErrorGuaranteed> {
-        let inner = self.inner.borrow();
-        let has_errors_or_span_delayed_bugs =
-            inner.has_errors() || !inner.span_delayed_bugs.is_empty();
-        has_errors_or_span_delayed_bugs.then(|| {
-            #[allow(deprecated)]
-            ErrorGuaranteed::unchecked_claim_error_was_emitted()
-        })
-    }
-
     pub fn is_compilation_going_to_fail(&self) -> Option<ErrorGuaranteed> {
         let inner = self.inner.borrow();
         let will_fail =

compiler/rustc_incremental/src/persist/fs.rs

@@ -312,7 +312,7 @@ pub fn finalize_session_directory(sess: &Session, svh: Option<Svh>) {
 
     let incr_comp_session_dir: PathBuf = sess.incr_comp_session_dir().clone();
 
-    if let Some(_) = sess.dcx().has_errors_or_span_delayed_bugs() {
+    if let Some(_) = sess.dcx().is_compilation_going_to_fail() {
         // If there have been any errors during compilation, we don't want to
         // publish this session directory. Rather, we'll just delete it.
 

compiler/rustc_incremental/src/persist/save.rs

@@ -32,7 +32,7 @@ pub fn save_dep_graph(tcx: TyCtxt<'_>) {
             return;
         }
         // This is going to be deleted in finalize_session_directory, so let's not create it
-        if let Some(_) = sess.dcx().has_errors_or_span_delayed_bugs() {
+        if let Some(_) = sess.dcx().is_compilation_going_to_fail() {
             return;
         }
 
@@ -87,7 +87,7 @@ pub fn save_work_product_index(
         return;
     }
     // This is going to be deleted in finalize_session_directory, so let's not create it
-    if let Some(_) = sess.dcx().has_errors_or_span_delayed_bugs() {
+    if let Some(_) = sess.dcx().is_compilation_going_to_fail() {
         return;
     }
 

compiler/rustc_infer/src/infer/error_reporting/mod.rs

@@ -133,7 +133,7 @@ pub struct TypeErrCtxt<'a, 'tcx> {
 
 impl Drop for TypeErrCtxt<'_, '_> {
     fn drop(&mut self) {
-        if let Some(_) = self.dcx().has_errors_or_span_delayed_bugs() {
+        if let Some(_) = self.dcx().has_errors_or_lint_errors() {
             // ok, emitted an error.
         } else {
             self.infcx

compiler/rustc_query_system/src/dep_graph/graph.rs

@@ -818,7 +818,7 @@ impl<D: Deps> DepGraphData<D> {
             None => {}
         }
 
-        if let None = qcx.dep_context().sess().dcx().has_errors_or_span_delayed_bugs() {
+        if let None = qcx.dep_context().sess().dcx().is_compilation_going_to_fail() {
             panic!("try_mark_previous_green() - Forcing the DepNode should have set its color")
         }