59 files changed, 3772 insertions, 3062 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1d24295ec..e7e0d599e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,16 +10,29 @@ on:
 jobs:
  rust:
    name: Rust
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
    env:
      RUSTFLAGS: -D warnings
      CARGO_INCREMENTAL: 0
      RUN_SLOW_TESTS: 1
+      RUSTUP_MAX_RETRIES: 10
+      CARGO_NET_RETRY: 10
    steps:
      - name: Checkout repository
        uses: actions/checkout@v1
+      # We need to disable the existing toolchain to avoid updating rust-docs
+      # which takes a long time. The fastest way to do this is to rename the
+      # existing folder, as deleting it takes about as much time as not doing
+      # anything and just updating rust-docs.
+      - name: Rename existing rust toolchain (Windows)
+        if: matrix.os == 'windows-latest'
+        run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
      - name: Install Rust toolchain
        uses: actions-rs/toolchain@v1
        with:
@@ -28,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
@@ -45,12 +70,13 @@ jobs:
        with:
          command: test
-      - name: Prepare build directory for cache
+      - name: Prepare cache
-        run: |
+        run: cargo xtask pre-cache
-          find ./target/debug -maxdepth 1 -type f -delete \
-          && rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*heavy_test*,*gen_lsp*,*thread_worker*} \
+      - name: Prepare cache 2
-          && rm -f  ./target/.rustc_info.json \
+        if: matrix.os == 'windows-latest'
-          && rm ./target/.slow_tests_cookie
+        run: Remove-Item ./target/debug/xtask.exe
  type-script:
    name: TypeScript
diff --git a/Cargo.lock b/Cargo.lock
index 65120c362..c570e0c3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,9 +25,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "atty"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -53,20 +54,12 @@ 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)",
 ]
 [[package]]
 name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-[[package]]
-name = "base64"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -122,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]]
@@ -137,7 +130,7 @@ source = "git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c
 dependencies = [
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -200,7 +193,7 @@ name = "clicolors-control"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -409,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]]
@@ -439,7 +432,7 @@ dependencies = [
 [[package]]
 name = "hermit-abi"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -450,7 +443,7 @@ name = "humantime"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -473,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)",
@@ -539,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)",
 ]
@@ -599,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "lock_api"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -626,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)",
@@ -707,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)",
+ "inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (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)",
@@ -736,7 +728,7 @@ name = "num_cpus"
 version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -755,7 +747,7 @@ name = "parking_lot"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -789,7 +781,7 @@ dependencies = [
 "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -808,7 +800,7 @@ dependencies = [
 [[package]]
 name = "pico-args"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -823,7 +815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -844,7 +836,7 @@ dependencies = [
 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -853,7 +845,7 @@ dependencies = [
 [[package]]
 name = "quick-error"
-version = "1.2.2"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -907,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)",
 ]
@@ -927,7 +919,7 @@ name = "ra_cli"
 version = "0.1.0"
 dependencies = [
 "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_batch 0.1.0",
 "ra_db 0.1.0",
 "ra_hir 0.1.0",
@@ -1040,6 +1032,7 @@ dependencies = [
 "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "fst 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1071,7 +1064,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",
@@ -1177,7 +1170,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)",
@@ -1215,7 +1208,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)",
@@ -1259,7 +1252,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]]
@@ -1399,16 +1392,6 @@ dependencies = [
 ]
 [[package]]
-name = "ron"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-[[package]]
 name = "rowan"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1476,7 +1459,7 @@ dependencies = [
 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1521,7 +1504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1541,7 +1524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1580,7 +1563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "syn"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1715,7 +1698,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]]
