Auto merge of #54343 - blitzerr:master, r=nikomatsakis

First shot at #54015

Closes #54015

Author: bors

src/librustc_mir/borrow_check/error_reporting.rs

@@ -46,9 +46,9 @@ impl<'tcx> BorrowExplanation<'tcx> {
             },
             BorrowExplanation::UsedLaterInLoop(is_in_closure, var_or_use_span) => {
                 let message = if is_in_closure {
-                    "borrow captured here by closure in later iteration of loop"
+                    "borrow captured here by closure, in later iteration of loop"
                 } else {
-                    "borrow used here in later iteration of loop"
+                    "borrow used here, in later iteration of loop"
                 };
                 err.span_label(var_or_use_span, message);
             },

src/librustc_mir/borrow_check/nll/explain_borrow/mod.rs

@@ -5,7 +5,7 @@ LL |     for &x in &vector {
    |               -------
    |               |
    |               immutable borrow occurs here
-   |               borrow used here in later iteration of loop
+   |               borrow used here, in later iteration of loop
 LL |         let cap = vector.capacity();
 LL |         vector.extend(repeat(0));      //~ ERROR cannot borrow
    |         ^^^^^^^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
@@ -17,7 +17,7 @@ LL |     for &x in &vector {
    |               -------
    |               |
    |               immutable borrow occurs here
-   |               borrow used here in later iteration of loop
+   |               borrow used here, in later iteration of loop
 ...
 LL |         vector[1] = 5;   //~ ERROR cannot borrow
    |         ^^^^^^ mutable borrow occurs here

src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr

@@ -8,13 +8,13 @@ LL |         borrow(&*v); //~ ERROR cannot borrow
    |                ^^^ immutable borrow occurs here
 LL |     }
 LL |     *x = box 5;
-   |     -- borrow used here in later iteration of loop
+   |     -- borrow used here, in later iteration of loop
 
 error[E0502]: cannot borrow `*v` as immutable because it is also borrowed as mutable
   --> $DIR/borrowck-lend-flow-loop.rs:109:16
    |
 LL |         **x += 1;
-   |         -------- borrow used here in later iteration of loop
+   |         -------- borrow used here, in later iteration of loop
 LL |         borrow(&*v); //~ ERROR cannot borrow
    |                ^^^ immutable borrow occurs here
 LL |         if cond2 {

src/test/ui/borrowck/borrowck-lend-flow-loop.nll.stderr

@@ -4,7 +4,7 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
 LL |             1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499]
    |                    ----      ^^^^^^ second mutable borrow occurs here
    |                    |
-   |                    borrow used here in later iteration of loop
+   |                    borrow used here, in later iteration of loop
 ...
 LL |             _ => { addr.push(&mut x); } //[ast]~ ERROR [E0499]
    |                              ------ first mutable borrow occurs here
@@ -13,7 +13,7 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
   --> $DIR/borrowck-mut-borrow-linear-errors.rs:25:30
    |
 LL |             1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499]
-   |                    ---- borrow used here in later iteration of loop
+   |                    ---- borrow used here, in later iteration of loop
 LL |             //[mir]~^ ERROR [E0499]
 LL |             2 => { addr.push(&mut x); } //[ast]~ ERROR [E0499]
    |                              ^^^^^^ second mutable borrow occurs here

src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr

@@ -4,7 +4,7 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
 LL |             1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499]
    |                    ----      ^^^^^^ second mutable borrow occurs here
    |                    |
-   |                    borrow used here in later iteration of loop
+   |                    borrow used here, in later iteration of loop
 ...
 LL |             _ => { addr.push(&mut x); } //[ast]~ ERROR [E0499]
    |                              ------ first mutable borrow occurs here
@@ -13,7 +13,7 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
   --> $DIR/borrowck-mut-borrow-linear-errors.rs:25:30
    |
 LL |             1 => { addr.push(&mut x); } //[ast]~ ERROR [E0499]
-   |                    ---- borrow used here in later iteration of loop
+   |                    ---- borrow used here, in later iteration of loop
 LL |             //[mir]~^ ERROR [E0499]
 LL |             2 => { addr.push(&mut x); } //[ast]~ ERROR [E0499]
    |                              ^^^^^^ second mutable borrow occurs here

src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr

@@ -20,7 +20,7 @@ error[E0382]: use of moved value (Mir)
   --> $DIR/issue-41962.rs:17:21
    |
 LL |         if let Some(thing) = maybe {
-   |                     ^^^^^ value moved here in previous iteration of loop
+   |                     ^^^^^ value moved here, in previous iteration of loop
    |
    = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait
 

src/test/ui/borrowck/issue-41962.stderr

@@ -17,7 +17,7 @@ LL |         let inner_second = &mut inner_void; //~ ERROR cannot borrow
    |                            ^^^^^^^^^^^^^^^ second mutable borrow occurs here
 LL |         inner_second.use_mut();
 LL |         inner_first.use_mut();
-   |         ----------- borrow used here in later iteration of loop
+   |         ----------- borrow used here, in later iteration of loop
 
 error: aborting due to 2 previous errors
 

src/test/ui/borrowck/mut-borrow-outside-loop.nll.stderr

@@ -2,7 +2,7 @@ error[E0382]: use of moved value: `tx`
   --> $DIR/issue-12041.rs:18:22
    |
 LL |             let tx = tx;
-   |                      ^^ value moved here in previous iteration of loop
+   |                      ^^ value moved here, in previous iteration of loop
    |
    = note: move occurs because `tx` has type `std::sync::mpsc::Sender<i32>`, which does not implement the `Copy` trait
 

src/test/ui/issues/issue-12041.nll.stderr

@@ -5,7 +5,7 @@ LL |         let v: Vec<&str> = line.split_whitespace().collect();
    |                            ^^^^ borrowed value does not live long enough
 LL |         //~^ ERROR `line` does not live long enough
 LL |         println!("accumulator before add_assign {:?}", acc.map);
-   |                                                        ------- borrow used here in later iteration of loop
+   |                                                        ------- borrow used here, in later iteration of loop
 ...
 LL |     }
    |     - `line` dropped here while still borrowed