BorrowUsedHere|Later

Author: AndyJado

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

@@ -23,6 +23,7 @@ use crate::session_diagnostics::{
     BorrowLaterBorrowUsedLaterInLoop, BorrowUsedHere, BorrowUsedLater, BorrowUsedLaterInLoop,
     MustValidFor, UsedLaterDropped,
 };
+use crate::session_diagnostics::{BorrowUsedHere, BorrowUsedLater};
 use crate::{
     borrow_set::BorrowData, nll::ConstraintDescription, region_infer::Cause, MirBorrowckCtxt,
     WriteKind,

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -172,6 +172,52 @@ pub(crate) enum AddMoveErr {
     },
     #[note(borrowck::moved_var_cannot_copy)]
     MovedNotCopy {},
+
+#[derive(SessionSubdiagnostic)]
+pub(crate) enum BorrowUsedHere {
+    #[label(borrowck::used_here_by_closure)]
+    ByClosure {
+        #[primary_span]
+        path_span: Span,
+    },
+}
+
+#[derive(SessionSubdiagnostic)]
+pub(crate) enum BorrowUsedLater<'a> {
+    #[label(borrowck::borrow_later_captured_by_trait_object)]
+    TraitCapture {
+        borrow_desc: &'a str,
+        #[primary_span]
+        span: Span,
+    },
+
+    #[label(borrowck::borrow_later_captured_by_closure)]
+    ClosureCapture {
+        borrow_desc: &'a str,
+        #[primary_span]
+        span: Span,
+    },
+
+    #[label(borrowck::borrow_later_used_by_call)]
+    Call {
+        borrow_desc: &'a str,
+        #[primary_span]
+        span: Span,
+    },
+
+    #[label(borrowck::borrow_later_stored_here)]
+    FakeLetRead {
+        borrow_desc: &'a str,
+        #[primary_span]
+        span: Span,
+    },
+
+    #[label(borrowck::borrow_later_used_here)]
+    Other {
+        borrow_desc: &'a str,
+        #[primary_span]
+        span: Span,
+    },
 }
 
 #[derive(SessionSubdiagnostic)]

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

@@ -115,6 +115,18 @@ borrowck_bl_used_borrow_in_later_iteration_loop =
 borrowck_drop_local_might_cause_borrow =
     {$borrow_desc}borrow might be used here, when `{$local_name}` is dropped and runs the {$dtor_desc} for {$type_desc}
 
+borrowck_closure_capture_borrow_in_later_iteration_loop =
+    {$borrow_desc}borrow later borrow captured here by closure, in later iteration of loop
+
+borrowck_call_used_borrow_in_later_iteration_loop =
+    {$borrow_desc}borrow later borrow used by call, in later iteration of loop
+
+borrowck_used_borrow_in_later_iteration_loop =
+    {$borrow_desc}borrow later borrow used here, in later iteration of loop
+
+borrowck_drop_local_might_cause_borrow =
+    {$borrow_desc}borrow might be used here, when `{$local_name}` is dropped and runs the {$dtor_name} for {$type_name}
+
 borrowck_var_dropped_in_wrong_order =
     values in a scope are dropped in the opposite order they are defined
 
@@ -174,3 +186,5 @@ borrowck_moved_by_call =
 
 borrowck_type_not_impl_Copy =
     {$move_prefix}move occurs because {$place_desc} has type `{$ty}`, which does not implement the `Copy` trait
+borrowck_outlive_constraint_need_borrow_lasts =
+    {$category}requires that `{$borrow_desc}` lasts for `{$region_name}`