Cleanup

utp/src/packet.rs

@@ -34,11 +34,20 @@ macro_rules! make_setter {
 
 #[derive(PartialEq, Eq, Debug)]
 pub enum PacketType {
-    Data,  // packet carries a data payload
-    Fin,   // signals the end of a connection
-    State, // signals acknowledgment of a packet
-    Reset, // forcibly terminates a connection
-    Syn,   // initiates a new connection with a peer
+    /// packet carries a data payload
+    Data,
+
+    /// signals the end of a connection
+    Fin,
+
+    /// signals acknowledgment of a packet
+    State,
+
+    /// forcibly terminates a connection
+    Reset,
+
+    /// initiates a new connection with a peer
+    Syn,
 }
 
 impl TryFrom<u8> for PacketType {
@@ -58,13 +67,7 @@ impl TryFrom<u8> for PacketType {
 
 impl From<PacketType> for u8 {
     fn from(original: PacketType) -> u8 {
-        match original {
-            PacketType::Data => 0,
-            PacketType::Fin => 1,
-            PacketType::State => 2,
-            PacketType::Reset => 3,
-            PacketType::Syn => 4,
-        }
+        original as u8
     }
 }
 

utp/src/socket.rs

@@ -1,13 +1,12 @@
-use crate::error::SocketError;
-use crate::packet::*;
-use crate::time::*;
-use crate::util::*;
-use std::cmp::{max, min};
-use std::collections::VecDeque;
-use std::convert::TryFrom;
-use std::io::Result;
-use std::net::SocketAddr;
-use std::time::{Duration, Instant};
+use crate::{error::SocketError, packet::*, time::*, util::*};
+use std::{
+    cmp::{max, min},
+    collections::VecDeque,
+    convert::TryFrom,
+    io::Result,
+    net::SocketAddr,
+    time::{Duration, Instant},
+};
 use tokio::net::{ToSocketAddrs, UdpSocket};
 
 // For simplicity's sake, let us assume no packet will ever exceed the

utp/src/stream.rs

@@ -1,6 +1,5 @@
 use crate::socket::UtpSocket;
-use std::io::Result;
-use std::net::SocketAddr;
+use std::{io::Result, net::SocketAddr};
 use tokio::net::ToSocketAddrs;
 
 /// A structure that represents a uTP (Micro Transport Protocol) stream between a local socket and a