From 324de39bfe87a27a5652d07ae04194cd49df275b Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Sat, 29 Jun 2019 16:48:34 +0100
Subject: [PATCH] fmt

---
 common/src/comp/player.rs    |  3 ++-
 common/src/sys/phys.rs       |  3 ++-
 server/src/lib.rs            | 28 ++++++++++++++++------------
 voxygen/src/menu/main/mod.rs |  3 ++-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/common/src/comp/player.rs b/common/src/comp/player.rs
index c713394f72..0761273cf7 100644
--- a/common/src/comp/player.rs
+++ b/common/src/comp/player.rs
@@ -17,7 +17,8 @@ impl Player {
     }
 
     pub fn is_valid(&self) -> bool {
-        self.alias.chars().all(|c| c.is_alphanumeric() || c == '_') && self.alias.len() <= MAX_ALIAS_LEN
+        self.alias.chars().all(|c| c.is_alphanumeric() || c == '_')
+            && self.alias.len() <= MAX_ALIAS_LEN
         // TODO: Check view distance here based on server config too
     }
 }
diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index b7ffcea028..d1538fd183 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -255,7 +255,8 @@ impl<'a> System<'a> for Sys {
                     // If the space above is free...
                     if !collision_with(pos.0 + Vec3::unit_z() * 1.1, near_iter.clone())
                         && resolve_dir.z == 0.0
-                        && terrain.get((pos.0 - Vec3::unit_z()).map(|e| e.floor() as i32)) // Make sure we're close to the ground
+                        && terrain
+                            .get((pos.0 - Vec3::unit_z()).map(|e| e.floor() as i32)) // Make sure we're close to the ground
                             .map(|vox| !vox.is_empty())
                             .unwrap_or(false)
                     {
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 62813a91bb..ad64bfbcb3 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -455,21 +455,25 @@ impl Server {
                             ClientState::Pending => {}
                         },
                         // Valid player
-                        ClientMsg::Register { player } if player.is_valid() => match client.client_state {
-                            ClientState::Connected => {
-                                Self::initialize_player(state, entity, client, player);
-                                if let Some(player) =
-                                    state.ecs().read_storage::<comp::Player>().get(entity)
-                                {
-                                    new_chat_msgs
-                                        .push((None, format!("{} logged in", &player.alias)));
+                        ClientMsg::Register { player } if player.is_valid() => {
+                            match client.client_state {
+                                ClientState::Connected => {
+                                    Self::initialize_player(state, entity, client, player);
+                                    if let Some(player) =
+                                        state.ecs().read_storage::<comp::Player>().get(entity)
+                                    {
+                                        new_chat_msgs
+                                            .push((None, format!("{} logged in", &player.alias)));
+                                    }
                                 }
+                                // Use RequestState instead (No need to send `player` again).
+                                _ => client.error_state(RequestStateError::Impossible),
                             }
-                            // Use RequestState instead (No need to send `player` again).
-                            _ => client.error_state(RequestStateError::Impossible),
-                        },
+                        }
                         // Invalid player
-                        ClientMsg::Register { player } => client.error_state(RequestStateError::Impossible),
+                        ClientMsg::Register { player } => {
+                            client.error_state(RequestStateError::Impossible)
+                        }
                         ClientMsg::SetViewDistance(view_distance) => match client.client_state {
                             ClientState::Character { .. } => {
                                 state
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index ecadaa589d..cbe1033b30 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -114,7 +114,8 @@ impl PlayState for MainMenuState {
                                 false,
                             )));
                         } else {
-                            self.main_menu_ui.login_error("Invalid username".to_string());
+                            self.main_menu_ui
+                                .login_error("Invalid username".to_string());
                         }
                     }
                     MainMenuEvent::StartSingleplayer => {