Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes

2 files changed, 9 insertions, 7 deletions

diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 77b9ae2b4..65cabf005 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -5,6 +5,9 @@ version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
 
+[lib]
+doctest = false
+
 [dependencies]
 walkdir = "2.1.3"
 pico-args = "0.3.0"
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 663e28103..c97bfec97 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -9,11 +9,10 @@
 //! `.cargo/config`.
 mod help;
 
+use std::{env, fmt::Write, path::PathBuf, str};
+
 use anyhow::Context;
-use core::fmt::Write;
-use core::str;
 use pico_args::Arguments;
-use std::{env, path::PathBuf};
 use xtask::{
     codegen::{self, Mode},
     install_pre_commit_hook, reformat_staged_files, run, run_clippy, run_fuzzer, run_rustfmt,
@@ -37,7 +36,7 @@ struct ServerOpt {
 }
 
 fn main() -> Result<()> {
-    if std::env::args().next().map(|it| it.contains("pre-commit")) == Some(true) {
+    if env::args().next().map(|it| it.contains("pre-commit")) == Some(true) {
         return reformat_staged_files();
     }
 
@@ -174,7 +173,7 @@ fn fix_path_for_mac() -> Result<()> {
 fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     let npm_version = Cmd {
         unix: r"npm --version",
-        windows: r"cmd.exe /c npm.cmd --version",
+        windows: r"cmd.exe /c npm --version",
         work_dir: "./editors/code",
     }
     .run();
@@ -183,10 +182,10 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
         eprintln!("\nERROR: `npm --version` failed, `npm` is required to build the VS Code plugin")
     }
 
-    Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm.cmd ci", work_dir: "./editors/code" }.run()?;
+    Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm ci", work_dir: "./editors/code" }.run()?;
     Cmd {
         unix: r"npm run package --scripts-prepend-node-path",
-        windows: r"cmd.exe /c npm.cmd run package",
+        windows: r"cmd.exe /c npm run package",
         work_dir: "./editors/code",
     }
     .run()?;