Skip to content

Switch to FuturesOrdered dynamically in try_join_all#2556

Merged
taiki-e merged 4 commits into
rust-lang:masterfrom
ibraheemdev:master
Jun 5, 2022
Merged

Switch to FuturesOrdered dynamically in try_join_all#2556
taiki-e merged 4 commits into
rust-lang:masterfrom
ibraheemdev:master

Conversation

@ibraheemdev
Copy link
Copy Markdown
Member

Continuation of #2412.

@ibraheemdev ibraheemdev requested a review from taiki-e as a code owner January 30, 2022 23:16
Comment thread futures-util/src/future/try_join_all.rs Outdated
@ibraheemdev
Copy link
Copy Markdown
Member Author

error[E0277]: `*const ()` cannot be sent between threads safely
   --> futures/tests/auto_traits.rs:579:5
    |
579 |     assert_impl!(TryJoinAll<SendTryFuture<()>>: Send);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
    |
    = help: within `futures::stream::futures_ordered::OrderWrapper<Result<(), *const ()>>`, the trait `std::marker::Send` is not implemented for `*const ()`
    = note: required because it appears within the type `Result<(), *const ()>`
    = note: required because it appears within the type `futures::stream::futures_ordered::OrderWrapper<Result<(), *const ()>>`
    = note: required because of the requirements on the impl of `std::marker::Send` for `Unique<futures::stream::futures_ordered::OrderWrapper<Result<(), *const ()>>>`
    = note: required because it appears within the type `alloc::raw_vec::RawVec<futures::stream::futures_ordered::OrderWrapper<Result<(), *const ()>>>`
    = note: required because it appears within the type `Vec<futures::stream::futures_ordered::OrderWrapper<Result<(), *const ()>>>`
    = note: required because it appears within the type `BinaryHeap<futures::stream::futures_ordered::OrderWrapper<Result<(), *const ()>>>`
    = note: required because it appears within the type `futures::stream::FuturesOrdered<Pin<Box<(dyn futures::Future<Output = Result<(), *const ()>> + std::marker::Send + 'static)>>>`
    = note: required because it appears within the type `futures::stream::TryCollect<futures::stream::FuturesOrdered<Pin<Box<(dyn futures::Future<Output = Result<(), *const ()>> + std::marker::Send + 'static)>>>, Vec<()>>`
    = note: required because it appears within the type `futures::future::try_join_all::TryJoinAllKind<Pin<Box<(dyn futures::Future<Output = Result<(), *const ()>> + std::marker::Send + 'static)>>>`
    = note: required because it appears within the type `futures::future::TryJoinAll<Pin<Box<(dyn futures::Future<Output = Result<(), *const ()>> + std::marker::Send + 'static)>>>`

@taiki-e do you know why this is failing now?

@taiki-e
Copy link
Copy Markdown
Member

taiki-e commented Feb 15, 2022

The SendTryFuture has two parameters (Ok and Err), so you probably need to set both to ().

pub type SendTryFuture<T = *const (), E = *const ()> = SendFuture<Result<T, E>>;

like:

assert_impl!(TryBuffered<SendTryStream<SendTryFuture<(), ()>>>: Send);

@ibraheemdev
Copy link
Copy Markdown
Member Author

@taiki-e this is ready to be merged.

Copy link
Copy Markdown
Member

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@taiki-e taiki-e merged commit 556cc46 into rust-lang:master Jun 5, 2022
@taiki-e taiki-e added breaking change A-future Area: futures::future labels Jun 5, 2022
@taiki-e taiki-e added this to the futures-0.4, futures-core-1.0 milestone Jun 5, 2022
@taiki-e taiki-e removed this from the futures-0.4, futures-core-1.0 milestone Aug 14, 2022
This was referenced Aug 14, 2022
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Aug 23, 2022
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [futures](https://github.com/rust-lang/futures-rs) | dependencies | patch | `0.3.21` -> `0.3.23` |

---

### Release Notes

<details>
<summary>rust-lang/futures-rs</summary>

### [`v0.3.23`](https://github.com/rust-lang/futures-rs/blob/HEAD/CHANGELOG.md#&#8203;0323---2022-08-14)

[Compare Source](rust-lang/futures-rs@0.3.22...0.3.23)

-   Work around MSRV increase due to a cargo bug.

### [`v0.3.22`](https://github.com/rust-lang/futures-rs/blob/HEAD/CHANGELOG.md#&#8203;0322---2022-08-14)

[Compare Source](rust-lang/futures-rs@0.3.21...0.3.22)

-   Fix `Sync` impl of `BiLockGuard` ([#&#8203;2570](rust-lang/futures-rs#2570))
-   Fix partial iteration in `FuturesUnordered` ([#&#8203;2574](rust-lang/futures-rs#2574))
-   Fix false detection of inner panics in `Shared` ([#&#8203;2576](rust-lang/futures-rs#2576))
-   Add `Mutex::lock_owned` and `Mutex::try_lock_owned` ([#&#8203;2571](rust-lang/futures-rs#2571))
-   Add `io::copy_buf_abortable` ([#&#8203;2507](rust-lang/futures-rs#2507))
-   Remove `Unpin` bound from `TryStreamExt::into_async_read` ([#&#8203;2599](rust-lang/futures-rs#2599))
-   Make `run_until_stalled` handle self-waking futures ([#&#8203;2593](rust-lang/futures-rs#2593))
-   Use `FuturesOrdered` in `try_join_all` ([#&#8203;2556](rust-lang/futures-rs#2556))
-   Fix orderings in `LocalPool` waker ([#&#8203;2608](rust-lang/futures-rs#2608))
-   Fix `stream::Chunk` adapters size hints ([#&#8203;2611](rust-lang/futures-rs#2611))
-   Add `push_front` and `push_back` to `FuturesOrdered` ([#&#8203;2591](rust-lang/futures-rs#2591))
-   Deprecate `FuturesOrdered::push` in favor of `FuturesOrdered::push_back` ([#&#8203;2591](rust-lang/futures-rs#2591))
-   Performance improvements ([#&#8203;2583](rust-lang/futures-rs#2583), [#&#8203;2626](rust-lang/futures-rs#2626))
-   Documentation improvements ([#&#8203;2579](rust-lang/futures-rs#2579), [#&#8203;2604](rust-lang/futures-rs#2604), [#&#8203;2613](rust-lang/futures-rs#2613))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4xNTYuMSIsInVwZGF0ZWRJblZlciI6IjMyLjE1Ni4xIn0=-->

Co-authored-by: cabr2-bot <cabr2.help@gmail.com>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1507
Reviewed-by: crapStone <crapstone@noreply.codeberg.org>
Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants