admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get windows to finish clippy without errors (#133)

Browse Source 
* Changes windows get_wsl_distribution argument

* changes in get_wsl_distributions

* changes in run_wsl_topgrade due to clippy errors
This commit is contained in:
Thomas Schönauer
2022-11-03 19:34:27 +00:00
committed by GitHub
parent c85adb8980
commit 16953409fd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/steps/os/windows.rs
View File

@@ -65,8 +65,8 @@ pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> {
Ok(()) Ok(())
} }
fn get_wsl_distributions(wsl: Path) -> Result<Vec<String>> { 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 Ok(output
.lines() .lines()
.filter(|s| !s.is_empty()) .filter(|s| !s.is_empty())
@@ -94,7 +94,7 @@ fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> R
pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> { pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> {
let wsl = require("wsl")?; let wsl = require("wsl")?;
let wsl_distributions = get_wsl_distributions(wsl)?; let wsl_distributions = get_wsl_distributions(&wsl)?;
let mut ran = false; let mut ran = false;
debug!("WSL distributions: {:?}", wsl_distributions); debug!("WSL distributions: {:?}", wsl_distributions);