From ca0c7c053153b964d1fec3a49e4765f9158cc7d9 Mon Sep 17 00:00:00 2001 From: CapsizeGlimmer <> Date: Wed, 24 Jun 2020 02:29:39 -0400 Subject: [PATCH] cargo fmt --- client/src/lib.rs | 25 ++++++++++++++++--------- server/src/cmd.rs | 20 +++++--------------- server/src/sys/message.rs | 13 ++++++------- voxygen/src/hud/settings_window.rs | 16 ++++++++++------ 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/client/src/lib.rs b/client/src/lib.rs index 17000154ec..80653d132d 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -872,11 +872,7 @@ impl Client { self.state.ecs_mut().apply_entity_package(entity_package); }, ServerMsg::DeleteEntity(entity) => { - if self - .state - .read_component_cloned::(self.entity) - != Some(entity) - { + if self.state.read_component_cloned::(self.entity) != Some(entity) { self.state .ecs_mut() .delete_entity_and_clear_from_uid_allocator(entity.0); @@ -1034,16 +1030,27 @@ impl Client { }; let name_of_uid = |uid| { let ecs = self.state.ecs(); - (&ecs.read_storage::(), &ecs.read_storage::()) - .join().find(|(_, u)| u == &uid).map(|(c, _)| c.name.clone()) + ( + &ecs.read_storage::(), + &ecs.read_storage::(), + ) + .join() + .find(|(_, u)| u == &uid) + .map(|(c, _)| c.name.clone()) }; let message_format = |uid, message, group| { let alias = alias_of_uid(uid); - let name = if character_name { name_of_uid(uid) } else { None }; + let name = if character_name { + name_of_uid(uid) + } else { + None + }; match (group, name) { (Some(group), None) => format!("({}) [{}]: {}", group, alias, message), (None, None) => format!("[{}]: {}", alias, message), - (Some(group), Some(name)) => format!("({}) [{}] {}: {}", group, alias, name, message), + (Some(group), Some(name)) => { + format!("({}) [{}] {}: {}", group, alias, name, message) + }, (None, Some(name)) => format!("[{}] {}: {}", alias, name, message), } }; diff --git a/server/src/cmd.rs b/server/src/cmd.rs index e67cf8afa5..63e37504fd 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -1083,9 +1083,7 @@ fn handle_faction( let _ = ecs.write_storage().insert(client, mode.clone()); if !msg.is_empty() { if let Some(uid) = ecs.read_storage().get(client) { - server - .state - .send_chat(mode.new_message(*uid, msg)); + server.state.send_chat(mode.new_message(*uid, msg)); } } } else { @@ -1117,9 +1115,7 @@ fn handle_group( let _ = ecs.write_storage().insert(client, mode.clone()); if !msg.is_empty() { if let Some(uid) = ecs.read_storage().get(client) { - server - .state - .send_chat(mode.new_message(*uid, msg)); + server.state.send_chat(mode.new_message(*uid, msg)); } } } else { @@ -1153,9 +1149,7 @@ fn handle_region( .insert(client, mode.clone()); if !msg.is_empty() { if let Some(uid) = server.state.ecs().read_storage().get(client) { - server - .state - .send_chat(mode.new_message(*uid, msg)); + server.state.send_chat(mode.new_message(*uid, msg)); } } } @@ -1183,9 +1177,7 @@ fn handle_say( .insert(client, mode.clone()); if !msg.is_empty() { if let Some(uid) = server.state.ecs().read_storage().get(client) { - server - .state - .send_chat(mode.new_message(*uid, msg)); + server.state.send_chat(mode.new_message(*uid, msg)); } } } @@ -1213,9 +1205,7 @@ fn handle_world( .insert(client, mode.clone()); if !msg.is_empty() { if let Some(uid) = server.state.ecs().read_storage().get(client) { - server - .state - .send_chat(mode.new_message(*uid, msg)); + server.state.send_chat(mode.new_message(*uid, msg)); } } } diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs index 3b7227a9a5..54bdc4790a 100644 --- a/server/src/sys/message.rs +++ b/server/src/sys/message.rs @@ -464,13 +464,12 @@ impl<'a> System<'a> for Sys { // Tell all clients to add them to the player list. for entity in new_players { if let (Some(uid), Some(player)) = (uids.get(entity), players.get(entity)) { - let msg = - ServerMsg::PlayerListUpdate(PlayerListUpdate::Add(*uid, PlayerInfo { - player_alias: player.alias.clone(), - is_online: true, - is_admin: admins.get(entity).is_some(), - character: None, // new players will be on character select. - })); + let msg = ServerMsg::PlayerListUpdate(PlayerListUpdate::Add(*uid, PlayerInfo { + player_alias: player.alias.clone(), + is_online: true, + is_admin: admins.get(entity).is_some(), + character: None, // new players will be on character select. + })); for client in (&mut clients).join().filter(|c| c.is_registered()) { client.notify(msg.clone()) } diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs index 0009f0de3f..796f1a52fd 100644 --- a/voxygen/src/hud/settings_window.rs +++ b/voxygen/src/hud/settings_window.rs @@ -1151,12 +1151,16 @@ impl<'a> Widget for SettingsWindow<'a> { !self.global_state.settings.gameplay.chat_character_name, )); } - Text::new(&self.localized_strings.get("hud.settings.chat_character_name")) - .right_from(state.ids.chat_char_name_button, 20.0) - .font_size(self.fonts.cyri.scale(14)) - .font_id(self.fonts.cyri.conrod_id) - .color(TEXT_COLOR) - .set(state.ids.chat_char_name_text, ui); + Text::new( + &self + .localized_strings + .get("hud.settings.chat_character_name"), + ) + .right_from(state.ids.chat_char_name_button, 20.0) + .font_size(self.fonts.cyri.scale(14)) + .font_id(self.fonts.cyri.conrod_id) + .color(TEXT_COLOR) + .set(state.ids.chat_char_name_text, ui); // Language select drop down Text::new(&self.localized_strings.get("common.languages"))