diff -r c5a6e8566425 -r e935b1ad23f3 rust/hedgewars-server/src/handlers/inlobby.rs --- a/rust/hedgewars-server/src/handlers/inlobby.rs Tue May 28 19:04:18 2019 +0300 +++ b/rust/hedgewars-server/src/handlers/inlobby.rs Tue May 28 21:28:32 2019 +0300 @@ -2,14 +2,14 @@ use super::common::rnd_reply; use crate::{ - protocol::messages::{ - add_flags, remove_flags, server_chat, HWProtocolMessage, HWServerMessage::*, - ProtocolFlags as Flags, + core::{ + client::HwClient, + server::HwServer, + types::{ClientId, ServerVar}, }, - core::{ - client::HWClient, - server::HWServer, - types::{ClientId, ServerVar}, + protocol::messages::{ + add_flags, remove_flags, server_chat, HwProtocolMessage, HwServerMessage::*, + ProtocolFlags as Flags, }, utils::is_name_illegal, }; @@ -17,12 +17,12 @@ use std::{collections::HashSet, convert::identity}; pub fn handle( - server: &mut HWServer, + server: &mut HwServer, client_id: ClientId, response: &mut super::Response, - message: HWProtocolMessage, + message: HwProtocolMessage, ) { - use crate::protocol::messages::HWProtocolMessage::*; + use crate::protocol::messages::HwProtocolMessage::*; match message { CreateRoom(name, password) => { if is_name_illegal(&name) { @@ -94,7 +94,7 @@ } } Follow(nick) => { - if let Some(HWClient { + if let Some(HwClient { room_id: Some(room_id), .. }) = server.find_client(&nick)