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

joinset: rename join_one to join_next #4755

Merged
merged 10 commits into from
Jun 9, 2022
Merged

joinset: rename join_one to join_next #4755

merged 10 commits into from
Jun 9, 2022

Conversation

davidbarsky
Copy link
Member

After some discussion and usage, several people including myself agreed that join_one is better named as join_next. Once AsyncIterator is stabilized, AsyncIterator::next can delegate to JoinSet::join_next.

@github-actions github-actions bot added the R-loom Run loom tests on this PR label Jun 6, 2022
@davidbarsky davidbarsky requested a review from Darksonn June 6, 2022 16:23
@Darksonn Darksonn added A-tokio-util Area: The tokio-util crate A-tokio Area: The main tokio crate M-task Module: tokio/task labels Jun 6, 2022
hawkw
hawkw reviewed Jun 6, 2022
View reviewed changes
Copy link
Member

@hawkw hawkw left a comment

Choose a reason for hiding this comment

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

I agree with @Darksonn's suggestion that we may as well add hidden deprecated aliases with the previous name. Also, we may want to add #[doc(alias = ...)] attributes to help folks who are searching the documentation for the old name.

tokio-util/src/task/join_map.rs Show resolved Hide resolved
tokio/src/task/join_set.rs Show resolved Hide resolved
tokio/src/task/join_set.rs Show resolved Hide resolved
davidbarsky and others added 4 commits June 7, 2022 16:18
@davidbarsky @hawkw
Update tokio/src/task/join_set.rs
c90d464 
Co-authored-by: Eliza Weisman <eliza@buoyant.io>
@davidbarsky @hawkw
Update tokio-util/src/task/join_map.rs
260eb53 
Co-authored-by: Eliza Weisman <eliza@buoyant.io>
@davidbarsky @hawkw
Update tokio/src/task/join_set.rs
43f8e8d 
Co-authored-by: Eliza Weisman <eliza@buoyant.io>
@davidbarsky
add deprecation notices to join_one names to JoinSet/JoinMap
43b1168
hawkw
hawkw reviewed Jun 7, 2022
View reviewed changes
tokio/src/task/join_set.rs Outdated Show resolved Hide resolved
tokio/src/task/join_set.rs Outdated Show resolved Hide resolved
tokio/src/task/join_set.rs Outdated Show resolved Hide resolved
tokio-util/src/task/join_map.rs Outdated Show resolved Hide resolved
davidbarsky and others added 4 commits June 7, 2022 16:46
@davidbarsky @hawkw
Update tokio/src/task/join_set.rs
19d3abc 
Co-authored-by: Eliza Weisman <eliza@buoyant.io>
@davidbarsky @hawkw
Update tokio-util/src/task/join_map.rs
634617f 
Co-authored-by: Eliza Weisman <eliza@buoyant.io>
@davidbarsky @hawkw
Update tokio/src/task/join_set.rs
e751a80 
Co-authored-by: Eliza Weisman <eliza@buoyant.io>
@davidbarsky
add since to deprecation warnings
43ae0d0
@davidbarsky davidbarsky requested review from Darksonn and hawkw June 8, 2022 14:35
@davidbarsky
Copy link
Member Author

davidbarsky commented Jun 8, 2022 •
edited
Loading

Sorry for the back and forth! I think all comments are resolved.

