[PR #411] [MERGED] Migrate to use tokio-timer directly #1416

New issue

Closed

opened 2026-03-16 02:05:24 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 02:05:24 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/411
Author: @justinlatimer
Created: 4/20/2018
Status: ✅ Merged
Merged: 4/20/2018
Merged by: @bluejekyll

Base: master ← Head: tokio-timer

📝 Commits (3)

540539b Migrate proto to tokio-timer.
ec110a0 Migrate integration-tests to tokio-timer.
70bda52 Migrate server to tokio-timer.

📊 Changes

16 files changed (+100 additions, -124 deletions)

View changed files

📝 Cargo.lock (+3 -0)
📝 integration-tests/Cargo.toml (+3 -2)
📝 integration-tests/src/lib.rs (+7 -8)
📝 integration-tests/tests/client_future_tests.rs (+1 -1)
📝 integration-tests/tests/mdns_tests.rs (+6 -7)
📝 proto/Cargo.toml (+1 -0)
📝 proto/src/error.rs (+4 -0)
📝 proto/src/lib.rs (+1 -0)
📝 proto/src/multicast/mdns_stream.rs (+14 -20)
📝 proto/src/tcp/tcp_stream.rs (+22 -36)
📝 proto/src/xfer/dns_future.rs (+6 -16)
📝 server/Cargo.toml (+1 -0)
📝 server/src/lib.rs (+1 -1)
📝 server/src/server/server_future.rs (+2 -2)
📝 server/src/server/timeout_stream.rs (+26 -26)
📝 server/tests/timeout_stream_tests.rs (+2 -5)

📄 Description

Part of #385, Port to tokio.

The methodology to port to tokio is that library crates need to move to depending on the new sub-crates under the tokio umbrella crate, and applications should depend on the tokio crate.

I've started by migrating all usages of tokio_core::reactor::Timeout to direct usages of tokio_timer::Delay (or straight to tokio_timer::Deadline where it was obvious)

(If you'd rather receive a PR that includes all of the sub-crate migrations at once, I can work on that instead)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/411 **Author:** [@justinlatimer](https://github.com/justinlatimer) **Created:** 4/20/2018 **Status:** ✅ Merged **Merged:** 4/20/2018 **Merged by:** [@bluejekyll](https://github.com/bluejekyll) **Base:** `master` ← **Head:** `tokio-timer` --- ### 📝 Commits (3) - [`540539b`](https://github.com/hickory-dns/hickory-dns/commit/540539b06790d39f74e26cf0944eb75aca00dbcb) Migrate proto to tokio-timer. - [`ec110a0`](https://github.com/hickory-dns/hickory-dns/commit/ec110a0ff48b33ec5cdb61dc163e159bd071bc90) Migrate integration-tests to tokio-timer. - [`70bda52`](https://github.com/hickory-dns/hickory-dns/commit/70bda52150c5c32060de5ae95cf49339673d2c9e) Migrate server to tokio-timer. ### 📊 Changes **16 files changed** (+100 additions, -124 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+3 -0) 📝 `integration-tests/Cargo.toml` (+3 -2) 📝 `integration-tests/src/lib.rs` (+7 -8) 📝 `integration-tests/tests/client_future_tests.rs` (+1 -1) 📝 `integration-tests/tests/mdns_tests.rs` (+6 -7) 📝 `proto/Cargo.toml` (+1 -0) 📝 `proto/src/error.rs` (+4 -0) 📝 `proto/src/lib.rs` (+1 -0) 📝 `proto/src/multicast/mdns_stream.rs` (+14 -20) 📝 `proto/src/tcp/tcp_stream.rs` (+22 -36) 📝 `proto/src/xfer/dns_future.rs` (+6 -16) 📝 `server/Cargo.toml` (+1 -0) 📝 `server/src/lib.rs` (+1 -1) 📝 `server/src/server/server_future.rs` (+2 -2) 📝 `server/src/server/timeout_stream.rs` (+26 -26) 📝 `server/tests/timeout_stream_tests.rs` (+2 -5) </details> ### 📄 Description Part of #385, Port to tokio. The methodology to port to tokio is that library crates need to move to depending on the new sub-crates under the tokio umbrella crate, and applications should depend on the tokio crate. I've started by migrating all usages of `tokio_core::reactor::Timeout` to direct usages of `tokio_timer::Delay` (or straight to `tokio_timer::Deadline` where it was obvious) (If you'd rather receive a PR that includes all of the sub-crate migrations at once, I can work on that instead) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>