[PR #960] [MERGED] Abstract tokio #1823

New issue

Closed

opened 2026-03-16 02:27:31 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 02:27:31 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/960
Author: @chunyingw
Created: 12/17/2019
Status: ✅ Merged
Merged: 12/19/2019
Merged by: @bluejekyll

Base: master ← Head: abstractTokio

📝 Commits (10+)

7d25a5d [trust-dns-proto] Make tokio* optional
2f4d5f5 [trust-dns-proto] Make tokio* optional
2d422d2 Merge branch 'abstractTokio' of https://github.com/chunyingw/trust-dns into abstractTokio
30e0637 Merge branch 'abstractTokio' of https://github.com/chunyingw/trust-dns into abstractTokio
e209b54 Fix clippy and tests compiling issues
83809e5 Fix clippy and tests compiling issues
370ed51 Merge branch 'abstractTokio' of https://github.com/chunyingw/trust-dns into abstractTokio
1e6f924 [trust-dns-proto] make fn asyn for Time trait
05b1f29 [trust-dns-proto] collapse features
ebe9306 Merge branch 'master' into abstractTokio

📊 Changes

30 files changed (+355 additions, -176 deletions)

View changed files

📝 bin/benches/comparison_benches.rs (+3 -2)
📝 bin/tests/named_test_rsa_dnssec.rs (+4 -2)
📝 bin/tests/named_tests.rs (+26 -12)
📝 crates/client/src/client/async_client.rs (+3 -2)
📝 crates/client/src/client/async_secure_client.rs (+3 -1)
📝 crates/client/src/tcp/tcp_client_connection.rs (+11 -5)
📝 crates/https/src/https_client_stream.rs (+7 -3)
📝 crates/native-tls/src/tls_client_stream.rs (+2 -1)
📝 crates/native-tls/src/tls_stream.rs (+5 -3)
📝 crates/openssl/src/tls_client_stream.rs (+2 -1)
📝 crates/openssl/src/tls_stream.rs (+8 -3)
📝 crates/proto/Cargo.toml (+3 -2)
📝 crates/proto/src/error.rs (+0 -14)
📝 crates/proto/src/lib.rs (+84 -9)
📝 crates/proto/src/tcp/tcp_client_stream.rs (+17 -11)
📝 crates/proto/src/tcp/tcp_stream.rs (+22 -20)
📝 crates/proto/src/tests/tcp.rs (+9 -7)
📝 crates/proto/src/tests/udp.rs (+3 -3)
📝 crates/proto/src/udp/udp_client_stream.rs (+25 -18)
📝 crates/proto/src/xfer/dns_exchange.rs (+31 -18)

...and 10 more files

📄 Description

[trust-dns-proto] Make tokio* optional

Move from tokio::io::{AsyncRead, AsyncWrite} to futures::io::{AsyncRead, AsyncWrite} and provide a helper struct Compat02As03 for the conversion.
Abstract tokio::time::{Delay, Timeout}.
Modify the other crates which are impacted by the above two changes.

_{🔄 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/960 **Author:** [@chunyingw](https://github.com/chunyingw) **Created:** 12/17/2019 **Status:** ✅ Merged **Merged:** 12/19/2019 **Merged by:** [@bluejekyll](https://github.com/bluejekyll) **Base:** `master` ← **Head:** `abstractTokio` --- ### 📝 Commits (10+) - [`7d25a5d`](https://github.com/hickory-dns/hickory-dns/commit/7d25a5d4663cf514d0f00b8bc37a4d9aff8ade02) [trust-dns-proto] Make tokio* optional - [`2f4d5f5`](https://github.com/hickory-dns/hickory-dns/commit/2f4d5f56377afcd28799b50c951daee4f600c6c7) [trust-dns-proto] Make tokio* optional - [`2d422d2`](https://github.com/hickory-dns/hickory-dns/commit/2d422d2f52b36c6c837f6806b906aa9b3d26ed92) Merge branch 'abstractTokio' of https://github.com/chunyingw/trust-dns into abstractTokio - [`30e0637`](https://github.com/hickory-dns/hickory-dns/commit/30e0637c23a78598242ed0432195e98c59c47b81) Merge branch 'abstractTokio' of https://github.com/chunyingw/trust-dns into abstractTokio - [`e209b54`](https://github.com/hickory-dns/hickory-dns/commit/e209b54934e9a4e01327c5c0ad7003019bf7ea71) Fix clippy and tests compiling issues - [`83809e5`](https://github.com/hickory-dns/hickory-dns/commit/83809e59d56fc79fbd2a91de793b4b0021b578c8) Fix clippy and tests compiling issues - [`370ed51`](https://github.com/hickory-dns/hickory-dns/commit/370ed5149f89b29b85cd459d54a99415c4bf525b) Merge branch 'abstractTokio' of https://github.com/chunyingw/trust-dns into abstractTokio - [`1e6f924`](https://github.com/hickory-dns/hickory-dns/commit/1e6f924aec5c2e297e70e0f3714a88f1ad31e10f) [trust-dns-proto] make fn asyn for Time trait - [`05b1f29`](https://github.com/hickory-dns/hickory-dns/commit/05b1f293f79121da09ecdf664114c301da5d5628) [trust-dns-proto] collapse features - [`ebe9306`](https://github.com/hickory-dns/hickory-dns/commit/ebe930605f3e4d8eb02e477c14e74ee9dea6be10) Merge branch 'master' into abstractTokio ### 📊 Changes **30 files changed** (+355 additions, -176 deletions) <details> <summary>View changed files</summary> 📝 `bin/benches/comparison_benches.rs` (+3 -2) 📝 `bin/tests/named_test_rsa_dnssec.rs` (+4 -2) 📝 `bin/tests/named_tests.rs` (+26 -12) 📝 `crates/client/src/client/async_client.rs` (+3 -2) 📝 `crates/client/src/client/async_secure_client.rs` (+3 -1) 📝 `crates/client/src/tcp/tcp_client_connection.rs` (+11 -5) 📝 `crates/https/src/https_client_stream.rs` (+7 -3) 📝 `crates/native-tls/src/tls_client_stream.rs` (+2 -1) 📝 `crates/native-tls/src/tls_stream.rs` (+5 -3) 📝 `crates/openssl/src/tls_client_stream.rs` (+2 -1) 📝 `crates/openssl/src/tls_stream.rs` (+8 -3) 📝 `crates/proto/Cargo.toml` (+3 -2) 📝 `crates/proto/src/error.rs` (+0 -14) 📝 `crates/proto/src/lib.rs` (+84 -9) 📝 `crates/proto/src/tcp/tcp_client_stream.rs` (+17 -11) 📝 `crates/proto/src/tcp/tcp_stream.rs` (+22 -20) 📝 `crates/proto/src/tests/tcp.rs` (+9 -7) 📝 `crates/proto/src/tests/udp.rs` (+3 -3) 📝 `crates/proto/src/udp/udp_client_stream.rs` (+25 -18) 📝 `crates/proto/src/xfer/dns_exchange.rs` (+31 -18) _...and 10 more files_ </details> ### 📄 Description [trust-dns-proto] Make tokio* optional 1. Move from tokio::io::{AsyncRead, AsyncWrite} to futures::io::{AsyncRead, AsyncWrite} and provide a helper struct Compat02As03 for the conversion. 2. Abstract tokio::time::{Delay, Timeout}. 3. Modify the other crates which are impacted by the above two changes. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>