diff options
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | examples/01.rs (renamed from src/main.rs) | 2 | ||||
-rw-r--r-- | src/server.rs | 14 |
3 files changed, 12 insertions, 8 deletions
@@ -3,3 +3,7 @@ name = "irsc" version = "0.0.1" authors = ["Till Hoeppner <hoeppner.till@gmail.com>"] +description = "A lightweight library for building IRC bots." +repository = "https://github.com/hoeppnertill/irsc" +keywords = ["irc", "internet", "protocol", "useless tags"] +license = "No decision yet." diff --git a/src/main.rs b/examples/01.rs index 865234a..9756119 100644 --- a/src/main.rs +++ b/examples/01.rs @@ -29,7 +29,7 @@ fn main() { s.user(NAME, "*", "*", DESC).unwrap(); s.join("#botzoo").unwrap(); - s.msg("flan3002", "Hey!").unwrap(); + s.msg("flan3002", "Hey, I'm your example bot!").unwrap(); s.events.lock().register(&callback); diff --git a/src/server.rs b/src/server.rs index b783a25..343cdee 100644 --- a/src/server.rs +++ b/src/server.rs @@ -48,10 +48,10 @@ impl Server { pub fn connect(&mut self, host: String, port: u16) -> Result<(), Failure> { let mut s = self.stream.lock(); - match *s { Some(_) => return Err(AlreadyConnected), _ => () }; + match *s { Some(_) => return Err(Failure::AlreadyConnected), _ => () }; *s = match TcpStream::connect((host.as_slice(), port)) { Ok(tcp) => Some(tcp), - Err(e) => return Err(Io(e)) + Err(e) => return Err(Failure::Io(e)) }; Ok(()) @@ -67,15 +67,15 @@ impl Server { Ok(_) => match { if newline { stream.write_str("\r\n") } else { Ok(()) } } { Ok(_) => match stream.flush() { Ok(_) => Ok(()), - Err(e) => return Err(Io(e)) + Err(e) => return Err(Failure::Io(e)) }, - Err(e) => return Err(Io(e)) + Err(e) => return Err(Failure::Io(e)) }, - Err(e) => return Err(Io(e)) + Err(e) => return Err(Failure::Io(e)) } }).unwrap() } else { - Err(NotConnected) + Err(Failure::NotConnected) } } @@ -104,7 +104,7 @@ impl Server { let lock = self.stream.lock(); match *lock { Some(ref s) => s.clone(), - None => return Err(NotConnected) + None => return Err(Failure::NotConnected) } }; |