borrowck_errors.rs init

Author: AndyJado

compiler/rustc_borrowck/src/borrowck_errors.rs

@@ -1,9 +1,14 @@
+#![deny(rustc::untranslatable_diagnostic)]
+#![deny(rustc::diagnostic_outside_of_impl)]
+
 use rustc_errors::{
     struct_span_err, DiagnosticBuilder, DiagnosticId, DiagnosticMessage, ErrorGuaranteed, MultiSpan,
 };
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_span::Span;
 
+use crate::session_diagnostics::{TemporaryDroppedErr, ThreadLocalOutliveErr};
+
 impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
     pub(crate) fn cannot_move_when_borrowed(
         &self,
@@ -450,14 +455,14 @@ impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
         &self,
         span: Span,
     ) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
-        struct_span_err!(self, span, E0712, "thread-local variable borrowed past end of function",)
+        self.infcx.tcx.sess.create_err(ThreadLocalOutliveErr { span })
     }
 
     pub(crate) fn temporary_value_borrowed_for_too_long(
         &self,
         span: Span,
     ) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
-        struct_span_err!(self, span, E0716, "temporary value dropped while borrowed",)
+        self.infcx.tcx.sess.create_err(TemporaryDroppedErr { span })
     }
 
     #[rustc_lint_diagnostics]

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -589,3 +589,17 @@ pub(crate) enum DefiningTypeNote<'a> {
     #[note(borrowck::define_inline_constant_type)]
     InlineConst { type_name: &'a str },
 }
+
+#[derive(SessionDiagnostic)]
+#[diag(borrowck::borrowed_temporary_value_dropped, code = "E0716")]
+pub(crate) struct TemporaryDroppedErr {
+    #[primary_span]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[diag(borrowck::thread_local_outlive_function, code = "E0712")]
+pub(crate) struct ThreadLocalOutliveErr {
+    #[primary_span]
+    pub span: Span,
+}

compiler/rustc_error_messages/locales/en-US/borrowck.ftl

@@ -248,3 +248,9 @@ borrowck_define_type_with_generator_substs =
 
 borrowck_define_type_with_closure_substs =
     defining type: {$type_name} with closure substs {$subsets}
+
+borrowck_borrowed_temporary_value_dropped =
+    temporary value dropped while borrowed
+
+borrowck_thread_local_outlive_function =
+    thread-local variable borrowed past end of function