Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Fuses from select, and only poll non-terminated streams #2583

Merged
merged 5 commits into from
May 5, 2022
Merged

Remove Fuses from select, and only poll non-terminated streams #2583

merged 5 commits into from
May 5, 2022

Conversation

414owen
Copy link
Contributor

@414owen 414owen commented Mar 21, 2022 •
edited
Loading

Benchmarks:

// old
test select_streams ... bench:     931,953 ns/iter (+/- 18,919)
// new
test select_streams ... bench:     847,498 ns/iter (+/- 21,188)

Time: ~-10%
Benchmark PR: #2582
Breaking changes: none

@414owen 414owen requested a review from taiki-e as a code owner March 21, 2022 09:58
@414owen 414owen force-pushed the remove-fuses-from-select branch 2 times, most recently from 8a29b0c to 53651ca Compare March 21, 2022 10:12
@414owen 414owen marked this pull request as draft March 21, 2022 11:26
@414owen 414owen marked this pull request as ready for review March 21, 2022 14:30
@414owen 414owen force-pushed the remove-fuses-from-select branch from bd8084d to b015744 Compare March 24, 2022 22:05
@414owen
Copy link
Contributor Author

414owen commented Mar 24, 2022

Not sure why the build is failing for -Z minimal-versions.
As far as I can see all our pin* dependencies are fixed to a patch version.
@taiki-e any ideas?

@414owen
Copy link
Contributor Author

414owen commented Mar 25, 2022

Not sure why the build is failing for -Z minimal-versions. As far as I can see all our pin* dependencies are fixed to a patch version. @taiki-e any ideas?

Turns out pin-project-lite added the ability to specify a projection name in 0.2.6.
Doesn't seem to be strictly semver-compliant, but at least we have it working now.

@414owen 414owen force-pushed the remove-fuses-from-select branch from 3d5b8eb to dc0ec68 Compare March 25, 2022 15:59
This was referenced Mar 25, 2022
Closed
Open
taiki-e
taiki-e reviewed Apr 16, 2022
View reviewed changes
Copy link
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! The implementation looks good to me.

futures-util/src/stream/select_with_strategy.rs Outdated Show resolved Hide resolved
futures-util/src/stream/select_with_strategy.rs Outdated Show resolved Hide resolved
@taiki-e
Copy link
Member

taiki-e commented Apr 16, 2022

Doesn't seem to be strictly semver-compliant

Note that if the major version is 0, cargo treats the minor version like the major version and the patch version like the minor version.

https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#specifying-dependencies-from-cratesio

@taiki-e taiki-e added 0.3-backport: pending The maintainer accepted to backport this to the 0.3 branch, but backport has not been done yet. A-stream Area: futures::stream labels Apr 16, 2022
@414owen 414owen force-pushed the remove-fuses-from-select branch from dc0ec68 to 9ef954f Compare April 23, 2022 15:16
@414owen
Copy link
Contributor Author

414owen commented May 1, 2022

@taiki-e I've implemented your suggestions, looks ready to merge to me.

@taiki-e taiki-e merged commit 2e30ec3 into rust-lang:master May 5, 2022
taiki-e pushed a commit that referenced this pull request Aug 14, 2022
@414owen @taiki-e
Remove Fuses from select, and only poll non-terminated streams (#…
628881f 
…2583)
@taiki-e taiki-e mentioned this pull request Aug 14, 2022
Merged
@taiki-e taiki-e added 0.3-backport: completed and removed 0.3-backport: pending The maintainer accepted to backport this to the 0.3 branch, but backport has not been done yet. labels Aug 14, 2022
taiki-e pushed a commit that referenced this pull request Aug 14, 2022
@414owen @taiki-e
Remove Fuses from select, and only poll non-terminated streams (#…
c5a09be 
…2583)
@taiki-e taiki-e mentioned this pull request Aug 14, 2022
Merged
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Aug 23, 2022
Update Rust crate futures to 0.3.23 (#1507)
f419db3 
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
Reviewers

@taiki-e taiki-e taiki-e approved these changes

Assignees
No one assigned
Labels
0.3-backport: completed A-stream Area: futures::stream
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@414owen @taiki-e