From eb96b559680e42173c0571b65fcb7fb63afbab62 Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Wed, 3 Feb 2021 01:26:02 +0100
Subject: clean up depending on futures

---
 mumd/src/network.rs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'mumd/src/network.rs')

diff --git a/mumd/src/network.rs b/mumd/src/network.rs
index 6c67b3a..7950dc7 100644
--- a/mumd/src/network.rs
+++ b/mumd/src/network.rs
@@ -1,15 +1,10 @@
 pub mod tcp;
 pub mod udp;
 
-use futures::Future;
-use futures::FutureExt;
-use futures::channel::oneshot;
-use futures::join;
-use futures::pin_mut;
-use futures::select;
+use futures_util::FutureExt;
 use log::*;
-use std::net::SocketAddr;
-use tokio::sync::watch;
+use std::{future::Future, net::SocketAddr};
+use tokio::{join, select, sync::{oneshot, watch}};
 
 use crate::state::StatePhase;
 
@@ -58,9 +53,9 @@ async fn run_until<F>(
 
     let main_block = async {
         let rx = rx.fuse();
-        pin_mut!(rx);
+        //pin_mut!(rx);
         let fut = fut.fuse();
-        pin_mut!(fut);
+        //pin_mut!(fut);
         select! {
             _ = fut => (),
             _ = rx => (),
-- 
cgit v1.2.1