From a447ef25b6286333d8238e9f5d46ffa45f8148ab Mon Sep 17 00:00:00 2001
From: James <jselby@jselby.net>
Date: Sun, 23 Jun 2019 20:27:35 +1000
Subject: [PATCH] Clean up codebase, fixing minor errors

---
 src/frontend/mod.rs                               |  2 ++
 src/frontend/rest/mod.rs                          |  2 ++
 src/frontend/rest/server.rs                       |  2 ++
 src/frontend/rest/services/attributes.rs          |  2 ++
 src/frontend/rest/services/config.rs              |  2 ++
 src/frontend/rest/services/default_path.rs        |  2 ++
 src/frontend/rest/services/exit.rs                |  2 ++
 src/frontend/rest/services/install.rs             |  2 ++
 src/frontend/rest/services/installation_status.rs |  2 ++
 src/frontend/rest/services/mod.rs                 |  2 ++
 src/frontend/rest/services/packages.rs            |  2 ++
 src/frontend/rest/services/static_files.rs        |  2 ++
 src/frontend/rest/services/uninstall.rs           |  2 ++
 src/frontend/rest/services/update_updater.rs      |  2 ++
 src/frontend/ui/mod.rs                            |  2 ++
 src/http.rs                                       |  2 +-
 src/installer.rs                                  |  6 +++---
 src/main.rs                                       |  2 +-
 src/sources/github/mod.rs                         |  5 +++--
 src/tasks/ensure_only_instance.rs                 |  6 +++---
 src/tasks/mod.rs                                  | 12 ++++++------
 21 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index 8788a3e..09e08f5 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -1,3 +1,5 @@
+//! frontend/mod.rs
+//!
 //! Provides the frontend interface, including HTTP server.
 
 use std::sync::{Arc, RwLock};
diff --git a/src/frontend/rest/mod.rs b/src/frontend/rest/mod.rs
index 4563295..19aa914 100644
--- a/src/frontend/rest/mod.rs
+++ b/src/frontend/rest/mod.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/mod.rs
+//!
 //! Contains the main web server used within the application.
 
 pub mod server;
diff --git a/src/frontend/rest/server.rs b/src/frontend/rest/server.rs
index ef860e3..e970763 100644
--- a/src/frontend/rest/server.rs
+++ b/src/frontend/rest/server.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/server.rs
+//!
 //! Contains the over-arching server object + methods to manipulate it.
 
 use frontend::rest::services::WebService;
diff --git a/src/frontend/rest/services/attributes.rs b/src/frontend/rest/services/attributes.rs
index ef3063d..267d1c4 100644
--- a/src/frontend/rest/services/attributes.rs
+++ b/src/frontend/rest/services/attributes.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/attributes.rs
+//!
 //! The /api/attr call returns an executable script containing session variables.
 
 use frontend::rest::services::default_future;
diff --git a/src/frontend/rest/services/config.rs b/src/frontend/rest/services/config.rs
index 3dc3e16..8056f0f 100644
--- a/src/frontend/rest/services/config.rs
+++ b/src/frontend/rest/services/config.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/config.rs
+//!
 //! The /api/config call returns the current installer framework configuration.
 //!
 //! This endpoint should be usable directly from a <script> tag during loading.
diff --git a/src/frontend/rest/services/default_path.rs b/src/frontend/rest/services/default_path.rs
index cb33fc4..6f5fcf2 100644
--- a/src/frontend/rest/services/default_path.rs
+++ b/src/frontend/rest/services/default_path.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/default_path.rs
+//!
 //! The /api/default-path returns the default path for the application to install into.
 
 use frontend::rest::services::default_future;
diff --git a/src/frontend/rest/services/exit.rs b/src/frontend/rest/services/exit.rs
index 23eacc2..d7e71f4 100644
--- a/src/frontend/rest/services/exit.rs
+++ b/src/frontend/rest/services/exit.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/exit.rs
+//!
 //! The /api/exit closes down the application.
 
 use frontend::rest::services::default_future;
diff --git a/src/frontend/rest/services/install.rs b/src/frontend/rest/services/install.rs
index d344961..4b42bbf 100644
--- a/src/frontend/rest/services/install.rs
+++ b/src/frontend/rest/services/install.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/install.rs
+//!
 //! The /api/install call installs a set of packages dictated by a POST request.
 
 use frontend::rest::services::stream_progress;
