From 0a58b26e8a296a4f03d55ae0469ce4da9a6080a6 Mon Sep 17 00:00:00 2001
From: nidnogg <henriquevt98@gmail.com>
Date: Sun, 21 Aug 2022 13:08:14 -0300
Subject: Hotfix ftl err name, added check for err.code in create_feature_err

---
 compiler/rustc_session/src/session.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'compiler/rustc_session')

diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
index 743b9f429e2..edb187ec3f7 100644
--- a/compiler/rustc_session/src/session.rs
+++ b/compiler/rustc_session/src/session.rs
@@ -467,7 +467,9 @@ impl Session {
         feature: Symbol,
     ) -> DiagnosticBuilder<'a, ErrorGuaranteed> {
         let mut err = self.parse_sess.create_err(err);
-        err.code = std::option::Option::Some(error_code!(E0658));
+        if err.code.is_none() {
+            err.code = std::option::Option::Some(error_code!(E0658));
+        }
         add_feature_diagnostics(&mut err, &self.parse_sess, feature);
         err
     }
-- 
cgit 1.4.1-3-g733a5