Merge together lookup() and lookup_with_hosts()

crates/resolver/src/async_resolver.rs

@@ -367,7 +367,7 @@ impl<P: ConnectionProvider> AsyncResolver<P> {
         L: From<Lookup> + Send + 'static,
     {
         let names = self.build_names(name);
-        LookupFuture::lookup_with_hosts(
+        LookupFuture::lookup(
             names,
             record_type,
             options,

crates/resolver/src/lookup.rs

@@ -272,23 +272,6 @@ impl<C> LookupFuture<C>
 where
     C: DnsHandle + 'static,
 {
-    /// Perform a lookup from a name and type to a set of RDatas
-    ///
-    /// # Arguments
-    ///
-    /// * `names` - a set of DNS names to attempt to resolve, they will be attempted in queue order, i.e. the first is `names.pop()`. Upon each failure, the next will be attempted.
-    /// * `record_type` - type of record being sought
-    /// * `client_cache` - cache with a connection to use for performing all lookups
-    #[doc(hidden)]
-    pub fn lookup(
-        names: Vec<Name>,
-        record_type: RecordType,
-        options: DnsRequestOptions,
-        client_cache: CachingClient<C>,
-    ) -> Self {
-        Self::lookup_with_hosts(names, record_type, options, client_cache, None)
-    }
-
     /// Perform a lookup from a name and type to a set of RDatas, taking the local
     /// hosts file into account.
     ///
@@ -299,7 +282,7 @@ where
     /// * `client_cache` - cache with a connection to use for performing all lookups
     /// * `hosts` - the local host file, the records inside it will be prioritized over the upstream DNS server
     #[doc(hidden)]
-    pub fn lookup_with_hosts(
+    pub fn lookup(
         mut names: Vec<Name>,
         record_type: RecordType,
         options: DnsRequestOptions,
@@ -663,6 +646,7 @@ pub mod tests {
                 RecordType::A,
                 DnsRequestOptions::default(),
                 CachingClient::new(0, mock(vec![v4_message()]), false),
+                None,
             ))
             .unwrap()
             .iter()
@@ -681,6 +665,7 @@ pub mod tests {
                     RecordType::A,
                     DnsRequestOptions::default(),
                     CachingClient::new(0, mock(vec![v4_message()]), false),
+                    None,
                 ))
                 .unwrap()
                 .records()[0]
@@ -700,6 +685,7 @@ pub mod tests {
                 RecordType::A,
                 DnsRequestOptions::default(),
                 CachingClient::new(0, mock(vec![v4_message()]), false),
+                None,
             ))
             .unwrap()
             .into_iter()
@@ -716,6 +702,7 @@ pub mod tests {
             RecordType::A,
             DnsRequestOptions::default(),
             CachingClient::new(0, mock(vec![error()]), false),
+            None,
         ))
         .is_err());
     }
@@ -731,6 +718,7 @@ pub mod tests {
             RecordType::A,
             DnsRequestOptions::default(),
             CachingClient::new(0, mock(vec![empty()]), false),
+            None,
         ))
         .expect_err("this should have been a NoRecordsFound")
         .proto()

tests/integration-tests/tests/lookup_tests.rs

@@ -45,6 +45,7 @@ fn test_lookup() {
         RecordType::A,
         Default::default(),
         CachingClient::new(0, client, false),
+        None,
     );
     let lookup = io_loop.block_on(lookup).unwrap();
 
@@ -188,6 +189,7 @@ fn test_mock_lookup() {
         RecordType::A,
         Default::default(),
         CachingClient::new(0, client, false),
+        None,
     );
 
     let io_loop = Runtime::new().unwrap();
@@ -219,6 +221,7 @@ fn test_cname_lookup() {
         RecordType::A,
         Default::default(),
         CachingClient::new(0, client, false),
+        None,
     );
 
     let io_loop = Runtime::new().unwrap();
@@ -255,6 +258,7 @@ fn test_cname_lookup_preserve() {
         RecordType::A,
         Default::default(),
         CachingClient::new(0, client, true),
+        None,
     );
 
     let io_loop = Runtime::new().unwrap();
@@ -292,6 +296,7 @@ fn test_chained_cname_lookup() {
         RecordType::A,
         Default::default(),
         CachingClient::new(0, client, false),
+        None,
     );
 
     let io_loop = Runtime::new().unwrap();
@@ -335,6 +340,7 @@ fn test_chained_cname_lookup_preserve() {
         RecordType::A,
         Default::default(),
         CachingClient::new(0, client, true),
+        None,
     );
 
     let io_loop = Runtime::new().unwrap();
@@ -421,6 +427,7 @@ fn test_max_chained_lookup_depth() {
         RecordType::A,
         Default::default(),
         client.clone(),
+        None,
     );
 
     let io_loop = Runtime::new().unwrap();
@@ -434,6 +441,7 @@ fn test_max_chained_lookup_depth() {
         RecordType::A,
         Default::default(),
         client,
+        None,
     );
 
     println!("performing followup resolve, should work");