From eceaf94f1936436e33ae235ca65bf2a6d4f77da5 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Tue, 18 Feb 2020 15:32:19 +0200 Subject: More manual clippy fixes --- xtask/src/install.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xtask') diff --git a/xtask/src/install.rs b/xtask/src/install.rs index cc6fecc85..3df021acc 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs @@ -94,8 +94,7 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { }) }; - let installed_extensions; - if cfg!(unix) { + let installed_extensions = if cfg!(unix) { run!("npm --version").context("`npm` is required to build the VS Code plugin")?; run!("npm install")?; @@ -103,7 +102,7 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { let code = find_code(|bin| run!("{} --version", bin).is_ok())?; run!("{} --install-extension rust-analyzer.vsix --force", code)?; - installed_extensions = run!("{} --list-extensions", code; echo = false)?; + run!("{} --list-extensions", code; echo = false)? } else { run!("cmd.exe /c npm --version") .context("`npm` is required to build the VS Code plugin")?; @@ -113,8 +112,8 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { let code = find_code(|bin| run!("cmd.exe /c {}.cmd --version", bin).is_ok())?; run!(r"cmd.exe /c {}.cmd --install-extension rust-analyzer.vsix --force", code)?; - installed_extensions = run!("cmd.exe /c {}.cmd --list-extensions", code; echo = false)?; - } + run!("cmd.exe /c {}.cmd --list-extensions", code; echo = false)? + }; if !installed_extensions.contains("rust-analyzer") { bail!( -- cgit v1.2.3 From f6816c253b96e8436f1156d6bd6b0942ee9fb4d3 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Tue, 18 Feb 2020 15:57:41 +0200 Subject: Update versions --- xtask/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xtask') diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 72dd5e581..a8b9b010d 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -9,8 +9,8 @@ publish = false doctest = false [dependencies] -walkdir = "2.1.3" -pico-args = "0.3.0" +walkdir = "2.3.1" +pico-args = "0.3.1" quote = "1.0.2" -proc-macro2 = "1.0.1" -anyhow = "1.0.19" +proc-macro2 = "1.0.8" +anyhow = "1.0.26" -- cgit v1.2.3