aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network
diff options
context:
space:
mode:
authorEskil Queseth <eskilq@kth.se>2021-02-03 01:26:02 +0100
committerEskil Queseth <eskilq@kth.se>2021-02-03 01:26:02 +0100
commiteb96b559680e42173c0571b65fcb7fb63afbab62 (patch)
tree59ed522612fbd16a2aa6541e9cd785f78d691925 /mumd/src/network
parent154a2930b3bbe5ede06648c3a10b8fa4904277f4 (diff)
downloadmum-eb96b559680e42173c0571b65fcb7fb63afbab62.tar.gz
clean up depending on futures
Diffstat (limited to 'mumd/src/network')
-rw-r--r--mumd/src/network/tcp.rs4
-rw-r--r--mumd/src/network/udp.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs
index 3a32b9f..fa2681e 100644
--- a/mumd/src/network/tcp.rs
+++ b/mumd/src/network/tcp.rs
@@ -2,8 +2,8 @@ use crate::network::ConnectionInfo;
use crate::state::{State, StatePhase};
use log::*;
-use futures::{FutureExt, SinkExt, Stream, StreamExt};
-use futures_util::stream::{SplitSink, SplitStream};
+use futures_util::{FutureExt, SinkExt, StreamExt};
+use futures_util::stream::{SplitSink, SplitStream, Stream};
use mumble_protocol::control::{msgs, ClientControlCodec, ControlCodec, ControlPacket};
use mumble_protocol::crypt::ClientCryptState;
use mumble_protocol::voice::VoicePacket;
diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs
index 5f24b51..da92dcb 100644
--- a/mumd/src/network/udp.rs
+++ b/mumd/src/network/udp.rs
@@ -1,8 +1,8 @@
use crate::network::ConnectionInfo;
use crate::state::{State, StatePhase};
-use futures::{join, FutureExt, SinkExt, StreamExt, Stream};
-use futures_util::stream::{SplitSink, SplitStream};
+use futures_util::{FutureExt, SinkExt, StreamExt};
+use futures_util::stream::{SplitSink, SplitStream, Stream};
use log::*;
use mumble_protocol::crypt::ClientCryptState;
use mumble_protocol::ping::{PingPacket, PongPacket};
@@ -14,7 +14,7 @@ use std::net::{Ipv6Addr, SocketAddr};
use std::rc::Rc;
use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::Arc;
-use tokio::net::UdpSocket;
+use tokio::{join, net::UdpSocket};
use tokio::sync::{mpsc, watch, Mutex};
use tokio::time::{interval, Duration};
use tokio_util::udp::UdpFramed;