From ce4ab4d6a395bbce37531225d506552d6a910f3f Mon Sep 17 00:00:00 2001
From: James Ravenscroft
Date: Thu, 25 Dec 2014 11:39:05 +0000
Subject: Added unwrap calls around ident regex matches

---
 src/ident.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/ident.rs')

diff --git a/src/ident.rs b/src/ident.rs
index 069e186..3089af4 100644
--- a/src/ident.rs
+++ b/src/ident.rs
@@ -16,9 +16,9 @@ impl Ident {
             None => return None
         };
         Some(Ident {
-            nickname: c.at(1).into_string(),
-            user: c.at(2).into_string(),
-            host: c.at(3).into_string()
+            nickname: c.at(1).unwrap_or("").into_string(),
+            user: c.at(2).unwrap_or("").into_string(),
+            host: c.at(3).unwrap_or("").into_string()
         })
     }
 }
-- 
cgit v1.2.3


From 8d42ad9822e7e4b9e595bb2bd587a5da0db8ce9a Mon Sep 17 00:00:00 2001
From: James Ravenscroft
Date: Thu, 25 Dec 2014 18:33:49 +0000
Subject: Changed unwrap_or to unwrap because we want the program to fail
 instead of use emptystring if ident can't be unwrapped

---
 src/ident.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/ident.rs')

diff --git a/src/ident.rs b/src/ident.rs
index 3089af4..19756ca 100644
--- a/src/ident.rs
+++ b/src/ident.rs
@@ -16,9 +16,9 @@ impl Ident {
             None => return None
         };
         Some(Ident {
-            nickname: c.at(1).unwrap_or("").into_string(),
-            user: c.at(2).unwrap_or("").into_string(),
-            host: c.at(3).unwrap_or("").into_string()
+            nickname: c.at(1).unwrap().into_string(),
+            user: c.at(2).unwrap().into_string(),
+            host: c.at(3).unwrap().into_string()
         })
     }
 }
-- 
cgit v1.2.3


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

---
 src/ident.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/ident.rs')

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()
         })
     }
 }
-- 
cgit v1.2.3