Skip to content

Commit

Permalink
./x.py test --bless --compare-mode=nll
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikomatsakis
nikomatsakis committed Oct 3, 2019
1 parent 19c07cc commit a807032
Show file tree
Hide file tree
Showing 6 changed files with 258 additions and 288 deletions.
15 changes: 7 additions & 8 deletions src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.nll.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ LL | async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
= note: hidden type `impl std::future::Future` captures lifetime '_#15r

error: lifetime may not live long enough
--> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:8:50
--> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:8:52
|
LL | async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
| - ^^^^^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
| - ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
| |
| lifetime `'_` defined here
| lifetime `'_` defined here

error: lifetime may not live long enough
--> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:11:73
--> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:11:75
|
LL | async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
| - ^^^^^^^^^^^^^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
| - ^^^^^^^^^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
Expand All @@ -33,12 +33,11 @@ LL | async fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg }
= note: hidden type `impl std::future::Future` captures lifetime '_#15r

error: lifetime may not live long enough
--> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:17:62
--> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:17:64
|
LL | async fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg }
| -- - ^^^^^^^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'a`
| | |
| | lifetime `'_` defined here
| -- - lifetime `'_` defined here ^^^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'a`
| |
| lifetime `'a` defined here

error: aborting due to 5 previous errors
Expand Down
114 changes: 54 additions & 60 deletions src/test/ui/self/elision/lt-ref-self-async.nll.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ LL | async fn ref_self(&self, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#23r

error: lifetime may not live long enough
--> $DIR/lt-ref-self-async.rs:13:47
|
LL | async fn ref_self(&self, f: &u32) -> &u32 {
| _______________________-_______________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/lt-ref-self-async.rs:14:9
|
LL | async fn ref_self(&self, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/lt-ref-self-async.rs:19:48
Expand All @@ -27,16 +26,15 @@ LL | async fn ref_Self(self: &Self, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#23r

error: lifetime may not live long enough
--> $DIR/lt-ref-self-async.rs:19:53
|
LL | async fn ref_Self(self: &Self, f: &u32) -> &u32 {
| _____________________________-_______________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/lt-ref-self-async.rs:20:9
|
LL | async fn ref_Self(self: &Self, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/lt-ref-self-async.rs:23:57
Expand All @@ -47,16 +45,15 @@ LL | async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#23r

error: lifetime may not live long enough
--> $DIR/lt-ref-self-async.rs:23:62
|
LL | async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
| _____________________________________-________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/lt-ref-self-async.rs:24:9
|
LL | async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/lt-ref-self-async.rs:27:57
Expand All @@ -67,16 +64,15 @@ LL | async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#23r

error: lifetime may not live long enough
--> $DIR/lt-ref-self-async.rs:27:62
|
LL | async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
| _____________________________________-________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/lt-ref-self-async.rs:28:9
|
LL | async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/lt-ref-self-async.rs:31:66
Expand All @@ -87,16 +83,15 @@ LL | async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#23r

error: lifetime may not live long enough
--> $DIR/lt-ref-self-async.rs:31:71
|
LL | async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
| _____________________________________________-_________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/lt-ref-self-async.rs:32:9
|
LL | async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/lt-ref-self-async.rs:35:62
Expand All @@ -107,16 +102,15 @@ LL | async fn box_pin_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#23r

error: lifetime may not live long enough
--> $DIR/lt-ref-self-async.rs:35:67
|
LL | async fn box_pin_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
| _________________________________________-_________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/lt-ref-self-async.rs:36:9
|
LL | async fn box_pin_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error: aborting due to 12 previous errors

Expand Down
114 changes: 54 additions & 60 deletions src/test/ui/self/elision/ref-mut-self-async.nll.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ LL | async fn ref_self(&mut self, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#15r

error: lifetime may not live long enough
--> $DIR/ref-mut-self-async.rs:13:51
|
LL | async fn ref_self(&mut self, f: &u32) -> &u32 {
| _______________________-___________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/ref-mut-self-async.rs:14:9
|
LL | async fn ref_self(&mut self, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/ref-mut-self-async.rs:19:52
Expand All @@ -27,16 +26,15 @@ LL | async fn ref_Self(self: &mut Self, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#15r

error: lifetime may not live long enough
--> $DIR/ref-mut-self-async.rs:19:57
|
LL | async fn ref_Self(self: &mut Self, f: &u32) -> &u32 {
| _____________________________-___________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/ref-mut-self-async.rs:20:9
|
LL | async fn ref_Self(self: &mut Self, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/ref-mut-self-async.rs:23:61
Expand All @@ -47,16 +45,15 @@ LL | async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#15r

error: lifetime may not live long enough
--> $DIR/ref-mut-self-async.rs:23:66
|
LL | async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 {
| _____________________________________-____________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/ref-mut-self-async.rs:24:9
|
LL | async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/ref-mut-self-async.rs:27:61
Expand All @@ -67,16 +64,15 @@ LL | async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#15r

error: lifetime may not live long enough
--> $DIR/ref-mut-self-async.rs:27:66
|
LL | async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 {
| _____________________________________-____________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/ref-mut-self-async.rs:28:9
|
LL | async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/ref-mut-self-async.rs:31:70
Expand All @@ -87,16 +83,15 @@ LL | async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#15r

error: lifetime may not live long enough
--> $DIR/ref-mut-self-async.rs:31:75
|
LL | async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 {
| _____________________________________________-_____________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/ref-mut-self-async.rs:32:9
|
LL | async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
--> $DIR/ref-mut-self-async.rs:35:70
Expand All @@ -107,16 +102,15 @@ LL | async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 {
= note: hidden type `impl std::future::Future` captures lifetime '_#15r

error: lifetime may not live long enough
--> $DIR/ref-mut-self-async.rs:35:75
|
LL | async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 {
| _____________________________________________-_____________________________^
| | |
| | lifetime `'_` defined here
| | lifetime `'_` defined here
LL | | f
LL | | }
| |_____^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`
--> $DIR/ref-mut-self-async.rs:36:9
|
LL | async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 {
| -
| |
| lifetime `'_` defined here
| lifetime `'_` defined here
LL | f
| ^ function was supposed to return data with lifetime `'_` but it is returning data with lifetime `'_`

error: aborting due to 12 previous errors

Expand Down
Loading

0 comments on commit a807032

Please sign in to comment.