[PR #3370] [MERGED] Merge recursor code into resolver crate #3783

New issue

Closed

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

kerem commented

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

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/3370
Author: @djc
Created: 12/2/2025
Status: ✅ Merged
Merged: 12/3/2025
Merged by: @djc

Base: main ← Head: merge-recursor

📝 Commits (6)

35e76c6 tests: use Protocol to distinguish protocols
60bcff7 resolver: fold contents of recursor crate into resolver
df128e2 resolver: inline inner recursor module
f53c4a2 resolver: move tests into existing tests module
3cf9011 resolver: rename recursor::recursor_dns_handle to handle
3e694bc resolver: merge metrics test into tests module

📊 Changes

23 files changed (+422 additions, -879 deletions)

View changed files

📝 Cargo.lock (+2 -27)
📝 Cargo.toml (+0 -2)
➖ crates/recursor/Cargo.toml (+0 -121)
➖ crates/recursor/LICENSE-APACHE (+0 -202)
➖ crates/recursor/LICENSE-MIT (+0 -20)
➖ crates/recursor/README.md (+0 -50)
➖ crates/recursor/src/lib.rs (+0 -204)
➖ crates/recursor/src/metrics_tests.rs (+0 -104)
📝 crates/resolver/Cargo.toml (+5 -0)
📝 crates/resolver/src/lib.rs (+4 -0)
📝 crates/resolver/src/recursor/error.rs (+4 -4)
📝 crates/resolver/src/recursor/handle.rs (+20 -23)
📝 crates/resolver/src/recursor/mod.rs (+167 -51)
📝 crates/resolver/src/recursor/tests.rs (+189 -28)
📝 crates/resolver/tests/tests.rs (+3 -3)
📝 crates/server/Cargo.toml (+4 -13)
📝 crates/server/src/lib.rs (+0 -2)
📝 crates/server/src/store/recursor.rs (+6 -3)
📝 crates/server/src/zone_handler/catalog.rs (+2 -3)
📝 crates/server/src/zone_handler/mod.rs (+2 -2)

...and 3 more files

📄 Description

No description provided

_{🔄 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/3370 **Author:** [@djc](https://github.com/djc) **Created:** 12/2/2025 **Status:** ✅ Merged **Merged:** 12/3/2025 **Merged by:** [@djc](https://github.com/djc) **Base:** `main` ← **Head:** `merge-recursor` --- ### 📝 Commits (6) - [`35e76c6`](https://github.com/hickory-dns/hickory-dns/commit/35e76c6d888ef65548310380642da2f5f023fdaa) tests: use Protocol to distinguish protocols - [`60bcff7`](https://github.com/hickory-dns/hickory-dns/commit/60bcff7ce810084a18eab9c79fbdc34f5a392503) resolver: fold contents of recursor crate into resolver - [`df128e2`](https://github.com/hickory-dns/hickory-dns/commit/df128e2c922c86bee7d254112774293c2b9991e0) resolver: inline inner recursor module - [`f53c4a2`](https://github.com/hickory-dns/hickory-dns/commit/f53c4a20ea063ca18d52cc83af54426b67f9398b) resolver: move tests into existing tests module - [`3cf9011`](https://github.com/hickory-dns/hickory-dns/commit/3cf901112f8f6f618a7041eb1eba3fba25c42fab) resolver: rename recursor::recursor_dns_handle to handle - [`3e694bc`](https://github.com/hickory-dns/hickory-dns/commit/3e694bc9da9f407dcfd890ad26995af10143ab47) resolver: merge metrics test into tests module ### 📊 Changes **23 files changed** (+422 additions, -879 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+2 -27) 📝 `Cargo.toml` (+0 -2) ➖ `crates/recursor/Cargo.toml` (+0 -121) ➖ `crates/recursor/LICENSE-APACHE` (+0 -202) ➖ `crates/recursor/LICENSE-MIT` (+0 -20) ➖ `crates/recursor/README.md` (+0 -50) ➖ `crates/recursor/src/lib.rs` (+0 -204) ➖ `crates/recursor/src/metrics_tests.rs` (+0 -104) 📝 `crates/resolver/Cargo.toml` (+5 -0) 📝 `crates/resolver/src/lib.rs` (+4 -0) 📝 `crates/resolver/src/recursor/error.rs` (+4 -4) 📝 `crates/resolver/src/recursor/handle.rs` (+20 -23) 📝 `crates/resolver/src/recursor/mod.rs` (+167 -51) 📝 `crates/resolver/src/recursor/tests.rs` (+189 -28) 📝 `crates/resolver/tests/tests.rs` (+3 -3) 📝 `crates/server/Cargo.toml` (+4 -13) 📝 `crates/server/src/lib.rs` (+0 -2) 📝 `crates/server/src/store/recursor.rs` (+6 -3) 📝 `crates/server/src/zone_handler/catalog.rs` (+2 -3) 📝 `crates/server/src/zone_handler/mod.rs` (+2 -2) _...and 3 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>