diff --git a/src/client.rs b/src/client.rs
index 6993724..0cd263b 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -96,7 +96,8 @@ impl Client {
                 config::PASSWORD,
                 config::VER_MAJOR,
                 config::VER_MINOR,
-            ).unwrap(),
+            )
+            .unwrap(),
         ));
 
         self.send_to_server(server::ServerRequest::SetListenPortRequest(
@@ -354,7 +355,8 @@ impl Client {
                             user_name: peer.user_name.clone(),
                             connection_type: peer.connection_type.clone(),
                         }),
-                    )).unwrap();
+                    ))
+                    .unwrap();
             }
 
             PeerState::OpeningFirewalled => {
@@ -370,7 +372,8 @@ impl Client {
                             token: peer.token,
                             user_name: peer.user_name,
                         }),
-                    )).unwrap();
+                    ))
+                    .unwrap();
             }
         }
     }
@@ -517,7 +520,8 @@ impl Client {
                         peer_id,
                         response.ip,
                         response.port,
-                    )).unwrap();
+                    ))
+                    .unwrap();
             }
 
             Err(peer) => {
diff --git a/src/control/ws.rs b/src/control/ws.rs
index 8eda242..c85e6bc 100644
--- a/src/control/ws.rs
+++ b/src/control/ws.rs
@@ -159,7 +159,8 @@ pub fn listen(client_tx: crossbeam_channel::Sender<Notification>) {
         .with_settings(ws::Settings {
             max_connections: 1,
             ..ws::Settings::default()
-        }).build(|socket_tx| Handler {
+        })
+        .build(|socket_tx| Handler {
             client_tx: client_tx.clone(),
             socket_tx: socket_tx,
         });
@@ -172,7 +173,8 @@ pub fn listen(client_tx: crossbeam_channel::Sender<Notification>) {
                 .send(Notification::Error(format!(
                     "Unable to build websocket: {}",
                     e
-                ))).unwrap();
+                )))
+                .unwrap();
             return;
         }
     };
@@ -187,7 +189,8 @@ pub fn listen(client_tx: crossbeam_channel::Sender<Notification>) {
                 .send(Notification::Error(format!(
                     "Unable to listen on websocket: {}",
                     e
-                ))).unwrap();
+                )))
+                .unwrap();
         }
     }
 }
