resolver: rename lookup_state to caching_client

CHANGELOG.md

@@ -9,6 +9,7 @@ All notes should be prepended with the location of the change, e.g. `(proto)` or
 
 ### Changed
 
+- (resolver) *BREAKING* Move `CachingClient` from `lookup_state` to `caching_client` module
 - (resolver) *BREAKING* Move `ResolverOpts::distrust_nx_responses` to `NameServerConfig::trust_nx_responses` (@djc) #1212
 - (proto) `data-encoding` is now a required dependency #1208
 - (all) minimum rustc version now `1.42`

crates/resolver/src/async_resolver.rs

@@ -19,12 +19,12 @@ use proto::rr::{IntoName, Name, Record, RecordType};
 use proto::xfer::{DnsRequestOptions, RetryDnsHandle};
 use proto::DnsHandle;
 
+use crate::caching_client::CachingClient;
 use crate::config::{ResolverConfig, ResolverOpts};
 use crate::dns_lru::{self, DnsLru};
 use crate::error::*;
 use crate::lookup::{self, Lookup, LookupEither, LookupFuture};
 use crate::lookup_ip::{LookupIp, LookupIpFuture};
-use crate::lookup_state::CachingClient;
 use crate::name_server::{
     ConnectionProvider, GenericConnection, GenericConnectionProvider, NameServerPool,
     RuntimeProvider,

crates/resolver/src/lib.rs

@@ -193,6 +193,7 @@ extern crate serde;
 pub extern crate trust_dns_proto as proto;
 
 mod async_resolver;
+pub mod caching_client;
 pub mod config;
 mod dns_lru;
 pub mod dns_sd;
@@ -202,7 +203,6 @@ mod hosts;
 mod https;
 pub mod lookup;
 pub mod lookup_ip;
-pub mod lookup_state;
 #[doc(hidden)]
 pub mod name_server;
 #[cfg(feature = "tokio-runtime")]

crates/resolver/src/lookup.rs

@@ -28,10 +28,10 @@ use proto::xfer::{DnsRequest, DnsRequestOptions, DnsResponse};
 use proto::DnssecDnsHandle;
 use proto::{DnsHandle, RetryDnsHandle};
 
+use crate::caching_client::CachingClient;
 use crate::dns_lru::MAX_TTL;
 use crate::error::*;
 use crate::lookup_ip::LookupIpIter;
-use crate::lookup_state::CachingClient;
 use crate::name_server::{ConnectionProvider, NameServerPool};
 
 /// Result of a DNS query when querying for any record type supported by the Trust-DNS Proto library.

crates/resolver/src/lookup_ip.rs

@@ -23,12 +23,12 @@ use proto::op::Query;
 use proto::rr::{Name, RData, Record, RecordType};
 use proto::xfer::{DnsHandle, DnsRequestOptions};
 
+use crate::caching_client::CachingClient;
 use crate::config::LookupIpStrategy;
 use crate::dns_lru::MAX_TTL;
 use crate::error::*;
 use crate::hosts::Hosts;
 use crate::lookup::{Lookup, LookupIntoIter, LookupIter};
-use crate::lookup_state::CachingClient;
 
 /// Result of a DNS query when querying for A or AAAA records.
 ///

tests/integration-tests/tests/lookup_tests.rs

@@ -8,11 +8,11 @@ use trust_dns_proto::op::{NoopMessageFinalizer, Query};
 use trust_dns_proto::rr::{DNSClass, Name, RData, Record, RecordType};
 use trust_dns_proto::xfer::{DnsExchange, DnsMultiplexer};
 use trust_dns_proto::TokioTime;
+use trust_dns_resolver::caching_client::CachingClient;
 use trust_dns_resolver::config::LookupIpStrategy;
 use trust_dns_resolver::error::ResolveError;
 use trust_dns_resolver::lookup::{Lookup, LookupFuture};
 use trust_dns_resolver::lookup_ip::LookupIpFuture;
-use trust_dns_resolver::lookup_state::CachingClient;
 use trust_dns_resolver::Hosts;
 use trust_dns_server::authority::{Authority, Catalog};
 use trust_dns_server::store::in_memory::InMemoryAuthority;