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

First shot at #54015

Closes #54015

src/test/ui/issues/issue-12041.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-52126-assign-op-invariance.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