From ddd3e3c4e016677613fe04d5ef3995f362f4a93d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 25 Feb 2022 12:05:59 -0500
Subject: [PATCH] rustup

---
 rust-version       | 2 +-
 src/diagnostics.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust-version b/rust-version
index 903f326d3fb..ab902204cd3 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-3d127e2040b57157936f5f24e114a8b4c9a505ef
+d4de1f230ca30b7ce08fbf453daebf8b2e7ffcc9
diff --git a/src/diagnostics.rs b/src/diagnostics.rs
index 71814806074..d651aabb86c 100644
--- a/src/diagnostics.rs
+++ b/src/diagnostics.rs
@@ -254,7 +254,7 @@ fn report_msg<'tcx>(
 ) {
     let span = stacktrace.first().map_or(DUMMY_SP, |fi| fi.span);
     let mut err = match diag_level {
-        DiagLevel::Error => tcx.sess.struct_span_err(span, title),
+        DiagLevel::Error => tcx.sess.struct_span_err(span, title).forget_guarantee(),
         DiagLevel::Warning => tcx.sess.struct_span_warn(span, title),
         DiagLevel::Note => tcx.sess.diagnostic().span_note_diag(span, title),
     };