diff --git a/src/frontend/rest/services/installation_status.rs b/src/frontend/rest/services/installation_status.rs
index 22667b9..e179f09 100644
--- a/src/frontend/rest/services/installation_status.rs
+++ b/src/frontend/rest/services/installation_status.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/installation_status.rs
+//!
 //! The /api/installation-status call returns metadata relating to the current status of
 //! the installation.
 //!
diff --git a/src/frontend/rest/services/mod.rs b/src/frontend/rest/services/mod.rs
index 4a99e3c..72943fb 100644
--- a/src/frontend/rest/services/mod.rs
+++ b/src/frontend/rest/services/mod.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/mod.rs
+//!
 //! Provides all services used by the REST server.
 
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
diff --git a/src/frontend/rest/services/packages.rs b/src/frontend/rest/services/packages.rs
index 9a893ca..e2b5f27 100644
--- a/src/frontend/rest/services/packages.rs
+++ b/src/frontend/rest/services/packages.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/packages.rs
+//!
 //! The /api/packages call returns all the currently installed packages.
 
 use frontend::rest::services::default_future;
diff --git a/src/frontend/rest/services/static_files.rs b/src/frontend/rest/services/static_files.rs
index a658525..16b8686 100644
--- a/src/frontend/rest/services/static_files.rs
+++ b/src/frontend/rest/services/static_files.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/static_files.rs
+//!
 //! The static files call returns static files embedded within the executable.
 //!
 //! e.g. index.html, main.js, ...
diff --git a/src/frontend/rest/services/uninstall.rs b/src/frontend/rest/services/uninstall.rs
index 3c7b880..162c130 100644
--- a/src/frontend/rest/services/uninstall.rs
+++ b/src/frontend/rest/services/uninstall.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/uninstall.rs
+//!
 //! The /api/uninstall call uninstalls all packages.
 
 use frontend::rest::services::default_future;
diff --git a/src/frontend/rest/services/update_updater.rs b/src/frontend/rest/services/update_updater.rs
index 1b1985b..6d48b85 100644
--- a/src/frontend/rest/services/update_updater.rs
+++ b/src/frontend/rest/services/update_updater.rs
@@ -1,3 +1,5 @@
+//! frontend/rest/services/update_updater.rs
+//!
 //! The /api/update-updater call attempts to update the currently running updater.
 
 use frontend::rest::services::default_future;
diff --git a/src/frontend/ui/mod.rs b/src/frontend/ui/mod.rs
index c4d79ce..be36d3c 100644
--- a/src/frontend/ui/mod.rs
+++ b/src/frontend/ui/mod.rs
@@ -1,3 +1,5 @@
+//! frontend/ui/mod.rs
+//!
 //! Provides a web-view UI.
 
 use web_view::Content;
diff --git a/src/http.rs b/src/http.rs
index a0ed427..fb57a54 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -14,7 +14,7 @@ pub fn assert_ssl(url: &str) -> Result<(), String> {
     if url.starts_with("https://") {
         Ok(())
     } else {
-        Err(format!("Specified URL was not https"))
+        Err("Specified URL was not https".to_string())
     }
 }
 
