Merge pull request #79 from mum-rs/tcp-event-queue

2 files changed, 14 insertions, 10 deletions

diff --git a/mumlib/src/error.rs b/mumlib/src/error.rs
index 8c66068..f6a02a7 100644
--- a/mumlib/src/error.rs
+++ b/mumlib/src/error.rs
@@ -3,30 +3,32 @@ use std::fmt;
 
 pub type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[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")
         }
     }
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
 pub enum ChannelIdentifierError {
     Invalid,
     Ambiguous,
diff --git a/mumlib/src/lib.rs b/mumlib/src/lib.rs
index bccf073..36edc10 100644
--- a/mumlib/src/lib.rs
+++ b/mumlib/src/lib.rs
@@ -3,6 +3,8 @@ pub mod config;
 pub mod error;
 pub mod state;
 
+pub use error::Error;
+
 use colored::*;
 use log::*;