From 35dbab8bebe26bc109a4998da3098306bef372c2 Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Tue, 3 Jul 2018 14:33:48 +0300 Subject: [PATCH] Increase the maximum line size --- rustfmt.toml | 1 + src/linux.rs | 44 ++++++++------------------------------------ src/main.rs | 3 +-- src/steps.rs | 39 ++++++--------------------------------- src/terminal.rs | 6 +----- src/windows.rs | 6 +----- 6 files changed, 18 insertions(+), 81 deletions(-) create mode 100644 rustfmt.toml diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 00000000..75306517 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1 @@ +max_width = 120 diff --git a/src/linux.rs b/src/linux.rs index 0e9a9f8a..7f93c74d 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -50,10 +50,7 @@ impl Distribution { } } -pub fn upgrade_arch_linux( - sudo: &Option, - terminal: &mut Terminal, -) -> Result<(), failure::Error> { +pub fn upgrade_arch_linux(sudo: &Option, 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( - sudo: &Option, - terminal: &mut Terminal, -) -> Result<(), failure::Error> { +pub fn upgrade_redhat(sudo: &Option, 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( - sudo: &Option, - terminal: &mut Terminal, -) -> Result<(), failure::Error> { +pub fn upgrade_fedora(sudo: &Option, 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( - sudo: &Option, - terminal: &mut Terminal, -) -> Result<(), failure::Error> { +pub fn upgrade_debian(sudo: &Option, 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) - .arg(needrestart) - .spawn()? - .wait()? - .check()?; + Command::new(&sudo).arg(needrestart).spawn()?.wait()?.check()?; Ok(()) } pub fn run_fwupdmgr(fwupdmgr: &PathBuf) -> Result<(), failure::Error> { - Command::new(&fwupdmgr) - .arg("refresh") - .spawn()? - .wait()? - .check()?; + Command::new(&fwupdmgr).arg("refresh").spawn()?.wait()?.check()?; - Command::new(&fwupdmgr) - .arg("get-updates") - .spawn()? - .wait()? - .check()?; + Command::new(&fwupdmgr).arg("get-updates").spawn()?.wait()?.check()?; Ok(()) } pub fn run_flatpak(flatpak: &PathBuf) -> Result<(), failure::Error> { - Command::new(&flatpak) - .arg("update") - .spawn()? - .wait()? - .check()?; + Command::new(&flatpak).arg("update").spawn()?.wait()?.check()?; Ok(()) } diff --git a/src/main.rs b/src/main.rs index 19539db6..defa200e 100644 --- a/src/main.rs +++ b/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()) - .report("Vim", &mut reports); + run_vim(&vim, &vimrc, plugin_framework.upgrade_command()).report("Vim", &mut reports); } } } diff --git a/src/steps.rs b/src/steps.rs index c29041ee..7823553e 100644 --- a/src/steps.rs +++ b/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(&[ - "--batch", - "-l", - init.to_str().unwrap(), - "--eval", - EMACS_UPGRADE, - ]) + .args(&["--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( - vim: &PathBuf, - vimrc: &PathBuf, - upgrade_command: &str, -) -> Result<(), failure::Error> { +pub fn run_vim(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) - .args(&["self", "update"]) - .spawn()? - .wait()? - .check()?; + Command::new(rustup).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) - .arg("update") - .spawn()? - .wait()? - .check()?; + Command::new(&homebrew).arg("update").spawn()?.wait()?.check()?; - Command::new(&homebrew) - .arg("upgrade") - .spawn()? - .wait()? - .check()?; + Command::new(&homebrew).arg("upgrade").spawn()?.wait()?.check()?; Ok(()) } pub fn run_custom_command(command: &str) -> Result<(), failure::Error> { - Command::new("sh") - .arg("-c") - .arg(command) - .spawn()? - .wait()? - .check()?; + Command::new("sh").arg("-c").arg(command).spawn()?.wait()?.check()?; Ok(()) } diff --git a/src/terminal.rs b/src/terminal.rs index db274817..e75a344c 100644 --- a/src/terminal.rs +++ b/src/terminal.rs @@ -59,11 +59,7 @@ impl Terminal { .set_bold(true), ); - let _ = write!( - &mut self.stdout, - "{}\n", - if succeeded { "OK" } else { "FAILED" } - ); + let _ = write!(&mut self.stdout, "{}\n", if succeeded { "OK" } else { "FAILED" }); let _ = self.stdout.reset(); let _ = self.stdout.flush(); diff --git a/src/windows.rs b/src/windows.rs index 4157bbc6..e3b371c1 100644 --- a/src/windows.rs +++ b/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) - .args(&["upgrade", "all"]) - .spawn()? - .wait()? - .check()?; + Command::new(&choco).args(&["upgrade", "all"]).spawn()?.wait()?.check()?; Ok(()) }