E0500 E0501

Author: AndyJado

compiler/rustc_borrowck/src/borrowck_errors.rs

@@ -104,38 +104,30 @@ impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
     pub(crate) fn cannot_uniquely_borrow_by_one_closure(
         &self,
         new_loan_span: Span,
-        container_name: &str,
+        is_generator: bool,
         desc_new: &str,
         opt_via: &str,
         old_loan_span: Span,
         noun_old: &str,
         old_opt_via: &str,
         previous_end_span: Option<Span>,
     ) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
-        let mut err = struct_span_err!(
-            self,
+        self.infcx.tcx.sess.create_err(crate::session_diagnostics::ClosureUniquelyBorrowErr {
             new_loan_span,
-            E0500,
-            "closure requires unique access to {} but {} is already borrowed{}",
+            is_generator,
             desc_new,
+            opt_via,
+            old_loan_span,
             noun_old,
             old_opt_via,
-        );
-        err.span_label(
-            new_loan_span,
-            format!("{} construction occurs here{}", container_name, opt_via),
-        );
-        err.span_label(old_loan_span, format!("borrow occurs here{}", old_opt_via));
-        if let Some(previous_end_span) = previous_end_span {
-            err.span_label(previous_end_span, "borrow ends here");
-        }
-        err
+            previous_end_span,
+        })
     }
 
     pub(crate) fn cannot_reborrow_already_uniquely_borrowed(
         &self,
         new_loan_span: Span,
-        container_name: &str,
+        is_generator: &str,
         desc_new: &str,
         opt_via: &str,
         kind_new: &str,
@@ -144,27 +136,17 @@ impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
         previous_end_span: Option<Span>,
         second_borrow_desc: &str,
     ) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
-        let mut err = struct_span_err!(
-            self,
+        self.infcx.tcx.sess.create_err(crate::session_diagnostics::ClosureReBorrowErr {
             new_loan_span,
-            E0501,
-            "cannot borrow {}{} as {} because previous closure requires unique access",
+            is_generator,
             desc_new,
             opt_via,
             kind_new,
-        );
-        err.span_label(
-            new_loan_span,
-            format!("{}borrow occurs here{}", second_borrow_desc, opt_via),
-        );
-        err.span_label(
             old_loan_span,
-            format!("{} construction occurs here{}", container_name, old_opt_via),
-        );
-        if let Some(previous_end_span) = previous_end_span {
-            err.span_label(previous_end_span, "borrow from closure ends here");
-        }
-        err
+            old_opt_via,
+            previous_end_span,
+            second_borrow_desc,
+        })
     }
 
     pub(crate) fn cannot_reborrow_already_borrowed(

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -923,11 +923,13 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         let borrow_spans = self.borrow_spans(span, location);
         let span = borrow_spans.args_or_use();
 
+        //FIXME: depercate when done diag migration
         let container_name = if issued_spans.for_generator() || borrow_spans.for_generator() {
             "generator"
         } else {
             "closure"
         };
+        let is_generator = issued_spans.for_generator() || borrow_spans.for_generator();
 
         let (desc_place, msg_place, msg_borrow, union_type_name) =
             self.describe_place_for_conflicting_borrow(place, issued_borrow.borrowed_place);
@@ -1042,7 +1044,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                 first_borrow_desc = "first ";
                 self.cannot_uniquely_borrow_by_one_closure(
                     span,
-                    container_name,
+                    is_generator,
                     &desc_place,
                     "",
                     issued_span,

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -749,3 +749,38 @@ pub(crate) struct MutMultiLoopLabel<'a> {
     #[primary_span]
     pub new_loan_span: Span,
 }
+
+#[derive(Diagnostic)]
+#[diag(borrowck_cannot_uniquely_borrow_by_one_closure, code = "E0500")]
+pub(crate) struct ClosureUniquelyBorrowErr<'a> {
+    #[primary_span]
+    #[label]
+    pub new_loan_span: Span,
+    pub is_generator: bool,
+    pub desc_new: &'a str,
+    pub opt_via: &'a str,
+    #[label(occurs_label)]
+    pub old_loan_span: Span,
+    pub noun_old: &'a str,
+    pub old_opt_via: &'a str,
+    #[label(ends_label)]
+    pub previous_end_span: Option<Span>,
+}
+
+#[derive(Diagnostic)]
+#[diag(borrowck_cannot_reborrow_already_uniquely_borrowed, code = "E0501")]
+pub(crate) struct ClosureReBorrowErr<'a> {
+    #[primary_span]
+    #[label]
+    pub new_loan_span: Span,
+    pub is_generator: &'a str,
+    pub desc_new: &'a str,
+    pub opt_via: &'a str,
+    pub kind_new: &'a str,
+    #[label(occurs_label)]
+    pub old_loan_span: Span,
+    pub old_opt_via: &'a str,
+    #[label(ends_label)]
+    pub previous_end_span: Option<Span>,
+    pub second_borrow_desc: &'a str,
+}

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

@@ -462,3 +462,21 @@ borrowck_cannot_mutably_borrow_multiply =
         [false] {""} (via {$place})
     }
     .first_mut_end_label = first borrow ends here
+
+borrowck_cannot_uniquely_borrow_by_one_closure =
+    closure requires unique access to {$desc_new} but {$noun_old} is already borrowed{$old_opt_via}
+    .label = {$is_generator ->
+        [true] generator
+        *[false] closure
+    } construction occurs here{$opt_via}
+    .occurs_label = borrow occurs here{$old_opt_via}
+    .ends_label = borrow ends here
+
+borrowck_cannot_reborrow_already_uniquely_borrowed =
+    cannot borrow {$desc_new}{$opt_via} as {$kind_new} because previous closure requires unique access
+    .label = {$second_borrow_desc}borrow occurs here{$opt_via}
+    .occurs_label = {$is_generator ->
+        [true] generator
+        *[false] closure
+    } construction occurs here{$old_opt_via}
+    .ends_label = borrow from closure ends here