diff --git a/src/installer.rs b/src/installer.rs
index 73b15d2..78f208d 100644
--- a/src/installer.rs
+++ b/src/installer.rs
@@ -109,14 +109,14 @@ pub struct LocalInstallation {
 
 macro_rules! declare_messenger_callback {
     ($target:expr) => {
-        &|msg: &TaskMessage| match msg {
-            &TaskMessage::DisplayMessage(msg, progress) => {
+        &|msg: &TaskMessage| match *msg {
+            TaskMessage::DisplayMessage(msg, progress) => {
                 if let Err(v) = $target.send(InstallMessage::Status(msg.to_string(), progress as _))
                 {
                     error!("Failed to submit queue message: {:?}", v);
                 }
             }
-            &TaskMessage::PackageInstalled => {
+            TaskMessage::PackageInstalled => {
                 if let Err(v) = $target.send(InstallMessage::PackageInstalled) {
                     error!("Failed to submit queue message: {:?}", v);
                 }
diff --git a/src/main.rs b/src/main.rs
index 9af7c6c..b8a996d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -148,7 +148,7 @@ fn main() {
                         info!("Copy attempt failed: {:?}, retrying in 3 seconds.", e);
                         thread::sleep(time::Duration::from_millis(3000));
                     } else {
-                        let _: () = Err(e).log_expect("Copying new binary failed");
+                        Err::<(), _>(e).log_expect("Copying new binary failed");
                     }
                 }
             }
diff --git a/src/sources/github/mod.rs b/src/sources/github/mod.rs
index 6e6be22..35c0f43 100644
--- a/src/sources/github/mod.rs
+++ b/src/sources/github/mod.rs
@@ -49,10 +49,11 @@ impl ReleaseSource for GithubReleases {
         match response.status() {
             StatusCode::OK => {}
             StatusCode::FORBIDDEN => {
-                return Err(format!(
+                return Err(
                     "GitHub is rate limiting you. Try moving to a internet connection \
                      that isn't shared, and/or disabling VPNs."
-                ));
+                        .to_string(),
+                );
             }
             _ => {
                 return Err(format!("Bad status code: {:?}.", response.status()));
diff --git a/src/tasks/ensure_only_instance.rs b/src/tasks/ensure_only_instance.rs
index e84258a..a9c34f1 100644
--- a/src/tasks/ensure_only_instance.rs
+++ b/src/tasks/ensure_only_instance.rs
@@ -32,13 +32,13 @@ impl Task for EnsureOnlyInstanceTask {
             let exe = name;
 
             if exe.ends_with("maintenancetool.exe") || exe.ends_with("maintenancetool") {
-                return Err(format!("Maintenance tool is already running!"));
+                return Err("Maintenance tool is already running!".to_string());
             }
 
             for package in &context.database.packages {
                 for file in &package.files {
                     if exe.ends_with(file) {
-                        return Err(format!("The installed application is currently running!"));
+                        return Err("The installed application is currently running!".to_string());
                     }
                 }
             }
@@ -52,6 +52,6 @@ impl Task for EnsureOnlyInstanceTask {
     }
 
     fn name(&self) -> String {
-        format!("EnsureOnlyInstanceTask")
+        "EnsureOnlyInstanceTask".to_string()
     }
 }
diff --git a/src/tasks/mod.rs b/src/tasks/mod.rs
index 614c841..294809e 100644
--- a/src/tasks/mod.rs
+++ b/src/tasks/mod.rs
@@ -133,8 +133,8 @@ impl DependencyTree {
                 continue;
             }
 
-            let result = i.execute(context, &|msg: &TaskMessage| match msg {
-                &TaskMessage::DisplayMessage(msg, progress) => {
+            let result = i.execute(context, &|msg: &TaskMessage| match *msg {
+                TaskMessage::DisplayMessage(msg, progress) => {
                     messenger(&TaskMessage::DisplayMessage(
                         msg,
                         progress / total_tasks + (1.0 / total_tasks) * f64::from(count),
@@ -159,8 +159,8 @@ impl DependencyTree {
 
         let task_result = self
             .task
-            .execute(inputs, context, &|msg: &TaskMessage| match msg {
-                &TaskMessage::DisplayMessage(msg, progress) => {
+            .execute(inputs, context, &|msg: &TaskMessage| match *msg {
+                TaskMessage::DisplayMessage(msg, progress) => {
                     messenger(&TaskMessage::DisplayMessage(
                         msg,
                         progress / total_tasks + (1.0 / total_tasks) * f64::from(count),
@@ -179,8 +179,8 @@ impl DependencyTree {
                 continue;
             }
 
-            let result = i.execute(context, &|msg: &TaskMessage| match msg {
-                &TaskMessage::DisplayMessage(msg, progress) => {
+            let result = i.execute(context, &|msg: &TaskMessage| match *msg {
+                TaskMessage::DisplayMessage(msg, progress) => {
                     messenger(&TaskMessage::DisplayMessage(
                         msg,
                         progress / total_tasks + (1.0 / total_tasks) * f64::from(count),