outlives_sugg ini

Author: AndyJado

compiler/rustc_borrowck/src/diagnostics/outlives_suggestion.rs

@@ -1,3 +1,5 @@
+// #![deny(rustc::untranslatable_diagnostic)]
+// #![deny(rustc::diagnostic_outside_of_impl)]
 //! Contains utilities for generating suggestions for borrowck errors related to unsatisfied
 //! outlives constraints.
 
@@ -7,7 +9,7 @@ use rustc_middle::ty::RegionVid;
 use smallvec::SmallVec;
 use std::collections::BTreeMap;
 
-use crate::MirBorrowckCtxt;
+use crate::{session_diagnostics::OnLifetimeBound, MirBorrowckCtxt};
 
 use super::{ErrorConstraintInfo, RegionName, RegionNameSource};
 
@@ -171,9 +173,7 @@ impl OutlivesSuggestionBuilder {
         if let (Some(fr_name), Some(outlived_fr_name)) = (fr_name, outlived_fr_name)
             && !matches!(outlived_fr_name.source, RegionNameSource::Static)
         {
-            diag.help(&format!(
-                "consider adding the following bound: `{fr_name}: {outlived_fr_name}`",
-            ));
+            diag.subdiagnostic(OnLifetimeBound::Add { fr_name: &fr_name, outlived_fr_name: &outlived_fr_name });
         }
     }
 

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -337,3 +337,9 @@ pub(crate) enum MustValidFor<'a> {
         span: Span,
     },
 }
+
+#[derive(SessionSubdiagnostic)]
+pub(crate) enum OnLifetimeBound<'a> {
+    #[help(borrowck::consider_add_lifetime_bound)]
+    Add { fr_name: &'a RegionName, outlived_fr_name: &'a RegionName },
+}

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

@@ -135,3 +135,6 @@ borrowck_perhaps_save_in_new_local_to_drop =
 
 borrowck_outlive_constraint_need_borrow_for =
     {$category}requires that `{$desc}` is borrowed for `{$region_name}`
+
+borrowck_consider_add_lifetime_bound =
+    consider adding the following bound: `{$fr_name}: {$outlived_fr_name}`