Bless nll tests

oli-obk · oli-obk · commit 09d1774c6cba · 2021-10-08T18:30:58.000Z
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.nll.stderr b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.nll.stderr
@@ -2,13 +2,14 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
   --> $DIR/ordinary-bounds-unrelated.rs:16:74
    |
 LL | fn upper_bounds<'a, 'b, 'c, 'd, 'e>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'d, 'e>
-   |                                                                          ^^^^^^^^^^^^^^^^^^
+   |                     --                                                   ^^^^^^^^^^^^^^^^^^
+   |                     |
+   |                     hidden type `Ordinary<'b>` captures the lifetime `'b` as defined here
    |
-note: hidden type `Ordinary<'b>` captures the lifetime `'b` as defined on the function body at 16:21
-  --> $DIR/ordinary-bounds-unrelated.rs:16:21
+help: to declare that the `impl Trait` captures 'b, you can add an explicit `'b` lifetime bound
    |
-LL | fn upper_bounds<'a, 'b, 'c, 'd, 'e>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'d, 'e>
-   |                     ^^
+LL | fn upper_bounds<'a, 'b, 'c, 'd, 'e>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'d, 'e> + 'b
+   |                                                                                             ++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.nll.stderr b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.nll.stderr
@@ -2,13 +2,14 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
   --> $DIR/ordinary-bounds-unsuited.rs:18:62
    |
 LL | fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b>
-   |                                                              ^^^^^^^^^^^^^^^^^^
+   |                     --                                       ^^^^^^^^^^^^^^^^^^
+   |                     |
+   |                     hidden type `Ordinary<'b>` captures the lifetime `'b` as defined here
    |
-note: hidden type `Ordinary<'b>` captures the lifetime `'b` as defined on the function body at 18:21
-  --> $DIR/ordinary-bounds-unsuited.rs:18:21
+help: to declare that the `impl Trait` captures 'b, you can add an explicit `'b` lifetime bound
    |
-LL | fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b>
-   |                     ^^
+LL | fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b> + 'b
+   |                                                                                 ++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.nll.stderr b/src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-2.nll.stderr
@@ -7,7 +7,7 @@ LL | |         t.test();
 LL | |     });
    | |______^
    |
-note: the parameter type `T` must be valid for the anonymous lifetime defined on the function body at 19:24...
+note: the parameter type `T` must be valid for the anonymous lifetime defined here...
   --> $DIR/missing-lifetimes-in-signature-2.rs:19:24
    |
 LL | fn func<T: Test>(foo: &Foo, t: T) {

Original file line number	Diff line number	Diff line change
@@ -2,13 +2,14 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
`2`	`2`	`--> $DIR/ordinary-bounds-unrelated.rs:16:74`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn upper_bounds<'a, 'b, 'c, 'd, 'e>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'d, 'e>`
`5`		`- \| ^^^^^^^^^^^^^^^^^^`
	`5`	`+ \| -- ^^^^^^^^^^^^^^^^^^`
	`6`	`+ \| \|`
	`7`	+ \| hidden type `Ordinary<'b>` captures the lifetime `'b` as defined here
`6`	`8`	`\|`
`7`		-note: hidden type `Ordinary<'b>` captures the lifetime `'b` as defined on the function body at 16:21
`8`		`- --> $DIR/ordinary-bounds-unrelated.rs:16:21`
	`9`	+help: to declare that the `impl Trait` captures 'b, you can add an explicit `'b` lifetime bound
`9`	`10`	`\|`
`10`		`-LL \| fn upper_bounds<'a, 'b, 'c, 'd, 'e>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'d, 'e>`
`11`		`- \| ^^`
	`11`	`+LL \| fn upper_bounds<'a, 'b, 'c, 'd, 'e>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'d, 'e> + 'b`
	`12`	`+ \| ++++`
`12`	`13`
`13`	`14`	`error: aborting due to previous error`
`14`	`15`
Original file line number	Diff line number	Diff line change
@@ -2,13 +2,14 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
`2`	`2`	`--> $DIR/ordinary-bounds-unsuited.rs:18:62`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b>`
`5`		`- \| ^^^^^^^^^^^^^^^^^^`
	`5`	`+ \| -- ^^^^^^^^^^^^^^^^^^`
	`6`	`+ \| \|`
	`7`	+ \| hidden type `Ordinary<'b>` captures the lifetime `'b` as defined here
`6`	`8`	`\|`
`7`		-note: hidden type `Ordinary<'b>` captures the lifetime `'b` as defined on the function body at 18:21
`8`		`- --> $DIR/ordinary-bounds-unsuited.rs:18:21`
	`9`	+help: to declare that the `impl Trait` captures 'b, you can add an explicit `'b` lifetime bound
`9`	`10`	`\|`
`10`		`-LL \| fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b>`
`11`		`- \| ^^`
	`11`	`+LL \| fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b> + 'b`
	`12`	`+ \| ++++`
`12`	`13`
`13`	`14`	`error: aborting due to previous error`
`14`	`15`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| \| t.test();`
`7`	`7`	`LL \| \| });`
`8`	`8`	`\| \|______^`
`9`	`9`	`\|`
`10`		-note: the parameter type `T` must be valid for the anonymous lifetime defined on the function body at 19:24...
	`10`	+note: the parameter type `T` must be valid for the anonymous lifetime defined here...
`11`	`11`	`--> $DIR/missing-lifetimes-in-signature-2.rs:19:24`
`12`	`12`	`\|`
`13`	`13`	`LL \| fn func<T: Test>(foo: &Foo, t: T) {`