forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#120103 - compiler-errors:concrete-afits, r=…
…oli-obk Make it so that async-fn-in-trait is compatible with a concrete future in implementation There's no technical reason why an AFIT like `async fn foo()` cannot be satisfied with an implementation signature like `fn foo() -> Pin<Box<dyn Future<Output = ()> + 'static>>`. We rejected this previously because we were uncertain about how AFITs worked with refinement, but I don't believe this needs to be a restriction any longer. r? oli-obk
- Loading branch information
Showing
9 changed files
with
117 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 5 additions & 2 deletions
7
tests/ui/async-await/in-trait/async-example-desugared-boxed.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 16 additions & 5 deletions
21
tests/ui/async-await/in-trait/async-example-desugared-boxed.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,22 @@ | ||
error: method `foo` should be async because the method from the trait is async | ||
--> $DIR/async-example-desugared-boxed.rs:11:5 | ||
warning: impl trait in impl method signature does not match trait method signature | ||
--> $DIR/async-example-desugared-boxed.rs:14:22 | ||
| | ||
LL | async fn foo(&self) -> i32; | ||
| --------------------------- required because the trait method is async | ||
| --------------------------- return type from trait method defined here | ||
... | ||
LL | fn foo(&self) -> Pin<Box<dyn Future<Output = i32> + '_>> { | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | ||
= note: add `#[allow(refining_impl_trait)]` if it is intended for this to be part of the public API of this crate | ||
note: the lint level is defined here | ||
--> $DIR/async-example-desugared-boxed.rs:13:12 | ||
| | ||
LL | #[warn(refining_impl_trait)] | ||
| ^^^^^^^^^^^^^^^^^^^ | ||
help: replace the return type so that it matches the trait | ||
| | ||
LL | fn foo(&self) -> impl Future<Output = i32> { | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
||
error: aborting due to 1 previous error | ||
warning: 1 warning emitted | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 16 additions & 5 deletions
21
tests/ui/async-await/in-trait/async-example-desugared-manual.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,22 @@ | ||
error: method `foo` should be async because the method from the trait is async | ||
--> $DIR/async-example-desugared-manual.rs:19:5 | ||
warning: impl trait in impl method signature does not match trait method signature | ||
--> $DIR/async-example-desugared-manual.rs:22:22 | ||
| | ||
LL | async fn foo(&self) -> i32; | ||
| --------------------------- required because the trait method is async | ||
| --------------------------- return type from trait method defined here | ||
... | ||
LL | fn foo(&self) -> MyFuture { | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| ^^^^^^^^ | ||
| | ||
= note: add `#[allow(refining_impl_trait)]` if it is intended for this to be part of the public API of this crate | ||
note: the lint level is defined here | ||
--> $DIR/async-example-desugared-manual.rs:21:12 | ||
| | ||
LL | #[warn(refining_impl_trait)] | ||
| ^^^^^^^^^^^^^^^^^^^ | ||
help: replace the return type so that it matches the trait | ||
| | ||
LL | fn foo(&self) -> impl Future<Output = i32> { | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
||
error: aborting due to 1 previous error | ||
warning: 1 warning emitted | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,14 @@ | ||
error: method `foo` should be async because the method from the trait is async | ||
error: method should be `async` or return a future, but it is synchronous | ||
--> $DIR/fn-not-async-err.rs:10:5 | ||
| | ||
LL | async fn foo(&self) -> i32; | ||
| --------------------------- required because the trait method is async | ||
... | ||
LL | fn foo(&self) -> i32 { | ||
| ^^^^^^^^^^^^^^^^^^^^ | ||
| | ||
note: this method is `async` so it expects a future to be returned | ||
--> $DIR/fn-not-async-err.rs:6:5 | ||
| | ||
LL | async fn foo(&self) -> i32; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: aborting due to 1 previous error | ||
|