Updated for Rust master.

examples/autoreconnect.rs

@@ -1,5 +1,4 @@
-#![allow(unstable)]
-#![feature(slicing_syntax)]
+#![feature(core, slicing_syntax, std_misc)]
 extern crate irc;
 
 use std::default::Default;

examples/multithreaded.rs

@@ -1,5 +1,4 @@
-#![allow(unstable)]
-#![feature(slicing_syntax)]
+#![feature(core, slicing_syntax, std_misc)]
 extern crate irc;
 
 use std::default::Default;

examples/simple.rs

@@ -1,5 +1,4 @@
-#![allow(unstable)]
-#![feature(slicing_syntax)]
+#![feature(core, slicing_syntax)]
 extern crate irc;
 
 use std::default::Default;

examples/simple_ssl.rs

@@ -1,5 +1,4 @@
-#![allow(unstable)]
-#![feature(slicing_syntax)]
+#![feature(core, slicing_syntax)]
 extern crate irc;
 
 use std::default::Default;

examples/tweeter.rs

@@ -1,5 +1,4 @@
-#![feature(slicing_syntax)]
-#![allow(unstable)]
+#![feature(io, slicing_syntax, std_misc)]
 extern crate irc;
 
 use std::default::Default;

src/client/data/command.rs

@@ -9,7 +9,7 @@ use client::data::message::{Message, ToMessage};
 /// [capabilities extension](https://tools.ietf.org/html/draft-mitchell-irc-capabilities-01).
 /// Additionally, this includes some common additional commands from popular IRCds.
 #[stable]
-#[derive(Show, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub enum Command<'a> {
     // 3.1 Connection Registration
     /// PASS :password
