pass

Author: AndyJado

compiler/rustc_borrowck/src/diagnostics/move_errors.rs

@@ -1,3 +1,6 @@
+#![deny(rustc::untranslatable_diagnostic)]
+#![deny(rustc::diagnostic_outside_of_impl)]
+
 use rustc_errors::{Applicability, Diagnostic, DiagnosticBuilder, ErrorGuaranteed};
 use rustc_middle::mir::*;
 use rustc_middle::ty;
@@ -8,6 +11,7 @@ use rustc_span::Span;
 
 use crate::diagnostics::{DescribePlaceOpt, UseSpans};
 use crate::prefixes::PrefixSet;
+use crate::session_diagnostics::AddMoveErr;
 use crate::MirBorrowckCtxt;
 
 // Often when desugaring a pattern match we may have many individual moves in
@@ -503,9 +507,9 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             let binding_span = bind_to.source_info.span;
 
             if j == 0 {
-                err.span_label(binding_span, "data moved here");
+                err.subdiagnostic(AddMoveErr::Here { binding_span });
             } else {
-                err.span_label(binding_span, "...and here");
+                err.subdiagnostic(AddMoveErr::AndHere { binding_span });
             }
 
             if binds_to.len() == 1 {
@@ -520,10 +524,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
         }
 
         if binds_to.len() > 1 {
-            err.note(
-                "move occurs because these variables have types that \
-                      don't implement the `Copy` trait",
-            );
+            err.subdiagnostic(AddMoveErr::MovedNotCopy {});
         }
     }
 }

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -157,3 +157,21 @@ pub(crate) enum RequireStaticErr {
         multi_span: MultiSpan,
     },
 }
+
+//move_errors.rs
+
+#[derive(SessionSubdiagnostic)]
+pub(crate) enum AddMoveErr {
+    #[label(borrowck::data_moved_here)]
+    Here {
+        #[primary_span]
+        binding_span: Span,
+    },
+    #[label(borrowck::and_data_moved_here)]
+    AndHere {
+        #[primary_span]
+        binding_span: Span,
+    },
+    #[note(borrowck::moved_var_cannot_copy)]
+    MovedNotCopy {},
+}

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

@@ -58,3 +58,11 @@ borrowck_returned_lifetime_short =
 
 borrowck_used_impl_require_static =
     the used `impl` has a `'static` requirement
+
+borrowck_data_moved_here =
+    data moved here
+
+borrowck_and_data_moved_here = ...and here
+
+borrowck_moved_var_cannot_copy =
+    move occurs because these variables have types that don't implement the `Copy` trait