From 99f0789d353e613a3f1ebe1fa016d29bc61d8a4d Mon Sep 17 00:00:00 2001
From: Aaron Weiss <aaronweiss74@gmail.com>
Date: Fri, 13 Feb 2015 10:58:40 -0500
Subject: [PATCH] Updated tests and examples for Rust master.

---
 examples/autoreconnect.rs | 2 +-
 examples/multithreaded.rs | 2 +-
 examples/simple.rs        | 4 ++--
 examples/simple_ssl.rs    | 4 ++--
 src/client/server/mod.rs  | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/examples/autoreconnect.rs b/examples/autoreconnect.rs
index 0743ff1..010a79b 100644
--- a/examples/autoreconnect.rs
+++ b/examples/autoreconnect.rs
@@ -1,4 +1,4 @@
-#![feature(core, slicing_syntax, std_misc)]
+#![feature(slicing_syntax, std_misc)]
 extern crate irc;
 
 use std::default::Default;
diff --git a/examples/multithreaded.rs b/examples/multithreaded.rs
index 8832e46..ad705e6 100644
--- a/examples/multithreaded.rs
+++ b/examples/multithreaded.rs
@@ -1,4 +1,4 @@
-#![feature(core, slicing_syntax, std_misc)]
+#![feature(slicing_syntax, std_misc)]
 extern crate irc;
 
 use std::default::Default;
diff --git a/examples/simple.rs b/examples/simple.rs
index 8437834..8c0ceb0 100644
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -1,4 +1,4 @@
-#![feature(core, slicing_syntax)]
+#![feature(slicing_syntax)]
 extern crate irc;
 
 use std::default::Default;
@@ -24,7 +24,7 @@ fn main() {
         if &message.command[] == "PRIVMSG" {
             if let Some(msg) = message.suffix {
                 if msg.contains("pickles") {
-                    server.send_privmsg(&message.args[0][], "Hi!").unwrap();
+                    server.send_privmsg(&message.args[0], "Hi!").unwrap();
                 }
             }
         }
diff --git a/examples/simple_ssl.rs b/examples/simple_ssl.rs
index a092293..b63e2ed 100644
--- a/examples/simple_ssl.rs
+++ b/examples/simple_ssl.rs
@@ -1,4 +1,4 @@
-#![feature(core, slicing_syntax)]
+#![feature(slicing_syntax)]
 extern crate irc;
 
 use std::default::Default;
@@ -25,7 +25,7 @@ fn main() {
         if &message.command[] == "PRIVMSG" {
             if let Some(msg) = message.suffix {
                 if msg.contains("pickles") {
-                    server.send_privmsg(&message.args[0][], "Hi!").unwrap();
+                    server.send_privmsg(&message.args[0], "Hi!").unwrap();
                 }
             }
         }
diff --git a/src/client/server/mod.rs b/src/client/server/mod.rs
index fd9165f..4fe10e6 100644
--- a/src/client/server/mod.rs
+++ b/src/client/server/mod.rs
@@ -322,7 +322,8 @@ mod test {
     }
 
     pub fn get_server_value<T: IrcReader>(server: IrcServer<T, MemWriter>) -> String {
-        String::from_utf8((*server.conn().writer()).get_ref().to_vec()).unwrap()
+        let vec = server.conn().writer().get_ref().to_vec();
+        String::from_utf8(vec).unwrap()
     }
 
     #[test]