Merge pull request #21 from messense/tokio-1

Update to Tokio 1.0

Author: willstott101

Cargo.toml

@@ -15,11 +15,11 @@ if-addrs = "0.6"
 hostname = "0.3"
 log = "0.4"
 multimap = "0.8"
-rand = "0.7"
+rand = "0.8"
 futures-util = "0.3"
-tokio = { version = "0.3.4", features = ["sync","net","stream","rt"] }
+tokio = { version = "1.0", features = ["sync","net","rt"] }
 quick-error = "1.2"
 socket2 = { version = "0.3.16", features = ["reuseport"] }
 
 [dev-dependencies]
-env_logger =  { version = "0.7", default-features = false, features = ["termcolor","humantime","atty"] } 
+env_logger =  { version = "0.8", default-features = false, features = ["termcolor","humantime","atty"] } 

src/fsm.rs

@@ -12,7 +12,7 @@ use std::{
     task::{Context, Poll},
 };
 
-use tokio::{net::UdpSocket, stream::Stream, sync::mpsc};
+use tokio::{net::UdpSocket, sync::mpsc};
 
 use super::{DEFAULT_TTL, MDNS_PORT};
 use crate::address_family::AddressFamily;
@@ -221,7 +221,7 @@ impl<AF: Unpin + AddressFamily> Future for FSM<AF> {
     type Output = ();
     fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<()> {
         let pinned = Pin::get_mut(self);
-        while let Poll::Ready(cmd) = Pin::new(&mut pinned.commands).poll_next(cx) {
+        while let Poll::Ready(cmd) = Pin::new(&mut pinned.commands).poll_recv(cx) {
             match cmd {
                 Some(Command::Shutdown) => return Poll::Ready(()),
                 Some(Command::SendUnsolicited {
@@ -243,7 +243,7 @@ impl<AF: Unpin + AddressFamily> Future for FSM<AF> {
             Err(e) => error!("ResponderRecvPacket Error: {:?}", e),
         }
 
-        while let Some((ref response, ref addr)) = pinned.outgoing.pop_front() {
+        while let Some((ref response, addr)) = pinned.outgoing.pop_front() {
             trace!("sending packet to {:?}", addr);
 
             match pinned.socket.poll_send_to(cx, response, addr) {