From 5da002fe6d6f4c4008445b9ee48b52a523e5d7ee Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Wed, 24 Jan 2018 15:27:36 +0200
Subject: [PATCH] Use map_err(From::from) instead of ? into Ok() wrapping
 pattern.

---
 hammond-data/src/models/episode.rs | 18 +++++++++---------
 hammond-data/src/models/podcast.rs |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hammond-data/src/models/episode.rs b/hammond-data/src/models/episode.rs
index 4ce2260..5e4a5ab 100644
--- a/hammond-data/src/models/episode.rs
+++ b/hammond-data/src/models/episode.rs
@@ -173,8 +173,7 @@ impl Episode {
     pub fn set_played_now(&mut self) -> Result<()> {
         let epoch = Utc::now().timestamp() as i32;
         self.set_played(Some(epoch));
-        self.save()?;
-        Ok(())
+        self.save().map(|_| ())
     }
 
     /// Helper method to easily save/"sync" current state of self to the Database.
@@ -182,7 +181,7 @@ impl Episode {
         let db = connection();
         let tempdb = db.get()?;
 
-        Ok(self.save_changes::<Episode>(&*tempdb)?)
+        self.save_changes::<Episode>(&*tempdb).map_err(From::from)
     }
 }
 
@@ -329,8 +328,7 @@ impl EpisodeWidgetQuery {
     pub fn set_played_now(&mut self) -> Result<()> {
         let epoch = Utc::now().timestamp() as i32;
         self.set_played(Some(epoch));
-        self.save()?;
-        Ok(())
+        self.save().map(|_| ())
     }
 
     /// Helper method to easily save/"sync" current state of self to the Database.
@@ -340,9 +338,10 @@ impl EpisodeWidgetQuery {
         let db = connection();
         let tempdb = db.get()?;
 
-        Ok(diesel::update(episode.filter(rowid.eq(self.rowid)))
+        diesel::update(episode.filter(rowid.eq(self.rowid)))
             .set(self)
-            .execute(&*tempdb)?)
+            .execute(&*tempdb)
+            .map_err(From::from)
     }
 }
 
@@ -406,9 +405,10 @@ impl EpisodeCleanerQuery {
         let db = connection();
         let tempdb = db.get()?;
 
-        Ok(diesel::update(episode.filter(rowid.eq(self.rowid())))
+        diesel::update(episode.filter(rowid.eq(self.rowid())))
             .set(self)
-            .execute(&*tempdb)?)
+            .execute(&*tempdb)
+            .map_err(From::from)
     }
 }
 
diff --git a/hammond-data/src/models/podcast.rs b/hammond-data/src/models/podcast.rs
index b99b83c..f75caee 100644
--- a/hammond-data/src/models/podcast.rs
+++ b/hammond-data/src/models/podcast.rs
@@ -113,7 +113,7 @@ impl Podcast {
         let db = connection();
         let tempdb = db.get()?;
 
-        Ok(self.save_changes::<Podcast>(&*tempdb)?)
+        self.save_changes::<Podcast>(&*tempdb).map_err(From::from)
     }
 }