diff --git a/src/proto/base_codec.rs b/src/proto/base_codec.rs
index 614ad5c..3045441 100644
--- a/src/proto/base_codec.rs
+++ b/src/proto/base_codec.rs
@@ -69,7 +69,7 @@ pub trait ProtoDecode: Sized {
 impl<'a> ProtoDecoder<'a> {
     /// Wraps the given byte buffer.
     pub fn new(bytes: &'a BytesMut) -> Self {
-        Self{
+        Self {
             inner: io::Cursor::new(bytes),
         }
     }
@@ -176,8 +176,7 @@ impl ProtoDecode for String {
     }
 }
 
-impl<T: ProtoDecode, U: ProtoDecode> ProtoDecode for (T, U)
-{
+impl<T: ProtoDecode, U: ProtoDecode> ProtoDecode for (T, U) {
     fn decode_from(decoder: &mut ProtoDecoder) -> io::Result<Self> {
         let first = decoder.decode()?;
         let second = decoder.decode()?;
@@ -185,8 +184,7 @@ impl<T: ProtoDecode, U: ProtoDecode> ProtoDecode for (T, U)
     }
 }
 
-impl<T: ProtoDecode> ProtoDecode for Vec<T>
-{
+impl<T: ProtoDecode> ProtoDecode for Vec<T> {
     fn decode_from(decoder: &mut ProtoDecoder) -> io::Result<Self> {
         let len = decoder.decode_u32_generic("vector length")? as usize;
         let mut vec = Vec::with_capacity(len);
@@ -547,9 +545,7 @@ pub mod tests {
             let mut expected_bytes = vec![13];
             expected_bytes.extend(encoded_bytes);
 
-            ProtoEncoder::new(&mut bytes)
-                .encode(&(val as u16))
-                .unwrap();
+            ProtoEncoder::new(&mut bytes).encode(&(val as u16)).unwrap();
             assert_eq!(bytes, expected_bytes);
         }
     }
diff --git a/src/proto/codec.rs b/src/proto/codec.rs
index 50571b3..cf6980e 100644
--- a/src/proto/codec.rs
+++ b/src/proto/codec.rs
@@ -140,7 +140,9 @@ mod tests {
     #[test]
     fn encode_u32() {
         let mut bytes = BytesMut::new();
-        LengthPrefixedEncoder::new().encode(U32_1337, &mut bytes).unwrap();
+        LengthPrefixedEncoder::new()
+            .encode(U32_1337, &mut bytes)
+            .unwrap();
 
         assert_eq!(
             bytes,
@@ -261,7 +263,9 @@ mod tests {
 
         let mut buffer = BytesMut::new();
 
-        LengthPrefixedEncoder::new().encode(value.clone(), &mut buffer).unwrap();
+        LengthPrefixedEncoder::new()
+            .encode(value.clone(), &mut buffer)
+            .unwrap();
         let decoded = LengthPrefixedDecoder::new().decode(&mut buffer).unwrap();
 
         assert_eq!(decoded, Some(value));
diff --git a/src/proto/handler.rs b/src/proto/handler.rs
index 1ce203a..04c9c21 100644
--- a/src/proto/handler.rs
+++ b/src/proto/handler.rs
@@ -3,9 +3,9 @@ use std::io;
 use std::net;
 use std::net::ToSocketAddrs;
 
+use crossbeam_channel;
 use mio;
 use slab;
-use crossbeam_channel;
 
 use crate::config;
 
@@ -122,10 +122,7 @@ impl Handler {
     ) -> io::Result<Self> {
         let host = config::SERVER_HOST;
         let port = config::SERVER_PORT;
-        let server_stream = Stream::new(
-            (host, port),
-            ServerResponseSender(client_tx.clone()),
-        )?;
+        let server_stream = Stream::new((host, port), ServerResponseSender(client_tx.clone()))?;
 
         info!("Connected to server at {}:{}", host, port);
 
@@ -172,7 +169,7 @@ impl Handler {
             None => return Err("id out of range".to_string()),
 
             Some(slab::Entry::Occupied(_occupied_entry)) => {
-                return Err("id already taken".to_string())
+                return Err("id already taken".to_string());
             }
 
             Some(slab::Entry::Vacant(vacant_entry)) => vacant_entry,
@@ -197,7 +194,8 @@ impl Handler {
                 mio::Token(peer_id),
                 mio::Ready::all(),
                 mio::PollOpt::edge() | mio::PollOpt::oneshot(),
-            ).unwrap();
+            )
+            .unwrap();
 
         vacant_entry.insert(peer_stream);
 
@@ -221,7 +219,8 @@ impl Handler {
                         mio::Token(SERVER_TOKEN),
                         event_set,
                         mio::PollOpt::edge() | mio::PollOpt::oneshot(),
-                    ).unwrap();
+                    )
+                    .unwrap();
             }
         }
     }
@@ -248,7 +247,8 @@ impl Handler {
                             token,
                             event_set,
                             mio::PollOpt::edge() | mio::PollOpt::oneshot(),
-                        ).unwrap();
+                        )
+                        .unwrap();
                 }
             }
         }
@@ -286,7 +286,8 @@ impl mio::deprecated::Handler for Handler {
                         token,
                         mio::Ready::all(),
                         mio::PollOpt::edge() | mio::PollOpt::oneshot(),
-                    ).unwrap();
+                    )
+                    .unwrap();
             }
 
             mio::Token(SERVER_TOKEN) => {
diff --git a/src/proto/peer/message.rs b/src/proto/peer/message.rs
index fb1d4b9..81c9581 100644
--- a/src/proto/peer/message.rs
+++ b/src/proto/peer/message.rs
@@ -2,8 +2,8 @@ use std::io;
 
 use crate::proto::peer::constants::*;
 use crate::proto::{
-    MutPacket, Packet, PacketReadError, ProtoDecode, ProtoDecoder, ProtoEncode, ProtoEncoder, ReadFromPacket,
-    WriteToPacket,
+    MutPacket, Packet, PacketReadError, ProtoDecode, ProtoDecoder, ProtoEncode, ProtoEncoder,
+    ReadFromPacket, WriteToPacket,
 };
 
 /*=========*
@@ -57,7 +57,7 @@ impl ProtoDecode for Message {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidData,
                     format!("unknown peer message code: {}", code),
-                ))
+                ));
             }
         };
         Ok(message)
diff --git a/src/proto/server/request.rs b/src/proto/server/request.rs
index 7afe1d0..f25a21c 100644
--- a/src/proto/server/request.rs
+++ b/src/proto/server/request.rs
@@ -197,7 +197,7 @@ impl ProtoDecode for ServerRequest {
                 return Err(io::Error::new(
                     io::ErrorKind::InvalidData,
                     format!("unknown server request code: {}", code),
-                ))
+                ));
             }
         };
         Ok(request)
diff --git a/src/proto/server/response.rs b/src/proto/server/response.rs
index 368c72a..872e4cc 100644
--- a/src/proto/server/response.rs
+++ b/src/proto/server/response.rs
@@ -38,9 +38,7 @@ impl ReadFromPacket for ServerResponse {
     fn read_from_packet(packet: &mut Packet) -> Result<Self, PacketReadError> {
         let code: u32 = packet.read_value()?;
         let resp = match code {
-            CODE_CONNECT_TO_PEER => {
-                ServerResponse::ConnectToPeerResponse(packet.read_value()?)
-            }
+            CODE_CONNECT_TO_PEER => ServerResponse::ConnectToPeerResponse(packet.read_value()?),
 
             CODE_FILE_SEARCH => ServerResponse::FileSearchResponse(packet.read_value()?),
 
@@ -48,9 +46,7 @@ impl ReadFromPacket for ServerResponse {
 
             CODE_PEER_ADDRESS => ServerResponse::PeerAddressResponse(packet.read_value()?),
 
-            CODE_PRIVILEGED_USERS => {
-                ServerResponse::PrivilegedUsersResponse(packet.read_value()?)
-            }
+            CODE_PRIVILEGED_USERS => ServerResponse::PrivilegedUsersResponse(packet.read_value()?),
 
             CODE_ROOM_JOIN => ServerResponse::RoomJoinResponse(packet.read_value()?),
 
@@ -62,9 +58,7 @@ impl ReadFromPacket for ServerResponse {
 
             CODE_ROOM_TICKERS => ServerResponse::RoomTickersResponse(packet.read_value()?),
 
-            CODE_ROOM_USER_JOINED => {
-                ServerResponse::RoomUserJoinedResponse(packet.read_value()?)
-            }
+            CODE_ROOM_USER_JOINED => ServerResponse::RoomUserJoinedResponse(packet.read_value()?),
 
             CODE_ROOM_USER_LEFT => ServerResponse::RoomUserLeftResponse(packet.read_value()?),
 
@@ -76,9 +70,7 @@ impl ReadFromPacket for ServerResponse {
                 ServerResponse::WishlistIntervalResponse(packet.read_value()?)
             }
 
-            CODE_PARENT_MIN_SPEED => {
-                ServerResponse::ParentMinSpeedResponse(packet.read_value()?)
-            }
+            CODE_PARENT_MIN_SPEED => ServerResponse::ParentMinSpeedResponse(packet.read_value()?),
 
             CODE_PARENT_SPEED_RATIO => {
                 ServerResponse::ParentSpeedRatioResponse(packet.read_value()?)
diff --git a/src/proto/user.rs b/src/proto/user.rs
index c1b8273..3009130 100644
--- a/src/proto/user.rs
+++ b/src/proto/user.rs
@@ -1,8 +1,8 @@
 use std::io;
 
 use crate::proto::{
-    MutPacket, Packet, PacketReadError, ProtoDecode, ProtoDecoder, ProtoEncode, ProtoEncoder, ReadFromPacket,
-    WriteToPacket,
+    MutPacket, Packet, PacketReadError, ProtoDecode, ProtoDecoder, ProtoEncode, ProtoEncoder,
+    ReadFromPacket, WriteToPacket,
 };
 
 const STATUS_OFFLINE: u32 = 1;