removal boolize on container_name

Author: AndyJado

compiler/rustc_borrowck/src/borrowck_errors.rs

@@ -104,7 +104,7 @@ impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
     pub(crate) fn cannot_uniquely_borrow_by_one_closure(
         &self,
         new_loan_span: Span,
-        is_generator: bool,
+        container_name: &str,
         desc_new: &str,
         opt_via: &str,
         old_loan_span: Span,
@@ -114,7 +114,7 @@ impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
     ) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
         self.infcx.tcx.sess.create_err(crate::session_diagnostics::ClosureUniquelyBorrowErr {
             new_loan_span,
-            is_generator,
+            container_name,
             desc_new,
             opt_via,
             old_loan_span,
@@ -127,7 +127,7 @@ impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
     pub(crate) fn cannot_reborrow_already_uniquely_borrowed(
         &self,
         new_loan_span: Span,
-        is_generator: &str,
+        container_name: &str,
         desc_new: &str,
         opt_via: &str,
         kind_new: &str,
@@ -138,7 +138,7 @@ impl<'cx, 'tcx> crate::MirBorrowckCtxt<'cx, 'tcx> {
     ) -> DiagnosticBuilder<'cx, ErrorGuaranteed> {
         self.infcx.tcx.sess.create_err(crate::session_diagnostics::ClosureReBorrowErr {
             new_loan_span,
-            is_generator,
+            container_name,
             desc_new,
             opt_via,
             kind_new,

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -923,13 +923,11 @@ 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);
@@ -1044,7 +1042,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                 first_borrow_desc = "first ";
                 self.cannot_uniquely_borrow_by_one_closure(
                     span,
-                    is_generator,
+                    container_name,
                     &desc_place,
                     "",
                     issued_span,

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -756,7 +756,7 @@ pub(crate) struct ClosureUniquelyBorrowErr<'a> {
     #[primary_span]
     #[label]
     pub new_loan_span: Span,
-    pub is_generator: bool,
+    pub container_name: &'a str,
     pub desc_new: &'a str,
     pub opt_via: &'a str,
     #[label(occurs_label)]
@@ -773,7 +773,7 @@ pub(crate) struct ClosureReBorrowErr<'a> {
     #[primary_span]
     #[label]
     pub new_loan_span: Span,
-    pub is_generator: &'a str,
+    pub container_name: &'a str,
     pub desc_new: &'a str,
     pub opt_via: &'a str,
     pub kind_new: &'a str,

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

@@ -465,18 +465,12 @@ borrowck_cannot_mutably_borrow_multiply =
 
 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}
+    .label = {$container_name} 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}
+    .occurs_label = {$container_name} construction occurs here{$old_opt_via}
     .ends_label = borrow from closure ends here