@@ -992,7 +992,7 @@ impl<'a> Command<'a> {
             }
         } else if let "CAP" = &m.command[] {
             if m.args.len() != 1 { return Err(invalid_input()) }
-            if let Some(cmd) = m.args[0].parse() {
+            if let Ok(cmd) = m.args[0].parse() {
                 match m.suffix {
                     Some(ref suffix) => Command::CAP(cmd, Some(&suffix[])),
                     None => Command::CAP(cmd, None),
@@ -1008,7 +1008,7 @@ impl<'a> Command<'a> {
 
 /// A list of all of the subcommands for the capabilities extension.
 #[stable]
-#[derive(Copy, Show, PartialEq)]
+#[derive(Copy, Debug, PartialEq)]
 pub enum CapSubCommand {
     /// Requests a list of the server's capabilities.
     #[stable]
@@ -1051,16 +1051,17 @@ impl CapSubCommand {
 }
 
 impl FromStr for CapSubCommand {
-    fn from_str(s: &str) -> Option<CapSubCommand> {
+    type Err = &'static str;
+    fn from_str(s: &str) -> Result<CapSubCommand, &'static str> {
         match s {
-            "LS"    => Some(CapSubCommand::LS),
-            "LIST"  => Some(CapSubCommand::LIST),
-            "REQ"   => Some(CapSubCommand::REQ),
-            "ACK"   => Some(CapSubCommand::ACK),
-            "NAK"   => Some(CapSubCommand::NAK),
-            "CLEAR" => Some(CapSubCommand::CLEAR),
-            "END"   => Some(CapSubCommand::END),
-            _       => None,
+            "LS"    => Ok(CapSubCommand::LS),
+            "LIST"  => Ok(CapSubCommand::LIST),
+            "REQ"   => Ok(CapSubCommand::REQ),
+            "ACK"   => Ok(CapSubCommand::ACK),
+            "NAK"   => Ok(CapSubCommand::NAK),
+            "CLEAR" => Ok(CapSubCommand::CLEAR),
+            "END"   => Ok(CapSubCommand::END),
+            _       => Err("Failed to parse CAP subcommand."),
         }
     }
 }

src/client/data/config.rs

@@ -8,7 +8,7 @@ use std::old_io::{InvalidInput, IoError, IoResult};
 use rustc_serialize::json::decode;
 
 /// Configuration data.
-#[derive(Clone, RustcDecodable, Default, PartialEq, Show)]
+#[derive(Clone, RustcDecodable, Default, PartialEq, Debug)]
 #[stable]
 pub struct Config {
     /// A list of the owners of the bot by nickname.

src/client/data/message.rs

@@ -5,7 +5,7 @@ use std::str::FromStr;
 
 /// IRC Message data.
 #[stable]
-#[derive(Clone, PartialEq, Show)]
+#[derive(Clone, PartialEq, Debug)]
 pub struct Message {
     /// The message prefix (or source) as defined by [RFC 2812](http://tools.ietf.org/html/rfc2812).
     #[stable]
@@ -72,9 +72,10 @@ impl ToMessage for Message {
 }
 
 impl FromStr for Message {
-    fn from_str(s: &str) -> Option<Message> {
+    type Err = &'static str;
+    fn from_str(s: &str) -> Result<Message, &'static str> {
         let mut state = s.clone();
-        if s.len() == 0 { return None }
+        if s.len() == 0 { return Err("Cannot parse an empty string as a message.") }
         let prefix = if state.starts_with(":") {
             let prefix = state.find(' ').map(|i| &state[1..i]);
             state = state.find(' ').map_or("", |i| &state[i+1..]);
@@ -94,11 +95,11 @@ impl FromStr for Message {
                 state = state.find(' ').map_or("", |i| &state[i+1..]);
                 cmd
             }
-            _ => return None
+            _ => return Err("Cannot parse a message without a command.")
         };
         if suffix.is_none() { state = &state[..state.len() - 2] }
         let args: Vec<_> = state.splitn(14, ' ').filter(|s| s.len() != 0).collect();
-        Some(Message::new(prefix, command, if args.len() > 0 { Some(args) } else { None }, suffix))
+        Ok(Message::new(prefix, command, if args.len() > 0 { Some(args) } else { None }, suffix))
     }
 }
 
@@ -167,14 +168,14 @@ mod test {
             args: vec![format!("test")],
             suffix: Some(format!("Testing!")),
         };
-        assert_eq!("PRIVMSG test :Testing!\r\n".parse(), Some(message));
+        assert_eq!("PRIVMSG test :Testing!\r\n".parse(), Ok(message));
         let message = Message {
             prefix: Some(format!("test!test@test")),
             command: format!("PRIVMSG"),
             args: vec![format!("test")],
             suffix: Some(format!("Still testing!")),
         };
-        assert_eq!(":test!test@test PRIVMSG test :Still testing!\r\n".parse(), Some(message));
+        assert_eq!(":test!test@test PRIVMSG test :Still testing!\r\n".parse(), Ok(message));
     }
 
     #[test]

src/client/data/response.rs

@@ -7,7 +7,7 @@ use client::data::message::Message;
 
 /// List of all server responses as defined in [RFC 2812](http://tools.ietf.org/html/rfc2812).
 /// All commands are documented with their expected form from the RFC.
-#[derive(Copy, Show, PartialEq, FromPrimitive)]
+#[derive(Copy, Debug, PartialEq, FromPrimitive)]
 #[repr(u16)]
 #[stable]
 pub enum Response {
@@ -435,7 +435,7 @@ impl Response {
     /// Gets a response from a message.
     #[stable]
     pub fn from_message(m: &Message) -> Option<Response> { 
-        m.command.parse() 
+        m.command.parse().ok()
     }
 
     /// Determines whether or not this response is an error response.
@@ -446,11 +446,12 @@ impl Response {
 }
 
 impl FromStr for Response {
-    fn from_str(s: &str) -> Option<Response> {
-        if let Some(respcode) = s.parse() {
-            FromPrimitive::from_u16(respcode)
+    type Err = &'static str;
+    fn from_str(s: &str) -> Result<Response, &'static str> {
+        if let Ok(respcode) = s.parse() {
+            FromPrimitive::from_u16(respcode).ok_or("Failed to convert response code to u16.")
         } else {
-            None
+            Err("Failed to parse response code.")
         }   
     }
 }

src/client/data/user.rs

@@ -7,7 +7,7 @@ use std::str::FromStr;
 
 /// IRC User data.
 #[stable]
-#[derive(Clone, Show)]
+#[derive(Clone, Debug)]
 pub struct User {
     /// The user's nickname.
     /// This is the only detail used in determining the equality of two users.
@@ -113,7 +113,7 @@ impl PartialEq for User {
 
 /// The user's access level.
 #[stable]
-#[derive(Copy, PartialEq, Clone, Show)]
+#[derive(Copy, PartialEq, Clone, Debug)]
 pub enum AccessLevel {
     /// The channel owner (~).
     #[stable]
@@ -174,15 +174,16 @@ impl PartialOrd for AccessLevel {
 }
 
 impl FromStr for AccessLevel {
-    fn from_str(s: &str) -> Option<AccessLevel> {
-        if s.len() == 0 { None } else {
-            Some(match s.char_at(0) {
+    type Err = &'static str;
+    fn from_str(s: &str) -> Result<AccessLevel, &'static str> {
+        if s.len() == 0 { Err("No access level in an empty string.") } else {
+            Ok(match s.char_at(0) {
                 '~' => AccessLevel::Owner,
                 '&' => AccessLevel::Admin,
                 '@' => AccessLevel::Oper,
                 '%' => AccessLevel::HalfOp,
                 '+' => AccessLevel::Voice,
-                 _  => return None,
+                 _  => return Err("Failed to parse access level."),
             })
         }
     }
@@ -206,7 +207,7 @@ impl<'a> Iterator for AccessLevelIterator<'a> {
         if self.value.len() > 0 {
             self.value = &self.value[1..];
         }
-        ret
+        ret.ok()
     }
 }
 
@@ -217,13 +218,13 @@ mod test {
 
     #[test]
     fn parse_access_level() {
-        assert!("member".parse::<AccessLevel>().is_none());
+        assert!("member".parse::<AccessLevel>().is_err());
         assert_eq!("~owner".parse::<AccessLevel>().unwrap(), Owner);
         assert_eq!("&admin".parse::<AccessLevel>().unwrap(), Admin);
         assert_eq!("@oper".parse::<AccessLevel>().unwrap(), Oper);
         assert_eq!("%halfop".parse::<AccessLevel>().unwrap(), HalfOp);
         assert_eq!("+voice".parse::<AccessLevel>().unwrap(), Voice);
-        assert!("".parse::<AccessLevel>().is_none());
+        assert!("".parse::<AccessLevel>().is_err());
     }
 
     #[test]

src/client/server/mod.rs

@@ -280,14 +280,14 @@ impl<'a, T: IrcReader, U: IrcWriter> Iterator for ServerIterator<'a, T, U> {
     fn next(&mut self) -> Option<IoResult<Message>> {
         let res = self.get_next_line().and_then(|msg|
              match msg.parse() {
-                Some(msg) => {
+                Ok(msg) => {
                     self.server.handle_message(&msg);
                     Ok(msg)
                 },
-                None => Err(IoError {
+                Err(m) => Err(IoError {
                     kind: IoErrorKind::InvalidInput,
                     desc: "Failed to parse message.",
-                    detail: Some(msg)
+                    detail: Some(format!("{} (Message: {})", m, msg))
                 })
             }
         );