10 files changed, 423 insertions, 406 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index abdec602e..e7e0d599e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,6 +18,8 @@ jobs:
       RUSTFLAGS: -D warnings
       CARGO_INCREMENTAL: 0
       RUN_SLOW_TESTS: 1
+      RUSTUP_MAX_RETRIES: 10
+      CARGO_NET_RETRY: 10
     steps:
 
       - name: Checkout repository
@@ -39,7 +41,19 @@ jobs:
           override: true
           components: rustfmt, rust-src
 
-      - name: Cargo target cache
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo target dir
         uses: actions/cache@v1
         with:
           path: target
@@ -56,28 +70,13 @@ jobs:
         with:
           command: test
 
-      - name: Prepare build directory for cache (UNIX)
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
-        run: |
-          find ./target/debug -maxdepth 1 -type f -delete \
-          && rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*heavy_test*,*gen_lsp*,*thread_worker*} \
-          && rm -f  ./target/.rustc_info.json \
-          && rm ./target/.slow_tests_cookie
+      - name: Prepare cache
+        run: cargo xtask pre-cache
 
-      - name: Prepare build directory for cache (Windows)
+      - name: Prepare cache 2
         if: matrix.os == 'windows-latest'
-        run: >-
-          (Get-ChildItem ./target/debug -Recurse -Depth 1 -File | Remove-Item) -and
-          (Remove-Item -Force -Recurse ./target/debug/deps/*ra_*) -and
-          (Remove-Item -Force -Recurse ./target/debug/deps/*heavy_test*) -and
-          (Remove-Item -Force -Recurse ./target/debug/deps/*gen_lsp*) -and
-          (Remove-Item -Force -Recurse ./target/debug/deps/*thread_worker*) -and
-          (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*ra_*) -and
-          (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*heavy_test*) -and
-          (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*gen_lsp*) -and
-          (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*thread_worker*) -and
-          (Remove-Item -Force ./target/.rustc_info.json) -and
-          (Remove-Item ./target/.slow_tests_cookie)
+        run: Remove-Item ./target/debug/xtask.exe
+
 
   type-script:
     name: TypeScript
diff --git a/Cargo.lock b/Cargo.lock
index 79f28f7cd..312240bd2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,7 +54,7 @@ name = "backtrace-sys"
 version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.48"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -402,12 +402,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "getrandom"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -466,7 +466,7 @@ dependencies = [
 
 [[package]]
 name = "inotify"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -532,7 +532,7 @@ name = "jemalloc-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -619,7 +619,7 @@ dependencies = [
 
 [[package]]
 name = "lsp-types"
-version = "0.68.0"
+version = "0.68.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -700,15 +700,14 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "4.0.14"
+version = "4.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -900,7 +899,7 @@ dependencies = [
  "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lsp-types 0.68.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lsp-types 0.68.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1064,7 +1063,7 @@ dependencies = [
  "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lsp-types 0.68.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lsp-types 0.68.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ra_cargo_watch 0.1.0",
  "ra_ide 0.1.0",
@@ -1170,7 +1169,7 @@ dependencies = [
  "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1208,7 +1207,7 @@ name = "rand"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1252,7 +1251,7 @@ name = "rand_core"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1698,7 +1697,7 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.7.0"
+version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1783,7 +1782,7 @@ dependencies = [
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202"
-"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
+"checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 "checksum chalk-derive 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>"
 "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>"
@@ -1818,14 +1817,14 @@ dependencies = [
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
-"checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718"
+"checksum inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8"
 "checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
 "checksum insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d499dc062e841590a67230d853bce62d0abeb91304927871670b7c55c461349"
 "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
@@ -1845,7 +1844,7 @@ dependencies = [
 "checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum lsp-server 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5383e043329615624bbf45e1ba27bd75c176762b2592855c659bc28ac580a06b"
-"checksum lsp-types 0.68.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b08121a463f43ee67f09da45c0a61d447793adc8dc23e52b009e8cf80278a16"
+"checksum lsp-types 0.68.1 (registry+https://github.com/rust-lang/crates.io-index)" = "19b79f72914b929daa263483134b8974962cdebc731593b11508afb7f9acec80"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
@@ -1853,7 +1852,7 @@ dependencies = [
 "checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
-"checksum notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "199628fc33b21bc767baa057490b00b382ecbae030803a7b36292422d15b778b"
+"checksum notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
 "checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
 "checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
 "checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed"
@@ -1932,7 +1931,7 @@ dependencies = [
 "checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
 "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs
index e62693b68..b3fa1efba 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/ra_hir_expand/src/name.rs
@@ -93,7 +93,10 @@ impl AsName for ast::FieldKind {
     fn as_name(&self) -> Name {
         match self {
             ast::FieldKind::Name(nr) => nr.as_name(),
-            ast::FieldKind::Index(idx) => Name::new_tuple_field(idx.text().parse().unwrap()),
+            ast::FieldKind::Index(idx) => {
+                let idx = idx.text().parse::<usize>().unwrap_or(0);
+                Name::new_tuple_field(idx)
+            }
         }
     }
 }
diff --git a/crates/ra_lsp_server/src/caps.rs b/crates/ra_lsp_server/src/caps.rs
index adfc9fb2c..db502c200 100644
--- a/crates/ra_lsp_server/src/caps.rs
+++ b/crates/ra_lsp_server/src/caps.rs
@@ -56,6 +56,7 @@ pub fn server_capabilities() -> ServerCapabilities {
         color_provider: None,
         execute_command_provider: None,
         workspace: None,
+        call_hierarchy_provider: None,
         experimental: Default::default(),
     }
 }
diff --git a/xtask/src/cmd.rs b/xtask/src/cmd.rs
new file mode 100644
index 000000000..2027f4893
--- /dev/null
+++ b/xtask/src/cmd.rs
@@ -0,0 +1,53 @@
+use std::process::{Command, Output, Stdio};
+
+use anyhow::{Context, Result};
+
+use crate::project_root;
+
+pub struct Cmd<'a> {
+    pub unix: &'a str,
+    pub windows: &'a str,
+    pub work_dir: &'a str,
+}
+
+impl Cmd<'_> {
+    pub fn run(self) -> Result<()> {
+        if cfg!(windows) {
+            run(self.windows, self.work_dir)
+        } else {
+            run(self.unix, self.work_dir)
+        }
+    }
+    pub fn run_with_output(self) -> Result<Output> {
+        if cfg!(windows) {
+            run_with_output(self.windows, self.work_dir)
+        } else {
+            run_with_output(self.unix, self.work_dir)
+        }
+    }
+}
+
+pub fn run(cmdline: &str, dir: &str) -> Result<()> {
+    do_run(cmdline, dir, &mut |c| {
+        c.stdout(Stdio::inherit());
+    })
+    .map(|_| ())
+}
+
+pub fn run_with_output(cmdline: &str, dir: &str) -> Result<Output> {
+    do_run(cmdline, dir, &mut |_| {})
+}
+
+fn do_run(cmdline: &str, dir: &str, f: &mut dyn FnMut(&mut Command)) -> Result<Output> {
+    eprintln!("\nwill run: {}", cmdline);
+    let proj_dir = project_root().join(dir);
+    let mut args = cmdline.split_whitespace();
+    let exec = args.next().unwrap();
+    let mut cmd = Command::new(exec);
+    f(cmd.args(args).current_dir(proj_dir).stderr(Stdio::inherit()));
+    let output = cmd.output().with_context(|| format!("running `{}`", cmdline))?;
+    if !output.status.success() {
+        anyhow::bail!("`{}` exited with {}", cmdline, output.status);
+    }
+    Ok(output)
+}
diff --git a/xtask/src/help.rs b/xtask/src/help.rs
deleted file mode 100644
index f4e25dcde..000000000
--- a/xtask/src/help.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-//! FIXME: write short doc here
-
-pub const GLOBAL_HELP: &str = "tasks
-
-USAGE:
-    ra_tools <SUBCOMMAND>
-
-FLAGS:
-    -h, --help       Prints help information
-
-SUBCOMMANDS:
-    format
-    install-pre-commit-hook
-    fuzz-tests
-    codegen
-    install
-    lint";
-
-pub const INSTALL_HELP: &str = "ra_tools-install
-
-USAGE:
-    ra_tools.exe install [FLAGS]
-
-FLAGS:
-        --client-code
-    -h, --help           Prints help information
-        --jemalloc
-        --server";
-
-pub fn print_no_param_subcommand_help(subcommand: &str) {
-    eprintln!(
-        "ra_tools-{}
-
-USAGE:
-    ra_tools {}
-
-FLAGS:
-    -h, --help       Prints help information",
-        subcommand, subcommand
-    );
-}
-
-pub const INSTALL_RA_CONFLICT: &str =
-    "error: The argument `--server` cannot be used with `--client-code`
-
-For more information try --help";
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
new file mode 100644
index 000000000..fa82633de
--- /dev/null
+++ b/xtask/src/install.rs
@@ -0,0 +1,178 @@
+//! Installs rust-analyzer language server and/or editor plugin.
+
+use std::{env, path::PathBuf, str};
+
+use anyhow::{Context, Result};
+
+use crate::cmd::{run, run_with_output, Cmd};
+
+// Latest stable, feel free to send a PR if this lags behind.
+const REQUIRED_RUST_VERSION: u32 = 40;
+
+pub struct InstallCmd {
+    pub client: Option<ClientOpt>,
+    pub server: Option<ServerOpt>,
+}
+
+pub enum ClientOpt {
+    VsCode,
+}
+
+pub struct ServerOpt {
+    pub jemalloc: bool,
+}
+
+impl InstallCmd {
+    pub fn run(self) -> Result<()> {
+        if cfg!(target_os = "macos") {
+            fix_path_for_mac().context("Fix path for mac")?
+        }
+        if let Some(server) = self.server {
+            install_server(server).context("install server")?;
+        }
+        if let Some(client) = self.client {
+            install_client(client).context("install client")?;
+        }
+        Ok(())
+    }
+}
+
+fn fix_path_for_mac() -> Result<()> {
+    let mut vscode_path: Vec<PathBuf> = {
+        const COMMON_APP_PATH: &str =
+            r"/Applications/Visual Studio Code.app/Contents/Resources/app/bin";
+        const ROOT_DIR: &str = "";
+        let home_dir = match env::var("HOME") {
+            Ok(home) => home,
+            Err(e) => anyhow::bail!("Failed getting HOME from environment with error: {}.", e),
+        };
+
+        [ROOT_DIR, &home_dir]
+            .iter()
+            .map(|dir| String::from(*dir) + COMMON_APP_PATH)
+            .map(PathBuf::from)
+            .filter(|path| path.exists())
+            .collect()
+    };
+
+    if !vscode_path.is_empty() {
+        let vars = match env::var_os("PATH") {
+            Some(path) => path,
+            None => anyhow::bail!("Could not get PATH variable from env."),
+        };
+
+        let mut paths = env::split_paths(&vars).collect::<Vec<_>>();
+        paths.append(&mut vscode_path);
+        let new_paths = env::join_paths(paths).context("build env PATH")?;
+        env::set_var("PATH", &new_paths);
+    }
+
+    Ok(())
+}
+
+fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
+    let npm_version = Cmd {
+        unix: r"npm --version",
+        windows: r"cmd.exe /c npm --version",
+        work_dir: "./editors/code",
+    }
+    .run();
+
+    if npm_version.is_err() {
+        eprintln!("\nERROR: `npm --version` failed, `npm` is required to build the VS Code plugin")
+    }
+
+    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",
+        work_dir: "./editors/code",
+    }
+    .run()?;
+
+    let code_binary = ["code", "code-insiders", "codium", "code-oss"].iter().find(|bin| {
+        Cmd {
+            unix: &format!("{} --version", bin),
+            windows: &format!("cmd.exe /c {}.cmd --version", bin),
+            work_dir: "./editors/code",
+        }
+        .run()
+        .is_ok()
+    });
+
+    let code_binary = match code_binary {
+        Some(it) => it,
+        None => anyhow::bail!("Can't execute `code --version`. Perhaps it is not in $PATH?"),
+    };
+
+    Cmd {
+        unix: &format!(r"{} --install-extension ./ra-lsp-0.0.1.vsix --force", code_binary),
+        windows: &format!(
+            r"cmd.exe /c {}.cmd --install-extension ./ra-lsp-0.0.1.vsix --force",
+            code_binary
+        ),
+        work_dir: "./editors/code",
+    }
+    .run()?;
+
+    let output = Cmd {
+        unix: &format!(r"{} --list-extensions", code_binary),
+        windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary),
+        work_dir: ".",
+    }
+    .run_with_output()?;
+
+    if !str::from_utf8(&output.stdout)?.contains("ra-lsp") {
+        anyhow::bail!(
+            "Could not install the Visual Studio Code extension. \
+             Please make sure you have at least NodeJS 10.x together with the latest version of VS Code installed and try again."
+        );
+    }
+
+    Ok(())
+}
+
+fn install_server(opts: ServerOpt) -> Result<()> {
+    let mut old_rust = false;
+    if let Ok(output) = run_with_output("cargo --version", ".") {
+        if let Ok(stdout) = String::from_utf8(output.stdout) {
+            println!("{}", stdout);
+            if !check_version(&stdout, REQUIRED_RUST_VERSION) {
+                old_rust = true;
+            }
+        }
+    }
+
+    if old_rust {
+        eprintln!(
+            "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
+            REQUIRED_RUST_VERSION,
+        )
+    }
+
+    let res = if opts.jemalloc {
+        run("cargo install --path crates/ra_lsp_server --locked --force --features jemalloc", ".")
+    } else {
+        run("cargo install --path crates/ra_lsp_server --locked --force", ".")
+    };
+
+    if res.is_err() && old_rust {
+        eprintln!(
+            "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
+            REQUIRED_RUST_VERSION,
+        )
+    }
+
+    res
+}
+
+fn check_version(version_output: &str, min_minor_version: u32) -> bool {
+    // Parse second the number out of
+    //      cargo 1.39.0-beta (1c6ec66d5 2019-09-30)
+    let minor: Option<u32> = version_output.split('.').nth(1).and_then(|it| it.parse().ok());
+    match minor {
+        None => true,
+        Some(minor) => minor >= min_minor_version,
+    }
+}
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 51a868dee..e46c21db7 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -1,18 +1,22 @@
 //! FIXME: write short doc here
 
+mod cmd;
+pub mod install;
+pub mod pre_commit;
+
 pub mod codegen;
 mod ast_src;
 
 use anyhow::Context;
-pub use anyhow::Result;
 use std::{
     env, fs,
-    io::{Error as IoError, ErrorKind},
     path::{Path, PathBuf},
-    process::{Command, Output, Stdio},
+    process::{Command, Stdio},
 };
 
-use crate::codegen::Mode;
+use crate::{cmd::run, codegen::Mode};
+
+pub use anyhow::Result;
 
 const TOOLCHAIN: &str = "stable";
 
@@ -26,40 +30,6 @@ pub fn project_root() -> PathBuf {
     .to_path_buf()
 }
 
-pub struct Cmd<'a> {
-    pub unix: &'a str,
-    pub windows: &'a str,
-    pub work_dir: &'a str,
-}
-
-impl Cmd<'_> {
-    pub fn run(self) -> Result<()> {
-        if cfg!(windows) {
-            run(self.windows, self.work_dir)
-        } else {
-            run(self.unix, self.work_dir)
-        }
-    }
-    pub fn run_with_output(self) -> Result<Output> {
-        if cfg!(windows) {
-            run_with_output(self.windows, self.work_dir)
-        } else {
-            run_with_output(self.unix, self.work_dir)
-        }
-    }
-}
-
-pub fn run(cmdline: &str, dir: &str) -> Result<()> {
-    do_run(cmdline, dir, |c| {
-        c.stdout(Stdio::inherit());
-    })
-    .map(|_| ())
-}
-
-pub fn run_with_output(cmdline: &str, dir: &str) -> Result<Output> {
-    do_run(cmdline, dir, |_| {})
-}
-
 pub fn run_rustfmt(mode: Mode) -> Result<()> {
     match Command::new("rustup")
         .args(&["run", TOOLCHAIN, "--", "cargo", "fmt", "--version"])
@@ -79,23 +49,11 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> {
     Ok(())
 }
 
-pub fn install_rustfmt() -> Result<()> {
+fn install_rustfmt() -> Result<()> {
     run(&format!("rustup toolchain install {}", TOOLCHAIN), ".")?;
     run(&format!("rustup component add rustfmt --toolchain {}", TOOLCHAIN), ".")
 }
 
-pub fn install_pre_commit_hook() -> Result<()> {
-    let result_path =
-        PathBuf::from(format!("./.git/hooks/pre-commit{}", std::env::consts::EXE_SUFFIX));
-    if !result_path.exists() {
-        let me = std::env::current_exe()?;
-        fs::copy(me, result_path)?;
-    } else {
-        Err(IoError::new(ErrorKind::AlreadyExists, "Git hook already created"))?;
-    }
-    Ok(())
-}
-
 pub fn run_clippy() -> Result<()> {
     match Command::new("rustup")
         .args(&["run", TOOLCHAIN, "--", "cargo", "clippy", "--version"])
@@ -125,7 +83,7 @@ pub fn run_clippy() -> Result<()> {
     Ok(())
 }
 
-pub fn install_clippy() -> Result<()> {
+fn install_clippy() -> Result<()> {
     run(&format!("rustup toolchain install {}", TOOLCHAIN), ".")?;
     run(&format!("rustup component add clippy --toolchain {}", TOOLCHAIN), ".")
 }
@@ -144,41 +102,40 @@ pub fn run_fuzzer() -> Result<()> {
     run("rustup run nightly -- cargo fuzz run parser", "./crates/ra_syntax")
 }
 
-pub fn reformat_staged_files() -> Result<()> {
-    run_rustfmt(Mode::Overwrite)?;
-    let root = project_root();
-    let output = Command::new("git")
-        .arg("diff")
-        .arg("--diff-filter=MAR")
-        .arg("--name-only")
-        .arg("--cached")
-        .current_dir(&root)
-        .output()?;
-    if !output.status.success() {
-        anyhow::bail!(
-            "`git diff --diff-filter=MAR --name-only --cached` exited with {}",
-            output.status
-        );
+/// Cleans the `./target` dir after the build such that only
+/// dependencies are cached on CI.
+pub fn run_pre_cache() -> Result<()> {
+    let slow_tests_cookie = Path::new("./target/.slow_tests_cookie");
+    if !slow_tests_cookie.exists() {
+        panic!("slow tests were skipped on CI!")
     }
-    for line in String::from_utf8(output.stdout)?.lines() {
-        run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?;
+    rm_rf(slow_tests_cookie)?;
+
+    for entry in Path::new("./target/debug").read_dir()? {
+        let entry = entry?;
+        if entry.file_type().map(|it| it.is_file()).ok() == Some(true) {
+            // Can't delete yourself on windows :-(
+            if !entry.path().ends_with("xtask.exe") {
+                rm_rf(&entry.path())?
+            }
+        }
+    }
+
+    fs::remove_file("./target/.rustc_info.json")?;
+    let to_delete = ["ra_", "heavy_test"];
+    for &dir in ["./target/debug/deps", "target/debug/.fingerprint"].iter() {
+        for entry in Path::new(dir).read_dir()? {
+            let entry = entry?;
+            if to_delete.iter().any(|&it| entry.path().display().to_string().contains(it)) {
+                rm_rf(&entry.path())?
+            }
+        }
     }
+
     Ok(())
 }
 
-fn do_run<F>(cmdline: &str, dir: &str, mut f: F) -> Result<Output>
-where
-    F: FnMut(&mut Command),
-{
-    eprintln!("\nwill run: {}", cmdline);
-    let proj_dir = project_root().join(dir);
-    let mut args = cmdline.split_whitespace();
-    let exec = args.next().unwrap();
-    let mut cmd = Command::new(exec);
-    f(cmd.args(args).current_dir(proj_dir).stderr(Stdio::inherit()));
-    let output = cmd.output().with_context(|| format!("running `{}`", cmdline))?;
-    if !output.status.success() {
-        anyhow::bail!("`{}` exited with {}", cmdline, output.status);
-    }
-    Ok(output)
+fn rm_rf(path: &Path) -> Result<()> {
+    if path.is_file() { fs::remove_file(path) } else { fs::remove_dir_all(path) }
+        .with_context(|| format!("failed to remove {:?}", path))
 }
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 9cefad925..053453e6e 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -7,272 +7,109 @@
 //!
 //! This binary is integrated into the `cargo` command line by using an alias in
 //! `.cargo/config`.
-mod help;
 
-use std::{env, fmt::Write, path::PathBuf, str};
+use std::env;
 
-use anyhow::Context;
 use pico_args::Arguments;
 use xtask::{
     codegen::{self, Mode},
-    install_pre_commit_hook, reformat_staged_files, run, run_clippy, run_fuzzer, run_rustfmt,
-    run_with_output, Cmd, Result,
+    install::{ClientOpt, InstallCmd, ServerOpt},
+    pre_commit, run_clippy, run_fuzzer, run_pre_cache, run_rustfmt, Result,
 };
 
-// Latest stable, feel free to send a PR if this lags behind.
-const REQUIRED_RUST_VERSION: u32 = 40;
-
-struct InstallOpt {
-    client: Option<ClientOpt>,
-    server: Option<ServerOpt>,
-}
-
-enum ClientOpt {
-    VsCode,
-}
-
-struct ServerOpt {
-    jemalloc: bool,
-}
-
 fn main() -> Result<()> {
     if env::args().next().map(|it| it.contains("pre-commit")) == Some(true) {
-        return reformat_staged_files();
+        return pre_commit::run_hook();
     }
 
-    let subcommand = match std::env::args_os().nth(1) {
-        None => {
-            eprintln!("{}", help::GLOBAL_HELP);
-            return Ok(());
-        }
-        Some(s) => s,
-    };
-    let mut matches = Arguments::from_vec(std::env::args_os().skip(2).collect());
-    let subcommand = &*subcommand.to_string_lossy();
-    match subcommand {
+    let subcommand = std::env::args().nth(1).unwrap_or_default();
+    let mut args = Arguments::from_vec(std::env::args_os().skip(2).collect());
+
+    match subcommand.as_str() {
         "install" => {
-            if matches.contains(["-h", "--help"]) {
-                eprintln!("{}", help::INSTALL_HELP);
+            if args.contains(["-h", "--help"]) {
+                eprintln!(
+                    "\
+cargo xtask install
+Install rust-analyzer server or editor plugin.
+
+USAGE:
+    cargo xtask install [FLAGS]
+
+FLAGS:
+        --client-code    Install only VS Code plugin
+        --server         Install only the language server
+        --jemalloc       Use jemalloc for server
+    -h, --help           Prints help information
+        "
+                );
                 return Ok(());
             }
-            let server = matches.contains("--server");
-            let client_code = matches.contains("--client-code");
+            let server = args.contains("--server");
+            let client_code = args.contains("--client-code");
             if server && client_code {
-                eprintln!("{}", help::INSTALL_RA_CONFLICT);
+                eprintln!(
+                    "error: The argument `--server` cannot be used with `--client-code`\n\n\
+                     For more information try --help"
+                );
                 return Ok(());
             }
-            let jemalloc = matches.contains("--jemalloc");
-            matches.finish().or_else(handle_extra_flags)?;
-            let opts = InstallOpt {
+
+            let jemalloc = args.contains("--jemalloc");
+
+            args.finish()?;
+
+            InstallCmd {
                 client: if server { None } else { Some(ClientOpt::VsCode) },
                 server: if client_code { None } else { Some(ServerOpt { jemalloc }) },
-            };
-            install(opts)?
+            }
+            .run()
         }
         "codegen" => {
-            if matches.contains(["-h", "--help"]) {
-                help::print_no_param_subcommand_help(&subcommand);
-                return Ok(());
-            }
+            args.finish()?;
             codegen::generate_syntax(Mode::Overwrite)?;
             codegen::generate_parser_tests(Mode::Overwrite)?;
             codegen::generate_assists_docs(Mode::Overwrite)?;
+            Ok(())
         }
         "format" => {
-            if matches.contains(["-h", "--help"]) {
-                help::print_no_param_subcommand_help(&subcommand);
-                return Ok(());
-            }
-            run_rustfmt(Mode::Overwrite)?
+            args.finish()?;
+            run_rustfmt(Mode::Overwrite)
         }
         "install-pre-commit-hook" => {
-            if matches.contains(["-h", "--help"]) {
-                help::print_no_param_subcommand_help(&subcommand);
-                return Ok(());
-            }
-            install_pre_commit_hook()?
+            args.finish()?;
+            pre_commit::install_hook()
         }
         "lint" => {
-            if matches.contains(["-h", "--help"]) {
-                help::print_no_param_subcommand_help(&subcommand);
-                return Ok(());
-            }
-            run_clippy()?
+            args.finish()?;
+            run_clippy()
         }
         "fuzz-tests" => {
-            if matches.contains(["-h", "--help"]) {
-                help::print_no_param_subcommand_help(&subcommand);
-                return Ok(());
-            }
-            run_fuzzer()?
+            args.finish()?;
+            run_fuzzer()
         }
-        _ => eprintln!("{}", help::GLOBAL_HELP),
-    }
-    Ok(())
-}
-
-fn handle_extra_flags(e: pico_args::Error) -> Result<()> {
-    if let pico_args::Error::UnusedArgsLeft(flags) = e {
-        let mut invalid_flags = String::new();
-        for flag in flags {
-            write!(&mut invalid_flags, "{}, ", flag)?;
-        }
-        let (invalid_flags, _) = invalid_flags.split_at(invalid_flags.len() - 2);
-        anyhow::bail!("Invalid flags: {}", invalid_flags)
-    } else {
-        anyhow::bail!(e.to_string())
-    }
-}
-
-fn install(opts: InstallOpt) -> Result<()> {
-    if cfg!(target_os = "macos") {
-        fix_path_for_mac().context("Fix path for mac")?
-    }
-    if let Some(server) = opts.server {
-        install_server(server).context("install server")?;
-    }
-    if let Some(client) = opts.client {
-        install_client(client).context("install client")?;
-    }
-    Ok(())
-}
-
-fn fix_path_for_mac() -> Result<()> {
-    let mut vscode_path: Vec<PathBuf> = {
-        const COMMON_APP_PATH: &str =
-            r"/Applications/Visual Studio Code.app/Contents/Resources/app/bin";
-        const ROOT_DIR: &str = "";
-        let home_dir = match env::var("HOME") {
-            Ok(home) => home,
-            Err(e) => anyhow::bail!("Failed getting HOME from environment with error: {}.", e),
-        };
-
-        [ROOT_DIR, &home_dir]
-            .iter()
-            .map(|dir| String::from(*dir) + COMMON_APP_PATH)
-            .map(PathBuf::from)
-            .filter(|path| path.exists())
-            .collect()
-    };
-
-    if !vscode_path.is_empty() {
-        let vars = match env::var_os("PATH") {
-            Some(path) => path,
-            None => anyhow::bail!("Could not get PATH variable from env."),
-        };
-
-        let mut paths = env::split_paths(&vars).collect::<Vec<_>>();
-        paths.append(&mut vscode_path);
-        let new_paths = env::join_paths(paths).context("build env PATH")?;
-        env::set_var("PATH", &new_paths);
-    }
-
-    Ok(())
-}
-
-fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
-    let npm_version = Cmd {
-        unix: r"npm --version",
-        windows: r"cmd.exe /c npm --version",
-        work_dir: "./editors/code",
-    }
-    .run();
-
-    if npm_version.is_err() {
-        eprintln!("\nERROR: `npm --version` failed, `npm` is required to build the VS Code plugin")
-    }
-
-    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",
-        work_dir: "./editors/code",
-    }
-    .run()?;
-
-    let code_binary = ["code", "code-insiders", "codium"].iter().find(|bin| {
-        Cmd {
-            unix: &format!("{} --version", bin),
-            windows: &format!("cmd.exe /c {}.cmd --version", bin),
-            work_dir: "./editors/code",
+        "pre-cache" => {
+            args.finish()?;
+            run_pre_cache()
         }
-        .run()
-        .is_ok()
-    });
-
-    let code_binary = match code_binary {
-        Some(it) => it,
-        None => anyhow::bail!("Can't execute `code --version`. Perhaps it is not in $PATH?"),
-    };
-
-    Cmd {
-        unix: &format!(r"{} --install-extension ./ra-lsp-0.0.1.vsix --force", code_binary),
-        windows: &format!(
-            r"cmd.exe /c {}.cmd --install-extension ./ra-lsp-0.0.1.vsix --force",
-            code_binary
-        ),
-        work_dir: "./editors/code",
-    }
-    .run()?;
-
-    let output = Cmd {
-        unix: &format!(r"{} --list-extensions", code_binary),
-        windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary),
-        work_dir: ".",
-    }
-    .run_with_output()?;
-
-    if !str::from_utf8(&output.stdout)?.contains("ra-lsp") {
-        anyhow::bail!(
-            "Could not install the Visual Studio Code extension. \
-             Please make sure you have at least NodeJS 10.x together with the latest version of VS Code installed and try again."
-        );
-    }
-
-    Ok(())
-}
-
-fn install_server(opts: ServerOpt) -> Result<()> {
-    let mut old_rust = false;
-    if let Ok(output) = run_with_output("cargo --version", ".") {
-        if let Ok(stdout) = String::from_utf8(output.stdout) {
-            println!("{}", stdout);
-            if !check_version(&stdout, REQUIRED_RUST_VERSION) {
-                old_rust = true;
-            }
+        _ => {
+            eprintln!(
+                "\
+cargo xtask
+Run custom build command.
+
+USAGE:
+    cargo xtask <SUBCOMMAND>
+
+SUBCOMMANDS:
+    format
+    install-pre-commit-hook
+    fuzz-tests
+    codegen
+    install
+    lint"
+            );
+            Ok(())
         }
     }
-
-    if old_rust {
-        eprintln!(
-            "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
-            REQUIRED_RUST_VERSION,
-        )
-    }
-
-    let res = if opts.jemalloc {
-        run("cargo install --path crates/ra_lsp_server --locked --force --features jemalloc", ".")
-    } else {
-        run("cargo install --path crates/ra_lsp_server --locked --force", ".")
-    };
-
-    if res.is_err() && old_rust {
-        eprintln!(
-            "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
-            REQUIRED_RUST_VERSION,
-        )
-    }
-
-    res
-}
-
-fn check_version(version_output: &str, min_minor_version: u32) -> bool {
-    // Parse second the number out of
-    //      cargo 1.39.0-beta (1c6ec66d5 2019-09-30)
-    let minor: Option<u32> = version_output.split('.').nth(1).and_then(|it| it.parse().ok());
-    match minor {
-        None => true,
-        Some(minor) => minor >= min_minor_version,
-    }
 }
diff --git a/xtask/src/pre_commit.rs b/xtask/src/pre_commit.rs
new file mode 100644
index 000000000..88e868ca6
--- /dev/null
+++ b/xtask/src/pre_commit.rs
@@ -0,0 +1,36 @@
+//! pre-commit hook for code formatting.
+
+use std::{fs, path::PathBuf};
+
+use anyhow::{bail, Result};
+
+use crate::{cmd::run_with_output, project_root, run, run_rustfmt, Mode};
+
+// FIXME: if there are changed `.ts` files, also reformat TypeScript (by
+// shelling out to `npm fmt`).
+pub fn run_hook() -> Result<()> {
+    run_rustfmt(Mode::Overwrite)?;
+
+    let diff = run_with_output("git diff --diff-filter=MAR --name-only --cached", ".")?;
+
+    let root = project_root();
+    for line in String::from_utf8(diff.stdout)?.lines() {
+        run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?;
+    }
+
+    Ok(())
+}
+
+pub fn install_hook() -> Result<()> {
+    let hook_path: PathBuf =
+        format!("./.git/hooks/pre-commit{}", std::env::consts::EXE_SUFFIX).into();
+
+    if hook_path.exists() {
+        bail!("Git hook already created");
+    }
+
+    let me = std::env::current_exe()?;
+    fs::copy(me, hook_path)?;
+
+    Ok(())
+}