@@ -1769,11 +1752,9 @@ name = "xtask"
 version = "0.1.0"
 dependencies = [
 "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1790,11 +1771,10 @@ dependencies = [
 "checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"
 "checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 "checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80"
 "checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb"
@@ -1803,7 +1783,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>"
@@ -1838,14 +1818,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.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f629dc602392d3ec14bfc8a09b5e644d7ffd725102b48b81e59f90f2633621d7"
+"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"
@@ -1862,10 +1842,10 @@ dependencies = [
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
-"checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586"
+"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"
@@ -1873,7 +1853,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"
@@ -1884,12 +1864,12 @@ dependencies = [
 "checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5"
 "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 "checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
-"checksum pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "22e32b0f3771287ebb436130477eabf0f11f934ed036099ad548bc885e708667"
+"checksum pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc"
 "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
 "checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
 "checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum ra_vfs 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc898f237e4b4498959ae0100c688793a23e77624d44ef710ba70094217f98e0"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
@@ -1915,7 +1895,6 @@ dependencies = [
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
 "checksum relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bedde000f40f2921ce439ea165c9c53fd629bfa115140c72e22aceacb4a21954"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
 "checksum rowan 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3eb10a10a48f0f809a217bcf074b85a03dcf79831bae80e7f1a043d0897463e2"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
@@ -1937,7 +1916,7 @@ dependencies = [
 "checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
 "checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b"
 "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
-"checksum syn 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc157159e2a7df58cd67b1cace10b8ed256a404fb0070593f137d8ba6bef4de"
+"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
 "checksum text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e08bbcb7a3adbda0eb23431206b653bdad3d8dea311e72d36bf2215e27a42579"
@@ -1953,7 +1932,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/bors.toml b/bors.toml
index 7ffbc9294..0bc71860f 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,2 +1,7 @@
-status = ["Rust", "TypeScript"]
+status = [
+    "Rust (ubuntu-latest)",
+    "Rust (windows-latest)",
+    "Rust (macos-latest)",
+    "TypeScript"
+]
 delete_merged_branches = true
diff --git a/crates/ra_assists/src/assists/flip_binexpr.rs b/crates/ra_assists/src/assists/flip_binexpr.rs
index 386045eb0..2d91b2a7e 100644
--- a/crates/ra_assists/src/assists/flip_binexpr.rs
+++ b/crates/ra_assists/src/assists/flip_binexpr.rs
@@ -56,17 +56,7 @@ enum FlipAction {
 impl From<BinOp> for FlipAction {
    fn from(op_kind: BinOp) -> Self {
        match op_kind {
-            BinOp::Assignment => FlipAction::DontFlip,
+            kind if kind.is_assignment() => FlipAction::DontFlip,
-            BinOp::AddAssign => FlipAction::DontFlip,
-            BinOp::DivAssign => FlipAction::DontFlip,
-            BinOp::MulAssign => FlipAction::DontFlip,
-            BinOp::RemAssign => FlipAction::DontFlip,
-            BinOp::ShrAssign => FlipAction::DontFlip,
-            BinOp::ShlAssign => FlipAction::DontFlip,
-            BinOp::SubAssign => FlipAction::DontFlip,
-            BinOp::BitOrAssign => FlipAction::DontFlip,
-            BinOp::BitAndAssign => FlipAction::DontFlip,
-            BinOp::BitXorAssign => FlipAction::DontFlip,
            BinOp::GreaterTest => FlipAction::FlipAndReplaceOp("<"),
            BinOp::GreaterEqualTest => FlipAction::FlipAndReplaceOp("<="),
            BinOp::LesserTest => FlipAction::FlipAndReplaceOp(">"),
diff --git a/crates/ra_cargo_watch/src/conv/test.rs b/crates/ra_cargo_watch/src/conv/test.rs
index f77ef1b4d..6b86525b8 100644
--- a/crates/ra_cargo_watch/src/conv/test.rs
+++ b/crates/ra_cargo_watch/src/conv/test.rs
@@ -1,7 +1,9 @@
 //! This module contains the large and verbose snapshot tests for the
 //! conversions between `cargo check` json and LSP diagnostics.
+#[cfg(not(windows))]
 use crate::*;
+#[cfg(not(windows))]
 fn parse_diagnostic(val: &str) -> cargo_metadata::diagnostic::Diagnostic {
    serde_json::from_str::<cargo_metadata::diagnostic::Diagnostic>(val).unwrap()
 }
diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs
index e8f335e33..30b598e9a 100644
--- a/crates/ra_db/src/fixture.rs
+++ b/crates/ra_db/src/fixture.rs
@@ -49,7 +49,7 @@ fn with_single_file(db: &mut dyn SourceDatabaseExt, text: &str) -> FileId {
    let file_id = FileId(0);
    let rel_path: RelativePathBuf = "/main.rs".into();
-    let mut source_root = SourceRoot::default();
+    let mut source_root = SourceRoot::new_local();
    source_root.insert_file(rel_path.clone(), file_id);
    let mut crate_graph = CrateGraph::default();
@@ -77,7 +77,7 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option<FilePosit
    let mut crate_deps = Vec::new();
    let mut default_crate_root: Option<FileId> = None;
-    let mut source_root = SourceRoot::default();
+    let mut source_root = SourceRoot::new_local();
    let mut source_root_id = WORKSPACE;
    let mut source_root_prefix: RelativePathBuf = "/".into();
    let mut file_id = FileId(0);
@@ -87,7 +87,7 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option<FilePosit
    for entry in fixture.iter() {
        let meta = match parse_meta(&entry.meta) {
            ParsedMeta::Root { path } => {
-                let source_root = std::mem::replace(&mut source_root, SourceRoot::default());
+                let source_root = std::mem::replace(&mut source_root, SourceRoot::new_local());
                db.set_source_root(source_root_id, Arc::new(source_root));
                source_root_id.0 += 1;
                source_root_prefix = path;
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 2a7ed20d1..07269237a 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -33,7 +33,7 @@ pub struct FileId(pub u32);
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct SourceRootId(pub u32);
-#[derive(Default, Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct SourceRoot {
    /// Sysroot or crates.io library.
    ///
@@ -44,11 +44,11 @@ pub struct SourceRoot {
 }
 impl SourceRoot {
-    pub fn new() -> SourceRoot {
+    pub fn new_local() -> SourceRoot {
-        Default::default()
+        SourceRoot { is_library: false, files: Default::default() }
    }
    pub fn new_library() -> SourceRoot {
-        SourceRoot { is_library: true, ..SourceRoot::new() }
+        SourceRoot { is_library: true, files: Default::default() }
    }
    pub fn insert_file(&mut self, path: RelativePathBuf, file_id: FileId) {
        self.files.insert(path, file_id);
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 488f74cfb..cc42068a1 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -25,6 +25,7 @@ use hir_ty::{
    TraitEnvironment, Ty, TyDefId, TypeCtor, TypeWalk,
 };
 use ra_db::{CrateId, Edition, FileId};
+use ra_prof::profile;
 use ra_syntax::ast;
 use crate::{
@@ -189,6 +190,7 @@ impl Module {
    }
    pub fn diagnostics(self, db: &impl HirDatabase, sink: &mut DiagnosticSink) {
+        let _p = profile("Module::diagnostics");
        db.crate_def_map(self.id.krate).add_diagnostics(db, self.id.local_id, sink);
        for decl in self.declarations(db) {
            match decl {
@@ -507,6 +509,7 @@ impl Function {
    }
    pub fn diagnostics(self, db: &impl HirDatabase, sink: &mut DiagnosticSink) {
+        let _p = profile("Function::diagnostics");
        let infer = db.infer(self.id.into());
        infer.add_diagnostics(db, self.id, sink);
        let mut validator = ExprValidator::new(self.id, infer, sink);
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index f5ffd64fa..e6079b88d 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -1,21 +1,21 @@
 //! FIXME: write short doc here
 pub use hir_def::db::{
-    BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery,
+    BodyQuery, BodyWithSourceMapQuery, ComputeCrateDefMapQuery, ConstDataQuery,
-    DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery, ExprScopesQuery,
+    CrateLangItemsQuery, DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery,
-    FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage,
+    ExprScopesQuery, FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase,
-    LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, StaticDataQuery, StructDataQuery,
+    InternDatabaseStorage, LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, StaticDataQuery,
-    TraitDataQuery, TypeAliasDataQuery,
+    StructDataQuery, TraitDataQuery, TypeAliasDataQuery,
 };
 pub use hir_expand::db::{
    AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery,
    ParseMacroQuery,
 };
 pub use hir_ty::db::{
-    AssociatedTyDataQuery, CallableItemSignatureQuery, FieldTypesQuery, GenericDefaultsQuery,
+    AssociatedTyDataQuery, CallableItemSignatureQuery, DoInferQuery, FieldTypesQuery,
-    GenericPredicatesQuery, HirDatabase, HirDatabaseStorage, ImplDatumQuery, ImplsForTraitQuery,
+    GenericDefaultsQuery, GenericPredicatesQuery, HirDatabase, HirDatabaseStorage, ImplDatumQuery,
-    ImplsInCrateQuery, InferQuery, StructDatumQuery, TraitDatumQuery, TraitSolveQuery, TyQuery,
+    ImplsForTraitQuery, ImplsInCrateQuery, StructDatumQuery, TraitDatumQuery, TraitSolveQuery,
-    ValueTyQuery,
+    TyQuery, ValueTyQuery,
 };
 #[test]
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs
index c55fd4111..da273eb11 100644
--- a/crates/ra_hir_def/src/db.rs
+++ b/crates/ra_hir_def/src/db.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 use hir_expand::{db::AstDatabase, HirFileId};
 use ra_db::{salsa, CrateId, SourceDatabase};
+use ra_prof::profile;
 use ra_syntax::SmolStr;
 use crate::{
@@ -46,9 +47,12 @@ pub trait DefDatabase: InternDatabase + AstDatabase {
    #[salsa::invoke(RawItems::raw_items_query)]
    fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>;
-    #[salsa::invoke(CrateDefMap::crate_def_map_query)]
+    #[salsa::transparent]
    fn crate_def_map(&self, krate: CrateId) -> Arc<CrateDefMap>;
+    #[salsa::invoke(CrateDefMap::compute_crate_def_map_query)]
+    fn compute_crate_def_map(&self, krate: CrateId) -> Arc<CrateDefMap>;
    #[salsa::invoke(StructData::struct_data_query)]
    fn struct_data(&self, id: StructId) -> Arc<StructData>;
    #[salsa::invoke(StructData::union_data_query)]
@@ -104,3 +108,8 @@ pub trait DefDatabase: InternDatabase + AstDatabase {
    #[salsa::invoke(Documentation::documentation_query)]
    fn documentation(&self, def: AttrDefId) -> Option<Documentation>;
 }
+fn crate_def_map(db: &impl DefDatabase, krate: CrateId) -> Arc<CrateDefMap> {
+    let _p = profile("crate_def_map");
+    db.compute_crate_def_map(krate)
+}
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
index 5d4ca73a3..4d210eab1 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/ra_hir_def/src/nameres.rs
@@ -172,13 +172,13 @@ pub struct ModuleData {
 }
 impl CrateDefMap {
-    pub(crate) fn crate_def_map_query(
+    pub(crate) fn compute_crate_def_map_query(
        // Note that this doesn't have `+ AstDatabase`!
        // This gurantess that `CrateDefMap` is stable across reparses.
        db: &impl DefDatabase,
        krate: CrateId,
    ) -> Arc<CrateDefMap> {
-        let _p = profile("crate_def_map_query");
+        let _p = profile("compute_crate_def_map");
        let def_map = {
            let crate_graph = db.crate_graph();
            let edition = crate_graph.edition(krate);
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 8a22b0585..35b852ee2 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -45,7 +45,6 @@ pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> C
        // If the dependency defines a prelude, we overwrite an already defined
        // prelude. This is necessary to import the "std" prelude if a crate
        // depends on both "core" and "std".
-        let dep_def_map = db.crate_def_map(dep.crate_id);
        if dep_def_map.prelude.is_some() {
            def_map.prelude = dep_def_map.prelude;
        }
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_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs
index d52f65b83..eb521c7a0 100644
--- a/crates/ra_hir_ty/src/db.rs
+++ b/crates/ra_hir_ty/src/db.rs
@@ -7,6 +7,7 @@ use hir_def::{
 };
 use ra_arena::map::ArenaMap;
 use ra_db::{salsa, CrateId};
+use ra_prof::profile;
 use crate::{
    method_resolution::CrateImplBlocks,
@@ -18,9 +19,12 @@ use crate::{
 #[salsa::query_group(HirDatabaseStorage)]
 #[salsa::requires(salsa::Database)]
 pub trait HirDatabase: DefDatabase {
-    #[salsa::invoke(crate::infer_query)]
+    #[salsa::transparent]
    fn infer(&self, def: DefWithBodyId) -> Arc<InferenceResult>;
+    #[salsa::invoke(crate::do_infer_query)]
+    fn do_infer(&self, def: DefWithBodyId) -> Arc<InferenceResult>;
    #[salsa::invoke(crate::lower::ty_query)]
    #[salsa::cycle(crate::lower::ty_recover)]
    fn ty(&self, def: TyDefId) -> Ty;
@@ -104,6 +108,11 @@ pub trait HirDatabase: DefDatabase {
    ) -> Option<crate::traits::Solution>;
 }
+fn infer(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> {
+    let _p = profile("infer");
+    db.do_infer(def)
+}
 #[test]
 fn hir_database_is_object_safe() {
    fn _assert_object_safe(_: &dyn HirDatabase) {}
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs
index 37e69599d..e2eda3134 100644
--- a/crates/ra_hir_ty/src/infer.rs
+++ b/crates/ra_hir_ty/src/infer.rs
@@ -62,8 +62,8 @@ mod pat;
 mod coerce;
 /// The entry point of type inference.
-pub fn infer_query(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> {
+pub fn do_infer_query(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> {
-    let _p = profile("infer_query");
+    let _p = profile("do_infer");
    let resolver = def.resolver(db);
    let mut ctx = InferenceContext::new(db, def, resolver);
diff --git a/crates/ra_hir_ty/src/lib.rs b/crates/ra_hir_ty/src/lib.rs
index 55b6dd836..d63f862dc 100644
--- a/crates/ra_hir_ty/src/lib.rs
+++ b/crates/ra_hir_ty/src/lib.rs
@@ -58,7 +58,7 @@ use crate::{
 use display::{HirDisplay, HirFormatter};
 pub use autoderef::autoderef;
-pub use infer::{infer_query, InferTy, InferenceResult};
+pub use infer::{do_infer_query, InferTy, InferenceResult};
 pub use lower::CallableDef;
 pub use lower::{callable_item_sig, TyDefId, ValueTyDefId};
 pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs
index af3db2e1d..2c2ecee9c 100644
--- a/crates/ra_hir_ty/src/lower.rs
+++ b/crates/ra_hir_ty/src/lower.rs
@@ -331,7 +331,7 @@ pub(super) fn substs_from_path_segment(
    if let Some(generic_args) = &segment.args_and_bindings {
        // if args are provided, it should be all of them, but we can't rely on that
        let self_param_correction = if add_self_param { 1 } else { 0 };
-        let child_len = child_len + self_param_correction;
+        let child_len = child_len - self_param_correction;
        for arg in generic_args.args.iter().take(child_len) {
            match arg {
                GenericArg::Type(type_ref) => {
diff --git a/crates/ra_hir_ty/src/tests/regression.rs b/crates/ra_hir_ty/src/tests/regression.rs
index 8b3aa8564..13c5f62e4 100644
--- a/crates/ra_hir_ty/src/tests/regression.rs
+++ b/crates/ra_hir_ty/src/tests/regression.rs
@@ -365,3 +365,20 @@ fn issue_2669() {
    "###
    )
 }
+#[test]
+fn issue_2705() {
+    assert_snapshot!(
+        infer(r#"
+trait Trait {}
+fn test() {
+    <Trait<u32>>::foo()
+}
+"#),
+        @r###"
+    [26; 53) '{     ...oo() }': ()
+    [32; 49) '<Trait...>::foo': {unknown}
+    [32; 51) '<Trait...:foo()': ()
+    "###
+    );
+}
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index e3439ae31..2c9f9dce0 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -13,6 +13,7 @@ wasm = []
 [dependencies]
 either = "1.5"
 format-buf = "1.0.0"
+indexmap = "1.3.0"
 itertools = "0.8.0"
 join_to_string = "0.1.3"
 log = "0.4.5"
diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs
new file mode 100644
index 000000000..1cb712e32
--- /dev/null
+++ b/crates/ra_ide/src/call_hierarchy.rs
@@ -0,0 +1,337 @@
+//! Entry point for call-hierarchy
+use indexmap::IndexMap;
+use hir::db::AstDatabase;
+use ra_syntax::{
+    ast::{self, DocCommentsOwner},
+    match_ast, AstNode, TextRange,
+};
+use crate::{
+    call_info::FnCallNode,
+    db::RootDatabase,
+    display::{ShortLabel, ToNav},
+    expand::descend_into_macros,
+    goto_definition, references, FilePosition, NavigationTarget, RangeInfo,
+};
+#[derive(Debug, Clone)]
+pub struct CallItem {
+    pub target: NavigationTarget,
+    pub ranges: Vec<TextRange>,
+}
+impl CallItem {
+    #[cfg(test)]
+    pub(crate) fn assert_match(&self, expected: &str) {
+        let actual = self.debug_render();
+        test_utils::assert_eq_text!(expected.trim(), actual.trim(),);
+    }
+    #[cfg(test)]
+    pub(crate) fn debug_render(&self) -> String {
+        format!("{} : {:?}", self.target.debug_render(), self.ranges)
+    }
+}
+pub(crate) fn call_hierarchy(
+    db: &RootDatabase,
+    position: FilePosition,
+) -> Option<RangeInfo<Vec<NavigationTarget>>> {
+    goto_definition::goto_definition(db, position)
+}
+pub(crate) fn incoming_calls(db: &RootDatabase, position: FilePosition) -> Option<Vec<CallItem>> {
+    // 1. Find all refs
+    // 2. Loop through refs and determine unique fndef. This will become our `from: CallHierarchyItem,` in the reply.
+    // 3. Add ranges relative to the start of the fndef.
+    let refs = references::find_all_refs(db, position, None)?;
+    let mut calls = CallLocations::default();
+    for reference in refs.info.references() {
+        let file_id = reference.file_range.file_id;
+        let file = db.parse_or_expand(file_id.into())?;
+        let token = file.token_at_offset(reference.file_range.range.start()).next()?;
+        let token = descend_into_macros(db, file_id, token);
+        let syntax = token.value.parent();
+        // This target is the containing function
+        if let Some(nav) = syntax.ancestors().find_map(|node| {
+            match_ast! {
+                match node {
+                    ast::FnDef(it) => {
+                        Some(NavigationTarget::from_named(
+                            db,
+                            token.with_value(&it),
+                            it.doc_comment_text(),
+                            it.short_label(),
+                        ))
+                    },
+                    _ => { None },
+                }
+            }
+        }) {
+            let relative_range = reference.file_range.range;
+            calls.add(&nav, relative_range);
+        }
+    }
+    Some(calls.into_items())
+}
+pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Option<Vec<CallItem>> {
+    let file_id = position.file_id;
+    let file = db.parse_or_expand(file_id.into())?;
+    let token = file.token_at_offset(position.offset).next()?;
+    let token = descend_into_macros(db, file_id, token);
+    let syntax = token.value.parent();
+    let mut calls = CallLocations::default();
+    syntax
+        .descendants()
+        .filter_map(|node| FnCallNode::with_node_exact(&node))
+        .filter_map(|call_node| {
+            let name_ref = call_node.name_ref()?;
+            let name_ref = token.with_value(name_ref.syntax());
+            let analyzer = hir::SourceAnalyzer::new(db, name_ref, None);
+            if let Some(func_target) = match &call_node {
+                FnCallNode::CallExpr(expr) => {
+                    //FIXME: Type::as_callable is broken
+                    let callable_def = analyzer.type_of(db, &expr.expr()?)?.as_callable()?;
+                    match callable_def {
+                        hir::CallableDef::FunctionId(it) => {
+                            let fn_def: hir::Function = it.into();
+                            let nav = fn_def.to_nav(db);
+                            Some(nav)
+                        }
+                        _ => None,
+                    }
+                }
+                FnCallNode::MethodCallExpr(expr) => {
+                    let function = analyzer.resolve_method_call(&expr)?;
+                    Some(function.to_nav(db))
+                }
+                FnCallNode::MacroCallExpr(expr) => {
+                    let macro_def = analyzer.resolve_macro_call(db, name_ref.with_value(&expr))?;
+                    Some(macro_def.to_nav(db))
+                }
+            } {
+                Some((func_target.clone(), name_ref.value.text_range()))
+            } else {
+                None
+            }
+        })
+        .for_each(|(nav, range)| calls.add(&nav, range));
+    Some(calls.into_items())
+}
+#[derive(Default)]
+struct CallLocations {
+    funcs: IndexMap<NavigationTarget, Vec<TextRange>>,
+}
+impl CallLocations {
+    fn add(&mut self, target: &NavigationTarget, range: TextRange) {
+        self.funcs.entry(target.clone()).or_default().push(range);
+    }
+    fn into_items(self) -> Vec<CallItem> {
+        self.funcs.into_iter().map(|(target, ranges)| CallItem { target, ranges }).collect()
+    }
+}
+#[cfg(test)]
+mod tests {
+    use ra_db::FilePosition;
+    use crate::mock_analysis::analysis_and_position;
+    fn check_hierarchy(
+        fixture: &str,
+        expected: &str,
+        expected_incoming: &[&str],
+        expected_outgoing: &[&str],
+    ) {
+        let (analysis, pos) = analysis_and_position(fixture);
+        let mut navs = analysis.call_hierarchy(pos).unwrap().unwrap().info;
+        assert_eq!(navs.len(), 1);
+        let nav = navs.pop().unwrap();
+        nav.assert_match(expected);
+        let item_pos = FilePosition { file_id: nav.file_id(), offset: nav.range().start() };
+        let incoming_calls = analysis.incoming_calls(item_pos).unwrap().unwrap();
+        assert_eq!(incoming_calls.len(), expected_incoming.len());
+        for call in 0..incoming_calls.len() {
+            incoming_calls[call].assert_match(expected_incoming[call]);
+        }
+        let outgoing_calls = analysis.outgoing_calls(item_pos).unwrap().unwrap();
+        assert_eq!(outgoing_calls.len(), expected_outgoing.len());
+        for call in 0..outgoing_calls.len() {
+            outgoing_calls[call].assert_match(expected_outgoing[call]);
+        }
+    }
+    #[test]
+    fn test_call_hierarchy_on_ref() {
+        check_hierarchy(
+            r#"
+            //- /lib.rs
+            fn callee() {}
+            fn caller() {
+                call<|>ee();
+            }
+            "#,
+            "callee FN_DEF FileId(1) [0; 14) [3; 9)",
+            &["caller FN_DEF FileId(1) [15; 44) [18; 24) : [[33; 39)]"],
+            &[],
+        );
+    }
+    #[test]
+    fn test_call_hierarchy_on_def() {
+        check_hierarchy(
+            r#"
+            //- /lib.rs
+            fn call<|>ee() {}
+            fn caller() {
+                callee();
+            }
+            "#,
+            "callee FN_DEF FileId(1) [0; 14) [3; 9)",
+            &["caller FN_DEF FileId(1) [15; 44) [18; 24) : [[33; 39)]"],
+            &[],
+        );
+    }
+    #[test]
+    fn test_call_hierarchy_in_same_fn() {
+        check_hierarchy(
+            r#"
+            //- /lib.rs
+            fn callee() {}
+            fn caller() {
+                call<|>ee();
+                callee();
+            }
+            "#,
+            "callee FN_DEF FileId(1) [0; 14) [3; 9)",
+            &["caller FN_DEF FileId(1) [15; 58) [18; 24) : [[33; 39), [47; 53)]"],
+            &[],
+        );
+    }
+    #[test]
+    fn test_call_hierarchy_in_different_fn() {
+        check_hierarchy(
+            r#"
+            //- /lib.rs
+            fn callee() {}
+            fn caller1() {
+                call<|>ee();
+            }
+            fn caller2() {
+                callee();
+            }
+            "#,
+            "callee FN_DEF FileId(1) [0; 14) [3; 9)",
+            &[
+                "caller1 FN_DEF FileId(1) [15; 45) [18; 25) : [[34; 40)]",
+                "caller2 FN_DEF FileId(1) [46; 76) [49; 56) : [[65; 71)]",
+            ],
+            &[],
+        );
+    }
+    #[test]
+    fn test_call_hierarchy_in_different_files() {
+        check_hierarchy(
+            r#"
+            //- /lib.rs
+            mod foo;
+            use foo::callee;
+            fn caller() {
+                call<|>ee();
+            }
+            //- /foo/mod.rs
+            pub fn callee() {}
+            "#,
+            "callee FN_DEF FileId(2) [0; 18) [7; 13)",
+            &["caller FN_DEF FileId(1) [26; 55) [29; 35) : [[44; 50)]"],
+            &[],
+        );
+    }
+    #[test]
+    fn test_call_hierarchy_outgoing() {
+        check_hierarchy(
+            r#"
+            //- /lib.rs
+            fn callee() {}
+            fn call<|>er() {
+                callee();
+                callee();
+            }
+            "#,
+            "caller FN_DEF FileId(1) [15; 58) [18; 24)",
+            &[],
+            &["callee FN_DEF FileId(1) [0; 14) [3; 9) : [[33; 39), [47; 53)]"],
+        );
+    }
+    #[test]
+    fn test_call_hierarchy_outgoing_in_different_files() {
+        check_hierarchy(
+            r#"
+            //- /lib.rs
+            mod foo;
+            use foo::callee;
+            fn call<|>er() {
+                callee();
+            }
+            //- /foo/mod.rs
+            pub fn callee() {}
+            "#,
+            "caller FN_DEF FileId(1) [26; 55) [29; 35)",
+            &[],
+            &["callee FN_DEF FileId(2) [0; 18) [7; 13) : [[44; 50)]"],
+        );
+    }
+    #[test]
+    fn test_call_hierarchy_incoming_outgoing() {
+        check_hierarchy(
+            r#"
+            //- /lib.rs
+            fn caller1() {
+                call<|>er2();
+            }
+            fn caller2() {
+                caller3();
+            }
+            fn caller3() {
+            }
+            "#,
+            "caller2 FN_DEF FileId(1) [32; 63) [35; 42)",
+            &["caller1 FN_DEF FileId(1) [0; 31) [3; 10) : [[19; 26)]"],
+            &["caller3 FN_DEF FileId(1) [64; 80) [67; 74) : [[51; 58)]"],
+        );
+    }
+}
diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs
index 2c2b6fa48..a7023529b 100644
--- a/crates/ra_ide/src/call_info.rs
+++ b/crates/ra_ide/src/call_info.rs
@@ -88,7 +88,7 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
 }
 #[derive(Debug)]
-enum FnCallNode {
+pub(crate) enum FnCallNode {
    CallExpr(ast::CallExpr),
    MethodCallExpr(ast::MethodCallExpr),
    MacroCallExpr(ast::MacroCall),
@@ -108,7 +108,18 @@ impl FnCallNode {
        })
    }
-    fn name_ref(&self) -> Option<ast::NameRef> {
+    pub(crate) fn with_node_exact(node: &SyntaxNode) -> Option<FnCallNode> {
+        match_ast! {
+            match node {
+                ast::CallExpr(it) => { Some(FnCallNode::CallExpr(it)) },
+                ast::MethodCallExpr(it) => { Some(FnCallNode::MethodCallExpr(it)) },
+                ast::MacroCall(it) => { Some(FnCallNode::MacroCallExpr(it)) },
+                _ => { None },
+            }
+        }
+    }
+    pub(crate) fn name_ref(&self) -> Option<ast::NameRef> {
        match self {
            FnCallNode::CallExpr(call_expr) => Some(match call_expr.expr()? {
                ast::Expr::PathExpr(path_expr) => path_expr.path()?.segment()?.name_ref()?,
diff --git a/crates/ra_ide/src/change.rs b/crates/ra_ide/src/change.rs
index 387a9cafb..b0aa2c8e0 100644
--- a/crates/ra_ide/src/change.rs
+++ b/crates/ra_ide/src/change.rs
@@ -176,7 +176,8 @@ impl RootDatabase {
        if !change.new_roots.is_empty() {
            let mut local_roots = Vec::clone(&self.local_roots());
            for (root_id, is_local) in change.new_roots {
-                let root = if is_local { SourceRoot::new() } else { SourceRoot::new_library() };
+                let root =
+                    if is_local { SourceRoot::new_local() } else { SourceRoot::new_library() };
                let durability = durability(&root);
                self.set_source_root_with_durability(root_id, Arc::new(root), durability);
                if is_local {
@@ -201,7 +202,7 @@ impl RootDatabase {
                libraries.push(library.root_id);
                self.set_source_root_with_durability(
                    library.root_id,
-                    Default::default(),
+                    Arc::new(SourceRoot::new_library()),
                    Durability::HIGH,
                );
                self.set_library_symbols_with_durability(
@@ -273,7 +274,7 @@ impl RootDatabase {
        self.query(hir::db::BodyWithSourceMapQuery).sweep(sweep);
        self.query(hir::db::ExprScopesQuery).sweep(sweep);
-        self.query(hir::db::InferQuery).sweep(sweep);
+        self.query(hir::db::DoInferQuery).sweep(sweep);
        self.query(hir::db::BodyQuery).sweep(sweep);
    }
@@ -309,7 +310,7 @@ impl RootDatabase {
            hir::db::EnumDataQuery
            hir::db::TraitDataQuery
            hir::db::RawItemsQuery
-            hir::db::CrateDefMapQuery
+            hir::db::ComputeCrateDefMapQuery
            hir::db::GenericParamsQuery
            hir::db::FunctionDataQuery
            hir::db::TypeAliasDataQuery
@@ -320,7 +321,7 @@ impl RootDatabase {
            hir::db::LangItemQuery
            hir::db::DocumentationQuery
            hir::db::ExprScopesQuery
-            hir::db::InferQuery
+            hir::db::DoInferQuery
            hir::db::TyQuery
            hir::db::ValueTyQuery
            hir::db::FieldTypesQuery
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs
index c50a70d99..478368529 100644
--- a/crates/ra_ide/src/diagnostics.rs
+++ b/crates/ra_ide/src/diagnostics.rs
@@ -64,22 +64,36 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
        })
    })
    .on::<hir::diagnostics::MissingFields, _>(|d| {
-        let mut field_list = d.ast(db);
+        // Note that although we could add a diagnostics to
-        for f in d.missed_fields.iter() {
+        // fill the missing tuple field, e.g :
-            let field = make::record_field(make::name_ref(&f.to_string()), Some(make::expr_unit()));
+        // `struct A(usize);`
-            field_list = field_list.append_field(&field);
+        // `let a = A { 0: () }`
-        }
+        // but it is uncommon usage and it should not be encouraged.
+        let fix = if d.missed_fields.iter().any(|it| it.as_tuple_index().is_some()) {
-        let mut builder = TextEditBuilder::default();
+            None
-        algo::diff(&d.ast(db).syntax(), &field_list.syntax()).into_text_edit(&mut builder);
+        } else {
+            let mut field_list = d.ast(db);
+            for f in d.missed_fields.iter() {
+                let field =
+                    make::record_field(make::name_ref(&f.to_string()), Some(make::expr_unit()));
+                field_list = field_list.append_field(&field);
+            }
+            let mut builder = TextEditBuilder::default();
+            algo::diff(&d.ast(db).syntax(), &field_list.syntax()).into_text_edit(&mut builder);
+            Some(SourceChange::source_file_edit_from(
+                "fill struct fields",
+                file_id,
+                builder.finish(),
+            ))
+        };
-        let fix =
-            SourceChange::source_file_edit_from("fill struct fields", file_id, builder.finish());
        res.borrow_mut().push(Diagnostic {
            range: d.highlight_range(),
            message: d.message(),
            severity: Severity::Error,
-            fix: Some(fix),
+            fix,
        })
    })
    .on::<hir::diagnostics::MissingOkInTailExpr, _>(|d| {
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index b9ae67828..f2e45fa31 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -19,7 +19,7 @@ use super::short_label::ShortLabel;
 ///
 /// Typically, a `NavigationTarget` corresponds to some element in the source
 /// code, like a function or a struct, but this is not strictly required.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct NavigationTarget {
    file_id: FileId,
    name: SmolStr,
diff --git a/crates/ra_ide/src/expand.rs b/crates/ra_ide/src/expand.rs
index 7a22bb0a4..b82259a3d 100644
--- a/crates/ra_ide/src/expand.rs
+++ b/crates/ra_ide/src/expand.rs
@@ -76,14 +76,15 @@ pub(crate) fn descend_into_macros(
 ) -> InFile<SyntaxToken> {
    let src = InFile::new(file_id.into(), token);
+    let source_analyzer =
+        hir::SourceAnalyzer::new(db, src.with_value(src.value.parent()).as_ref(), None);
    successors(Some(src), |token| {
        let macro_call = token.value.ancestors().find_map(ast::MacroCall::cast)?;
        let tt = macro_call.token_tree()?;
        if !token.value.text_range().is_subrange(&tt.syntax().text_range()) {
            return None;
        }
-        let source_analyzer =
-            hir::SourceAnalyzer::new(db, token.with_value(token.value.parent()).as_ref(), None);
        let exp = source_analyzer.expand(db, token.with_value(&macro_call))?;
        exp.map_token_down(db, token.as_ref())
    })
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 779a81b2c..7b187eba3 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -24,6 +24,7 @@ mod goto_definition;
 mod goto_type_definition;
 mod extend_selection;
 mod hover;
+mod call_hierarchy;
 mod call_info;
 mod syntax_highlighting;
 mod parent_module;
@@ -62,6 +63,7 @@ use crate::{db::LineIndexDatabase, display::ToNav, symbol_index::FileSymbol};
 pub use crate::{
    assists::{Assist, AssistId},
+    call_hierarchy::CallItem,
    change::{AnalysisChange, LibraryData},
    completion::{CompletionItem, CompletionItemKind, InsertTextFormat},
    diagnostics::Severity,
@@ -73,7 +75,7 @@ pub use crate::{
    inlay_hints::{InlayHint, InlayKind},
    line_index::{LineCol, LineIndex},
    line_index_utils::translate_offset_with_edit,
-    references::{ReferenceSearchResult, SearchScope},
+    references::{Reference, ReferenceKind, ReferenceSearchResult, SearchScope},
    runnables::{Runnable, RunnableKind},
    source_change::{FileSystemEdit, SourceChange, SourceFileEdit},
    syntax_highlighting::HighlightedRange,
@@ -412,6 +414,24 @@ impl Analysis {
        self.with_db(|db| call_info::call_info(db, position))
    }
+    /// Computes call hierarchy candidates for the given file position.
+    pub fn call_hierarchy(
+        &self,
+        position: FilePosition,
+    ) -> Cancelable<Option<RangeInfo<Vec<NavigationTarget>>>> {
+        self.with_db(|db| call_hierarchy::call_hierarchy(db, position))
+    }
+    /// Computes incoming calls for the given file position.
+    pub fn incoming_calls(&self, position: FilePosition) -> Cancelable<Option<Vec<CallItem>>> {
+        self.with_db(|db| call_hierarchy::incoming_calls(db, position))
+    }
+    /// Computes incoming calls for the given file position.
+    pub fn outgoing_calls(&self, position: FilePosition) -> Cancelable<Option<Vec<CallItem>>> {
+        self.with_db(|db| call_hierarchy::outgoing_calls(db, position))
+    }
    /// Returns a `mod name;` declaration which created the current module.
    pub fn parent_module(&self, position: FilePosition) -> Cancelable<Vec<NavigationTarget>> {
        self.with_db(|db| parent_module::parent_module(db, position))
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index e3ecde50d..5a3ec4eb9 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -18,7 +18,10 @@ use hir::InFile;
 use once_cell::unsync::Lazy;
 use ra_db::{SourceDatabase, SourceDatabaseExt};
 use ra_prof::profile;
-use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SourceFile, SyntaxNode, TextUnit};
+use ra_syntax::{
+    algo::find_node_at_offset, ast, AstNode, SourceFile, SyntaxKind, SyntaxNode, TextUnit,
+    TokenAtOffset,
+};
 use crate::{
    db::RootDatabase, display::ToNav, FilePosition, FileRange, NavigationTarget, RangeInfo,
@@ -35,7 +38,20 @@ pub use self::search_scope::SearchScope;
 #[derive(Debug, Clone)]
 pub struct ReferenceSearchResult {
    declaration: NavigationTarget,
-    references: Vec<FileRange>,
+    declaration_kind: ReferenceKind,
+    references: Vec<Reference>,
+}
+#[derive(Debug, Clone)]
+pub struct Reference {
+    pub file_range: FileRange,
+    pub kind: ReferenceKind,
+}
+#[derive(Debug, Clone, PartialEq)]
+pub enum ReferenceKind {
+    StructLiteral,
+    Other,
 }
 impl ReferenceSearchResult {
@@ -43,7 +59,7 @@ impl ReferenceSearchResult {
        &self.declaration
    }
-    pub fn references(&self) -> &[FileRange] {
+    pub fn references(&self) -> &[Reference] {
        &self.references
    }
@@ -58,12 +74,18 @@ impl ReferenceSearchResult {
 // allow turning ReferenceSearchResult into an iterator
 // over FileRanges
 impl IntoIterator for ReferenceSearchResult {
-    type Item = FileRange;
+    type Item = Reference;
-    type IntoIter = std::vec::IntoIter<FileRange>;
+    type IntoIter = std::vec::IntoIter<Reference>;
    fn into_iter(mut self) -> Self::IntoIter {
        let mut v = Vec::with_capacity(self.len());
-        v.push(FileRange { file_id: self.declaration.file_id(), range: self.declaration.range() });
+        v.push(Reference {
+            file_range: FileRange {
+                file_id: self.declaration.file_id(),
+                range: self.declaration.range(),
+            },
+            kind: self.declaration_kind,
+        });
        v.append(&mut self.references);
        v.into_iter()
    }
@@ -71,11 +93,24 @@ impl IntoIterator for ReferenceSearchResult {
 pub(crate) fn find_all_refs(
    db: &RootDatabase,
-    position: FilePosition,
+    mut position: FilePosition,
    search_scope: Option<SearchScope>,
 ) -> Option<RangeInfo<ReferenceSearchResult>> {
    let parse = db.parse(position.file_id);
    let syntax = parse.tree().syntax().clone();
+    let token = syntax.token_at_offset(position.offset);
+    let mut search_kind = ReferenceKind::Other;
+    if let TokenAtOffset::Between(ref left, ref right) = token {
+        if (right.kind() == SyntaxKind::L_CURLY || right.kind() == SyntaxKind::L_PAREN)
+            && left.kind() != SyntaxKind::IDENT
+        {
+            position = FilePosition { offset: left.text_range().start(), ..position };
+            search_kind = ReferenceKind::StructLiteral;
+        }
+    }
    let RangeInfo { range, info: (name, def) } = find_name(db, &syntax, position)?;
    let declaration = match def.kind {
@@ -96,9 +131,15 @@ pub(crate) fn find_all_refs(
        }
    };
-    let references = process_definition(db, def, name, search_scope);
+    let references = process_definition(db, def, name, search_scope)
+        .into_iter()
+        .filter(|r| search_kind == ReferenceKind::Other || search_kind == r.kind)
+        .collect();
-    Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references }))
+    Some(RangeInfo::new(
+        range,
+        ReferenceSearchResult { declaration, references, declaration_kind: ReferenceKind::Other },
+    ))
 }
 fn find_name<'a>(
@@ -122,7 +163,7 @@ fn process_definition(
    def: NameDefinition,
    name: String,
    scope: SearchScope,
-) -> Vec<FileRange> {
+) -> Vec<Reference> {
    let _p = profile("process_definition");
    let pat = name.as_str();
@@ -146,7 +187,21 @@ fn process_definition(
                }
                if let Some(d) = classify_name_ref(db, InFile::new(file_id.into(), &name_ref)) {
                    if d == def {
-                        refs.push(FileRange { file_id, range });
+                        let kind = if name_ref
+                            .syntax()
+                            .ancestors()
+                            .find_map(ast::RecordLit::cast)
+                            .and_then(|l| l.path())
+                            .and_then(|p| p.segment())
+                            .and_then(|p| p.name_ref())
+                            .map(|n| n == name_ref)
+                            .unwrap_or(false)
+                        {
+                            ReferenceKind::StructLiteral
+                        } else {
+                            ReferenceKind::Other
+                        };
+                        refs.push(Reference { file_range: FileRange { file_id, range }, kind });
                    }
                }
            }
@@ -159,10 +214,33 @@ fn process_definition(
 mod tests {
    use crate::{
        mock_analysis::{analysis_and_position, single_file_with_position, MockAnalysis},
-        ReferenceSearchResult, SearchScope,
+        Reference, ReferenceKind, ReferenceSearchResult, SearchScope,
    };
    #[test]
+    fn test_struct_literal() {
+        let code = r#"
+    struct Foo <|>{
+        a: i32,
+    }
+    impl Foo {
+        fn f() -> i32 { 42 }
+    }    
+    fn main() {
+        let f: Foo;
+        f = Foo {a: Foo::f()};
+    }"#;
+        let refs = get_all_refs(code);
+        check_result(
+            refs,
+            "Foo STRUCT_DEF FileId(1) [5; 39) [12; 15)",
+            ReferenceKind::Other,
+            &["FileId(1) [142; 145) StructLiteral"],
+        );
+    }
+    #[test]
    fn test_find_all_refs_for_local() {
        let code = r#"
    fn main() {
@@ -178,7 +256,17 @@ mod tests {
    }"#;
        let refs = get_all_refs(code);
-        assert_eq!(refs.len(), 5);
+        check_result(
+            refs,
+            "i BIND_PAT FileId(1) [33; 34)",
+            ReferenceKind::Other,
+            &[
+                "FileId(1) [67; 68) Other",
+                "FileId(1) [71; 72) Other",
+                "FileId(1) [101; 102) Other",
+                "FileId(1) [127; 128) Other",
+            ],
+        );
    }
    #[test]
@@ -189,7 +277,12 @@ mod tests {
    }"#;
        let refs = get_all_refs(code);
-        assert_eq!(refs.len(), 2);
+        check_result(
+            refs,
+            "i BIND_PAT FileId(1) [12; 13)",
+            ReferenceKind::Other,
+            &["FileId(1) [38; 39) Other"],
+        );
    }
    #[test]
@@ -200,7 +293,12 @@ mod tests {
    }"#;
        let refs = get_all_refs(code);
-        assert_eq!(refs.len(), 2);
+        check_result(
+            refs,
+            "i BIND_PAT FileId(1) [12; 13)",
+            ReferenceKind::Other,
+            &["FileId(1) [38; 39) Other"],
+        );
    }
    #[test]
@@ -217,7 +315,12 @@ mod tests {
        "#;
        let refs = get_all_refs(code);
-        assert_eq!(refs.len(), 2);
+        check_result(
+            refs,
+            "spam RECORD_FIELD_DEF FileId(1) [66; 79) [70; 74)",
+            ReferenceKind::Other,
+            &["FileId(1) [152; 156) Other"],
+        );
    }
    #[test]
@@ -231,7 +334,7 @@ mod tests {
        "#;
        let refs = get_all_refs(code);
-        assert_eq!(refs.len(), 1);
+        check_result(refs, "f FN_DEF FileId(1) [88; 104) [91; 92)", ReferenceKind::Other, &[]);
    }
    #[test]
@@ -246,7 +349,7 @@ mod tests {
        "#;
        let refs = get_all_refs(code);
-        assert_eq!(refs.len(), 1);
+        check_result(refs, "B ENUM_VARIANT FileId(1) [83; 84) [83; 84)", ReferenceKind::Other, &[]);
    }
    #[test]
@@ -285,7 +388,12 @@ mod tests {
        let (analysis, pos) = analysis_and_position(code);
        let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
-        assert_eq!(refs.len(), 3);
+        check_result(
+            refs,
+            "Foo STRUCT_DEF FileId(2) [16; 50) [27; 30)",
+            ReferenceKind::Other,
+            &["FileId(1) [52; 55) StructLiteral", "FileId(3) [77; 80) StructLiteral"],
+        );
    }
    // `mod foo;` is not in the results because `foo` is an `ast::Name`.
@@ -311,7 +419,12 @@ mod tests {
        let (analysis, pos) = analysis_and_position(code);
        let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
-        assert_eq!(refs.len(), 2);
+        check_result(
+            refs,
+            "foo SOURCE_FILE FileId(2) [0; 35)",
+            ReferenceKind::Other,
+            &["FileId(1) [13; 16) Other"],
+        );
    }
    #[test]
@@ -336,7 +449,12 @@ mod tests {
        let (analysis, pos) = analysis_and_position(code);
        let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
-        assert_eq!(refs.len(), 3);
+        check_result(
+            refs,
+            "Foo STRUCT_DEF FileId(3) [0; 41) [18; 21)",
+            ReferenceKind::Other,
+            &["FileId(2) [20; 23) Other", "FileId(2) [46; 49) StructLiteral"],
+        );
    }
    #[test]
@@ -360,11 +478,21 @@ mod tests {
        let analysis = mock.analysis();
        let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
-        assert_eq!(refs.len(), 3);
+        check_result(
+            refs,
+            "quux FN_DEF FileId(1) [18; 34) [25; 29)",
+            ReferenceKind::Other,
+            &["FileId(2) [16; 20) Other", "FileId(3) [16; 20) Other"],
+        );
        let refs =
            analysis.find_all_refs(pos, Some(SearchScope::single_file(bar))).unwrap().unwrap();
-        assert_eq!(refs.len(), 2);
+        check_result(
+            refs,
+            "quux FN_DEF FileId(1) [18; 34) [25; 29)",
+            ReferenceKind::Other,
+            &["FileId(3) [16; 20) Other"],
+        );
    }
    #[test]
@@ -379,11 +507,40 @@ mod tests {
        }"#;
        let refs = get_all_refs(code);
-        assert_eq!(refs.len(), 3);
+        check_result(
+            refs,
+            "m1 MACRO_CALL FileId(1) [9; 63) [46; 48)",
+            ReferenceKind::Other,
+            &["FileId(1) [96; 98) Other", "FileId(1) [114; 116) Other"],
+        );
    }
    fn get_all_refs(text: &str) -> ReferenceSearchResult {
        let (analysis, position) = single_file_with_position(text);
        analysis.find_all_refs(position, None).unwrap().unwrap()
    }
+    fn check_result(
+        res: ReferenceSearchResult,
+        expected_decl: &str,
+        decl_kind: ReferenceKind,
+        expected_refs: &[&str],
+    ) {
+        res.declaration().assert_match(expected_decl);
+        assert_eq!(res.declaration_kind, decl_kind);
+        assert_eq!(res.references.len(), expected_refs.len());
+        res.references().iter().enumerate().for_each(|(i, r)| r.assert_match(expected_refs[i]));
+    }
+    impl Reference {
+        fn debug_render(&self) -> String {
+            format!("{:?} {:?} {:?}", self.file_range.file_id, self.file_range.range, self.kind)
+        }
+        fn assert_match(&self, expected: &str) {
+            let actual = self.debug_render();
+            test_utils::assert_eq_text!(expected.trim(), actual.trim(),);
+        }
+    }
 }
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index b804d5f6d..e02985dcd 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -110,7 +110,13 @@ fn rename_reference(
    let edit = refs
        .into_iter()
-        .map(|range| source_edit_from_file_id_range(range.file_id, range.range, new_name))
+        .map(|reference| {
+            source_edit_from_file_id_range(
+                reference.file_range.file_id,
+                reference.file_range.range,
+                new_name,
+            )
+        })
        .collect::<Vec<_>>();
    if edit.is_empty() {
diff --git a/crates/ra_lsp_server/src/caps.rs b/crates/ra_lsp_server/src/caps.rs
index adfc9fb2c..c4711076c 100644
--- a/crates/ra_lsp_server/src/caps.rs
+++ b/crates/ra_lsp_server/src/caps.rs
@@ -1,8 +1,8 @@
 //! Advertizes the capabilities of the LSP Server.
 use lsp_types::{
-    CodeActionProviderCapability, CodeLensOptions, CompletionOptions,
+    CallHierarchyServerCapability, CodeActionProviderCapability, CodeLensOptions,
-    DocumentOnTypeFormattingOptions, FoldingRangeProviderCapability,
+    CompletionOptions, DocumentOnTypeFormattingOptions, FoldingRangeProviderCapability,
    ImplementationProviderCapability, RenameOptions, RenameProviderCapability, SaveOptions,
    SelectionRangeProviderCapability, ServerCapabilities, SignatureHelpOptions,
    TextDocumentSyncCapability, TextDocumentSyncKind, TextDocumentSyncOptions,
@@ -56,6 +56,7 @@ pub fn server_capabilities() -> ServerCapabilities {
        color_provider: None,
        execute_command_provider: None,
        workspace: None,
+        call_hierarchy_provider: Some(CallHierarchyServerCapability::Simple(true)),
        experimental: Default::default(),
    }
 }
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index e93d4ea33..c260b51c4 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -490,6 +490,24 @@ impl TryConvWith<&WorldSnapshot> for (FileId, RangeInfo<Vec<NavigationTarget>>)
    }
 }
+pub fn to_call_hierarchy_item(
+    file_id: FileId,
+    range: TextRange,
+    world: &WorldSnapshot,
+    line_index: &LineIndex,
+    nav: NavigationTarget,
+) -> Result<lsp_types::CallHierarchyItem> {
+    Ok(lsp_types::CallHierarchyItem {
+        name: nav.name().to_string(),
+        kind: nav.kind().conv(),
+        tags: None,
+        detail: nav.description().map(|it| it.to_string()),
+        uri: file_id.try_conv_with(&world)?,
+        range: nav.range().conv_with(&line_index),
+        selection_range: range.conv_with(&line_index),
+    })
+}
 pub fn to_location(
    file_id: FileId,
    range: TextRange,
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 53c6834d0..7a49cad86 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -504,6 +504,9 @@ fn on_request(
        .on::<req::Formatting>(handlers::handle_formatting)?
        .on::<req::DocumentHighlightRequest>(handlers::handle_document_highlight)?
        .on::<req::InlayHints>(handlers::handle_inlay_hints)?
+        .on::<req::CallHierarchyPrepare>(handlers::handle_call_hierarchy_prepare)?
+        .on::<req::CallHierarchyIncomingCalls>(handlers::handle_call_hierarchy_incoming)?
+        .on::<req::CallHierarchyOutgoingCalls>(handlers::handle_call_hierarchy_outgoing)?
        .finish();
    Ok(())
 }
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 331beab13..a5b6f48af 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -5,13 +5,16 @@ use std::{fmt::Write as _, io::Write as _};
 use lsp_server::ErrorCode;
 use lsp_types::{
+    CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem,
+    CallHierarchyOutgoingCall, CallHierarchyOutgoingCallsParams, CallHierarchyPrepareParams,
    CodeAction, CodeActionResponse, CodeLens, Command, CompletionItem, Diagnostic,
    DocumentFormattingParams, DocumentHighlight, DocumentSymbol, FoldingRange, FoldingRangeParams,
    Hover, HoverContents, Location, MarkupContent, MarkupKind, Position, PrepareRenameResponse,
    Range, RenameParams, SymbolInformation, TextDocumentIdentifier, TextEdit, WorkspaceEdit,
 };
 use ra_ide::{
-    AssistId, FileId, FilePosition, FileRange, Query, Runnable, RunnableKind, SearchScope,
+    AssistId, FileId, FilePosition, FileRange, Query, RangeInfo, Runnable, RunnableKind,
+    SearchScope,
 };
 use ra_prof::profile;
 use ra_syntax::{AstNode, SyntaxKind, TextRange, TextUnit};
@@ -21,7 +24,10 @@ use serde_json::to_value;
 use crate::{
    cargo_target_spec::{runnable_args, CargoTargetSpec},
-    conv::{to_location, Conv, ConvWith, FoldConvCtx, MapConvWith, TryConvWith, TryConvWithToVec},
+    conv::{
+        to_call_hierarchy_item, to_location, Conv, ConvWith, FoldConvCtx, MapConvWith, TryConvWith,
+        TryConvWithToVec,
+    },
    req::{self, Decoration, InlayHint, InlayHintsParams, InlayKind},
    world::WorldSnapshot,
    LspError, Result,
@@ -531,8 +537,8 @@ pub fn handle_references(
    let locations = if params.context.include_declaration {
        refs.into_iter()
            .filter_map(|r| {
-                let line_index = world.analysis().file_line_index(r.file_id).ok()?;
+                let line_index = world.analysis().file_line_index(r.file_range.file_id).ok()?;
-                to_location(r.file_id, r.range, &world, &line_index).ok()
+                to_location(r.file_range.file_id, r.file_range.range, &world, &line_index).ok()
            })
            .collect()
    } else {
@@ -540,8 +546,8 @@ pub fn handle_references(
        refs.references()
            .iter()
            .filter_map(|r| {
-                let line_index = world.analysis().file_line_index(r.file_id).ok()?;
+                let line_index = world.analysis().file_line_index(r.file_range.file_id).ok()?;
-                to_location(r.file_id, r.range, &world, &line_index).ok()
+                to_location(r.file_range.file_id, r.file_range.range, &world, &line_index).ok()
            })
            .collect()
    };
@@ -830,8 +836,11 @@ pub fn handle_document_highlight(
    Ok(Some(
        refs.into_iter()
-            .filter(|r| r.file_id == file_id)
+            .filter(|r| r.file_range.file_id == file_id)
-            .map(|r| DocumentHighlight { range: r.range.conv_with(&line_index), kind: None })
+            .map(|r| DocumentHighlight {
+                range: r.file_range.range.conv_with(&line_index),
+                kind: None,
+            })
            .collect(),
    ))
 }
@@ -933,3 +942,91 @@ pub fn handle_inlay_hints(
        })
        .collect())
 }
+pub fn handle_call_hierarchy_prepare(
+    world: WorldSnapshot,
+    params: CallHierarchyPrepareParams,
+) -> Result<Option<Vec<CallHierarchyItem>>> {
+    let _p = profile("handle_call_hierarchy_prepare");
+    let position = params.text_document_position_params.try_conv_with(&world)?;
+    let file_id = position.file_id;
+    let nav_info = match world.analysis().call_hierarchy(position)? {
+        None => return Ok(None),
+        Some(it) => it,
+    };
+    let line_index = world.analysis().file_line_index(file_id)?;
+    let RangeInfo { range, info: navs } = nav_info;
+    let res = navs
+        .into_iter()
+        .filter(|it| it.kind() == SyntaxKind::FN_DEF)
+        .filter_map(|it| to_call_hierarchy_item(file_id, range, &world, &line_index, it).ok())
+        .collect();
+    Ok(Some(res))
+}
+pub fn handle_call_hierarchy_incoming(
+    world: WorldSnapshot,
+    params: CallHierarchyIncomingCallsParams,
+) -> Result<Option<Vec<CallHierarchyIncomingCall>>> {
+    let _p = profile("handle_call_hierarchy_incoming");
+    let item = params.item;
+    let doc = TextDocumentIdentifier::new(item.uri);
+    let frange: FileRange = (&doc, item.range).try_conv_with(&world)?;
+    let fpos = FilePosition { file_id: frange.file_id, offset: frange.range.start() };
+    let call_items = match world.analysis().incoming_calls(fpos)? {
+        None => return Ok(None),
+        Some(it) => it,
+    };
+    let mut res = vec![];
+    for call_item in call_items.into_iter() {
+        let file_id = call_item.target.file_id();
+        let line_index = world.analysis().file_line_index(file_id)?;
+        let range = call_item.target.range();
+        let item = to_call_hierarchy_item(file_id, range, &world, &line_index, call_item.target)?;
+        res.push(CallHierarchyIncomingCall {
+            from: item,
+            from_ranges: call_item.ranges.iter().map(|it| it.conv_with(&line_index)).collect(),
+        });
+    }
+    Ok(Some(res))
+}
+pub fn handle_call_hierarchy_outgoing(
+    world: WorldSnapshot,
+    params: CallHierarchyOutgoingCallsParams,
+) -> Result<Option<Vec<CallHierarchyOutgoingCall>>> {
+    let _p = profile("handle_call_hierarchy_outgoing");
+    let item = params.item;
+    let doc = TextDocumentIdentifier::new(item.uri);
+    let frange: FileRange = (&doc, item.range).try_conv_with(&world)?;
+    let fpos = FilePosition { file_id: frange.file_id, offset: frange.range.start() };
+    let call_items = match world.analysis().outgoing_calls(fpos)? {
+        None => return Ok(None),
+        Some(it) => it,
+    };
+    let mut res = vec![];
+    for call_item in call_items.into_iter() {
+        let file_id = call_item.target.file_id();
+        let line_index = world.analysis().file_line_index(file_id)?;
+        let range = call_item.target.range();
+        let item = to_call_hierarchy_item(file_id, range, &world, &line_index, call_item.target)?;
+        res.push(CallHierarchyOutgoingCall {
+            to: item,
+            from_ranges: call_item.ranges.iter().map(|it| it.conv_with(&line_index)).collect(),
+        });
+    }
+    Ok(Some(res))
+}
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs
index 40edaf677..8098ff31d 100644
--- a/crates/ra_lsp_server/src/req.rs
+++ b/crates/ra_lsp_server/src/req.rs
@@ -6,13 +6,15 @@ use serde::{Deserialize, Serialize};
 pub use lsp_types::{
    notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens,
-    CodeLensParams, CompletionParams, CompletionResponse, DidChangeConfigurationParams,
+    CodeLensParams, CompletionParams, CompletionResponse, DiagnosticTag,
-    DidChangeWatchedFilesParams, DidChangeWatchedFilesRegistrationOptions,
+    DidChangeConfigurationParams, DidChangeWatchedFilesParams,
-    DocumentOnTypeFormattingParams, DocumentSymbolParams, DocumentSymbolResponse,
+    DidChangeWatchedFilesRegistrationOptions, DocumentOnTypeFormattingParams, DocumentSymbolParams,
-    FileSystemWatcher, Hover, InitializeResult, MessageType, ProgressParams, ProgressParamsValue,
+    DocumentSymbolResponse, FileSystemWatcher, Hover, InitializeResult, MessageType,
-    ProgressToken, PublishDiagnosticsParams, ReferenceParams, Registration, RegistrationParams,
+    PartialResultParams, ProgressParams, ProgressParamsValue, ProgressToken,
-    SelectionRange, SelectionRangeParams, ShowMessageParams, SignatureHelp, TextDocumentEdit,
+    PublishDiagnosticsParams, ReferenceParams, Registration, RegistrationParams, SelectionRange,
-    TextDocumentPositionParams, TextEdit, WorkspaceEdit, WorkspaceSymbolParams,
+    SelectionRangeParams, ServerCapabilities, ShowMessageParams, SignatureHelp, SymbolKind,
+    TextDocumentEdit, TextDocumentPositionParams, TextEdit, WorkDoneProgressParams, WorkspaceEdit,
+    WorkspaceSymbolParams,
 };
 pub enum AnalyzerStatus {}
diff --git a/crates/ra_parser/src/grammar/items/traits.rs b/crates/ra_parser/src/grammar/items/traits.rs
index 2c560e824..964fd3041 100644
--- a/crates/ra_parser/src/grammar/items/traits.rs
+++ b/crates/ra_parser/src/grammar/items/traits.rs
@@ -100,6 +100,8 @@ pub(crate) fn impl_item_list(p: &mut Parser) {
    m.complete(p, ITEM_LIST);
 }
+// test impl_type_params
+// impl<const N: u32> Bar<N> {}
 fn choose_type_params_over_qpath(p: &Parser) -> bool {
    // There's an ambiguity between generic parameters and qualified paths in impls.
    // If we see `<` it may start both, so we have to inspect some following tokens.
@@ -107,6 +109,7 @@ fn choose_type_params_over_qpath(p: &Parser) -> bool {
    // but not qualified paths (with one exception):
    //     `<` `>` - empty generic parameters
    //     `<` `#` - generic parameters with attributes
+    //     `<` `const` - const generic parameters
    //     `<` (LIFETIME|IDENT) `>` - single generic parameter
    //     `<` (LIFETIME|IDENT) `,` - first generic parameter in a list
    //     `<` (LIFETIME|IDENT) `:` - generic parameter with bounds
@@ -119,7 +122,7 @@ fn choose_type_params_over_qpath(p: &Parser) -> bool {
    if !p.at(T![<]) {
        return false;
    }
-    if p.nth(1) == T![#] || p.nth(1) == T![>] {
+    if p.nth(1) == T![#] || p.nth(1) == T![>] || p.nth(1) == CONST_KW {
        return true;
    }
    (p.nth(1) == LIFETIME || p.nth(1) == IDENT)
diff --git a/crates/ra_parser/src/grammar/type_args.rs b/crates/ra_parser/src/grammar/type_args.rs
index 7256c2697..33d9973e9 100644
--- a/crates/ra_parser/src/grammar/type_args.rs
+++ b/crates/ra_parser/src/grammar/type_args.rs
@@ -26,7 +26,7 @@ pub(super) fn opt_type_arg_list(p: &mut Parser, colon_colon_required: bool) {
 }
 // test type_arg
-// type A = B<'static, i32, Item=u64>;
+// type A = B<'static, i32, 1, { 2 }, Item=u64>;
 fn type_arg(p: &mut Parser) {
    let m = p.start();
    match p.current() {
@@ -47,6 +47,14 @@ fn type_arg(p: &mut Parser) {
            types::type_(p);
            m.complete(p, ASSOC_TYPE_ARG);
        }
+        T!['{'] => {
+            expressions::block(p);
+            m.complete(p, CONST_ARG);
+        }
+        k if k.is_literal() => {
+            p.bump(k);
+            m.complete(p, CONST_ARG);
+        }
        _ => {
            types::type_(p);
            m.complete(p, TYPE_ARG);
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index af2945f57..4b301d67a 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -61,46 +61,46 @@ pub enum SyntaxKind {
    SHR,
    SHLEQ,
    SHREQ,
+    AS_KW,
    ASYNC_KW,
-    USE_KW,
+    AWAIT_KW,
-    FN_KW,
+    BOX_KW,
-    STRUCT_KW,
+    BREAK_KW,
-    ENUM_KW,
+    CONST_KW,
-    TRAIT_KW,
+    CONTINUE_KW,
-    IMPL_KW,
+    CRATE_KW,
    DYN_KW,
-    TRUE_KW,
+    ELSE_KW,
-    FALSE_KW,
+    ENUM_KW,
-    AS_KW,
    EXTERN_KW,
-    CRATE_KW,
+    FALSE_KW,
-    MOD_KW,
+    FN_KW,
-    PUB_KW,
-    SELF_KW,
-    SUPER_KW,
-    IN_KW,
-    WHERE_KW,
    FOR_KW,
-    LOOP_KW,
-    WHILE_KW,
-    CONTINUE_KW,
-    BREAK_KW,
    IF_KW,
-    ELSE_KW,
+    IMPL_KW,
+    IN_KW,
+    LET_KW,
+    LOOP_KW,
+    MACRO_KW,
    MATCH_KW,
-    CONST_KW,
+    MOD_KW,
-    STATIC_KW,
+    MOVE_KW,
    MUT_KW,
-    UNSAFE_KW,
+    PUB_KW,
-    TYPE_KW,
    REF_KW,
-    LET_KW,
-    MOVE_KW,
    RETURN_KW,
+    SELF_KW,
+    STATIC_KW,
+    STRUCT_KW,
+    SUPER_KW,
+    TRAIT_KW,
+    TRUE_KW,
    TRY_KW,
-    BOX_KW,
+    TYPE_KW,
-    AWAIT_KW,
+    UNSAFE_KW,
-    MACRO_KW,
+    USE_KW,
+    WHERE_KW,
+    WHILE_KW,
    AUTO_KW,
    DEFAULT_KW,
    EXISTENTIAL_KW,
@@ -234,6 +234,7 @@ pub enum SyntaxKind {
    LIFETIME_ARG,
    TYPE_ARG,
    ASSOC_TYPE_ARG,
+    CONST_ARG,
    PARAM_LIST,
    PARAM,
    SELF_PARAM,
@@ -249,12 +250,12 @@ use self::SyntaxKind::*;
 impl SyntaxKind {
    pub fn is_keyword(self) -> bool {
        match self {
-            ASYNC_KW | USE_KW | FN_KW | STRUCT_KW | ENUM_KW | TRAIT_KW | IMPL_KW | DYN_KW
+            AS_KW | ASYNC_KW | AWAIT_KW | BOX_KW | BREAK_KW | CONST_KW | CONTINUE_KW | CRATE_KW
-            | TRUE_KW | FALSE_KW | AS_KW | EXTERN_KW | CRATE_KW | MOD_KW | PUB_KW | SELF_KW
+            | DYN_KW | ELSE_KW | ENUM_KW | EXTERN_KW | FALSE_KW | FN_KW | FOR_KW | IF_KW
-            | SUPER_KW | IN_KW | WHERE_KW | FOR_KW | LOOP_KW | WHILE_KW | CONTINUE_KW
+            | IMPL_KW | IN_KW | LET_KW | LOOP_KW | MACRO_KW | MATCH_KW | MOD_KW | MOVE_KW
-            | BREAK_KW | IF_KW | ELSE_KW | MATCH_KW | CONST_KW | STATIC_KW | MUT_KW | UNSAFE_KW
+            | MUT_KW | PUB_KW | REF_KW | RETURN_KW | SELF_KW | STATIC_KW | STRUCT_KW | SUPER_KW
-            | TYPE_KW | REF_KW | LET_KW | MOVE_KW | RETURN_KW | TRY_KW | BOX_KW | AWAIT_KW
+            | TRAIT_KW | TRUE_KW | TRY_KW | TYPE_KW | UNSAFE_KW | USE_KW | WHERE_KW | WHILE_KW
-            | MACRO_KW | AUTO_KW | DEFAULT_KW | EXISTENTIAL_KW | UNION_KW => true,
+            | AUTO_KW | DEFAULT_KW | EXISTENTIAL_KW | UNION_KW => true,
            _ => false,
        }
    }
@@ -278,46 +279,46 @@ impl SyntaxKind {
    }
    pub fn from_keyword(ident: &str) -> Option<SyntaxKind> {
        let kw = match ident {
+            "as" => AS_KW,
            "async" => ASYNC_KW,
-            "use" => USE_KW,
+            "await" => AWAIT_KW,
-            "fn" => FN_KW,
+            "box" => BOX_KW,
-            "struct" => STRUCT_KW,
+            "break" => BREAK_KW,
-            "enum" => ENUM_KW,
+            "const" => CONST_KW,
-            "trait" => TRAIT_KW,
+            "continue" => CONTINUE_KW,
-            "impl" => IMPL_KW,
+            "crate" => CRATE_KW,
            "dyn" => DYN_KW,
-            "true" => TRUE_KW,
+            "else" => ELSE_KW,
-            "false" => FALSE_KW,
+            "enum" => ENUM_KW,
-            "as" => AS_KW,
            "extern" => EXTERN_KW,
-            "crate" => CRATE_KW,
+            "false" => FALSE_KW,
-            "mod" => MOD_KW,
+            "fn" => FN_KW,
-            "pub" => PUB_KW,
-            "self" => SELF_KW,
-            "super" => SUPER_KW,
-            "in" => IN_KW,
-            "where" => WHERE_KW,
            "for" => FOR_KW,
-            "loop" => LOOP_KW,
-            "while" => WHILE_KW,
-            "continue" => CONTINUE_KW,
-            "break" => BREAK_KW,
            "if" => IF_KW,
-            "else" => ELSE_KW,
+            "impl" => IMPL_KW,
+            "in" => IN_KW,
+            "let" => LET_KW,
+            "loop" => LOOP_KW,
+            "macro" => MACRO_KW,
            "match" => MATCH_KW,
-            "const" => CONST_KW,
+            "mod" => MOD_KW,
-            "static" => STATIC_KW,
+            "move" => MOVE_KW,
            "mut" => MUT_KW,
-            "unsafe" => UNSAFE_KW,
+            "pub" => PUB_KW,
-            "type" => TYPE_KW,
            "ref" => REF_KW,
-            "let" => LET_KW,
-            "move" => MOVE_KW,
            "return" => RETURN_KW,
+            "self" => SELF_KW,
+            "static" => STATIC_KW,
+            "struct" => STRUCT_KW,
+            "super" => SUPER_KW,
+            "trait" => TRAIT_KW,
+            "true" => TRUE_KW,
            "try" => TRY_KW,
-            "box" => BOX_KW,
+            "type" => TYPE_KW,
-            "await" => AWAIT_KW,
+            "unsafe" => UNSAFE_KW,
-            "macro" => MACRO_KW,
+            "use" => USE_KW,
+            "where" => WHERE_KW,
+            "while" => WHILE_KW,
            _ => return None,
        };
        Some(kw)
@@ -515,125 +516,125 @@ macro_rules! T {
    ( >>= ) => {
        $crate::SyntaxKind::SHREQ
    };
+    ( as ) => {
+        $crate::SyntaxKind::AS_KW
+    };
    ( async ) => {
        $crate::SyntaxKind::ASYNC_KW
    };
-    ( use ) => {
+    ( await ) => {
-        $crate::SyntaxKind::USE_KW
+        $crate::SyntaxKind::AWAIT_KW
    };
-    ( fn ) => {
+    ( box ) => {
-        $crate::SyntaxKind::FN_KW
+        $crate::SyntaxKind::BOX_KW
    };
-    ( struct ) => {
+    ( break ) => {
-        $crate::SyntaxKind::STRUCT_KW
+        $crate::SyntaxKind::BREAK_KW
    };
-    ( enum ) => {
+    ( const ) => {
-        $crate::SyntaxKind::ENUM_KW
+        $crate::SyntaxKind::CONST_KW
    };
-    ( trait ) => {
+    ( continue ) => {
-        $crate::SyntaxKind::TRAIT_KW
+        $crate::SyntaxKind::CONTINUE_KW
    };
-    ( impl ) => {
+    ( crate ) => {
-        $crate::SyntaxKind::IMPL_KW
+        $crate::SyntaxKind::CRATE_KW
    };
    ( dyn ) => {
        $crate::SyntaxKind::DYN_KW
    };
-    ( true ) => {
+    ( else ) => {
-        $crate::SyntaxKind::TRUE_KW
+        $crate::SyntaxKind::ELSE_KW
-    };
-    ( false ) => {
-        $crate::SyntaxKind::FALSE_KW
    };
-    ( as ) => {
+    ( enum ) => {
-        $crate::SyntaxKind::AS_KW
+        $crate::SyntaxKind::ENUM_KW
    };
    ( extern ) => {
        $crate::SyntaxKind::EXTERN_KW
    };
-    ( crate ) => {
+    ( false ) => {
-        $crate::SyntaxKind::CRATE_KW
+        $crate::SyntaxKind::FALSE_KW
    };
-    ( mod ) => {
+    ( fn ) => {
-        $crate::SyntaxKind::MOD_KW
+        $crate::SyntaxKind::FN_KW
    };
-    ( pub ) => {
+    ( for ) => {
-        $crate::SyntaxKind::PUB_KW
+        $crate::SyntaxKind::FOR_KW
    };
-    ( self ) => {
+    ( if ) => {
-        $crate::SyntaxKind::SELF_KW
+        $crate::SyntaxKind::IF_KW
    };
-    ( super ) => {
+    ( impl ) => {
-        $crate::SyntaxKind::SUPER_KW
+        $crate::SyntaxKind::IMPL_KW
    };
    ( in ) => {
        $crate::SyntaxKind::IN_KW
    };
-    ( where ) => {
+    ( let ) => {
-        $crate::SyntaxKind::WHERE_KW
+        $crate::SyntaxKind::LET_KW
-    };
-    ( for ) => {
-        $crate::SyntaxKind::FOR_KW
    };
    ( loop ) => {
        $crate::SyntaxKind::LOOP_KW
    };
-    ( while ) => {
+    ( macro ) => {
-        $crate::SyntaxKind::WHILE_KW
+        $crate::SyntaxKind::MACRO_KW
-    };
-    ( continue ) => {
-        $crate::SyntaxKind::CONTINUE_KW
-    };
-    ( break ) => {
-        $crate::SyntaxKind::BREAK_KW
-    };
-    ( if ) => {
-        $crate::SyntaxKind::IF_KW
-    };
-    ( else ) => {
-        $crate::SyntaxKind::ELSE_KW
    };
    ( match ) => {
        $crate::SyntaxKind::MATCH_KW
    };
-    ( const ) => {
+    ( mod ) => {
-        $crate::SyntaxKind::CONST_KW
+        $crate::SyntaxKind::MOD_KW
    };
-    ( static ) => {
+    ( move ) => {
-        $crate::SyntaxKind::STATIC_KW
+        $crate::SyntaxKind::MOVE_KW
    };
    ( mut ) => {
        $crate::SyntaxKind::MUT_KW
    };
-    ( unsafe ) => {
+    ( pub ) => {
-        $crate::SyntaxKind::UNSAFE_KW
+        $crate::SyntaxKind::PUB_KW
-    };
-    ( type ) => {
-        $crate::SyntaxKind::TYPE_KW
    };
    ( ref ) => {
        $crate::SyntaxKind::REF_KW
    };
-    ( let ) => {
-        $crate::SyntaxKind::LET_KW
-    };
-    ( move ) => {
-        $crate::SyntaxKind::MOVE_KW
-    };
    ( return ) => {
        $crate::SyntaxKind::RETURN_KW
    };
+    ( self ) => {
+        $crate::SyntaxKind::SELF_KW
+    };
+    ( static ) => {
+        $crate::SyntaxKind::STATIC_KW
+    };
+    ( struct ) => {
+        $crate::SyntaxKind::STRUCT_KW
+    };
+    ( super ) => {
+        $crate::SyntaxKind::SUPER_KW
+    };
+    ( trait ) => {
+        $crate::SyntaxKind::TRAIT_KW
+    };
+    ( true ) => {
+        $crate::SyntaxKind::TRUE_KW
+    };
    ( try ) => {
        $crate::SyntaxKind::TRY_KW
    };
-    ( box ) => {
+    ( type ) => {
-        $crate::SyntaxKind::BOX_KW
+        $crate::SyntaxKind::TYPE_KW
    };
-    ( await ) => {
+    ( unsafe ) => {
-        $crate::SyntaxKind::AWAIT_KW
+        $crate::SyntaxKind::UNSAFE_KW
    };
-    ( macro ) => {
+    ( use ) => {
-        $crate::SyntaxKind::MACRO_KW
+        $crate::SyntaxKind::USE_KW
+    };
+    ( where ) => {
+        $crate::SyntaxKind::WHERE_KW
+    };
+    ( while ) => {
+        $crate::SyntaxKind::WHILE_KW
    };
    ( auto ) => {
        $crate::SyntaxKind::AUTO_KW
diff --git a/crates/ra_prof/src/lib.rs b/crates/ra_prof/src/lib.rs
index f260c40a3..6dde304b1 100644
--- a/crates/ra_prof/src/lib.rs
+++ b/crates/ra_prof/src/lib.rs
@@ -197,7 +197,10 @@ impl Drop for Profiler {
                    if level == 0 {
                        let stdout = stderr();
                        let longer_than = stack.filter_data.longer_than;
-                        if duration >= longer_than {
+                        // Convert to millis for comparison to avoid problems with rounding
+                        // (otherwise we could print `0ms` despite user's `>0` filter when
+                        // `duration` is just a few nanos).
+                        if duration.as_millis() > longer_than.as_millis() {
                            print(0, &stack.messages, &mut stdout.lock(), longer_than, None);
                        }
                        stack.messages.clear();
@@ -226,7 +229,7 @@ fn print(
            continue;
        }
        accounted_for += duration;
-        if duration >= longer_than {
+        if duration.as_millis() > longer_than.as_millis() {
            writeln!(out, "{}{:5}ms - {}", indent, duration.as_millis(), msg)
                .expect("printing profiling info to stdout");
@@ -251,8 +254,9 @@ fn print(
    if let Some(total) = total {
        if let Some(unaccounted) = total.checked_sub(accounted_for) {
-            if unaccounted >= longer_than && last > 0 {
+            let unaccounted_millis = unaccounted.as_millis();
-                writeln!(out, "{}{:5}ms - ???", indent, unaccounted.as_millis())
+            if unaccounted_millis > longer_than.as_millis() && unaccounted_millis > 0 && last > 0 {
+                writeln!(out, "{}{:5}ms - ???", indent, unaccounted_millis)
                    .expect("printing profiling info to stdout");
            }
        }
@@ -356,4 +360,21 @@ mod tests {
    fn profiling_function2() {
        let _p = profile("profile2");
    }
+    #[test]
+    fn test_longer_than() {
+        let mut result = vec![];
+        let msgs = vec![
+            Message { level: 1, duration: Duration::from_nanos(3), message: "bar".to_owned() },
+            Message { level: 1, duration: Duration::from_nanos(2), message: "bar".to_owned() },
+            Message { level: 0, duration: Duration::from_millis(1), message: "foo".to_owned() },
+        ];
+        print(0, &msgs, &mut result, Duration::from_millis(0), Some(Duration::from_millis(1)));
+        // The calls to `bar` are so short that they'll be rounded to 0ms and should get collapsed
+        // when printing.
+        assert_eq!(
+            std::str::from_utf8(&result).unwrap(),
+            "    1ms - foo\n        0ms - bar (2 calls)\n"
+        );
+    }
 }
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index 10ca391b6..34d066b1e 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -53,9 +53,10 @@ impl Sysroot {
        if !src.exists() {
            Err(format!(
                "can't load standard library from sysroot\n\
-                 {:?}\n\
+                 {}\n\
+                 (discovered via `rustc --print sysroot`)\n\
                 try running `rustup component add rust-src` or set `RUST_SRC_PATH`",
-                src,
+                src.display(),
            ))?;
        }
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index 2fd039837..23b6aa901 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_extensions.rs
@@ -126,6 +126,24 @@ pub enum BinOp {
    BitXorAssign,
 }
+impl BinOp {
+    pub fn is_assignment(&self) -> bool {
+        match *self {
+            BinOp::Assignment
+            | BinOp::AddAssign
+            | BinOp::DivAssign
+            | BinOp::MulAssign
+            | BinOp::RemAssign
+            | BinOp::ShrAssign
+            | BinOp::ShlAssign
+            | BinOp::SubAssign
+            | BinOp::BitOrAssign
+            | BinOp::BitAndAssign
+            | BinOp::BitXorAssign => true,
+            _ => false,
+        }
+    }
+}
 impl ast::BinExpr {
    pub fn op_details(&self) -> Option<(SyntaxToken, BinOp)> {
        self.syntax().children_with_tokens().filter_map(|it| it.into_token()).find_map(|c| {
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs
index e64c83d33..33d5578e7 100644
--- a/crates/ra_syntax/src/ast/generated.rs
+++ b/crates/ra_syntax/src/ast/generated.rs
@@ -6,13 +6,13 @@ use crate::{
    SyntaxNode,
 };
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Alias {
+pub struct SourceFile {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Alias {
+impl AstNode for SourceFile {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ALIAS => true,
+            SOURCE_FILE => true,
            _ => false,
        }
    }
@@ -27,16 +27,21 @@ impl AstNode for Alias {
        &self.syntax
    }
 }
-impl ast::NameOwner for Alias {}
+impl ast::ModuleItemOwner for SourceFile {}
-impl Alias {}
+impl ast::FnDefOwner for SourceFile {}
+impl SourceFile {
+    pub fn modules(&self) -> AstChildren<Module> {
+        AstChildren::new(&self.syntax)
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ArgList {
+pub struct FnDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ArgList {
+impl AstNode for FnDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ARG_LIST => true,
+            FN_DEF => true,
            _ => false,
        }
    }
@@ -51,19 +56,30 @@ impl AstNode for ArgList {
        &self.syntax
    }
 }
-impl ArgList {
+impl ast::VisibilityOwner for FnDef {}
-    pub fn args(&self) -> AstChildren<Expr> {
+impl ast::NameOwner for FnDef {}
-        AstChildren::new(&self.syntax)
+impl ast::TypeParamsOwner for FnDef {}
+impl ast::DocCommentsOwner for FnDef {}
+impl ast::AttrsOwner for FnDef {}
+impl FnDef {
+    pub fn param_list(&self) -> Option<ParamList> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn ret_type(&self) -> Option<RetType> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn body(&self) -> Option<BlockExpr> {
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ArrayExpr {
+pub struct RetType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ArrayExpr {
+impl AstNode for RetType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ARRAY_EXPR => true,
+            RET_TYPE => true,
            _ => false,
        }
    }
@@ -78,19 +94,19 @@ impl AstNode for ArrayExpr {
        &self.syntax
    }
 }
-impl ArrayExpr {
+impl RetType {
-    pub fn exprs(&self) -> AstChildren<Expr> {
+    pub fn type_ref(&self) -> Option<TypeRef> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ArrayType {
+pub struct StructDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ArrayType {
+impl AstNode for StructDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ARRAY_TYPE => true,
+            STRUCT_DEF => true,
            _ => false,
        }
    }
@@ -105,22 +121,20 @@ impl AstNode for ArrayType {
        &self.syntax
    }
 }
-impl ArrayType {
+impl ast::VisibilityOwner for StructDef {}
-    pub fn type_ref(&self) -> Option<TypeRef> {
+impl ast::NameOwner for StructDef {}
-        AstChildren::new(&self.syntax).next()
+impl ast::TypeParamsOwner for StructDef {}
-    }
+impl ast::AttrsOwner for StructDef {}
-    pub fn expr(&self) -> Option<Expr> {
+impl ast::DocCommentsOwner for StructDef {}
-        AstChildren::new(&self.syntax).next()
+impl StructDef {}
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct AssocTypeArg {
+pub struct UnionDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for AssocTypeArg {
+impl AstNode for UnionDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ASSOC_TYPE_ARG => true,
+            UNION_DEF => true,
            _ => false,
        }
    }
@@ -135,22 +149,24 @@ impl AstNode for AssocTypeArg {
        &self.syntax
    }
 }
-impl AssocTypeArg {
+impl ast::VisibilityOwner for UnionDef {}
-    pub fn name_ref(&self) -> Option<NameRef> {
+impl ast::NameOwner for UnionDef {}
-        AstChildren::new(&self.syntax).next()
+impl ast::TypeParamsOwner for UnionDef {}
-    }
+impl ast::AttrsOwner for UnionDef {}
-    pub fn type_ref(&self) -> Option<TypeRef> {
+impl ast::DocCommentsOwner for UnionDef {}
+impl UnionDef {
+    pub fn record_field_def_list(&self) -> Option<RecordFieldDefList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Attr {
+pub struct RecordFieldDefList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Attr {
+impl AstNode for RecordFieldDefList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ATTR => true,
+            RECORD_FIELD_DEF_LIST => true,
            _ => false,
        }
    }
@@ -165,60 +181,47 @@ impl AstNode for Attr {
        &self.syntax
    }
 }
-impl Attr {
+impl RecordFieldDefList {
-    pub fn path(&self) -> Option<Path> {
+    pub fn fields(&self) -> AstChildren<RecordFieldDef> {
-        AstChildren::new(&self.syntax).next()
+        AstChildren::new(&self.syntax)
-    }
-    pub fn input(&self) -> Option<AttrInput> {
-        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum AttrInput {
+pub struct RecordFieldDef {
-    Literal(Literal),
+    pub(crate) syntax: SyntaxNode,
-    TokenTree(TokenTree),
-}
-impl From<Literal> for AttrInput {
-    fn from(node: Literal) -> AttrInput {
-        AttrInput::Literal(node)
-    }
-}
-impl From<TokenTree> for AttrInput {
-    fn from(node: TokenTree) -> AttrInput {
-        AttrInput::TokenTree(node)
-    }
 }
-impl AstNode for AttrInput {
+impl AstNode for RecordFieldDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LITERAL | TOKEN_TREE => true,
+            RECORD_FIELD_DEF => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
+        if Self::can_cast(syntax.kind()) {
-            LITERAL => AttrInput::Literal(Literal { syntax }),
+            Some(Self { syntax })
-            TOKEN_TREE => AttrInput::TokenTree(TokenTree { syntax }),
+        } else {
-            _ => return None,
+            None
-        };
+        }
-        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        match self {
+        &self.syntax
-            AttrInput::Literal(it) => &it.syntax,
-            AttrInput::TokenTree(it) => &it.syntax,
-        }
    }
 }
-impl AttrInput {}
+impl ast::VisibilityOwner for RecordFieldDef {}
+impl ast::NameOwner for RecordFieldDef {}
+impl ast::AttrsOwner for RecordFieldDef {}
+impl ast::DocCommentsOwner for RecordFieldDef {}
+impl ast::TypeAscriptionOwner for RecordFieldDef {}
+impl RecordFieldDef {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct AwaitExpr {
+pub struct TupleFieldDefList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for AwaitExpr {
+impl AstNode for TupleFieldDefList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            AWAIT_EXPR => true,
+            TUPLE_FIELD_DEF_LIST => true,
            _ => false,
        }
    }
@@ -233,19 +236,19 @@ impl AstNode for AwaitExpr {
        &self.syntax
    }
 }
-impl AwaitExpr {
+impl TupleFieldDefList {
-    pub fn expr(&self) -> Option<Expr> {
+    pub fn fields(&self) -> AstChildren<TupleFieldDef> {
-        AstChildren::new(&self.syntax).next()
+        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BinExpr {
+pub struct TupleFieldDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for BinExpr {
+impl AstNode for TupleFieldDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            BIN_EXPR => true,
+            TUPLE_FIELD_DEF => true,
            _ => false,
        }
    }
@@ -260,15 +263,21 @@ impl AstNode for BinExpr {
        &self.syntax
    }
 }
-impl BinExpr {}
+impl ast::VisibilityOwner for TupleFieldDef {}
+impl ast::AttrsOwner for TupleFieldDef {}
+impl TupleFieldDef {
+    pub fn type_ref(&self) -> Option<TypeRef> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BindPat {
+pub struct EnumDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for BindPat {
+impl AstNode for EnumDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            BIND_PAT => true,
+            ENUM_DEF => true,
            _ => false,
        }
    }
@@ -283,20 +292,24 @@ impl AstNode for BindPat {
        &self.syntax
    }
 }
-impl ast::NameOwner for BindPat {}
+impl ast::VisibilityOwner for EnumDef {}
-impl BindPat {
+impl ast::NameOwner for EnumDef {}
-    pub fn pat(&self) -> Option<Pat> {
+impl ast::TypeParamsOwner for EnumDef {}
+impl ast::AttrsOwner for EnumDef {}
+impl ast::DocCommentsOwner for EnumDef {}
+impl EnumDef {
+    pub fn variant_list(&self) -> Option<EnumVariantList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Block {
+pub struct EnumVariantList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Block {
+impl AstNode for EnumVariantList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            BLOCK => true,
+            ENUM_VARIANT_LIST => true,
            _ => false,
        }
    }
@@ -311,24 +324,19 @@ impl AstNode for Block {
        &self.syntax
    }
 }
-impl ast::AttrsOwner for Block {}
+impl EnumVariantList {
-impl ast::ModuleItemOwner for Block {}
+    pub fn variants(&self) -> AstChildren<EnumVariant> {
-impl Block {
-    pub fn statements(&self) -> AstChildren<Stmt> {
        AstChildren::new(&self.syntax)
    }
-    pub fn expr(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax).next()
-    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BlockExpr {
+pub struct EnumVariant {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for BlockExpr {
+impl AstNode for EnumVariant {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            BLOCK_EXPR => true,
+            ENUM_VARIANT => true,
            _ => false,
        }
    }
@@ -343,19 +351,22 @@ impl AstNode for BlockExpr {
        &self.syntax
    }
 }
-impl BlockExpr {
+impl ast::NameOwner for EnumVariant {}
-    pub fn block(&self) -> Option<Block> {
+impl ast::DocCommentsOwner for EnumVariant {}
+impl ast::AttrsOwner for EnumVariant {}
+impl EnumVariant {
+    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BoxExpr {
+pub struct TraitDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for BoxExpr {
+impl AstNode for TraitDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            BOX_EXPR => true,
+            TRAIT_DEF => true,
            _ => false,
        }
    }
@@ -370,19 +381,25 @@ impl AstNode for BoxExpr {
        &self.syntax
    }
 }
-impl BoxExpr {
+impl ast::VisibilityOwner for TraitDef {}
-    pub fn expr(&self) -> Option<Expr> {
+impl ast::NameOwner for TraitDef {}
+impl ast::AttrsOwner for TraitDef {}
+impl ast::DocCommentsOwner for TraitDef {}
+impl ast::TypeParamsOwner for TraitDef {}
+impl ast::TypeBoundsOwner for TraitDef {}
+impl TraitDef {
+    pub fn item_list(&self) -> Option<ItemList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BoxPat {
+pub struct Module {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for BoxPat {
+impl AstNode for Module {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            BOX_PAT => true,
+            MODULE => true,
            _ => false,
        }
    }
@@ -397,19 +414,23 @@ impl AstNode for BoxPat {
        &self.syntax
    }
 }
-impl BoxPat {
+impl ast::VisibilityOwner for Module {}
-    pub fn pat(&self) -> Option<Pat> {
+impl ast::NameOwner for Module {}
+impl ast::AttrsOwner for Module {}
+impl ast::DocCommentsOwner for Module {}
+impl Module {
+    pub fn item_list(&self) -> Option<ItemList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BreakExpr {
+pub struct ItemList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for BreakExpr {
+impl AstNode for ItemList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            BREAK_EXPR => true,
+            ITEM_LIST => true,
            _ => false,
        }
    }
@@ -424,19 +445,21 @@ impl AstNode for BreakExpr {
        &self.syntax
    }
 }
-impl BreakExpr {
+impl ast::FnDefOwner for ItemList {}
-    pub fn expr(&self) -> Option<Expr> {
+impl ast::ModuleItemOwner for ItemList {}
-        AstChildren::new(&self.syntax).next()
+impl ItemList {
+    pub fn impl_items(&self) -> AstChildren<ImplItem> {
+        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct CallExpr {
+pub struct ConstDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for CallExpr {
+impl AstNode for ConstDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            CALL_EXPR => true,
+            CONST_DEF => true,
            _ => false,
        }
    }
@@ -451,20 +474,25 @@ impl AstNode for CallExpr {
        &self.syntax
    }
 }
-impl ast::ArgListOwner for CallExpr {}
+impl ast::VisibilityOwner for ConstDef {}
-impl CallExpr {
+impl ast::NameOwner for ConstDef {}
-    pub fn expr(&self) -> Option<Expr> {
+impl ast::TypeParamsOwner for ConstDef {}
+impl ast::AttrsOwner for ConstDef {}
+impl ast::DocCommentsOwner for ConstDef {}
+impl ast::TypeAscriptionOwner for ConstDef {}
+impl ConstDef {
+    pub fn body(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct CastExpr {
+pub struct StaticDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for CastExpr {
+impl AstNode for StaticDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            CAST_EXPR => true,
+            STATIC_DEF => true,
            _ => false,
        }
    }
@@ -479,22 +507,25 @@ impl AstNode for CastExpr {
        &self.syntax
    }
 }
-impl CastExpr {
+impl ast::VisibilityOwner for StaticDef {}
-    pub fn expr(&self) -> Option<Expr> {
+impl ast::NameOwner for StaticDef {}
-        AstChildren::new(&self.syntax).next()
+impl ast::TypeParamsOwner for StaticDef {}
-    }
+impl ast::AttrsOwner for StaticDef {}
-    pub fn type_ref(&self) -> Option<TypeRef> {
+impl ast::DocCommentsOwner for StaticDef {}
+impl ast::TypeAscriptionOwner for StaticDef {}
+impl StaticDef {
+    pub fn body(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Condition {
+pub struct TypeAliasDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Condition {
+impl AstNode for TypeAliasDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            CONDITION => true,
+            TYPE_ALIAS_DEF => true,
            _ => false,
        }
    }
@@ -509,22 +540,25 @@ impl AstNode for Condition {
        &self.syntax
    }
 }
-impl Condition {
+impl ast::VisibilityOwner for TypeAliasDef {}
-    pub fn pat(&self) -> Option<Pat> {
+impl ast::NameOwner for TypeAliasDef {}
-        AstChildren::new(&self.syntax).next()
+impl ast::TypeParamsOwner for TypeAliasDef {}
-    }
+impl ast::AttrsOwner for TypeAliasDef {}
-    pub fn expr(&self) -> Option<Expr> {
+impl ast::DocCommentsOwner for TypeAliasDef {}
+impl ast::TypeBoundsOwner for TypeAliasDef {}
+impl TypeAliasDef {
+    pub fn type_ref(&self) -> Option<TypeRef> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ConstDef {
+pub struct ImplBlock {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ConstDef {
+impl AstNode for ImplBlock {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            CONST_DEF => true,
+            IMPL_BLOCK => true,
            _ => false,
        }
    }
@@ -539,25 +573,21 @@ impl AstNode for ConstDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for ConstDef {}
+impl ast::TypeParamsOwner for ImplBlock {}
-impl ast::NameOwner for ConstDef {}
+impl ast::AttrsOwner for ImplBlock {}
-impl ast::TypeParamsOwner for ConstDef {}
+impl ImplBlock {
-impl ast::AttrsOwner for ConstDef {}
+    pub fn item_list(&self) -> Option<ItemList> {
-impl ast::DocCommentsOwner for ConstDef {}
-impl ast::TypeAscriptionOwner for ConstDef {}
-impl ConstDef {
-    pub fn body(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ConstParam {
+pub struct ParenType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ConstParam {
+impl AstNode for ParenType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            CONST_PARAM => true,
+            PAREN_TYPE => true,
            _ => false,
        }
    }
@@ -572,22 +602,19 @@ impl AstNode for ConstParam {
        &self.syntax
    }
 }
-impl ast::NameOwner for ConstParam {}
+impl ParenType {
-impl ast::AttrsOwner for ConstParam {}
+    pub fn type_ref(&self) -> Option<TypeRef> {
-impl ast::TypeAscriptionOwner for ConstParam {}
-impl ConstParam {
-    pub fn default_val(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ContinueExpr {
+pub struct TupleType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ContinueExpr {
+impl AstNode for TupleType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            CONTINUE_EXPR => true,
+            TUPLE_TYPE => true,
            _ => false,
        }
    }
@@ -602,15 +629,19 @@ impl AstNode for ContinueExpr {
        &self.syntax
    }
 }
-impl ContinueExpr {}
+impl TupleType {
+    pub fn fields(&self) -> AstChildren<TypeRef> {
+        AstChildren::new(&self.syntax)
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct DotDotPat {
+pub struct NeverType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for DotDotPat {
+impl AstNode for NeverType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            DOT_DOT_PAT => true,
+            NEVER_TYPE => true,
            _ => false,
        }
    }
@@ -625,15 +656,15 @@ impl AstNode for DotDotPat {
        &self.syntax
    }
 }
-impl DotDotPat {}
+impl NeverType {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct DynTraitType {
+pub struct PathType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for DynTraitType {
+impl AstNode for PathType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            DYN_TRAIT_TYPE => true,
+            PATH_TYPE => true,
            _ => false,
        }
    }
@@ -648,16 +679,19 @@ impl AstNode for DynTraitType {
        &self.syntax
    }
 }
-impl ast::TypeBoundsOwner for DynTraitType {}
+impl PathType {
-impl DynTraitType {}
+    pub fn path(&self) -> Option<Path> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumDef {
+pub struct PointerType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for EnumDef {
+impl AstNode for PointerType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ENUM_DEF => true,
+            POINTER_TYPE => true,
            _ => false,
        }
    }
@@ -672,24 +706,19 @@ impl AstNode for EnumDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for EnumDef {}
+impl PointerType {
-impl ast::NameOwner for EnumDef {}
+    pub fn type_ref(&self) -> Option<TypeRef> {
-impl ast::TypeParamsOwner for EnumDef {}
-impl ast::AttrsOwner for EnumDef {}
-impl ast::DocCommentsOwner for EnumDef {}
-impl EnumDef {
-    pub fn variant_list(&self) -> Option<EnumVariantList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumVariant {
+pub struct ArrayType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for EnumVariant {
+impl AstNode for ArrayType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ENUM_VARIANT => true,
+            ARRAY_TYPE => true,
            _ => false,
        }
    }
@@ -704,22 +733,22 @@ impl AstNode for EnumVariant {
        &self.syntax
    }
 }
-impl ast::NameOwner for EnumVariant {}
+impl ArrayType {
-impl ast::DocCommentsOwner for EnumVariant {}
+    pub fn type_ref(&self) -> Option<TypeRef> {
-impl ast::AttrsOwner for EnumVariant {}
+        AstChildren::new(&self.syntax).next()
-impl EnumVariant {
+    }
    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumVariantList {
+pub struct SliceType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for EnumVariantList {
+impl AstNode for SliceType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ENUM_VARIANT_LIST => true,
+            SLICE_TYPE => true,
            _ => false,
        }
    }
@@ -734,294 +763,46 @@ impl AstNode for EnumVariantList {
        &self.syntax
    }
 }
-impl EnumVariantList {
+impl SliceType {
-    pub fn variants(&self) -> AstChildren<EnumVariant> {
+    pub fn type_ref(&self) -> Option<TypeRef> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum Expr {
+pub struct ReferenceType {
-    TupleExpr(TupleExpr),
+    pub(crate) syntax: SyntaxNode,
-    ArrayExpr(ArrayExpr),
-    ParenExpr(ParenExpr),
-    PathExpr(PathExpr),
-    LambdaExpr(LambdaExpr),
-    IfExpr(IfExpr),
-    LoopExpr(LoopExpr),
-    ForExpr(ForExpr),
-    WhileExpr(WhileExpr),
-    ContinueExpr(ContinueExpr),
-    BreakExpr(BreakExpr),
-    Label(Label),
-    BlockExpr(BlockExpr),
-    ReturnExpr(ReturnExpr),
-    MatchExpr(MatchExpr),
-    RecordLit(RecordLit),
-    CallExpr(CallExpr),
-    IndexExpr(IndexExpr),
-    MethodCallExpr(MethodCallExpr),
-    FieldExpr(FieldExpr),
-    AwaitExpr(AwaitExpr),
-    TryExpr(TryExpr),
-    TryBlockExpr(TryBlockExpr),
-    CastExpr(CastExpr),
-    RefExpr(RefExpr),
-    PrefixExpr(PrefixExpr),
-    RangeExpr(RangeExpr),
-    BinExpr(BinExpr),
-    Literal(Literal),
-    MacroCall(MacroCall),
-    BoxExpr(BoxExpr),
-}
-impl From<TupleExpr> for Expr {
-    fn from(node: TupleExpr) -> Expr {
-        Expr::TupleExpr(node)
-    }
-}
-impl From<ArrayExpr> for Expr {
-    fn from(node: ArrayExpr) -> Expr {
-        Expr::ArrayExpr(node)
-    }
-}
-impl From<ParenExpr> for Expr {
-    fn from(node: ParenExpr) -> Expr {
-        Expr::ParenExpr(node)
-    }
-}
-impl From<PathExpr> for Expr {
-    fn from(node: PathExpr) -> Expr {
-        Expr::PathExpr(node)
-    }
-}
-impl From<LambdaExpr> for Expr {
-    fn from(node: LambdaExpr) -> Expr {
-        Expr::LambdaExpr(node)
-    }
-}
-impl From<IfExpr> for Expr {
-    fn from(node: IfExpr) -> Expr {
-        Expr::IfExpr(node)
-    }
-}
-impl From<LoopExpr> for Expr {
-    fn from(node: LoopExpr) -> Expr {
-        Expr::LoopExpr(node)
-    }
-}
-impl From<ForExpr> for Expr {
-    fn from(node: ForExpr) -> Expr {
-        Expr::ForExpr(node)
-    }
-}
-impl From<WhileExpr> for Expr {
-    fn from(node: WhileExpr) -> Expr {
-        Expr::WhileExpr(node)
-    }
-}
-impl From<ContinueExpr> for Expr {
-    fn from(node: ContinueExpr) -> Expr {
-        Expr::ContinueExpr(node)
-    }
-}
-impl From<BreakExpr> for Expr {
-    fn from(node: BreakExpr) -> Expr {
-        Expr::BreakExpr(node)
-    }
-}
-impl From<Label> for Expr {
-    fn from(node: Label) -> Expr {
-        Expr::Label(node)
-    }
-}
-impl From<BlockExpr> for Expr {
-    fn from(node: BlockExpr) -> Expr {
-        Expr::BlockExpr(node)
-    }
-}
-impl From<ReturnExpr> for Expr {
-    fn from(node: ReturnExpr) -> Expr {
-        Expr::ReturnExpr(node)
-    }
-}
-impl From<MatchExpr> for Expr {
-    fn from(node: MatchExpr) -> Expr {
-        Expr::MatchExpr(node)
-    }
-}
-impl From<RecordLit> for Expr {
-    fn from(node: RecordLit) -> Expr {
-        Expr::RecordLit(node)
-    }
-}
-impl From<CallExpr> for Expr {
-    fn from(node: CallExpr) -> Expr {
-        Expr::CallExpr(node)
-    }
-}
-impl From<IndexExpr> for Expr {
-    fn from(node: IndexExpr) -> Expr {
-        Expr::IndexExpr(node)
-    }
-}
-impl From<MethodCallExpr> for Expr {
-    fn from(node: MethodCallExpr) -> Expr {
-        Expr::MethodCallExpr(node)
-    }
-}
-impl From<FieldExpr> for Expr {
-    fn from(node: FieldExpr) -> Expr {
-        Expr::FieldExpr(node)
-    }
-}
-impl From<AwaitExpr> for Expr {
-    fn from(node: AwaitExpr) -> Expr {
-        Expr::AwaitExpr(node)
-    }
-}
-impl From<TryExpr> for Expr {
-    fn from(node: TryExpr) -> Expr {
-        Expr::TryExpr(node)
-    }
-}
-impl From<TryBlockExpr> for Expr {
-    fn from(node: TryBlockExpr) -> Expr {
-        Expr::TryBlockExpr(node)
-    }
-}
-impl From<CastExpr> for Expr {
-    fn from(node: CastExpr) -> Expr {
-        Expr::CastExpr(node)
-    }
-}
-impl From<RefExpr> for Expr {
-    fn from(node: RefExpr) -> Expr {
-        Expr::RefExpr(node)
-    }
-}
-impl From<PrefixExpr> for Expr {
-    fn from(node: PrefixExpr) -> Expr {
-        Expr::PrefixExpr(node)
-    }
-}
-impl From<RangeExpr> for Expr {
-    fn from(node: RangeExpr) -> Expr {
-        Expr::RangeExpr(node)
-    }
-}
-impl From<BinExpr> for Expr {
-    fn from(node: BinExpr) -> Expr {
-        Expr::BinExpr(node)
-    }
-}
-impl From<Literal> for Expr {
-    fn from(node: Literal) -> Expr {
-        Expr::Literal(node)
-    }
-}
-impl From<MacroCall> for Expr {
-    fn from(node: MacroCall) -> Expr {
-        Expr::MacroCall(node)
-    }
-}
-impl From<BoxExpr> for Expr {
-    fn from(node: BoxExpr) -> Expr {
-        Expr::BoxExpr(node)
-    }
 }
-impl AstNode for Expr {
+impl AstNode for ReferenceType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR
+            REFERENCE_TYPE => true,
-            | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL
-            | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR
-            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | TRY_BLOCK_EXPR
-            | CAST_EXPR | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL
-            | BOX_EXPR => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
+        if Self::can_cast(syntax.kind()) {
-            TUPLE_EXPR => Expr::TupleExpr(TupleExpr { syntax }),
+            Some(Self { syntax })
-            ARRAY_EXPR => Expr::ArrayExpr(ArrayExpr { syntax }),
+        } else {
-            PAREN_EXPR => Expr::ParenExpr(ParenExpr { syntax }),
+            None
-            PATH_EXPR => Expr::PathExpr(PathExpr { syntax }),
+        }
-            LAMBDA_EXPR => Expr::LambdaExpr(LambdaExpr { syntax }),
-            IF_EXPR => Expr::IfExpr(IfExpr { syntax }),
-            LOOP_EXPR => Expr::LoopExpr(LoopExpr { syntax }),
-            FOR_EXPR => Expr::ForExpr(ForExpr { syntax }),
-            WHILE_EXPR => Expr::WhileExpr(WhileExpr { syntax }),
-            CONTINUE_EXPR => Expr::ContinueExpr(ContinueExpr { syntax }),
-            BREAK_EXPR => Expr::BreakExpr(BreakExpr { syntax }),
-            LABEL => Expr::Label(Label { syntax }),
-            BLOCK_EXPR => Expr::BlockExpr(BlockExpr { syntax }),
-            RETURN_EXPR => Expr::ReturnExpr(ReturnExpr { syntax }),
-            MATCH_EXPR => Expr::MatchExpr(MatchExpr { syntax }),
-            RECORD_LIT => Expr::RecordLit(RecordLit { syntax }),
-            CALL_EXPR => Expr::CallExpr(CallExpr { syntax }),
-            INDEX_EXPR => Expr::IndexExpr(IndexExpr { syntax }),
-            METHOD_CALL_EXPR => Expr::MethodCallExpr(MethodCallExpr { syntax }),
-            FIELD_EXPR => Expr::FieldExpr(FieldExpr { syntax }),
-            AWAIT_EXPR => Expr::AwaitExpr(AwaitExpr { syntax }),
-            TRY_EXPR => Expr::TryExpr(TryExpr { syntax }),
-            TRY_BLOCK_EXPR => Expr::TryBlockExpr(TryBlockExpr { syntax }),
-            CAST_EXPR => Expr::CastExpr(CastExpr { syntax }),
-            REF_EXPR => Expr::RefExpr(RefExpr { syntax }),
-            PREFIX_EXPR => Expr::PrefixExpr(PrefixExpr { syntax }),
-            RANGE_EXPR => Expr::RangeExpr(RangeExpr { syntax }),
-            BIN_EXPR => Expr::BinExpr(BinExpr { syntax }),
-            LITERAL => Expr::Literal(Literal { syntax }),
-            MACRO_CALL => Expr::MacroCall(MacroCall { syntax }),
-            BOX_EXPR => Expr::BoxExpr(BoxExpr { syntax }),
-            _ => return None,
-        };
-        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        match self {
+        &self.syntax
-            Expr::TupleExpr(it) => &it.syntax,
+    }
-            Expr::ArrayExpr(it) => &it.syntax,
+}
-            Expr::ParenExpr(it) => &it.syntax,
+impl ReferenceType {
-            Expr::PathExpr(it) => &it.syntax,
+    pub fn type_ref(&self) -> Option<TypeRef> {
-            Expr::LambdaExpr(it) => &it.syntax,
+        AstChildren::new(&self.syntax).next()
-            Expr::IfExpr(it) => &it.syntax,
-            Expr::LoopExpr(it) => &it.syntax,
-            Expr::ForExpr(it) => &it.syntax,
-            Expr::WhileExpr(it) => &it.syntax,
-            Expr::ContinueExpr(it) => &it.syntax,
-            Expr::BreakExpr(it) => &it.syntax,
-            Expr::Label(it) => &it.syntax,
-            Expr::BlockExpr(it) => &it.syntax,
-            Expr::ReturnExpr(it) => &it.syntax,
-            Expr::MatchExpr(it) => &it.syntax,
-            Expr::RecordLit(it) => &it.syntax,
-            Expr::CallExpr(it) => &it.syntax,
-            Expr::IndexExpr(it) => &it.syntax,
-            Expr::MethodCallExpr(it) => &it.syntax,
-            Expr::FieldExpr(it) => &it.syntax,
-            Expr::AwaitExpr(it) => &it.syntax,
-            Expr::TryExpr(it) => &it.syntax,
-            Expr::TryBlockExpr(it) => &it.syntax,
-            Expr::CastExpr(it) => &it.syntax,
-            Expr::RefExpr(it) => &it.syntax,
-            Expr::PrefixExpr(it) => &it.syntax,
-            Expr::RangeExpr(it) => &it.syntax,
-            Expr::BinExpr(it) => &it.syntax,
-            Expr::Literal(it) => &it.syntax,
-            Expr::MacroCall(it) => &it.syntax,
-            Expr::BoxExpr(it) => &it.syntax,
-        }
    }
 }
-impl Expr {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ExprStmt {
+pub struct PlaceholderType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ExprStmt {
+impl AstNode for PlaceholderType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            EXPR_STMT => true,
+            PLACEHOLDER_TYPE => true,
            _ => false,
        }
    }
@@ -1036,19 +817,15 @@ impl AstNode for ExprStmt {
        &self.syntax
    }
 }
-impl ExprStmt {
+impl PlaceholderType {}
-    pub fn expr(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ExternCrateItem {
+pub struct FnPointerType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ExternCrateItem {
+impl AstNode for FnPointerType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            EXTERN_CRATE_ITEM => true,
+            FN_POINTER_TYPE => true,
            _ => false,
        }
    }
@@ -1063,24 +840,22 @@ impl AstNode for ExternCrateItem {
        &self.syntax
    }
 }
-impl ast::AttrsOwner for ExternCrateItem {}
+impl FnPointerType {
-impl ast::VisibilityOwner for ExternCrateItem {}
+    pub fn param_list(&self) -> Option<ParamList> {
-impl ExternCrateItem {
-    pub fn name_ref(&self) -> Option<NameRef> {
        AstChildren::new(&self.syntax).next()
    }
-    pub fn alias(&self) -> Option<Alias> {
+    pub fn ret_type(&self) -> Option<RetType> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FieldExpr {
+pub struct ForType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for FieldExpr {
+impl AstNode for ForType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            FIELD_EXPR => true,
+            FOR_TYPE => true,
            _ => false,
        }
    }
@@ -1095,22 +870,19 @@ impl AstNode for FieldExpr {
        &self.syntax
    }
 }
-impl FieldExpr {
+impl ForType {
-    pub fn expr(&self) -> Option<Expr> {
+    pub fn type_ref(&self) -> Option<TypeRef> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn name_ref(&self) -> Option<NameRef> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FnDef {
+pub struct ImplTraitType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for FnDef {
+impl AstNode for ImplTraitType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            FN_DEF => true,
+            IMPL_TRAIT_TYPE => true,
            _ => false,
        }
    }
@@ -1125,30 +897,16 @@ impl AstNode for FnDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for FnDef {}
+impl ast::TypeBoundsOwner for ImplTraitType {}
-impl ast::NameOwner for FnDef {}
+impl ImplTraitType {}
-impl ast::TypeParamsOwner for FnDef {}
-impl ast::AttrsOwner for FnDef {}
-impl ast::DocCommentsOwner for FnDef {}
-impl FnDef {
-    pub fn param_list(&self) -> Option<ParamList> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn body(&self) -> Option<BlockExpr> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn ret_type(&self) -> Option<RetType> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FnPointerType {
+pub struct DynTraitType {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for FnPointerType {
+impl AstNode for DynTraitType {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            FN_POINTER_TYPE => true,
+            DYN_TRAIT_TYPE => true,
            _ => false,
        }
    }
@@ -1163,22 +921,16 @@ impl AstNode for FnPointerType {
        &self.syntax
    }
 }
-impl FnPointerType {
+impl ast::TypeBoundsOwner for DynTraitType {}
-    pub fn param_list(&self) -> Option<ParamList> {
+impl DynTraitType {}
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn ret_type(&self) -> Option<RetType> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ForExpr {
+pub struct TupleExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ForExpr {
+impl AstNode for TupleExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            FOR_EXPR => true,
+            TUPLE_EXPR => true,
            _ => false,
        }
    }
@@ -1193,23 +945,19 @@ impl AstNode for ForExpr {
        &self.syntax
    }
 }
-impl ast::LoopBodyOwner for ForExpr {}
+impl TupleExpr {
-impl ForExpr {
+    pub fn exprs(&self) -> AstChildren<Expr> {
-    pub fn pat(&self) -> Option<Pat> {
+        AstChildren::new(&self.syntax)
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn iterable(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ForType {
+pub struct ArrayExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ForType {
+impl AstNode for ArrayExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            FOR_TYPE => true,
+            ARRAY_EXPR => true,
            _ => false,
        }
    }
@@ -1224,19 +972,19 @@ impl AstNode for ForType {
        &self.syntax
    }
 }
-impl ForType {
+impl ArrayExpr {
-    pub fn type_ref(&self) -> Option<TypeRef> {
+    pub fn exprs(&self) -> AstChildren<Expr> {
-        AstChildren::new(&self.syntax).next()
+        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct IfExpr {
+pub struct ParenExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for IfExpr {
+impl AstNode for ParenExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            IF_EXPR => true,
+            PAREN_EXPR => true,
            _ => false,
        }
    }
@@ -1251,19 +999,19 @@ impl AstNode for IfExpr {
        &self.syntax
    }
 }
-impl IfExpr {
+impl ParenExpr {
-    pub fn condition(&self) -> Option<Condition> {
+    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ImplBlock {
+pub struct PathExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ImplBlock {
+impl AstNode for PathExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            IMPL_BLOCK => true,
+            PATH_EXPR => true,
            _ => false,
        }
    }
@@ -1278,68 +1026,52 @@ impl AstNode for ImplBlock {
        &self.syntax
    }
 }
-impl ast::TypeParamsOwner for ImplBlock {}
+impl PathExpr {
-impl ast::AttrsOwner for ImplBlock {}
+    pub fn path(&self) -> Option<Path> {
-impl ImplBlock {
-    pub fn item_list(&self) -> Option<ItemList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ImplItem {
+pub struct LambdaExpr {
-    FnDef(FnDef),
+    pub(crate) syntax: SyntaxNode,
-    TypeAliasDef(TypeAliasDef),
-    ConstDef(ConstDef),
-}
-impl From<FnDef> for ImplItem {
-    fn from(node: FnDef) -> ImplItem {
-        ImplItem::FnDef(node)
-    }
-}
-impl From<TypeAliasDef> for ImplItem {
-    fn from(node: TypeAliasDef) -> ImplItem {
-        ImplItem::TypeAliasDef(node)
-    }
-}
-impl From<ConstDef> for ImplItem {
-    fn from(node: ConstDef) -> ImplItem {
-        ImplItem::ConstDef(node)
-    }
 }
-impl AstNode for ImplItem {
+impl AstNode for LambdaExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            FN_DEF | TYPE_ALIAS_DEF | CONST_DEF => true,
+            LAMBDA_EXPR => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
+        if Self::can_cast(syntax.kind()) {
-            FN_DEF => ImplItem::FnDef(FnDef { syntax }),
+            Some(Self { syntax })
-            TYPE_ALIAS_DEF => ImplItem::TypeAliasDef(TypeAliasDef { syntax }),
+        } else {
-            CONST_DEF => ImplItem::ConstDef(ConstDef { syntax }),
+            None
-            _ => return None,
+        }
-        };
-        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        match self {
+        &self.syntax
-            ImplItem::FnDef(it) => &it.syntax,
+    }
-            ImplItem::TypeAliasDef(it) => &it.syntax,
+}
-            ImplItem::ConstDef(it) => &it.syntax,
+impl LambdaExpr {
-        }
+    pub fn param_list(&self) -> Option<ParamList> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn ret_type(&self) -> Option<RetType> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn body(&self) -> Option<Expr> {
+        AstChildren::new(&self.syntax).next()
    }
 }
-impl ast::AttrsOwner for ImplItem {}
-impl ImplItem {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ImplTraitType {
+pub struct IfExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ImplTraitType {
+impl AstNode for IfExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            IMPL_TRAIT_TYPE => true,
+            IF_EXPR => true,
            _ => false,
        }
    }
@@ -1354,16 +1086,19 @@ impl AstNode for ImplTraitType {
        &self.syntax
    }
 }
-impl ast::TypeBoundsOwner for ImplTraitType {}
+impl IfExpr {
-impl ImplTraitType {}
+    pub fn condition(&self) -> Option<Condition> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct IndexExpr {
+pub struct LoopExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for IndexExpr {
+impl AstNode for LoopExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            INDEX_EXPR => true,
+            LOOP_EXPR => true,
            _ => false,
        }
    }
@@ -1378,15 +1113,16 @@ impl AstNode for IndexExpr {
        &self.syntax
    }
 }
-impl IndexExpr {}
+impl ast::LoopBodyOwner for LoopExpr {}
+impl LoopExpr {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ItemList {
+pub struct TryBlockExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ItemList {
+impl AstNode for TryBlockExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            ITEM_LIST => true,
+            TRY_BLOCK_EXPR => true,
            _ => false,
        }
    }
@@ -1401,21 +1137,19 @@ impl AstNode for ItemList {
        &self.syntax
    }
 }
-impl ast::FnDefOwner for ItemList {}
+impl TryBlockExpr {
-impl ast::ModuleItemOwner for ItemList {}
+    pub fn body(&self) -> Option<BlockExpr> {
-impl ItemList {
+        AstChildren::new(&self.syntax).next()
-    pub fn impl_items(&self) -> AstChildren<ImplItem> {
-        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Label {
+pub struct ForExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Label {
+impl AstNode for ForExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LABEL => true,
+            FOR_EXPR => true,
            _ => false,
        }
    }
@@ -1430,15 +1164,23 @@ impl AstNode for Label {
        &self.syntax
    }
 }
-impl Label {}
+impl ast::LoopBodyOwner for ForExpr {}
+impl ForExpr {
+    pub fn pat(&self) -> Option<Pat> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn iterable(&self) -> Option<Expr> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LambdaExpr {
+pub struct WhileExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for LambdaExpr {
+impl AstNode for WhileExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LAMBDA_EXPR => true,
+            WHILE_EXPR => true,
            _ => false,
        }
    }
@@ -1453,25 +1195,20 @@ impl AstNode for LambdaExpr {
        &self.syntax
    }
 }
-impl LambdaExpr {
+impl ast::LoopBodyOwner for WhileExpr {}
-    pub fn param_list(&self) -> Option<ParamList> {
+impl WhileExpr {
-        AstChildren::new(&self.syntax).next()
+    pub fn condition(&self) -> Option<Condition> {
-    }
-    pub fn ret_type(&self) -> Option<RetType> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn body(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LetStmt {
+pub struct ContinueExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for LetStmt {
+impl AstNode for ContinueExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LET_STMT => true,
+            CONTINUE_EXPR => true,
            _ => false,
        }
    }
@@ -1486,23 +1223,15 @@ impl AstNode for LetStmt {
        &self.syntax
    }
 }
-impl ast::TypeAscriptionOwner for LetStmt {}
+impl ContinueExpr {}
-impl LetStmt {
-    pub fn pat(&self) -> Option<Pat> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn initializer(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LifetimeArg {
+pub struct BreakExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for LifetimeArg {
+impl AstNode for BreakExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LIFETIME_ARG => true,
+            BREAK_EXPR => true,
            _ => false,
        }
    }
@@ -1517,15 +1246,19 @@ impl AstNode for LifetimeArg {
        &self.syntax
    }
 }
-impl LifetimeArg {}
+impl BreakExpr {
+    pub fn expr(&self) -> Option<Expr> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LifetimeParam {
+pub struct Label {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for LifetimeParam {
+impl AstNode for Label {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LIFETIME_PARAM => true,
+            LABEL => true,
            _ => false,
        }
    }
@@ -1540,16 +1273,15 @@ impl AstNode for LifetimeParam {
        &self.syntax
    }
 }
-impl ast::AttrsOwner for LifetimeParam {}
+impl Label {}
-impl LifetimeParam {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Literal {
+pub struct BlockExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Literal {
+impl AstNode for BlockExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LITERAL => true,
+            BLOCK_EXPR => true,
            _ => false,
        }
    }
@@ -1564,15 +1296,19 @@ impl AstNode for Literal {
        &self.syntax
    }
 }
-impl Literal {}
+impl BlockExpr {
+    pub fn block(&self) -> Option<Block> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LiteralPat {
+pub struct ReturnExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for LiteralPat {
+impl AstNode for ReturnExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LITERAL_PAT => true,
+            RETURN_EXPR => true,
            _ => false,
        }
    }
@@ -1587,19 +1323,19 @@ impl AstNode for LiteralPat {
        &self.syntax
    }
 }
-impl LiteralPat {
+impl ReturnExpr {
-    pub fn literal(&self) -> Option<Literal> {
+    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LoopExpr {
+pub struct CallExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for LoopExpr {
+impl AstNode for CallExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LOOP_EXPR => true,
+            CALL_EXPR => true,
            _ => false,
        }
    }
@@ -1614,16 +1350,20 @@ impl AstNode for LoopExpr {
        &self.syntax
    }
 }
-impl ast::LoopBodyOwner for LoopExpr {}
+impl ast::ArgListOwner for CallExpr {}
-impl LoopExpr {}
+impl CallExpr {
+    pub fn expr(&self) -> Option<Expr> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroCall {
+pub struct MethodCallExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for MacroCall {
+impl AstNode for MethodCallExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            MACRO_CALL => true,
+            METHOD_CALL_EXPR => true,
            _ => false,
        }
    }
@@ -1638,25 +1378,26 @@ impl AstNode for MacroCall {
        &self.syntax
    }
 }
-impl ast::NameOwner for MacroCall {}
+impl ast::ArgListOwner for MethodCallExpr {}
-impl ast::AttrsOwner for MacroCall {}
+impl MethodCallExpr {
-impl ast::DocCommentsOwner for MacroCall {}
+    pub fn expr(&self) -> Option<Expr> {
-impl MacroCall {
-    pub fn token_tree(&self) -> Option<TokenTree> {
        AstChildren::new(&self.syntax).next()
    }
-    pub fn path(&self) -> Option<Path> {
+    pub fn name_ref(&self) -> Option<NameRef> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn type_arg_list(&self) -> Option<TypeArgList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroItems {
+pub struct IndexExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for MacroItems {
+impl AstNode for IndexExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            MACRO_ITEMS => true,
+            INDEX_EXPR => true,
            _ => false,
        }
    }
@@ -1671,17 +1412,15 @@ impl AstNode for MacroItems {
        &self.syntax
    }
 }
-impl ast::ModuleItemOwner for MacroItems {}
+impl IndexExpr {}
-impl ast::FnDefOwner for MacroItems {}
-impl MacroItems {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroStmts {
+pub struct FieldExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for MacroStmts {
+impl AstNode for FieldExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            MACRO_STMTS => true,
+            FIELD_EXPR => true,
            _ => false,
        }
    }
@@ -1696,22 +1435,22 @@ impl AstNode for MacroStmts {
        &self.syntax
    }
 }
-impl MacroStmts {
+impl FieldExpr {
-    pub fn statements(&self) -> AstChildren<Stmt> {
-        AstChildren::new(&self.syntax)
-    }
    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
+    pub fn name_ref(&self) -> Option<NameRef> {
+        AstChildren::new(&self.syntax).next()
+    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MatchArm {
+pub struct AwaitExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for MatchArm {
+impl AstNode for AwaitExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            MATCH_ARM => true,
+            AWAIT_EXPR => true,
            _ => false,
        }
    }
@@ -1726,26 +1465,19 @@ impl AstNode for MatchArm {
        &self.syntax
    }
 }
-impl ast::AttrsOwner for MatchArm {}
+impl AwaitExpr {
-impl MatchArm {
-    pub fn pats(&self) -> AstChildren<Pat> {
-        AstChildren::new(&self.syntax)
-    }
-    pub fn guard(&self) -> Option<MatchGuard> {
-        AstChildren::new(&self.syntax).next()
-    }
    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MatchArmList {
+pub struct TryExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for MatchArmList {
+impl AstNode for TryExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            MATCH_ARM_LIST => true,
+            TRY_EXPR => true,
            _ => false,
        }
    }
@@ -1760,20 +1492,19 @@ impl AstNode for MatchArmList {
        &self.syntax
    }
 }
-impl ast::AttrsOwner for MatchArmList {}
+impl TryExpr {
-impl MatchArmList {
+    pub fn expr(&self) -> Option<Expr> {
-    pub fn arms(&self) -> AstChildren<MatchArm> {
+        AstChildren::new(&self.syntax).next()
-        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MatchExpr {
+pub struct CastExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for MatchExpr {
+impl AstNode for CastExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            MATCH_EXPR => true,
+            CAST_EXPR => true,
            _ => false,
        }
    }
@@ -1788,22 +1519,22 @@ impl AstNode for MatchExpr {
        &self.syntax
    }
 }
-impl MatchExpr {
+impl CastExpr {
    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
-    pub fn match_arm_list(&self) -> Option<MatchArmList> {
+    pub fn type_ref(&self) -> Option<TypeRef> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MatchGuard {
+pub struct RefExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for MatchGuard {
+impl AstNode for RefExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            MATCH_GUARD => true,
+            REF_EXPR => true,
            _ => false,
        }
    }
@@ -1818,19 +1549,19 @@ impl AstNode for MatchGuard {
        &self.syntax
    }
 }
-impl MatchGuard {
+impl RefExpr {
    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MethodCallExpr {
+pub struct PrefixExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for MethodCallExpr {
+impl AstNode for PrefixExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            METHOD_CALL_EXPR => true,
+            PREFIX_EXPR => true,
            _ => false,
        }
    }
@@ -1845,26 +1576,19 @@ impl AstNode for MethodCallExpr {
        &self.syntax
    }
 }
-impl ast::ArgListOwner for MethodCallExpr {}
+impl PrefixExpr {
-impl MethodCallExpr {
    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
-    pub fn name_ref(&self) -> Option<NameRef> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn type_arg_list(&self) -> Option<TypeArgList> {
-        AstChildren::new(&self.syntax).next()
-    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Module {
+pub struct BoxExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Module {
+impl AstNode for BoxExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            MODULE => true,
+            BOX_EXPR => true,
            _ => false,
        }
    }
@@ -1879,144 +1603,42 @@ impl AstNode for Module {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for Module {}
+impl BoxExpr {
-impl ast::NameOwner for Module {}
+    pub fn expr(&self) -> Option<Expr> {
-impl ast::AttrsOwner for Module {}
-impl ast::DocCommentsOwner for Module {}
-impl Module {
-    pub fn item_list(&self) -> Option<ItemList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ModuleItem {
+pub struct RangeExpr {
-    StructDef(StructDef),
+    pub(crate) syntax: SyntaxNode,
-    UnionDef(UnionDef),
-    EnumDef(EnumDef),
-    FnDef(FnDef),
-    TraitDef(TraitDef),
-    TypeAliasDef(TypeAliasDef),
-    ImplBlock(ImplBlock),
-    UseItem(UseItem),
-    ExternCrateItem(ExternCrateItem),
-    ConstDef(ConstDef),
-    StaticDef(StaticDef),
-    Module(Module),
-}
-impl From<StructDef> for ModuleItem {
-    fn from(node: StructDef) -> ModuleItem {
-        ModuleItem::StructDef(node)
-    }
-}
-impl From<UnionDef> for ModuleItem {
-    fn from(node: UnionDef) -> ModuleItem {
-        ModuleItem::UnionDef(node)
-    }
-}
-impl From<EnumDef> for ModuleItem {
-    fn from(node: EnumDef) -> ModuleItem {
-        ModuleItem::EnumDef(node)
-    }
-}
-impl From<FnDef> for ModuleItem {
-    fn from(node: FnDef) -> ModuleItem {
-        ModuleItem::FnDef(node)
-    }
-}
-impl From<TraitDef> for ModuleItem {
-    fn from(node: TraitDef) -> ModuleItem {
-        ModuleItem::TraitDef(node)
-    }
-}
-impl From<TypeAliasDef> for ModuleItem {
-    fn from(node: TypeAliasDef) -> ModuleItem {
-        ModuleItem::TypeAliasDef(node)
-    }
-}
-impl From<ImplBlock> for ModuleItem {
-    fn from(node: ImplBlock) -> ModuleItem {
-        ModuleItem::ImplBlock(node)
-    }
-}
-impl From<UseItem> for ModuleItem {
-    fn from(node: UseItem) -> ModuleItem {
-        ModuleItem::UseItem(node)
-    }
-}
-impl From<ExternCrateItem> for ModuleItem {
-    fn from(node: ExternCrateItem) -> ModuleItem {
-        ModuleItem::ExternCrateItem(node)
-    }
-}
-impl From<ConstDef> for ModuleItem {
-    fn from(node: ConstDef) -> ModuleItem {
-        ModuleItem::ConstDef(node)
-    }
-}
-impl From<StaticDef> for ModuleItem {
-    fn from(node: StaticDef) -> ModuleItem {
-        ModuleItem::StaticDef(node)
-    }
-}
-impl From<Module> for ModuleItem {
-    fn from(node: Module) -> ModuleItem {
-        ModuleItem::Module(node)
-    }
 }
-impl AstNode for ModuleItem {
+impl AstNode for RangeExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            STRUCT_DEF | UNION_DEF | ENUM_DEF | FN_DEF | TRAIT_DEF | TYPE_ALIAS_DEF
+            RANGE_EXPR => true,
-            | IMPL_BLOCK | USE_ITEM | EXTERN_CRATE_ITEM | CONST_DEF | STATIC_DEF | MODULE => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
+        if Self::can_cast(syntax.kind()) {
-            STRUCT_DEF => ModuleItem::StructDef(StructDef { syntax }),
+            Some(Self { syntax })
-            UNION_DEF => ModuleItem::UnionDef(UnionDef { syntax }),
+        } else {
-            ENUM_DEF => ModuleItem::EnumDef(EnumDef { syntax }),
+            None
-            FN_DEF => ModuleItem::FnDef(FnDef { syntax }),
+        }
-            TRAIT_DEF => ModuleItem::TraitDef(TraitDef { syntax }),
-            TYPE_ALIAS_DEF => ModuleItem::TypeAliasDef(TypeAliasDef { syntax }),
-            IMPL_BLOCK => ModuleItem::ImplBlock(ImplBlock { syntax }),
-            USE_ITEM => ModuleItem::UseItem(UseItem { syntax }),
-            EXTERN_CRATE_ITEM => ModuleItem::ExternCrateItem(ExternCrateItem { syntax }),
-            CONST_DEF => ModuleItem::ConstDef(ConstDef { syntax }),
-            STATIC_DEF => ModuleItem::StaticDef(StaticDef { syntax }),
-            MODULE => ModuleItem::Module(Module { syntax }),
-            _ => return None,
-        };
-        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        match self {
+        &self.syntax
-            ModuleItem::StructDef(it) => &it.syntax,
-            ModuleItem::UnionDef(it) => &it.syntax,
-            ModuleItem::EnumDef(it) => &it.syntax,
-            ModuleItem::FnDef(it) => &it.syntax,
-            ModuleItem::TraitDef(it) => &it.syntax,
-            ModuleItem::TypeAliasDef(it) => &it.syntax,
-            ModuleItem::ImplBlock(it) => &it.syntax,
-            ModuleItem::UseItem(it) => &it.syntax,
-            ModuleItem::ExternCrateItem(it) => &it.syntax,
-            ModuleItem::ConstDef(it) => &it.syntax,
-            ModuleItem::StaticDef(it) => &it.syntax,
-            ModuleItem::Module(it) => &it.syntax,
-        }
    }
 }
-impl ast::AttrsOwner for ModuleItem {}
+impl RangeExpr {}
-impl ast::VisibilityOwner for ModuleItem {}
-impl ModuleItem {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Name {
+pub struct BinExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Name {
+impl AstNode for BinExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            NAME => true,
+            BIN_EXPR => true,
            _ => false,
        }
    }
@@ -2031,15 +1653,15 @@ impl AstNode for Name {
        &self.syntax
    }
 }
-impl Name {}
+impl BinExpr {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct NameRef {
+pub struct Literal {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for NameRef {
+impl AstNode for Literal {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            NAME_REF => true,
+            LITERAL => true,
            _ => false,
        }
    }
@@ -2054,15 +1676,15 @@ impl AstNode for NameRef {
        &self.syntax
    }
 }
-impl NameRef {}
+impl Literal {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct NeverType {
+pub struct MatchExpr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for NeverType {
+impl AstNode for MatchExpr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            NEVER_TYPE => true,
+            MATCH_EXPR => true,
            _ => false,
        }
    }
@@ -2077,64 +1699,50 @@ impl AstNode for NeverType {
        &self.syntax
    }
 }
-impl NeverType {}
+impl MatchExpr {
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+    pub fn expr(&self) -> Option<Expr> {
-pub enum NominalDef {
+        AstChildren::new(&self.syntax).next()
-    StructDef(StructDef),
-    EnumDef(EnumDef),
-    UnionDef(UnionDef),
-}
-impl From<StructDef> for NominalDef {
-    fn from(node: StructDef) -> NominalDef {
-        NominalDef::StructDef(node)
    }
-}
+    pub fn match_arm_list(&self) -> Option<MatchArmList> {
-impl From<EnumDef> for NominalDef {
+        AstChildren::new(&self.syntax).next()
-    fn from(node: EnumDef) -> NominalDef {
-        NominalDef::EnumDef(node)
    }
 }
-impl From<UnionDef> for NominalDef {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-    fn from(node: UnionDef) -> NominalDef {
+pub struct MatchArmList {
-        NominalDef::UnionDef(node)
+    pub(crate) syntax: SyntaxNode,
-    }
 }
-impl AstNode for NominalDef {
+impl AstNode for MatchArmList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            STRUCT_DEF | ENUM_DEF | UNION_DEF => true,
+            MATCH_ARM_LIST => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
+        if Self::can_cast(syntax.kind()) {
-            STRUCT_DEF => NominalDef::StructDef(StructDef { syntax }),
+            Some(Self { syntax })
-            ENUM_DEF => NominalDef::EnumDef(EnumDef { syntax }),
+        } else {
-            UNION_DEF => NominalDef::UnionDef(UnionDef { syntax }),
+            None
-            _ => return None,
+        }
-        };
-        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        match self {
+        &self.syntax
-            NominalDef::StructDef(it) => &it.syntax,
+    }
-            NominalDef::EnumDef(it) => &it.syntax,
+}
-            NominalDef::UnionDef(it) => &it.syntax,
+impl ast::AttrsOwner for MatchArmList {}
-        }
+impl MatchArmList {
+    pub fn arms(&self) -> AstChildren<MatchArm> {
+        AstChildren::new(&self.syntax)
    }
 }
-impl ast::NameOwner for NominalDef {}
-impl ast::TypeParamsOwner for NominalDef {}
-impl ast::AttrsOwner for NominalDef {}
-impl NominalDef {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Param {
+pub struct MatchArm {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Param {
+impl AstNode for MatchArm {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PARAM => true,
+            MATCH_ARM => true,
            _ => false,
        }
    }
@@ -2149,21 +1757,26 @@ impl AstNode for Param {
        &self.syntax
    }
 }
-impl ast::TypeAscriptionOwner for Param {}
+impl ast::AttrsOwner for MatchArm {}
-impl ast::AttrsOwner for Param {}
+impl MatchArm {
-impl Param {
+    pub fn pats(&self) -> AstChildren<Pat> {
-    pub fn pat(&self) -> Option<Pat> {
+        AstChildren::new(&self.syntax)
+    }
+    pub fn guard(&self) -> Option<MatchGuard> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ParamList {
+pub struct MatchGuard {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ParamList {
+impl AstNode for MatchGuard {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PARAM_LIST => true,
+            MATCH_GUARD => true,
            _ => false,
        }
    }
@@ -2178,22 +1791,19 @@ impl AstNode for ParamList {
        &self.syntax
    }
 }
-impl ParamList {
+impl MatchGuard {
-    pub fn params(&self) -> AstChildren<Param> {
+    pub fn expr(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax)
-    }
-    pub fn self_param(&self) -> Option<SelfParam> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ParenExpr {
+pub struct RecordLit {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ParenExpr {
+impl AstNode for RecordLit {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PAREN_EXPR => true,
+            RECORD_LIT => true,
            _ => false,
        }
    }
@@ -2208,19 +1818,22 @@ impl AstNode for ParenExpr {
        &self.syntax
    }
 }
-impl ParenExpr {
+impl RecordLit {
-    pub fn expr(&self) -> Option<Expr> {
+    pub fn path(&self) -> Option<Path> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn record_field_list(&self) -> Option<RecordFieldList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ParenType {
+pub struct RecordFieldList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ParenType {
+impl AstNode for RecordFieldList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PAREN_TYPE => true,
+            RECORD_FIELD_LIST => true,
            _ => false,
        }
    }
@@ -2235,140 +1848,79 @@ impl AstNode for ParenType {
        &self.syntax
    }
 }
-impl ParenType {
+impl RecordFieldList {
-    pub fn type_ref(&self) -> Option<TypeRef> {
+    pub fn fields(&self) -> AstChildren<RecordField> {
+        AstChildren::new(&self.syntax)
+    }
+    pub fn spread(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum Pat {
+pub struct RecordField {
-    RefPat(RefPat),
+    pub(crate) syntax: SyntaxNode,
-    BoxPat(BoxPat),
-    BindPat(BindPat),
-    PlaceholderPat(PlaceholderPat),
-    DotDotPat(DotDotPat),
-    PathPat(PathPat),
-    RecordPat(RecordPat),
-    TupleStructPat(TupleStructPat),
-    TuplePat(TuplePat),
-    SlicePat(SlicePat),
-    RangePat(RangePat),
-    LiteralPat(LiteralPat),
-}
-impl From<RefPat> for Pat {
-    fn from(node: RefPat) -> Pat {
-        Pat::RefPat(node)
-    }
-}
-impl From<BoxPat> for Pat {
-    fn from(node: BoxPat) -> Pat {
-        Pat::BoxPat(node)
-    }
-}
-impl From<BindPat> for Pat {
-    fn from(node: BindPat) -> Pat {
-        Pat::BindPat(node)
-    }
-}
-impl From<PlaceholderPat> for Pat {
-    fn from(node: PlaceholderPat) -> Pat {
-        Pat::PlaceholderPat(node)
-    }
-}
-impl From<DotDotPat> for Pat {
-    fn from(node: DotDotPat) -> Pat {
-        Pat::DotDotPat(node)
-    }
-}
-impl From<PathPat> for Pat {
-    fn from(node: PathPat) -> Pat {
-        Pat::PathPat(node)
-    }
 }
-impl From<RecordPat> for Pat {
+impl AstNode for RecordField {
-    fn from(node: RecordPat) -> Pat {
+    fn can_cast(kind: SyntaxKind) -> bool {
-        Pat::RecordPat(node)
+        match kind {
+            RECORD_FIELD => true,
+            _ => false,
+        }
    }
-}
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
-impl From<TupleStructPat> for Pat {
+        if Self::can_cast(syntax.kind()) {
-    fn from(node: TupleStructPat) -> Pat {
+            Some(Self { syntax })
-        Pat::TupleStructPat(node)
+        } else {
+            None
+        }
    }
-}
+    fn syntax(&self) -> &SyntaxNode {
-impl From<TuplePat> for Pat {
+        &self.syntax
-    fn from(node: TuplePat) -> Pat {
-        Pat::TuplePat(node)
    }
 }
-impl From<SlicePat> for Pat {
+impl RecordField {
-    fn from(node: SlicePat) -> Pat {
+    pub fn name_ref(&self) -> Option<NameRef> {
-        Pat::SlicePat(node)
+        AstChildren::new(&self.syntax).next()
    }
-}
+    pub fn expr(&self) -> Option<Expr> {
-impl From<RangePat> for Pat {
+        AstChildren::new(&self.syntax).next()
-    fn from(node: RangePat) -> Pat {
-        Pat::RangePat(node)
    }
 }
-impl From<LiteralPat> for Pat {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-    fn from(node: LiteralPat) -> Pat {
+pub struct RefPat {
-        Pat::LiteralPat(node)
+    pub(crate) syntax: SyntaxNode,
-    }
 }
-impl AstNode for Pat {
+impl AstNode for RefPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            REF_PAT | BOX_PAT | BIND_PAT | PLACEHOLDER_PAT | DOT_DOT_PAT | PATH_PAT
+            REF_PAT => true,
-            | RECORD_PAT | TUPLE_STRUCT_PAT | TUPLE_PAT | SLICE_PAT | RANGE_PAT | LITERAL_PAT => {
-                true
-            }
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
+        if Self::can_cast(syntax.kind()) {
-            REF_PAT => Pat::RefPat(RefPat { syntax }),
+            Some(Self { syntax })
-            BOX_PAT => Pat::BoxPat(BoxPat { syntax }),
+        } else {
-            BIND_PAT => Pat::BindPat(BindPat { syntax }),
+            None
-            PLACEHOLDER_PAT => Pat::PlaceholderPat(PlaceholderPat { syntax }),
+        }
-            DOT_DOT_PAT => Pat::DotDotPat(DotDotPat { syntax }),
-            PATH_PAT => Pat::PathPat(PathPat { syntax }),
-            RECORD_PAT => Pat::RecordPat(RecordPat { syntax }),
-            TUPLE_STRUCT_PAT => Pat::TupleStructPat(TupleStructPat { syntax }),
-            TUPLE_PAT => Pat::TuplePat(TuplePat { syntax }),
-            SLICE_PAT => Pat::SlicePat(SlicePat { syntax }),
-            RANGE_PAT => Pat::RangePat(RangePat { syntax }),
-            LITERAL_PAT => Pat::LiteralPat(LiteralPat { syntax }),
-            _ => return None,
-        };
-        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        match self {
+        &self.syntax
-            Pat::RefPat(it) => &it.syntax,
+    }
-            Pat::BoxPat(it) => &it.syntax,
+}
-            Pat::BindPat(it) => &it.syntax,
+impl RefPat {
-            Pat::PlaceholderPat(it) => &it.syntax,
+    pub fn pat(&self) -> Option<Pat> {
-            Pat::DotDotPat(it) => &it.syntax,
+        AstChildren::new(&self.syntax).next()
-            Pat::PathPat(it) => &it.syntax,
-            Pat::RecordPat(it) => &it.syntax,
-            Pat::TupleStructPat(it) => &it.syntax,
-            Pat::TuplePat(it) => &it.syntax,
-            Pat::SlicePat(it) => &it.syntax,
-            Pat::RangePat(it) => &it.syntax,
-            Pat::LiteralPat(it) => &it.syntax,
-        }
    }
 }
-impl Pat {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Path {
+pub struct BoxPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for Path {
+impl AstNode for BoxPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PATH => true,
+            BOX_PAT => true,
            _ => false,
        }
    }
@@ -2383,22 +1935,19 @@ impl AstNode for Path {
        &self.syntax
    }
 }
-impl Path {
+impl BoxPat {
-    pub fn segment(&self) -> Option<PathSegment> {
+    pub fn pat(&self) -> Option<Pat> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn qualifier(&self) -> Option<Path> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PathExpr {
+pub struct BindPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PathExpr {
+impl AstNode for BindPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PATH_EXPR => true,
+            BIND_PAT => true,
            _ => false,
        }
    }
@@ -2413,19 +1962,20 @@ impl AstNode for PathExpr {
        &self.syntax
    }
 }
-impl PathExpr {
+impl ast::NameOwner for BindPat {}
-    pub fn path(&self) -> Option<Path> {
+impl BindPat {
+    pub fn pat(&self) -> Option<Pat> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PathPat {
+pub struct PlaceholderPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PathPat {
+impl AstNode for PlaceholderPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PATH_PAT => true,
+            PLACEHOLDER_PAT => true,
            _ => false,
        }
    }
@@ -2440,19 +1990,15 @@ impl AstNode for PathPat {
        &self.syntax
    }
 }
-impl PathPat {
+impl PlaceholderPat {}
-    pub fn path(&self) -> Option<Path> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PathSegment {
+pub struct DotDotPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PathSegment {
+impl AstNode for DotDotPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PATH_SEGMENT => true,
+            DOT_DOT_PAT => true,
            _ => false,
        }
    }
@@ -2467,31 +2013,15 @@ impl AstNode for PathSegment {
        &self.syntax
    }
 }
-impl PathSegment {
+impl DotDotPat {}
-    pub fn name_ref(&self) -> Option<NameRef> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn type_arg_list(&self) -> Option<TypeArgList> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn param_list(&self) -> Option<ParamList> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn ret_type(&self) -> Option<RetType> {
-        AstChildren::new(&self.syntax).next()
-    }
-    pub fn path_type(&self) -> Option<PathType> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PathType {
+pub struct PathPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PathType {
+impl AstNode for PathPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PATH_TYPE => true,
+            PATH_PAT => true,
            _ => false,
        }
    }
@@ -2506,19 +2036,19 @@ impl AstNode for PathType {
        &self.syntax
    }
 }
-impl PathType {
+impl PathPat {
    pub fn path(&self) -> Option<Path> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PlaceholderPat {
+pub struct SlicePat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PlaceholderPat {
+impl AstNode for SlicePat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PLACEHOLDER_PAT => true,
+            SLICE_PAT => true,
            _ => false,
        }
    }
@@ -2533,15 +2063,15 @@ impl AstNode for PlaceholderPat {
        &self.syntax
    }
 }
-impl PlaceholderPat {}
+impl SlicePat {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PlaceholderType {
+pub struct RangePat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PlaceholderType {
+impl AstNode for RangePat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PLACEHOLDER_TYPE => true,
+            RANGE_PAT => true,
            _ => false,
        }
    }
@@ -2556,15 +2086,15 @@ impl AstNode for PlaceholderType {
        &self.syntax
    }
 }
-impl PlaceholderType {}
+impl RangePat {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PointerType {
+pub struct LiteralPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PointerType {
+impl AstNode for LiteralPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            POINTER_TYPE => true,
+            LITERAL_PAT => true,
            _ => false,
        }
    }
@@ -2579,19 +2109,19 @@ impl AstNode for PointerType {
        &self.syntax
    }
 }
-impl PointerType {
+impl LiteralPat {
-    pub fn type_ref(&self) -> Option<TypeRef> {
+    pub fn literal(&self) -> Option<Literal> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct PrefixExpr {
+pub struct RecordPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for PrefixExpr {
+impl AstNode for RecordPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            PREFIX_EXPR => true,
+            RECORD_PAT => true,
            _ => false,
        }
    }
@@ -2606,19 +2136,22 @@ impl AstNode for PrefixExpr {
        &self.syntax
    }
 }
-impl PrefixExpr {
+impl RecordPat {
-    pub fn expr(&self) -> Option<Expr> {
+    pub fn record_field_pat_list(&self) -> Option<RecordFieldPatList> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn path(&self) -> Option<Path> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RangeExpr {
+pub struct RecordFieldPatList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RangeExpr {
+impl AstNode for RecordFieldPatList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RANGE_EXPR => true,
+            RECORD_FIELD_PAT_LIST => true,
            _ => false,
        }
    }
@@ -2633,15 +2166,22 @@ impl AstNode for RangeExpr {
        &self.syntax
    }
 }
-impl RangeExpr {}
+impl RecordFieldPatList {
+    pub fn record_field_pats(&self) -> AstChildren<RecordFieldPat> {
+        AstChildren::new(&self.syntax)
+    }
+    pub fn bind_pats(&self) -> AstChildren<BindPat> {
+        AstChildren::new(&self.syntax)
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RangePat {
+pub struct RecordFieldPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RangePat {
+impl AstNode for RecordFieldPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RANGE_PAT => true,
+            RECORD_FIELD_PAT => true,
            _ => false,
        }
    }
@@ -2656,15 +2196,20 @@ impl AstNode for RangePat {
        &self.syntax
    }
 }
-impl RangePat {}
+impl ast::NameOwner for RecordFieldPat {}
+impl RecordFieldPat {
+    pub fn pat(&self) -> Option<Pat> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordField {
+pub struct TupleStructPat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RecordField {
+impl AstNode for TupleStructPat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_FIELD => true,
+            TUPLE_STRUCT_PAT => true,
            _ => false,
        }
    }
@@ -2679,22 +2224,22 @@ impl AstNode for RecordField {
        &self.syntax
    }
 }
-impl RecordField {
+impl TupleStructPat {
-    pub fn name_ref(&self) -> Option<NameRef> {
+    pub fn path(&self) -> Option<Path> {
        AstChildren::new(&self.syntax).next()
    }
-    pub fn expr(&self) -> Option<Expr> {
+    pub fn args(&self) -> AstChildren<Pat> {
-        AstChildren::new(&self.syntax).next()
+        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldDef {
+pub struct TuplePat {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RecordFieldDef {
+impl AstNode for TuplePat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_FIELD_DEF => true,
+            TUPLE_PAT => true,
            _ => false,
        }
    }
@@ -2709,20 +2254,19 @@ impl AstNode for RecordFieldDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for RecordFieldDef {}
+impl TuplePat {
-impl ast::NameOwner for RecordFieldDef {}
+    pub fn args(&self) -> AstChildren<Pat> {
-impl ast::AttrsOwner for RecordFieldDef {}
+        AstChildren::new(&self.syntax)
-impl ast::DocCommentsOwner for RecordFieldDef {}
+    }
-impl ast::TypeAscriptionOwner for RecordFieldDef {}
+}
-impl RecordFieldDef {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldDefList {
+pub struct Visibility {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RecordFieldDefList {
+impl AstNode for Visibility {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_FIELD_DEF_LIST => true,
+            VISIBILITY => true,
            _ => false,
        }
    }
@@ -2737,19 +2281,15 @@ impl AstNode for RecordFieldDefList {
        &self.syntax
    }
 }
-impl RecordFieldDefList {
+impl Visibility {}
-    pub fn fields(&self) -> AstChildren<RecordFieldDef> {
-        AstChildren::new(&self.syntax)
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldList {
+pub struct Name {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RecordFieldList {
+impl AstNode for Name {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_FIELD_LIST => true,
+            NAME => true,
            _ => false,
        }
    }
@@ -2764,22 +2304,15 @@ impl AstNode for RecordFieldList {
        &self.syntax
    }
 }
-impl RecordFieldList {
+impl Name {}
-    pub fn fields(&self) -> AstChildren<RecordField> {
-        AstChildren::new(&self.syntax)
-    }
-    pub fn spread(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldPat {
+pub struct NameRef {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RecordFieldPat {
+impl AstNode for NameRef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_FIELD_PAT => true,
+            NAME_REF => true,
            _ => false,
        }
    }
@@ -2794,20 +2327,15 @@ impl AstNode for RecordFieldPat {
        &self.syntax
    }
 }
-impl ast::NameOwner for RecordFieldPat {}
+impl NameRef {}
-impl RecordFieldPat {
-    pub fn pat(&self) -> Option<Pat> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldPatList {
+pub struct MacroCall {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RecordFieldPatList {
+impl AstNode for MacroCall {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_FIELD_PAT_LIST => true,
+            MACRO_CALL => true,
            _ => false,
        }
    }
@@ -2822,22 +2350,25 @@ impl AstNode for RecordFieldPatList {
        &self.syntax
    }
 }
-impl RecordFieldPatList {
+impl ast::NameOwner for MacroCall {}
-    pub fn record_field_pats(&self) -> AstChildren<RecordFieldPat> {
+impl ast::AttrsOwner for MacroCall {}
-        AstChildren::new(&self.syntax)
+impl ast::DocCommentsOwner for MacroCall {}
+impl MacroCall {
+    pub fn token_tree(&self) -> Option<TokenTree> {
+        AstChildren::new(&self.syntax).next()
    }
-    pub fn bind_pats(&self) -> AstChildren<BindPat> {
+    pub fn path(&self) -> Option<Path> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordLit {
+pub struct Attr {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RecordLit {
+impl AstNode for Attr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_LIT => true,
+            ATTR => true,
            _ => false,
        }
    }
@@ -2852,22 +2383,22 @@ impl AstNode for RecordLit {
        &self.syntax
    }
 }
-impl RecordLit {
+impl Attr {
    pub fn path(&self) -> Option<Path> {
        AstChildren::new(&self.syntax).next()
    }
-    pub fn record_field_list(&self) -> Option<RecordFieldList> {
+    pub fn input(&self) -> Option<AttrInput> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordPat {
+pub struct TokenTree {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RecordPat {
+impl AstNode for TokenTree {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_PAT => true,
+            TOKEN_TREE => true,
            _ => false,
        }
    }
@@ -2882,22 +2413,45 @@ impl AstNode for RecordPat {
        &self.syntax
    }
 }
-impl RecordPat {
+impl TokenTree {}
-    pub fn record_field_pat_list(&self) -> Option<RecordFieldPatList> {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-        AstChildren::new(&self.syntax).next()
+pub struct TypeParamList {
+    pub(crate) syntax: SyntaxNode,
+}
+impl AstNode for TypeParamList {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            TYPE_PARAM_LIST => true,
+            _ => false,
+        }
    }
-    pub fn path(&self) -> Option<Path> {
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        AstChildren::new(&self.syntax).next()
+        if Self::can_cast(syntax.kind()) {
+            Some(Self { syntax })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        &self.syntax
+    }
+}
+impl TypeParamList {
+    pub fn type_params(&self) -> AstChildren<TypeParam> {
+        AstChildren::new(&self.syntax)
+    }
+    pub fn lifetime_params(&self) -> AstChildren<LifetimeParam> {
+        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RefExpr {
+pub struct TypeParam {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RefExpr {
+impl AstNode for TypeParam {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            REF_EXPR => true,
+            TYPE_PARAM => true,
            _ => false,
        }
    }
@@ -2912,19 +2466,22 @@ impl AstNode for RefExpr {
        &self.syntax
    }
 }
-impl RefExpr {
+impl ast::NameOwner for TypeParam {}
-    pub fn expr(&self) -> Option<Expr> {
+impl ast::AttrsOwner for TypeParam {}
+impl ast::TypeBoundsOwner for TypeParam {}
+impl TypeParam {
+    pub fn default_type(&self) -> Option<TypeRef> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RefPat {
+pub struct ConstParam {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RefPat {
+impl AstNode for ConstParam {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            REF_PAT => true,
+            CONST_PARAM => true,
            _ => false,
        }
    }
@@ -2939,19 +2496,22 @@ impl AstNode for RefPat {
        &self.syntax
    }
 }
-impl RefPat {
+impl ast::NameOwner for ConstParam {}
-    pub fn pat(&self) -> Option<Pat> {
+impl ast::AttrsOwner for ConstParam {}
+impl ast::TypeAscriptionOwner for ConstParam {}
+impl ConstParam {
+    pub fn default_val(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ReferenceType {
+pub struct LifetimeParam {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ReferenceType {
+impl AstNode for LifetimeParam {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            REFERENCE_TYPE => true,
+            LIFETIME_PARAM => true,
            _ => false,
        }
    }
@@ -2966,19 +2526,16 @@ impl AstNode for ReferenceType {
        &self.syntax
    }
 }
-impl ReferenceType {
+impl ast::AttrsOwner for LifetimeParam {}
-    pub fn type_ref(&self) -> Option<TypeRef> {
+impl LifetimeParam {}
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RetType {
+pub struct TypeBound {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for RetType {
+impl AstNode for TypeBound {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RET_TYPE => true,
+            TYPE_BOUND => true,
            _ => false,
        }
    }
@@ -2993,19 +2550,19 @@ impl AstNode for RetType {
        &self.syntax
    }
 }
-impl RetType {
+impl TypeBound {
    pub fn type_ref(&self) -> Option<TypeRef> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ReturnExpr {
+pub struct TypeBoundList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for ReturnExpr {
+impl AstNode for TypeBoundList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RETURN_EXPR => true,
+            TYPE_BOUND_LIST => true,
            _ => false,
        }
    }
@@ -3020,19 +2577,19 @@ impl AstNode for ReturnExpr {
        &self.syntax
    }
 }
-impl ReturnExpr {
+impl TypeBoundList {
-    pub fn expr(&self) -> Option<Expr> {
+    pub fn bounds(&self) -> AstChildren<TypeBound> {
-        AstChildren::new(&self.syntax).next()
+        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SelfParam {
+pub struct WherePred {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for SelfParam {
+impl AstNode for WherePred {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            SELF_PARAM => true,
+            WHERE_PRED => true,
            _ => false,
        }
    }
@@ -3047,17 +2604,20 @@ impl AstNode for SelfParam {
        &self.syntax
    }
 }
-impl ast::TypeAscriptionOwner for SelfParam {}
+impl ast::TypeBoundsOwner for WherePred {}
-impl ast::AttrsOwner for SelfParam {}
+impl WherePred {
-impl SelfParam {}
+    pub fn type_ref(&self) -> Option<TypeRef> {
+        AstChildren::new(&self.syntax).next()
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SlicePat {
+pub struct WhereClause {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for SlicePat {
+impl AstNode for WhereClause {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            SLICE_PAT => true,
+            WHERE_CLAUSE => true,
            _ => false,
        }
    }
@@ -3072,15 +2632,19 @@ impl AstNode for SlicePat {
        &self.syntax
    }
 }
-impl SlicePat {}
+impl WhereClause {
+    pub fn predicates(&self) -> AstChildren<WherePred> {
+        AstChildren::new(&self.syntax)
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SliceType {
+pub struct ExprStmt {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for SliceType {
+impl AstNode for ExprStmt {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            SLICE_TYPE => true,
+            EXPR_STMT => true,
            _ => false,
        }
    }
@@ -3095,19 +2659,19 @@ impl AstNode for SliceType {
        &self.syntax
    }
 }
-impl SliceType {
+impl ExprStmt {
-    pub fn type_ref(&self) -> Option<TypeRef> {
+    pub fn expr(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SourceFile {
+pub struct LetStmt {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for SourceFile {
+impl AstNode for LetStmt {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            SOURCE_FILE => true,
+            LET_STMT => true,
            _ => false,
        }
    }
@@ -3122,21 +2686,23 @@ impl AstNode for SourceFile {
        &self.syntax
    }
 }
-impl ast::ModuleItemOwner for SourceFile {}
+impl ast::TypeAscriptionOwner for LetStmt {}
-impl ast::FnDefOwner for SourceFile {}
+impl LetStmt {
-impl SourceFile {
+    pub fn pat(&self) -> Option<Pat> {
-    pub fn modules(&self) -> AstChildren<Module> {
+        AstChildren::new(&self.syntax).next()
-        AstChildren::new(&self.syntax)
+    }
+    pub fn initializer(&self) -> Option<Expr> {
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StaticDef {
+pub struct Condition {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for StaticDef {
+impl AstNode for Condition {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            STATIC_DEF => true,
+            CONDITION => true,
            _ => false,
        }
    }
@@ -3151,63 +2717,54 @@ impl AstNode for StaticDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for StaticDef {}
+impl Condition {
-impl ast::NameOwner for StaticDef {}
+    pub fn pat(&self) -> Option<Pat> {
-impl ast::TypeParamsOwner for StaticDef {}
-impl ast::AttrsOwner for StaticDef {}
-impl ast::DocCommentsOwner for StaticDef {}
-impl ast::TypeAscriptionOwner for StaticDef {}
-impl StaticDef {
-    pub fn body(&self) -> Option<Expr> {
        AstChildren::new(&self.syntax).next()
    }
-}
+    pub fn expr(&self) -> Option<Expr> {
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+        AstChildren::new(&self.syntax).next()
-pub enum Stmt {
-    ExprStmt(ExprStmt),
-    LetStmt(LetStmt),
-}
-impl From<ExprStmt> for Stmt {
-    fn from(node: ExprStmt) -> Stmt {
-        Stmt::ExprStmt(node)
    }
 }
-impl From<LetStmt> for Stmt {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-    fn from(node: LetStmt) -> Stmt {
+pub struct Block {
-        Stmt::LetStmt(node)
+    pub(crate) syntax: SyntaxNode,
-    }
 }
-impl AstNode for Stmt {
+impl AstNode for Block {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            EXPR_STMT | LET_STMT => true,
+            BLOCK => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
+        if Self::can_cast(syntax.kind()) {
-            EXPR_STMT => Stmt::ExprStmt(ExprStmt { syntax }),
+            Some(Self { syntax })
-            LET_STMT => Stmt::LetStmt(LetStmt { syntax }),
+        } else {
-            _ => return None,
+            None
-        };
+        }
-        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        match self {
+        &self.syntax
-            Stmt::ExprStmt(it) => &it.syntax,
+    }
-            Stmt::LetStmt(it) => &it.syntax,
+}
-        }
+impl ast::AttrsOwner for Block {}
+impl ast::ModuleItemOwner for Block {}
+impl Block {
+    pub fn statements(&self) -> AstChildren<Stmt> {
+        AstChildren::new(&self.syntax)
+    }
+    pub fn expr(&self) -> Option<Expr> {
+        AstChildren::new(&self.syntax).next()
    }
 }
-impl Stmt {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StructDef {
+pub struct ParamList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for StructDef {
+impl AstNode for ParamList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            STRUCT_DEF => true,
+            PARAM_LIST => true,
            _ => false,
        }
    }
@@ -3222,20 +2779,22 @@ impl AstNode for StructDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for StructDef {}
+impl ParamList {
-impl ast::NameOwner for StructDef {}
+    pub fn self_param(&self) -> Option<SelfParam> {
-impl ast::TypeParamsOwner for StructDef {}
+        AstChildren::new(&self.syntax).next()
-impl ast::AttrsOwner for StructDef {}
+    }
-impl ast::DocCommentsOwner for StructDef {}
+    pub fn params(&self) -> AstChildren<Param> {
-impl StructDef {}
+        AstChildren::new(&self.syntax)
+    }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TokenTree {
+pub struct SelfParam {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TokenTree {
+impl AstNode for SelfParam {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TOKEN_TREE => true,
+            SELF_PARAM => true,
            _ => false,
        }
    }
@@ -3250,15 +2809,17 @@ impl AstNode for TokenTree {
        &self.syntax
    }
 }
-impl TokenTree {}
+impl ast::TypeAscriptionOwner for SelfParam {}
+impl ast::AttrsOwner for SelfParam {}
+impl SelfParam {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TraitDef {
+pub struct Param {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TraitDef {
+impl AstNode for Param {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TRAIT_DEF => true,
+            PARAM => true,
            _ => false,
        }
    }
@@ -3273,25 +2834,21 @@ impl AstNode for TraitDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for TraitDef {}
+impl ast::TypeAscriptionOwner for Param {}
-impl ast::NameOwner for TraitDef {}
+impl ast::AttrsOwner for Param {}
-impl ast::AttrsOwner for TraitDef {}
+impl Param {
-impl ast::DocCommentsOwner for TraitDef {}
+    pub fn pat(&self) -> Option<Pat> {
-impl ast::TypeParamsOwner for TraitDef {}
-impl ast::TypeBoundsOwner for TraitDef {}
-impl TraitDef {
-    pub fn item_list(&self) -> Option<ItemList> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TryBlockExpr {
+pub struct UseItem {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TryBlockExpr {
+impl AstNode for UseItem {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TRY_BLOCK_EXPR => true,
+            USE_ITEM => true,
            _ => false,
        }
    }
@@ -3306,19 +2863,21 @@ impl AstNode for TryBlockExpr {
        &self.syntax
    }
 }
-impl TryBlockExpr {
+impl ast::AttrsOwner for UseItem {}
-    pub fn body(&self) -> Option<BlockExpr> {
+impl ast::VisibilityOwner for UseItem {}
+impl UseItem {
+    pub fn use_tree(&self) -> Option<UseTree> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TryExpr {
+pub struct UseTree {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TryExpr {
+impl AstNode for UseTree {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TRY_EXPR => true,
+            USE_TREE => true,
            _ => false,
        }
    }
@@ -3333,19 +2892,25 @@ impl AstNode for TryExpr {
        &self.syntax
    }
 }
-impl TryExpr {
+impl UseTree {
-    pub fn expr(&self) -> Option<Expr> {
+    pub fn path(&self) -> Option<Path> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn use_tree_list(&self) -> Option<UseTreeList> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn alias(&self) -> Option<Alias> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleExpr {
+pub struct Alias {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TupleExpr {
+impl AstNode for Alias {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TUPLE_EXPR => true,
+            ALIAS => true,
            _ => false,
        }
    }
@@ -3360,19 +2925,16 @@ impl AstNode for TupleExpr {
        &self.syntax
    }
 }
-impl TupleExpr {
+impl ast::NameOwner for Alias {}
-    pub fn exprs(&self) -> AstChildren<Expr> {
+impl Alias {}
-        AstChildren::new(&self.syntax)
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleFieldDef {
+pub struct UseTreeList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TupleFieldDef {
+impl AstNode for UseTreeList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TUPLE_FIELD_DEF => true,
+            USE_TREE_LIST => true,
            _ => false,
        }
    }
@@ -3387,21 +2949,19 @@ impl AstNode for TupleFieldDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for TupleFieldDef {}
+impl UseTreeList {
-impl ast::AttrsOwner for TupleFieldDef {}
+    pub fn use_trees(&self) -> AstChildren<UseTree> {
-impl TupleFieldDef {
+        AstChildren::new(&self.syntax)
-    pub fn type_ref(&self) -> Option<TypeRef> {
-        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleFieldDefList {
+pub struct ExternCrateItem {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TupleFieldDefList {
+impl AstNode for ExternCrateItem {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TUPLE_FIELD_DEF_LIST => true,
+            EXTERN_CRATE_ITEM => true,
            _ => false,
        }
    }
@@ -3416,19 +2976,24 @@ impl AstNode for TupleFieldDefList {
        &self.syntax
    }
 }
-impl TupleFieldDefList {
+impl ast::AttrsOwner for ExternCrateItem {}
-    pub fn fields(&self) -> AstChildren<TupleFieldDef> {
+impl ast::VisibilityOwner for ExternCrateItem {}
-        AstChildren::new(&self.syntax)
+impl ExternCrateItem {
+    pub fn name_ref(&self) -> Option<NameRef> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn alias(&self) -> Option<Alias> {
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TuplePat {
+pub struct ArgList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TuplePat {
+impl AstNode for ArgList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TUPLE_PAT => true,
+            ARG_LIST => true,
            _ => false,
        }
    }
@@ -3443,19 +3008,19 @@ impl AstNode for TuplePat {
        &self.syntax
    }
 }
-impl TuplePat {
+impl ArgList {
-    pub fn args(&self) -> AstChildren<Pat> {
+    pub fn args(&self) -> AstChildren<Expr> {
        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleStructPat {
+pub struct Path {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TupleStructPat {
+impl AstNode for Path {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TUPLE_STRUCT_PAT => true,
+            PATH => true,
            _ => false,
        }
    }
@@ -3470,22 +3035,22 @@ impl AstNode for TupleStructPat {
        &self.syntax
    }
 }
-impl TupleStructPat {
+impl Path {
-    pub fn args(&self) -> AstChildren<Pat> {
+    pub fn segment(&self) -> Option<PathSegment> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
    }
-    pub fn path(&self) -> Option<Path> {
+    pub fn qualifier(&self) -> Option<Path> {
        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleType {
+pub struct PathSegment {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TupleType {
+impl AstNode for PathSegment {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TUPLE_TYPE => true,
+            PATH_SEGMENT => true,
            _ => false,
        }
    }
@@ -3500,19 +3065,31 @@ impl AstNode for TupleType {
        &self.syntax
    }
 }
-impl TupleType {
+impl PathSegment {
-    pub fn fields(&self) -> AstChildren<TypeRef> {
+    pub fn name_ref(&self) -> Option<NameRef> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn type_arg_list(&self) -> Option<TypeArgList> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn param_list(&self) -> Option<ParamList> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn ret_type(&self) -> Option<RetType> {
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn path_type(&self) -> Option<PathType> {
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeAliasDef {
+pub struct TypeArgList {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TypeAliasDef {
+impl AstNode for TypeArgList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TYPE_ALIAS_DEF => true,
+            TYPE_ARG_LIST => true,
            _ => false,
        }
    }
@@ -3527,15 +3104,18 @@ impl AstNode for TypeAliasDef {
        &self.syntax
    }
 }
-impl ast::VisibilityOwner for TypeAliasDef {}
+impl TypeArgList {
-impl ast::NameOwner for TypeAliasDef {}
+    pub fn type_args(&self) -> AstChildren<TypeArg> {
-impl ast::TypeParamsOwner for TypeAliasDef {}
+        AstChildren::new(&self.syntax)
-impl ast::AttrsOwner for TypeAliasDef {}
+    }
-impl ast::DocCommentsOwner for TypeAliasDef {}
+    pub fn lifetime_args(&self) -> AstChildren<LifetimeArg> {
-impl ast::TypeBoundsOwner for TypeAliasDef {}
+        AstChildren::new(&self.syntax)
-impl TypeAliasDef {
+    }
-    pub fn type_ref(&self) -> Option<TypeRef> {
+    pub fn assoc_type_args(&self) -> AstChildren<AssocTypeArg> {
-        AstChildren::new(&self.syntax).next()
+        AstChildren::new(&self.syntax)
+    }
+    pub fn const_arg(&self) -> AstChildren<ConstArg> {
+        AstChildren::new(&self.syntax)
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -3566,13 +3146,13 @@ impl TypeArg {
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeArgList {
+pub struct AssocTypeArg {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TypeArgList {
+impl AstNode for AssocTypeArg {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TYPE_ARG_LIST => true,
+            ASSOC_TYPE_ARG => true,
            _ => false,
        }
    }
@@ -3587,25 +3167,22 @@ impl AstNode for TypeArgList {
        &self.syntax
    }
 }
-impl TypeArgList {
+impl AssocTypeArg {
-    pub fn type_args(&self) -> AstChildren<TypeArg> {
+    pub fn name_ref(&self) -> Option<NameRef> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
-    }
-    pub fn lifetime_args(&self) -> AstChildren<LifetimeArg> {
-        AstChildren::new(&self.syntax)
    }
-    pub fn assoc_type_args(&self) -> AstChildren<AssocTypeArg> {
+    pub fn type_ref(&self) -> Option<TypeRef> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeBound {
+pub struct LifetimeArg {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TypeBound {
+impl AstNode for LifetimeArg {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TYPE_BOUND => true,
+            LIFETIME_ARG => true,
            _ => false,
        }
    }
@@ -3620,19 +3197,15 @@ impl AstNode for TypeBound {
        &self.syntax
    }
 }
-impl TypeBound {
+impl LifetimeArg {}
-    pub fn type_ref(&self) -> Option<TypeRef> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeBoundList {
+pub struct ConstArg {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TypeBoundList {
+impl AstNode for ConstArg {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TYPE_BOUND_LIST => true,
+            CONST_ARG => true,
            _ => false,
        }
    }
@@ -3647,19 +3220,22 @@ impl AstNode for TypeBoundList {
        &self.syntax
    }
 }
-impl TypeBoundList {
+impl ConstArg {
-    pub fn bounds(&self) -> AstChildren<TypeBound> {
+    pub fn literal(&self) -> Option<Literal> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
+    }
+    pub fn block_expr(&self) -> Option<BlockExpr> {
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeParam {
+pub struct MacroItems {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TypeParam {
+impl AstNode for MacroItems {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TYPE_PARAM => true,
+            MACRO_ITEMS => true,
            _ => false,
        }
    }
@@ -3674,22 +3250,17 @@ impl AstNode for TypeParam {
        &self.syntax
    }
 }
-impl ast::NameOwner for TypeParam {}
+impl ast::ModuleItemOwner for MacroItems {}
-impl ast::AttrsOwner for TypeParam {}
+impl ast::FnDefOwner for MacroItems {}
-impl ast::TypeBoundsOwner for TypeParam {}
+impl MacroItems {}
-impl TypeParam {
-    pub fn default_type(&self) -> Option<TypeRef> {
-        AstChildren::new(&self.syntax).next()
-    }
-}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeParamList {
+pub struct MacroStmts {
    pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for TypeParamList {
+impl AstNode for MacroStmts {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            TYPE_PARAM_LIST => true,
+            MACRO_STMTS => true,
            _ => false,
        }
    }
@@ -3704,15 +3275,63 @@ impl AstNode for TypeParamList {
        &self.syntax
    }
 }
-impl TypeParamList {
+impl MacroStmts {
-    pub fn type_params(&self) -> AstChildren<TypeParam> {
+    pub fn statements(&self) -> AstChildren<Stmt> {
        AstChildren::new(&self.syntax)
    }
-    pub fn lifetime_params(&self) -> AstChildren<LifetimeParam> {
+    pub fn expr(&self) -> Option<Expr> {
-        AstChildren::new(&self.syntax)
+        AstChildren::new(&self.syntax).next()
    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum NominalDef {
+    StructDef(StructDef),
+    EnumDef(EnumDef),
+    UnionDef(UnionDef),
+}
+impl From<StructDef> for NominalDef {
+    fn from(node: StructDef) -> NominalDef {
+        NominalDef::StructDef(node)
+    }
+}
+impl From<EnumDef> for NominalDef {
+    fn from(node: EnumDef) -> NominalDef {
+        NominalDef::EnumDef(node)
+    }
+}
+impl From<UnionDef> for NominalDef {
+    fn from(node: UnionDef) -> NominalDef {
+        NominalDef::UnionDef(node)
+    }
+}
+impl AstNode for NominalDef {
+    fn can_cast(kind: SyntaxKind) -> bool {
+        match kind {
+            STRUCT_DEF | ENUM_DEF | UNION_DEF => true,
+            _ => false,
+        }
+    }
+    fn cast(syntax: SyntaxNode) -> Option<Self> {
+        let res = match syntax.kind() {
+            STRUCT_DEF => NominalDef::StructDef(StructDef { syntax }),
+            ENUM_DEF => NominalDef::EnumDef(EnumDef { syntax }),
+            UNION_DEF => NominalDef::UnionDef(UnionDef { syntax }),
+            _ => return None,
+        };
+        Some(res)
+    }
+    fn syntax(&self) -> &SyntaxNode {
+        match self {
+            NominalDef::StructDef(it) => &it.syntax,
+            NominalDef::EnumDef(it) => &it.syntax,
+            NominalDef::UnionDef(it) => &it.syntax,
+        }
+    }
+}
+impl ast::NameOwner for NominalDef {}
+impl ast::TypeParamsOwner for NominalDef {}
+impl ast::AttrsOwner for NominalDef {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum TypeRef {
    ParenType(ParenType),
    TupleType(TupleType),
@@ -3839,231 +3458,637 @@ impl AstNode for TypeRef {
        }
    }
 }
-impl TypeRef {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UnionDef {
+pub enum ModuleItem {
-    pub(crate) syntax: SyntaxNode,
+    StructDef(StructDef),
+    UnionDef(UnionDef),
+    EnumDef(EnumDef),
+    FnDef(FnDef),
+    TraitDef(TraitDef),
+    TypeAliasDef(TypeAliasDef),
+    ImplBlock(ImplBlock),
+    UseItem(UseItem),
+    ExternCrateItem(ExternCrateItem),
+    ConstDef(ConstDef),
+    StaticDef(StaticDef),
+    Module(Module),
 }
-impl AstNode for UnionDef {
+impl From<StructDef> for ModuleItem {
-    fn can_cast(kind: SyntaxKind) -> bool {
+    fn from(node: StructDef) -> ModuleItem {
-        match kind {
+        ModuleItem::StructDef(node)
-            UNION_DEF => true,
-            _ => false,
-        }
    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
+}
-        if Self::can_cast(syntax.kind()) {
+impl From<UnionDef> for ModuleItem {
-            Some(Self { syntax })
+    fn from(node: UnionDef) -> ModuleItem {
-        } else {
+        ModuleItem::UnionDef(node)
-            None
-        }
    }
-    fn syntax(&self) -> &SyntaxNode {
+}
-        &self.syntax
+impl From<EnumDef> for ModuleItem {
+    fn from(node: EnumDef) -> ModuleItem {
+        ModuleItem::EnumDef(node)
    }
 }
-impl ast::VisibilityOwner for UnionDef {}
+impl From<FnDef> for ModuleItem {
-impl ast::NameOwner for UnionDef {}
+    fn from(node: FnDef) -> ModuleItem {
-impl ast::TypeParamsOwner for UnionDef {}
+        ModuleItem::FnDef(node)
-impl ast::AttrsOwner for UnionDef {}
-impl ast::DocCommentsOwner for UnionDef {}
-impl UnionDef {
-    pub fn record_field_def_list(&self) -> Option<RecordFieldDefList> {
-        AstChildren::new(&self.syntax).next()
    }
 }
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+impl From<TraitDef> for ModuleItem {
-pub struct UseItem {
+    fn from(node: TraitDef) -> ModuleItem {
-    pub(crate) syntax: SyntaxNode,
+        ModuleItem::TraitDef(node)
+    }
 }
-impl AstNode for UseItem {
+impl From<TypeAliasDef> for ModuleItem {
+    fn from(node: TypeAliasDef) -> ModuleItem {
+        ModuleItem::TypeAliasDef(node)
+    }
+}
+impl From<ImplBlock> for ModuleItem {
+    fn from(node: ImplBlock) -> ModuleItem {
+        ModuleItem::ImplBlock(node)
+    }
+}
+impl From<UseItem> for ModuleItem {
+    fn from(node: UseItem) -> ModuleItem {
+        ModuleItem::UseItem(node)
+    }
+}
+impl From<ExternCrateItem> for ModuleItem {
+    fn from(node: ExternCrateItem) -> ModuleItem {
+        ModuleItem::ExternCrateItem(node)
+    }
+}
+impl From<ConstDef> for ModuleItem {
+    fn from(node: ConstDef) -> ModuleItem {
+        ModuleItem::ConstDef(node)
+    }
+}
+impl From<StaticDef> for ModuleItem {
+    fn from(node: StaticDef) -> ModuleItem {
+        ModuleItem::StaticDef(node)
+    }
+}
+impl From<Module> for ModuleItem {
+    fn from(node: Module) -> ModuleItem {
+        ModuleItem::Module(node)
+    }
+}
+impl AstNode for ModuleItem {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            USE_ITEM => true,
+            STRUCT_DEF | UNION_DEF | ENUM_DEF | FN_DEF | TRAIT_DEF | TYPE_ALIAS_DEF
+            | IMPL_BLOCK | USE_ITEM | EXTERN_CRATE_ITEM | CONST_DEF | STATIC_DEF | MODULE => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
+        let res = match syntax.kind() {
-            Some(Self { syntax })
+            STRUCT_DEF => ModuleItem::StructDef(StructDef { syntax }),
-        } else {
+            UNION_DEF => ModuleItem::UnionDef(UnionDef { syntax }),
-            None
+            ENUM_DEF => ModuleItem::EnumDef(EnumDef { syntax }),
-        }
+            FN_DEF => ModuleItem::FnDef(FnDef { syntax }),
+            TRAIT_DEF => ModuleItem::TraitDef(TraitDef { syntax }),
+            TYPE_ALIAS_DEF => ModuleItem::TypeAliasDef(TypeAliasDef { syntax }),
+            IMPL_BLOCK => ModuleItem::ImplBlock(ImplBlock { syntax }),
+            USE_ITEM => ModuleItem::UseItem(UseItem { syntax }),
+            EXTERN_CRATE_ITEM => ModuleItem::ExternCrateItem(ExternCrateItem { syntax }),
+            CONST_DEF => ModuleItem::ConstDef(ConstDef { syntax }),
+            STATIC_DEF => ModuleItem::StaticDef(StaticDef { syntax }),
+            MODULE => ModuleItem::Module(Module { syntax }),
+            _ => return None,
+        };
+        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
+        match self {
+            ModuleItem::StructDef(it) => &it.syntax,
+            ModuleItem::UnionDef(it) => &it.syntax,
+            ModuleItem::EnumDef(it) => &it.syntax,
+            ModuleItem::FnDef(it) => &it.syntax,
+            ModuleItem::TraitDef(it) => &it.syntax,
+            ModuleItem::TypeAliasDef(it) => &it.syntax,
+            ModuleItem::ImplBlock(it) => &it.syntax,
+            ModuleItem::UseItem(it) => &it.syntax,
+            ModuleItem::ExternCrateItem(it) => &it.syntax,
+            ModuleItem::ConstDef(it) => &it.syntax,
+            ModuleItem::StaticDef(it) => &it.syntax,
+            ModuleItem::Module(it) => &it.syntax,
+        }
    }
 }
-impl ast::AttrsOwner for UseItem {}
+impl ast::AttrsOwner for ModuleItem {}
-impl ast::VisibilityOwner for UseItem {}
+impl ast::VisibilityOwner for ModuleItem {}
-impl UseItem {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-    pub fn use_tree(&self) -> Option<UseTree> {
+pub enum ImplItem {
-        AstChildren::new(&self.syntax).next()
+    FnDef(FnDef),
+    TypeAliasDef(TypeAliasDef),
+    ConstDef(ConstDef),
+}
+impl From<FnDef> for ImplItem {
+    fn from(node: FnDef) -> ImplItem {
+        ImplItem::FnDef(node)
    }
 }
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+impl From<TypeAliasDef> for ImplItem {
-pub struct UseTree {
+    fn from(node: TypeAliasDef) -> ImplItem {
-    pub(crate) syntax: SyntaxNode,
+        ImplItem::TypeAliasDef(node)
+    }
 }
-impl AstNode for UseTree {
+impl From<ConstDef> for ImplItem {
+    fn from(node: ConstDef) -> ImplItem {
+        ImplItem::ConstDef(node)
+    }
+}
+impl AstNode for ImplItem {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            USE_TREE => true,
+            FN_DEF | TYPE_ALIAS_DEF | CONST_DEF => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
+        let res = match syntax.kind() {
-            Some(Self { syntax })
+            FN_DEF => ImplItem::FnDef(FnDef { syntax }),
-        } else {
+            TYPE_ALIAS_DEF => ImplItem::TypeAliasDef(TypeAliasDef { syntax }),
-            None
+            CONST_DEF => ImplItem::ConstDef(ConstDef { syntax }),
-        }
+            _ => return None,
+        };
+        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
+        match self {
+            ImplItem::FnDef(it) => &it.syntax,
+            ImplItem::TypeAliasDef(it) => &it.syntax,
+            ImplItem::ConstDef(it) => &it.syntax,
+        }
    }
 }
-impl UseTree {
+impl ast::AttrsOwner for ImplItem {}
-    pub fn path(&self) -> Option<Path> {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-        AstChildren::new(&self.syntax).next()
+pub enum Expr {
+    TupleExpr(TupleExpr),
+    ArrayExpr(ArrayExpr),
+    ParenExpr(ParenExpr),
+    PathExpr(PathExpr),
+    LambdaExpr(LambdaExpr),
+    IfExpr(IfExpr),
+    LoopExpr(LoopExpr),
+    ForExpr(ForExpr),
+    WhileExpr(WhileExpr),
+    ContinueExpr(ContinueExpr),
+    BreakExpr(BreakExpr),
+    Label(Label),
+    BlockExpr(BlockExpr),
+    ReturnExpr(ReturnExpr),
+    MatchExpr(MatchExpr),
+    RecordLit(RecordLit),
+    CallExpr(CallExpr),
+    IndexExpr(IndexExpr),
+    MethodCallExpr(MethodCallExpr),
+    FieldExpr(FieldExpr),
+    AwaitExpr(AwaitExpr),
+    TryExpr(TryExpr),
+    TryBlockExpr(TryBlockExpr),
+    CastExpr(CastExpr),
+    RefExpr(RefExpr),
+    PrefixExpr(PrefixExpr),
+    RangeExpr(RangeExpr),
+    BinExpr(BinExpr),
+    Literal(Literal),
+    MacroCall(MacroCall),
+    BoxExpr(BoxExpr),
+}
+impl From<TupleExpr> for Expr {
+    fn from(node: TupleExpr) -> Expr {
+        Expr::TupleExpr(node)
    }
-    pub fn use_tree_list(&self) -> Option<UseTreeList> {
+}
-        AstChildren::new(&self.syntax).next()
+impl From<ArrayExpr> for Expr {
+    fn from(node: ArrayExpr) -> Expr {
+        Expr::ArrayExpr(node)
    }
-    pub fn alias(&self) -> Option<Alias> {
+}
-        AstChildren::new(&self.syntax).next()
+impl From<ParenExpr> for Expr {
+    fn from(node: ParenExpr) -> Expr {
+        Expr::ParenExpr(node)
    }
 }
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+impl From<PathExpr> for Expr {
-pub struct UseTreeList {
+    fn from(node: PathExpr) -> Expr {
-    pub(crate) syntax: SyntaxNode,
+        Expr::PathExpr(node)
+    }
 }
-impl AstNode for UseTreeList {
+impl From<LambdaExpr> for Expr {
-    fn can_cast(kind: SyntaxKind) -> bool {
+    fn from(node: LambdaExpr) -> Expr {
-        match kind {
+        Expr::LambdaExpr(node)
-            USE_TREE_LIST => true,
-            _ => false,
-        }
    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
+}
-        if Self::can_cast(syntax.kind()) {
+impl From<IfExpr> for Expr {
-            Some(Self { syntax })
+    fn from(node: IfExpr) -> Expr {
-        } else {
+        Expr::IfExpr(node)
-            None
-        }
    }
-    fn syntax(&self) -> &SyntaxNode {
+}
-        &self.syntax
+impl From<LoopExpr> for Expr {
+    fn from(node: LoopExpr) -> Expr {
+        Expr::LoopExpr(node)
    }
 }
-impl UseTreeList {
+impl From<ForExpr> for Expr {
-    pub fn use_trees(&self) -> AstChildren<UseTree> {
+    fn from(node: ForExpr) -> Expr {
-        AstChildren::new(&self.syntax)
+        Expr::ForExpr(node)
    }
 }
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+impl From<WhileExpr> for Expr {
-pub struct Visibility {
+    fn from(node: WhileExpr) -> Expr {
-    pub(crate) syntax: SyntaxNode,
+        Expr::WhileExpr(node)
+    }
 }
-impl AstNode for Visibility {
+impl From<ContinueExpr> for Expr {
+    fn from(node: ContinueExpr) -> Expr {
+        Expr::ContinueExpr(node)
+    }
+}
+impl From<BreakExpr> for Expr {
+    fn from(node: BreakExpr) -> Expr {
+        Expr::BreakExpr(node)
+    }
+}
+impl From<Label> for Expr {
+    fn from(node: Label) -> Expr {
+        Expr::Label(node)
+    }
+}
+impl From<BlockExpr> for Expr {
+    fn from(node: BlockExpr) -> Expr {
+        Expr::BlockExpr(node)
+    }
+}
+impl From<ReturnExpr> for Expr {
+    fn from(node: ReturnExpr) -> Expr {
+        Expr::ReturnExpr(node)
+    }
+}
+impl From<MatchExpr> for Expr {
+    fn from(node: MatchExpr) -> Expr {
+        Expr::MatchExpr(node)
+    }
+}
+impl From<RecordLit> for Expr {
+    fn from(node: RecordLit) -> Expr {
+        Expr::RecordLit(node)
+    }
+}
+impl From<CallExpr> for Expr {
+    fn from(node: CallExpr) -> Expr {
+        Expr::CallExpr(node)
+    }
+}
+impl From<IndexExpr> for Expr {
+    fn from(node: IndexExpr) -> Expr {
+        Expr::IndexExpr(node)
+    }
+}
+impl From<MethodCallExpr> for Expr {
+    fn from(node: MethodCallExpr) -> Expr {
+        Expr::MethodCallExpr(node)
+    }
+}
+impl From<FieldExpr> for Expr {
+    fn from(node: FieldExpr) -> Expr {
+        Expr::FieldExpr(node)
+    }
+}
+impl From<AwaitExpr> for Expr {
+    fn from(node: AwaitExpr) -> Expr {
+        Expr::AwaitExpr(node)
+    }
+}
+impl From<TryExpr> for Expr {
+    fn from(node: TryExpr) -> Expr {
+        Expr::TryExpr(node)
+    }
+}
+impl From<TryBlockExpr> for Expr {
+    fn from(node: TryBlockExpr) -> Expr {
+        Expr::TryBlockExpr(node)
+    }
+}
+impl From<CastExpr> for Expr {
+    fn from(node: CastExpr) -> Expr {
+        Expr::CastExpr(node)
+    }
+}
+impl From<RefExpr> for Expr {
+    fn from(node: RefExpr) -> Expr {
+        Expr::RefExpr(node)
+    }
+}
+impl From<PrefixExpr> for Expr {
+    fn from(node: PrefixExpr) -> Expr {
+        Expr::PrefixExpr(node)
+    }
+}
+impl From<RangeExpr> for Expr {
+    fn from(node: RangeExpr) -> Expr {
+        Expr::RangeExpr(node)
+    }
+}
+impl From<BinExpr> for Expr {
+    fn from(node: BinExpr) -> Expr {
+        Expr::BinExpr(node)
+    }
+}
+impl From<Literal> for Expr {
+    fn from(node: Literal) -> Expr {
+        Expr::Literal(node)
+    }
+}
+impl From<MacroCall> for Expr {
+    fn from(node: MacroCall) -> Expr {
+        Expr::MacroCall(node)
+    }
+}
+impl From<BoxExpr> for Expr {
+    fn from(node: BoxExpr) -> Expr {
+        Expr::BoxExpr(node)
+    }
+}
+impl AstNode for Expr {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            VISIBILITY => true,
+            TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR
+            | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL
+            | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR
+            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | TRY_BLOCK_EXPR
+            | CAST_EXPR | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL
+            | BOX_EXPR => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
+        let res = match syntax.kind() {
-            Some(Self { syntax })
+            TUPLE_EXPR => Expr::TupleExpr(TupleExpr { syntax }),
-        } else {
+            ARRAY_EXPR => Expr::ArrayExpr(ArrayExpr { syntax }),
-            None
+            PAREN_EXPR => Expr::ParenExpr(ParenExpr { syntax }),
-        }
+            PATH_EXPR => Expr::PathExpr(PathExpr { syntax }),
+            LAMBDA_EXPR => Expr::LambdaExpr(LambdaExpr { syntax }),
+            IF_EXPR => Expr::IfExpr(IfExpr { syntax }),
+            LOOP_EXPR => Expr::LoopExpr(LoopExpr { syntax }),
+            FOR_EXPR => Expr::ForExpr(ForExpr { syntax }),
+            WHILE_EXPR => Expr::WhileExpr(WhileExpr { syntax }),
+            CONTINUE_EXPR => Expr::ContinueExpr(ContinueExpr { syntax }),
+            BREAK_EXPR => Expr::BreakExpr(BreakExpr { syntax }),
+            LABEL => Expr::Label(Label { syntax }),
+            BLOCK_EXPR => Expr::BlockExpr(BlockExpr { syntax }),
+            RETURN_EXPR => Expr::ReturnExpr(ReturnExpr { syntax }),
+            MATCH_EXPR => Expr::MatchExpr(MatchExpr { syntax }),
+            RECORD_LIT => Expr::RecordLit(RecordLit { syntax }),
+            CALL_EXPR => Expr::CallExpr(CallExpr { syntax }),
+            INDEX_EXPR => Expr::IndexExpr(IndexExpr { syntax }),
+            METHOD_CALL_EXPR => Expr::MethodCallExpr(MethodCallExpr { syntax }),
+            FIELD_EXPR => Expr::FieldExpr(FieldExpr { syntax }),
+            AWAIT_EXPR => Expr::AwaitExpr(AwaitExpr { syntax }),
+            TRY_EXPR => Expr::TryExpr(TryExpr { syntax }),
+            TRY_BLOCK_EXPR => Expr::TryBlockExpr(TryBlockExpr { syntax }),
+            CAST_EXPR => Expr::CastExpr(CastExpr { syntax }),
+            REF_EXPR => Expr::RefExpr(RefExpr { syntax }),
+            PREFIX_EXPR => Expr::PrefixExpr(PrefixExpr { syntax }),
+            RANGE_EXPR => Expr::RangeExpr(RangeExpr { syntax }),
+            BIN_EXPR => Expr::BinExpr(BinExpr { syntax }),
+            LITERAL => Expr::Literal(Literal { syntax }),
+            MACRO_CALL => Expr::MacroCall(MacroCall { syntax }),
+            BOX_EXPR => Expr::BoxExpr(BoxExpr { syntax }),
+            _ => return None,
+        };
+        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
+        match self {
+            Expr::TupleExpr(it) => &it.syntax,
+            Expr::ArrayExpr(it) => &it.syntax,
+            Expr::ParenExpr(it) => &it.syntax,
+            Expr::PathExpr(it) => &it.syntax,
+            Expr::LambdaExpr(it) => &it.syntax,
+            Expr::IfExpr(it) => &it.syntax,
+            Expr::LoopExpr(it) => &it.syntax,
+            Expr::ForExpr(it) => &it.syntax,
+            Expr::WhileExpr(it) => &it.syntax,
+            Expr::ContinueExpr(it) => &it.syntax,
+            Expr::BreakExpr(it) => &it.syntax,
+            Expr::Label(it) => &it.syntax,
+            Expr::BlockExpr(it) => &it.syntax,
+            Expr::ReturnExpr(it) => &it.syntax,
+            Expr::MatchExpr(it) => &it.syntax,
+            Expr::RecordLit(it) => &it.syntax,
+            Expr::CallExpr(it) => &it.syntax,
+            Expr::IndexExpr(it) => &it.syntax,
+            Expr::MethodCallExpr(it) => &it.syntax,
+            Expr::FieldExpr(it) => &it.syntax,
+            Expr::AwaitExpr(it) => &it.syntax,
+            Expr::TryExpr(it) => &it.syntax,
+            Expr::TryBlockExpr(it) => &it.syntax,
+            Expr::CastExpr(it) => &it.syntax,
+            Expr::RefExpr(it) => &it.syntax,
+            Expr::PrefixExpr(it) => &it.syntax,
+            Expr::RangeExpr(it) => &it.syntax,
+            Expr::BinExpr(it) => &it.syntax,
+            Expr::Literal(it) => &it.syntax,
+            Expr::MacroCall(it) => &it.syntax,
+            Expr::BoxExpr(it) => &it.syntax,
+        }
    }
 }
-impl Visibility {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct WhereClause {
+pub enum Pat {
-    pub(crate) syntax: SyntaxNode,
+    RefPat(RefPat),
+    BoxPat(BoxPat),
+    BindPat(BindPat),
+    PlaceholderPat(PlaceholderPat),
+    DotDotPat(DotDotPat),
+    PathPat(PathPat),
+    RecordPat(RecordPat),
+    TupleStructPat(TupleStructPat),
+    TuplePat(TuplePat),
+    SlicePat(SlicePat),
+    RangePat(RangePat),
+    LiteralPat(LiteralPat),
 }
-impl AstNode for WhereClause {
+impl From<RefPat> for Pat {
+    fn from(node: RefPat) -> Pat {
+        Pat::RefPat(node)
+    }
+}
+impl From<BoxPat> for Pat {
+    fn from(node: BoxPat) -> Pat {
+        Pat::BoxPat(node)
+    }
+}
+impl From<BindPat> for Pat {
+    fn from(node: BindPat) -> Pat {
+        Pat::BindPat(node)
+    }
+}
+impl From<PlaceholderPat> for Pat {
+    fn from(node: PlaceholderPat) -> Pat {
+        Pat::PlaceholderPat(node)
+    }
+}
+impl From<DotDotPat> for Pat {
+    fn from(node: DotDotPat) -> Pat {
+        Pat::DotDotPat(node)
+    }
+}
+impl From<PathPat> for Pat {
+    fn from(node: PathPat) -> Pat {
+        Pat::PathPat(node)
+    }
+}
+impl From<RecordPat> for Pat {
+    fn from(node: RecordPat) -> Pat {
+        Pat::RecordPat(node)
+    }
+}
+impl From<TupleStructPat> for Pat {
+    fn from(node: TupleStructPat) -> Pat {
+        Pat::TupleStructPat(node)
+    }
+}
+impl From<TuplePat> for Pat {
+    fn from(node: TuplePat) -> Pat {
+        Pat::TuplePat(node)
+    }
+}
+impl From<SlicePat> for Pat {
+    fn from(node: SlicePat) -> Pat {
+        Pat::SlicePat(node)
+    }
+}
+impl From<RangePat> for Pat {
+    fn from(node: RangePat) -> Pat {
+        Pat::RangePat(node)
+    }
+}
+impl From<LiteralPat> for Pat {
+    fn from(node: LiteralPat) -> Pat {
+        Pat::LiteralPat(node)
+    }
+}
+impl AstNode for Pat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            WHERE_CLAUSE => true,
+            REF_PAT | BOX_PAT | BIND_PAT | PLACEHOLDER_PAT | DOT_DOT_PAT | PATH_PAT
+            | RECORD_PAT | TUPLE_STRUCT_PAT | TUPLE_PAT | SLICE_PAT | RANGE_PAT | LITERAL_PAT => {
+                true
+            }
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
+        let res = match syntax.kind() {
-            Some(Self { syntax })
+            REF_PAT => Pat::RefPat(RefPat { syntax }),
-        } else {
+            BOX_PAT => Pat::BoxPat(BoxPat { syntax }),
-            None
+            BIND_PAT => Pat::BindPat(BindPat { syntax }),
-        }
+            PLACEHOLDER_PAT => Pat::PlaceholderPat(PlaceholderPat { syntax }),
+            DOT_DOT_PAT => Pat::DotDotPat(DotDotPat { syntax }),
+            PATH_PAT => Pat::PathPat(PathPat { syntax }),
+            RECORD_PAT => Pat::RecordPat(RecordPat { syntax }),
+            TUPLE_STRUCT_PAT => Pat::TupleStructPat(TupleStructPat { syntax }),
+            TUPLE_PAT => Pat::TuplePat(TuplePat { syntax }),
+            SLICE_PAT => Pat::SlicePat(SlicePat { syntax }),
+            RANGE_PAT => Pat::RangePat(RangePat { syntax }),
+            LITERAL_PAT => Pat::LiteralPat(LiteralPat { syntax }),
+            _ => return None,
+        };
+        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
+        match self {
+            Pat::RefPat(it) => &it.syntax,
+            Pat::BoxPat(it) => &it.syntax,
+            Pat::BindPat(it) => &it.syntax,
+            Pat::PlaceholderPat(it) => &it.syntax,
+            Pat::DotDotPat(it) => &it.syntax,
+            Pat::PathPat(it) => &it.syntax,
+            Pat::RecordPat(it) => &it.syntax,
+            Pat::TupleStructPat(it) => &it.syntax,
+            Pat::TuplePat(it) => &it.syntax,
+            Pat::SlicePat(it) => &it.syntax,
+            Pat::RangePat(it) => &it.syntax,
+            Pat::LiteralPat(it) => &it.syntax,
+        }
    }
 }
-impl WhereClause {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-    pub fn predicates(&self) -> AstChildren<WherePred> {
+pub enum AttrInput {
-        AstChildren::new(&self.syntax)
+    Literal(Literal),
+    TokenTree(TokenTree),
+}
+impl From<Literal> for AttrInput {
+    fn from(node: Literal) -> AttrInput {
+        AttrInput::Literal(node)
    }
 }
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+impl From<TokenTree> for AttrInput {
-pub struct WherePred {
+    fn from(node: TokenTree) -> AttrInput {
-    pub(crate) syntax: SyntaxNode,
+        AttrInput::TokenTree(node)
+    }
 }
-impl AstNode for WherePred {
+impl AstNode for AttrInput {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            WHERE_PRED => true,
+            LITERAL | TOKEN_TREE => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
+        let res = match syntax.kind() {
-            Some(Self { syntax })
+            LITERAL => AttrInput::Literal(Literal { syntax }),
-        } else {
+            TOKEN_TREE => AttrInput::TokenTree(TokenTree { syntax }),
-            None
+            _ => return None,
-        }
+        };
+        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
+        match self {
+            AttrInput::Literal(it) => &it.syntax,
+            AttrInput::TokenTree(it) => &it.syntax,
+        }
    }
 }
-impl ast::TypeBoundsOwner for WherePred {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-impl WherePred {
+pub enum Stmt {
-    pub fn type_ref(&self) -> Option<TypeRef> {
+    ExprStmt(ExprStmt),
-        AstChildren::new(&self.syntax).next()
+    LetStmt(LetStmt),
+}
+impl From<ExprStmt> for Stmt {
+    fn from(node: ExprStmt) -> Stmt {
+        Stmt::ExprStmt(node)
    }
 }
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+impl From<LetStmt> for Stmt {
-pub struct WhileExpr {
+    fn from(node: LetStmt) -> Stmt {
-    pub(crate) syntax: SyntaxNode,
+        Stmt::LetStmt(node)
+    }
 }
-impl AstNode for WhileExpr {
+impl AstNode for Stmt {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            WHILE_EXPR => true,
+            EXPR_STMT | LET_STMT => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
+        let res = match syntax.kind() {
-            Some(Self { syntax })
+            EXPR_STMT => Stmt::ExprStmt(ExprStmt { syntax }),
-        } else {
+            LET_STMT => Stmt::LetStmt(LetStmt { syntax }),
-            None
+            _ => return None,
-        }
+        };
+        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
+        match self {
-    }
+            Stmt::ExprStmt(it) => &it.syntax,
-}
+            Stmt::LetStmt(it) => &it.syntax,
-impl ast::LoopBodyOwner for WhileExpr {}
+        }
-impl WhileExpr {
-    pub fn condition(&self) -> Option<Condition> {
-        AstChildren::new(&self.syntax).next()
    }
 }
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
deleted file mode 100644
index e43a724f0..000000000
--- a/crates/ra_syntax/src/grammar.ron
+++ /dev/null
@@ -1,736 +0,0 @@
-// Stores definitions which must be used in multiple places
-// See `cargo xtask codegen` (defined in xtasks/src/main.rs)
-Grammar(
-    punct: [
-        (";", "SEMI"),
-        (",", "COMMA"),
-        ("(", "L_PAREN"),
-        (")", "R_PAREN"),
-        ("{", "L_CURLY"),
-        ("}", "R_CURLY"),
-        ("[", "L_BRACK"),
-        ("]", "R_BRACK"),
-        ("<", "L_ANGLE"),
-        (">", "R_ANGLE"),
-        ("@", "AT"),
-        ("#", "POUND"),
-        ("~", "TILDE"),
-        ("?", "QUESTION"),
-        ("$", "DOLLAR"),
-        ("&", "AMP"),
-        ("|", "PIPE"),
-        ("+", "PLUS"),
-        ("*", "STAR"),
-        ("/", "SLASH"),
-        ("^", "CARET"),
-        ("%", "PERCENT"),
-        ("_", "UNDERSCORE"),
-        (".", "DOT"),
-        ("..", "DOTDOT"),
-        ("...", "DOTDOTDOT"),
-        ("..=", "DOTDOTEQ"),
-        (":", "COLON"),
-        ("::", "COLONCOLON"),
-        ("=", "EQ"),
-        ("==", "EQEQ"),
-        ("=>", "FAT_ARROW"),
-        ("!", "EXCL"),
-        ("!=", "NEQ"),
-        ("-", "MINUS"),
-        ("->", "THIN_ARROW"),
-        ("<=", "LTEQ"),
-        (">=", "GTEQ"),
-        ("+=", "PLUSEQ"),
-        ("-=", "MINUSEQ"),
-        ("|=", "PIPEEQ"),
-        ("&=", "AMPEQ"),
-        ("^=", "CARETEQ"),
-        ("/=", "SLASHEQ"),
-        ("*=", "STAREQ"),
-        ("%=", "PERCENTEQ"),
-        ("&&", "AMPAMP"),
-        ("||", "PIPEPIPE"),
-        ("<<", "SHL"),
-        (">>", "SHR"),
-        ("<<=", "SHLEQ"),
-        (">>=", "SHREQ"),
-    ],
-    keywords: [
-        "async",
-        "use",
-        "fn",
-        "struct",
-        "enum",
-        "trait",
-        "impl",
-        "dyn",
-        "true",
-        "false",
-        "as",
-        "extern",
-        "crate",
-        "mod",
-        "pub",
-        "self",
-        "super",
-        "in",
-        "where",
-        "for",
-        "loop",
-        "while",
-        "continue",
-        "break",
-        "if",
-        "else",
-        "match",
-        "const",
-        "static",
-        "mut",
-        "unsafe",
-        "type",
-        "ref",
-        "let",
-        "move",
-        "return",
-        "try",
-        "box",
-        "await",
-        "macro"
-    ],
-    contextual_keywords: [
-        "auto",
-        "default",
-        "existential",
-        "union",
-    ],
-    literals: [
-        "INT_NUMBER",
-        "FLOAT_NUMBER",
-        "CHAR",
-        "BYTE",
-        "STRING",
-        "RAW_STRING",
-        "BYTE_STRING",
-        "RAW_BYTE_STRING",
-    ],
-    tokens: [
-        "ERROR",
-        "IDENT",
-        "WHITESPACE",
-        "LIFETIME",
-        "COMMENT",
-        "SHEBANG",
-        "L_DOLLAR",
-        "R_DOLLAR",
-    ],
-    nodes: [
-        "SOURCE_FILE",
-        "STRUCT_DEF",
-        "UNION_DEF",
-        "ENUM_DEF",
-        "FN_DEF",
-        "RET_TYPE",
-        "EXTERN_CRATE_ITEM",
-        "MODULE",
-        "USE_ITEM",
-        "STATIC_DEF",
-        "CONST_DEF",
-        "TRAIT_DEF",
-        "IMPL_BLOCK",
-        "TYPE_ALIAS_DEF",
-        "MACRO_CALL",
-        "TOKEN_TREE",
-        "MACRO_DEF",
-        "PAREN_TYPE",
-        "TUPLE_TYPE",
-        "NEVER_TYPE",
-        "PATH_TYPE",
-        "POINTER_TYPE",
-        "ARRAY_TYPE",
-        "SLICE_TYPE",
-        "REFERENCE_TYPE",
-        "PLACEHOLDER_TYPE",
-        "FN_POINTER_TYPE",
-        "FOR_TYPE",
-        "IMPL_TRAIT_TYPE",
-        "DYN_TRAIT_TYPE",
-        "REF_PAT",
-        "BOX_PAT",
-        "BIND_PAT",
-        "PLACEHOLDER_PAT",
-        "DOT_DOT_PAT",
-        "PATH_PAT",
-        "RECORD_PAT",
-        "RECORD_FIELD_PAT_LIST",
-        "RECORD_FIELD_PAT",
-        "TUPLE_STRUCT_PAT",
-        "TUPLE_PAT",
-        "SLICE_PAT",
-        "RANGE_PAT",
-        "LITERAL_PAT",
-        // atoms
-        "TUPLE_EXPR",
-        "ARRAY_EXPR",
-        "PAREN_EXPR",
-        "PATH_EXPR",
-        "LAMBDA_EXPR",
-        "IF_EXPR",
-        "WHILE_EXPR",
-        "CONDITION",
-        "LOOP_EXPR",
-        "FOR_EXPR",
-        "CONTINUE_EXPR",
-        "BREAK_EXPR",
-        "LABEL",
-        "BLOCK_EXPR",
-        "RETURN_EXPR",
-        "MATCH_EXPR",
-        "MATCH_ARM_LIST",
-        "MATCH_ARM",
-        "MATCH_GUARD",
-        "RECORD_LIT",
-        "RECORD_FIELD_LIST",
-        "RECORD_FIELD",
-        "TRY_BLOCK_EXPR",
-        "BOX_EXPR",
-        // postfix
-        "CALL_EXPR",
-        "INDEX_EXPR",
-        "METHOD_CALL_EXPR",
-        "FIELD_EXPR",
-        "AWAIT_EXPR",
-        "TRY_EXPR",
-        "CAST_EXPR",
-        // unary
-        "REF_EXPR",
-        "PREFIX_EXPR",
-        "RANGE_EXPR", // just weird
-        "BIN_EXPR",
-        "BLOCK",
-        "EXTERN_BLOCK",
-        "EXTERN_ITEM_LIST",
-        "ENUM_VARIANT",
-        "RECORD_FIELD_DEF_LIST",
-        "RECORD_FIELD_DEF",
-        "TUPLE_FIELD_DEF_LIST",
-        "TUPLE_FIELD_DEF",
-        "ENUM_VARIANT_LIST",
-        "ITEM_LIST",
-        "ATTR",
-        "META_ITEM", // not an item actually
-        "USE_TREE",
-        "USE_TREE_LIST",
-        "PATH",
-        "PATH_SEGMENT",
-        "LITERAL",
-        "ALIAS",
-        "VISIBILITY",
-        "WHERE_CLAUSE",
-        "WHERE_PRED",
-        "ABI",
-        "NAME",
-        "NAME_REF",
-        "LET_STMT",
-        "EXPR_STMT",
-        "TYPE_PARAM_LIST",
-        "LIFETIME_PARAM",
-        "TYPE_PARAM",
-        "CONST_PARAM",
-        "TYPE_ARG_LIST",
-        "LIFETIME_ARG",
-        "TYPE_ARG",
-        "ASSOC_TYPE_ARG",
-        "PARAM_LIST",
-        "PARAM",
-        "SELF_PARAM",
-        "ARG_LIST",
-        "TYPE_BOUND",
-        "TYPE_BOUND_LIST",
-        // macro related
-        "MACRO_ITEMS",
-        "MACRO_STMTS",
-    ],
-    ast: {
-        "SourceFile": (
-            traits: [ "ModuleItemOwner", "FnDefOwner" ],
-            collections: [
-                ("modules", "Module"),
-            ]
-        ),
-        "FnDef": (
-            traits: [
-                "VisibilityOwner",
-                "NameOwner",
-                "TypeParamsOwner",
-                "AttrsOwner",
-                "DocCommentsOwner"
-            ],
-            options: [ "ParamList", ["body", "BlockExpr"], "RetType" ],
-        ),
-        "RetType": (options: ["TypeRef"]),
-        "StructDef": (
-            traits: [
-                "VisibilityOwner",
-                "NameOwner",
-                "TypeParamsOwner",
-                "AttrsOwner",
-                "DocCommentsOwner"
-            ]
-        ),
-        "UnionDef": (
-            traits: [
-                "VisibilityOwner",
-                "NameOwner",
-                "TypeParamsOwner",
-                "AttrsOwner",
-                "DocCommentsOwner"
-            ],
-            options: ["RecordFieldDefList"],
-        ),
-        "RecordFieldDefList": (collections: [("fields", "RecordFieldDef")]),
-        "RecordFieldDef": (
-            traits: [
-                "VisibilityOwner",
-                "NameOwner",
-                "AttrsOwner",
-                "DocCommentsOwner",
-                "TypeAscriptionOwner"
-            ]
-        ),
-        "TupleFieldDefList": (collections: [("fields", "TupleFieldDef")]),
-        "TupleFieldDef": ( traits: ["VisibilityOwner", "AttrsOwner"], options: ["TypeRef"]),
-        "EnumDef": ( traits: [
-            "VisibilityOwner",
-            "NameOwner",
-            "TypeParamsOwner",
-            "AttrsOwner",
-            "DocCommentsOwner"
-        ], options: [["variant_list", "EnumVariantList"]] ),
-        "EnumVariantList": ( collections: [("variants", "EnumVariant")] ),
-        "EnumVariant": ( traits: ["NameOwner", "DocCommentsOwner", "AttrsOwner"], options: ["Expr"] ),
-        "TraitDef": (
-            traits: ["VisibilityOwner", "NameOwner", "AttrsOwner", "DocCommentsOwner", "TypeParamsOwner", "TypeBoundsOwner"],
-            options: ["ItemList"]
-        ),
-        "Module": (
-            traits: ["VisibilityOwner", "NameOwner", "AttrsOwner", "DocCommentsOwner" ],
-            options: [ "ItemList" ]
-        ),
-        "ItemList": (
-            collections: [("impl_items", "ImplItem")],
-            traits: [ "FnDefOwner", "ModuleItemOwner" ],
-        ),
-        "ConstDef": (
-            traits: [
-                "VisibilityOwner",
-                "NameOwner",
-                "TypeParamsOwner",
-                "AttrsOwner",
-                "DocCommentsOwner",
-                "TypeAscriptionOwner",
-            ],
-            options: [ ["body","Expr"]],
-        ),
-        "StaticDef": (
-            traits: [
-                "VisibilityOwner",
-                "NameOwner",
-                "TypeParamsOwner",
-                "AttrsOwner",
-                "DocCommentsOwner",
-                "TypeAscriptionOwner",
-            ],
-            options: [ ["body","Expr"]],
-        ),
-        "TypeAliasDef": (
-            traits: [
-                "VisibilityOwner",
-                "NameOwner",
-                "TypeParamsOwner",
-                "AttrsOwner",
-                "DocCommentsOwner",
-                "TypeBoundsOwner",
-            ],
-            options: ["TypeRef"]
-        ),
-        "ImplBlock": (options: ["ItemList"], traits: ["TypeParamsOwner", "AttrsOwner"]),
-        "ParenType": (options: ["TypeRef"]),
-        "TupleType": ( collections: [("fields", "TypeRef")] ),
-        "NeverType": (),
-        "PathType": (options: ["Path"]),
-        "PointerType": (options: ["TypeRef"]),
-        "ArrayType": ( options: ["TypeRef", "Expr"] ),
-        "SliceType": ( options: ["TypeRef"] ),
-        "ReferenceType": (options: ["TypeRef"]),
-        "PlaceholderType": (),
-        "FnPointerType": (options: ["ParamList", "RetType"]),
-        "ForType": (options: ["TypeRef"]),
-        "ImplTraitType": (
-            traits: ["TypeBoundsOwner"],
-        ),
-        "DynTraitType": (
-            traits: ["TypeBoundsOwner"],
-        ),
-        "TypeRef": ( enum: [
-            "ParenType",
-            "TupleType",
-            "NeverType",
-            "PathType",
-            "PointerType",
-            "ArrayType",
-            "SliceType",
-            "ReferenceType",
-            "PlaceholderType",
-            "FnPointerType",
-            "ForType",
-            "ImplTraitType",
-            "DynTraitType",
-        ]),
-        "NominalDef": (
-            enum: ["StructDef", "EnumDef", "UnionDef"],
-            traits: [
-                "NameOwner",
-                "TypeParamsOwner",
-                "AttrsOwner"
-            ],
-        ),
-        "ModuleItem": (
-            enum: ["StructDef", "UnionDef", "EnumDef", "FnDef", "TraitDef", "TypeAliasDef", "ImplBlock",
-                   "UseItem", "ExternCrateItem", "ConstDef", "StaticDef", "Module" ],
-            traits: ["AttrsOwner", "VisibilityOwner"],
-        ),
-        "ImplItem": (
-            enum: ["FnDef", "TypeAliasDef", "ConstDef"],
-            traits: ["AttrsOwner"]
-        ),
-        "TupleExpr": (
-            collections: [("exprs", "Expr")]
-        ),
-        "ArrayExpr": (
-            collections: [("exprs", "Expr")]
-        ),
-        "ParenExpr": (options: ["Expr"]),
-        "PathExpr": (options: ["Path"]),
-        "LambdaExpr": (
-            options: [
-                "ParamList", "RetType",
-                ["body", "Expr"],
-            ]
-        ),
-        "IfExpr": (
-            options: [ "Condition" ]
-        ),
-        "LoopExpr": (
-            traits: ["LoopBodyOwner"],
-        ),
-        "TryBlockExpr": (
-            options: [["body", "BlockExpr"]],
-        ),
-        "ForExpr": (
-            traits: ["LoopBodyOwner"],
-            options: [
-                "Pat",
-                ["iterable", "Expr"],
-            ]
-        ),
-        "WhileExpr": (
-            traits: ["LoopBodyOwner"],
-            options: [ "Condition" ]
-        ),
-        "ContinueExpr": (),
-        "BreakExpr": (options: ["Expr"]),
-        "Label": (),
-        "BlockExpr": (
-            options: [ "Block" ]
-        ),
-        "ReturnExpr": (options: ["Expr"]),
-        "MatchExpr": (
-            options: [ "Expr", "MatchArmList" ],
-        ),
-        "MatchArmList": (
-            collections: [ ("arms", "MatchArm") ],
-            traits: [ "AttrsOwner" ]
-        ),
-        "MatchArm": (
-            options: [
-                [ "guard", "MatchGuard" ],
-                "Expr",
-            ],
-            collections: [ ("pats", "Pat") ],
-            traits: [ "AttrsOwner" ]
-        ),
-        "MatchGuard": (options: ["Expr"]),
-        "RecordLit": (options: ["Path", "RecordFieldList"]),
-        "RecordFieldList": (
-            collections: [ ("fields", "RecordField") ],
-            options: [["spread", "Expr"]]
-        ),
-        "RecordField": (options: ["NameRef", "Expr"]),
-        "CallExpr": (
-            traits: ["ArgListOwner"],
-            options: [ "Expr" ],
-        ),
-        "MethodCallExpr": (
-            traits: ["ArgListOwner"],
-            options: [ "Expr", "NameRef", "TypeArgList" ],
-        ),
-        "IndexExpr": (),
-        "FieldExpr": (options: ["Expr", "NameRef"]),
-        "AwaitExpr": (options: ["Expr"]),
-        "TryExpr": (options: ["Expr"]),
-        "CastExpr": (options: ["Expr", "TypeRef"]),
-        "RefExpr": (options: ["Expr"]),
-        "PrefixExpr": (options: ["Expr"]),
-        "BoxExpr": (options: ["Expr"]),
-        "RangeExpr": (),
-        "BinExpr": (),
-        "Literal": (),
-        "Expr": (
-            enum: [
-                "TupleExpr",
-                "ArrayExpr",
-                "ParenExpr",
-                "PathExpr",
-                "LambdaExpr",
-                "IfExpr",
-                "LoopExpr",
-                "ForExpr",
-                "WhileExpr",
-                "ContinueExpr",
-                "BreakExpr",
-                "Label",
-                "BlockExpr",
-                "ReturnExpr",
-                "MatchExpr",
-                "RecordLit",
-                "CallExpr",
-                "IndexExpr",
-                "MethodCallExpr",
-                "FieldExpr",
-                "AwaitExpr",
-                "TryExpr",
-                "TryBlockExpr",
-                "CastExpr",
-                "RefExpr",
-                "PrefixExpr",
-                "RangeExpr",
-                "BinExpr",
-                "Literal",
-                "MacroCall",
-                "BoxExpr",
-            ],
-        ),
-        "RefPat": ( options: [ "Pat" ]),
-        "BoxPat": ( options: [ "Pat" ]),
-        "BindPat": (
-            options: [ "Pat" ],
-            traits: ["NameOwner"]
-        ),
-        "PlaceholderPat": (),
-        "DotDotPat": (),
-        "PathPat": ( options: [ "Path" ] ),
-        "RecordPat": ( options: ["RecordFieldPatList", "Path"] ),
-        "RecordFieldPatList": (
-            collections: [
-                ("record_field_pats", "RecordFieldPat"),
-                ("bind_pats", "BindPat"),
-            ]
-        ),
-        "RecordFieldPat": (
-            traits: ["NameOwner"],
-            options: ["Pat"]
-        ),
-        "TupleStructPat": (
-            options: ["Path"],
-            collections: [("args", "Pat")],
-        ),
-        "TuplePat": ( collections: [("args", "Pat")] ),
-        "SlicePat": (),
-        "RangePat": (),
-        "LiteralPat": (options: ["Literal"]),
-        "Pat": (
-            enum: [
-                "RefPat",
-                "BoxPat",
-                "BindPat",
-                "PlaceholderPat",
-                "DotDotPat",
-                "PathPat",
-                "RecordPat",
-                "TupleStructPat",
-                "TuplePat",
-                "SlicePat",
-                "RangePat",
-                "LiteralPat",
-            ],
-        ),
-        "Visibility": (),
-        "Name": (),
-        "NameRef": (),
-        "MacroCall": (
-            traits: [ "NameOwner", "AttrsOwner","DocCommentsOwner" ],
-            options: [ "TokenTree", "Path" ],
-        ),
-        "AttrInput": ( enum: [ "Literal", "TokenTree" ] ),
-        "Attr": ( options: [ "Path", [ "input", "AttrInput" ] ] ),
-        "TokenTree": (),
-        "TypeParamList": (
-            collections: [
-                ("type_params", "TypeParam" ),
-                ("lifetime_params", "LifetimeParam" ),
-            ]
-        ),
-        "TypeParam": (
-            options: [("default_type", "TypeRef")],
-            traits: ["NameOwner", "AttrsOwner", "TypeBoundsOwner"],
-        ),
-        "ConstParam": (
-            options: [("default_val", "Expr")],
-            traits: ["NameOwner", "AttrsOwner", "TypeAscriptionOwner"],
-        ),
-        "LifetimeParam": (
-            traits: ["AttrsOwner"],
-        ),
-        "TypeBound": (
-            options: [
-                "TypeRef",
-            ]
-        ),
-        "TypeBoundList": (
-            collections: [
-                ("bounds", "TypeBound"),
-            ]
-        ),
-        "WherePred": (
-            options: [
-                "TypeRef",
-            ],
-            traits: [
-                "TypeBoundsOwner",
-            ],
-        ),
-        "WhereClause": (
-            collections: [
-                ("predicates", "WherePred"),
-            ],
-        ),
-        "ExprStmt": (
-            options: [ ["expr", "Expr"] ]
-        ),
-        "LetStmt": (
-            options: [
-                ["pat", "Pat"],
-                ["initializer", "Expr"],
-            ],
-            traits: [
-                "TypeAscriptionOwner",
-            ]
-        ),
-        "Condition": (
-            options: [ "Pat", "Expr" ]
-        ),
-        "Stmt": (
-            enum: ["ExprStmt", "LetStmt"],
-        ),
-        "Block": (
-            options: [ "Expr" ],
-            collections: [
-                ("statements", "Stmt"),
-            ],
-            traits: [
-                "AttrsOwner",
-                "ModuleItemOwner",
-            ]
-        ),
-        "ParamList": (
-            options: [ "SelfParam" ],
-            collections: [
-                ("params", "Param"),
-            ]
-        ),
-        "SelfParam": (
-            traits: [
-                "TypeAscriptionOwner",
-                "AttrsOwner",
-            ]
-        ),
-        "Param": (
-            options: [ "Pat" ],
-            traits: [
-                "TypeAscriptionOwner",
-                "AttrsOwner",
-            ]
-        ),
-        "UseItem": (
-            traits: ["AttrsOwner", "VisibilityOwner"],
-            options: [ "UseTree" ],
-        ),
-        "UseTree": (
-            options: [ "Path", "UseTreeList", "Alias" ]
-        ),
-        "Alias": (
-            traits: ["NameOwner"],
-        ),
-        "UseTreeList": (
-            collections: [("use_trees", "UseTree")]
-        ),
-        "ExternCrateItem": (
-            traits: ["AttrsOwner", "VisibilityOwner"],
-            options: ["NameRef", "Alias"],
-        ),
-        "ArgList": (
-            collections: [
-                ("args", "Expr"),
-            ]
-        ),
-        "Path": (
-            options: [
-                ["segment", "PathSegment"],
-                ["qualifier", "Path"],
-            ]
-        ),
-        "PathSegment": (
-            options: [ "NameRef", "TypeArgList", "ParamList", "RetType", "PathType" ]
-        ),
-        "TypeArgList": (collections: [
-            ("type_args", "TypeArg"),
-            ("lifetime_args", "LifetimeArg"),
-            ("assoc_type_args", "AssocTypeArg"),
-        ]),
-        "TypeArg": (options: ["TypeRef"]),
-        "AssocTypeArg": (options: ["NameRef", "TypeRef"]),
-        "LifetimeArg": (),
-        "MacroItems": (
-            traits: [ "ModuleItemOwner", "FnDefOwner" ],
-        ),
-        "MacroStmts" : (
-            options: [ "Expr" ],
-            collections: [
-                ("statements", "Stmt"),
-            ],
-        )
-    },
-)
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs
index 385c43131..0d07d7651 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs
@@ -1 +1 @@
-type A = B<'static, i32, Item=u64>;
+type A = B<'static, i32, 1, { 2 }, Item=u64>;
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.txt b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.txt
index 4786bf77a..025faf5ca 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.txt
@@ -1,5 +1,5 @@
-SOURCE_FILE@[0; 36)
+SOURCE_FILE@[0; 46)
-  TYPE_ALIAS_DEF@[0; 35)
+  TYPE_ALIAS_DEF@[0; 45)
    TYPE_KW@[0; 4) "type"
    WHITESPACE@[4; 5) " "
    NAME@[5; 6)
@@ -7,12 +7,12 @@ SOURCE_FILE@[0; 36)
    WHITESPACE@[6; 7) " "
    EQ@[7; 8) "="
    WHITESPACE@[8; 9) " "
-    PATH_TYPE@[9; 34)
+    PATH_TYPE@[9; 44)
-      PATH@[9; 34)
+      PATH@[9; 44)
-        PATH_SEGMENT@[9; 34)
+        PATH_SEGMENT@[9; 44)
          NAME_REF@[9; 10)
            IDENT@[9; 10) "B"
-          TYPE_ARG_LIST@[10; 34)
+          TYPE_ARG_LIST@[10; 44)
            L_ANGLE@[10; 11) "<"
            LIFETIME_ARG@[11; 18)
              LIFETIME@[11; 18) "\'static"
@@ -26,15 +26,30 @@ SOURCE_FILE@[0; 36)
                      IDENT@[20; 23) "i32"
            COMMA@[23; 24) ","
            WHITESPACE@[24; 25) " "
-            ASSOC_TYPE_ARG@[25; 33)
+            CONST_ARG@[25; 26)
-              NAME_REF@[25; 29)
+              INT_NUMBER@[25; 26) "1"
-                IDENT@[25; 29) "Item"
+            COMMA@[26; 27) ","
-              EQ@[29; 30) "="
+            WHITESPACE@[27; 28) " "
-              PATH_TYPE@[30; 33)
+            CONST_ARG@[28; 33)
-                PATH@[30; 33)
+              BLOCK_EXPR@[28; 33)
-                  PATH_SEGMENT@[30; 33)
+                BLOCK@[28; 33)
-                    NAME_REF@[30; 33)
+                  L_CURLY@[28; 29) "{"
-                      IDENT@[30; 33) "u64"
+                  WHITESPACE@[29; 30) " "
-            R_ANGLE@[33; 34) ">"
+                  LITERAL@[30; 31)
-    SEMI@[34; 35) ";"
+                    INT_NUMBER@[30; 31) "2"
-  WHITESPACE@[35; 36) "\n"
+                  WHITESPACE@[31; 32) " "
+                  R_CURLY@[32; 33) "}"
+            COMMA@[33; 34) ","
+            WHITESPACE@[34; 35) " "
+            ASSOC_TYPE_ARG@[35; 43)
+              NAME_REF@[35; 39)
+                IDENT@[35; 39) "Item"
+              EQ@[39; 40) "="
+              PATH_TYPE@[40; 43)
+                PATH@[40; 43)
+                  PATH_SEGMENT@[40; 43)
+                    NAME_REF@[40; 43)
+                      IDENT@[40; 43) "u64"
+            R_ANGLE@[43; 44) ">"
+    SEMI@[44; 45) ";"
+  WHITESPACE@[45; 46) "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rs b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rs
new file mode 100644
index 000000000..cb0a105c2
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rs
@@ -0,0 +1 @@
+impl<const N: u32> Bar<N> {}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.txt b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.txt
new file mode 100644
index 000000000..47fadef85
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.txt
@@ -0,0 +1,38 @@
+SOURCE_FILE@[0; 29)
+  IMPL_BLOCK@[0; 28)
+    IMPL_KW@[0; 4) "impl"
+    TYPE_PARAM_LIST@[4; 18)
+      L_ANGLE@[4; 5) "<"
+      CONST_PARAM@[5; 17)
+        CONST_KW@[5; 10) "const"
+        WHITESPACE@[10; 11) " "
+        NAME@[11; 12)
+          IDENT@[11; 12) "N"
+        COLON@[12; 13) ":"
+        WHITESPACE@[13; 14) " "
+        PATH_TYPE@[14; 17)
+          PATH@[14; 17)
+            PATH_SEGMENT@[14; 17)
+              NAME_REF@[14; 17)
+                IDENT@[14; 17) "u32"
+      R_ANGLE@[17; 18) ">"
+    WHITESPACE@[18; 19) " "
+    PATH_TYPE@[19; 25)
+      PATH@[19; 25)
+        PATH_SEGMENT@[19; 25)
+          NAME_REF@[19; 22)
+            IDENT@[19; 22) "Bar"
+          TYPE_ARG_LIST@[22; 25)
+            L_ANGLE@[22; 23) "<"
+            TYPE_ARG@[23; 24)
+              PATH_TYPE@[23; 24)
+                PATH@[23; 24)
+                  PATH_SEGMENT@[23; 24)
+                    NAME_REF@[23; 24)
+                      IDENT@[23; 24) "N"
+            R_ANGLE@[24; 25) ">"
+    WHITESPACE@[25; 26) " "
+    ITEM_LIST@[26; 28)
+      L_CURLY@[26; 27) "{"
+      R_CURLY@[27; 28) "}"
+  WHITESPACE@[28; 29) "\n"
diff --git a/docs/dev/lsp-features.md b/docs/dev/lsp-features.md
index d3e79b8be..00b0867d7 100644
--- a/docs/dev/lsp-features.md
+++ b/docs/dev/lsp-features.md
@@ -41,7 +41,7 @@ This list documents LSP features, supported by rust-analyzer.
 - trigger characters: `:`, `.`
 - [x] [textDocument/hover](https://microsoft.github.io/language-server-protocol/specification#textDocument_hover)
 - [x] [textDocument/signatureHelp](https://microsoft.github.io/language-server-protocol/specification#textDocument_signatureHelp)
- - trigger characters: `(`,  `,`,  `)`
+ - trigger characters: `(`,  `,`
 - [ ] [textDocument/declaration](https://microsoft.github.io/language-server-protocol/specification#textDocument_declaration)
 - [x] [textDocument/definition](https://microsoft.github.io/language-server-protocol/specification#textDocument_definition)
 - [x] [textDocument/typeDefinition](https://microsoft.github.io/language-server-protocol/specification#textDocument_typeDefinition)
@@ -58,7 +58,7 @@ This list documents LSP features, supported by rust-analyzer.
 - rust-analyzer.run
 - rust-analyzer.analyzerStatus
 - [x] [textDocument/codeLens](https://microsoft.github.io/language-server-protocol/specification#textDocument_codeLens)
- [ ] [textDocument/documentLink](https://microsoft.github.io/language-server-protocol/specification#codeLens_resolve)
+- [x] [codeLens/resolve](https://microsoft.github.io/language-server-protocol/specification#codeLens_resolve)
 - [ ] [documentLink/resolve](https://microsoft.github.io/language-server-protocol/specification#documentLink_resolve)
 - [ ] [textDocument/documentColor](https://microsoft.github.io/language-server-protocol/specification#textDocument_documentColor)
 - [ ] [textDocument/colorPresentation](https://microsoft.github.io/language-server-protocol/specification#textDocument_colorPresentation)
diff --git a/docs/user/README.md b/docs/user/README.md
index 8cf4b68fd..fa202f06c 100644
--- a/docs/user/README.md
+++ b/docs/user/README.md
@@ -44,6 +44,10 @@ $ cargo xtask install
 The automatic installation is expected to *just work* for common cases, if it
 doesn't, report bugs!
+**Note** [#1831](https://github.com/rust-analyzer/rust-analyzer/issues/1831): If you are using the popular 
+[Vim emulation plugin](https://github.com/VSCodeVim/Vim), you will likely
+need to turn off the `rust-analyzer.enableEnhancedTyping` setting.
 If you have an unusual setup (for example, `code` is not in the `PATH`), you
 should adapt these manual installation instructions:
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 743384bd7..1ff64a930 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -1,5 +1,6 @@
 import { homedir } from 'os';
 import * as lc from 'vscode-languageclient';
+import { spawnSync } from 'child_process';
 import { window, workspace } from 'vscode';
 import { Config } from './config';
@@ -13,6 +14,9 @@ export function createClient(config: Config): lc.LanguageClient {
    }
    const command = expandPathResolving(config.raLspServerPath);
+    if (spawnSync(command, ["--version"]).status !== 0) {
+        window.showErrorMessage(`Unable to execute '${command} --version'`);
+    }
    const run: lc.Executable = {
        command,
        options: { cwd: folder },
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 65cabf005..72dd5e581 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -13,6 +13,4 @@ walkdir = "2.1.3"
 pico-args = "0.3.0"
 quote = "1.0.2"
 proc-macro2 = "1.0.1"
-ron = "0.5.1"
-serde = { version = "1.0.0", features = ["derive"] }
 anyhow = "1.0.19"
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
new file mode 100644
index 000000000..67d1f41bc
--- /dev/null
+++ b/xtask/src/ast_src.rs
@@ -0,0 +1,621 @@
+pub(crate) struct KindsSrc<'a> {
+    pub(crate) punct: &'a [(&'a str, &'a str)],
+    pub(crate) keywords: &'a [&'a str],
+    pub(crate) contextual_keywords: &'a [&'a str],
+    pub(crate) literals: &'a [&'a str],
+    pub(crate) tokens: &'a [&'a str],
+    pub(crate) nodes: &'a [&'a str],
+}
+pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
+    punct: &[
+        (";", "SEMI"),
+        (",", "COMMA"),
+        ("(", "L_PAREN"),
+        (")", "R_PAREN"),
+        ("{", "L_CURLY"),
+        ("}", "R_CURLY"),
+        ("[", "L_BRACK"),
+        ("]", "R_BRACK"),
+        ("<", "L_ANGLE"),
+        (">", "R_ANGLE"),
+        ("@", "AT"),
+        ("#", "POUND"),
+        ("~", "TILDE"),
+        ("?", "QUESTION"),
+        ("$", "DOLLAR"),
+        ("&", "AMP"),
+        ("|", "PIPE"),
+        ("+", "PLUS"),
+        ("*", "STAR"),
+        ("/", "SLASH"),
+        ("^", "CARET"),
+        ("%", "PERCENT"),
+        ("_", "UNDERSCORE"),
+        (".", "DOT"),
+        ("..", "DOTDOT"),
+        ("...", "DOTDOTDOT"),
+        ("..=", "DOTDOTEQ"),
+        (":", "COLON"),
+        ("::", "COLONCOLON"),
+        ("=", "EQ"),
+        ("==", "EQEQ"),
+        ("=>", "FAT_ARROW"),
+        ("!", "EXCL"),
+        ("!=", "NEQ"),
+        ("-", "MINUS"),
+        ("->", "THIN_ARROW"),
+        ("<=", "LTEQ"),
+        (">=", "GTEQ"),
+        ("+=", "PLUSEQ"),
+        ("-=", "MINUSEQ"),
+        ("|=", "PIPEEQ"),
+        ("&=", "AMPEQ"),
+        ("^=", "CARETEQ"),
+        ("/=", "SLASHEQ"),
+        ("*=", "STAREQ"),
+        ("%=", "PERCENTEQ"),
+        ("&&", "AMPAMP"),
+        ("||", "PIPEPIPE"),
+        ("<<", "SHL"),
+        (">>", "SHR"),
+        ("<<=", "SHLEQ"),
+        (">>=", "SHREQ"),
+    ],
+    keywords: &[
+        "as", "async", "await", "box", "break", "const", "continue", "crate", "dyn", "else",
+        "enum", "extern", "false", "fn", "for", "if", "impl", "in", "let", "loop", "macro",
+        "match", "mod", "move", "mut", "pub", "ref", "return", "self", "static", "struct", "super",
+        "trait", "true", "try", "type", "unsafe", "use", "where", "while",
+    ],
+    contextual_keywords: &["auto", "default", "existential", "union"],
+    literals: &[
+        "INT_NUMBER",
+        "FLOAT_NUMBER",
+        "CHAR",
+        "BYTE",
+        "STRING",
+        "RAW_STRING",
+        "BYTE_STRING",
+        "RAW_BYTE_STRING",
+    ],
+    tokens: &[
+        "ERROR",
+        "IDENT",
+        "WHITESPACE",
+        "LIFETIME",
+        "COMMENT",
+        "SHEBANG",
+        "L_DOLLAR",
+        "R_DOLLAR",
+    ],
+    nodes: &[
+        "SOURCE_FILE",
+        "STRUCT_DEF",
+        "UNION_DEF",
+        "ENUM_DEF",
+        "FN_DEF",
+        "RET_TYPE",
+        "EXTERN_CRATE_ITEM",
+        "MODULE",
+        "USE_ITEM",
+        "STATIC_DEF",
+        "CONST_DEF",
+        "TRAIT_DEF",
+        "IMPL_BLOCK",
+        "TYPE_ALIAS_DEF",
+        "MACRO_CALL",
+        "TOKEN_TREE",
+        "MACRO_DEF",
+        "PAREN_TYPE",
+        "TUPLE_TYPE",
+        "NEVER_TYPE",
+        "PATH_TYPE",
+        "POINTER_TYPE",
+        "ARRAY_TYPE",
+        "SLICE_TYPE",
+        "REFERENCE_TYPE",
+        "PLACEHOLDER_TYPE",
+        "FN_POINTER_TYPE",
+        "FOR_TYPE",
+        "IMPL_TRAIT_TYPE",
+        "DYN_TRAIT_TYPE",
+        "REF_PAT",
+        "BOX_PAT",
+        "BIND_PAT",
+        "PLACEHOLDER_PAT",
+        "DOT_DOT_PAT",
+        "PATH_PAT",
+        "RECORD_PAT",
+        "RECORD_FIELD_PAT_LIST",
+        "RECORD_FIELD_PAT",
+        "TUPLE_STRUCT_PAT",
+        "TUPLE_PAT",
+        "SLICE_PAT",
+        "RANGE_PAT",
+        "LITERAL_PAT",
+        // atoms
+        "TUPLE_EXPR",
+        "ARRAY_EXPR",
+        "PAREN_EXPR",
+        "PATH_EXPR",
+        "LAMBDA_EXPR",
+        "IF_EXPR",
+        "WHILE_EXPR",
+        "CONDITION",
+        "LOOP_EXPR",
+        "FOR_EXPR",
+        "CONTINUE_EXPR",
+        "BREAK_EXPR",
+        "LABEL",
+        "BLOCK_EXPR",
+        "RETURN_EXPR",
+        "MATCH_EXPR",
+        "MATCH_ARM_LIST",
+        "MATCH_ARM",
+        "MATCH_GUARD",
+        "RECORD_LIT",
+        "RECORD_FIELD_LIST",
+        "RECORD_FIELD",
+        "TRY_BLOCK_EXPR",
+        "BOX_EXPR",
+        // postfix
+        "CALL_EXPR",
+        "INDEX_EXPR",
+        "METHOD_CALL_EXPR",
+        "FIELD_EXPR",
+        "AWAIT_EXPR",
+        "TRY_EXPR",
+        "CAST_EXPR",
+        // unary
+        "REF_EXPR",
+        "PREFIX_EXPR",
+        "RANGE_EXPR", // just weird
+        "BIN_EXPR",
+        "BLOCK",
+        "EXTERN_BLOCK",
+        "EXTERN_ITEM_LIST",
+        "ENUM_VARIANT",
+        "RECORD_FIELD_DEF_LIST",
+        "RECORD_FIELD_DEF",
+        "TUPLE_FIELD_DEF_LIST",
+        "TUPLE_FIELD_DEF",
+        "ENUM_VARIANT_LIST",
+        "ITEM_LIST",
+        "ATTR",
+        "META_ITEM", // not an item actually
+        "USE_TREE",
+        "USE_TREE_LIST",
+        "PATH",
+        "PATH_SEGMENT",
+        "LITERAL",
+        "ALIAS",
+        "VISIBILITY",
+        "WHERE_CLAUSE",
+        "WHERE_PRED",
+        "ABI",
+        "NAME",
+        "NAME_REF",
+        "LET_STMT",
+        "EXPR_STMT",
+        "TYPE_PARAM_LIST",
+        "LIFETIME_PARAM",
+        "TYPE_PARAM",
+        "CONST_PARAM",
+        "TYPE_ARG_LIST",
+        "LIFETIME_ARG",
+        "TYPE_ARG",
+        "ASSOC_TYPE_ARG",
+        "CONST_ARG",
+        "PARAM_LIST",
+        "PARAM",
+        "SELF_PARAM",
+        "ARG_LIST",
+        "TYPE_BOUND",
+        "TYPE_BOUND_LIST",
+        // macro related
+        "MACRO_ITEMS",
+        "MACRO_STMTS",
+    ],
+};
+pub(crate) struct AstSrc<'a> {
+    pub(crate) nodes: &'a [AstNodeSrc<'a>],
+    pub(crate) enums: &'a [AstEnumSrc<'a>],
+}
+pub(crate) struct AstNodeSrc<'a> {
+    pub(crate) name: &'a str,
+    pub(crate) traits: &'a [&'a str],
+    pub(crate) fields: &'a [(&'a str, FieldSrc<&'a str>)],
+}
+pub(crate) enum FieldSrc<T> {
+    Shorthand,
+    Optional(T),
+    Many(T),
+}
+pub(crate) struct AstEnumSrc<'a> {
+    pub(crate) name: &'a str,
+    pub(crate) traits: &'a [&'a str],
+    pub(crate) variants: &'a [&'a str],
+}
+macro_rules! ast_nodes {
+    ($(
+        struct $name:ident$(: $($trait:ident),*)? {
+            $($field_name:ident $(: $ty:tt)?),*$(,)?
+        }
+    )*) => {
+        [$(
+            AstNodeSrc {
+                name: stringify!($name),
+                traits: &[$($(stringify!($trait)),*)?],
+                fields: &[$(
+                    (stringify!($field_name), field_ty!($field_name $($ty)?))
+                ),*],
+            }
+        ),*]
+    };
+}
+macro_rules! field_ty {
+    ($field_name:ident) => {
+        FieldSrc::Shorthand
+    };
+    ($field_name:ident [$ty:ident]) => {
+        FieldSrc::Many(stringify!($ty))
+    };
+    ($field_name:ident $ty:ident) => {
+        FieldSrc::Optional(stringify!($ty))
+    };
+}
+macro_rules! ast_enums {
+    ($(
+        enum $name:ident $(: $($trait:ident),*)? {
+            $($variant:ident),*$(,)?
+        }
+    )*) => {
+        [$(
+            AstEnumSrc {
+                name: stringify!($name),
+                traits: &[$($(stringify!($trait)),*)?],
+                variants: &[$(stringify!($variant)),*],
+            }
+        ),*]
+    };
+}
+pub(crate) const AST_SRC: AstSrc = AstSrc {
+    nodes: &ast_nodes! {
+        struct SourceFile: ModuleItemOwner, FnDefOwner {
+            modules: [Module],
+        }
+        struct FnDef: VisibilityOwner, NameOwner, TypeParamsOwner, DocCommentsOwner, AttrsOwner {
+            ParamList,
+            RetType,
+            body: BlockExpr,
+        }
+        struct RetType { TypeRef }
+        struct StructDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
+        }
+        struct UnionDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
+            RecordFieldDefList,
+        }
+        struct RecordFieldDefList { fields: [RecordFieldDef] }
+        struct RecordFieldDef: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner { }
+        struct TupleFieldDefList { fields: [TupleFieldDef] }
+        struct TupleFieldDef: VisibilityOwner, AttrsOwner {
+            TypeRef,
+        }
+        struct EnumDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
+            variant_list: EnumVariantList,
+        }
+        struct EnumVariantList {
+            variants: [EnumVariant],
+        }
+        struct EnumVariant: NameOwner, DocCommentsOwner, AttrsOwner {
+            Expr
+        }
+        struct TraitDef: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner, TypeParamsOwner, TypeBoundsOwner {
+            ItemList,
+        }
+        struct Module: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner {
+            ItemList,
+        }
+        struct ItemList: FnDefOwner, ModuleItemOwner {
+            impl_items: [ImplItem],
+        }
+        struct ConstDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner {
+            body: Expr,
+        }
+        struct StaticDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner {
+            body: Expr,
+        }
+        struct TypeAliasDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeBoundsOwner {
+            TypeRef,
+        }
+        struct ImplBlock: TypeParamsOwner, AttrsOwner {
+            ItemList,
+        }
+        struct ParenType { TypeRef }
+        struct TupleType { fields: [TypeRef] }
+        struct NeverType { }
+        struct PathType { Path }
+        struct PointerType { TypeRef }
+        struct ArrayType { TypeRef, Expr }
+        struct SliceType { TypeRef }
+        struct ReferenceType { TypeRef }
+        struct PlaceholderType {  }
+        struct FnPointerType { ParamList, RetType }
+        struct ForType { TypeRef }
+        struct ImplTraitType: TypeBoundsOwner {}
+        struct DynTraitType: TypeBoundsOwner {}
+        struct TupleExpr { exprs: [Expr] }
+        struct ArrayExpr { exprs: [Expr] }
+        struct ParenExpr { Expr }
+        struct PathExpr  { Path }
+        struct LambdaExpr {
+            ParamList,
+            RetType,
+            body: Expr,
+        }
+        struct IfExpr { Condition }
+        struct LoopExpr: LoopBodyOwner { }
+        struct TryBlockExpr { body: BlockExpr }
+        struct ForExpr: LoopBodyOwner {
+            Pat,
+            iterable: Expr,
+        }
+        struct WhileExpr: LoopBodyOwner { Condition }
+        struct ContinueExpr {}
+        struct BreakExpr { Expr }
+        struct Label {}
+        struct BlockExpr { Block  }
+        struct ReturnExpr { Expr }
+        struct CallExpr: ArgListOwner { Expr }
+        struct MethodCallExpr: ArgListOwner {
+            Expr, NameRef, TypeArgList,
+        }
+        struct IndexExpr {}
+        struct FieldExpr { Expr, NameRef }
+        struct AwaitExpr { Expr }
+        struct TryExpr { Expr }
+        struct CastExpr { Expr, TypeRef }
+        struct RefExpr { Expr }
+        struct PrefixExpr { Expr }
+        struct BoxExpr { Expr }
+        struct RangeExpr {}
+        struct BinExpr {}
+        struct Literal {}
+        struct MatchExpr { Expr, MatchArmList }
+        struct MatchArmList: AttrsOwner { arms: [MatchArm] }
+        struct MatchArm: AttrsOwner {
+            pats: [Pat],
+            guard: MatchGuard,
+            Expr,
+         }
+        struct MatchGuard { Expr }
+        struct RecordLit { Path, RecordFieldList }
+        struct RecordFieldList {
+            fields: [RecordField],
+            spread: Expr,
+         }
+        struct RecordField { NameRef, Expr }
+        struct RefPat { Pat }
+        struct BoxPat { Pat }
+        struct BindPat: NameOwner { Pat }
+        struct PlaceholderPat { }
+        struct DotDotPat { }
+        struct PathPat {  Path }
+        struct SlicePat {}
+        struct RangePat {}
+        struct LiteralPat { Literal }
+        struct RecordPat { RecordFieldPatList, Path }
+        struct RecordFieldPatList {
+            record_field_pats: [RecordFieldPat],
+            bind_pats: [BindPat],
+        }
+        struct RecordFieldPat: NameOwner { Pat }
+        struct TupleStructPat { Path, args: [Pat] }
+        struct TuplePat { args: [Pat] }
+        struct Visibility {}
+        struct Name {}
+        struct NameRef {}
+        struct MacroCall: NameOwner, AttrsOwner,DocCommentsOwner {
+            TokenTree, Path
+        }
+        struct Attr { Path, input: AttrInput }
+        struct TokenTree {}
+        struct TypeParamList {
+            type_params: [TypeParam],
+            lifetime_params: [LifetimeParam],
+        }
+        struct TypeParam: NameOwner, AttrsOwner, TypeBoundsOwner {
+            default_type: TypeRef,
+        }
+        struct ConstParam: NameOwner, AttrsOwner, TypeAscriptionOwner {
+            default_val: Expr,
+        }
+        struct LifetimeParam: AttrsOwner { }
+        struct TypeBound { TypeRef}
+        struct TypeBoundList { bounds: [TypeBound] }
+        struct WherePred: TypeBoundsOwner { TypeRef }
+        struct WhereClause { predicates: [WherePred] }
+        struct ExprStmt { Expr }
+        struct LetStmt: TypeAscriptionOwner {
+            Pat,
+            initializer: Expr,
+        }
+        struct Condition { Pat, Expr }
+        struct Block: AttrsOwner, ModuleItemOwner {
+            statements: [Stmt],
+            Expr,
+        }
+        struct ParamList {
+            SelfParam,
+            params: [Param],
+        }
+        struct SelfParam: TypeAscriptionOwner, AttrsOwner { }
+        struct Param: TypeAscriptionOwner, AttrsOwner {
+            Pat,
+        }
+        struct UseItem: AttrsOwner, VisibilityOwner {
+            UseTree,
+        }
+        struct UseTree {
+            Path, UseTreeList, Alias
+        }
+        struct Alias: NameOwner { }
+        struct UseTreeList { use_trees: [UseTree] }
+        struct ExternCrateItem: AttrsOwner, VisibilityOwner {
+            NameRef, Alias,
+        }
+        struct ArgList {
+            args: [Expr],
+        }
+        struct Path {
+            segment: PathSegment,
+            qualifier: Path,
+        }
+        struct PathSegment {
+            NameRef, TypeArgList, ParamList, RetType, PathType,
+        }
+        struct TypeArgList {
+            type_args: [TypeArg],
+            lifetime_args: [LifetimeArg],
+            assoc_type_args: [AssocTypeArg],
+            const_arg: [ConstArg],
+        }
+        struct TypeArg { TypeRef }
+        struct AssocTypeArg { NameRef, TypeRef }
+        struct LifetimeArg {}
+        struct ConstArg { Literal, BlockExpr }
+        struct MacroItems: ModuleItemOwner, FnDefOwner { }
+        struct MacroStmts {
+            statements: [Stmt],
+            Expr,
+        }
+    },
+    enums: &ast_enums! {
+        enum NominalDef: NameOwner, TypeParamsOwner, AttrsOwner {
+            StructDef, EnumDef, UnionDef,
+        }
+        enum TypeRef {
+            ParenType,
+            TupleType,
+            NeverType,
+            PathType,
+            PointerType,
+            ArrayType,
+            SliceType,
+            ReferenceType,
+            PlaceholderType,
+            FnPointerType,
+            ForType,
+            ImplTraitType,
+            DynTraitType,
+        }
+        enum ModuleItem: AttrsOwner, VisibilityOwner {
+            StructDef,
+            UnionDef,
+            EnumDef,
+            FnDef,
+            TraitDef,
+            TypeAliasDef,
+            ImplBlock,
+            UseItem,
+            ExternCrateItem,
+            ConstDef,
+            StaticDef,
+            Module,
+        }
+        enum ImplItem: AttrsOwner {
+            FnDef, TypeAliasDef, ConstDef,
+        }
+        enum Expr {
+            TupleExpr,
+            ArrayExpr,
+            ParenExpr,
+            PathExpr,
+            LambdaExpr,
+            IfExpr,
+            LoopExpr,
+            ForExpr,
+            WhileExpr,
+            ContinueExpr,
+            BreakExpr,
+            Label,
+            BlockExpr,
+            ReturnExpr,
+            MatchExpr,
+            RecordLit,
+            CallExpr,
+            IndexExpr,
+            MethodCallExpr,
+            FieldExpr,
+            AwaitExpr,
+            TryExpr,
+            TryBlockExpr,
+            CastExpr,
+            RefExpr,
+            PrefixExpr,
+            RangeExpr,
+            BinExpr,
+            Literal,
+            MacroCall,
+            BoxExpr,
+        }
+        enum Pat {
+            RefPat,
+            BoxPat,
+            BindPat,
+            PlaceholderPat,
+            DotDotPat,
+            PathPat,
+            RecordPat,
+            TupleStructPat,
+            TuplePat,
+            SlicePat,
+            RangePat,
+            LiteralPat,
+        }
+        enum AttrInput { Literal, TokenTree }
+        enum Stmt { ExprStmt, LetStmt }
+    },
+};
diff --git a/xtask/src/boilerplate_gen.rs b/xtask/src/boilerplate_gen.rs
deleted file mode 100644
index e69de29bb..000000000
--- a/xtask/src/boilerplate_gen.rs
+++ /dev/null
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/codegen.rs b/xtask/src/codegen.rs
index 53f524f42..158cfc2d6 100644
--- a/xtask/src/codegen.rs
+++ b/xtask/src/codegen.rs
@@ -24,7 +24,6 @@ pub use self::{
    gen_syntax::generate_syntax,
 };
-pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron";
 const GRAMMAR_DIR: &str = "crates/ra_parser/src/grammar";
 const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok";
 const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/err";
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index 88f2ac0e3..0f50ca569 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -3,149 +3,142 @@
 //! Specifically, it generates the `SyntaxKind` enum and a number of newtype
 //! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`.
-use std::{collections::BTreeMap, fs};
 use proc_macro2::{Punct, Spacing};
 use quote::{format_ident, quote};
-use ron;
-use serde::Deserialize;
 use crate::{
+    ast_src::{AstSrc, FieldSrc, KindsSrc, AST_SRC, KINDS_SRC},
    codegen::{self, update, Mode},
    project_root, Result,
 };
 pub fn generate_syntax(mode: Mode) -> Result<()> {
-    let grammar = project_root().join(codegen::GRAMMAR);
-    let grammar: Grammar = {
-        let text = fs::read_to_string(grammar)?;
-        ron::de::from_str(&text)?
-    };
    let syntax_kinds_file = project_root().join(codegen::SYNTAX_KINDS);
-    let syntax_kinds = generate_syntax_kinds(&grammar)?;
+    let syntax_kinds = generate_syntax_kinds(KINDS_SRC)?;
    update(syntax_kinds_file.as_path(), &syntax_kinds, mode)?;
    let ast_file = project_root().join(codegen::AST);
-    let ast = generate_ast(&grammar)?;
+    let ast = generate_ast(AST_SRC)?;
    update(ast_file.as_path(), &ast, mode)?;
    Ok(())
 }
-fn generate_ast(grammar: &Grammar) -> Result<String> {
+fn generate_ast(grammar: AstSrc<'_>) -> Result<String> {
-    let nodes = grammar.ast.iter().map(|(name, ast_node)| {
+    let nodes = grammar.nodes.iter().map(|node| {
-        let variants =
+        let name = format_ident!("{}", node.name);
-            ast_node.variants.iter().map(|var| format_ident!("{}", var)).collect::<Vec<_>>();
+        let kind = format_ident!("{}", to_upper_snake_case(&name.to_string()));
-        let name = format_ident!("{}", name);
+        let traits = node.traits.iter().map(|trait_name| {
+            let trait_name = format_ident!("{}", trait_name);
-        let adt = if variants.is_empty() {
+            quote!(impl ast::#trait_name for #name {})
-            let kind = format_ident!("{}", to_upper_snake_case(&name.to_string()));
+        });
-            quote! {
-                #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-                pub struct #name {
-                    pub(crate) syntax: SyntaxNode,
-                }
-                impl AstNode for #name {
+        let methods = node.fields.iter().map(|(name, field)| {
-                    fn can_cast(kind: SyntaxKind) -> bool {
+            let method_name = match field {
-                        match kind {
+                FieldSrc::Shorthand => format_ident!("{}", to_lower_snake_case(&name)),
-                            #kind => true,
+                _ => format_ident!("{}", name),
-                            _ => false,
+            };
+            let ty = match field {
+                FieldSrc::Optional(ty) | FieldSrc::Many(ty) => ty,
+                FieldSrc::Shorthand => name,
+            };
+            let ty = format_ident!("{}", ty);
+            match field {
+                FieldSrc::Many(_) => {
+                    quote! {
+                        pub fn #method_name(&self) -> AstChildren<#ty> {
+                            AstChildren::new(&self.syntax)
                        }
                    }
-                    fn cast(syntax: SyntaxNode) -> Option<Self> {
+                }
-                        if Self::can_cast(syntax.kind()) { Some(Self { syntax }) } else { None }
+                FieldSrc::Optional(_) | FieldSrc::Shorthand => {
+                    quote! {
+                        pub fn #method_name(&self) -> Option<#ty> {
+                            AstChildren::new(&self.syntax).next()
+                        }
                    }
-                    fn syntax(&self) -> &SyntaxNode { &self.syntax }
                }
            }
-        } else {
+        });
-            let kinds = variants
-                .iter()
-                .map(|name| format_ident!("{}", to_upper_snake_case(&name.to_string())))
-                .collect::<Vec<_>>();
-            quote! {
-                #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-                pub enum #name {
-                    #(#variants(#variants),)*
-                }
-                #(
+        quote! {
-                impl From<#variants> for #name {
+            #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-                    fn from(node: #variants) -> #name {
+            pub struct #name {
-                        #name::#variants(node)
+                pub(crate) syntax: SyntaxNode,
-                    }
+            }
-                }
-                )*
-                impl AstNode for #name {
+            impl AstNode for #name {
-                    fn can_cast(kind: SyntaxKind) -> bool {
+                fn can_cast(kind: SyntaxKind) -> bool {
-                        match kind {
+                    match kind {
-                            #(#kinds)|* => true,
+                        #kind => true,
-                            _ => false,
+                        _ => false,
-                        }
-                    }
-                    fn cast(syntax: SyntaxNode) -> Option<Self> {
-                        let res = match syntax.kind() {
-                            #(
-                            #kinds => #name::#variants(#variants { syntax }),
-                            )*
-                            _ => return None,
-                        };
-                        Some(res)
-                    }
-                    fn syntax(&self) -> &SyntaxNode {
-                        match self {
-                            #(
-                            #name::#variants(it) => &it.syntax,
-                            )*
-                        }
                    }
                }
+                fn cast(syntax: SyntaxNode) -> Option<Self> {
+                    if Self::can_cast(syntax.kind()) { Some(Self { syntax }) } else { None }
+                }
+                fn syntax(&self) -> &SyntaxNode { &self.syntax }
            }
-        };
+            #(#traits)*
+            impl #name {
+                #(#methods)*
+            }
+        }
+    });
-        let traits = ast_node.traits.iter().map(|trait_name| {
+    let enums = grammar.enums.iter().map(|en| {
+        let variants = en.variants.iter().map(|var| format_ident!("{}", var)).collect::<Vec<_>>();
+        let name = format_ident!("{}", en.name);
+        let kinds = variants
+            .iter()
+            .map(|name| format_ident!("{}", to_upper_snake_case(&name.to_string())))
+            .collect::<Vec<_>>();
+        let traits = en.traits.iter().map(|trait_name| {
            let trait_name = format_ident!("{}", trait_name);
            quote!(impl ast::#trait_name for #name {})
        });
-        let collections = ast_node.collections.iter().map(|(name, kind)| {
+        quote! {
-            let method_name = format_ident!("{}", name);
+            #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-            let kind = format_ident!("{}", kind);
+            pub enum #name {
-            quote! {
+                #(#variants(#variants),)*
-                pub fn #method_name(&self) -> AstChildren<#kind> {
-                    AstChildren::new(&self.syntax)
-                }
            }
-        });
-        let options = ast_node.options.iter().map(|attr| {
+            #(
-            let method_name = match attr {
+            impl From<#variants> for #name {
-                Attr::Type(t) => format_ident!("{}", to_lower_snake_case(&t)),
+                fn from(node: #variants) -> #name {
-                Attr::NameType(n, _) => format_ident!("{}", n),
+                    #name::#variants(node)
-            };
-            let ty = match attr {
-                Attr::Type(t) | Attr::NameType(_, t) => format_ident!("{}", t),
-            };
-            quote! {
-                pub fn #method_name(&self) -> Option<#ty> {
-                    AstChildren::new(&self.syntax).next()
                }
            }
-        });
+            )*
-        quote! {
-            #adt
-            #(#traits)*
-            impl #name {
+            impl AstNode for #name {
-                #(#collections)*
+                fn can_cast(kind: SyntaxKind) -> bool {
-                #(#options)*
+                    match kind {
+                        #(#kinds)|* => true,
+                        _ => false,
+                    }
+                }
+                fn cast(syntax: SyntaxNode) -> Option<Self> {
+                    let res = match syntax.kind() {
+                        #(
+                        #kinds => #name::#variants(#variants { syntax }),
+                        )*
+                        _ => return None,
+                    };
+                    Some(res)
+                }
+                fn syntax(&self) -> &SyntaxNode {
+                    match self {
+                        #(
+                        #name::#variants(it) => &it.syntax,
+                        )*
+                    }
+                }
            }
+            #(#traits)*
        }
    });
@@ -156,13 +149,14 @@ fn generate_ast(grammar: &Grammar) -> Result<String> {
        };
        #(#nodes)*
+        #(#enums)*
    };
    let pretty = codegen::reformat(ast)?;
    Ok(pretty)
 }
-fn generate_syntax_kinds(grammar: &Grammar) -> Result<String> {
+fn generate_syntax_kinds(grammar: KindsSrc<'_>) -> Result<String> {
    let (single_byte_tokens_values, single_byte_tokens): (Vec<_>, Vec<_>) = grammar
        .punct
        .iter()
@@ -274,38 +268,6 @@ fn generate_syntax_kinds(grammar: &Grammar) -> Result<String> {
    codegen::reformat(ast)
 }
-#[derive(Deserialize, Debug)]
-struct Grammar {
-    punct: Vec<(String, String)>,
-    keywords: Vec<String>,
-    contextual_keywords: Vec<String>,
-    literals: Vec<String>,
-    tokens: Vec<String>,
-    nodes: Vec<String>,
-    ast: BTreeMap<String, AstNode>,
-}
-#[derive(Deserialize, Debug)]
-struct AstNode {
-    #[serde(default)]
-    #[serde(rename = "enum")]
-    variants: Vec<String>,
-    #[serde(default)]
-    traits: Vec<String>,
-    #[serde(default)]
-    collections: Vec<(String, String)>,
-    #[serde(default)]
-    options: Vec<Attr>,
-}
-#[derive(Deserialize, Debug)]
-#[serde(untagged)]
-enum Attr {
-    Type(String),
-    NameType(String, String),
-}
 fn to_upper_snake_case(s: &str) -> String {
    let mut buf = String::with_capacity(s.len());
    let mut prev_is_upper = None;
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 40a6682be..e46c21db7 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -1,17 +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";
@@ -25,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"])
@@ -78,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"])
@@ -124,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), ".")
 }
@@ -143,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<()> {
+/// Cleans the `./target` dir after the build such that only
-    run_rustfmt(Mode::Overwrite)?;
+/// dependencies are cached on CI.
-    let root = project_root();
+pub fn run_pre_cache() -> Result<()> {
-    let output = Command::new("git")
+    let slow_tests_cookie = Path::new("./target/.slow_tests_cookie");
-        .arg("diff")
+    if !slow_tests_cookie.exists() {
-        .arg("--diff-filter=MAR")
+        panic!("slow tests were skipped on CI!")
-        .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
-        );
    }
-    for line in String::from_utf8(output.stdout)?.lines() {
+    rm_rf(slow_tests_cookie)?;
-        run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?;
+    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>
+fn rm_rf(path: &Path) -> Result<()> {
-where
+    if path.is_file() { fs::remove_file(path) } else { fs::remove_dir_all(path) }
-    F: FnMut(&mut Command),
+        .with_context(|| format!("failed to remove {:?}", path))
-{
-    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/main.rs b/xtask/src/main.rs
index 9cefad925..c347de9ab 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,
+    install::{ClientOpt, InstallCmd, ServerOpt},
-    run_with_output, Cmd, Result,
+    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) {
+    let mut args = Arguments::from_env();
-        None => {
+    let subcommand = args.subcommand()?.unwrap_or_default();
-            eprintln!("{}", help::GLOBAL_HELP);
-            return Ok(());
+    match subcommand.as_str() {
-        }
-        Some(s) => s,
-    };
-    let mut matches = Arguments::from_vec(std::env::args_os().skip(2).collect());
-    let subcommand = &*subcommand.to_string_lossy();
-    match subcommand {
        "install" => {
-            if matches.contains(["-h", "--help"]) {
+            if args.contains(["-h", "--help"]) {
-                eprintln!("{}", help::INSTALL_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 server = args.contains("--server");
-            let client_code = matches.contains("--client-code");
+            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 jemalloc = args.contains("--jemalloc");
-            let opts = InstallOpt {
+            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"]) {
+            args.finish()?;
-                help::print_no_param_subcommand_help(&subcommand);
-                return Ok(());
-            }
            codegen::generate_syntax(Mode::Overwrite)?;
            codegen::generate_parser_tests(Mode::Overwrite)?;
            codegen::generate_assists_docs(Mode::Overwrite)?;
+            Ok(())
        }
        "format" => {
-            if matches.contains(["-h", "--help"]) {
+            args.finish()?;
-                help::print_no_param_subcommand_help(&subcommand);
+            run_rustfmt(Mode::Overwrite)
-                return Ok(());
-            }
-            run_rustfmt(Mode::Overwrite)?
        }
        "install-pre-commit-hook" => {
-            if matches.contains(["-h", "--help"]) {
+            args.finish()?;
-                help::print_no_param_subcommand_help(&subcommand);
+            pre_commit::install_hook()
-                return Ok(());
-            }
-            install_pre_commit_hook()?
        }
        "lint" => {
-            if matches.contains(["-h", "--help"]) {
+            args.finish()?;
-                help::print_no_param_subcommand_help(&subcommand);
+            run_clippy()
-                return Ok(());
-            }
-            run_clippy()?
        }
        "fuzz-tests" => {
-            if matches.contains(["-h", "--help"]) {
+            args.finish()?;
-                help::print_no_param_subcommand_help(&subcommand);
+            run_fuzzer()
-                return Ok(());
-            }
-            run_fuzzer()?
        }
-        _ => eprintln!("{}", help::GLOBAL_HELP),
+        "pre-cache" => {
-    }
+            args.finish()?;
-    Ok(())
+            run_pre_cache()
-}
-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",
        }
-        .run()
+        _ => {
-        .is_ok()
+            eprintln!(
-    });
+                "\
+cargo xtask
-    let code_binary = match code_binary {
+Run custom build command.
-        Some(it) => it,
-        None => anyhow::bail!("Can't execute `code --version`. Perhaps it is not in $PATH?"),
+USAGE:
-    };
+    cargo xtask <SUBCOMMAND>
-    Cmd {
+SUBCOMMANDS:
-        unix: &format!(r"{} --install-extension ./ra-lsp-0.0.1.vsix --force", code_binary),
+    format
-        windows: &format!(
+    install-pre-commit-hook
-            r"cmd.exe /c {}.cmd --install-extension ./ra-lsp-0.0.1.vsix --force",
+    fuzz-tests
-            code_binary
+    codegen
-        ),
+    install
-        work_dir: "./editors/code",
+    lint"
-    }
+            );
-    .run()?;
+            Ok(())
-    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/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(())
+}