From e84e7df3f16d17436d204e15e7ca1ee27823b95b Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Mon, 5 Feb 2018 15:59:34 +0200
Subject: [PATCH] Remove unwrap call.

---
 hammond-data/src/errors.rs        | 2 +-
 hammond-data/src/models/source.rs | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hammond-data/src/errors.rs b/hammond-data/src/errors.rs
index fa88ca5..5afe6b8 100644
--- a/hammond-data/src/errors.rs
+++ b/hammond-data/src/errors.rs
@@ -30,7 +30,7 @@ pub enum DataError {
     #[fail(display = "TLS Error: {}", _0)]
     TLSError(#[cause] native_tls::Error),
     #[fail(display = "IO Error: {}", _0)]
-    IOError(io::Error),
+    IOError(#[cause] io::Error),
     #[fail(display = "WANNABE BAIL ERROR: {}", _0)]
     DiscountBail(String),
 }
diff --git a/hammond-data/src/models/source.rs b/hammond-data/src/models/source.rs
index 34f32dd..2352757 100644
--- a/hammond-data/src/models/source.rs
+++ b/hammond-data/src/models/source.rs
@@ -241,8 +241,10 @@ fn response_to_channel(
         .map_err(From::from)
         .map(|iter| iter.collect::<Vec<u8>>())
         .map(|utf_8_bytes| String::from_utf8_lossy(&utf_8_bytes).into_owned())
-        // FIXME: Unwrap
-        .and_then(|buf| Ok(Channel::from_str(&buf).unwrap()));
+        .and_then(|buf| {
+            Channel::from_str(&buf)
+                .or_else(|_| Err(DataError::DiscountBail(format!("RSS crate Error"))))
+        });
     let cpu_chan = pool.spawn(chan);
     Box::new(cpu_chan)
 }