Upload to crates.io plus fixes for changes in Rust

2 files changed, 7 insertions, 45 deletions

diff --git a/src/main.rs b/src/main.rs
deleted file mode 100644
index 865234a..0000000
--- a/src/main.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-#![feature(globs, slicing_syntax)]
-
-extern crate irsc;
-
-use irsc::server::Server;
-use irsc::color::bold;
-use irsc::event;
-use irsc::event::{ Event, ParseResult, PrivMsg };
-
-static NAME: &'static str = "rusticbot";
-static DESC: &'static str = "A bot, written in Rust.";
-
-fn callback(arg: (Server, Event)) {
-    let (mut server, event) = arg;
-    match event.command[] {
-        event::PRIVMSG => {
-            let privmsg: PrivMsg = ParseResult::parse(event).unwrap();
-            let response = format!("You wrote: {}", bold(privmsg.content[]));
-            server.msg(privmsg.from.nickname[], response[]).unwrap();
-        },
-        _ => ()
-    }
-}
-
-fn main() {
-    let mut s = Server::new();
-    s.connect("irc.freenode.org".into_string(), 6667).unwrap();
-    s.nick(NAME).unwrap();
-    s.user(NAME, "*", "*", DESC).unwrap();
-    s.join("#botzoo").unwrap();
-
-    s.msg("flan3002", "Hey!").unwrap();
-
-    s.events.lock().register(&callback);
-
-    // Dedicate this thread to listening and event processing
-    s.listen().unwrap();
-}
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)
             }
         };