Increase the maximum line size

rustfmt.toml

@@ -0,0 +1 @@
+max_width = 120

src/linux.rs

@@ -50,10 +50,7 @@ impl Distribution {
     }
 }
 
-pub fn upgrade_arch_linux(
+pub fn upgrade_arch_linux(sudo: &Option<PathBuf>, terminal: &mut Terminal) -> Result<(), failure::Error> {
-    sudo: &Option<PathBuf>,
-    terminal: &mut Terminal,
-) -> Result<(), failure::Error> {
     if let Some(yay) = which("yay") {
         if let Some(python) = which("python") {
             if python != PathBuf::from("/usr/bin/python") {
@@ -82,10 +79,7 @@ It's dangerous to run yay since Python based AUR packages will be installed in t
     Ok(())
 }
 
-pub fn upgrade_redhat(
+pub fn upgrade_redhat(sudo: &Option<PathBuf>, terminal: &mut Terminal) -> Result<(), failure::Error> {
-    sudo: &Option<PathBuf>,
-    terminal: &mut Terminal,
-) -> Result<(), failure::Error> {
     if let Some(sudo) = &sudo {
         Command::new(&sudo)
             .args(&["/usr/bin/yum", "upgrade"])
@@ -99,10 +93,7 @@ pub fn upgrade_redhat(
     Ok(())
 }
 
-pub fn upgrade_fedora(
+pub fn upgrade_fedora(sudo: &Option<PathBuf>, terminal: &mut Terminal) -> Result<(), failure::Error> {
-    sudo: &Option<PathBuf>,
-    terminal: &mut Terminal,
-) -> Result<(), failure::Error> {
     if let Some(sudo) = &sudo {
         Command::new(&sudo)
             .args(&["/usr/bin/dnf", "upgrade"])
@@ -116,10 +107,7 @@ pub fn upgrade_fedora(
     Ok(())
 }
 
-pub fn upgrade_debian(
+pub fn upgrade_debian(sudo: &Option<PathBuf>, terminal: &mut Terminal) -> Result<(), failure::Error> {
-    sudo: &Option<PathBuf>,
-    terminal: &mut Terminal,
-) -> Result<(), failure::Error> {
     if let Some(sudo) = &sudo {
         Command::new(&sudo)
             .args(&["/usr/bin/apt", "update"])
@@ -140,37 +128,21 @@ pub fn upgrade_debian(
 }
 
 pub fn run_needrestart(sudo: &PathBuf, needrestart: &PathBuf) -> Result<(), failure::Error> {
-    Command::new(&sudo)
+    Command::new(&sudo).arg(needrestart).spawn()?.wait()?.check()?;
-        .arg(needrestart)
-        .spawn()?
-        .wait()?
-        .check()?;
 
     Ok(())
 }
 
 pub fn run_fwupdmgr(fwupdmgr: &PathBuf) -> Result<(), failure::Error> {
-    Command::new(&fwupdmgr)
+    Command::new(&fwupdmgr).arg("refresh").spawn()?.wait()?.check()?;
-        .arg("refresh")
-        .spawn()?
-        .wait()?
-        .check()?;
 
-    Command::new(&fwupdmgr)
+    Command::new(&fwupdmgr).arg("get-updates").spawn()?.wait()?.check()?;
-        .arg("get-updates")
-        .spawn()?
-        .wait()?
-        .check()?;
 
     Ok(())
 }
 
 pub fn run_flatpak(flatpak: &PathBuf) -> Result<(), failure::Error> {
-    Command::new(&flatpak)
+    Command::new(&flatpak).arg("update").spawn()?.wait()?.check()?;
-        .arg("update")
-        .spawn()?
-        .wait()?
-        .check()?;
 
     Ok(())
 }

src/main.rs

@@ -188,8 +188,7 @@ fn run() -> Result<(), Error> {
         if let Some(vimrc) = vim::vimrc() {
             if let Some(plugin_framework) = vim::PluginFramework::detect(&vimrc) {
                 terminal.print_separator(&format!("vim ({:?})", plugin_framework));
-                run_vim(&vim, &vimrc, plugin_framework.upgrade_command())
+                run_vim(&vim, &vimrc, plugin_framework.upgrade_command()).report("Vim", &mut reports);
-                    .report("Vim", &mut reports);
             }
         }
     }

src/steps.rs

@@ -19,13 +19,7 @@ pub fn run_cargo_update(cargo_update: &PathBuf) -> Result<(), failure::Error> {
 
 pub fn run_emacs(emacs: &PathBuf, init: &PathBuf) -> Result<(), failure::Error> {
     Command::new(&emacs)
-        .args(&[
+        .args(&["--batch", "-l", init.to_str().unwrap(), "--eval", EMACS_UPGRADE])
-            "--batch",
-            "-l",
-            init.to_str().unwrap(),
-            "--eval",
-            EMACS_UPGRADE,
-        ])
         .spawn()?
         .wait()?
         .check()?;
@@ -33,11 +27,7 @@ pub fn run_emacs(emacs: &PathBuf, init: &PathBuf) -> Result<(), failure::Error>
     Ok(())
 }
 
-pub fn run_vim(
+pub fn run_vim(vim: &PathBuf, vimrc: &PathBuf, upgrade_command: &str) -> Result<(), failure::Error> {
-    vim: &PathBuf,
-    vimrc: &PathBuf,
-    upgrade_command: &str,
-) -> Result<(), failure::Error> {
     Command::new(&vim)
         .args(&[
             "-N",
@@ -72,11 +62,7 @@ pub fn run_apm(apm: &PathBuf) -> Result<(), failure::Error> {
 
 pub fn run_rustup(rustup: &PathBuf) -> Result<(), failure::Error> {
     if is_ancestor(&home_dir().unwrap(), &rustup) {
-        Command::new(rustup)
+        Command::new(rustup).args(&["self", "update"]).spawn()?.wait()?.check()?;
-            .args(&["self", "update"])
-            .spawn()?
-            .wait()?
-            .check()?;
     }
 
     Command::new(rustup).arg("update").spawn()?.wait()?.check()?;
@@ -85,28 +71,15 @@ pub fn run_rustup(rustup: &PathBuf) -> Result<(), failure::Error> {
 }
 
 pub fn run_homebrew(homebrew: &PathBuf) -> Result<(), failure::Error> {
-    Command::new(&homebrew)
+    Command::new(&homebrew).arg("update").spawn()?.wait()?.check()?;
-        .arg("update")
-        .spawn()?
-        .wait()?
-        .check()?;
 
-    Command::new(&homebrew)
+    Command::new(&homebrew).arg("upgrade").spawn()?.wait()?.check()?;
-        .arg("upgrade")
-        .spawn()?
-        .wait()?
-        .check()?;
 
     Ok(())
 }
 
 pub fn run_custom_command(command: &str) -> Result<(), failure::Error> {
-    Command::new("sh")
+    Command::new("sh").arg("-c").arg(command).spawn()?.wait()?.check()?;
-        .arg("-c")
-        .arg(command)
-        .spawn()?
-        .wait()?
-        .check()?;
 
     Ok(())
 }

src/terminal.rs

@@ -59,11 +59,7 @@ impl Terminal {
                 .set_bold(true),
         );
 
-        let _ = write!(
+        let _ = write!(&mut self.stdout, "{}\n", if succeeded { "OK" } else { "FAILED" });
-            &mut self.stdout,
-            "{}\n",
-            if succeeded { "OK" } else { "FAILED" }
-        );
 
         let _ = self.stdout.reset();
         let _ = self.stdout.flush();

src/windows.rs

@@ -4,11 +4,7 @@ use std::path::PathBuf;
 use std::process::Command;
 
 pub fn run_chocolatey(choco: &PathBuf) -> Result<(), failure::Error> {
-    Command::new(&choco)
+    Command::new(&choco).args(&["upgrade", "all"]).spawn()?.wait()?.check()?;
-        .args(&["upgrade", "all"])
-        .spawn()?
-        .wait()?
-        .check()?;
 
     Ok(())
 }