-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #103714 - matthiaskrgr:rollup-kajt3i8, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #102961 (Make `CStr::from_ptr` `const`.) - #103342 (Add test for issue 98634) - #103383 (Note scope of TAIT more accurately) - #103656 (Specialize ToString for Symbol) - #103663 (rustdoc: remove redundant CSS/DOM `div.search-container`) - #103664 (rustdoc-json-types: Improve ItemSummary::path docs) - #103704 (Add a test for TAIT used with impl/dyn Trait inside RPIT) Failed merges: - #103618 (Rename some `OwnerId` fields.) r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
16 changed files
with
232 additions
and
47 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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // edition: 2021 | ||
|
|
||
| use std::{ | ||
| future::Future, | ||
| pin::Pin, | ||
| task::{Context, Poll, Waker}, | ||
| }; | ||
|
|
||
| pub struct StructAsync<F: Fn() -> Pin<Box<dyn Future<Output = ()>>>> { | ||
| pub callback: F, | ||
| } | ||
|
|
||
| impl<F> Future for StructAsync<F> | ||
| where | ||
| F: Fn() -> Pin<Box<dyn Future<Output = ()>>>, | ||
| { | ||
| type Output = (); | ||
|
|
||
| fn poll(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Self::Output> { | ||
| Poll::Pending | ||
| } | ||
| } | ||
|
|
||
| async fn callback() {} | ||
|
|
||
| struct Runtime; | ||
|
|
||
| fn waker() -> &'static Waker { | ||
| todo!() | ||
| } | ||
|
|
||
| impl Runtime { | ||
| #[track_caller] | ||
| pub fn block_on<F: Future>(&self, mut future: F) -> F::Output { | ||
| loop { | ||
| unsafe { | ||
| Pin::new_unchecked(&mut future).poll(&mut Context::from_waker(waker())); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| Runtime.block_on(async { | ||
| StructAsync { callback }.await; | ||
| //~^ ERROR expected `fn() -> impl Future<Output = ()> {callback}` to be a fn item that returns `Pin<Box<(dyn Future<Output = ()> + 'static)>>`, but it returns `impl Future<Output = ()>` | ||
| //~| ERROR expected `fn() -> impl Future<Output = ()> {callback}` to be a fn item that returns `Pin<Box<(dyn Future<Output = ()> + 'static)>>`, but it returns `impl Future<Output = ()>` | ||
| //~| ERROR expected `fn() -> impl Future<Output = ()> {callback}` to be a fn item that returns `Pin<Box<(dyn Future<Output = ()> + 'static)>>`, but it returns `impl Future<Output = ()>` | ||
| }); | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| error[E0271]: expected `fn() -> impl Future<Output = ()> {callback}` to be a fn item that returns `Pin<Box<(dyn Future<Output = ()> + 'static)>>`, but it returns `impl Future<Output = ()>` | ||
| --> $DIR/issue-98634.rs:45:23 | ||
| | | ||
| LL | StructAsync { callback }.await; | ||
| | ^^^^^^^^ expected struct `Pin`, found opaque type | ||
| | | ||
| note: while checking the return type of the `async fn` | ||
| --> $DIR/issue-98634.rs:24:21 | ||
| | | ||
| LL | async fn callback() {} | ||
| | ^ checked the `Output` of this `async fn`, found opaque type | ||
| = note: expected struct `Pin<Box<(dyn Future<Output = ()> + 'static)>>` | ||
| found opaque type `impl Future<Output = ()>` | ||
| note: required by a bound in `StructAsync` | ||
| --> $DIR/issue-98634.rs:9:35 | ||
| | | ||
| LL | pub struct StructAsync<F: Fn() -> Pin<Box<dyn Future<Output = ()>>>> { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `StructAsync` | ||
|
|
||
| error[E0271]: expected `fn() -> impl Future<Output = ()> {callback}` to be a fn item that returns `Pin<Box<(dyn Future<Output = ()> + 'static)>>`, but it returns `impl Future<Output = ()>` | ||
| --> $DIR/issue-98634.rs:45:9 | ||
| | | ||
| LL | StructAsync { callback }.await; | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `Pin`, found opaque type | ||
| | | ||
| note: while checking the return type of the `async fn` | ||
| --> $DIR/issue-98634.rs:24:21 | ||
| | | ||
| LL | async fn callback() {} | ||
| | ^ checked the `Output` of this `async fn`, found opaque type | ||
| = note: expected struct `Pin<Box<(dyn Future<Output = ()> + 'static)>>` | ||
| found opaque type `impl Future<Output = ()>` | ||
| note: required by a bound in `StructAsync` | ||
| --> $DIR/issue-98634.rs:9:35 | ||
| | | ||
| LL | pub struct StructAsync<F: Fn() -> Pin<Box<dyn Future<Output = ()>>>> { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `StructAsync` | ||
|
|
||
| error[E0271]: expected `fn() -> impl Future<Output = ()> {callback}` to be a fn item that returns `Pin<Box<(dyn Future<Output = ()> + 'static)>>`, but it returns `impl Future<Output = ()>` | ||
| --> $DIR/issue-98634.rs:45:33 | ||
| | | ||
| LL | StructAsync { callback }.await; | ||
| | ^^^^^^ expected struct `Pin`, found opaque type | ||
| | | ||
| note: while checking the return type of the `async fn` | ||
| --> $DIR/issue-98634.rs:24:21 | ||
| | | ||
| LL | async fn callback() {} | ||
| | ^ checked the `Output` of this `async fn`, found opaque type | ||
| = note: expected struct `Pin<Box<(dyn Future<Output = ()> + 'static)>>` | ||
| found opaque type `impl Future<Output = ()>` | ||
| note: required by a bound in `StructAsync` | ||
| --> $DIR/issue-98634.rs:9:35 | ||
| | | ||
| LL | pub struct StructAsync<F: Fn() -> Pin<Box<dyn Future<Output = ()>>>> { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `StructAsync` | ||
|
|
||
| error: aborting due to 3 previous errors | ||
|
|
||
| For more information about this error, try `rustc --explain E0271`. |
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
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
Oops, something went wrong.