(Sorry, it's been a minute since I touched Tokio proper...)

hawkw
hawkw approved these changes Jun 8, 2022
View reviewed changes
Copy link
Member

@hawkw hawkw left a comment

Choose a reason for hiding this comment

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

looks like rustfmt needs to be run — i think this one is kinda my fault for leaving suggestions on github that rustfmt didn't like.

once CI passes, though, this lgtm!

@davidbarsky
Copy link
Member Author

looks like rustfmt needs to be run — i think this one is kinda my fault for leaving suggestions on github that rustfmt didn't like.
Not your fault! i have cargo fmt run on save, and for whatever reason, this wasn't formatted.

@hawkw
Copy link
Member

hawkw commented Jun 9, 2022

looks like rustfmt needs to be run — i think this one is kinda my fault for leaving suggestions on github that rustfmt didn't like.

Not your fault! i have cargo fmt run on save, and for whatever reason, this wasn't formatted.

i mean, i think what happened there is that you applied suggestions i made in the github PR, so they were changed through the web interface and didn't trigger rustfmt on your machine.

@hawkw
Copy link
Member

hawkw commented Jun 9, 2022

anyway, this looks good to me and i'm happy to go ahead and merge it unless @Darksonn wants to take a last look at it?

@Darksonn Darksonn merged commit 08d4953 into master Jun 9, 2022
@Darksonn Darksonn deleted the david/rename-join-one branch June 9, 2022 20:41
@Darksonn Darksonn mentioned this pull request Jul 12, 2022
Merged
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Jul 18, 2022
Update Rust crate tokio to 1.20.0 (#1458)
1cbccbc 
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dependencies | minor | `1.19.2` -> `1.20.0` |
| [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dev-dependencies | minor | `1.19.2` -> `1.20.0` |

---

### Release Notes

<details>
<summary>tokio-rs/tokio</summary>

### [`v1.20.0`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.20.0)

[Compare Source](tokio-rs/tokio@tokio-1.19.2...tokio-1.20.0)

##### 1.20.0 (July 12, 2022)

##### Added

-   tokio: add track_caller to public APIs ([#&#8203;4772], [#&#8203;4791], [#&#8203;4793], [#&#8203;4806], [#&#8203;4808])
-   sync: Add `has_changed` method to `watch::Ref` ([#&#8203;4758])

##### Changed

-   time: remove `src/time/driver/wheel/stack.rs` ([#&#8203;4766])
-   rt: clean up arguments passed to basic scheduler ([#&#8203;4767])
-   net: be more specific about winapi features ([#&#8203;4764])
-   tokio: use const initialized thread locals where possible ([#&#8203;4677])
-   task: various small improvements to LocalKey ([#&#8203;4795])

##### Fixed

##### Documented

-   fs: warn about performance pitfall ([#&#8203;4762])
-   chore: fix spelling ([#&#8203;4769])
-   sync: document spurious failures in oneshot ([#&#8203;4777])
-   sync: add warning for watch in non-Send futures ([#&#8203;4741])
-   chore: fix typo ([#&#8203;4798])

##### Unstable

-   joinset: rename `join_one` to `join_next` ([#&#8203;4755])
-   rt: unhandled panic config for current thread rt ([#&#8203;4770])

[#&#8203;4677]: tokio-rs/tokio#4677

[#&#8203;4741]: tokio-rs/tokio#4741

[#&#8203;4755]: tokio-rs/tokio#4755

[#&#8203;4758]: tokio-rs/tokio#4758

[#&#8203;4762]: tokio-rs/tokio#4762

[#&#8203;4764]: tokio-rs/tokio#4764

[#&#8203;4766]: tokio-rs/tokio#4766

[#&#8203;4767]: tokio-rs/tokio#4767

[#&#8203;4769]: tokio-rs/tokio#4769

[#&#8203;4770]: tokio-rs/tokio#4770

[#&#8203;4772]: tokio-rs/tokio#4772

[#&#8203;4777]: tokio-rs/tokio#4777

[#&#8203;4791]: tokio-rs/tokio#4791

[#&#8203;4793]: tokio-rs/tokio#4793

[#&#8203;4795]: tokio-rs/tokio#4795

[#&#8203;4798]: tokio-rs/tokio#4798

[#&#8203;4806]: tokio-rs/tokio#4806

[#&#8203;4808]: tokio-rs/tokio#4808

</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 these updates 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:eyJjcmVhdGVkSW5WZXIiOiIzMi4xMTEuMSIsInVwZGF0ZWRJblZlciI6IjMyLjExMS4xIn0=-->

Co-authored-by: cabr2-bot <cabr2.help@gmail.com>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1458
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>
@Darksonn Darksonn mentioned this pull request Sep 7, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hawkw hawkw hawkw approved these changes

@Darksonn Darksonn Darksonn approved these changes

Assignees
No one assigned
Labels
A-tokio Area: The main tokio crate A-tokio-util Area: The tokio-util crate M-task Module: tokio/task R-loom Run loom tests on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@davidbarsky @hawkw @Darksonn