diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2019-10-02 14:17:38 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2019-10-02 14:17:38 -0400 |
| commit | dce20bf62a37cd8b22858c6f23de62cd36404fa1 (patch) | |
| tree | 7fb243f1a0e33336c965c9f16bb14c2170858762 | |
| parent | 81cd596bc57f5a02b8de14c70a2ed2fc31ca3dfd (diff) | |
| download | rust-dce20bf62a37cd8b22858c6f23de62cd36404fa1.tar.gz rust-dce20bf62a37cd8b22858c6f23de62cd36404fa1.zip | |
WIP fix tests
20 files changed, 221 insertions, 187 deletions
diff --git a/src/test/ui/async-await/async-block-control-flow-static-semantics.rs b/src/test/ui/async-await/async-block-control-flow-static-semantics.rs index 753a4e49155..971d4476334 100644 --- a/src/test/ui/async-await/async-block-control-flow-static-semantics.rs +++ b/src/test/ui/async-await/async-block-control-flow-static-semantics.rs @@ -20,7 +20,7 @@ fn return_targets_async_block_not_fn() -> u8 { } async fn return_targets_async_block_not_async_fn() -> u8 { - //~^ ERROR type mismatch resolving + //~^ ERROR mismatched types let block = async { return 0u8; }; diff --git a/src/test/ui/async-await/async-block-control-flow-static-semantics.stderr b/src/test/ui/async-await/async-block-control-flow-static-semantics.stderr index c36caa5586f..a9b0e7ae779 100644 --- a/src/test/ui/async-await/async-block-control-flow-static-semantics.stderr +++ b/src/test/ui/async-await/async-block-control-flow-static-semantics.stderr @@ -39,6 +39,22 @@ LL | let _: &dyn Future<Output = ()> = █ found type `()` = note: required for the cast to the object type `dyn std::future::Future<Output = ()>` +error[E0308]: mismatched types + --> $DIR/async-block-control-flow-static-semantics.rs:22:58 + | +LL | async fn return_targets_async_block_not_async_fn() -> u8 { + | __________________________________________________________^ +LL | | +LL | | let block = async { +LL | | return 0u8; +... | +LL | | +LL | | } + | |_^ expected u8, found () + | + = note: expected type `u8` + found type `()` + error[E0271]: type mismatch resolving `<impl std::future::Future as std::future::Future>::Output == ()` --> $DIR/async-block-control-flow-static-semantics.rs:27:39 | @@ -49,16 +65,6 @@ LL | let _: &dyn Future<Output = ()> = █ found type `()` = note: required for the cast to the object type `dyn std::future::Future<Output = ()>` -error[E0271]: type mismatch resolving `<impl std::future::Future as std::future::Future>::Output == u8` - --> $DIR/async-block-control-flow-static-semantics.rs:22:55 - | -LL | async fn return_targets_async_block_not_async_fn() -> u8 { - | ^^ expected (), found u8 - | - = note: expected type `()` - found type `u8` - = note: the return type of a function must have a statically known size - error[E0308]: mismatched types --> $DIR/async-block-control-flow-static-semantics.rs:48:44 | diff --git a/src/test/ui/async-await/async-error-span.rs b/src/test/ui/async-await/async-error-span.rs index dec3ac0f685..0559e627643 100644 --- a/src/test/ui/async-await/async-error-span.rs +++ b/src/test/ui/async-await/async-error-span.rs @@ -9,7 +9,7 @@ fn get_future() -> impl Future<Output = ()> { } async fn foo() { - let a; //~ ERROR type inside `async` object must be known in this context + let a; //~ ERROR type inside `async` fn body must be known in this context get_future().await; } diff --git a/src/test/ui/async-await/async-error-span.stderr b/src/test/ui/async-await/async-error-span.stderr index 47441f5e4ef..384029f3aa5 100644 --- a/src/test/ui/async-await/async-error-span.stderr +++ b/src/test/ui/async-await/async-error-span.stderr @@ -1,10 +1,10 @@ -error[E0698]: type inside `async` object must be known in this context +error[E0698]: type inside `async` fn body must be known in this context --> $DIR/async-error-span.rs:12:9 | LL | let a; | ^ cannot infer type | -note: the type is part of the `async` object because of this `await` +note: the type is part of the `async` fn body because of this `await` --> $DIR/async-error-span.rs:13:5 | LL | get_future().await; diff --git a/src/test/ui/async-await/issues/issue-63388-1.rs b/src/test/ui/async-await/issues/issue-63388-1.rs index 3cde5de2198..baecf49c798 100644 --- a/src/test/ui/async-await/issues/issue-63388-1.rs +++ b/src/test/ui/async-await/issues/issue-63388-1.rs @@ -9,9 +9,9 @@ trait Foo {} impl Xyz { async fn do_sth<'a>( &'a self, foo: &dyn Foo - ) -> &dyn Foo //~ ERROR lifetime mismatch + ) -> &dyn Foo { - foo + foo //~ ERROR lifetime mismatch } } diff --git a/src/test/ui/async-await/issues/issue-63388-1.stderr b/src/test/ui/async-await/issues/issue-63388-1.stderr index a54cadb0cd2..2917fa9ccb7 100644 --- a/src/test/ui/async-await/issues/issue-63388-1.stderr +++ b/src/test/ui/async-await/issues/issue-63388-1.stderr @@ -1,12 +1,13 @@ error[E0623]: lifetime mismatch - --> $DIR/issue-63388-1.rs:12:10 + --> $DIR/issue-63388-1.rs:14:9 | LL | &'a self, foo: &dyn Foo | -------- this parameter and the return type are declared with different lifetimes... LL | ) -> &dyn Foo - | ^^^^^^^^ - | | - | ...but data from `foo` is returned here + | -------- +LL | { +LL | foo + | ^^^ ...but data from `foo` is returned here error: aborting due to previous error diff --git a/src/test/ui/async-await/issues/issue-63388-2.stderr b/src/test/ui/async-await/issues/issue-63388-2.stderr index 1edeb3d5493..5099297fbeb 100644 --- a/src/test/ui/async-await/issues/issue-63388-2.stderr +++ b/src/test/ui/async-await/issues/issue-63388-2.stderr @@ -11,8 +11,9 @@ error: cannot infer an appropriate lifetime | LL | foo: &dyn Foo, bar: &'a dyn Foo | ^^^ ...but this borrow... -LL | ) -> &dyn Foo - | -------- this return type evaluates to the `'static` lifetime... +... +LL | foo + | --- this return type evaluates to the `'static` lifetime... | note: ...can't outlive the lifetime '_ as defined on the method body at 11:14 --> $DIR/issue-63388-2.rs:11:14 @@ -21,8 +22,8 @@ LL | foo: &dyn Foo, bar: &'a dyn Foo | ^ help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime '_ as defined on the method body at 11:14 | -LL | ) -> &dyn Foo + '_ - | ^^^^^^^^^^^^^ +LL | foo + '_ + | error: aborting due to 2 previous errors diff --git a/src/test/ui/async-await/unresolved_type_param.rs b/src/test/ui/async-await/unresolved_type_param.rs index d8ea87d2775..8d035d038ab 100644 --- a/src/test/ui/async-await/unresolved_type_param.rs +++ b/src/test/ui/async-await/unresolved_type_param.rs @@ -7,9 +7,9 @@ async fn bar<T>() -> () {} async fn foo() { bar().await; - //~^ ERROR type inside `async` object must be known in this context + //~^ ERROR type inside `async` fn body must be known in this context //~| NOTE cannot infer type for `T` - //~| NOTE the type is part of the `async` object because of this `await` + //~| NOTE the type is part of the `async` fn body because of this `await` //~| NOTE in this expansion of desugaring of `await` } fn main() {} diff --git a/src/test/ui/async-await/unresolved_type_param.stderr b/src/test/ui/async-await/unresolved_type_param.stderr index f3090a2b980..652f15cffe2 100644 --- a/src/test/ui/async-await/unresolved_type_param.stderr +++ b/src/test/ui/async-await/unresolved_type_param.stderr @@ -1,10 +1,10 @@ -error[E0698]: type inside `async` object must be known in this context +error[E0698]: type inside `async` fn body must be known in this context --> $DIR/unresolved_type_param.rs:9:5 | LL | bar().await; | ^^^ cannot infer type for `T` | -note: the type is part of the `async` object because of this `await` +note: the type is part of the `async` fn body because of this `await` --> $DIR/unresolved_type_param.rs:9:5 | LL | bar().await; diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr index 57ad026bdcf..e3c261576e6 100644 --- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr +++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.stderr @@ -1,28 +1,25 @@ error[E0623]: lifetime mismatch - --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:8:45 + --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:8:52 | LL | async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f } - | ---- ^^^^ - | | | - | | ...but data from `f` is returned here + | ---- ---- ^ ...but data from `f` is returned here + | | | this parameter and the return type are declared with different lifetimes... error[E0623]: lifetime mismatch - --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:11:55 + --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:11:82 | LL | async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) } - | ----- ^^^^^^^^^^^^^^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ----------------- ^ ...but data from `f` is returned here + | | | this parameter and the return type are declared with different lifetimes... error[E0623]: lifetime mismatch - --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:17:58 + --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:17:64 | LL | async fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg } - | ----- ^^^ - | | | - | | ...but data from `arg` is returned here + | ----- --- ^^^ ...but data from `arg` is returned here + | | | this parameter and the return type are declared with different lifetimes... error: aborting due to 3 previous errors diff --git a/src/test/ui/self/elision/lt-ref-self-async.rs b/src/test/ui/self/elision/lt-ref-self-async.rs index e3ca0c2e2dd..5aba7cfcf29 100644 --- a/src/test/ui/self/elision/lt-ref-self-async.rs +++ b/src/test/ui/self/elision/lt-ref-self-async.rs @@ -11,29 +11,29 @@ impl<'a> Struct<'a> { // Test using `&self` sugar: async fn ref_self(&self, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } // Test using `&Self` explicitly: async fn ref_Self(self: &Self, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_pin_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } } diff --git a/src/test/ui/self/elision/lt-ref-self-async.stderr b/src/test/ui/self/elision/lt-ref-self-async.stderr index 2bc64bdf1f7..6b668d9f1f6 100644 --- a/src/test/ui/self/elision/lt-ref-self-async.stderr +++ b/src/test/ui/self/elision/lt-ref-self-async.stderr @@ -1,56 +1,62 @@ error[E0623]: lifetime mismatch - --> $DIR/lt-ref-self-async.rs:13:42 + --> $DIR/lt-ref-self-async.rs:14:9 | LL | async fn ref_self(&self, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/lt-ref-self-async.rs:19:48 + --> $DIR/lt-ref-self-async.rs:20:9 | LL | async fn ref_Self(self: &Self, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/lt-ref-self-async.rs:23:57 + --> $DIR/lt-ref-self-async.rs:24:9 | LL | async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/lt-ref-self-async.rs:27:57 + --> $DIR/lt-ref-self-async.rs:28:9 | LL | async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/lt-ref-self-async.rs:31:66 + --> $DIR/lt-ref-self-async.rs:32:9 | LL | async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/lt-ref-self-async.rs:35:62 + --> $DIR/lt-ref-self-async.rs:36:9 | LL | async fn box_pin_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error: aborting due to 6 previous errors diff --git a/src/test/ui/self/elision/ref-mut-self-async.rs b/src/test/ui/self/elision/ref-mut-self-async.rs index 2ca14800a75..b8eb416d904 100644 --- a/src/test/ui/self/elision/ref-mut-self-async.rs +++ b/src/test/ui/self/elision/ref-mut-self-async.rs @@ -10,30 +10,30 @@ struct Struct { } impl Struct { // Test using `&mut self` sugar: - async fn ref_self(&mut self, f: &u32) -> &u32 { //~ ERROR lifetime mismatch - f + async fn ref_self(&mut self, f: &u32) -> &u32 { + f //~ ERROR lifetime mismatch } // Test using `&mut Self` explicitly: async fn ref_Self(self: &mut Self, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } } diff --git a/src/test/ui/self/elision/ref-mut-self-async.stderr b/src/test/ui/self/elision/ref-mut-self-async.stderr index 39a1b30ca53..29fbec9fa7a 100644 --- a/src/test/ui/self/elision/ref-mut-self-async.stderr +++ b/src/test/ui/self/elision/ref-mut-self-async.stderr @@ -1,56 +1,62 @@ error[E0623]: lifetime mismatch - --> $DIR/ref-mut-self-async.rs:13:46 + --> $DIR/ref-mut-self-async.rs:14:9 | LL | async fn ref_self(&mut self, f: &u32) -> &u32 { - | --------- ^^^^ - | | | - | | ...but data from `f` is returned here + | --------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-self-async.rs:19:52 + --> $DIR/ref-mut-self-async.rs:20:9 | LL | async fn ref_Self(self: &mut Self, f: &u32) -> &u32 { - | --------- ^^^^ - | | | - | | ...but data from `f` is returned here + | --------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-self-async.rs:23:61 + --> $DIR/ref-mut-self-async.rs:24:9 | LL | async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 { - | --------- ^^^^ - | | | - | | ...but data from `f` is returned here + | --------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-self-async.rs:27:61 + --> $DIR/ref-mut-self-async.rs:28:9 | LL | async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 { - | --------- ^^^^ - | | | - | | ...but data from `f` is returned here + | --------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-self-async.rs:31:70 + --> $DIR/ref-mut-self-async.rs:32:9 | LL | async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 { - | --------- ^^^^ - | | | - | | ...but data from `f` is returned here + | --------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-self-async.rs:35:70 + --> $DIR/ref-mut-self-async.rs:36:9 | LL | async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 { - | --------- ^^^^ - | | | - | | ...but data from `f` is returned here + | --------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error: aborting due to 6 previous errors diff --git a/src/test/ui/self/elision/ref-mut-struct-async.rs b/src/test/ui/self/elision/ref-mut-struct-async.rs index a671116de25..1822a9a468b 100644 --- a/src/test/ui/self/elision/ref-mut-struct-async.rs +++ b/src/test/ui/self/elision/ref-mut-struct-async.rs @@ -11,23 +11,23 @@ impl Struct { // Test using `&mut Struct` explicitly: async fn ref_Struct(self: &mut Struct, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_ref_Struct(self: Box<&mut Struct>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn pin_ref_Struct(self: Pin<&mut Struct>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_box_ref_Struct(self: Box<Box<&mut Struct>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_pin_ref_Struct(self: Box<Pin<&mut Struct>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } } diff --git a/src/test/ui/self/elision/ref-mut-struct-async.stderr b/src/test/ui/self/elision/ref-mut-struct-async.stderr index fe4a636ada6..46591bfc958 100644 --- a/src/test/ui/self/elision/ref-mut-struct-async.stderr +++ b/src/test/ui/self/elision/ref-mut-struct-async.stderr @@ -1,47 +1,52 @@ error[E0623]: lifetime mismatch - --> $DIR/ref-mut-struct-async.rs:13:56 + --> $DIR/ref-mut-struct-async.rs:14:9 | LL | async fn ref_Struct(self: &mut Struct, f: &u32) -> &u32 { - | ----------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-struct-async.rs:17:65 + --> $DIR/ref-mut-struct-async.rs:18:9 | LL | async fn box_ref_Struct(self: Box<&mut Struct>, f: &u32) -> &u32 { - | ----------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-struct-async.rs:21:65 + --> $DIR/ref-mut-struct-async.rs:22:9 | LL | async fn pin_ref_Struct(self: Pin<&mut Struct>, f: &u32) -> &u32 { - | ----------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-struct-async.rs:25:74 + --> $DIR/ref-mut-struct-async.rs:26:9 | LL | async fn box_box_ref_Struct(self: Box<Box<&mut Struct>>, f: &u32) -> &u32 { - | ----------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-mut-struct-async.rs:29:74 + --> $DIR/ref-mut-struct-async.rs:30:9 | LL | async fn box_pin_ref_Struct(self: Box<Pin<&mut Struct>>, f: &u32) -> &u32 { - | ----------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error: aborting due to 5 previous errors diff --git a/src/test/ui/self/elision/ref-self-async.rs b/src/test/ui/self/elision/ref-self-async.rs index 06f3b127b21..9425fbfca8f 100644 --- a/src/test/ui/self/elision/ref-self-async.rs +++ b/src/test/ui/self/elision/ref-self-async.rs @@ -19,34 +19,34 @@ impl<T, P> Deref for Wrap<T, P> { impl Struct { // Test using `&self` sugar: - async fn ref_self(&self, f: &u32) -> &u32 { //~ ERROR lifetime mismatch - f + async fn ref_self(&self, f: &u32) -> &u32 { + f //~ ERROR lifetime mismatch } // Test using `&Self` explicitly: async fn ref_Self(self: &Self, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_pin_ref_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn wrap_ref_Self_Self(self: Wrap<&Self, Self>, f: &u8) -> &u8 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } } diff --git a/src/test/ui/self/elision/ref-self-async.stderr b/src/test/ui/self/elision/ref-self-async.stderr index 2f9e2a01e34..c255d189363 100644 --- a/src/test/ui/self/elision/ref-self-async.stderr +++ b/src/test/ui/self/elision/ref-self-async.stderr @@ -1,65 +1,72 @@ error[E0623]: lifetime mismatch - --> $DIR/ref-self-async.rs:22:42 + --> $DIR/ref-self-async.rs:23:9 | LL | async fn ref_self(&self, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-self-async.rs:28:48 + --> $DIR/ref-self-async.rs:29:9 | LL | async fn ref_Self(self: &Self, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-self-async.rs:32:57 + --> $DIR/ref-self-async.rs:33:9 | LL | async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-self-async.rs:36:57 + --> $DIR/ref-self-async.rs:37:9 | LL | async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-self-async.rs:40:66 + --> $DIR/ref-self-async.rs:41:9 | LL | async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-self-async.rs:44:66 + --> $DIR/ref-self-async.rs:45:9 | LL | async fn box_pin_ref_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 { - | ----- ^^^^ - | | | - | | ...but data from `f` is returned here + | ----- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-self-async.rs:48:69 + --> $DIR/ref-self-async.rs:49:9 | LL | async fn wrap_ref_Self_Self(self: Wrap<&Self, Self>, f: &u8) -> &u8 { - | ----- ^^^ - | | | - | | ...but data from `f` is returned here + | ----- --- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error: aborting due to 7 previous errors diff --git a/src/test/ui/self/elision/ref-struct-async.rs b/src/test/ui/self/elision/ref-struct-async.rs index 94eaeedc734..64c84c4cd2e 100644 --- a/src/test/ui/self/elision/ref-struct-async.rs +++ b/src/test/ui/self/elision/ref-struct-async.rs @@ -11,23 +11,23 @@ impl Struct { // Test using `&Struct` explicitly: async fn ref_Struct(self: &Struct, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_ref_Struct(self: Box<&Struct>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn pin_ref_Struct(self: Pin<&Struct>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_box_ref_Struct(self: Box<Box<&Struct>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } async fn box_pin_Struct(self: Box<Pin<&Struct>>, f: &u32) -> &u32 { - f //~^ ERROR lifetime mismatch + f //~ ERROR lifetime mismatch } } diff --git a/src/test/ui/self/elision/ref-struct-async.stderr b/src/test/ui/self/elision/ref-struct-async.stderr index 222e27ebf0d..c70facc931e 100644 --- a/src/test/ui/self/elision/ref-struct-async.stderr +++ b/src/test/ui/self/elision/ref-struct-async.stderr @@ -1,47 +1,52 @@ error[E0623]: lifetime mismatch - --> $DIR/ref-struct-async.rs:13:52 + --> $DIR/ref-struct-async.rs:14:9 | LL | async fn ref_Struct(self: &Struct, f: &u32) -> &u32 { - | ------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-struct-async.rs:17:61 + --> $DIR/ref-struct-async.rs:18:9 | LL | async fn box_ref_Struct(self: Box<&Struct>, f: &u32) -> &u32 { - | ------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-struct-async.rs:21:61 + --> $DIR/ref-struct-async.rs:22:9 | LL | async fn pin_ref_Struct(self: Pin<&Struct>, f: &u32) -> &u32 { - | ------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-struct-async.rs:25:70 + --> $DIR/ref-struct-async.rs:26:9 | LL | async fn box_box_ref_Struct(self: Box<Box<&Struct>>, f: &u32) -> &u32 { - | ------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error[E0623]: lifetime mismatch - --> $DIR/ref-struct-async.rs:29:66 + --> $DIR/ref-struct-async.rs:30:9 | LL | async fn box_pin_Struct(self: Box<Pin<&Struct>>, f: &u32) -> &u32 { - | ------- ^^^^ - | | | - | | ...but data from `f` is returned here + | ------- ---- + | | | this parameter and the return type are declared with different lifetimes... +LL | f + | ^ ...but data from `f` is returned here error: aborting due to 5 previous errors |