New upstream version 1.24.1+dfsg1

[rustc.git] / src / test / ui / span / regions-escape-loop-via-vec.stderr

diff --git a/src/test/ui/span/regions-escape-loop-via-vec.stderr b/src/test/ui/span/regions-escape-loop-via-vec.stderr
index b61df82e8a14f1db996497c321757825f3e2d140..73ff449b2b532b4e296cf7cc5817ff8bd4b7088f 100644 (file)
--- a/src/test/ui/span/regions-escape-loop-via-vec.stderr
+++ b/src/test/ui/span/regions-escape-loop-via-vec.stderr
@@ -1,40 +1,38 @@
 error[E0597]: `z` does not live long enough
-  --> $DIR/regions-escape-loop-via-vec.rs:26:5
+  --> $DIR/regions-escape-loop-via-vec.rs:17:22
    |
-22 |         _y.push(&mut z); //~ ERROR `z` does not live long enough
-   |                      - borrow occurs here
+17 |         _y.push(&mut z);
+   |                      ^ borrowed value does not live long enough
 ...
-26 |     }
-   |     ^ `z` dropped here while still borrowed
-27 |     //~^ NOTE borrowed value only lives until here
-28 | }
+20 |     }
+   |     - `z` dropped here while still borrowed
+21 | }
    | - borrowed value needs to live until here
 
 error[E0503]: cannot use `x` because it was mutably borrowed
-  --> $DIR/regions-escape-loop-via-vec.rs:18:11
+  --> $DIR/regions-escape-loop-via-vec.rs:15:11
    |
 14 |     let mut _y = vec![&mut x];
    |                            - borrow of `x` occurs here
-...
-18 |     while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed
+15 |     while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed
    |           ^ use of borrowed `x`
 
 error[E0503]: cannot use `x` because it was mutably borrowed
-  --> $DIR/regions-escape-loop-via-vec.rs:20:13
+  --> $DIR/regions-escape-loop-via-vec.rs:16:13
    |
 14 |     let mut _y = vec![&mut x];
    |                            - borrow of `x` occurs here
-...
-20 |         let mut z = x; //~ ERROR cannot use `x` because it was mutably borrowed
+15 |     while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed
+16 |         let mut z = x; //~ ERROR cannot use `x` because it was mutably borrowed
    |             ^^^^^ use of borrowed `x`
 
 error[E0506]: cannot assign to `x` because it is borrowed
-  --> $DIR/regions-escape-loop-via-vec.rs:24:9
+  --> $DIR/regions-escape-loop-via-vec.rs:19:9
    |
 14 |     let mut _y = vec![&mut x];
    |                            - borrow of `x` occurs here
 ...
-24 |         x += 1; //~ ERROR cannot assign
+19 |         x += 1; //~ ERROR cannot assign
    |         ^^^^^^ assignment to borrowed `x` occurs here
 
 error: aborting due to 4 previous errors