Merge branch 'builds'

3 files changed, 11 insertions, 11 deletions

diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index 3bb912c..bcce43a 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -22,7 +22,7 @@ pub mod json;
 pub mod table;
 
 /// Helper function for building a new Frontend object based on the commandline parameters
-pub fn new_frontend(app: &ArgMatches, _config: &Configuration) -> Result<Box<Frontend>> {
+pub fn new_frontend(app: &ArgMatches, _config: &Configuration) -> Result<Box<dyn Frontend>> {
     match app.value_of("output") {
         None | Some("lines") => {
             debug!("No output specified, using default");
diff --git a/src/frontend/table.rs b/src/frontend/table.rs
index 35c867c..2bef1b8 100644
--- a/src/frontend/table.rs
+++ b/src/frontend/table.rs
@@ -93,10 +93,10 @@ impl Frontend for TableFrontend {
                 .filter(|p| filter_repos.contains(p.repo()))
                 .for_each(|upstream_package| {
                     table.add_row(row![
-                       package.name().deref().clone(),
-                         package.version().deref().clone(),
-                         upstream_package.repo().deref().clone(),
-                         upstream_package.version().deref().clone(),
+                       package.name().clone(),
+                         package.version().clone(),
+                         upstream_package.repo().clone(),
+                         upstream_package.version().clone(),
                    ]);
                 });
         }
diff --git a/src/main.rs b/src/main.rs
index a45ebb7..eea89f4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -92,7 +92,7 @@ fn deserialize_package_list(s: String, filepath: &str) -> Result<Vec<ComparePack
             Ok(v)
         },
 
-        other => Err(format_err!("Unknown file extension: {}", other))?,
+        other => Err(format_err!("Unknown file extension: {}", other)),
     }
 }
 
@@ -128,20 +128,20 @@ fn app() -> Result<()> {
         let blacklist_filter = |repo: &Repo| -> bool {
             if config.blacklist().contains(repo) {
                 trace!("In Blacklist: {:?} -> false", repo);
-                return false;
+                false
             } else {
                 trace!("Not in Blacklist: {:?} -> true", repo);
-                return true;
+                true
             }
         };
 
         let whitelist_filter = |repo: &Repo| -> bool {
             if config.whitelist().contains(repo) {
                 trace!("In Whitelist: {:?} -> true", repo);
-                return true;
+                true
             } else {
                 trace!("Not in Whitelist: {:?} -> false", repo);
-                return false;
+                false
             }
         };
 
@@ -220,7 +220,7 @@ fn app() -> Result<()> {
 
         (other, _mtch) => {
             app.is_present("input_stdin")
-                .as_result((), Error::from(format_err!("Input not from stdin")))
+                .as_result((), format_err!("Input not from stdin"))
                 .and_then(|_| {
                     // Ugly, but works:
                     // If we have "--stdin" on CLI, we have a CLI/Stdin backend, which means that we can query