From 3ebaac3a1d7f9c4c6b9deabe97d3e46666ccba20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sch=C3=B6nauer?= <37108907+DottoDev@users.noreply.github.com> Date: Thu, 3 Nov 2022 21:43:45 +0000 Subject: [PATCH] Fix windows clippy errors (#135) * Changes windows get_wsl_distribution argument * changes in get_wsl_distributions * changes in run_wsl_topgrade due to clippy errors * Resolves needless borrow --- src/steps/os/windows.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/steps/os/windows.rs b/src/steps/os/windows.rs index 02d4c55f..14d57595 100644 --- a/src/steps/os/windows.rs +++ b/src/steps/os/windows.rs @@ -65,7 +65,7 @@ pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> { Ok(()) } -fn get_wsl_distributions(wsl: Path) -> Result> { +fn get_wsl_distributions(wsl: &Path) -> Result> { let output = Command::new(wsl).args(["--list", "-q"]).check_output()?; Ok(output .lines() @@ -80,7 +80,7 @@ fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> R .check_output() .map_err(|_| SkipStep(String::from("Could not find Topgrade installed in WSL")))?; - let mut command = ctx.run_type().execute(&wsl); + let mut command = ctx.run_type().execute(wsl); command .args(["-d", dist, "bash", "-c"]) .arg(format!("TOPGRADE_PREFIX={} exec {}", dist, topgrade)); @@ -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);