2 files changed, 6 insertions, 4 deletions

diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 7332a4072..40a6682be 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -79,7 +79,7 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> {
 }
 
 pub fn install_rustfmt() -> Result<()> {
-    run(&format!("rustup install {}", TOOLCHAIN), ".")?;
+    run(&format!("rustup toolchain install {}", TOOLCHAIN), ".")?;
     run(&format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN), ".")
 }
 
@@ -125,7 +125,7 @@ pub fn run_clippy() -> Result<()> {
 }
 
 pub fn install_clippy() -> Result<()> {
-    run(&format!("rustup install {}", TOOLCHAIN), ".")?;
+    run(&format!("rustup toolchain install {}", TOOLCHAIN), ".")?;
     run(&format!("rustup component add clippy --toolchain {}", TOOLCHAIN), ".")
 }
 
@@ -144,6 +144,7 @@ pub fn run_fuzzer() -> Result<()> {
 }
 
 pub fn reformat_staged_files() -> Result<()> {
+    run_rustfmt(Mode::Overwrite)?;
     let root = project_root();
     let output = Command::new("git")
         .arg("diff")
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index c97bfec97..4201c6a6a 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -20,7 +20,7 @@ use xtask::{
 };
 
 // Latest stable, feel free to send a PR if this lags behind.
-const REQUIRED_RUST_VERSION: u32 = 39;
+const REQUIRED_RUST_VERSION: u32 = 40;
 
 struct InstallOpt {
     client: Option<ClientOpt>,
@@ -182,7 +182,8 @@ 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 ci", work_dir: "./editors/code" }.run()?;
+    Cmd { unix: r"npm install", windows: r"cmd.exe /c npm install", work_dir: "./editors/code" }
+        .run()?;
     Cmd {
         unix: r"npm run package --scripts-prepend-node-path",
         windows: r"cmd.exe /c npm run package",