Skip to content

Commit

Permalink
Resolve clippy errors (topgrade-rs#130)
Browse files Browse the repository at this point in the history
* Resolves clippy errors

* Fixes clippy errors
  • Loading branch information
s34m authored Nov 3, 2022
1 parent 4dcb5a2 commit 66e0b94
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
24 changes: 12 additions & 12 deletions src/steps/os/windows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub fn run_chocolatey(ctx: &ExecutionContext) -> Result<()> {
args.insert(0, "choco");
}

let mut command = ctx.run_type().execute(&cmd);
let mut command = ctx.run_type().execute(cmd);

command.args(&args);

Expand All @@ -47,42 +47,42 @@ pub fn run_winget(ctx: &ExecutionContext) -> Result<()> {
return Err(SkipStep(String::from("Winget is disabled by default")).into());
}

ctx.run_type().execute(&winget).args(&["upgrade", "--all"]).check_run()
ctx.run_type().execute(&winget).args(["upgrade", "--all"]).check_run()
}

pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> {
let scoop = require("scoop")?;

print_separator("Scoop");

run_type.execute(&scoop).args(&["update"]).check_run()?;
run_type.execute(&scoop).args(&["update", "*"]).check_run()?;
run_type.execute(&scoop).args(["update"]).check_run()?;
run_type.execute(&scoop).args(["update", "*"]).check_run()?;

if cleanup {
run_type.execute(&scoop).args(&["cleanup", "*"]).check_run()?;
run_type.execute(&scoop).args(["cleanup", "*"]).check_run()?;
}

Ok(())
}

fn get_wsl_distributions(wsl: &Path) -> Result<Vec<String>> {
let output = Command::new(wsl).args(&["--list", "-q"]).check_output()?;
let output = Command::new(wsl).args(["--list", "-q"]).check_output()?;
Ok(output
.lines()
.filter(|s| !s.is_empty())
.map(|x| x.replace('\u{0}', "").replace('\r', ""))
.map(|x| x.replace(['\u{0}', '\r'], ""))
.collect())
}

fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> Result<()> {
let topgrade = Command::new(&wsl)
.args(&["-d", dist, "bash", "-lc", "which topgrade"])
let topgrade = Command::new(wsl)
.args(["-d", dist, "bash", "-lc", "which topgrade"])
.check_output()
.map_err(|_| SkipStep(String::from("Could not find Topgrade installed in WSL")))?;

let mut command = ctx.run_type().execute(&wsl);
command
.args(&["-d", dist, "bash", "-c"])
.args(["-d", dist, "bash", "-c"])
.arg(format!("TOPGRADE_PREFIX={} exec {}", dist, topgrade));

if ctx.config().yes(Step::Wsl) {
Expand All @@ -94,7 +94,7 @@ fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> R

pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> {
let wsl = require("wsl")?;
let wsl_distributions = get_wsl_distributions(&wsl)?;
let wsl_distributions = get_wsl_distributions(wsl)?;
let mut ran = false;

debug!("WSL distributions: {:?}", wsl_distributions);
Expand Down Expand Up @@ -134,7 +134,7 @@ pub fn windows_update(ctx: &ExecutionContext) -> Result<()> {
}

pub fn reboot() {
Command::new("shutdown").args(&["/R", "/T", "0"]).spawn().ok();
Command::new("shutdown").args(["/R", "/T", "0"]).spawn().ok();
}

pub fn insert_startup_scripts(ctx: &ExecutionContext, git_repos: &mut Repositories) -> Result<()> {
Expand Down
10 changes: 5 additions & 5 deletions src/steps/powershell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ impl Powershell {

#[cfg(windows)]
pub fn has_module(powershell: &Path, command: &str) -> bool {
Command::new(&powershell)
.args(&[
Command::new(powershell)
.args([
"-NoProfile",
"-Command",
&format!("Get-Module -ListAvailable {}", command),
Expand Down Expand Up @@ -100,14 +100,14 @@ impl Powershell {

let mut command = if let Some(sudo) = ctx.sudo() {
let mut command = ctx.run_type().execute(sudo);
command.arg(&powershell);
command.arg(powershell);
command
} else {
ctx.run_type().execute(&powershell)
ctx.run_type().execute(powershell)
};

command
.args(&[
.args([
"-NoProfile",
"-Command",
&format!(
Expand Down

0 comments on commit 66e0b94

Please sign in to comment.