pass without effor

Author: AndyJado

compiler/rustc_borrowck/src/diagnostics/mod.rs

@@ -22,7 +22,7 @@ use rustc_span::{symbol::sym, Span, Symbol, DUMMY_SP};
 use rustc_target::abi::VariantIdx;
 use rustc_trait_selection::traits::type_known_to_meet_bound_modulo_regions;
 
-use crate::session_diagnostics::{CaptureCausedBy, ClosureCannotAgain};
+use crate::session_diagnostics::{CaptureCausedBy, ClosureCannotAgain, NotImplCopy};
 
 use super::borrow_set::BorrowData;
 use super::MirBorrowckCtxt;
@@ -391,14 +391,10 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         span: Option<Span>,
         move_prefix: &str,
     ) {
-        let message = format!(
-            "{}move occurs because {} has type `{}`, which does not implement the `Copy` trait",
-            move_prefix, place_desc, ty,
-        );
         if let Some(span) = span {
-            err.span_label(span, message);
+            err.subdiagnostic(NotImplCopy::Label { span, place_desc, ty, move_prefix });
         } else {
-            err.note(&message);
+            err.subdiagnostic(NotImplCopy::Note { place_desc, ty, move_prefix });
         }
     }
 
@@ -988,6 +984,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                         loop_message,
                         span: fn_call_span,
                     };
+                    err.subdiagnostic(label);
                     let note = CaptureCausedBy::FnOnceVal { span: var_span };
                     err.subdiagnostic(note);
                 }

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -424,3 +424,17 @@ pub(crate) enum CaptureCausedBy<'a> {
         span: Span,
     },
 }
+
+#[derive(SessionSubdiagnostic)]
+pub(crate) enum NotImplCopy<'a, 'tcx> {
+    #[label(borrowck::type_not_impl_Copy)]
+    Label {
+        place_desc: &'a str,
+        ty: Ty<'tcx>,
+        move_prefix: &'a str,
+        #[primary_span]
+        span: Span,
+    },
+    #[note(borrowck::type_not_impl_Copy)]
+    Note { place_desc: &'a str, ty: Ty<'tcx>, move_prefix: &'a str },
+}

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

@@ -171,3 +171,6 @@ borrowck_moved_fnonce_value =
 
 borrowck_moved_by_call =
     {$place_name} {$partially_str}moved due to this call{$loop_message}
+
+borrowck_type_not_impl_Copy =
+    {$move_prefix}move occurs because {$place_desc} has type `{$ty}`, which does not implement the `Copy` trait