[PR #3374] [MERGED] proto: split NetError out of ProtoError #3789

New issue

Closed

opened 2026-03-16 12:02:40 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 12:02:40 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/3374
Author: @djc
Created: 12/4/2025
Status: ✅ Merged
Merged: 12/5/2025
Merged by: @djc

Base: main ← Head: net-error

📝 Commits (9)

cd0fa40 proto: inline single-use macro
0708b8b proto: use ready!() macro to reduce boilerplate
4d141d3 proto: drop unused ParseError::Timeout variant
2d52826 proto: box Name in DecodeError to reduce error sizes
717327f proto: inline single-use macro
06545c5 resolver: move error comparison code closer to caller
e0b8dc9 resolver: simplify specificity comparison
3b47b4c proto: drop ProtoError::kind() method
1963424 proto: split NetError out of ProtoError

📊 Changes

68 files changed (+859 additions, -811 deletions)

View changed files

📝 bin/tests/integration/named_metrics_tests.rs (+4 -4)
📝 bin/tests/integration/server_harness/mod.rs (+2 -2)
📝 crates/proto/src/client/dnssec_client.rs (+3 -4)
📝 crates/proto/src/client/memoize_client_handle.rs (+8 -7)
📝 crates/proto/src/client/mod.rs (+9 -9)
📝 crates/proto/src/client/rc_stream.rs (+5 -5)
📝 crates/proto/src/client/tests.rs (+1 -1)
📝 crates/proto/src/dnssec/handle.rs (+46 -41)
📝 crates/proto/src/dnssec/mod.rs (+2 -5)
📝 crates/proto/src/dnssec/proof.rs (+4 -4)
📝 crates/proto/src/error.rs (+182 -137)
📝 crates/proto/src/h2/h2_client_stream.rs (+18 -18)
📝 crates/proto/src/h3/h3_client_stream.rs (+18 -18)
📝 crates/proto/src/h3/h3_server.rs (+11 -11)
📝 crates/proto/src/lib.rs (+3 -13)
📝 crates/proto/src/multicast/mdns_client_stream.rs (+5 -5)
📝 crates/proto/src/op/message.rs (+1 -1)
📝 crates/proto/src/quic/quic_client_stream.rs (+5 -5)
📝 crates/proto/src/quic/quic_server.rs (+7 -7)
📝 crates/proto/src/quic/quic_stream.rs (+20 -15)

...and 48 more files

📄 Description

Happy to get feedback on this while I iterate on getting CI passing.

_{🔄 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/3374 **Author:** [@djc](https://github.com/djc) **Created:** 12/4/2025 **Status:** ✅ Merged **Merged:** 12/5/2025 **Merged by:** [@djc](https://github.com/djc) **Base:** `main` ← **Head:** `net-error` --- ### 📝 Commits (9) - [`cd0fa40`](https://github.com/hickory-dns/hickory-dns/commit/cd0fa405a05a55e50f76ce5483ea063190f0b51b) proto: inline single-use macro - [`0708b8b`](https://github.com/hickory-dns/hickory-dns/commit/0708b8b8139ced71166eff77f5da75ea29a6fedf) proto: use ready!() macro to reduce boilerplate - [`4d141d3`](https://github.com/hickory-dns/hickory-dns/commit/4d141d3948abe78f6ee6fa5f18add46a941bbb7a) proto: drop unused ParseError::Timeout variant - [`2d52826`](https://github.com/hickory-dns/hickory-dns/commit/2d52826aa532d1efc104bb94e9a7253a01303b41) proto: box Name in DecodeError to reduce error sizes - [`717327f`](https://github.com/hickory-dns/hickory-dns/commit/717327f3b364f0bde1cf449ec840f9525dab3d3a) proto: inline single-use macro - [`06545c5`](https://github.com/hickory-dns/hickory-dns/commit/06545c5bc7241f9b46e99169eaa38b160d5f60bf) resolver: move error comparison code closer to caller - [`e0b8dc9`](https://github.com/hickory-dns/hickory-dns/commit/e0b8dc976c38e2518bcaf88d295b597d27e5fef8) resolver: simplify specificity comparison - [`3b47b4c`](https://github.com/hickory-dns/hickory-dns/commit/3b47b4cf394a2a47bc1bfbf2c50e3a8ad1b83283) proto: drop ProtoError::kind() method - [`1963424`](https://github.com/hickory-dns/hickory-dns/commit/1963424441770344108a29380b0ae6f93a3ba906) proto: split NetError out of ProtoError ### 📊 Changes **68 files changed** (+859 additions, -811 deletions) <details> <summary>View changed files</summary> 📝 `bin/tests/integration/named_metrics_tests.rs` (+4 -4) 📝 `bin/tests/integration/server_harness/mod.rs` (+2 -2) 📝 `crates/proto/src/client/dnssec_client.rs` (+3 -4) 📝 `crates/proto/src/client/memoize_client_handle.rs` (+8 -7) 📝 `crates/proto/src/client/mod.rs` (+9 -9) 📝 `crates/proto/src/client/rc_stream.rs` (+5 -5) 📝 `crates/proto/src/client/tests.rs` (+1 -1) 📝 `crates/proto/src/dnssec/handle.rs` (+46 -41) 📝 `crates/proto/src/dnssec/mod.rs` (+2 -5) 📝 `crates/proto/src/dnssec/proof.rs` (+4 -4) 📝 `crates/proto/src/error.rs` (+182 -137) 📝 `crates/proto/src/h2/h2_client_stream.rs` (+18 -18) 📝 `crates/proto/src/h3/h3_client_stream.rs` (+18 -18) 📝 `crates/proto/src/h3/h3_server.rs` (+11 -11) 📝 `crates/proto/src/lib.rs` (+3 -13) 📝 `crates/proto/src/multicast/mdns_client_stream.rs` (+5 -5) 📝 `crates/proto/src/op/message.rs` (+1 -1) 📝 `crates/proto/src/quic/quic_client_stream.rs` (+5 -5) 📝 `crates/proto/src/quic/quic_server.rs` (+7 -7) 📝 `crates/proto/src/quic/quic_stream.rs` (+20 -15) _...and 48 more files_ </details> ### 📄 Description Happy to get feedback on this while I iterate on getting CI passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>