From 26a8e0c20cc1a300f8d03e152c9910839ce1cd53 Mon Sep 17 00:00:00 2001
From: James Ravenscroft
Date: Fri, 26 Dec 2014 13:28:56 +0000
Subject: Put examples back to how they were before and removed some
 into_string deprecated calls

---
 examples/01.rs | 2 +-
 src/ident.rs   | 7 ++++---
 src/server.rs  | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/01.rs b/examples/01.rs
index ec35e5d..0bf51f5 100644
--- a/examples/01.rs
+++ b/examples/01.rs
@@ -24,7 +24,7 @@ fn callback(arg: (Server, Event)) {
 
 fn main() {
     let mut s = Server::new();
-    s.connect("irc.aberwiki.org".into_string(), 6667).unwrap();
+    s.connect("irc.freenode.org".into_string(), 6667).unwrap();
     s.nick(NAME).unwrap();
     s.user(NAME, "*", "*", DESC).unwrap();
     s.join("#botzoo").unwrap();
diff --git a/src/ident.rs b/src/ident.rs
index 19756ca..6a01d12 100644
--- a/src/ident.rs
+++ b/src/ident.rs
@@ -1,4 +1,5 @@
 use regex::Regex;
+use std::borrow::ToOwned;
 
 static PATTERN: Regex = regex!(":(.*)!(.*)@(.*)");
 
@@ -16,9 +17,9 @@ impl Ident {
             None => return None
         };
         Some(Ident {
-            nickname: c.at(1).unwrap().into_string(),
-            user: c.at(2).unwrap().into_string(),
-            host: c.at(3).unwrap().into_string()
+            nickname: c.at(1).unwrap().to_owned(),
+            user: c.at(2).unwrap().to_owned(),
+            host: c.at(3).unwrap().to_owned()
         })
     }
 }
diff --git a/src/server.rs b/src/server.rs
index 7504658..309ecfb 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -7,6 +7,8 @@ use std::io::{
 use std::sync::Arc;
 use std::sync::Mutex;
 
+use std::borrow::ToOwned;
+
 use callback::Callback;
 use event;
 use event::Event;
@@ -126,8 +128,8 @@ impl Server {
 
             let cmd = parts.remove(0).unwrap();
             let event = Event {
-                prefix: prefix.into_string(),
-                command: cmd.into_string(),
+                prefix: prefix.to_owned(),
+                command: cmd.to_owned(),
                 content: parts.iter().map(|p| p.into_string()).collect()
             };
 
-- 
cgit v1.2.3