migrate some rustc_borrowck diagnostic

Author: AndyJado

compiler/rustc_borrowck/src/lib.rs

@@ -18,7 +18,7 @@ extern crate tracing;
 
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::graph::dominators::Dominators;
-use rustc_errors::{Applicability, Diagnostic, DiagnosticBuilder, ErrorGuaranteed};
+use rustc_errors::{Diagnostic, DiagnosticBuilder, ErrorGuaranteed};
 use rustc_hir as hir;
 use rustc_hir::def_id::LocalDefId;
 use rustc_index::bit_set::ChunkedBitSet;
@@ -424,17 +424,12 @@ fn do_mir_borrowck<'a, 'tcx>(
             continue;
         }
 
-        tcx.struct_span_lint_hir(UNUSED_MUT, lint_root, span, |lint| {
-            let mut_span = tcx.sess.source_map().span_until_non_whitespace(span);
-            lint.build("variable does not need to be mutable")
-                .span_suggestion_short(
-                    mut_span,
-                    "remove this `mut`",
-                    "",
-                    Applicability::MachineApplicable,
-                )
-                .emit();
-        })
+        tcx.emit_spanned_lint(
+            UNUSED_MUT,
+            lint_root,
+            span,
+            session_diagnostics::VarBetterNotMut { span },
+        )
     }
 
     let tainted_by_errors = mbcx.emit_errors();

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

@@ -16,6 +16,8 @@ use rustc_span::Span;
 use rustc_trait_selection::traits::error_reporting::InferCtxtExt as _;
 use rustc_trait_selection::traits::TraitEngineExt as _;
 
+use crate::session_diagnostics::ConstNotUsedTraitAlias;
+
 use super::RegionInferenceContext;
 
 impl<'tcx> RegionInferenceContext<'tcx> {
@@ -639,17 +641,11 @@ impl<'tcx> TypeFolder<'tcx> for ReverseMapper<'tcx> {
                     Some(GenericArgKind::Const(c1)) => c1,
                     Some(u) => panic!("const mapped to unexpected kind: {:?}", u),
                     None => {
-                        self.tcx
-                            .sess
-                            .struct_span_err(
-                                self.span,
-                                &format!(
-                                    "const parameter `{}` is part of concrete type but not \
-                                          used in parameter list for the `impl Trait` type alias",
-                                    ct
-                                ),
-                            )
-                            .emit();
+                        //FIXME!
+                        self.tcx.sess.emit_err(ConstNotUsedTraitAlias {
+                            ct: ct.to_string(),
+                            span: self.span,
+                        });
 
                         self.tcx().const_error(ct.ty())
                     }

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -1,7 +1,15 @@
-use rustc_macros::{SessionDiagnostic, SessionSubdiagnostic};
+use rustc_macros::{LintDiagnostic, SessionDiagnostic, SessionSubdiagnostic};
 use rustc_middle::ty::Ty;
 use rustc_span::Span;
 
+#[derive(SessionDiagnostic)]
+#[error(borrowck::move_borrowed, code = "E0505")]
+pub(crate) struct MoveBorrowed<'cx> {
+    #[primary_span]
+    pub span: Span,
+    pub desc: &'cx str,
+}
+
 #[derive(SessionDiagnostic)]
 #[error(borrowck::move_unsized, code = "E0161")]
 pub(crate) struct MoveUnsized<'tcx> {
@@ -42,3 +50,18 @@ pub(crate) struct GenericDoesNotLiveLongEnough {
     #[primary_span]
     pub span: Span,
 }
+
+#[derive(LintDiagnostic)]
+#[lint(borrowck::var_better_not_mut)]
+pub(crate) struct VarBetterNotMut {
+    #[suggestion_short(applicability = "machine-applicable", code = "")]
+    pub span: Span,
+}
+
+#[derive(SessionDiagnostic)]
+#[error(borrowck::const_not_used_in_type_alias)]
+pub(crate) struct ConstNotUsedTraitAlias {
+    pub ct: String,
+    #[primary_span]
+    pub span: Span,
+}

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

@@ -15,4 +15,15 @@ borrowck_higher_ranked_subtype_error =
     higher-ranked subtype error
   
 generic_does_not_live_long_enough =
-    `{$kind}` does not live long enough
+    `{$kind}` does not live long enough
+    
+borrowck_move_borrowed = 
+    cannot move out of `{$desc}` beacause it is borrowed
+    
+borrowck_var_better_not_mut = 
+    variable does not need to be mutable
+    .suggestion = remove this `mut`
+
+borrowck_const_not_used_in_type_alias = 
+    const parameter `{$ct}` is part of concrete type but not \
+          used in parameter list for the `impl Trait` type alias