about summary refs log tree commit diff
diff options
context:
space:
mode:
authoryukang <moorekang@gmail.com>2022-11-04 10:02:54 +0800
committeryukang <moorekang@gmail.com>2022-11-08 11:17:57 +0800
commit465ac26405d32cc1dd73460fa465c9303f40ea43 (patch)
treef3601b16361ebe246579c13d80b97713f4bd8e93
parent1f21b96dce9c4165bcfae364b4e100953dd8167b (diff)
downloadrust-465ac26405d32cc1dd73460fa465c9303f40ea43.tar.gz
rust-465ac26405d32cc1dd73460fa465c9303f40ea43.zip
deprecate unchecked_claim_error_was_emitted in error_reported
-rw-r--r--compiler/rustc_middle/src/ty/visit.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/rustc_middle/src/ty/visit.rs b/compiler/rustc_middle/src/ty/visit.rs
index f0e9f990a81..5e366ef703f 100644
--- a/compiler/rustc_middle/src/ty/visit.rs
+++ b/compiler/rustc_middle/src/ty/visit.rs
@@ -97,7 +97,11 @@ pub trait TypeVisitable<'tcx>: fmt::Debug + Clone {
     }
     fn error_reported(&self) -> Result<(), ErrorGuaranteed> {
         if self.references_error() {
-            Err(ErrorGuaranteed::unchecked_claim_error_was_emitted())
+            if let Some(reported) = ty::tls::with(|tcx| tcx.sess.has_errors()) {
+                Err(reported)
+            } else {
+                bug!("expect tcx.sess.has_errors return true");
+            }
         } else {
             Ok(())
         }