Update affected tests.

diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
index 9c7e3db67a611a55676afa41b85e1ec1671e59ca..77f0ab5d6bdd29ed51c63afc170a995b108440ee 100644 (file)
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
+++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
@@ -11,7 +11,7 @@ LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
    |                ----------^^^^^-----------------
    |                |   |     |
    |                |   |     free region requires that `'1` must outlive `'2`
-   |                |   lifetime `'1` appears in this argument
+   |                |   has type `&'1i32`
    |                lifetime `'2` appears in return type
 
 error: aborting due to previous error

diff --git a/src/test/ui/issue-40510-1.nll.stderr b/src/test/ui/issue-40510-1.nll.stderr
index 73a8d58290dfaf7c594eaaa014d4566cbf98168c..312ec6e742e9164b4e276828cb51a247f2441a1f 100644 (file)
--- a/src/test/ui/issue-40510-1.nll.stderr
+++ b/src/test/ui/issue-40510-1.nll.stderr
@@ -6,7 +6,7 @@ LL |        || {
    |  |_____|
    | ||
 LL | ||         &mut x
-   | ||         ^^^^^^ free region requires that `'1` must outlive `'2`
+   | ||         ^^^^^^ return requires that `'1` must outlive `'2`
 LL | ||     };
    | ||     -
    | ||_____|

diff --git a/src/test/ui/issue-52213.nll.stderr b/src/test/ui/issue-52213.nll.stderr
index c288cf9ed820c8dc2f8baf8034570d49847d8214..fb5da7d7a19470cbf2c995230f6c4356c791174b 100644 (file)
--- a/src/test/ui/issue-52213.nll.stderr
+++ b/src/test/ui/issue-52213.nll.stderr
@@ -5,10 +5,10 @@ LL |     match (&t,) { //~ ERROR cannot infer an appropriate lifetime
    |           ^^^^^
 
 error: unsatisfied lifetime constraints
-  --> $DIR/issue-52213.rs:13:11
+  --> $DIR/issue-52213.rs:12:11
    |
-LL |         ((u,),) => u,
-   |           ^ free region requires that `'a` must outlive `'b`
+LL |     match (&t,) { //~ ERROR cannot infer an appropriate lifetime
+   |           ^^^^^ free region requires that `'a` must outlive `'b`
 
 error: aborting due to previous error
 

diff --git a/src/test/ui/issue-52533.nll.stderr b/src/test/ui/issue-52533.nll.stderr
index 7931bc320b10afd74300e164d6c41316012e9deb..365ef2bac39082432217227c2690c708f94846d8 100644 (file)
--- a/src/test/ui/issue-52533.nll.stderr
+++ b/src/test/ui/issue-52533.nll.stderr
@@ -8,10 +8,10 @@ error: unsatisfied lifetime constraints
   --> $DIR/issue-52533.rs:15:16
    |
 LL |     foo(|a, b| b)
-   |          -  -  ^ free region requires that `'1` must outlive `'2`
+   |          -  -  ^ closure was supposed to return data with lifetime `'1` but it is returning data with lifetime `'2`
    |          |  |
-   |          |  lifetime `'1` appears in this argument
-   |          lifetime `'2` appears in this argument
+   |          |  has type `&'1u32`
+   |          has type `&'2u32`
 
 error: aborting due to previous error
 

diff --git a/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr b/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
index d6f542183603ec522f9cce71ea9312659b47a7c9..c7fdbe1685c4a702162d1f900f3813d313fe9580 100644 (file)
--- a/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
+++ b/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
@@ -10,8 +10,8 @@ error: unsatisfied lifetime constraints
 LL |         let mut closure = expect_sig(|p, y| *p = y);
    |                                       -  -  ^^^^^^ free region requires that `'1` must outlive `'2`
    |                                       |  |
-   |                                       |  lifetime `'1` appears in this argument
-   |                                       lifetime `'2` appears in this argument
+   |                                       |  has type `&'1 i32`
+   |                                       has type `&'2 mut &'3 i32`
 
 note: No external requirements
   --> $DIR/escape-argument-callee.rs:36:38

diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
index a7a50a3a029817e099b4a2433a4ac47608c4f135..6882b08f330784f48867859a4f35f5be488317cf 100644 (file)
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
@@ -8,12 +8,12 @@ error: unsatisfied lifetime constraints
   --> $DIR/propagate-approximated-fail-no-postdom.rs:57:13
    |
 LL |         |_outlives1, _outlives2, _outlives3, x, y| {
-   |          ----------              ---------- lifetime `'2` appears in this argument
+   |          ----------              ---------- has type `std::cell::Cell<&'3 &'4 u32>`
    |          |
-   |          lifetime `'1` appears in this argument
+   |          has type `std::cell::Cell<&'1 &'2 u32>`
 ...
 LL |             demand_y(x, y, p) //~ ERROR
-   |             ^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2`
+   |             ^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'3`
 
 note: No external requirements
   --> $DIR/propagate-approximated-fail-no-postdom.rs:53:9

diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
index fb98c506c7d280a913b785441d731b06f4f7c1d7..771d1df2df0ba4bd52cd9d4aad2c380509435e26 100644 (file)
--- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
@@ -8,12 +8,12 @@ error: unsatisfied lifetime constraints
   --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:47:9
    |
 LL |     establish_relationships(&cell_a, &cell_b, |_outlives, x, y| {
-   |                                                ---------  - lifetime `'1` appears in this argument
+   |                                                ---------  - has type `&'1 std::cell::Cell<&'2 u32>`
    |                                                |
-   |                                                lifetime `'2` appears in this argument
+   |                                                has type `&'3 std::cell::Cell<&'4 &'5 u32>`
 LL |         // Only works if 'x: 'y:
 LL |         demand_y(x, y, x.get())
-   |         ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2`
+   |         ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'3`
 
 note: No external requirements
   --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:45:47

diff --git a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
index 73d39a8502b6438060cf366c70aad478c2dd4daa..1ac52e5e56012fb53404f2c2567d22e476ddda33 100644 (file)
--- a/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
@@ -8,12 +8,12 @@ error: unsatisfied lifetime constraints
   --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:51:9
    |
 LL |     establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| {
-   |                                                ----------  ---------- lifetime `'2` appears in this argument
+   |                                                ----------  ---------- has type `&'4 std::cell::Cell<&'5 &'6 u32>`
    |                                                |
-   |                                                lifetime `'1` appears in this argument
+   |                                                has type `&'1 std::cell::Cell<&'2 &'3 u32>`
 LL |         // Only works if 'x: 'y:
 LL |         demand_y(x, y, x.get())
-   |         ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2`
+   |         ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'4`
 
 note: No external requirements
   --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:49:47

diff --git a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr b/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
index 5724cdbd8c95be1fb5f557863315c69626baacdf..d6d1645ceeacc755a3b727c34dd40171d4a0019b 100644 (file)
--- a/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
+++ b/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
@@ -8,10 +8,10 @@ error: unsatisfied lifetime constraints
   --> $DIR/return-wrong-bound-region.rs:21:23
    |
 LL |     expect_sig(|a, b| b); // ought to return `a`
-   |                 -  -  ^ free region requires that `'1` must outlive `'2`
+   |                 -  -  ^ closure was supposed to return data with lifetime `'1` but it is returning data with lifetime `'2`
    |                 |  |
-   |                 |  lifetime `'1` appears in this argument
-   |                 lifetime `'2` appears in this argument
+   |                 |  has type `&'1 i32`
+   |                 has type `&'2 i32`
 
 note: No external requirements
   --> $DIR/return-wrong-bound-region.rs:21:16