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.

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

time: Move DelayQueue to tokio-util #2897

Merged
merged 2 commits into from
Oct 5, 2020
Merged

Conversation

bdonlan
Copy link
Contributor

@bdonlan bdonlan commented Sep 30, 2020

This change is intended to do the minimum to unblock 0.3; as such, for now, we
duplicate the internal time::wheel structures in tokio-util, rather than trying
to refactor things at this stage.

@Darksonn Darksonn added A-tokio Area: The main tokio crate A-tokio-util Area: The tokio-util crate C-maintenance Category: PRs that clean code up or issues documenting cleanup. M-time Module: tokio/time labels Oct 1, 2020
@Darksonn
Copy link
Contributor

Darksonn commented Oct 1, 2020

What part of the API was causing trouble?

@bdonlan
Copy link
Contributor Author

bdonlan commented Oct 1, 2020

@Darksonn per @carllerche Tokio 1.0 won't initially expose DelayQueue as a stable API (see #2718), so this is moving it to tokio-util, which won't have the same stability guarantees.

This change is intended to do the minimum to unblock 0.3; as such, for now, we
duplicate the internal `time::wheel` structures in tokio-util, rather than trying
to refactor things at this stage.
@bdonlan
Copy link
Contributor Author

bdonlan commented Oct 1, 2020

Force pushing to resolve conflicts.

@bdonlan
Copy link
Contributor Author

bdonlan commented Oct 1, 2020

Not sure why the CI run was cancelled... Can someone please restart it?

@Darksonn
Copy link
Contributor

Darksonn commented Oct 1, 2020

Done.

@Darksonn Darksonn mentioned this pull request Oct 3, 2020
@bdonlan
Copy link
Contributor Author

bdonlan commented Oct 5, 2020

Macos tests failed due to reaching unreachable code in the tokio scheduler... could this be an independent bug? @carllerche

@bdonlan
Copy link
Contributor Author

bdonlan commented Oct 5, 2020

Failing line is https://github.com/tokio-rs/tokio/blob/master/tokio/tests/rt_common.rs#L569

Looks unrelated to the timer changes (but probably a legitimate bug)

Copy link
Member

@carllerche carllerche left a comment

Choose a reason for hiding this comment

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

Looks great, thanks 👍

@carllerche carllerche merged commit 9730317 into tokio-rs:master Oct 5, 2020
@bdonlan bdonlan deleted the delay-queue branch October 5, 2020 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tokio Area: The main tokio crate A-tokio-util Area: The tokio-util crate C-maintenance Category: PRs that clean code up or issues documenting cleanup. M-time Module: tokio/time
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants