From 2cac8a7970ab1aab38b10ec475a211c2121cec8e Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Mon, 31 Dec 2018 13:34:56 +0200
Subject: [PATCH] Cargo fmt

---
 src/main.rs             |  5 ++++-
 src/steps/os/freebsd.rs |  6 ++++--
 src/steps/os/macos.rs   |  3 ++-
 src/steps/os/windows.rs | 18 +++++++++---------
 src/steps/vim.rs        |  5 +++--
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 92b7098b..a3984306 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -125,7 +125,10 @@ fn run() -> Result<(), Error> {
     #[cfg(unix)]
     report.push_result(execute(|| unix::run_homebrew(opt.cleanup, opt.run_type), opt.no_retry)?);
     #[cfg(target_os = "freebsd")]
-    report.push_result(execute(|| freebsd::upgrade_packages(&sudo, opt.run_type), opt.no_retry)?);
+    report.push_result(execute(
+        || freebsd::upgrade_packages(&sudo, opt.run_type),
+        opt.no_retry,
+    )?);
     #[cfg(unix)]
     report.push_result(execute(|| unix::run_nix(opt.run_type), opt.no_retry)?);
 
diff --git a/src/steps/os/freebsd.rs b/src/steps/os/freebsd.rs
index 6579373d..db6a015b 100644
--- a/src/steps/os/freebsd.rs
+++ b/src/steps/os/freebsd.rs
@@ -12,7 +12,8 @@ pub fn upgrade_freebsd(sudo: &Option<PathBuf>, run_type: RunType) -> Option<(&'s
 
     if let Some(sudo) = sudo {
         let success = || -> Result<(), Error> {
-            run_type.execute(sudo)
+            run_type
+                .execute(sudo)
                 .args(&["/usr/sbin/freebsd-update", "fetch", "install"])
                 .spawn()?
                 .wait()?
@@ -34,7 +35,8 @@ pub fn upgrade_packages(sudo: &Option<PathBuf>, run_type: RunType) -> Option<(&'
 
     if let Some(sudo) = sudo {
         let success = || -> Result<(), Error> {
-            run_type.execute(sudo)
+            run_type
+                .execute(sudo)
                 .args(&["/usr/sbin/pkg", "upgrade"])
                 .spawn()?
                 .wait()?
diff --git a/src/steps/os/macos.rs b/src/steps/os/macos.rs
index 49d5a331..79fbc1ff 100644
--- a/src/steps/os/macos.rs
+++ b/src/steps/os/macos.rs
@@ -8,7 +8,8 @@ pub fn upgrade_macos(run_type: RunType) -> Option<(&'static str, bool)> {
     print_separator("App Store");
 
     let success = || -> Result<(), Error> {
-        run_type.execute("softwareupdate")
+        run_type
+            .execute("softwareupdate")
             .args(&["--install", "--all"])
             .spawn()?
             .wait()?
diff --git a/src/steps/os/windows.rs b/src/steps/os/windows.rs
index 44baad01..4339f9d8 100644
--- a/src/steps/os/windows.rs
+++ b/src/steps/os/windows.rs
@@ -13,7 +13,8 @@ pub fn run_chocolatey(run_type: RunType) -> Option<(&'static str, bool)> {
         print_separator("Chocolatey");
 
         let success = || -> Result<(), Error> {
-            run_type.execute(&choco)
+            run_type
+                .execute(&choco)
                 .args(&["upgrade", "all"])
                 .spawn()?
                 .wait()?
@@ -34,12 +35,9 @@ pub fn run_scoop(run_type: RunType) -> Option<(&'static str, bool)> {
         print_separator("Scoop");
 
         let success = || -> Result<(), Error> {
-            run_type.execute(&scoop)
-                .args(&["update"])
-                .spawn()?
-                .wait()?
-                .check()?;
-            run_type.execute(&scoop)
+            run_type.execute(&scoop).args(&["update"]).spawn()?.wait()?.check()?;
+            run_type
+                .execute(&scoop)
                 .args(&["update", "*"])
                 .spawn()?
                 .wait()?
@@ -104,7 +102,8 @@ impl Powershell {
             print_separator("Powershell Modules Update");
 
             let success = || -> Result<(), Error> {
-                run_type.execute(&powershell)
+                run_type
+                    .execute(&powershell)
                     .arg("Update-Module")
                     .spawn()?
                     .wait()?
@@ -126,7 +125,8 @@ impl Powershell {
                 print_separator("Windows Update");
 
                 let success = || -> Result<(), Error> {
-                    run_type.execute(&powershell)
+                    run_type
+                        .execute(&powershell)
                         .args(&["-Command", "Install-WindowsUpdate -MicrosoftUpdate -AcceptAll -Verbose"])
                         .spawn()?
                         .wait()?
diff --git a/src/steps/vim.rs b/src/steps/vim.rs
index f16549ad..b617e696 100644
--- a/src/steps/vim.rs
+++ b/src/steps/vim.rs
@@ -1,5 +1,5 @@
 use crate::error::Error;
-use crate::executor::{RunType};
+use crate::executor::RunType;
 use crate::terminal::print_separator;
 use crate::utils::{which, Check, PathExt};
 use directories::BaseDirs;
@@ -55,7 +55,8 @@ fn nvimrc(base_dirs: &BaseDirs) -> Option<PathBuf> {
 
 #[must_use]
 fn upgrade(vim: &PathBuf, vimrc: &PathBuf, plugin_framework: PluginFramework, run_type: RunType) -> Result<(), Error> {
-    run_type.execute(&vim)
+    run_type
+        .execute(&vim)
         .args(&[
             "-N",
             "-u",