summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChubby Puddles Esq <andrew@2b9x.com>2020-01-10 11:33:38 -0800
committerChubby Puddles Esq <andrew@2b9x.com>2020-01-10 11:33:38 -0800
commit524142b64edc488a403651ce0bf6b9afa6dbe189 (patch)
treea587c0d6f1994d602f7be72f360a6e9c6ed21103
parent3eecb969d5440b68bbcc808a062661223c60681e (diff)
made requested PR changes
-rw-r--r--src/network/dns/resolver.rs4
-rw-r--r--src/os/shared.rs3
-rw-r--r--src/tests/fakes/fake_input.rs13
3 files changed, 3 insertions, 17 deletions
diff --git a/src/network/dns/resolver.rs b/src/network/dns/resolver.rs
index d802a26..007c485 100644
--- a/src/network/dns/resolver.rs
+++ b/src/network/dns/resolver.rs
@@ -1,7 +1,7 @@
use async_trait::async_trait;
use std::net::Ipv4Addr;
use tokio::runtime::Handle;
-use trust_dns_resolver::{error::ResolveErrorKind, AsyncResolver, TokioAsyncResolver};
+use trust_dns_resolver::{error::ResolveErrorKind, TokioAsyncResolver};
#[async_trait]
pub trait Lookup {
@@ -12,7 +12,7 @@ pub struct Resolver(TokioAsyncResolver);
impl Resolver {
pub async fn new(runtime: Handle) -> Result<Self, failure::Error> {
- let resolver = AsyncResolver::from_system_conf(runtime).await?;
+ let resolver = TokioAsyncResolver::from_system_conf(runtime).await?;
Ok(Self(resolver))
}
}
diff --git a/src/os/shared.rs b/src/os/shared.rs
index d2c2c34..a55043b 100644
--- a/src/os/shared.rs
+++ b/src/os/shared.rs
@@ -126,8 +126,7 @@ pub fn get_input(
let dns_client = if resolve {
let mut runtime = Runtime::new()?;
let resolver = runtime
- .block_on(dns::Resolver::new(runtime.handle().clone()))
- .unwrap();
+ .block_on(dns::Resolver::new(runtime.handle().clone()))?;
let dns_client = dns::Client::new(resolver, runtime)?;
Some(dns_client)
} else {
diff --git a/src/tests/fakes/fake_input.rs b/src/tests/fakes/fake_input.rs
index bd4295e..253082e 100644
--- a/src/tests/fakes/fake_input.rs
+++ b/src/tests/fakes/fake_input.rs
@@ -3,10 +3,7 @@ use ::ipnetwork::IpNetwork;
use ::pnet_bandwhich_fork::datalink::DataLinkReceiver;
use ::pnet_bandwhich_fork::datalink::NetworkInterface;
use ::std::collections::HashMap;
-use ::std::future::Future;
use ::std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use ::std::pin::Pin;
-use ::std::task::{Context, Poll};
use ::std::{thread, time};
use ::termion::event::Event;
use ::tokio::runtime::Runtime;
@@ -187,13 +184,3 @@ impl Lookup for FakeResolver {
self.0.get(&ip).cloned()
}
}
-
-struct FakeBackground {}
-
-impl Future for FakeBackground {
- type Output = ();
-
- fn poll(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Self::Output> {
- Poll::Ready(())
- }
-}