diff options
| -rw-r--r-- | mumd/src/state.rs | 26 | ||||
| -rw-r--r-- | mumlib/src/error.rs | 16 |
2 files changed, 21 insertions, 21 deletions
diff --git a/mumd/src/state.rs b/mumd/src/state.rs index f725276..e666bcf 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -88,7 +88,7 @@ impl State { match command { Command::ChannelJoin { channel_identifier } => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected(_)) { - return now!(Err(Error::DisconnectedError)); + return now!(Err(Error::Disconnected)); } let channels = self.server().unwrap().channels(); @@ -138,7 +138,7 @@ impl State { } Command::ChannelList => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected(_)) { - return now!(Err(Error::DisconnectedError)); + return now!(Err(Error::Disconnected)); } let list = channel::into_channel( self.server.as_ref().unwrap().channels(), @@ -152,7 +152,7 @@ impl State { } Command::DeafenSelf(toggle) => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected(_)) { - return now!(Err(Error::DisconnectedError)); + return now!(Err(Error::Disconnected)); } let server = self.server().unwrap(); @@ -210,7 +210,7 @@ impl State { } Command::MuteOther(string, toggle) => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected(_)) { - return now!(Err(Error::DisconnectedError)); + return now!(Err(Error::Disconnected)); } let id = self @@ -222,7 +222,7 @@ impl State { let (id, user) = match id { Some(id) => (*id.0, id.1), - None => return now!(Err(Error::InvalidUsernameError(string))), + None => return now!(Err(Error::InvalidUsername(string))), }; let action = match toggle { @@ -245,7 +245,7 @@ impl State { } Command::MuteSelf(toggle) => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected(_)) { - return now!(Err(Error::DisconnectedError)); + return now!(Err(Error::Disconnected)); } let server = self.server().unwrap(); @@ -313,7 +313,7 @@ impl State { accept_invalid_cert, } => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Disconnected) { - return now!(Err(Error::AlreadyConnectedError)); + return now!(Err(Error::AlreadyConnected)); } let mut server = Server::new(); *server.username_mut() = Some(username); @@ -332,7 +332,7 @@ impl State { Ok(Some(v)) => v, _ => { warn!("Error parsing server addr"); - return now!(Err(Error::InvalidServerAddrError(host, port))); + return now!(Err(Error::InvalidServerAddr(host, port))); } }; connection_info_sender @@ -361,7 +361,7 @@ impl State { } Command::ServerDisconnect => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected(_)) { - return now!(Err(Error::DisconnectedError)); + return now!(Err(Error::Disconnected)); } self.server = None; @@ -381,7 +381,7 @@ impl State { .map(|mut e| e.next()) { Ok(Some(v)) => Ok(v), - _ => Err(mumlib::error::Error::InvalidServerAddrError(host, port)), + _ => Err(mumlib::error::Error::InvalidServerAddr(host, port)), } }), Box::new(move |pong| { @@ -395,7 +395,7 @@ impl State { ), Command::Status => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected(_)) { - return now!(Err(Error::DisconnectedError)); + return now!(Err(Error::Disconnected)); } let state = self.server.as_ref().unwrap().into(); now!(Ok(Some(CommandResponse::Status { @@ -404,7 +404,7 @@ impl State { } Command::UserVolumeSet(string, volume) => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected(_)) { - return now!(Err(Error::DisconnectedError)); + return now!(Err(Error::Disconnected)); } let user_id = match self .server() @@ -414,7 +414,7 @@ impl State { .find(|e| e.1.name() == string) .map(|e| *e.0) { - None => return now!(Err(Error::InvalidUsernameError(string))), + None => return now!(Err(Error::InvalidUsername(string))), Some(v) => v, }; diff --git a/mumlib/src/error.rs b/mumlib/src/error.rs index 0259c28..f6a02a7 100644 --- a/mumlib/src/error.rs +++ b/mumlib/src/error.rs @@ -5,24 +5,24 @@ pub type Result<T> = std::result::Result<T, Error>; #[derive(Clone, Debug, Serialize, Deserialize)] pub enum Error { - DisconnectedError, - AlreadyConnectedError, + Disconnected, + AlreadyConnected, ChannelIdentifierError(String, ChannelIdentifierError), - InvalidServerAddrError(String, u16), - InvalidUsernameError(String), + InvalidServerAddr(String, u16), + InvalidUsername(String), InvalidServerPassword, } impl fmt::Display for Error { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Error::DisconnectedError => write!(f, "Not connected to a server"), - Error::AlreadyConnectedError => write!(f, "Already connected to a server"), + Error::Disconnected=> write!(f, "Not connected to a server"), + Error::AlreadyConnected=> write!(f, "Already connected to a server"), Error::ChannelIdentifierError(id, kind) => write!(f, "{}: {}", kind, id), - Error::InvalidServerAddrError(addr, port) => { + Error::InvalidServerAddr(addr, port) => { write!(f, "Invalid server address: {}: {}", addr, port) } - Error::InvalidUsernameError(username) => write!(f, "Invalid username: {}", username), + Error::InvalidUsername(username) => write!(f, "Invalid username: {}", username), Error::InvalidServerPassword => write!(f, "Invalid server password") } } |