Skip to content

Commit d103852

Browse files
committed
bless nll tests
1 parent f2d2fd3 commit d103852

6 files changed

+16
-20
lines changed

src/test/ui/async-await/multiple-lifetimes/ret-impl-trait-one.nll.stderr

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
error: lifetime may not live long enough
2-
--> $DIR/ret-impl-trait-one.rs:10:80
2+
--> $DIR/ret-impl-trait-one.rs:10:65
33
|
4-
LL | async fn async_ret_impl_trait1<'a, 'b>(a: &'a u8, b: &'b u8) -> impl Trait<'a> {
5-
| ________________________________--__--__________________________________________^
6-
| | | |
7-
| | | lifetime `'b` defined here
8-
| | lifetime `'a` defined here
9-
LL | |
10-
LL | | (a, b)
11-
LL | | }
12-
| |_^ function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'b`
4+
LL | async fn async_ret_impl_trait1<'a, 'b>(a: &'a u8, b: &'b u8) -> impl Trait<'a> {
5+
| -- -- ^^^^^^^^^^^^^^ opaque type requires that `'b` must outlive `'a`
6+
| | |
7+
| | lifetime `'b` defined here
8+
| lifetime `'a` defined here
139
|
1410
= help: consider adding the following bound: `'b: 'a`
1511

src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait-async.nll.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: lifetime may not live long enough
2-
--> $DIR/arbitrary_self_types_pin_lifetime_impl_trait-async.rs:8:48
2+
--> $DIR/arbitrary_self_types_pin_lifetime_impl_trait-async.rs:8:37
33
|
44
LL | async fn f(self: Pin<&Self>) -> impl Clone { self }
5-
| - ^^^^^^^^ returning this value requires that `'1` must outlive `'static`
5+
| - ^^^^^^^^^^ opaque type requires that `'1` must outlive `'static`
66
| |
77
| let's call the lifetime of this reference `'1`
88
|

src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.full_tait.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LL | type WrongGeneric<T> = impl 'static;
2828
found opaque type `impl Sized`
2929

3030
error[E0310]: the parameter type `T` may not live long enough
31-
--> $DIR/generic_type_does_not_live_long_enough.rs:17:30
31+
--> $DIR/generic_type_does_not_live_long_enough.rs:16:30
3232
|
3333
LL | fn wrong_generic<T>(t: T) -> WrongGeneric<T> {
3434
| ^^^^^^^^^^^^^^^

src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.min_tait.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ LL | type WrongGeneric<T> = impl 'static;
1919
found opaque type `impl Sized`
2020

2121
error[E0310]: the parameter type `T` may not live long enough
22-
--> $DIR/generic_type_does_not_live_long_enough.rs:17:30
22+
--> $DIR/generic_type_does_not_live_long_enough.rs:16:30
2323
|
2424
LL | fn wrong_generic<T>(t: T) -> WrongGeneric<T> {
2525
| ^^^^^^^^^^^^^^^

src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.full_tait.nll.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | #![cfg_attr(full_tait, feature(type_alias_impl_trait))]
88
= note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
99

1010
error: higher-ranked subtype error
11-
--> $DIR/issue-57611-trait-alias.rs:28:9
11+
--> $DIR/issue-57611-trait-alias.rs:24:9
1212
|
1313
LL | |x| x
1414
| ^^^^^
1515

1616
error: higher-ranked subtype error
17-
--> $DIR/issue-57611-trait-alias.rs:28:9
17+
--> $DIR/issue-57611-trait-alias.rs:24:9
1818
|
1919
LL | |x| x
2020
| ^^^^^
@@ -28,7 +28,7 @@ LL | type Bar = impl Baz<Self, Self>;
2828
= note: expected type `for<'r> Fn<(&'r X,)>`
2929
found type `Fn<(&'static X,)>`
3030
note: this closure does not fulfill the lifetime requirements
31-
--> $DIR/issue-57611-trait-alias.rs:28:9
31+
--> $DIR/issue-57611-trait-alias.rs:24:9
3232
|
3333
LL | |x| x
3434
| ^^^^^

src/test/ui/type-alias-impl-trait/issue-57611-trait-alias.min_tait.nll.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: higher-ranked subtype error
2-
--> $DIR/issue-57611-trait-alias.rs:28:9
2+
--> $DIR/issue-57611-trait-alias.rs:24:9
33
|
44
LL | |x| x
55
| ^^^^^
66

77
error: higher-ranked subtype error
8-
--> $DIR/issue-57611-trait-alias.rs:28:9
8+
--> $DIR/issue-57611-trait-alias.rs:24:9
99
|
1010
LL | |x| x
1111
| ^^^^^
@@ -19,7 +19,7 @@ LL | type Bar = impl Baz<Self, Self>;
1919
= note: expected type `for<'r> Fn<(&'r X,)>`
2020
found type `Fn<(&'static X,)>`
2121
note: this closure does not fulfill the lifetime requirements
22-
--> $DIR/issue-57611-trait-alias.rs:28:9
22+
--> $DIR/issue-57611-trait-alias.rs:24:9
2323
|
2424
LL | |x| x
2525
| ^^^^^

0 commit comments

Comments
 (0)