borrow_ck some diagnostic msg migration

E0596 & E0594 diagnose migration

sort ftl messages alphabetically

a153 patch

141c patch

squash

Author: AndyJado

compiler/rustc_borrowck/messages.ftl

@@ -1795,6 +1795,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     /// cannot borrow `a.u` (via `a.u.z.c`) as immutable because it is also borrowed as
     /// mutable (via `a.u.s.b`) [E0502]
     /// ```
+    // FIXME: first 3 out of 4 can contain English word value, note for diagnostic migration
     pub(crate) fn describe_place_for_conflicting_borrow(
         &self,
         first_borrowed_place: Place<'tcx>,

compiler/rustc_borrowck/src/borrowck_errors.rs

@@ -46,7 +46,7 @@ mod mutability_errors;
 mod region_errors;
 
 pub(crate) use bound_region_errors::{ToUniverseInfo, UniverseInfo};
-pub(crate) use mutability_errors::AccessKind;
+pub(crate) use mutability_errors::{AccessKind, PlaceAndReason};
 pub(crate) use outlives_suggestion::OutlivesSuggestionBuilder;
 pub(crate) use region_errors::{ErrorConstraintInfo, RegionErrorKind, RegionErrors};
 pub(crate) use region_name::{RegionName, RegionNameSource};
@@ -678,6 +678,7 @@ impl UseSpans<'_> {
     }
 }
 
+#[derive(Clone, Copy, Debug)]
 pub(super) enum BorrowedContentSource<'tcx> {
     DerefRawPointer,
     DerefMutableRef,
@@ -715,21 +716,22 @@ impl<'tcx> BorrowedContentSource<'tcx> {
         }
     }
 
-    pub(super) fn describe_for_immutable_place(&self, tcx: TyCtxt<'_>) -> String {
+    // ready to remove
+    pub(super) fn describe_for_immutable_place(&self, tcx: TyCtxt<'_>) -> Option<String> {
         match *self {
-            BorrowedContentSource::DerefRawPointer => "a `*const` pointer".to_string(),
-            BorrowedContentSource::DerefSharedRef => "a `&` reference".to_string(),
+            BorrowedContentSource::DerefRawPointer => None,
+            BorrowedContentSource::DerefSharedRef => None,
             BorrowedContentSource::DerefMutableRef => {
                 bug!("describe_for_immutable_place: DerefMutableRef isn't immutable")
             }
             BorrowedContentSource::OverloadedDeref(ty) => ty
                 .ty_adt_def()
                 .and_then(|adt| match tcx.get_diagnostic_name(adt.did())? {
-                    name @ (sym::Rc | sym::Arc) => Some(format!("an `{name}`")),
+                    name @ (sym::Rc | sym::Arc) => Some(Some(format!("an `{name}`"))),
                     _ => None,
                 })
-                .unwrap_or_else(|| format!("dereference of `{ty}`")),
-            BorrowedContentSource::OverloadedIndex(ty) => format!("an index of `{ty}`"),
+                .unwrap_or_else(|| Some(format!("dereference of `{ty}`"))),
+            BorrowedContentSource::OverloadedIndex(ty) => Some(format!("`{ty}`")),
         }
     }
 

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -9,6 +9,7 @@ use rustc_span::{BytePos, Span};
 use crate::diagnostics::CapturedMessageOpt;
 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
@@ -547,9 +548,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 {
@@ -564,10 +565,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);
         }
     }
 }