Convert to inline diagnostics in rustc_borrowck

Author: JonathanBrouwer

Cargo.lock

@@ -3573,7 +3573,6 @@ dependencies = [
  "rustc_abi",
  "rustc_data_structures",
  "rustc_errors",
- "rustc_fluent_macro",
  "rustc_graphviz",
  "rustc_hir",
  "rustc_index",
@@ -3778,7 +3777,6 @@ dependencies = [
  "rustc_ast_lowering",
  "rustc_ast_passes",
  "rustc_ast_pretty",
- "rustc_borrowck",
  "rustc_builtin_macros",
  "rustc_codegen_ssa",
  "rustc_const_eval",

compiler/rustc_borrowck/Cargo.toml

@@ -11,7 +11,6 @@ polonius-engine = "0.13.0"
 rustc_abi = { path = "../rustc_abi" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
-rustc_fluent_macro = { path = "../rustc_fluent_macro" }
 rustc_graphviz = { path = "../rustc_graphviz" }
 rustc_hir = { path = "../rustc_hir" }
 rustc_index = { path = "../rustc_index" }

compiler/rustc_borrowck/messages.ftl

@@ -4,7 +4,9 @@ use std::collections::BTreeMap;
 
 use rustc_abi::{FieldIdx, VariantIdx};
 use rustc_data_structures::fx::FxIndexMap;
-use rustc_errors::{Applicability, Diag, EmissionGuarantee, MultiSpan, listify};
+use rustc_errors::{
+    Applicability, Diag, DiagMessage, EmissionGuarantee, MultiSpan, inline_fluent, listify,
+};
 use rustc_hir::def::{CtorKind, Namespace};
 use rustc_hir::{
     self as hir, CoroutineKind, GenericBound, LangItem, WhereBoundPredicate, WherePredicateKind,
@@ -35,7 +37,6 @@ use tracing::debug;
 use super::MirBorrowckCtxt;
 use super::borrow_set::BorrowData;
 use crate::constraints::OutlivesConstraint;
-use crate::fluent_generated as fluent;
 use crate::nll::ConstraintDescription;
 use crate::session_diagnostics::{
     CaptureArgLabel, CaptureReasonLabel, CaptureReasonNote, CaptureReasonSuggest, CaptureVarCause,
@@ -664,6 +665,10 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
         diag: &mut Diag<'_, G>,
         path: &[OutlivesConstraint<'tcx>],
     ) {
+        const BORROWCK_LIMITATION_IMPLIES_STATIC: DiagMessage = inline_fluent!(
+            "due to a current limitation of the type system, this implies a `'static` lifetime"
+        );
+
         let tcx = self.infcx.tcx;
         let Some((gat_hir_id, generics)) = path.iter().find_map(|constraint| {
             let outlived = constraint.sub;
@@ -700,7 +705,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
                 .rfind(|bgp| tcx.local_def_id_to_hir_id(bgp.def_id) == gat_hir_id)
                 .is_some()
             {
-                diag.span_note(pred.span, fluent::borrowck_limitations_implies_static);
+                diag.span_note(pred.span, BORROWCK_LIMITATION_IMPLIES_STATIC);
                 return;
             }
             for bound in bounds.iter() {
@@ -711,7 +716,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
                         .rfind(|bgp| tcx.local_def_id_to_hir_id(bgp.def_id) == gat_hir_id)
                         .is_some()
                     {
-                        diag.span_note(bound.span, fluent::borrowck_limitations_implies_static);
+                        diag.span_note(bound.span, BORROWCK_LIMITATION_IMPLIES_STATIC);
                         return;
                     }
                 }
@@ -1312,7 +1317,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
                         let mut span: MultiSpan = spans.clone().into();
                         err.arg("ty", param_ty.to_string());
                         let msg = err.dcx.eagerly_translate_to_string(
-                            fluent::borrowck_moved_a_fn_once_in_call_def,
+                            inline_fluent!("`{$ty}` is made to be an `FnOnce` closure here"),
                             err.args.iter(),
                         );
                         err.remove_arg("ty");
@@ -1321,9 +1326,12 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
                         }
                         span.push_span_label(
                             fn_call_span,
-                            fluent::borrowck_moved_a_fn_once_in_call,
+                            inline_fluent!("this value implements `FnOnce`, which causes it to be moved when called"),
+                        );
+                        err.span_note(
+                            span,
+                            inline_fluent!("`FnOnce` closures can only be called once"),
                         );
-                        err.span_note(span, fluent::borrowck_moved_a_fn_once_in_call_call);
                     } else {
                         err.subdiagnostic(CaptureReasonNote::FnOnceMoveInCall { var_span });
                     }