Updated tests after rebase.

diff --git a/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.nll.stderr b/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.nll.stderr
index 614034794bd6094873e682f5c4b83ad617efdb15..b7c252cac9bc7dbf6b5d2823887719d1d5a1913c 100644 (file)
--- a/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.nll.stderr
@@ -8,9 +8,9 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex2b-push-no-existing-names.rs:16:5
    |
 LL | fn foo(x: &mut Vec<Ref<i32>>, y: Ref<i32>) {
-   |                    --------      -------- lifetime `'1` appears in this type
-   |                    |
-   |                    lifetime `'2` appears in this type
+   |        -                      - has type `Ref<'1, i32>`
+   |        |
+   |        has type `&mut std::vec::Vec<Ref<'2, i32>>`
 LL |     x.push(y); //~ ERROR lifetime mismatch
    |     ^^^^^^^^^ argument requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr
index 2829fbcd32a1bbc13801a80c7af3cdcd53d3fee9..618817fd57b31e9cc76e85c4d9e850f95cbcafc2 100644 (file)
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr
@@ -8,9 +8,9 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex3-both-anon-regions-both-are-structs-2.rs:16:5
    |
 LL | fn foo(mut x: Ref, y: Ref) {
-   |               ---     --- lifetime `'1` appears in this type
-   |               |
-   |               lifetime `'2` appears in this type
+   |        -----       - has type `Ref<'_, '1>`
+   |        |
+   |        has type `Ref<'_, '2>`
 LL |     x.b = y.b; //~ ERROR lifetime mismatch
    |     ^^^^^^^^^ requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr
index 8171ee758b066fc2590b1f1c428959a6c8232d08..b4767afd4138abadd80eff532f99f614555b50f2 100644 (file)
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr
@@ -8,10 +8,10 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex3-both-anon-regions-both-are-structs-3.rs:16:5
    |
 LL | fn foo(mut x: Ref) {
-   |               ---
-   |               |
-   |               lifetime `'1` appears in this type
-   |               lifetime `'2` appears in this type
+   |        -----
+   |        |
+   |        has type `Ref<'_, '1>`
+   |        has type `Ref<'2, '_>`
 LL |     x.a = x.b; //~ ERROR lifetime mismatch
    |     ^^^^^^^^^ requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr
index 99b64605baec1e1641c6a526a350baeee0857ac7..e2fcbaa4c3c5507ab1c13a723012850b7dccbb2d 100644 (file)
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr
@@ -8,10 +8,10 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex3-both-anon-regions-both-are-structs-4.rs:16:5
    |
 LL | fn foo(mut x: Ref) {
-   |               ---
-   |               |
-   |               lifetime `'1` appears in this type
-   |               lifetime `'2` appears in this type
+   |        -----
+   |        |
+   |        has type `Ref<'_, '1>`
+   |        has type `Ref<'2, '_>`
 LL |     x.a = x.b; //~ ERROR lifetime mismatch
    |     ^^^^^^^^^ requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr
index c9542d31069799f69fb1b283af44ba246673be68..79f1a8c0ccf7d559d29b6976123bcc3885abaeeb 100644 (file)
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr
@@ -8,9 +8,9 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex3-both-anon-regions-both-are-structs.rs:15:5
    |
 LL | fn foo(mut x: Vec<Ref>, y: Ref) {
-   |                   ---      --- lifetime `'1` appears in this type
-   |                   |
-   |                   lifetime `'2` appears in this type
+   |        -----            - has type `Ref<'1>`
+   |        |
+   |        has type `std::vec::Vec<Ref<'2>>`
 LL |     x.push(y); //~ ERROR lifetime mismatch
    |     ^^^^^^^^^ argument requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr
index 459796760e1b490cc3f076080a69d5fbeb0c9b03..0bacd894e6e9a6c6e73497aae6b2b50b7d7d80cb 100644 (file)
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr
@@ -8,9 +8,9 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex3-both-anon-regions-one-is-struct-2.rs:14:5
    |
 LL | fn foo(mut x: Ref, y: &u32) {
-   |               ---     - let's call the lifetime of this reference `'2`
-   |               |
-   |               lifetime `'1` appears in this type
+   |        -----          - let's call the lifetime of this reference `'2`
+   |        |
+   |        has type `Ref<'_, '1>`
 LL |     y = x.b; //~ ERROR lifetime mismatch
    |     ^^^^^^^ requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr
index 5fc1755ed390ac083a09157882e436d57ca04bfe..f40c67b8d114c282f3186133714364981ae288eb 100644 (file)
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr
@@ -8,9 +8,9 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex3-both-anon-regions-one-is-struct-3.rs:14:5
    |
 LL | fn foo(mut y: Ref, x: &u32) {
-   |               ---     - let's call the lifetime of this reference `'1`
-   |               |
-   |               lifetime `'2` appears in this type
+   |        -----          - let's call the lifetime of this reference `'1`
+   |        |
+   |        has type `Ref<'_, '2>`
 LL |     y.b = x; //~ ERROR lifetime mismatch
    |     ^^^^^^^ requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr
index 835f95880a744b43d92e0ab8a36b93d612061169..f9168dcf5837bf5dd092b213668dbee1a7ab55eb 100644 (file)
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr
@@ -8,9 +8,9 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex3-both-anon-regions-one-is-struct-4.rs:14:5
    |
 LL | fn foo(mut y: Ref, x: &u32) {
-   |               ---     - let's call the lifetime of this reference `'1`
-   |               |
-   |               lifetime `'2` appears in this type
+   |        -----          - let's call the lifetime of this reference `'1`
+   |        |
+   |        has type `Ref<'_, '2>`
 LL |     y.b = x; //~ ERROR lifetime mismatch
    |     ^^^^^^^ requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr
index 7aed5fe626f060d04f19e241e08e6a7dc9b24124..c43f847723240a593b8c4f77f2c5c183b528abc4 100644 (file)
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr
@@ -8,9 +8,9 @@ error: unsatisfied lifetime constraints
   --> $DIR/ex3-both-anon-regions-one-is-struct.rs:17:5
    |
 LL | fn foo(mut x: Ref, y: &u32) {
-   |               ---     - let's call the lifetime of this reference `'1`
-   |               |
-   |               lifetime `'2` appears in this type
+   |        -----          - let's call the lifetime of this reference `'1`
+   |        |
+   |        has type `Ref<'_, '2>`
 LL |     x.b = y; //~ ERROR lifetime mismatch
    |     ^^^^^^^ requires that `'1` must outlive `'2`
 

diff --git a/src/test/ui/nll/issue-52742.rs b/src/test/ui/nll/issue-52742.rs
index 84d06a1d20aac76485ed819f553df31cff08644b..c36e4cc70fd58abcee5a4fa8c1380785ed09b26f 100644 (file)
--- a/src/test/ui/nll/issue-52742.rs
+++ b/src/test/ui/nll/issue-52742.rs
@@ -10,6 +10,7 @@
 
 #![feature(nll)]
 #![feature(in_band_lifetimes)]
+#![feature(impl_header_lifetime_elision)]
 
 struct Foo<'a, 'b> {
     x: &'a u32,

diff --git a/src/test/ui/nll/issue-52742.stderr b/src/test/ui/nll/issue-52742.stderr
index d1b830b9dfc29b5532f30615358597447250b25b..515ba55cf6f5b8f7bbbe951396d0fa39846ca8e9 100644 (file)
--- a/src/test/ui/nll/issue-52742.stderr
+++ b/src/test/ui/nll/issue-52742.stderr
@@ -1,5 +1,5 @@
 error: unsatisfied lifetime constraints
-  --> $DIR/issue-52742.rs:25:9
+  --> $DIR/issue-52742.rs:26:9
    |
 LL |     fn take_bar(&mut self, b: Bar<'_>) {
    |                 ---------         -- let's call this `'1`