Resolve clippy errors (#130)
* Resolves clippy errors * Fixes clippy errors
This commit is contained in:
@@ -26,7 +26,7 @@ pub fn run_chocolatey(ctx: &ExecutionContext) -> Result<()> {
|
|||||||
args.insert(0, "choco");
|
args.insert(0, "choco");
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut command = ctx.run_type().execute(&cmd);
|
let mut command = ctx.run_type().execute(cmd);
|
||||||
|
|
||||||
command.args(&args);
|
command.args(&args);
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ pub fn run_winget(ctx: &ExecutionContext) -> Result<()> {
|
|||||||
return Err(SkipStep(String::from("Winget is disabled by default")).into());
|
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<()> {
|
pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> {
|
||||||
@@ -55,34 +55,34 @@ pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> {
|
|||||||
|
|
||||||
print_separator("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 {
|
if cleanup {
|
||||||
run_type.execute(&scoop).args(&["cleanup", "*"]).check_run()?;
|
run_type.execute(&scoop).args(["cleanup", "*"]).check_run()?;
|
||||||
}
|
}
|
||||||
|
|
||||||
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())
|
||||||
.map(|x| x.replace('\u{0}', "").replace('\r', ""))
|
.map(|x| x.replace(['\u{0}', '\r'], ""))
|
||||||
.collect())
|
.collect())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> Result<()> {
|
fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> Result<()> {
|
||||||
let topgrade = Command::new(&wsl)
|
let topgrade = Command::new(wsl)
|
||||||
.args(&["-d", dist, "bash", "-lc", "which topgrade"])
|
.args(["-d", dist, "bash", "-lc", "which topgrade"])
|
||||||
.check_output()
|
.check_output()
|
||||||
.map_err(|_| SkipStep(String::from("Could not find Topgrade installed in WSL")))?;
|
.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
|
command
|
||||||
.args(&["-d", dist, "bash", "-c"])
|
.args(["-d", dist, "bash", "-c"])
|
||||||
.arg(format!("TOPGRADE_PREFIX={} exec {}", dist, topgrade));
|
.arg(format!("TOPGRADE_PREFIX={} exec {}", dist, topgrade));
|
||||||
|
|
||||||
if ctx.config().yes(Step::Wsl) {
|
if ctx.config().yes(Step::Wsl) {
|
||||||
@@ -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);
|
||||||
@@ -134,7 +134,7 @@ pub fn windows_update(ctx: &ExecutionContext) -> Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn reboot() {
|
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<()> {
|
pub fn insert_startup_scripts(ctx: &ExecutionContext, git_repos: &mut Repositories) -> Result<()> {
|
||||||
|
|||||||
@@ -46,8 +46,8 @@ impl Powershell {
|
|||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
pub fn has_module(powershell: &Path, command: &str) -> bool {
|
pub fn has_module(powershell: &Path, command: &str) -> bool {
|
||||||
Command::new(&powershell)
|
Command::new(powershell)
|
||||||
.args(&[
|
.args([
|
||||||
"-NoProfile",
|
"-NoProfile",
|
||||||
"-Command",
|
"-Command",
|
||||||
&format!("Get-Module -ListAvailable {}", command),
|
&format!("Get-Module -ListAvailable {}", command),
|
||||||
@@ -100,14 +100,14 @@ impl Powershell {
|
|||||||
|
|
||||||
let mut command = if let Some(sudo) = ctx.sudo() {
|
let mut command = if let Some(sudo) = ctx.sudo() {
|
||||||
let mut command = ctx.run_type().execute(sudo);
|
let mut command = ctx.run_type().execute(sudo);
|
||||||
command.arg(&powershell);
|
command.arg(powershell);
|
||||||
command
|
command
|
||||||
} else {
|
} else {
|
||||||
ctx.run_type().execute(&powershell)
|
ctx.run_type().execute(powershell)
|
||||||
};
|
};
|
||||||
|
|
||||||
command
|
command
|
||||||
.args(&[
|
.args([
|
||||||
"-NoProfile",
|
"-NoProfile",
|
||||||
"-Command",
|
"-Command",
|
||||||
&format!(
|
&format!(
|
||||||
|
|||||||
Reference in New Issue
Block a user