655 files changed, 33791 insertions, 35962 deletions
diff --git a/.gitattributes b/.gitattributes
index e749e1dc9..4cd50e481 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,6 @@
 * text=auto eol=lf
 crates/ra_syntax/test_data/** -text eof=LF
+# Older git versions try to fix line endings on images, this prevents it.
+*.png binary
+*.jpg binary
+*.ico binary
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ed9191c49..2acd44012 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,25 +16,25 @@ env:
  RUSTUP_MAX_RETRIES: 10
 jobs:
-  rust-audit:
+  # rust-audit:
-    name: Audit Rust vulnerabilities
+  #   name: Audit Rust vulnerabilities
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    steps:
+  #   steps:
-    - name: Checkout repository
+  #   - name: Checkout repository
-      uses: actions/checkout@v2
+  #     uses: actions/checkout@v2
-    - uses: actions-rs/[email protected]
+  #   - uses: actions-rs/[email protected]
-      with:
+  #     with:
-        crate: cargo-audit
+  #       crate: cargo-audit
-        use-tool-cache: true
+  #       use-tool-cache: true
-    - run: cargo audit
+  #   - run: cargo audit
  rust:
    name: Rust
    runs-on: ${{ matrix.os }}
    env:
-     CC: deny_c
+      CC: deny_c
    strategy:
      fail-fast: false
@@ -61,29 +61,22 @@ jobs:
        override: true
        components: rustfmt, rust-src
-    - if: matrix.os == 'ubuntu-latest'
+    - name: Cache cargo directories
-      run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/
+      uses: actions/cache@v2
-    - name: Cache cargo registry
-      uses: actions/cache@v1
      with:
-        path: ~/.cargo/registry
+        path: |
-        key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+          ~/.cargo/registry
+          ~/.cargo/git
-    - name: Cache cargo index
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      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
+      uses: actions/cache@v2
      with:
        path: target
        key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
    - name: Compile
-      run: cargo test --no-run
+      run: cargo test --no-run --locked
    - name: Test
      run: cargo test
@@ -95,6 +88,34 @@ jobs:
      if: matrix.os == 'windows-latest'
      run: Remove-Item ./target/debug/xtask.exe, ./target/debug/deps/xtask.exe
+  # Weird target to catch non-portable code
+  rust-power:
+    name: Rust Power
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+        target: 'powerpc-unknown-linux-gnu'
+    - name: Cache cargo directories
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+    - name: Check
+      run: cargo check --target=powerpc-unknown-linux-gnu --all-targets
  typescript:
    name: TypeScript
    strategy:
@@ -103,7 +124,7 @@ jobs:
        os: [ubuntu-latest, windows-latest, macos-latest]
    runs-on: ${{ matrix.os }}
-    
    steps:
    - name: Checkout repository
      uses: actions/checkout@v2
@@ -116,9 +137,9 @@ jobs:
    - run: npm ci
      working-directory: ./editors/code
-    - run: npm audit || { sleep 10 && npm audit; } || { sleep 30 && npm audit; }
+#    - run: npm audit || { sleep 10 && npm audit; } || { sleep 30 && npm audit; }
-      if: runner.os == 'Linux'
+#      if: runner.os == 'Linux'
-      working-directory: ./editors/code
+#      working-directory: ./editors/code
    - run: npm run lint
      working-directory: ./editors/code
diff --git a/.github/workflows/metrics.yaml b/.github/workflows/metrics.yaml
new file mode 100644
index 000000000..ea780e875
--- /dev/null
+++ b/.github/workflows/metrics.yaml
@@ -0,0 +1,32 @@
+name: metrics
+on:
+  push:
+   branches:
+   - master
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTFLAGS: -D warnings
+  RUSTUP_MAX_RETRIES: 10
+jobs:
+  metrics:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+        components: rust-src
+    - name: Collect metrics
+      run: cargo xtask metrics
+      env:
+        METRICS_TOKEN: ${{ secrets.METRICS_TOKEN }}
diff --git a/Cargo.lock b/Cargo.lock
index 459f82f3a..572fb868e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,18 +2,18 @@
 # It is not intended for manual editing.
 [[package]]
 name = "addr2line"
-version = "0.12.2"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c"
+checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
 dependencies = [
 "gimli",
 ]
 [[package]]
-name = "adler32"
+name = "adler"
-version = "1.1.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d"
+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
 [[package]]
 name = "aho-corasick"
@@ -26,18 +26,18 @@ dependencies = [
 [[package]]
 name = "ansi_term"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
 "winapi 0.3.9",
 ]
 [[package]]
 name = "anyhow"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f"
+checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
 [[package]]
 name = "anymap"
@@ -52,6 +52,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 [[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi 0.3.9",
+]
+[[package]]
 name = "autocfg"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -59,9 +70,9 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 [[package]]
 name = "backtrace"
-version = "0.3.49"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c"
+checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
 dependencies = [
 "addr2line",
 "cfg-if",
@@ -84,15 +95,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 [[package]]
-name = "bstr"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
-dependencies = [
- "memchr",
-]
-[[package]]
 name = "byteorder"
 version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -100,21 +102,20 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 [[package]]
 name = "cargo_metadata"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8de60b887edf6d74370fc8eb177040da4847d971d6234c7b13a6da324ef0caf"
+checksum = "89fec17b16f1ac67908af82e47d0a90a7afd0e1827b181cd77504323d3263d35"
 dependencies = [
 "semver",
 "serde",
- "serde_derive",
 "serde_json",
 ]
 [[package]]
 name = "cc"
-version = "1.0.56"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c1f1d60091c1b73e2b1f4560ab419204b178e625fa945ded7b660becd2bd46"
+checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
 [[package]]
 name = "cfg-if"
@@ -124,9 +125,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 [[package]]
 name = "chalk-derive"
-version = "0.15.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7379caa72d04103fcfd9bde5642b816f58e3ffd6a0d39347e9e35a066648226"
+checksum = "654c611946ba2629c5028cb7708687af975faf2c29d731824cb294c873df4697"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -135,35 +136,35 @@ dependencies = [
 ]
 [[package]]
-name = "chalk-engine"
+name = "chalk-ir"
-version = "0.15.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8afe48b5663504b485791ab4fae69cf4864869a71ceec9c758fd4d03423722"
+checksum = "0a5341fbc654ca886b73b804a36aebf0e621057ccc1a68e9815b5b39b3ac9ae8"
 dependencies = [
 "chalk-derive",
- "chalk-ir",
+ "lazy_static",
- "rustc-hash",
- "tracing",
 ]
 [[package]]
-name = "chalk-ir"
+name = "chalk-recursive"
-version = "0.15.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "231e391a03c1fc45874171d92be9542efedc939bac59d9501ee28b9521feb406"
+checksum = "4484807b155b5a411e6135d330295f9ba5042e2920b8712c6574ca6ea91e9ee5"
 dependencies = [
 "chalk-derive",
- "lazy_static",
+ "chalk-ir",
+ "chalk-solve",
+ "rustc-hash",
+ "tracing",
 ]
 [[package]]
 name = "chalk-solve"
-version = "0.15.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c969c0fd06ad50538253327ca3445ff02cc9d0209f94c3cbf198ad9d365b48"
+checksum = "281f82facd2538997fbe52132b1941ed213d266748215c31d15f62a8664429ad"
 dependencies = [
 "chalk-derive",
- "chalk-engine",
 "chalk-ir",
 "ena",
 "itertools",
@@ -171,13 +172,14 @@ dependencies = [
 "rustc-hash",
 "tracing",
 "tracing-subscriber",
+ "tracing-tree",
 ]
 [[package]]
 name = "chrono"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
+checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
 dependencies = [
 "num-integer",
 "num-traits",
@@ -194,41 +196,31 @@ dependencies = [
 ]
 [[package]]
-name = "console"
+name = "cmake"
-version = "0.11.3"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c0994e656bba7b922d8dd1245db90672ffb701e684e45be58f20719d69abc5a"
+checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb"
 dependencies = [
- "encode_unicode",
+ "cc",
- "lazy_static",
- "libc",
- "terminal_size",
- "termios",
- "winapi 0.3.9",
 ]
 [[package]]
-name = "crossbeam"
+name = "crc32fast"
-version = "0.7.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
 "cfg-if",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
 ]
 [[package]]
 name = "crossbeam-channel"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
+checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6"
 dependencies = [
+ "cfg-if",
 "crossbeam-utils",
- "maybe-uninit",
 ]
 [[package]]
@@ -292,12 +284,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f"
 [[package]]
-name = "dtoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
-[[package]]
 name = "either"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -313,12 +299,6 @@ dependencies = [
 ]
 [[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-[[package]]
 name = "env_logger"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -328,10 +308,19 @@ dependencies = [
 ]
 [[package]]
+name = "expect"
+version = "0.1.0"
+dependencies = [
+ "difference",
+ "once_cell",
+ "stdx",
+]
+[[package]]
 name = "filetime"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "affc17579b132fc2461adf7c575cc6e8b134ebca52c51f5411388965227dc695"
+checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b"
 dependencies = [
 "cfg-if",
 "libc",
@@ -346,6 +335,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 [[package]]
+name = "flate2"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
+dependencies = [
+ "cfg-if",
+ "crc32fast",
+ "libc",
+ "miniz_oxide",
+]
+[[package]]
 name = "flycheck"
 version = "0.1.0"
 dependencies = [
@@ -358,18 +359,6 @@ dependencies = [
 ]
 [[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-[[package]]
-name = "fs_extra"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
-[[package]]
 name = "fsevent"
 version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -432,22 +421,9 @@ dependencies = [
 [[package]]
 name = "gimli"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
+checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
-[[package]]
-name = "globset"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120"
-dependencies = [
- "aho-corasick",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
 [[package]]
 name = "goblin"
@@ -461,6 +437,15 @@ dependencies = [
 ]
 [[package]]
+name = "hashbrown"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
+dependencies = [
+ "autocfg",
+]
+[[package]]
 name = "heck"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -471,9 +456,9 @@ dependencies = [
 [[package]]
 name = "hermit-abi"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909"
+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
 dependencies = [
 "libc",
 ]
@@ -500,11 +485,12 @@ dependencies = [
 [[package]]
 name = "indexmap"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe"
+checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
 dependencies = [
 "autocfg",
+ "hashbrown",
 ]
 [[package]]
@@ -528,24 +514,10 @@ dependencies = [
 ]
 [[package]]
-name = "insta"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617e921abc813f96a3b00958c079e7bf1e2db998f8a04f1546dd967373a418ee"
-dependencies = [
- "console",
- "difference",
- "lazy_static",
- "serde",
- "serde_json",
- "serde_yaml",
-]
-[[package]]
 name = "instant"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69da7ce1490173c2bf4d26bc8be429aaeeaf4cce6c4b970b7949651fa17655fe"
+checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
 [[package]]
 name = "iovec"
@@ -572,38 +544,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
 [[package]]
-name = "jemalloc-ctl"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7"
-dependencies = [
- "jemalloc-sys",
- "libc",
- "paste",
-]
-[[package]]
-name = "jemalloc-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
-dependencies = [
- "cc",
- "fs_extra",
- "libc",
-]
-[[package]]
-name = "jemallocator"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
-dependencies = [
- "jemalloc-sys",
- "libc",
-]
-[[package]]
 name = "jod-thread"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -633,9 +573,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 [[package]]
 name = "libc"
-version = "0.2.71"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49"
+checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
 [[package]]
 name = "libloading"
@@ -647,25 +587,28 @@ dependencies = [
 ]
 [[package]]
-name = "linked-hash-map"
+name = "libmimalloc-sys"
-version = "0.5.3"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "a27252ec1d0c4e0dd6142cbc572da50b363ab56fc334f7aa8fadf295b2e24e74"
+dependencies = [
+ "cmake",
+]
 [[package]]
 name = "lock_api"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de302ce1fe7482db13738fbaf2e21cfb06a986b89c0bf38d88abf16681aada4e"
+checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
 dependencies = [
 "scopeguard",
 ]
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
 "cfg-if",
 ]
@@ -684,9 +627,9 @@ dependencies = [
 [[package]]
 name = "lsp-types"
-version = "0.74.2"
+version = "0.79.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b360754e89e0e13c114245131382ba921d4ff1efabb918e549422938aaa8d392"
+checksum = "7f1f86677fdbe8df5f88b99131b1424e50aad27bbe3e5900d221bc414bd72e9b"
 dependencies = [
 "base64",
 "bitflags",
@@ -741,20 +684,29 @@ dependencies = [
 [[package]]
 name = "memoffset"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
 dependencies = [
 "autocfg",
 ]
 [[package]]
+name = "mimalloc"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c52de2069999f01bd26436564dbe7de3a87898feeb7a0d0ff9eb20a05bb7ca0"
+dependencies = [
+ "libmimalloc-sys",
+]
+[[package]]
 name = "miniz_oxide"
-version = "0.3.7"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
+checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
 dependencies = [
- "adler32",
+ "adler",
 ]
 [[package]]
@@ -873,6 +825,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
 [[package]]
+name = "oorandom"
+version = "11.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c"
+[[package]]
 name = "parking_lot"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -899,33 +857,33 @@ dependencies = [
 ]
 [[package]]
-name = "paste"
+name = "paths"
-version = "0.1.18"
+version = "0.1.0"
+[[package]]
+name = "percent-encoding"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-dependencies = [
- "paste-impl",
- "proc-macro-hack",
-]
 [[package]]
-name = "paste-impl"
+name = "perf-event"
-version = "0.1.18"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
+checksum = "76c42ba5d85a2f4472b99f475fb60cf336d9b4c85b1ea8bb300fef2e3c7c8f89"
 dependencies = [
- "proc-macro-hack",
+ "libc",
+ "perf-event-open-sys",
 ]
 [[package]]
-name = "paths"
+name = "perf-event-open-sys"
-version = "0.1.0"
+version = "0.3.1"
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "95db63e37862bc1b842135d2234ef9418f222cc660c6752f45e7cf9ddfb97f96"
+dependencies = [
+ "libc",
+]
 [[package]]
 name = "petgraph"
@@ -956,25 +914,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
 [[package]]
-name = "proc-macro-hack"
-version = "0.5.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
-[[package]]
 name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
 dependencies = [
 "unicode-xid",
 ]
 [[package]]
 name = "pulldown-cmark"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e142c3b8f49d2200605ee6ba0b1d757310e9e7a72afe78c36ee2ef67300ee00"
+checksum = "ca36dea94d187597e104a5c8e4b07576a8a45aa5db48a65e12940d3eb7461f55"
 dependencies = [
 "bitflags",
 "getopts",
@@ -1040,7 +992,6 @@ dependencies = [
 "ra_prof",
 "ra_syntax",
 "ra_tt",
- "relative-path",
 "rustc-hash",
 "salsa",
 "stdx",
@@ -1071,6 +1022,7 @@ dependencies = [
 "ra_prof",
 "ra_syntax",
 "rustc-hash",
+ "stdx",
 ]
 [[package]]
@@ -1080,9 +1032,9 @@ dependencies = [
 "anymap",
 "drop_bomb",
 "either",
+ "expect",
 "fst",
 "indexmap",
- "insta",
 "itertools",
 "log",
 "once_cell",
@@ -1123,9 +1075,10 @@ version = "0.1.0"
 dependencies = [
 "arrayvec",
 "chalk-ir",
+ "chalk-recursive",
 "chalk-solve",
 "ena",
- "insta",
+ "expect",
 "itertools",
 "log",
 "ra_arena",
@@ -1139,6 +1092,9 @@ dependencies = [
 "smallvec",
 "stdx",
 "test_utils",
+ "tracing",
+ "tracing-subscriber",
+ "tracing-tree",
 ]
 [[package]]
@@ -1146,12 +1102,13 @@ name = "ra_ide"
 version = "0.1.0"
 dependencies = [
 "either",
+ "expect",
 "indexmap",
- "insta",
 "itertools",
 "lazy_static",
 "log",
 "maplit",
+ "oorandom",
 "pulldown-cmark",
 "pulldown-cmark-to-cmark",
 "ra_assists",
@@ -1190,7 +1147,7 @@ dependencies = [
 "ra_text_edit",
 "rayon",
 "rustc-hash",
- "superslice",
+ "stdx",
 "test_utils",
 ]
@@ -1248,9 +1205,10 @@ name = "ra_prof"
 version = "0.1.0"
 dependencies = [
 "backtrace",
- "jemalloc-ctl",
+ "cfg-if",
- "jemallocator",
+ "libc",
 "once_cell",
+ "perf-event",
 "ra_arena",
 ]
@@ -1277,12 +1235,14 @@ dependencies = [
 name = "ra_ssr"
 version = "0.1.0"
 dependencies = [
+ "expect",
 "ra_db",
 "ra_hir",
 "ra_ide_db",
 "ra_syntax",
 "ra_text_edit",
 "rustc-hash",
+ "test_utils",
 ]
 [[package]]
@@ -1290,10 +1250,12 @@ name = "ra_syntax"
 version = "0.1.0"
 dependencies = [
 "arrayvec",
+ "expect",
 "itertools",
 "once_cell",
 "ra_parser",
 "ra_text_edit",
+ "rayon",
 "rowan",
 "rustc-ap-rustc_lexer",
 "rustc-hash",
@@ -1323,6 +1285,7 @@ name = "ra_tt"
 version = "0.1.0"
 dependencies = [
 "smol_str",
+ "stdx",
 ]
 [[package]]
@@ -1403,9 +1366,9 @@ dependencies = [
 [[package]]
 name = "redox_syscall"
-version = "0.1.56"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 [[package]]
 name = "regex"
@@ -1436,21 +1399,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
 [[package]]
-name = "relative-path"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c602122c47b382cd045b10866a084b184035d45d8c2609cdd3762852ddfae2a1"
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-[[package]]
 name = "rowan"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1469,14 +1417,15 @@ dependencies = [
 "anyhow",
 "crossbeam-channel",
 "env_logger",
+ "expect",
 "flycheck",
- "globset",
- "insta",
 "itertools",
 "jod-thread",
 "log",
 "lsp-server",
 "lsp-types",
+ "mimalloc",
+ "oorandom",
 "parking_lot",
 "pico-args",
 "ra_cfg",
@@ -1495,12 +1444,11 @@ dependencies = [
 "ra_text_edit",
 "ra_toolchain",
 "ra_tt",
- "rand",
+ "rayon",
 "rustc-hash",
 "serde",
 "serde_json",
 "stdx",
- "tempfile",
 "test_utils",
 "threadpool",
 "vfs",
@@ -1510,9 +1458,9 @@ dependencies = [
 [[package]]
 name = "rustc-ap-rustc_lexer"
-version = "666.0.0"
+version = "671.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e00c526f9f8430ea4cd2178d25b02bfc7debe6677350c57292f92f50e65d2fe"
+checksum = "22e1221f3bfa2943c942cf8da319ab2346887f8757778c29c7f1822cd27b521f"
 dependencies = [
 "unicode-xid",
 ]
@@ -1537,15 +1485,16 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 [[package]]
 name = "salsa"
-version = "0.14.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a976dce155e392af3f1aa540ca23a6fc7303a7fef425cb431c464deb263eb54"
+checksum = "d4cdc109fcc9e9450c7ef47fb7474e99bffd51799da03ed0a6c7f0e2cb3848a6"
 dependencies = [
- "crossbeam",
+ "crossbeam-utils",
 "indexmap",
+ "lock_api",
 "log",
+ "oorandom",
 "parking_lot",
- "rand",
 "rustc-hash",
 "salsa-macros",
 "smallvec",
@@ -1553,9 +1502,9 @@ dependencies = [
 [[package]]
 name = "salsa-macros"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038a09b6271446f1123f142fe7e5bef6d4687c4cf82e6986be574c2af3745530"
+checksum = "2c280ac85b15ac214b86ac4b407626a48e6a1c4f90769a582fec74aa57942b9f"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -1606,9 +1555,9 @@ dependencies = [
 [[package]]
 name = "semver"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
 dependencies = [
 "semver-parser",
 "serde",
@@ -1642,9 +1591,9 @@ dependencies = [
 [[package]]
 name = "serde_json"
-version = "1.0.56"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
 dependencies = [
 "itoa",
 "ryu",
@@ -1663,18 +1612,6 @@ dependencies = [
 ]
 [[package]]
-name = "serde_yaml"
-version = "0.8.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
-dependencies = [
- "dtoa",
- "linked-hash-map",
- "serde",
- "yaml-rust",
-]
-[[package]]
 name = "sharded-slab"
 version = "0.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1691,15 +1628,15 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 [[package]]
 name = "smallvec"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
+checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f"
 [[package]]
 name = "smol_str"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b"
+checksum = "2f7909a1d8bc166a862124d84fdc11bda0ea4ed3157ccca662296919c2972db1"
 dependencies = [
 "serde",
 ]
@@ -1709,16 +1646,10 @@ name = "stdx"
 version = "0.1.0"
 [[package]]
-name = "superslice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
-[[package]]
 name = "syn"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
+checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1738,36 +1669,12 @@ dependencies = [
 ]
 [[package]]
-name = "tempfile"
+name = "termcolor"
-version = "3.1.0"
+version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-dependencies = [
- "cfg-if",
- "libc",
- "rand",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-[[package]]
-name = "terminal_size"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-[[package]]
-name = "termios"
-version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2"
+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
 dependencies = [
- "libc",
+ "winapi-util",
 ]
 [[package]]
@@ -1829,9 +1736,9 @@ checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
 [[package]]
 name = "tracing"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41f40ed0e162c911ac6fcb53ecdc8134c46905fdbbae8c50add462a538b495f"
+checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
 dependencies = [
 "cfg-if",
 "tracing-attributes",
@@ -1840,9 +1747,9 @@ dependencies = [
 [[package]]
 name = "tracing-attributes"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c"
+checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1851,9 +1758,9 @@ dependencies = [
 [[package]]
 name = "tracing-core"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aa83a9a47081cd522c09c81b31aec2c9273424976f922ad61c053b58350b715"
+checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f"
 dependencies = [
 "lazy_static",
 ]
@@ -1881,9 +1788,9 @@ dependencies = [
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.6"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04a11b459109e38ff6e1b580bafef4142a11d44889f5d07424cbce2fd2a2a119"
+checksum = "e4f5dd7095c2481b7b3cbed71c8de53085fb3542bc3c2b4c73cba43e8f11c7ba"
 dependencies = [
 "ansi_term",
 "chrono",
@@ -1900,6 +1807,26 @@ dependencies = [
 ]
 [[package]]
+name = "tracing-tree"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37ee7f0f53ed2093971a698db799ef56a2dfd89b32e3aeb5165f0e637a02be04"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "chrono",
+ "termcolor",
+ "tracing",
+ "tracing-subscriber",
+]
+[[package]]
+name = "ungrammar"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee12e4891ab3acc2d95d5023022ace22020247bb8a8d1ece875a443f7dab37d"
+[[package]]
 name = "unicase"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1966,6 +1893,7 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
 name = "vfs"
 version = "0.1.0"
 dependencies = [
+ "fst",
 "paths",
 "rustc-hash",
 ]
@@ -1975,7 +1903,6 @@ name = "vfs-notify"
 version = "0.1.0"
 dependencies = [
 "crossbeam-channel",
- "globset",
 "jod-thread",
 "log",
 "notify",
@@ -2060,17 +1987,10 @@ name = "xtask"
 version = "0.1.0"
 dependencies = [
 "anyhow",
+ "flate2",
 "pico-args",
 "proc-macro2",
 "quote",
+ "ungrammar",
 "walkdir",
 ]
-[[package]]
-name = "yaml-rust"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
-dependencies = [
- "linked-hash-map",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 5278b5a16..612e6809f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,9 +24,16 @@ opt-level = 0
 opt-level = 0
 [profile.release.package.salsa-macros]
 opt-level = 0
+[profile.release.package.tracing-attributes]
+opt-level = 0
 [profile.release.package.xtask]
 opt-level = 0
+# Gzipping the artifacts is up to 10 times faster with optimizations (`cargo xtask dist`).
+# `miniz_oxide` is the direct dependency of `flate2` which does all the heavy lifting
+[profile.dev.package.miniz_oxide]
+opt-level = 3
 [patch.'crates-io']
 # rowan = { path = "../rowan" }
diff --git a/README.md b/README.md
index 7ba705e73..16c980400 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,8 @@
  <img src="https://user-images.githubusercontent.com/1711539/72443316-5a79f280-37ae-11ea-858f-035209ece2dd.png" alt="rust-analyzer logo">
 </p>
-rust-analyzer is an **experimental** modular compiler frontend for the Rust
+rust-analyzer is an **experimental** modular compiler frontend for the Rust language.
-language. It is a part of a larger rls-2.0 effort to create excellent IDE
+It is a part of a larger rls-2.0 effort to create excellent IDE support for Rust.
-support for Rust. If you want to get involved, check the rls-2.0 working group:
-https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0
 Work on rust-analyzer is sponsored by
@@ -25,8 +22,8 @@ If you want to **contribute** to rust-analyzer or are just curious about how
 things work under the hood, check the [./docs/dev](./docs/dev) folder.
 If you want to **use** rust-analyzer's language server with your editor of
-choice, check [the manual](https://rust-analyzer.github.io/manual.html) folder. It also contains some tips & tricks to help
+choice, check [the manual](https://rust-analyzer.github.io/manual.html) folder.
-you be more productive when using rust-analyzer.
+It also contains some tips & tricks to help you be more productive when using rust-analyzer.
 ## Communication
@@ -40,8 +37,9 @@ https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frls-2.2E0
 ## Quick Links
-* API docs: https://rust-analyzer.github.io/rust-analyzer/ra_ide/
 * Website: https://rust-analyzer.github.io/
+* Metrics: https://rust-analyzer.github.io/metrics/
+* API docs: https://rust-analyzer.github.io/rust-analyzer/ra_ide/
 ## License
diff --git a/crates/expect/Cargo.toml b/crates/expect/Cargo.toml
new file mode 100644
index 000000000..77775630d
--- /dev/null
+++ b/crates/expect/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "expect"
+version = "0.1.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
+license = "MIT OR Apache-2.0"
+[lib]
+doctest = false
+[dependencies]
+once_cell = "1"
+difference = "2"
+stdx = { path = "../stdx" }
diff --git a/crates/expect/src/lib.rs b/crates/expect/src/lib.rs
new file mode 100644
index 000000000..21a458d47
--- /dev/null
+++ b/crates/expect/src/lib.rs
@@ -0,0 +1,356 @@
+//! Snapshot testing library, see
+//! https://github.com/rust-analyzer/rust-analyzer/pull/5101
+use std::{
+    collections::HashMap,
+    env, fmt, fs, mem,
+    ops::Range,
+    panic,
+    path::{Path, PathBuf},
+    sync::Mutex,
+};
+use difference::Changeset;
+use once_cell::sync::Lazy;
+use stdx::{lines_with_ends, trim_indent};
+const HELP: &str = "
+You can update all `expect![[]]` tests by running:
+    env UPDATE_EXPECT=1 cargo test
+To update a single test, place the cursor on `expect` token and use `run` feature of rust-analyzer.
+";
+fn update_expect() -> bool {
+    env::var("UPDATE_EXPECT").is_ok()
+}
+/// expect![[r#"inline snapshot"#]]
+#[macro_export]
+macro_rules! expect {
+    [[$data:literal]] => {$crate::Expect {
+        position: $crate::Position {
+            file: file!(),
+            line: line!(),
+            column: column!(),
+        },
+        data: $data,
+    }};
+    [[]] => { $crate::expect![[""]] };
+}
+/// expect_file!["/crates/foo/test_data/bar.html"]
+#[macro_export]
+macro_rules! expect_file {
+    [$path:expr] => {$crate::ExpectFile {
+        path: std::path::PathBuf::from($path)
+    }};
+}
+#[derive(Debug)]
+pub struct Expect {
+    pub position: Position,
+    pub data: &'static str,
+}
+#[derive(Debug)]
+pub struct ExpectFile {
+    pub path: PathBuf,
+}
+#[derive(Debug)]
+pub struct Position {
+    pub file: &'static str,
+    pub line: u32,
+    pub column: u32,
+}
+impl fmt::Display for Position {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}:{}:{}", self.file, self.line, self.column)
+    }
+}
+impl Expect {
+    pub fn assert_eq(&self, actual: &str) {
+        let trimmed = self.trimmed();
+        if &trimmed == actual {
+            return;
+        }
+        Runtime::fail_expect(self, &trimmed, actual);
+    }
+    pub fn assert_debug_eq(&self, actual: &impl fmt::Debug) {
+        let actual = format!("{:#?}\n", actual);
+        self.assert_eq(&actual)
+    }
+    fn trimmed(&self) -> String {
+        if !self.data.contains('\n') {
+            return self.data.to_string();
+        }
+        trim_indent(self.data)
+    }
+    fn locate(&self, file: &str) -> Location {
+        let mut target_line = None;
+        let mut line_start = 0;
+        for (i, line) in lines_with_ends(file).enumerate() {
+            if i == self.position.line as usize - 1 {
+                let pat = "expect![[";
+                let offset = line.find(pat).unwrap();
+                let literal_start = line_start + offset + pat.len();
+                let indent = line.chars().take_while(|&it| it == ' ').count();
+                target_line = Some((literal_start, indent));
+                break;
+            }
+            line_start += line.len();
+        }
+        let (literal_start, line_indent) = target_line.unwrap();
+        let literal_length =
+            file[literal_start..].find("]]").expect("Couldn't find matching `]]` for `expect![[`.");
+        let literal_range = literal_start..literal_start + literal_length;
+        Location { line_indent, literal_range }
+    }
+}
+impl ExpectFile {
+    pub fn assert_eq(&self, actual: &str) {
+        let expected = self.read();
+        if actual == expected {
+            return;
+        }
+        Runtime::fail_file(self, &expected, actual);
+    }
+    pub fn assert_debug_eq(&self, actual: &impl fmt::Debug) {
+        let actual = format!("{:#?}\n", actual);
+        self.assert_eq(&actual)
+    }
+    fn read(&self) -> String {
+        fs::read_to_string(self.abs_path()).unwrap_or_default().replace("\r\n", "\n")
+    }
+    fn write(&self, contents: &str) {
+        fs::write(self.abs_path(), contents).unwrap()
+    }
+    fn abs_path(&self) -> PathBuf {
+        WORKSPACE_ROOT.join(&self.path)
+    }
+}
+#[derive(Default)]
+struct Runtime {
+    help_printed: bool,
+    per_file: HashMap<&'static str, FileRuntime>,
+}
+static RT: Lazy<Mutex<Runtime>> = Lazy::new(Default::default);
+impl Runtime {
+    fn fail_expect(expect: &Expect, expected: &str, actual: &str) {
+        let mut rt = RT.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
+        if update_expect() {
+            println!("\x1b[1m\x1b[92mupdating\x1b[0m: {}", expect.position);
+            rt.per_file
+                .entry(expect.position.file)
+                .or_insert_with(|| FileRuntime::new(expect))
+                .update(expect, actual);
+            return;
+        }
+        rt.panic(expect.position.to_string(), expected, actual);
+    }
+    fn fail_file(expect: &ExpectFile, expected: &str, actual: &str) {
+        let mut rt = RT.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
+        if update_expect() {
+            println!("\x1b[1m\x1b[92mupdating\x1b[0m: {}", expect.path.display());
+            expect.write(actual);
+            return;
+        }
+        rt.panic(expect.path.display().to_string(), expected, actual);
+    }
+    fn panic(&mut self, position: String, expected: &str, actual: &str) {
+        let print_help = !mem::replace(&mut self.help_printed, true);
+        let help = if print_help { HELP } else { "" };
+        let diff = Changeset::new(actual, expected, "\n");
+        println!(
+            "\n
+\x1b[1m\x1b[91merror\x1b[97m: expect test failed\x1b[0m
+   \x1b[1m\x1b[34m-->\x1b[0m {}
+{}
+\x1b[1mExpect\x1b[0m:
+----
+{}
+----
+\x1b[1mActual\x1b[0m:
+----
+{}
+----
+\x1b[1mDiff\x1b[0m:
+----
+{}
+----
+",
+            position, help, expected, actual, diff
+        );
+        // Use resume_unwind instead of panic!() to prevent a backtrace, which is unnecessary noise.
+        panic::resume_unwind(Box::new(()));
+    }
+}
+struct FileRuntime {
+    path: PathBuf,
+    original_text: String,
+    patchwork: Patchwork,
+}
+impl FileRuntime {
+    fn new(expect: &Expect) -> FileRuntime {
+        let path = WORKSPACE_ROOT.join(expect.position.file);
+        let original_text = fs::read_to_string(&path).unwrap();
+        let patchwork = Patchwork::new(original_text.clone());
+        FileRuntime { path, original_text, patchwork }
+    }
+    fn update(&mut self, expect: &Expect, actual: &str) {
+        let loc = expect.locate(&self.original_text);
+        let patch = format_patch(loc.line_indent.clone(), actual);
+        self.patchwork.patch(loc.literal_range, &patch);
+        fs::write(&self.path, &self.patchwork.text).unwrap()
+    }
+}
+#[derive(Debug)]
+struct Location {
+    line_indent: usize,
+    literal_range: Range<usize>,
+}
+#[derive(Debug)]
+struct Patchwork {
+    text: String,
+    indels: Vec<(Range<usize>, usize)>,
+}
+impl Patchwork {
+    fn new(text: String) -> Patchwork {
+        Patchwork { text, indels: Vec::new() }
+    }
+    fn patch(&mut self, mut range: Range<usize>, patch: &str) {
+        self.indels.push((range.clone(), patch.len()));
+        self.indels.sort_by_key(|(delete, _insert)| delete.start);
+        let (delete, insert) = self
+            .indels
+            .iter()
+            .take_while(|(delete, _)| delete.start < range.start)
+            .map(|(delete, insert)| (delete.end - delete.start, insert))
+            .fold((0usize, 0usize), |(x1, y1), (x2, y2)| (x1 + x2, y1 + y2));
+        for pos in &mut [&mut range.start, &mut range.end] {
+            **pos -= delete;
+            **pos += insert;
+        }
+        self.text.replace_range(range, &patch);
+    }
+}
+fn format_patch(line_indent: usize, patch: &str) -> String {
+    let mut max_hashes = 0;
+    let mut cur_hashes = 0;
+    for byte in patch.bytes() {
+        if byte != b'#' {
+            cur_hashes = 0;
+            continue;
+        }
+        cur_hashes += 1;
+        max_hashes = max_hashes.max(cur_hashes);
+    }
+    let hashes = &"#".repeat(max_hashes + 1);
+    let indent = &" ".repeat(line_indent);
+    let is_multiline = patch.contains('\n');
+    let mut buf = String::new();
+    buf.push('r');
+    buf.push_str(hashes);
+    buf.push('"');
+    if is_multiline {
+        buf.push('\n');
+    }
+    let mut final_newline = false;
+    for line in lines_with_ends(patch) {
+        if is_multiline && !line.trim().is_empty() {
+            buf.push_str(indent);
+            buf.push_str("    ");
+        }
+        buf.push_str(line);
+        final_newline = line.ends_with('\n');
+    }
+    if final_newline {
+        buf.push_str(indent);
+    }
+    buf.push('"');
+    buf.push_str(hashes);
+    buf
+}
+static WORKSPACE_ROOT: Lazy<PathBuf> = Lazy::new(|| {
+    let my_manifest =
+        env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| env!("CARGO_MANIFEST_DIR").to_owned());
+    // Heuristic, see https://github.com/rust-lang/cargo/issues/3946
+    Path::new(&my_manifest)
+        .ancestors()
+        .filter(|it| it.join("Cargo.toml").exists())
+        .last()
+        .unwrap()
+        .to_path_buf()
+});
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn test_format_patch() {
+        let patch = format_patch(0, "hello\nworld\n");
+        expect![[r##"
+            r#"
+                hello
+                world
+            "#"##]]
+        .assert_eq(&patch);
+        let patch = format_patch(4, "single line");
+        expect![[r##"r#"single line"#"##]].assert_eq(&patch);
+    }
+    #[test]
+    fn test_patchwork() {
+        let mut patchwork = Patchwork::new("one two three".to_string());
+        patchwork.patch(4..7, "zwei");
+        patchwork.patch(0..3, "один");
+        patchwork.patch(8..13, "3");
+        expect![[r#"
+            Patchwork {
+                text: "один zwei 3",
+                indels: [
+                    (
+                        0..3,
+                        8,
+                    ),
+                    (
+                        4..7,
+                        4,
+                    ),
+                    (
+                        8..13,
+                        1,
+                    ),
+                ],
+            }
+        "#]]
+        .assert_debug_eq(&patchwork);
+    }
+}
diff --git a/crates/flycheck/Cargo.toml b/crates/flycheck/Cargo.toml
index dc26b8ce7..ff8a1e568 100644
--- a/crates/flycheck/Cargo.toml
+++ b/crates/flycheck/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "flycheck"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -10,7 +11,7 @@ doctest = false
 [dependencies]
 crossbeam-channel = "0.4.0"
 log = "0.4.8"
-cargo_metadata = "0.10.0"
+cargo_metadata = "0.11.1"
 serde_json = "1.0.48"
 jod-thread = "0.1.1"
 ra_toolchain = { path = "../ra_toolchain" }
diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index 1023d3040..7c38f5ef9 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@@ -14,14 +14,17 @@ use std::{
 use crossbeam_channel::{never, select, unbounded, Receiver, Sender};
 pub use cargo_metadata::diagnostic::{
-    Applicability, Diagnostic, DiagnosticLevel, DiagnosticSpan, DiagnosticSpanMacroExpansion,
+    Applicability, Diagnostic, DiagnosticCode, DiagnosticLevel, DiagnosticSpan,
+    DiagnosticSpanMacroExpansion,
 };
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum FlycheckConfig {
    CargoCommand {
        command: String,
+        target_triple: Option<String>,
        all_targets: bool,
+        no_default_features: bool,
        all_features: bool,
        features: Vec<String>,
        extra_args: Vec<String>,
@@ -132,6 +135,7 @@ impl FlycheckActor {
                    self.cancel_check_process();
                    let mut command = self.check_command();
+                    log::info!("restart flycheck {:?}", command);
                    command.stdout(Stdio::piped()).stderr(Stdio::null()).stdin(Stdio::null());
                    if let Ok(child) = command.spawn().map(JodChild) {
                        self.cargo_handle = Some(CargoHandle::spawn(child));
@@ -176,6 +180,8 @@ impl FlycheckActor {
        let mut cmd = match &self.config {
            FlycheckConfig::CargoCommand {
                command,
+                target_triple,
+                no_default_features,
                all_targets,
                all_features,
                extra_args,
@@ -185,14 +191,23 @@ impl FlycheckActor {
                cmd.arg(command);
                cmd.args(&["--workspace", "--message-format=json", "--manifest-path"])
                    .arg(self.workspace_root.join("Cargo.toml"));
+                if let Some(target) = target_triple {
+                    cmd.args(&["--target", target.as_str()]);
+                }
                if *all_targets {
                    cmd.arg("--all-targets");
                }
                if *all_features {
                    cmd.arg("--all-features");
-                } else if !features.is_empty() {
+                } else {
-                    cmd.arg("--features");
+                    if *no_default_features {
-                    cmd.arg(features.join(" "));
+                        cmd.arg("--no-default-features");
+                    }
+                    if !features.is_empty() {
+                        cmd.arg("--features");
+                        cmd.arg(features.join(" "));
+                    }
                }
                cmd.args(extra_args);
                cmd
diff --git a/crates/paths/Cargo.toml b/crates/paths/Cargo.toml
index 646ee7fd5..cbe2c26e2 100644
--- a/crates/paths/Cargo.toml
+++ b/crates/paths/Cargo.toml
@@ -3,6 +3,7 @@ name = "paths"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 edition = "2018"
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_arena/Cargo.toml b/crates/ra_arena/Cargo.toml
index d287dbb73..66c3738f4 100644
--- a/crates/ra_arena/Cargo.toml
+++ b/crates/ra_arena/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_arena"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml
index 3bcf58ba4..bd2905f08 100644
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/ra_assists/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_assists"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_assists/src/assist_config.rs b/crates/ra_assists/src/assist_config.rs
index c0a0226fb..cda2abfb9 100644
--- a/crates/ra_assists/src/assist_config.rs
+++ b/crates/ra_assists/src/assist_config.rs
@@ -4,9 +4,12 @@
 //! module, and we use to statically check that we only produce snippet
 //! assists if we are allowed to.
+use crate::AssistKind;
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct AssistConfig {
    pub snippet_cap: Option<SnippetCap>,
+    pub allowed: Option<Vec<AssistKind>>,
 }
 impl AssistConfig {
@@ -22,6 +25,6 @@ pub struct SnippetCap {
 impl Default for AssistConfig {
    fn default() -> Self {
-        AssistConfig { snippet_cap: Some(SnippetCap { _private: () }) }
+        AssistConfig { snippet_cap: Some(SnippetCap { _private: () }), allowed: None }
    }
 }
diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs
index ee614de72..3407df856 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/ra_assists/src/assist_context.rs
@@ -19,7 +19,7 @@ use ra_text_edit::TextEditBuilder;
 use crate::{
    assist_config::{AssistConfig, SnippetCap},
-    Assist, AssistId, GroupLabel, ResolvedAssist,
+    Assist, AssistId, AssistKind, GroupLabel, ResolvedAssist,
 };
 /// `AssistContext` allows to apply an assist or check if it could be applied.
@@ -55,7 +55,6 @@ use crate::{
 pub(crate) struct AssistContext<'a> {
    pub(crate) config: &'a AssistConfig,
    pub(crate) sema: Semantics<'a, RootDatabase>,
-    pub(crate) db: &'a RootDatabase,
    pub(crate) frange: FileRange,
    source_file: SourceFile,
 }
@@ -67,8 +66,11 @@ impl<'a> AssistContext<'a> {
        frange: FileRange,
    ) -> AssistContext<'a> {
        let source_file = sema.parse(frange.file_id);
-        let db = sema.db;
+        AssistContext { config, sema, frange, source_file }
-        AssistContext { config, sema, db, frange, source_file }
+    }
+    pub(crate) fn db(&self) -> &RootDatabase {
+        self.sema.db
    }
    // NB, this ignores active selection.
@@ -101,14 +103,26 @@ pub(crate) struct Assists {
    resolve: bool,
    file: FileId,
    buf: Vec<(Assist, Option<SourceChange>)>,
+    allowed: Option<Vec<AssistKind>>,
 }
 impl Assists {
    pub(crate) fn new_resolved(ctx: &AssistContext) -> Assists {
-        Assists { resolve: true, file: ctx.frange.file_id, buf: Vec::new() }
+        Assists {
+            resolve: true,
+            file: ctx.frange.file_id,
+            buf: Vec::new(),
+            allowed: ctx.config.allowed.clone(),
+        }
    }
    pub(crate) fn new_unresolved(ctx: &AssistContext) -> Assists {
-        Assists { resolve: false, file: ctx.frange.file_id, buf: Vec::new() }
+        Assists {
+            resolve: false,
+            file: ctx.frange.file_id,
+            buf: Vec::new(),
+            allowed: ctx.config.allowed.clone(),
+        }
    }
    pub(crate) fn finish_unresolved(self) -> Vec<Assist> {
@@ -137,9 +151,13 @@ impl Assists {
        target: TextRange,
        f: impl FnOnce(&mut AssistBuilder),
    ) -> Option<()> {
+        if !self.is_allowed(&id) {
+            return None;
+        }
        let label = Assist::new(id, label.into(), None, target);
        self.add_impl(label, f)
    }
    pub(crate) fn add_group(
        &mut self,
        group: &GroupLabel,
@@ -148,9 +166,14 @@ impl Assists {
        target: TextRange,
        f: impl FnOnce(&mut AssistBuilder),
    ) -> Option<()> {
+        if !self.is_allowed(&id) {
+            return None;
+        }
        let label = Assist::new(id, label.into(), Some(group.clone()), target);
        self.add_impl(label, f)
    }
    fn add_impl(&mut self, label: Assist, f: impl FnOnce(&mut AssistBuilder)) -> Option<()> {
        let source_change = if self.resolve {
            let mut builder = AssistBuilder::new(self.file);
@@ -168,13 +191,20 @@ impl Assists {
        self.buf.sort_by_key(|(label, _edit)| label.target.len());
        self.buf
    }
+    fn is_allowed(&self, id: &AssistId) -> bool {
+        match &self.allowed {
+            Some(allowed) => allowed.iter().any(|kind| kind.contains(id.1)),
+            None => true,
+        }
+    }
 }
 pub(crate) struct AssistBuilder {
    edit: TextEditBuilder,
    file_id: FileId,
    is_snippet: bool,
-    edits: Vec<SourceFileEdit>,
+    change: SourceChange,
 }
 impl AssistBuilder {
@@ -183,7 +213,7 @@ impl AssistBuilder {
            edit: TextEditBuilder::default(),
            file_id,
            is_snippet: false,
-            edits: Vec::new(),
+            change: SourceChange::default(),
        }
    }
@@ -195,8 +225,8 @@ impl AssistBuilder {
        let edit = mem::take(&mut self.edit).finish();
        if !edit.is_empty() {
            let new_edit = SourceFileEdit { file_id: self.file_id, edit };
-            assert!(!self.edits.iter().any(|it| it.file_id == new_edit.file_id));
+            assert!(!self.change.source_file_edits.iter().any(|it| it.file_id == new_edit.file_id));
-            self.edits.push(new_edit);
+            self.change.source_file_edits.push(new_edit);
        }
    }
@@ -263,10 +293,10 @@ impl AssistBuilder {
    fn finish(mut self) -> SourceChange {
        self.commit();
-        let mut res: SourceChange = mem::take(&mut self.edits).into();
+        let mut change = mem::take(&mut self.change);
        if self.is_snippet {
-            res.is_snippet = true;
+            change.is_snippet = true;
        }
-        res
+        change
    }
 }
diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/ra_assists/src/ast_transform.rs
index 00fa95b6c..5ea4f9f5b 100644
--- a/crates/ra_assists/src/ast_transform.rs
+++ b/crates/ra_assists/src/ast_transform.rs
@@ -2,7 +2,6 @@
 use rustc_hash::FxHashMap;
 use hir::{HirDisplay, PathResolution, SemanticsScope};
-use ra_ide_db::RootDatabase;
 use ra_syntax::{
    algo::SyntaxRewriter,
    ast::{self, AstNode},
@@ -32,17 +31,17 @@ impl<'a> AstTransform<'a> for NullTransformer {
 }
 pub struct SubstituteTypeParams<'a> {
-    source_scope: &'a SemanticsScope<'a, RootDatabase>,
+    source_scope: &'a SemanticsScope<'a>,
    substs: FxHashMap<hir::TypeParam, ast::TypeRef>,
    previous: Box<dyn AstTransform<'a> + 'a>,
 }
 impl<'a> SubstituteTypeParams<'a> {
    pub fn for_trait_impl(
-        source_scope: &'a SemanticsScope<'a, RootDatabase>,
+        source_scope: &'a SemanticsScope<'a>,
        // FIXME: there's implicit invariant that `trait_` and  `source_scope` match...
        trait_: hir::Trait,
-        impl_def: ast::ImplDef,
+        impl_def: ast::Impl,
    ) -> SubstituteTypeParams<'a> {
        let substs = get_syntactic_substs(impl_def).unwrap_or_default();
        let generic_def: hir::GenericDef = trait_.into();
@@ -81,7 +80,7 @@ impl<'a> SubstituteTypeParams<'a> {
        // FIXME: It would probably be nicer if we could get this via HIR (i.e. get the
        // trait ref, and then go from the types in the substs back to the syntax)
-        fn get_syntactic_substs(impl_def: ast::ImplDef) -> Option<Vec<ast::TypeRef>> {
+        fn get_syntactic_substs(impl_def: ast::Impl) -> Option<Vec<ast::TypeRef>> {
            let target_trait = impl_def.target_trait()?;
            let path_type = match target_trait {
                ast::TypeRef::PathType(path) => path,
@@ -126,16 +125,13 @@ impl<'a> AstTransform<'a> for SubstituteTypeParams<'a> {
 }
 pub struct QualifyPaths<'a> {
-    target_scope: &'a SemanticsScope<'a, RootDatabase>,
+    target_scope: &'a SemanticsScope<'a>,
-    source_scope: &'a SemanticsScope<'a, RootDatabase>,
+    source_scope: &'a SemanticsScope<'a>,
    previous: Box<dyn AstTransform<'a> + 'a>,
 }
 impl<'a> QualifyPaths<'a> {
-    pub fn new(
+    pub fn new(target_scope: &'a SemanticsScope<'a>, source_scope: &'a SemanticsScope<'a>) -> Self {
-        target_scope: &'a SemanticsScope<'a, RootDatabase>,
-        source_scope: &'a SemanticsScope<'a, RootDatabase>,
-    ) -> Self {
        Self { target_scope, source_scope, previous: Box::new(NullTransformer) }
    }
@@ -156,7 +152,7 @@ impl<'a> QualifyPaths<'a> {
        let resolution = self.source_scope.resolve_hir_path(&hir_path?)?;
        match resolution {
            PathResolution::Def(def) => {
-                let found_path = from.find_use_path(self.source_scope.db, def)?;
+                let found_path = from.find_use_path(self.source_scope.db.upcast(), def)?;
                let mut path = path_to_ast(found_path);
                let type_args = p
diff --git a/crates/ra_assists/src/handlers/add_custom_impl.rs b/crates/ra_assists/src/handlers/add_custom_impl.rs
index fa70c8496..b67438b6b 100644
--- a/crates/ra_assists/src/handlers/add_custom_impl.rs
+++ b/crates/ra_assists/src/handlers/add_custom_impl.rs
@@ -8,7 +8,7 @@ use stdx::SepBy;
 use crate::{
    assist_context::{AssistContext, Assists},
-    AssistId,
+    AssistId, AssistKind,
 };
 // Assist: add_custom_impl
@@ -29,8 +29,8 @@ use crate::{
 // }
 // ```
 pub(crate) fn add_custom_impl(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let input = ctx.find_node_at_offset::<ast::AttrInput>()?;
+    let attr = ctx.find_node_at_offset::<ast::Attr>()?;
-    let attr = input.syntax().parent().and_then(ast::Attr::cast)?;
+    let input = attr.token_tree()?;
    let attr_name = attr
        .syntax()
@@ -52,7 +52,7 @@ pub(crate) fn add_custom_impl(acc: &mut Assists, ctx: &AssistContext) -> Option<
        format!("Add custom impl `{}` for `{}`", trait_token.text().as_str(), annotated_name);
    let target = attr.syntax().text_range();
-    acc.add(AssistId("add_custom_impl"), label, target, |builder| {
+    acc.add(AssistId("add_custom_impl", AssistKind::Refactor), label, target, |builder| {
        let new_attr_input = input
            .syntax()
            .descendants_with_tokens()
diff --git a/crates/ra_assists/src/handlers/add_explicit_type.rs b/crates/ra_assists/src/handlers/add_explicit_type.rs
index 90b06a625..e69f0a89b 100644
--- a/crates/ra_assists/src/handlers/add_explicit_type.rs
+++ b/crates/ra_assists/src/handlers/add_explicit_type.rs
@@ -1,10 +1,10 @@
 use hir::HirDisplay;
 use ra_syntax::{
-    ast::{self, AstNode, LetStmt, NameOwner, TypeAscriptionOwner},
+    ast::{self, AstNode, LetStmt, NameOwner},
    TextRange,
 };
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: add_explicit_type
 //
@@ -22,11 +22,11 @@ use crate::{AssistContext, AssistId, Assists};
 // }
 // ```
 pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let stmt = ctx.find_node_at_offset::<LetStmt>()?;
+    let let_stmt = ctx.find_node_at_offset::<LetStmt>()?;
-    let module = ctx.sema.scope(stmt.syntax()).module()?;
+    let module = ctx.sema.scope(let_stmt.syntax()).module()?;
-    let expr = stmt.initializer()?;
+    let expr = let_stmt.initializer()?;
    // Must be a binding
-    let pat = match stmt.pat()? {
+    let pat = match let_stmt.pat()? {
        ast::Pat::BindPat(bind_pat) => bind_pat,
        _ => return None,
    };
@@ -34,8 +34,8 @@ pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext) -> Optio
    // The binding must have a name
    let name = pat.name()?;
    let name_range = name.syntax().text_range();
-    let stmt_range = stmt.syntax().text_range();
+    let stmt_range = let_stmt.syntax().text_range();
-    let eq_range = stmt.eq_token()?.text_range();
+    let eq_range = let_stmt.eq_token()?.text_range();
    // Assist should only be applicable if cursor is between 'let' and '='
    let let_range = TextRange::new(stmt_range.start(), eq_range.start());
    let cursor_in_range = let_range.contains_range(ctx.frange.range);
@@ -44,7 +44,7 @@ pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext) -> Optio
    }
    // Assist not applicable if the type has already been specified
    // and it has no placeholders
-    let ascribed_ty = stmt.ascribed_type();
+    let ascribed_ty = let_stmt.ty();
    if let Some(ty) = &ascribed_ty {
        if ty.syntax().descendants().find_map(ast::PlaceholderType::cast).is_none() {
            return None;
@@ -57,9 +57,9 @@ pub(crate) fn add_explicit_type(acc: &mut Assists, ctx: &AssistContext) -> Optio
        return None;
    }
-    let inferred_type = ty.display_source_code(ctx.db, module.into()).ok()?;
+    let inferred_type = ty.display_source_code(ctx.db(), module.into()).ok()?;
    acc.add(
-        AssistId("add_explicit_type"),
+        AssistId("add_explicit_type", AssistKind::RefactorRewrite),
        format!("Insert explicit type `{}`", inferred_type),
        pat_range,
        |builder| match ascribed_ty {
diff --git a/crates/ra_assists/src/handlers/add_impl.rs b/crates/ra_assists/src/handlers/add_impl.rs
deleted file mode 100644
index eceba7d0a..000000000
--- a/crates/ra_assists/src/handlers/add_impl.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use ra_syntax::ast::{self, AstNode, NameOwner, TypeParamsOwner};
-use stdx::{format_to, SepBy};
-use crate::{AssistContext, AssistId, Assists};
-// Assist: add_impl
-//
-// Adds a new inherent impl for a type.
-//
-// ```
-// struct Ctx<T: Clone> {
-//     data: T,<|>
-// }
-// ```
-// ->
-// ```
-// struct Ctx<T: Clone> {
-//     data: T,
-// }
-//
-// impl<T: Clone> Ctx<T> {
-//     $0
-// }
-// ```
-pub(crate) fn add_impl(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let nominal = ctx.find_node_at_offset::<ast::NominalDef>()?;
-    let name = nominal.name()?;
-    let target = nominal.syntax().text_range();
-    acc.add(AssistId("add_impl"), format!("Implement {}", name.text().as_str()), target, |edit| {
-        let type_params = nominal.type_param_list();
-        let start_offset = nominal.syntax().text_range().end();
-        let mut buf = String::new();
-        buf.push_str("\n\nimpl");
-        if let Some(type_params) = &type_params {
-            format_to!(buf, "{}", type_params.syntax());
-        }
-        buf.push_str(" ");
-        buf.push_str(name.text().as_str());
-        if let Some(type_params) = type_params {
-            let lifetime_params = type_params
-                .lifetime_params()
-                .filter_map(|it| it.lifetime_token())
-                .map(|it| it.text().clone());
-            let type_params =
-                type_params.type_params().filter_map(|it| it.name()).map(|it| it.text().clone());
-            let generic_params = lifetime_params.chain(type_params).sep_by(", ");
-            format_to!(buf, "<{}>", generic_params)
-        }
-        match ctx.config.snippet_cap {
-            Some(cap) => {
-                buf.push_str(" {\n    $0\n}");
-                edit.insert_snippet(cap, start_offset, buf);
-            }
-            None => {
-                buf.push_str(" {\n}");
-                edit.insert(start_offset, buf);
-            }
-        }
-    })
-}
-#[cfg(test)]
-mod tests {
-    use crate::tests::{check_assist, check_assist_target};
-    use super::*;
-    #[test]
-    fn test_add_impl() {
-        check_assist(add_impl, "struct Foo {<|>}\n", "struct Foo {}\n\nimpl Foo {\n    $0\n}\n");
-        check_assist(
-            add_impl,
-            "struct Foo<T: Clone> {<|>}",
-            "struct Foo<T: Clone> {}\n\nimpl<T: Clone> Foo<T> {\n    $0\n}",
-        );
-        check_assist(
-            add_impl,
-            "struct Foo<'a, T: Foo<'a>> {<|>}",
-            "struct Foo<'a, T: Foo<'a>> {}\n\nimpl<'a, T: Foo<'a>> Foo<'a, T> {\n    $0\n}",
-        );
-    }
-    #[test]
-    fn add_impl_target() {
-        check_assist_target(
-            add_impl,
-            "
-struct SomeThingIrrelevant;
-/// Has a lifetime parameter
-struct Foo<'a, T: Foo<'a>> {<|>}
-struct EvenMoreIrrelevant;
-",
-            "/// Has a lifetime parameter
-struct Foo<'a, T: Foo<'a>> {}",
-        );
-    }
-}
diff --git a/crates/ra_assists/src/handlers/add_missing_impl_members.rs b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
index abacd4065..95a750aee 100644
--- a/crates/ra_assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
@@ -12,7 +12,7 @@ use crate::{
    assist_context::{AssistContext, Assists},
    ast_transform::{self, AstTransform, QualifyPaths, SubstituteTypeParams},
    utils::{get_missing_assoc_items, render_snippet, resolve_target_trait, Cursor},
-    AssistId,
+    AssistId, AssistKind,
 };
 #[derive(PartialEq)]
@@ -111,16 +111,17 @@ fn add_missing_impl_members_inner(
    label: &'static str,
 ) -> Option<()> {
    let _p = ra_prof::profile("add_missing_impl_members_inner");
-    let impl_def = ctx.find_node_at_offset::<ast::ImplDef>()?;
+    let impl_def = ctx.find_node_at_offset::<ast::Impl>()?;
-    let impl_item_list = impl_def.item_list()?;
+    let impl_item_list = impl_def.assoc_item_list()?;
    let trait_ = resolve_target_trait(&ctx.sema, &impl_def)?;
    let def_name = |item: &ast::AssocItem| -> Option<SmolStr> {
        match item {
-            ast::AssocItem::FnDef(def) => def.name(),
+            ast::AssocItem::Fn(def) => def.name(),
-            ast::AssocItem::TypeAliasDef(def) => def.name(),
+            ast::AssocItem::TypeAlias(def) => def.name(),
-            ast::AssocItem::ConstDef(def) => def.name(),
+            ast::AssocItem::Const(def) => def.name(),
+            ast::AssocItem::MacroCall(_) => None,
        }
        .map(|it| it.text().clone())
    };
@@ -128,13 +129,13 @@ fn add_missing_impl_members_inner(
    let missing_items = get_missing_assoc_items(&ctx.sema, &impl_def)
        .iter()
        .map(|i| match i {
-            hir::AssocItem::Function(i) => ast::AssocItem::FnDef(i.source(ctx.db).value),
+            hir::AssocItem::Function(i) => ast::AssocItem::Fn(i.source(ctx.db()).value),
-            hir::AssocItem::TypeAlias(i) => ast::AssocItem::TypeAliasDef(i.source(ctx.db).value),
+            hir::AssocItem::TypeAlias(i) => ast::AssocItem::TypeAlias(i.source(ctx.db()).value),
-            hir::AssocItem::Const(i) => ast::AssocItem::ConstDef(i.source(ctx.db).value),
+            hir::AssocItem::Const(i) => ast::AssocItem::Const(i.source(ctx.db()).value),
        })
        .filter(|t| def_name(&t).is_some())
        .filter(|t| match t {
-            ast::AssocItem::FnDef(def) => match mode {
+            ast::AssocItem::Fn(def) => match mode {
                AddMissingImplMembersMode::DefaultMethodsOnly => def.body().is_some(),
                AddMissingImplMembersMode::NoDefaultMethods => def.body().is_none(),
            },
@@ -147,7 +148,7 @@ fn add_missing_impl_members_inner(
    }
    let target = impl_def.syntax().text_range();
-    acc.add(AssistId(assist_id), label, target, |builder| {
+    acc.add(AssistId(assist_id, AssistKind::QuickFix), label, target, |builder| {
        let n_existing_items = impl_item_list.assoc_items().count();
        let source_scope = ctx.sema.scope_for_def(trait_);
        let target_scope = ctx.sema.scope(impl_item_list.syntax());
@@ -157,7 +158,8 @@ fn add_missing_impl_members_inner(
            .into_iter()
            .map(|it| ast_transform::apply(&*ast_transform, it))
            .map(|it| match it {
-                ast::AssocItem::FnDef(def) => ast::AssocItem::FnDef(add_body(def)),
+                ast::AssocItem::Fn(def) => ast::AssocItem::Fn(add_body(def)),
+                ast::AssocItem::TypeAlias(def) => ast::AssocItem::TypeAlias(def.remove_bounds()),
                _ => it,
            })
            .map(|it| edit::remove_attrs_and_docs(&it));
@@ -170,7 +172,7 @@ fn add_missing_impl_members_inner(
            Some(cap) => {
                let mut cursor = Cursor::Before(first_new_item.syntax());
                let placeholder;
-                if let ast::AssocItem::FnDef(func) = &first_new_item {
+                if let ast::AssocItem::Fn(func) = &first_new_item {
                    if let Some(m) = func.syntax().descendants().find_map(ast::MacroCall::cast) {
                        if m.syntax().text() == "todo!()" {
                            placeholder = m;
@@ -188,7 +190,7 @@ fn add_missing_impl_members_inner(
    })
 }
-fn add_body(fn_def: ast::FnDef) -> ast::FnDef {
+fn add_body(fn_def: ast::Fn) -> ast::Fn {
    if fn_def.body().is_some() {
        return fn_def;
    }
@@ -684,4 +686,26 @@ impl Foo<T> for S<T> {
 }"#,
        )
    }
+    #[test]
+    fn test_assoc_type_bounds_are_removed() {
+        check_assist(
+            add_missing_impl_members,
+            r#"
+trait Tr {
+    type Ty: Copy + 'static;
+}
+impl Tr for ()<|> {
+}"#,
+            r#"
+trait Tr {
+    type Ty: Copy + 'static;
+}
+impl Tr for () {
+    $0type Ty;
+}"#,
+        )
+    }
 }
diff --git a/crates/ra_assists/src/handlers/add_turbo_fish.rs b/crates/ra_assists/src/handlers/add_turbo_fish.rs
index 26acf81f2..0c565e89a 100644
--- a/crates/ra_assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ra_assists/src/handlers/add_turbo_fish.rs
@@ -4,7 +4,7 @@ use test_utils::mark;
 use crate::{
    assist_context::{AssistContext, Assists},
-    AssistId,
+    AssistId, AssistKind,
 };
 // Assist: add_turbo_fish
@@ -25,7 +25,14 @@ use crate::{
 // }
 // ```
 pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let ident = ctx.find_token_at_offset(SyntaxKind::IDENT)?;
+    let ident = ctx.find_token_at_offset(SyntaxKind::IDENT).or_else(|| {
+        let arg_list = ctx.find_node_at_offset::<ast::ArgList>()?;
+        if arg_list.args().count() > 0 {
+            return None;
+        }
+        mark::hit!(add_turbo_fish_after_call);
+        arg_list.l_paren_token()?.prev_token().filter(|it| it.kind() == SyntaxKind::IDENT)
+    })?;
    let next_token = ident.next_token()?;
    if next_token.kind() == T![::] {
        mark::hit!(add_turbo_fish_one_fish_is_enough);
@@ -45,12 +52,15 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
        mark::hit!(add_turbo_fish_non_generic);
        return None;
    }
-    acc.add(AssistId("add_turbo_fish"), "Add `::<>`", ident.text_range(), |builder| {
+    acc.add(
-        match ctx.config.snippet_cap {
+        AssistId("add_turbo_fish", AssistKind::RefactorRewrite),
+        "Add `::<>`",
+        ident.text_range(),
+        |builder| match ctx.config.snippet_cap {
            Some(cap) => builder.insert_snippet(cap, ident.text_range().end(), "::<${0:_}>"),
            None => builder.insert(ident.text_range().end(), "::<_>"),
-        }
+        },
-    })
+    )
 }
 #[cfg(test)]
@@ -80,6 +90,26 @@ fn main() {
    }
    #[test]
+    fn add_turbo_fish_after_call() {
+        mark::check!(add_turbo_fish_after_call);
+        check_assist(
+            add_turbo_fish,
+            r#"
+fn make<T>() -> T {}
+fn main() {
+    make()<|>;
+}
+"#,
+            r#"
+fn make<T>() -> T {}
+fn main() {
+    make::<${0:_}>();
+}
+"#,
+        );
+    }
+    #[test]
    fn add_turbo_fish_method() {
        check_assist(
            add_turbo_fish,
diff --git a/crates/ra_assists/src/handlers/apply_demorgan.rs b/crates/ra_assists/src/handlers/apply_demorgan.rs
index 233e8fb8e..de701f8b8 100644
--- a/crates/ra_assists/src/handlers/apply_demorgan.rs
+++ b/crates/ra_assists/src/handlers/apply_demorgan.rs
@@ -1,6 +1,6 @@
 use ra_syntax::ast::{self, AstNode};
-use crate::{utils::invert_boolean_expression, AssistContext, AssistId, Assists};
+use crate::{utils::invert_boolean_expression, AssistContext, AssistId, AssistKind, Assists};
 // Assist: apply_demorgan
 //
@@ -39,11 +39,16 @@ pub(crate) fn apply_demorgan(acc: &mut Assists, ctx: &AssistContext) -> Option<(
    let rhs_range = rhs.syntax().text_range();
    let not_rhs = invert_boolean_expression(rhs);
-    acc.add(AssistId("apply_demorgan"), "Apply De Morgan's law", op_range, |edit| {
+    acc.add(
-        edit.replace(op_range, opposite_op);
+        AssistId("apply_demorgan", AssistKind::RefactorRewrite),
-        edit.replace(lhs_range, format!("!({}", not_lhs.syntax().text()));
+        "Apply De Morgan's law",
-        edit.replace(rhs_range, format!("{})", not_rhs.syntax().text()));
+        op_range,
-    })
+        |edit| {
+            edit.replace(op_range, opposite_op);
+            edit.replace(lhs_range, format!("!({}", not_lhs.syntax().text()));
+            edit.replace(rhs_range, format!("{})", not_rhs.syntax().text()));
+        },
+    )
 }
 // Return the opposite text for a given logical operator, if it makes sense
diff --git a/crates/ra_assists/src/handlers/auto_import.rs b/crates/ra_assists/src/handlers/auto_import.rs
index d1cafa7d9..01e7b7a44 100644
--- a/crates/ra_assists/src/handlers/auto_import.rs
+++ b/crates/ra_assists/src/handlers/auto_import.rs
@@ -5,7 +5,7 @@ use hir::{
    AsAssocItem, AssocItemContainer, ModPath, Module, ModuleDef, PathResolution, Semantics, Trait,
    Type,
 };
-use ra_ide_db::{imports_locator::ImportsLocator, RootDatabase};
+use ra_ide_db::{imports_locator, RootDatabase};
 use ra_prof::profile;
 use ra_syntax::{
    ast::{self, AstNode},
@@ -13,7 +13,9 @@ use ra_syntax::{
 };
 use rustc_hash::FxHashSet;
-use crate::{utils::insert_use_statement, AssistContext, AssistId, Assists, GroupLabel};
+use crate::{
+    utils::insert_use_statement, AssistContext, AssistId, AssistKind, Assists, GroupLabel,
+};
 // Assist: auto_import
 //
@@ -35,8 +37,8 @@ use crate::{utils::insert_use_statement, AssistContext, AssistId, Assists, Group
 // # pub mod std { pub mod collections { pub struct HashMap { } } }
 // ```
 pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let auto_import_assets = AutoImportAssets::new(&ctx)?;
+    let auto_import_assets = AutoImportAssets::new(ctx)?;
-    let proposed_imports = auto_import_assets.search_for_imports(ctx.db);
+    let proposed_imports = auto_import_assets.search_for_imports(ctx);
    if proposed_imports.is_empty() {
        return None;
    }
@@ -46,7 +48,7 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
    for import in proposed_imports {
        acc.add_group(
            &group,
-            AssistId("auto_import"),
+            AssistId("auto_import", AssistKind::QuickFix),
            format!("Import `{}`", &import),
            range,
            |builder| {
@@ -90,7 +92,7 @@ impl AutoImportAssets {
    fn for_regular_path(path_under_caret: ast::Path, ctx: &AssistContext) -> Option<Self> {
        let syntax_under_caret = path_under_caret.syntax().to_owned();
-        if syntax_under_caret.ancestors().find_map(ast::UseItem::cast).is_some() {
+        if syntax_under_caret.ancestors().find_map(ast::Use::cast).is_some() {
            return None;
        }
@@ -127,11 +129,11 @@ impl AutoImportAssets {
        GroupLabel(name)
    }
-    fn search_for_imports(&self, db: &RootDatabase) -> BTreeSet<ModPath> {
+    fn search_for_imports(&self, ctx: &AssistContext) -> BTreeSet<ModPath> {
        let _p = profile("auto_import::search_for_imports");
+        let db = ctx.db();
        let current_crate = self.module_with_name_to_import.krate();
-        ImportsLocator::new(db, current_crate)
+        imports_locator::find_imports(&ctx.sema, current_crate, &self.get_search_query())
-            .find_imports(&self.get_search_query())
            .into_iter()
            .filter_map(|candidate| match &self.import_candidate {
                ImportCandidate::TraitAssocItem(assoc_item_type, _) => {
@@ -811,6 +813,146 @@ fn main() {
    }
    #[test]
+    fn trait_method_cross_crate() {
+        check_assist(
+            auto_import,
+            r"
+            //- /main.rs crate:main deps:dep
+            fn main() {
+                let test_struct = dep::test_mod::TestStruct {};
+                test_struct.test_meth<|>od()
+            }
+            //- /dep.rs crate:dep
+            pub mod test_mod {
+                pub trait TestTrait {
+                    fn test_method(&self);
+                }
+                pub struct TestStruct {}
+                impl TestTrait for TestStruct {
+                    fn test_method(&self) {}
+                }
+            }
+            ",
+            r"
+            use dep::test_mod::TestTrait;
+            fn main() {
+                let test_struct = dep::test_mod::TestStruct {};
+                test_struct.test_method()
+            }
+            ",
+        );
+    }
+    #[test]
+    fn assoc_fn_cross_crate() {
+        check_assist(
+            auto_import,
+            r"
+            //- /main.rs crate:main deps:dep
+            fn main() {
+                dep::test_mod::TestStruct::test_func<|>tion
+            }
+            //- /dep.rs crate:dep
+            pub mod test_mod {
+                pub trait TestTrait {
+                    fn test_function();
+                }
+                pub struct TestStruct {}
+                impl TestTrait for TestStruct {
+                    fn test_function() {}
+                }
+            }
+            ",
+            r"
+            use dep::test_mod::TestTrait;
+            fn main() {
+                dep::test_mod::TestStruct::test_function
+            }
+            ",
+        );
+    }
+    #[test]
+    fn assoc_const_cross_crate() {
+        check_assist(
+            auto_import,
+            r"
+            //- /main.rs crate:main deps:dep
+            fn main() {
+                dep::test_mod::TestStruct::CONST<|>
+            }
+            //- /dep.rs crate:dep
+            pub mod test_mod {
+                pub trait TestTrait {
+                    const CONST: bool;
+                }
+                pub struct TestStruct {}
+                impl TestTrait for TestStruct {
+                    const CONST: bool = true;
+                }
+            }
+            ",
+            r"
+            use dep::test_mod::TestTrait;
+            fn main() {
+                dep::test_mod::TestStruct::CONST
+            }
+            ",
+        );
+    }
+    #[test]
+    fn assoc_fn_as_method_cross_crate() {
+        check_assist_not_applicable(
+            auto_import,
+            r"
+            //- /main.rs crate:main deps:dep
+            fn main() {
+                let test_struct = dep::test_mod::TestStruct {};
+                test_struct.test_func<|>tion()
+            }
+            //- /dep.rs crate:dep
+            pub mod test_mod {
+                pub trait TestTrait {
+                    fn test_function();
+                }
+                pub struct TestStruct {}
+                impl TestTrait for TestStruct {
+                    fn test_function() {}
+                }
+            }
+            ",
+        );
+    }
+    #[test]
+    fn private_trait_cross_crate() {
+        check_assist_not_applicable(
+            auto_import,
+            r"
+            //- /main.rs crate:main deps:dep
+            fn main() {
+                let test_struct = dep::test_mod::TestStruct {};
+                test_struct.test_meth<|>od()
+            }
+            //- /dep.rs crate:dep
+            pub mod test_mod {
+                trait TestTrait {
+                    fn test_method(&self);
+                }
+                pub struct TestStruct {}
+                impl TestTrait for TestStruct {
+                    fn test_method(&self) {}
+                }
+            }
+            ",
+        );
+    }
+    #[test]
    fn not_applicable_for_imported_trait_for_method() {
        check_assist_not_applicable(
            auto_import,
diff --git a/crates/ra_assists/src/handlers/change_return_type_to_result.rs b/crates/ra_assists/src/handlers/change_return_type_to_result.rs
index 855baf187..167e162d8 100644
--- a/crates/ra_assists/src/handlers/change_return_type_to_result.rs
+++ b/crates/ra_assists/src/handlers/change_return_type_to_result.rs
@@ -3,7 +3,7 @@ use ra_syntax::{
    AstNode, SyntaxNode,
 };
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 use test_utils::mark;
 // Assist: change_return_type_to_result
@@ -20,9 +20,9 @@ use test_utils::mark;
 pub(crate) fn change_return_type_to_result(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    let ret_type = ctx.find_node_at_offset::<ast::RetType>()?;
    // FIXME: extend to lambdas as well
-    let fn_def = ret_type.syntax().parent().and_then(ast::FnDef::cast)?;
+    let fn_def = ret_type.syntax().parent().and_then(ast::Fn::cast)?;
-    let type_ref = &ret_type.type_ref()?;
+    let type_ref = &ret_type.ty()?;
    let ret_type_str = type_ref.syntax().text().to_string();
    let first_part_ret_type = ret_type_str.splitn(2, '<').next();
    if let Some(ret_type_first_part) = first_part_ret_type {
@@ -35,8 +35,8 @@ pub(crate) fn change_return_type_to_result(acc: &mut Assists, ctx: &AssistContex
    let block_expr = &fn_def.body()?;
    acc.add(
-        AssistId("change_return_type_to_result"),
+        AssistId("change_return_type_to_result", AssistKind::RefactorRewrite),
-        "Change return type to Result",
+        "Wrap return type in Result",
        type_ref.syntax().text_range(),
        |builder| {
            let mut tail_return_expr_collector = TailReturnCollector::new();
@@ -240,7 +240,7 @@ fn get_tail_expr_from_block(expr: &Expr) -> Option<Vec<NodeType>> {
        Expr::ParenExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
        Expr::PathExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
        Expr::Label(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::RecordLit(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
+        Expr::RecordExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
        Expr::IndexExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
        Expr::MethodCallExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
        Expr::AwaitExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
diff --git a/crates/ra_assists/src/handlers/change_visibility.rs b/crates/ra_assists/src/handlers/change_visibility.rs
index 157c7b665..724daa93f 100644
--- a/crates/ra_assists/src/handlers/change_visibility.rs
+++ b/crates/ra_assists/src/handlers/change_visibility.rs
@@ -1,12 +1,12 @@
 use ra_syntax::{
    ast::{self, NameOwner, VisibilityOwner},
    AstNode,
-    SyntaxKind::{CONST_DEF, ENUM_DEF, FN_DEF, MODULE, STRUCT_DEF, TRAIT_DEF, VISIBILITY},
+    SyntaxKind::{CONST, ENUM, FN, MODULE, STATIC, STRUCT, TRAIT, VISIBILITY},
    T,
 };
 use test_utils::mark;
-use crate::{utils::vis_offset, AssistContext, AssistId, Assists};
+use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists};
 // Assist: change_visibility
 //
@@ -28,12 +28,15 @@ pub(crate) fn change_visibility(acc: &mut Assists, ctx: &AssistContext) -> Optio
 fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    let item_keyword = ctx.token_at_offset().find(|leaf| {
-        matches!(leaf.kind(), T![const] | T![fn] | T![mod] | T![struct] | T![enum] | T![trait])
+        matches!(
+            leaf.kind(),
+            T![const] | T![static] | T![fn] | T![mod] | T![struct] | T![enum] | T![trait]
+        )
    });
    let (offset, target) = if let Some(keyword) = item_keyword {
        let parent = keyword.parent();
-        let def_kws = vec![CONST_DEF, FN_DEF, MODULE, STRUCT_DEF, ENUM_DEF, TRAIT_DEF];
+        let def_kws = vec![CONST, STATIC, FN, MODULE, STRUCT, ENUM, TRAIT];
        // Parent is not a definition, can't add visibility
        if !def_kws.iter().any(|&def_kw| def_kw == parent.kind()) {
            return None;
@@ -44,7 +47,7 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
        }
        (vis_offset(&parent), keyword.text_range())
    } else if let Some(field_name) = ctx.find_node_at_offset::<ast::Name>() {
-        let field = field_name.syntax().ancestors().find_map(ast::RecordFieldDef::cast)?;
+        let field = field_name.syntax().ancestors().find_map(ast::RecordField::cast)?;
        if field.name()? != field_name {
            mark::hit!(change_visibility_field_false_positive);
            return None;
@@ -53,7 +56,7 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
            return None;
        }
        (vis_offset(field.syntax()), field_name.syntax().text_range())
-    } else if let Some(field) = ctx.find_node_at_offset::<ast::TupleFieldDef>() {
+    } else if let Some(field) = ctx.find_node_at_offset::<ast::TupleField>() {
        if field.visibility().is_some() {
            return None;
        }
@@ -62,16 +65,21 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
        return None;
    };
-    acc.add(AssistId("change_visibility"), "Change visibility to pub(crate)", target, |edit| {
+    acc.add(
-        edit.insert(offset, "pub(crate) ");
+        AssistId("change_visibility", AssistKind::RefactorRewrite),
-    })
+        "Change visibility to pub(crate)",
+        target,
+        |edit| {
+            edit.insert(offset, "pub(crate) ");
+        },
+    )
 }
 fn change_vis(acc: &mut Assists, vis: ast::Visibility) -> Option<()> {
    if vis.syntax().text() == "pub" {
        let target = vis.syntax().text_range();
        return acc.add(
-            AssistId("change_visibility"),
+            AssistId("change_visibility", AssistKind::RefactorRewrite),
            "Change Visibility to pub(crate)",
            target,
            |edit| {
@@ -82,7 +90,7 @@ fn change_vis(acc: &mut Assists, vis: ast::Visibility) -> Option<()> {
    if vis.syntax().text() == "pub(crate)" {
        let target = vis.syntax().text_range();
        return acc.add(
-            AssistId("change_visibility"),
+            AssistId("change_visibility", AssistKind::RefactorRewrite),
            "Change visibility to pub",
            target,
            |edit| {
@@ -147,6 +155,11 @@ mod tests {
    }
    #[test]
+    fn change_visibility_static() {
+        check_assist(change_visibility, "<|>static FOO = 3u8;", "pub(crate) static FOO = 3u8;");
+    }
+    #[test]
    fn change_visibility_handles_comment_attrs() {
        check_assist(
            change_visibility,
diff --git a/crates/ra_assists/src/handlers/early_return.rs b/crates/ra_assists/src/handlers/early_return.rs
index dfade7432..3650289fd 100644
--- a/crates/ra_assists/src/handlers/early_return.rs
+++ b/crates/ra_assists/src/handlers/early_return.rs
@@ -8,14 +8,14 @@ use ra_syntax::{
        make,
    },
    AstNode,
-    SyntaxKind::{FN_DEF, LOOP_EXPR, L_CURLY, R_CURLY, WHILE_EXPR, WHITESPACE},
+    SyntaxKind::{FN, LOOP_EXPR, L_CURLY, R_CURLY, WHILE_EXPR, WHITESPACE},
    SyntaxNode,
 };
 use crate::{
    assist_context::{AssistContext, Assists},
    utils::invert_boolean_expression,
-    AssistId,
+    AssistId, AssistKind,
 };
 // Assist: convert_to_guarded_return
@@ -88,7 +88,7 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
    let early_expression: ast::Expr = match parent_container.kind() {
        WHILE_EXPR | LOOP_EXPR => make::expr_continue(),
-        FN_DEF => make::expr_return(),
+        FN => make::expr_return(),
        _ => return None,
    };
@@ -99,86 +99,92 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
    then_block.syntax().last_child_or_token().filter(|t| t.kind() == R_CURLY)?;
    let target = if_expr.syntax().text_range();
-    acc.add(AssistId("convert_to_guarded_return"), "Convert to guarded return", target, |edit| {
+    acc.add(
-        let if_indent_level = IndentLevel::from_node(&if_expr.syntax());
+        AssistId("convert_to_guarded_return", AssistKind::RefactorRewrite),
-        let new_block = match if_let_pat {
+        "Convert to guarded return",
-            None => {
+        target,
-                // If.
+        |edit| {
-                let new_expr = {
+            let if_indent_level = IndentLevel::from_node(&if_expr.syntax());
-                    let then_branch =
+            let new_block = match if_let_pat {
-                        make::block_expr(once(make::expr_stmt(early_expression).into()), None);
+                None => {
-                    let cond = invert_boolean_expression(cond_expr);
+                    // If.
-                    make::expr_if(make::condition(cond, None), then_branch).indent(if_indent_level)
+                    let new_expr = {
-                };
+                        let then_branch =
-                replace(new_expr.syntax(), &then_block, &parent_block, &if_expr)
+                            make::block_expr(once(make::expr_stmt(early_expression).into()), None);
-            }
+                        let cond = invert_boolean_expression(cond_expr);
-            Some((path, bound_ident)) => {
+                        make::expr_if(make::condition(cond, None), then_branch)
-                // If-let.
+                            .indent(if_indent_level)
-                let match_expr = {
-                    let happy_arm = {
-                        let pat = make::tuple_struct_pat(
-                            path,
-                            once(make::bind_pat(make::name("it")).into()),
-                        );
-                        let expr = {
-                            let name_ref = make::name_ref("it");
-                            let segment = make::path_segment(name_ref);
-                            let path = make::path_unqualified(segment);
-                            make::expr_path(path)
-                        };
-                        make::match_arm(once(pat.into()), expr)
                    };
+                    replace(new_expr.syntax(), &then_block, &parent_block, &if_expr)
+                }
+                Some((path, bound_ident)) => {
+                    // If-let.
+                    let match_expr = {
+                        let happy_arm = {
+                            let pat = make::tuple_struct_pat(
+                                path,
+                                once(make::bind_pat(make::name("it")).into()),
+                            );
+                            let expr = {
+                                let name_ref = make::name_ref("it");
+                                let segment = make::path_segment(name_ref);
+                                let path = make::path_unqualified(segment);
+                                make::expr_path(path)
+                            };
+                            make::match_arm(once(pat.into()), expr)
+                        };
-                    let sad_arm = make::match_arm(
+                        let sad_arm = make::match_arm(
-                        // FIXME: would be cool to use `None` or `Err(_)` if appropriate
+                            // FIXME: would be cool to use `None` or `Err(_)` if appropriate
-                        once(make::placeholder_pat().into()),
+                            once(make::placeholder_pat().into()),
-                        early_expression,
+                            early_expression,
-                    );
+                        );
-                    make::expr_match(cond_expr, make::match_arm_list(vec![happy_arm, sad_arm]))
+                        make::expr_match(cond_expr, make::match_arm_list(vec![happy_arm, sad_arm]))
-                };
+                    };
-                let let_stmt = make::let_stmt(
+                    let let_stmt = make::let_stmt(
-                    make::bind_pat(make::name(&bound_ident.syntax().to_string())).into(),
+                        make::bind_pat(make::name(&bound_ident.syntax().to_string())).into(),
-                    Some(match_expr),
+                        Some(match_expr),
+                    );
+                    let let_stmt = let_stmt.indent(if_indent_level);
+                    replace(let_stmt.syntax(), &then_block, &parent_block, &if_expr)
+                }
+            };
+            edit.replace_ast(parent_block, ast::BlockExpr::cast(new_block).unwrap());
+            fn replace(
+                new_expr: &SyntaxNode,
+                then_block: &ast::BlockExpr,
+                parent_block: &ast::BlockExpr,
+                if_expr: &ast::IfExpr,
+            ) -> SyntaxNode {
+                let then_block_items = then_block.dedent(IndentLevel(1));
+                let end_of_then = then_block_items.syntax().last_child_or_token().unwrap();
+                let end_of_then =
+                    if end_of_then.prev_sibling_or_token().map(|n| n.kind()) == Some(WHITESPACE) {
+                        end_of_then.prev_sibling_or_token().unwrap()
+                    } else {
+                        end_of_then
+                    };
+                let mut then_statements = new_expr.children_with_tokens().chain(
+                    then_block_items
+                        .syntax()
+                        .children_with_tokens()
+                        .skip(1)
+                        .take_while(|i| *i != end_of_then),
                );
-                let let_stmt = let_stmt.indent(if_indent_level);
+                replace_children(
-                replace(let_stmt.syntax(), &then_block, &parent_block, &if_expr)
+                    &parent_block.syntax(),
+                    RangeInclusive::new(
+                        if_expr.clone().syntax().clone().into(),
+                        if_expr.syntax().clone().into(),
+                    ),
+                    &mut then_statements,
+                )
            }
-        };
+        },
-        edit.replace_ast(parent_block, ast::BlockExpr::cast(new_block).unwrap());
+    )
-        fn replace(
-            new_expr: &SyntaxNode,
-            then_block: &ast::BlockExpr,
-            parent_block: &ast::BlockExpr,
-            if_expr: &ast::IfExpr,
-        ) -> SyntaxNode {
-            let then_block_items = then_block.dedent(IndentLevel(1));
-            let end_of_then = then_block_items.syntax().last_child_or_token().unwrap();
-            let end_of_then =
-                if end_of_then.prev_sibling_or_token().map(|n| n.kind()) == Some(WHITESPACE) {
-                    end_of_then.prev_sibling_or_token().unwrap()
-                } else {
-                    end_of_then
-                };
-            let mut then_statements = new_expr.children_with_tokens().chain(
-                then_block_items
-                    .syntax()
-                    .children_with_tokens()
-                    .skip(1)
-                    .take_while(|i| *i != end_of_then),
-            );
-            replace_children(
-                &parent_block.syntax(),
-                RangeInclusive::new(
-                    if_expr.clone().syntax().clone().into(),
-                    if_expr.syntax().clone().into(),
-                ),
-                &mut then_statements,
-            )
-        }
-    })
 }
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
index 43b4584b4..ccec688ca 100644
--- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -10,7 +10,8 @@ use ra_syntax::{
 use rustc_hash::FxHashSet;
 use crate::{
-    assist_context::AssistBuilder, utils::insert_use_statement, AssistContext, AssistId, Assists,
+    assist_context::AssistBuilder, utils::insert_use_statement, AssistContext, AssistId,
+    AssistKind, Assists,
 };
 // Assist: extract_struct_from_enum_variant
@@ -30,30 +31,30 @@ pub(crate) fn extract_struct_from_enum_variant(
    acc: &mut Assists,
    ctx: &AssistContext,
 ) -> Option<()> {
-    let variant = ctx.find_node_at_offset::<ast::EnumVariant>()?;
+    let variant = ctx.find_node_at_offset::<ast::Variant>()?;
    let field_list = match variant.kind() {
        ast::StructKind::Tuple(field_list) => field_list,
        _ => return None,
    };
    let variant_name = variant.name()?.to_string();
    let variant_hir = ctx.sema.to_def(&variant)?;
-    if existing_struct_def(ctx.db, &variant_name, &variant_hir) {
+    if existing_struct_def(ctx.db(), &variant_name, &variant_hir) {
        return None;
    }
    let enum_ast = variant.parent_enum();
    let visibility = enum_ast.visibility();
    let enum_hir = ctx.sema.to_def(&enum_ast)?;
-    let variant_hir_name = variant_hir.name(ctx.db);
+    let variant_hir_name = variant_hir.name(ctx.db());
    let enum_module_def = ModuleDef::from(enum_hir);
-    let current_module = enum_hir.module(ctx.db);
+    let current_module = enum_hir.module(ctx.db());
    let target = variant.syntax().text_range();
    acc.add(
-        AssistId("extract_struct_from_enum_variant"),
+        AssistId("extract_struct_from_enum_variant", AssistKind::RefactorRewrite),
        "Extract struct from enum variant",
        target,
        |builder| {
            let definition = Definition::ModuleDef(ModuleDef::EnumVariant(variant_hir));
-            let res = definition.find_usages(&ctx.db, None);
+            let res = definition.find_usages(&ctx.sema, None);
            let start_offset = variant.parent_enum().syntax().text_range().start();
            let mut visited_modules_set = FxHashSet::default();
            visited_modules_set.insert(current_module);
@@ -101,7 +102,7 @@ fn insert_import(
    enum_module_def: &ModuleDef,
    variant_hir_name: &Name,
 ) -> Option<()> {
-    let db = ctx.db;
+    let db = ctx.db();
    let mod_path = module.find_use_path(db, enum_module_def.clone());
    if let Some(mut mod_path) = mod_path {
        mod_path.segments.pop();
diff --git a/crates/ra_assists/src/handlers/extract_variable.rs b/crates/ra_assists/src/handlers/extract_variable.rs
index c4150d2bb..b925a2884 100644
--- a/crates/ra_assists/src/handlers/extract_variable.rs
+++ b/crates/ra_assists/src/handlers/extract_variable.rs
@@ -2,14 +2,13 @@ use ra_syntax::{
    ast::{self, AstNode},
    SyntaxKind::{
        BLOCK_EXPR, BREAK_EXPR, COMMENT, LAMBDA_EXPR, LOOP_EXPR, MATCH_ARM, PATH_EXPR, RETURN_EXPR,
-        WHITESPACE,
    },
    SyntaxNode,
 };
 use stdx::format_to;
 use test_utils::mark;
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: extract_variable
 //
@@ -36,87 +35,84 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option
        mark::hit!(extract_var_in_comment_is_not_applicable);
        return None;
    }
-    let expr = node.ancestors().find_map(valid_target_expr)?;
+    let to_extract = node.ancestors().find_map(valid_target_expr)?;
-    let (anchor_stmt, wrap_in_block) = anchor_stmt(expr.clone())?;
+    let anchor = Anchor::from(&to_extract)?;
-    let indent = anchor_stmt.prev_sibling_or_token()?.as_token()?.clone();
+    let indent = anchor.syntax().prev_sibling_or_token()?.as_token()?.clone();
-    if indent.kind() != WHITESPACE {
+    let target = to_extract.syntax().text_range();
-        return None;
+    acc.add(
-    }
+        AssistId("extract_variable", AssistKind::RefactorExtract),
-    let target = expr.syntax().text_range();
+        "Extract into variable",
-    acc.add(AssistId("extract_variable"), "Extract into variable", target, move |edit| {
+        target,
-        let field_shorthand = match expr.syntax().parent().and_then(ast::RecordField::cast) {
+        move |edit| {
-            Some(field) => field.name_ref(),
+            let field_shorthand =
-            None => None,
+                match to_extract.syntax().parent().and_then(ast::RecordExprField::cast) {
-        };
+                    Some(field) => field.name_ref(),
+                    None => None,
-        let mut buf = String::new();
+                };
-        let var_name = match &field_shorthand {
+            let mut buf = String::new();
-            Some(it) => it.to_string(),
-            None => "var_name".to_string(),
+            let var_name = match &field_shorthand {
-        };
+                Some(it) => it.to_string(),
-        let expr_range = match &field_shorthand {
+                None => "var_name".to_string(),
-            Some(it) => it.syntax().text_range().cover(expr.syntax().text_range()),
+            };
-            None => expr.syntax().text_range(),
+            let expr_range = match &field_shorthand {
-        };
+                Some(it) => it.syntax().text_range().cover(to_extract.syntax().text_range()),
+                None => to_extract.syntax().text_range(),
-        if wrap_in_block {
+            };
-            format_to!(buf, "{{ let {} = ", var_name);
-        } else {
+            if let Anchor::WrapInBlock(_) = anchor {
-            format_to!(buf, "let {} = ", var_name);
+                format_to!(buf, "{{ let {} = ", var_name);
-        };
+            } else {
-        format_to!(buf, "{}", expr.syntax());
+                format_to!(buf, "let {} = ", var_name);
+            };
-        let full_stmt = ast::ExprStmt::cast(anchor_stmt.clone());
+            format_to!(buf, "{}", to_extract.syntax());
-        let is_full_stmt = if let Some(expr_stmt) = &full_stmt {
-            Some(expr.syntax().clone()) == expr_stmt.expr().map(|e| e.syntax().clone())
+            if let Anchor::Replace(stmt) = anchor {
-        } else {
+                mark::hit!(test_extract_var_expr_stmt);
-            false
+                if stmt.semicolon_token().is_none() {
-        };
+                    buf.push_str(";");
-        if is_full_stmt {
+                }
-            mark::hit!(test_extract_var_expr_stmt);
+                match ctx.config.snippet_cap {
-            if full_stmt.unwrap().semicolon_token().is_none() {
+                    Some(cap) => {
-                buf.push_str(";");
+                        let snip = buf
+                            .replace(&format!("let {}", var_name), &format!("let $0{}", var_name));
+                        edit.replace_snippet(cap, expr_range, snip)
+                    }
+                    None => edit.replace(expr_range, buf),
+                }
+                return;
            }
+            buf.push_str(";");
+            // We want to maintain the indent level,
+            // but we do not want to duplicate possible
+            // extra newlines in the indent block
+            let text = indent.text();
+            if text.starts_with('\n') {
+                buf.push_str("\n");
+                buf.push_str(text.trim_start_matches('\n'));
+            } else {
+                buf.push_str(text);
+            }
+            edit.replace(expr_range, var_name.clone());
+            let offset = anchor.syntax().text_range().start();
            match ctx.config.snippet_cap {
                Some(cap) => {
                    let snip =
                        buf.replace(&format!("let {}", var_name), &format!("let $0{}", var_name));
-                    edit.replace_snippet(cap, expr_range, snip)
+                    edit.insert_snippet(cap, offset, snip)
                }
-                None => edit.replace(expr_range, buf),
+                None => edit.insert(offset, buf),
            }
-            return;
-        }
-        buf.push_str(";");
-        // We want to maintain the indent level,
-        // but we do not want to duplicate possible
-        // extra newlines in the indent block
-        let text = indent.text();
-        if text.starts_with('\n') {
-            buf.push_str("\n");
-            buf.push_str(text.trim_start_matches('\n'));
-        } else {
-            buf.push_str(text);
-        }
-        edit.replace(expr_range, var_name.clone());
+            if let Anchor::WrapInBlock(_) = anchor {
-        let offset = anchor_stmt.text_range().start();
+                edit.insert(anchor.syntax().text_range().end(), " }");
-        match ctx.config.snippet_cap {
-            Some(cap) => {
-                let snip =
-                    buf.replace(&format!("let {}", var_name), &format!("let $0{}", var_name));
-                edit.insert_snippet(cap, offset, snip)
            }
-            None => edit.insert(offset, buf),
+        },
-        }
+    )
-        if wrap_in_block {
-            edit.insert(anchor_stmt.text_range().end(), " }");
-        }
-    })
 }
 /// Check whether the node is a valid expression which can be extracted to a variable.
@@ -133,32 +129,48 @@ fn valid_target_expr(node: SyntaxNode) -> Option<ast::Expr> {
    }
 }
-/// Returns the syntax node which will follow the freshly extractd var
+enum Anchor {
-/// and a boolean indicating whether we have to wrap it within a { } block
+    Before(SyntaxNode),
-/// to produce correct code.
+    Replace(ast::ExprStmt),
-/// It can be a statement, the last in a block expression or a wanna be block
+    WrapInBlock(SyntaxNode),
-/// expression like a lambda or match arm.
+}
-fn anchor_stmt(expr: ast::Expr) -> Option<(SyntaxNode, bool)> {
-    expr.syntax().ancestors().find_map(|node| {
+impl Anchor {
-        if let Some(expr) = node.parent().and_then(ast::BlockExpr::cast).and_then(|it| it.expr()) {
+    fn from(to_extract: &ast::Expr) -> Option<Anchor> {
-            if expr.syntax() == &node {
+        to_extract.syntax().ancestors().find_map(|node| {
-                mark::hit!(test_extract_var_last_expr);
+            if let Some(expr) =
-                return Some((node, false));
+                node.parent().and_then(ast::BlockExpr::cast).and_then(|it| it.expr())
+            {
+                if expr.syntax() == &node {
+                    mark::hit!(test_extract_var_last_expr);
+                    return Some(Anchor::Before(node));
+                }
            }
-        }
-        if let Some(parent) = node.parent() {
+            if let Some(parent) = node.parent() {
-            if parent.kind() == MATCH_ARM || parent.kind() == LAMBDA_EXPR {
+                if parent.kind() == MATCH_ARM || parent.kind() == LAMBDA_EXPR {
-                return Some((node, true));
+                    return Some(Anchor::WrapInBlock(node));
+                }
            }
-        }
-        if ast::Stmt::cast(node.clone()).is_some() {
+            if let Some(stmt) = ast::Stmt::cast(node.clone()) {
-            return Some((node, false));
+                if let ast::Stmt::ExprStmt(stmt) = stmt {
-        }
+                    if stmt.expr().as_ref() == Some(to_extract) {
+                        return Some(Anchor::Replace(stmt));
+                    }
+                }
+                return Some(Anchor::Before(node));
+            }
+            None
+        })
+    }
-        None
+    fn syntax(&self) -> &SyntaxNode {
-    })
+        match self {
+            Anchor::Before(it) | Anchor::WrapInBlock(it) => it,
+            Anchor::Replace(stmt) => stmt.syntax(),
+        }
+    }
 }
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/fill_match_arms.rs b/crates/ra_assists/src/handlers/fill_match_arms.rs
index 64270c86f..708e1bc6c 100644
--- a/crates/ra_assists/src/handlers/fill_match_arms.rs
+++ b/crates/ra_assists/src/handlers/fill_match_arms.rs
@@ -8,7 +8,7 @@ use test_utils::mark;
 use crate::{
    utils::{render_snippet, Cursor, FamousDefs},
-    AssistContext, AssistId, Assists,
+    AssistContext, AssistId, AssistKind, Assists,
 };
 // Assist: fill_match_arms
@@ -51,11 +51,11 @@ pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option<
    let module = ctx.sema.scope(expr.syntax()).module()?;
    let missing_arms: Vec<MatchArm> = if let Some(enum_def) = resolve_enum_def(&ctx.sema, &expr) {
-        let variants = enum_def.variants(ctx.db);
+        let variants = enum_def.variants(ctx.db());
        let mut variants = variants
            .into_iter()
-            .filter_map(|variant| build_pat(ctx.db, module, variant))
+            .filter_map(|variant| build_pat(ctx.db(), module, variant))
            .filter(|variant_pat| is_variant_missing(&mut arms, variant_pat))
            .map(|pat| make::match_arm(iter::once(pat), make::expr_empty_block()))
            .collect::<Vec<_>>();
@@ -84,11 +84,11 @@ pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option<
        // where each tuple represents a proposed match arm.
        enum_defs
            .into_iter()
-            .map(|enum_def| enum_def.variants(ctx.db))
+            .map(|enum_def| enum_def.variants(ctx.db()))
            .multi_cartesian_product()
            .map(|variants| {
                let patterns =
-                    variants.into_iter().filter_map(|variant| build_pat(ctx.db, module, variant));
+                    variants.into_iter().filter_map(|variant| build_pat(ctx.db(), module, variant));
                ast::Pat::from(make::tuple_pat(patterns))
            })
            .filter(|variant_pat| is_variant_missing(&mut arms, variant_pat))
@@ -103,24 +103,37 @@ pub(crate) fn fill_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option<
    }
    let target = match_expr.syntax().text_range();
-    acc.add(AssistId("fill_match_arms"), "Fill match arms", target, |builder| {
+    acc.add(
-        let new_arm_list = match_arm_list.remove_placeholder();
+        AssistId("fill_match_arms", AssistKind::QuickFix),
-        let n_old_arms = new_arm_list.arms().count();
+        "Fill match arms",
-        let new_arm_list = new_arm_list.append_arms(missing_arms);
+        target,
-        let first_new_arm = new_arm_list.arms().nth(n_old_arms);
+        |builder| {
-        let old_range = match_arm_list.syntax().text_range();
+            let new_arm_list = match_arm_list.remove_placeholder();
-        match (first_new_arm, ctx.config.snippet_cap) {
+            let n_old_arms = new_arm_list.arms().count();
-            (Some(first_new_arm), Some(cap)) => {
+            let new_arm_list = new_arm_list.append_arms(missing_arms);
-                let snippet = render_snippet(
+            let first_new_arm = new_arm_list.arms().nth(n_old_arms);
-                    cap,
+            let old_range = match_arm_list.syntax().text_range();
-                    new_arm_list.syntax(),
+            match (first_new_arm, ctx.config.snippet_cap) {
-                    Cursor::Before(first_new_arm.syntax()),
+                (Some(first_new_arm), Some(cap)) => {
-                );
+                    let extend_lifetime;
-                builder.replace_snippet(cap, old_range, snippet);
+                    let cursor = match first_new_arm
-            }
+                        .syntax()
-            _ => builder.replace(old_range, new_arm_list.to_string()),
+                        .descendants()
-        }
+                        .find_map(ast::PlaceholderPat::cast)
-    })
+                    {
+                        Some(it) => {
+                            extend_lifetime = it.syntax().clone();
+                            Cursor::Replace(&extend_lifetime)
+                        }
+                        None => Cursor::Before(first_new_arm.syntax()),
+                    };
+                    let snippet = render_snippet(cap, new_arm_list.syntax(), cursor);
+                    builder.replace_snippet(cap, old_range, snippet);
+                }
+                _ => builder.replace(old_range, new_arm_list.to_string()),
+            }
+        },
+    )
 }
 fn is_variant_missing(existing_arms: &mut Vec<MatchArm>, var: &Pat) -> bool {
@@ -286,30 +299,22 @@ mod tests {
        check_assist(
            fill_match_arms,
            r#"
-            enum A {
+enum A { As, Bs, Cs(Option<i32>) }
-                As,
+fn main() {
-                Bs,
+    match A::As<|> {
-                Cs(Option<i32>),
+        A::Cs(_) | A::Bs => {}
-            }
+    }
-            fn main() {
+}
-                match A::As<|> {
+"#,
-                    A::Cs(_) | A::Bs => {}
-                }
-            }
-            "#,
            r#"
-            enum A {
+enum A { As, Bs, Cs(Option<i32>) }
-                As,
+fn main() {
-                Bs,
+    match A::As {
-                Cs(Option<i32>),
+        A::Cs(_) | A::Bs => {}
-            }
+        $0A::As => {}
-            fn main() {
+    }
-                match A::As {
+}
-                    A::Cs(_) | A::Bs => {}
+"#,
-                    $0A::As => {}
-                }
-            }
-            "#,
        );
    }
@@ -318,47 +323,29 @@ mod tests {
        check_assist(
            fill_match_arms,
            r#"
-            enum A {
+enum A { As, Bs, Cs, Ds(String), Es(B) }
-                As,
+enum B { Xs, Ys }
-                Bs,
+fn main() {
-                Cs,
+    match A::As<|> {
-                Ds(String),
+        A::Bs if 0 < 1 => {}
-                Es(B),
+        A::Ds(_value) => { let x = 1; }
-            }
+        A::Es(B::Xs) => (),
-            enum B {
+    }
-                Xs,
+}
-                Ys,
+"#,
-            }
-            fn main() {
-                match A::As<|> {
-                    A::Bs if 0 < 1 => {}
-                    A::Ds(_value) => { let x = 1; }
-                    A::Es(B::Xs) => (),
-                }
-            }
-            "#,
            r#"
-            enum A {
+enum A { As, Bs, Cs, Ds(String), Es(B) }
-                As,
+enum B { Xs, Ys }
-                Bs,
+fn main() {
-                Cs,
+    match A::As {
-                Ds(String),
+        A::Bs if 0 < 1 => {}
-                Es(B),
+        A::Ds(_value) => { let x = 1; }
-            }
+        A::Es(B::Xs) => (),
-            enum B {
+        $0A::As => {}
-                Xs,
+        A::Cs => {}
-                Ys,
+    }
-            }
+}
-            fn main() {
+"#,
-                match A::As {
-                    A::Bs if 0 < 1 => {}
-                    A::Ds(_value) => { let x = 1; }
-                    A::Es(B::Xs) => (),
-                    $0A::As => {}
-                    A::Cs => {}
-                }
-            }
-            "#,
        );
    }
@@ -367,32 +354,24 @@ mod tests {
        check_assist(
            fill_match_arms,
            r#"
-            enum A {
+enum A { As, Bs, Cs(Option<i32>) }
-                As,
+fn main() {
-                Bs,
+    match A::As<|> {
-                Cs(Option<i32>),
+        A::As(_) => {}
-            }
+        a @ A::Bs(_) => {}
-            fn main() {
+    }
-                match A::As<|> {
+}
-                    A::As(_) => {}
+"#,
-                    a @ A::Bs(_) => {}
-                }
-            }
-            "#,
            r#"
-            enum A {
+enum A { As, Bs, Cs(Option<i32>) }
-                As,
+fn main() {
-                Bs,
+    match A::As {
-                Cs(Option<i32>),
+        A::As(_) => {}
-            }
+        a @ A::Bs(_) => {}
-            fn main() {
+        A::Cs(${0:_}) => {}
-                match A::As {
+    }
-                    A::As(_) => {}
+}
-                    a @ A::Bs(_) => {}
+"#,
-                    $0A::Cs(_) => {}
-                }
-            }
-            "#,
        );
    }
@@ -401,39 +380,27 @@ mod tests {
        check_assist(
            fill_match_arms,
            r#"
-            enum A {
+enum A { As, Bs, Cs(String), Ds(String, String), Es { x: usize, y: usize } }
-                As,
-                Bs,
-                Cs(String),
-                Ds(String, String),
-                Es { x: usize, y: usize }
-            }
-            fn main() {
+fn main() {
-                let a = A::As;
+    let a = A::As;
-                match a<|> {}
+    match a<|> {}
-            }
+}
-            "#,
+"#,
            r#"
-            enum A {
+enum A { As, Bs, Cs(String), Ds(String, String), Es { x: usize, y: usize } }
-                As,
-                Bs,
-                Cs(String),
-                Ds(String, String),
-                Es { x: usize, y: usize }
-            }
-            fn main() {
+fn main() {
-                let a = A::As;
+    let a = A::As;
-                match a {
+    match a {
-                    $0A::As => {}
+        $0A::As => {}
-                    A::Bs => {}
+        A::Bs => {}
-                    A::Cs(_) => {}
+        A::Cs(_) => {}
-                    A::Ds(_, _) => {}
+        A::Ds(_, _) => {}
-                    A::Es { x, y } => {}
+        A::Es { x, y } => {}
-                }
+    }
-            }
+}
-            "#,
+"#,
        );
    }
@@ -773,7 +740,7 @@ fn foo(opt: Option<i32>) {
            r#"
 fn foo(opt: Option<i32>) {
    match opt {
-        $0Some(_) => {}
+        Some(${0:_}) => {}
        None => {}
    }
 }
diff --git a/crates/ra_assists/src/handlers/fix_visibility.rs b/crates/ra_assists/src/handlers/fix_visibility.rs
index 19d4dac5e..1aefa79cc 100644
--- a/crates/ra_assists/src/handlers/fix_visibility.rs
+++ b/crates/ra_assists/src/handlers/fix_visibility.rs
@@ -2,7 +2,8 @@ use hir::{db::HirDatabase, HasSource, HasVisibility, PathResolution};
 use ra_db::FileId;
 use ra_syntax::{ast, AstNode, TextRange, TextSize};
-use crate::{utils::vis_offset, AssistContext, AssistId, Assists};
+use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists};
+use ast::VisibilityOwner;
 // FIXME: this really should be a fix for diagnostic, rather than an assist.
@@ -41,14 +42,15 @@ fn add_vis_to_referenced_module_def(acc: &mut Assists, ctx: &AssistContext) -> O
    };
    let current_module = ctx.sema.scope(&path.syntax()).module()?;
-    let target_module = def.module(ctx.db)?;
+    let target_module = def.module(ctx.db())?;
-    let vis = target_module.visibility_of(ctx.db, &def)?;
+    let vis = target_module.visibility_of(ctx.db(), &def)?;
-    if vis.is_visible_from(ctx.db, current_module.into()) {
+    if vis.is_visible_from(ctx.db(), current_module.into()) {
        return None;
    };
-    let (offset, target, target_file, target_name) = target_data_for_def(ctx.db, def)?;
+    let (offset, current_visibility, target, target_file, target_name) =
+        target_data_for_def(ctx.db(), def)?;
    let missing_visibility =
        if current_module.krate() == target_module.krate() { "pub(crate)" } else { "pub" };
@@ -58,54 +60,78 @@ fn add_vis_to_referenced_module_def(acc: &mut Assists, ctx: &AssistContext) -> O
        Some(name) => format!("Change visibility of {} to {}", name, missing_visibility),
    };
-    acc.add(AssistId("fix_visibility"), assist_label, target, |builder| {
+    acc.add(AssistId("fix_visibility", AssistKind::QuickFix), assist_label, target, |builder| {
        builder.edit_file(target_file);
        match ctx.config.snippet_cap {
-            Some(cap) => builder.insert_snippet(cap, offset, format!("$0{} ", missing_visibility)),
+            Some(cap) => match current_visibility {
-            None => builder.insert(offset, format!("{} ", missing_visibility)),
+                Some(current_visibility) => builder.replace_snippet(
+                    cap,
+                    current_visibility.syntax().text_range(),
+                    format!("$0{}", missing_visibility),
+                ),
+                None => builder.insert_snippet(cap, offset, format!("$0{} ", missing_visibility)),
+            },
+            None => match current_visibility {
+                Some(current_visibility) => {
+                    builder.replace(current_visibility.syntax().text_range(), missing_visibility)
+                }
+                None => builder.insert(offset, format!("{} ", missing_visibility)),
+            },
        }
    })
 }
 fn add_vis_to_referenced_record_field(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let record_field: ast::RecordField = ctx.find_node_at_offset()?;
+    let record_field: ast::RecordExprField = ctx.find_node_at_offset()?;
    let (record_field_def, _) = ctx.sema.resolve_record_field(&record_field)?;
    let current_module = ctx.sema.scope(record_field.syntax()).module()?;
-    let visibility = record_field_def.visibility(ctx.db);
+    let visibility = record_field_def.visibility(ctx.db());
-    if visibility.is_visible_from(ctx.db, current_module.into()) {
+    if visibility.is_visible_from(ctx.db(), current_module.into()) {
        return None;
    }
-    let parent = record_field_def.parent_def(ctx.db);
+    let parent = record_field_def.parent_def(ctx.db());
-    let parent_name = parent.name(ctx.db);
+    let parent_name = parent.name(ctx.db());
-    let target_module = parent.module(ctx.db);
+    let target_module = parent.module(ctx.db());
-    let in_file_source = record_field_def.source(ctx.db);
+    let in_file_source = record_field_def.source(ctx.db());
-    let (offset, target) = match in_file_source.value {
+    let (offset, current_visibility, target) = match in_file_source.value {
        hir::FieldSource::Named(it) => {
            let s = it.syntax();
-            (vis_offset(s), s.text_range())
+            (vis_offset(s), it.visibility(), s.text_range())
        }
        hir::FieldSource::Pos(it) => {
            let s = it.syntax();
-            (vis_offset(s), s.text_range())
+            (vis_offset(s), it.visibility(), s.text_range())
        }
    };
    let missing_visibility =
        if current_module.krate() == target_module.krate() { "pub(crate)" } else { "pub" };
-    let target_file = in_file_source.file_id.original_file(ctx.db);
+    let target_file = in_file_source.file_id.original_file(ctx.db());
-    let target_name = record_field_def.name(ctx.db);
+    let target_name = record_field_def.name(ctx.db());
    let assist_label =
        format!("Change visibility of {}.{} to {}", parent_name, target_name, missing_visibility);
-    acc.add(AssistId("fix_visibility"), assist_label, target, |builder| {
+    acc.add(AssistId("fix_visibility", AssistKind::QuickFix), assist_label, target, |builder| {
        builder.edit_file(target_file);
        match ctx.config.snippet_cap {
-            Some(cap) => builder.insert_snippet(cap, offset, format!("$0{} ", missing_visibility)),
+            Some(cap) => match current_visibility {
-            None => builder.insert(offset, format!("{} ", missing_visibility)),
+                Some(current_visibility) => builder.replace_snippet(
+                    cap,
+                    dbg!(current_visibility.syntax()).text_range(),
+                    format!("$0{}", missing_visibility),
+                ),
+                None => builder.insert_snippet(cap, offset, format!("$0{} ", missing_visibility)),
+            },
+            None => match current_visibility {
+                Some(current_visibility) => {
+                    builder.replace(current_visibility.syntax().text_range(), missing_visibility)
+                }
+                None => builder.insert(offset, format!("{} ", missing_visibility)),
+            },
        }
    })
 }
@@ -113,24 +139,30 @@ fn add_vis_to_referenced_record_field(acc: &mut Assists, ctx: &AssistContext) ->
 fn target_data_for_def(
    db: &dyn HirDatabase,
    def: hir::ModuleDef,
-) -> Option<(TextSize, TextRange, FileId, Option<hir::Name>)> {
+) -> Option<(TextSize, Option<ast::Visibility>, TextRange, FileId, Option<hir::Name>)> {
    fn offset_target_and_file_id<S, Ast>(
        db: &dyn HirDatabase,
        x: S,
-    ) -> (TextSize, TextRange, FileId)
+    ) -> (TextSize, Option<ast::Visibility>, TextRange, FileId)
    where
        S: HasSource<Ast = Ast>,
-        Ast: AstNode,
+        Ast: AstNode + ast::VisibilityOwner,
    {
        let source = x.source(db);
        let in_file_syntax = source.syntax();
        let file_id = in_file_syntax.file_id;
        let syntax = in_file_syntax.value;
-        (vis_offset(syntax), syntax.text_range(), file_id.original_file(db.upcast()))
+        let current_visibility = source.value.visibility();
+        (
+            vis_offset(syntax),
+            current_visibility,
+            syntax.text_range(),
+            file_id.original_file(db.upcast()),
+        )
    }
    let target_name;
-    let (offset, target, target_file) = match def {
+    let (offset, current_visibility, target, target_file) = match def {
        hir::ModuleDef::Function(f) => {
            target_name = Some(f.name(db));
            offset_target_and_file_id(db, f)
@@ -164,13 +196,13 @@ fn target_data_for_def(
            let in_file_source = m.declaration_source(db)?;
            let file_id = in_file_source.file_id.original_file(db.upcast());
            let syntax = in_file_source.value.syntax();
-            (vis_offset(syntax), syntax.text_range(), file_id)
+            (vis_offset(syntax), in_file_source.value.visibility(), syntax.text_range(), file_id)
        }
        // Enum variants can't be private, we can't modify builtin types
        hir::ModuleDef::EnumVariant(_) | hir::ModuleDef::BuiltinType(_) => return None,
    };
-    Some((offset, target, target_file, target_name))
+    Some((offset, current_visibility, target, target_file, target_name))
 }
 #[cfg(test)]
@@ -523,6 +555,34 @@ struct Bar;
    }
    #[test]
+    fn replaces_pub_crate_with_pub() {
+        check_assist(
+            fix_visibility,
+            r"
+//- /main.rs crate:a deps:foo
+foo::Bar<|>
+//- /lib.rs crate:foo
+pub(crate) struct Bar;
+",
+            r"$0pub struct Bar;
+",
+        );
+        check_assist(
+            fix_visibility,
+            r"
+//- /main.rs crate:a deps:foo
+fn main() {
+    foo::Foo { <|>bar: () };
+}
+//- /lib.rs crate:foo
+pub struct Foo { pub(crate) bar: () }
+",
+            r"pub struct Foo { $0pub bar: () }
+",
+        );
+    }
+    #[test]
    #[ignore]
    // FIXME handle reexports properly
    fn fix_visibility_of_reexport() {
diff --git a/crates/ra_assists/src/handlers/flip_binexpr.rs b/crates/ra_assists/src/handlers/flip_binexpr.rs
index 573196576..3cd532650 100644
--- a/crates/ra_assists/src/handlers/flip_binexpr.rs
+++ b/crates/ra_assists/src/handlers/flip_binexpr.rs
@@ -1,6 +1,6 @@
 use ra_syntax::ast::{AstNode, BinExpr, BinOp};
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: flip_binexpr
 //
@@ -33,13 +33,18 @@ pub(crate) fn flip_binexpr(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
        return None;
    }
-    acc.add(AssistId("flip_binexpr"), "Flip binary expression", op_range, |edit| {
+    acc.add(
-        if let FlipAction::FlipAndReplaceOp(new_op) = action {
+        AssistId("flip_binexpr", AssistKind::RefactorRewrite),
-            edit.replace(op_range, new_op);
+        "Flip binary expression",
-        }
+        op_range,
-        edit.replace(lhs.text_range(), rhs.text());
+        |edit| {
-        edit.replace(rhs.text_range(), lhs.text());
+            if let FlipAction::FlipAndReplaceOp(new_op) = action {
-    })
+                edit.replace(op_range, new_op);
+            }
+            edit.replace(lhs.text_range(), rhs.text());
+            edit.replace(rhs.text_range(), lhs.text());
+        },
+    )
 }
 enum FlipAction {
diff --git a/crates/ra_assists/src/handlers/flip_comma.rs b/crates/ra_assists/src/handlers/flip_comma.rs
index a57a1c463..55a971dc7 100644
--- a/crates/ra_assists/src/handlers/flip_comma.rs
+++ b/crates/ra_assists/src/handlers/flip_comma.rs
@@ -1,6 +1,6 @@
 use ra_syntax::{algo::non_trivia_sibling, Direction, T};
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: flip_comma
 //
@@ -28,10 +28,15 @@ pub(crate) fn flip_comma(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
        return None;
    }
-    acc.add(AssistId("flip_comma"), "Flip comma", comma.text_range(), |edit| {
+    acc.add(
-        edit.replace(prev.text_range(), next.to_string());
+        AssistId("flip_comma", AssistKind::RefactorRewrite),
-        edit.replace(next.text_range(), prev.to_string());
+        "Flip comma",
-    })
+        comma.text_range(),
+        |edit| {
+            edit.replace(prev.text_range(), next.to_string());
+            edit.replace(next.text_range(), prev.to_string());
+        },
+    )
 }
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/flip_trait_bound.rs b/crates/ra_assists/src/handlers/flip_trait_bound.rs
index 0115adc8b..1234f4d29 100644
--- a/crates/ra_assists/src/handlers/flip_trait_bound.rs
+++ b/crates/ra_assists/src/handlers/flip_trait_bound.rs
@@ -4,7 +4,7 @@ use ra_syntax::{
    Direction, T,
 };
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: flip_trait_bound
 //
@@ -33,10 +33,15 @@ pub(crate) fn flip_trait_bound(acc: &mut Assists, ctx: &AssistContext) -> Option
    );
    let target = plus.text_range();
-    acc.add(AssistId("flip_trait_bound"), "Flip trait bounds", target, |edit| {
+    acc.add(
-        edit.replace(before.text_range(), after.to_string());
+        AssistId("flip_trait_bound", AssistKind::RefactorRewrite),
-        edit.replace(after.text_range(), before.to_string());
+        "Flip trait bounds",
-    })
+        target,
+        |edit| {
+            edit.replace(before.text_range(), after.to_string());
+            edit.replace(after.text_range(), before.to_string());
+        },
+    )
 }
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/add_derive.rs b/crates/ra_assists/src/handlers/generate_derive.rs
index b123b8498..90ece9fab 100644
--- a/crates/ra_assists/src/handlers/add_derive.rs
+++ b/crates/ra_assists/src/handlers/generate_derive.rs
@@ -4,9 +4,9 @@ use ra_syntax::{
    TextSize,
 };
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
-// Assist: add_derive
+// Assist: generate_derive
 //
 // Adds a new `#[derive()]` clause to a struct or enum.
 //
@@ -24,36 +24,41 @@ use crate::{AssistContext, AssistId, Assists};
 //     y: u32,
 // }
 // ```
-pub(crate) fn add_derive(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn generate_derive(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    let cap = ctx.config.snippet_cap?;
-    let nominal = ctx.find_node_at_offset::<ast::NominalDef>()?;
+    let nominal = ctx.find_node_at_offset::<ast::AdtDef>()?;
    let node_start = derive_insertion_offset(&nominal)?;
    let target = nominal.syntax().text_range();
-    acc.add(AssistId("add_derive"), "Add `#[derive]`", target, |builder| {
+    acc.add(
-        let derive_attr = nominal
+        AssistId("generate_derive", AssistKind::Generate),
-            .attrs()
+        "Add `#[derive]`",
-            .filter_map(|x| x.as_simple_call())
+        target,
-            .filter(|(name, _arg)| name == "derive")
+        |builder| {
-            .map(|(_name, arg)| arg)
+            let derive_attr = nominal
-            .next();
+                .attrs()
-        match derive_attr {
+                .filter_map(|x| x.as_simple_call())
-            None => {
+                .filter(|(name, _arg)| name == "derive")
-                builder.insert_snippet(cap, node_start, "#[derive($0)]\n");
+                .map(|(_name, arg)| arg)
-            }
+                .next();
-            Some(tt) => {
+            match derive_attr {
-                // Just move the cursor.
+                None => {
-                builder.insert_snippet(
+                    builder.insert_snippet(cap, node_start, "#[derive($0)]\n");
-                    cap,
+                }
-                    tt.syntax().text_range().end() - TextSize::of(')'),
+                Some(tt) => {
-                    "$0",
+                    // Just move the cursor.
-                )
+                    builder.insert_snippet(
-            }
+                        cap,
-        };
+                        tt.syntax().text_range().end() - TextSize::of(')'),
-    })
+                        "$0",
+                    )
+                }
+            };
+        },
+    )
 }
 // Insert `derive` after doc comments.
-fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option<TextSize> {
+fn derive_insertion_offset(nominal: &ast::AdtDef) -> Option<TextSize> {
    let non_ws_child = nominal
        .syntax()
        .children_with_tokens()
@@ -70,12 +75,12 @@ mod tests {
    #[test]
    fn add_derive_new() {
        check_assist(
-            add_derive,
+            generate_derive,
            "struct Foo { a: i32, <|>}",
            "#[derive($0)]\nstruct Foo { a: i32, }",
        );
        check_assist(
-            add_derive,
+            generate_derive,
            "struct Foo { <|> a: i32, }",
            "#[derive($0)]\nstruct Foo {  a: i32, }",
        );
@@ -84,7 +89,7 @@ mod tests {
    #[test]
    fn add_derive_existing() {
        check_assist(
-            add_derive,
+            generate_derive,
            "#[derive(Clone)]\nstruct Foo { a: i32<|>, }",
            "#[derive(Clone$0)]\nstruct Foo { a: i32, }",
        );
@@ -93,7 +98,7 @@ mod tests {
    #[test]
    fn add_derive_new_with_doc_comment() {
        check_assist(
-            add_derive,
+            generate_derive,
            "
 /// `Foo` is a pretty important struct.
 /// It does stuff.
@@ -111,7 +116,7 @@ struct Foo { a: i32, }
    #[test]
    fn add_derive_target() {
        check_assist_target(
-            add_derive,
+            generate_derive,
            "
 struct SomeThingIrrelevant;
 /// `Foo` is a pretty important struct.
diff --git a/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs b/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs
index b0e56e1b5..9da23640a 100644
--- a/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
+++ b/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs
@@ -2,9 +2,9 @@ use ra_ide_db::RootDatabase;
 use ra_syntax::ast::{self, AstNode, NameOwner};
 use test_utils::mark;
-use crate::{utils::FamousDefs, AssistContext, AssistId, Assists};
+use crate::{utils::FamousDefs, AssistContext, AssistId, AssistKind, Assists};
-// Assist: add_from_impl_for_enum
+// Assist: generate_from_impl_for_enum
 //
 // Adds a From impl for an enum variant with one tuple field.
 //
@@ -21,8 +21,8 @@ use crate::{utils::FamousDefs, AssistContext, AssistId, Assists};
 //     }
 // }
 // ```
-pub(crate) fn add_from_impl_for_enum(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn generate_from_impl_for_enum(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let variant = ctx.find_node_at_offset::<ast::EnumVariant>()?;
+    let variant = ctx.find_node_at_offset::<ast::Variant>()?;
    let variant_name = variant.name()?;
    let enum_name = variant.parent_enum().name()?;
    let field_list = match variant.kind() {
@@ -32,7 +32,7 @@ pub(crate) fn add_from_impl_for_enum(acc: &mut Assists, ctx: &AssistContext) ->
    if field_list.fields().count() != 1 {
        return None;
    }
-    let field_type = field_list.fields().next()?.type_ref()?;
+    let field_type = field_list.fields().next()?.ty()?;
    let path = match field_type {
        ast::TypeRef::PathType(it) => it,
        _ => return None,
@@ -45,8 +45,8 @@ pub(crate) fn add_from_impl_for_enum(acc: &mut Assists, ctx: &AssistContext) ->
    let target = variant.syntax().text_range();
    acc.add(
-        AssistId("add_from_impl_for_enum"),
+        AssistId("generate_from_impl_for_enum", AssistKind::Generate),
-        "Add From impl for this enum variant",
+        "Generate `From` impl for this enum variant",
        target,
        |edit| {
            let start_offset = variant.parent_enum().syntax().text_range().end();
@@ -69,7 +69,7 @@ impl From<{0}> for {1} {{
 fn existing_from_impl(
    sema: &'_ hir::Semantics<'_, RootDatabase>,
-    variant: &ast::EnumVariant,
+    variant: &ast::Variant,
 ) -> Option<()> {
    let variant = sema.to_def(variant)?;
    let enum_ = variant.parent_enum(sema.db);
@@ -97,9 +97,9 @@ mod tests {
    use super::*;
    #[test]
-    fn test_add_from_impl_for_enum() {
+    fn test_generate_from_impl_for_enum() {
        check_assist(
-            add_from_impl_for_enum,
+            generate_from_impl_for_enum,
            "enum A { <|>One(u32) }",
            r#"enum A { One(u32) }
@@ -112,9 +112,9 @@ impl From<u32> for A {
    }
    #[test]
-    fn test_add_from_impl_for_enum_complicated_path() {
+    fn test_generate_from_impl_for_enum_complicated_path() {
        check_assist(
-            add_from_impl_for_enum,
+            generate_from_impl_for_enum,
            r#"enum A { <|>One(foo::bar::baz::Boo) }"#,
            r#"enum A { One(foo::bar::baz::Boo) }
@@ -129,7 +129,7 @@ impl From<foo::bar::baz::Boo> for A {
    fn check_not_applicable(ra_fixture: &str) {
        let fixture =
            format!("//- /main.rs crate:main deps:core\n{}\n{}", ra_fixture, FamousDefs::FIXTURE);
-        check_assist_not_applicable(add_from_impl_for_enum, &fixture)
+        check_assist_not_applicable(generate_from_impl_for_enum, &fixture)
    }
    #[test]
@@ -166,7 +166,7 @@ impl From<u32> for A {
    #[test]
    fn test_add_from_impl_different_variant_impl_exists() {
        check_assist(
-            add_from_impl_for_enum,
+            generate_from_impl_for_enum,
            r#"enum A { <|>One(u32), Two(String), }
 impl From<String> for A {
diff --git a/crates/ra_assists/src/handlers/add_function.rs b/crates/ra_assists/src/handlers/generate_function.rs
index 1cfbd75aa..56510861d 100644
--- a/crates/ra_assists/src/handlers/add_function.rs
+++ b/crates/ra_assists/src/handlers/generate_function.rs
@@ -13,10 +13,10 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use crate::{
    assist_config::SnippetCap,
    utils::{render_snippet, Cursor},
-    AssistContext, AssistId, Assists,
+    AssistContext, AssistId, AssistKind, Assists,
 };
-// Assist: add_function
+// Assist: generate_function
 //
 // Adds a stub function with a signature matching the function under the cursor.
 //
@@ -41,7 +41,7 @@ use crate::{
 // }
 //
 // ```
-pub(crate) fn add_function(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn generate_function(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    let path_expr: ast::PathExpr = ctx.find_node_at_offset()?;
    let call = path_expr.syntax().parent().and_then(ast::CallExpr::cast)?;
    let path = path_expr.path()?;
@@ -62,22 +62,27 @@ pub(crate) fn add_function(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
    let function_builder = FunctionBuilder::from_call(&ctx, &call, &path, target_module)?;
    let target = call.syntax().text_range();
-    acc.add(AssistId("add_function"), "Add function", target, |builder| {
+    acc.add(
-        let function_template = function_builder.render();
+        AssistId("generate_function", AssistKind::Generate),
-        builder.edit_file(function_template.file);
+        format!("Generate `{}` function", function_builder.fn_name),
-        let new_fn = function_template.to_string(ctx.config.snippet_cap);
+        target,
-        match ctx.config.snippet_cap {
+        |builder| {
-            Some(cap) => builder.insert_snippet(cap, function_template.insert_offset, new_fn),
+            let function_template = function_builder.render();
-            None => builder.insert(function_template.insert_offset, new_fn),
+            builder.edit_file(function_template.file);
-        }
+            let new_fn = function_template.to_string(ctx.config.snippet_cap);
-    })
+            match ctx.config.snippet_cap {
+                Some(cap) => builder.insert_snippet(cap, function_template.insert_offset, new_fn),
+                None => builder.insert(function_template.insert_offset, new_fn),
+            }
+        },
+    )
 }
 struct FunctionTemplate {
    insert_offset: TextSize,
    placeholder_expr: ast::MacroCall,
    leading_ws: String,
-    fn_def: ast::FnDef,
+    fn_def: ast::Fn,
    trailing_ws: String,
    file: FileId,
 }
@@ -99,7 +104,7 @@ impl FunctionTemplate {
 struct FunctionBuilder {
    target: GeneratedFunctionTarget,
    fn_name: ast::Name,
-    type_params: Option<ast::TypeParamList>,
+    type_params: Option<ast::GenericParamList>,
    params: ast::ParamList,
    file: FileId,
    needs_pub: bool,
@@ -117,7 +122,7 @@ impl FunctionBuilder {
        let mut file = ctx.frange.file_id;
        let target = match &target_module {
            Some(target_module) => {
-                let module_source = target_module.definition_source(ctx.db);
+                let module_source = target_module.definition_source(ctx.db());
                let (in_file, target) = next_space_for_fn_in_module(ctx.sema.db, &module_source)?;
                file = in_file;
                target
@@ -195,7 +200,7 @@ fn fn_args(
    ctx: &AssistContext,
    target_module: hir::Module,
    call: &ast::CallExpr,
-) -> Option<(Option<ast::TypeParamList>, ast::ParamList)> {
+) -> Option<(Option<ast::GenericParamList>, ast::ParamList)> {
    let mut arg_names = Vec::new();
    let mut arg_types = Vec::new();
    for arg in call.arg_list()?.args() {
@@ -269,7 +274,7 @@ fn fn_arg_type(
        return None;
    }
-    if let Ok(rendered) = ty.display_source_code(ctx.db, target_module.into()) {
+    if let Ok(rendered) = ty.display_source_code(ctx.db(), target_module.into()) {
        Some(rendered)
    } else {
        None
@@ -333,7 +338,7 @@ mod tests {
    #[test]
    fn add_function_with_no_args() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo() {
    bar<|>();
@@ -356,7 +361,7 @@ fn bar() {
        // This ensures that the function is correctly generated
        // in the next outer mod or file
        check_assist(
-            add_function,
+            generate_function,
            r"
 impl Foo {
    fn foo() {
@@ -382,7 +387,7 @@ fn bar() {
    fn add_function_directly_after_current_block() {
        // The new fn should not be created at the end of the file or module
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo1() {
    bar<|>();
@@ -407,7 +412,7 @@ fn foo2() {}
    #[test]
    fn add_function_with_no_args_in_same_module() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 mod baz {
    fn foo() {
@@ -432,7 +437,7 @@ mod baz {
    #[test]
    fn add_function_with_function_call_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 struct Baz;
 fn baz() -> Baz { todo!() }
@@ -457,7 +462,7 @@ fn bar(baz: Baz) {
    #[test]
    fn add_function_with_method_call_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 struct Baz;
 impl Baz {
@@ -490,7 +495,7 @@ fn bar(baz: Baz) {
    #[test]
    fn add_function_with_string_literal_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r#"
 fn foo() {
    <|>bar("bar")
@@ -511,7 +516,7 @@ fn bar(arg: &str) {
    #[test]
    fn add_function_with_char_literal_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r#"
 fn foo() {
    <|>bar('x')
@@ -532,7 +537,7 @@ fn bar(arg: char) {
    #[test]
    fn add_function_with_int_literal_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo() {
    <|>bar(42)
@@ -553,7 +558,7 @@ fn bar(arg: i32) {
    #[test]
    fn add_function_with_cast_int_literal_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo() {
    <|>bar(42 as u8)
@@ -576,7 +581,7 @@ fn bar(arg: u8) {
        // Ensures that the name of the cast type isn't used
        // in the generated function signature.
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo() {
    let x = 42;
@@ -599,7 +604,7 @@ fn bar(x: u8) {
    #[test]
    fn add_function_with_variable_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo() {
    let worble = ();
@@ -622,7 +627,7 @@ fn bar(worble: ()) {
    #[test]
    fn add_function_with_impl_trait_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 trait Foo {}
 fn foo() -> impl Foo {
@@ -651,7 +656,7 @@ fn bar(foo: impl Foo) {
    #[test]
    fn borrowed_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 struct Baz;
 fn baz() -> Baz { todo!() }
@@ -678,7 +683,7 @@ fn bar(baz: &Baz) {
    #[test]
    fn add_function_with_qualified_path_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 mod Baz {
    pub struct Bof;
@@ -709,7 +714,7 @@ fn bar(baz: Baz::Bof) {
    // FIXME fix printing the generics of a `Ty` to make this test pass
    fn add_function_with_generic_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo<T>(t: T) {
    <|>bar(t)
@@ -732,7 +737,7 @@ fn bar<T>(t: T) {
    // FIXME Fix function type printing to make this test pass
    fn add_function_with_fn_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 struct Baz;
 impl Baz {
@@ -763,7 +768,7 @@ fn bar(arg: fn() -> Baz) {
    // FIXME Fix closure type printing to make this test pass
    fn add_function_with_closure_arg() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo() {
    let closure = |x: i64| x - 1;
@@ -786,7 +791,7 @@ fn bar(closure: impl Fn(i64) -> i64) {
    #[test]
    fn unresolveable_types_default_to_unit() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 fn foo() {
    <|>bar(baz)
@@ -807,7 +812,7 @@ fn bar(baz: ()) {
    #[test]
    fn arg_names_dont_overlap() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 struct Baz;
 fn baz() -> Baz { Baz }
@@ -832,7 +837,7 @@ fn bar(baz_1: Baz, baz_2: Baz) {
    #[test]
    fn arg_name_counters_start_at_1_per_name() {
        check_assist(
-            add_function,
+            generate_function,
            r#"
 struct Baz;
 fn baz() -> Baz { Baz }
@@ -857,7 +862,7 @@ fn bar(baz_1: Baz, baz_2: Baz, arg_1: &str, arg_2: &str) {
    #[test]
    fn add_function_in_module() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 mod bar {}
@@ -885,7 +890,7 @@ fn foo() {
    // See https://github.com/rust-analyzer/rust-analyzer/issues/1165
    fn qualified_path_uses_correct_scope() {
        check_assist(
-            add_function,
+            generate_function,
            "
 mod foo {
    pub struct Foo;
@@ -916,7 +921,7 @@ fn baz(foo: foo::Foo) {
    #[test]
    fn add_function_in_module_containing_other_items() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 mod bar {
    fn something_else() {}
@@ -945,7 +950,7 @@ fn foo() {
    #[test]
    fn add_function_in_nested_module() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 mod bar {
    mod baz {}
@@ -974,7 +979,7 @@ fn foo() {
    #[test]
    fn add_function_in_another_file() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 //- /main.rs
 mod foo;
@@ -996,7 +1001,7 @@ pub(crate) fn bar() {
    #[test]
    fn add_function_not_applicable_if_function_already_exists() {
        check_assist_not_applicable(
-            add_function,
+            generate_function,
            r"
 fn foo() {
    bar<|>();
@@ -1013,7 +1018,7 @@ fn bar() {}
            // bar is resolved, but baz isn't.
            // The assist is only active if the cursor is on an unresolved path,
            // but the assist should only be offered if the path is a function call.
-            add_function,
+            generate_function,
            r"
 fn foo() {
    bar(b<|>az);
@@ -1028,7 +1033,7 @@ fn bar(baz: ()) {}
    #[ignore]
    fn create_method_with_no_args() {
        check_assist(
-            add_function,
+            generate_function,
            r"
 struct Foo;
 impl Foo {
diff --git a/crates/ra_assists/src/handlers/generate_impl.rs b/crates/ra_assists/src/handlers/generate_impl.rs
new file mode 100644
index 000000000..d9b87c9c0
--- /dev/null
+++ b/crates/ra_assists/src/handlers/generate_impl.rs
@@ -0,0 +1,109 @@
+use ra_syntax::ast::{self, AstNode, GenericParamsOwner, NameOwner};
+use stdx::{format_to, SepBy};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
+// Assist: generate_impl
+//
+// Adds a new inherent impl for a type.
+//
+// ```
+// struct Ctx<T: Clone> {
+//     data: T,<|>
+// }
+// ```
+// ->
+// ```
+// struct Ctx<T: Clone> {
+//     data: T,
+// }
+//
+// impl<T: Clone> Ctx<T> {
+//     $0
+// }
+// ```
+pub(crate) fn generate_impl(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+    let nominal = ctx.find_node_at_offset::<ast::AdtDef>()?;
+    let name = nominal.name()?;
+    let target = nominal.syntax().text_range();
+    acc.add(
+        AssistId("generate_impl", AssistKind::Generate),
+        format!("Generate impl for `{}`", name),
+        target,
+        |edit| {
+            let type_params = nominal.generic_param_list();
+            let start_offset = nominal.syntax().text_range().end();
+            let mut buf = String::new();
+            buf.push_str("\n\nimpl");
+            if let Some(type_params) = &type_params {
+                format_to!(buf, "{}", type_params.syntax());
+            }
+            buf.push_str(" ");
+            buf.push_str(name.text().as_str());
+            if let Some(type_params) = type_params {
+                let lifetime_params = type_params
+                    .lifetime_params()
+                    .filter_map(|it| it.lifetime_token())
+                    .map(|it| it.text().clone());
+                let type_params = type_params
+                    .type_params()
+                    .filter_map(|it| it.name())
+                    .map(|it| it.text().clone());
+                let generic_params = lifetime_params.chain(type_params).sep_by(", ");
+                format_to!(buf, "<{}>", generic_params)
+            }
+            match ctx.config.snippet_cap {
+                Some(cap) => {
+                    buf.push_str(" {\n    $0\n}");
+                    edit.insert_snippet(cap, start_offset, buf);
+                }
+                None => {
+                    buf.push_str(" {\n}");
+                    edit.insert(start_offset, buf);
+                }
+            }
+        },
+    )
+}
+#[cfg(test)]
+mod tests {
+    use crate::tests::{check_assist, check_assist_target};
+    use super::*;
+    #[test]
+    fn test_add_impl() {
+        check_assist(
+            generate_impl,
+            "struct Foo {<|>}\n",
+            "struct Foo {}\n\nimpl Foo {\n    $0\n}\n",
+        );
+        check_assist(
+            generate_impl,
+            "struct Foo<T: Clone> {<|>}",
+            "struct Foo<T: Clone> {}\n\nimpl<T: Clone> Foo<T> {\n    $0\n}",
+        );
+        check_assist(
+            generate_impl,
+            "struct Foo<'a, T: Foo<'a>> {<|>}",
+            "struct Foo<'a, T: Foo<'a>> {}\n\nimpl<'a, T: Foo<'a>> Foo<'a, T> {\n    $0\n}",
+        );
+    }
+    #[test]
+    fn add_impl_target() {
+        check_assist_target(
+            generate_impl,
+            "
+struct SomeThingIrrelevant;
+/// Has a lifetime parameter
+struct Foo<'a, T: Foo<'a>> {<|>}
+struct EvenMoreIrrelevant;
+",
+            "/// Has a lifetime parameter
+struct Foo<'a, T: Foo<'a>> {}",
+        );
+    }
+}
diff --git a/crates/ra_assists/src/handlers/add_new.rs b/crates/ra_assists/src/handlers/generate_new.rs
index 837aa8377..b84aa24b6 100644
--- a/crates/ra_assists/src/handlers/add_new.rs
+++ b/crates/ra_assists/src/handlers/generate_new.rs
@@ -1,15 +1,13 @@
 use hir::Adt;
 use ra_syntax::{
-    ast::{
+    ast::{self, AstNode, GenericParamsOwner, NameOwner, StructKind, VisibilityOwner},
-        self, AstNode, NameOwner, StructKind, TypeAscriptionOwner, TypeParamsOwner, VisibilityOwner,
-    },
    T,
 };
 use stdx::{format_to, SepBy};
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
-// Assist: add_new
+// Assist: generate_new
 //
 // Adds a new inherent impl for a type.
 //
@@ -29,8 +27,8 @@ use crate::{AssistContext, AssistId, Assists};
 // }
 //
 // ```
-pub(crate) fn add_new(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn generate_new(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let strukt = ctx.find_node_at_offset::<ast::StructDef>()?;
+    let strukt = ctx.find_node_at_offset::<ast::Struct>()?;
    // We want to only apply this to non-union structs with named fields
    let field_list = match strukt.kind() {
@@ -42,7 +40,7 @@ pub(crate) fn add_new(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    let impl_def = find_struct_impl(&ctx, &strukt)?;
    let target = strukt.syntax().text_range();
-    acc.add(AssistId("add_new"), "Add default constructor", target, |builder| {
+    acc.add(AssistId("generate_new", AssistKind::Generate), "Generate `new`", target, |builder| {
        let mut buf = String::with_capacity(512);
        if impl_def.is_some() {
@@ -53,9 +51,7 @@ pub(crate) fn add_new(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
        let params = field_list
            .fields()
-            .filter_map(|f| {
+            .filter_map(|f| Some(format!("{}: {}", f.name()?.syntax(), f.ty()?.syntax())))
-                Some(format!("{}: {}", f.name()?.syntax(), f.ascribed_type()?.syntax()))
-            })
            .sep_by(", ");
        let fields = field_list.fields().filter_map(|f| f.name()).sep_by(", ");
@@ -90,8 +86,8 @@ pub(crate) fn add_new(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
 // Generates the surrounding `impl Type { <code> }` including type and lifetime
 // parameters
-fn generate_impl_text(strukt: &ast::StructDef, code: &str) -> String {
+fn generate_impl_text(strukt: &ast::Struct, code: &str) -> String {
-    let type_params = strukt.type_param_list();
+    let type_params = strukt.generic_param_list();
    let mut buf = String::with_capacity(code.len());
    buf.push_str("\n\nimpl");
    if let Some(type_params) = &type_params {
@@ -121,15 +117,15 @@ fn generate_impl_text(strukt: &ast::StructDef, code: &str) -> String {
 //
 // FIXME: change the new fn checking to a more semantic approach when that's more
 // viable (e.g. we process proc macros, etc)
-fn find_struct_impl(ctx: &AssistContext, strukt: &ast::StructDef) -> Option<Option<ast::ImplDef>> {
+fn find_struct_impl(ctx: &AssistContext, strukt: &ast::Struct) -> Option<Option<ast::Impl>> {
-    let db = ctx.db;
+    let db = ctx.db();
    let module = strukt.syntax().ancestors().find(|node| {
        ast::Module::can_cast(node.kind()) || ast::SourceFile::can_cast(node.kind())
    })?;
    let struct_def = ctx.sema.to_def(strukt)?;
-    let block = module.descendants().filter_map(ast::ImplDef::cast).find_map(|impl_blk| {
+    let block = module.descendants().filter_map(ast::Impl::cast).find_map(|impl_blk| {
        let blk = ctx.sema.to_def(&impl_blk)?;
        // FIXME: handle e.g. `struct S<T>; impl<U> S<U> {}`
@@ -157,10 +153,10 @@ fn find_struct_impl(ctx: &AssistContext, strukt: &ast::StructDef) -> Option<Opti
    Some(block)
 }
-fn has_new_fn(imp: &ast::ImplDef) -> bool {
+fn has_new_fn(imp: &ast::Impl) -> bool {
-    if let Some(il) = imp.item_list() {
+    if let Some(il) = imp.assoc_item_list() {
        for item in il.assoc_items() {
-            if let ast::AssocItem::FnDef(f) = item {
+            if let ast::AssocItem::Fn(f) = item {
                if let Some(name) = f.name() {
                    if name.text().eq_ignore_ascii_case("new") {
                        return true;
@@ -181,10 +177,10 @@ mod tests {
    #[test]
    #[rustfmt::skip]
-    fn test_add_new() {
+    fn test_generate_new() {
        // Check output of generation
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo {<|>}",
 "struct Foo {}
@@ -194,7 +190,7 @@ impl Foo {
 ",
        );
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo<T: Clone> {<|>}",
 "struct Foo<T: Clone> {}
@@ -204,7 +200,7 @@ impl<T: Clone> Foo<T> {
 ",
        );
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo<'a, T: Foo<'a>> {<|>}",
 "struct Foo<'a, T: Foo<'a>> {}
@@ -214,7 +210,7 @@ impl<'a, T: Foo<'a>> Foo<'a, T> {
 ",
        );
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo { baz: String <|>}",
 "struct Foo { baz: String }
@@ -224,7 +220,7 @@ impl Foo {
 ",
        );
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo { baz: String, qux: Vec<i32> <|>}",
 "struct Foo { baz: String, qux: Vec<i32> }
@@ -236,7 +232,7 @@ impl Foo {
        // Check that visibility modifiers don't get brought in for fields
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo { pub baz: String, pub qux: Vec<i32> <|>}",
 "struct Foo { pub baz: String, pub qux: Vec<i32> }
@@ -248,7 +244,7 @@ impl Foo {
        // Check that it reuses existing impls
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo {<|>}
 impl Foo {}
@@ -261,7 +257,7 @@ impl Foo {
 ",
        );
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo {<|>}
 impl Foo {
@@ -279,7 +275,7 @@ impl Foo {
        );
        check_assist(
-            add_new,
+            generate_new,
 "struct Foo {<|>}
 impl Foo {
@@ -304,7 +300,7 @@ impl Foo {
        // Check visibility of new fn based on struct
        check_assist(
-            add_new,
+            generate_new,
 "pub struct Foo {<|>}",
 "pub struct Foo {}
@@ -314,7 +310,7 @@ impl Foo {
 ",
        );
        check_assist(
-            add_new,
+            generate_new,
 "pub(crate) struct Foo {<|>}",
 "pub(crate) struct Foo {}
@@ -326,9 +322,9 @@ impl Foo {
    }
    #[test]
-    fn add_new_not_applicable_if_fn_exists() {
+    fn generate_new_not_applicable_if_fn_exists() {
        check_assist_not_applicable(
-            add_new,
+            generate_new,
            "
 struct Foo {<|>}
@@ -340,7 +336,7 @@ impl Foo {
        );
        check_assist_not_applicable(
-            add_new,
+            generate_new,
            "
 struct Foo {<|>}
@@ -353,9 +349,9 @@ impl Foo {
    }
    #[test]
-    fn add_new_target() {
+    fn generate_new_target() {
        check_assist_target(
-            add_new,
+            generate_new,
            "
 struct SomeThingIrrelevant;
 /// Has a lifetime parameter
@@ -370,7 +366,7 @@ struct Foo<'a, T: Foo<'a>> {}",
    #[test]
    fn test_unrelated_new() {
        check_assist(
-            add_new,
+            generate_new,
            r##"
 pub struct AstId<N: AstNode> {
    file_id: HirFileId,
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index d26e68847..2fdfabaf5 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ra_assists/src/handlers/inline_local_variable.rs
@@ -7,7 +7,7 @@ use test_utils::mark;
 use crate::{
    assist_context::{AssistContext, Assists},
-    AssistId,
+    AssistId, AssistKind,
 };
 // Assist: inline_local_variable
@@ -44,7 +44,7 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
    let def = ctx.sema.to_def(&bind_pat)?;
    let def = Definition::Local(def);
-    let refs = def.find_usages(ctx.db, None);
+    let refs = def.find_usages(&ctx.sema, None);
    if refs.is_empty() {
        mark::hit!(test_not_applicable_if_variable_unused);
        return None;
@@ -110,13 +110,19 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
    let init_in_paren = format!("({})", &init_str);
    let target = bind_pat.syntax().text_range();
-    acc.add(AssistId("inline_local_variable"), "Inline variable", target, move |builder| {
+    acc.add(
-        builder.delete(delete_range);
+        AssistId("inline_local_variable", AssistKind::RefactorInline),
-        for (desc, should_wrap) in refs.iter().zip(wrap_in_parens) {
+        "Inline variable",
-            let replacement = if should_wrap { init_in_paren.clone() } else { init_str.clone() };
+        target,
-            builder.replace(desc.file_range.range, replacement)
+        move |builder| {
-        }
+            builder.delete(delete_range);
-    })
+            for (desc, should_wrap) in refs.iter().zip(wrap_in_parens) {
+                let replacement =
+                    if should_wrap { init_in_paren.clone() } else { init_str.clone() };
+                builder.replace(desc.file_range.range, replacement)
+            }
+        },
+    )
 }
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs b/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
index 28fcbc9ba..c3134f64d 100644
--- a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
+++ b/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
@@ -1,10 +1,10 @@
 use ra_syntax::{
-    ast::{self, NameOwner, TypeAscriptionOwner, TypeParamsOwner},
+    ast::{self, GenericParamsOwner, NameOwner},
    AstNode, SyntaxKind, TextRange, TextSize,
 };
 use rustc_hash::FxHashSet;
-use crate::{assist_context::AssistBuilder, AssistContext, AssistId, Assists};
+use crate::{assist_context::AssistBuilder, AssistContext, AssistId, AssistKind, Assists};
 static ASSIST_NAME: &str = "introduce_named_lifetime";
 static ASSIST_LABEL: &str = "Introduce named lifetime";
@@ -38,9 +38,9 @@ pub(crate) fn introduce_named_lifetime(acc: &mut Assists, ctx: &AssistContext) -
    let lifetime_token = ctx
        .find_token_at_offset(SyntaxKind::LIFETIME)
        .filter(|lifetime| lifetime.text() == "'_")?;
-    if let Some(fn_def) = lifetime_token.ancestors().find_map(ast::FnDef::cast) {
+    if let Some(fn_def) = lifetime_token.ancestors().find_map(ast::Fn::cast) {
        generate_fn_def_assist(acc, &fn_def, lifetime_token.text_range())
-    } else if let Some(impl_def) = lifetime_token.ancestors().find_map(ast::ImplDef::cast) {
+    } else if let Some(impl_def) = lifetime_token.ancestors().find_map(ast::Impl::cast) {
        generate_impl_def_assist(acc, &impl_def, lifetime_token.text_range())
    } else {
        None
@@ -50,11 +50,11 @@ pub(crate) fn introduce_named_lifetime(acc: &mut Assists, ctx: &AssistContext) -
 /// Generate the assist for the fn def case
 fn generate_fn_def_assist(
    acc: &mut Assists,
-    fn_def: &ast::FnDef,
+    fn_def: &ast::Fn,
    lifetime_loc: TextRange,
 ) -> Option<()> {
    let param_list: ast::ParamList = fn_def.param_list()?;
-    let new_lifetime_param = generate_unique_lifetime_param_name(&fn_def.type_param_list())?;
+    let new_lifetime_param = generate_unique_lifetime_param_name(&fn_def.generic_param_list())?;
    let end_of_fn_ident = fn_def.name()?.ident_token()?.text_range().end();
    let self_param =
        // use the self if it's a reference and has no explicit lifetime
@@ -67,7 +67,7 @@ fn generate_fn_def_assist(
        // otherwise, if there's a single reference parameter without a named liftime, use that
        let fn_params_without_lifetime: Vec<_> = param_list
            .params()
-            .filter_map(|param| match param.ascribed_type() {
+            .filter_map(|param| match param.ty() {
                Some(ast::TypeRef::ReferenceType(ascribed_type))
                    if ascribed_type.lifetime_token() == None =>
                {
@@ -83,7 +83,7 @@ fn generate_fn_def_assist(
            _ => return None,
        }
    };
-    acc.add(AssistId(ASSIST_NAME), ASSIST_LABEL, lifetime_loc, |builder| {
+    acc.add(AssistId(ASSIST_NAME, AssistKind::Refactor), ASSIST_LABEL, lifetime_loc, |builder| {
        add_lifetime_param(fn_def, builder, end_of_fn_ident, new_lifetime_param);
        builder.replace(lifetime_loc, format!("'{}", new_lifetime_param));
        loc_needing_lifetime.map(|loc| builder.insert(loc, format!("'{} ", new_lifetime_param)));
@@ -93,12 +93,12 @@ fn generate_fn_def_assist(
 /// Generate the assist for the impl def case
 fn generate_impl_def_assist(
    acc: &mut Assists,
-    impl_def: &ast::ImplDef,
+    impl_def: &ast::Impl,
    lifetime_loc: TextRange,
 ) -> Option<()> {
-    let new_lifetime_param = generate_unique_lifetime_param_name(&impl_def.type_param_list())?;
+    let new_lifetime_param = generate_unique_lifetime_param_name(&impl_def.generic_param_list())?;
    let end_of_impl_kw = impl_def.impl_token()?.text_range().end();
-    acc.add(AssistId(ASSIST_NAME), ASSIST_LABEL, lifetime_loc, |builder| {
+    acc.add(AssistId(ASSIST_NAME, AssistKind::Refactor), ASSIST_LABEL, lifetime_loc, |builder| {
        add_lifetime_param(impl_def, builder, end_of_impl_kw, new_lifetime_param);
        builder.replace(lifetime_loc, format!("'{}", new_lifetime_param));
    })
@@ -107,7 +107,7 @@ fn generate_impl_def_assist(
 /// Given a type parameter list, generate a unique lifetime parameter name
 /// which is not in the list
 fn generate_unique_lifetime_param_name(
-    existing_type_param_list: &Option<ast::TypeParamList>,
+    existing_type_param_list: &Option<ast::GenericParamList>,
 ) -> Option<char> {
    match existing_type_param_list {
        Some(type_params) => {
@@ -123,13 +123,13 @@ fn generate_unique_lifetime_param_name(
 /// Add the lifetime param to `builder`. If there are type parameters in `type_params_owner`, add it to the end. Otherwise
 /// add new type params brackets with the lifetime parameter at `new_type_params_loc`.
-fn add_lifetime_param<TypeParamsOwner: ast::TypeParamsOwner>(
+fn add_lifetime_param<TypeParamsOwner: ast::GenericParamsOwner>(
    type_params_owner: &TypeParamsOwner,
    builder: &mut AssistBuilder,
    new_type_params_loc: TextSize,
    new_lifetime_param: char,
 ) {
-    match type_params_owner.type_param_list() {
+    match type_params_owner.generic_param_list() {
        // add the new lifetime parameter to an existing type param list
        Some(type_params) => {
            builder.insert(
diff --git a/crates/ra_assists/src/handlers/invert_if.rs b/crates/ra_assists/src/handlers/invert_if.rs
index 59d278eb9..bbe3f3643 100644
--- a/crates/ra_assists/src/handlers/invert_if.rs
+++ b/crates/ra_assists/src/handlers/invert_if.rs
@@ -6,7 +6,7 @@ use ra_syntax::{
 use crate::{
    assist_context::{AssistContext, Assists},
    utils::invert_boolean_expression,
-    AssistId,
+    AssistId, AssistKind,
 };
 // Assist: invert_if
@@ -54,7 +54,7 @@ pub(crate) fn invert_if(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    let else_node = else_block.syntax();
    let else_range = else_node.text_range();
    let then_range = then_node.text_range();
-    acc.add(AssistId("invert_if"), "Invert if", if_range, |edit| {
+    acc.add(AssistId("invert_if", AssistKind::RefactorRewrite), "Invert if", if_range, |edit| {
        edit.replace(cond_range, flip_cond.syntax().text());
        edit.replace(else_range, then_node.text());
        edit.replace(then_range, else_node.text());
diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/ra_assists/src/handlers/merge_imports.rs
index ac0b3035c..c775fe25c 100644
--- a/crates/ra_assists/src/handlers/merge_imports.rs
+++ b/crates/ra_assists/src/handlers/merge_imports.rs
@@ -8,7 +8,7 @@ use ra_syntax::{
 use crate::{
    assist_context::{AssistContext, Assists},
-    AssistId,
+    AssistId, AssistKind,
 };
 // Assist: merge_imports
@@ -28,7 +28,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
    let mut rewriter = SyntaxRewriter::default();
    let mut offset = ctx.offset();
-    if let Some(use_item) = tree.syntax().parent().and_then(ast::UseItem::cast) {
+    if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) {
        let (merged, to_delete) = next_prev()
            .filter_map(|dir| neighbor(&use_item, dir))
            .filter_map(|it| Some((it.clone(), it.use_tree()?)))
@@ -56,9 +56,14 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
    };
    let target = tree.syntax().text_range();
-    acc.add(AssistId("merge_imports"), "Merge imports", target, |builder| {
+    acc.add(
-        builder.rewrite(rewriter);
+        AssistId("merge_imports", AssistKind::RefactorRewrite),
-    })
+        "Merge imports",
+        target,
+        |builder| {
+            builder.rewrite(rewriter);
+        },
+    )
 }
 fn next_prev() -> impl Iterator<Item = Direction> {
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs
index 90ce66378..186a1f618 100644
--- a/crates/ra_assists/src/handlers/merge_match_arms.rs
+++ b/crates/ra_assists/src/handlers/merge_match_arms.rs
@@ -6,7 +6,7 @@ use ra_syntax::{
    Direction,
 };
-use crate::{AssistContext, AssistId, Assists, TextRange};
+use crate::{AssistContext, AssistId, AssistKind, Assists, TextRange};
 // Assist: merge_match_arms
 //
@@ -59,25 +59,30 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option
        return None;
    }
-    acc.add(AssistId("merge_match_arms"), "Merge match arms", current_text_range, |edit| {
+    acc.add(
-        let pats = if arms_to_merge.iter().any(contains_placeholder) {
+        AssistId("merge_match_arms", AssistKind::RefactorRewrite),
-            "_".into()
+        "Merge match arms",
-        } else {
+        current_text_range,
-            arms_to_merge
+        |edit| {
-                .iter()
+            let pats = if arms_to_merge.iter().any(contains_placeholder) {
-                .filter_map(ast::MatchArm::pat)
+                "_".into()
-                .map(|x| x.syntax().to_string())
+            } else {
-                .collect::<Vec<String>>()
+                arms_to_merge
-                .join(" | ")
+                    .iter()
-        };
+                    .filter_map(ast::MatchArm::pat)
+                    .map(|x| x.syntax().to_string())
-        let arm = format!("{} => {}", pats, current_expr.syntax().text());
+                    .collect::<Vec<String>>()
+                    .join(" | ")
-        let start = arms_to_merge.first().unwrap().syntax().text_range().start();
+            };
-        let end = arms_to_merge.last().unwrap().syntax().text_range().end();
+            let arm = format!("{} => {}", pats, current_expr.syntax().text());
-        edit.replace(TextRange::new(start, end), arm);
-    })
+            let start = arms_to_merge.first().unwrap().syntax().text_range().start();
+            let end = arms_to_merge.last().unwrap().syntax().text_range().end();
+            edit.replace(TextRange::new(start, end), arm);
+        },
+    )
 }
 fn contains_placeholder(a: &ast::MatchArm) -> bool {
diff --git a/crates/ra_assists/src/handlers/move_bounds.rs b/crates/ra_assists/src/handlers/move_bounds.rs
index be2a7eddc..6d394443e 100644
--- a/crates/ra_assists/src/handlers/move_bounds.rs
+++ b/crates/ra_assists/src/handlers/move_bounds.rs
@@ -5,7 +5,7 @@ use ra_syntax::{
    T,
 };
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: move_bounds_to_where_clause
 //
@@ -23,7 +23,7 @@ use crate::{AssistContext, AssistId, Assists};
 // }
 // ```
 pub(crate) fn move_bounds_to_where_clause(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let type_param_list = ctx.find_node_at_offset::<ast::TypeParamList>()?;
+    let type_param_list = ctx.find_node_at_offset::<ast::GenericParamList>()?;
    let mut type_params = type_param_list.type_params();
    if type_params.all(|p| p.type_bound_list().is_none()) {
@@ -37,42 +37,49 @@ pub(crate) fn move_bounds_to_where_clause(acc: &mut Assists, ctx: &AssistContext
    let anchor = match_ast! {
        match parent {
-            ast::FnDef(it) => it.body()?.syntax().clone().into(),
+            ast::Fn(it) => it.body()?.syntax().clone().into(),
-            ast::TraitDef(it) => it.item_list()?.syntax().clone().into(),
+            ast::Trait(it) => it.assoc_item_list()?.syntax().clone().into(),
-            ast::ImplDef(it) => it.item_list()?.syntax().clone().into(),
+            ast::Impl(it) => it.assoc_item_list()?.syntax().clone().into(),
-            ast::EnumDef(it) => it.variant_list()?.syntax().clone().into(),
+            ast::Enum(it) => it.variant_list()?.syntax().clone().into(),
-            ast::StructDef(it) => {
+            ast::Struct(it) => {
                it.syntax().children_with_tokens()
-                    .find(|it| it.kind() == RECORD_FIELD_DEF_LIST || it.kind() == T![;])?
+                    .find(|it| it.kind() == RECORD_FIELD_LIST || it.kind() == T![;])?
            },
            _ => return None
        }
    };
    let target = type_param_list.syntax().text_range();
-    acc.add(AssistId("move_bounds_to_where_clause"), "Move to where clause", target, |edit| {
+    acc.add(
-        let new_params = type_param_list
+        AssistId("move_bounds_to_where_clause", AssistKind::RefactorRewrite),
-            .type_params()
+        "Move to where clause",
-            .filter(|it| it.type_bound_list().is_some())
+        target,
-            .map(|type_param| {
+        |edit| {
-                let without_bounds = type_param.remove_bounds();
+            let new_params = type_param_list
-                (type_param, without_bounds)
+                .type_params()
-            });
+                .filter(|it| it.type_bound_list().is_some())
+                .map(|type_param| {
-        let new_type_param_list = type_param_list.replace_descendants(new_params);
+                    let without_bounds = type_param.remove_bounds();
-        edit.replace_ast(type_param_list.clone(), new_type_param_list);
+                    (type_param, without_bounds)
+                });
-        let where_clause = {
-            let predicates = type_param_list.type_params().filter_map(build_predicate);
+            let new_type_param_list = type_param_list.replace_descendants(new_params);
-            make::where_clause(predicates)
+            edit.replace_ast(type_param_list.clone(), new_type_param_list);
-        };
+            let where_clause = {
-        let to_insert = match anchor.prev_sibling_or_token() {
+                let predicates = type_param_list.type_params().filter_map(build_predicate);
-            Some(ref elem) if elem.kind() == WHITESPACE => format!("{} ", where_clause.syntax()),
+                make::where_clause(predicates)
-            _ => format!(" {}", where_clause.syntax()),
+            };
-        };
-        edit.insert(anchor.text_range().start(), to_insert);
+            let to_insert = match anchor.prev_sibling_or_token() {
-    })
+                Some(ref elem) if elem.kind() == WHITESPACE => {
+                    format!("{} ", where_clause.syntax())
+                }
+                _ => format!(" {}", where_clause.syntax()),
+            };
+            edit.insert(anchor.text_range().start(), to_insert);
+        },
+    )
 }
 fn build_predicate(param: ast::TypeParam) -> Option<ast::WherePred> {
diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs
index 7edcf0748..4060d34c6 100644
--- a/crates/ra_assists/src/handlers/move_guard.rs
+++ b/crates/ra_assists/src/handlers/move_guard.rs
@@ -3,7 +3,7 @@ use ra_syntax::{
    SyntaxKind::WHITESPACE,
 };
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: move_guard_to_arm_body
 //
@@ -40,17 +40,22 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext) ->
    let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text());
    let target = guard.syntax().text_range();
-    acc.add(AssistId("move_guard_to_arm_body"), "Move guard to arm body", target, |edit| {
+    acc.add(
-        match space_before_guard {
+        AssistId("move_guard_to_arm_body", AssistKind::RefactorRewrite),
-            Some(element) if element.kind() == WHITESPACE => {
+        "Move guard to arm body",
-                edit.delete(element.text_range());
+        target,
-            }
+        |edit| {
-            _ => (),
+            match space_before_guard {
-        };
+                Some(element) if element.kind() == WHITESPACE => {
+                    edit.delete(element.text_range());
+                }
+                _ => (),
+            };
-        edit.delete(guard.syntax().text_range());
+            edit.delete(guard.syntax().text_range());
-        edit.replace_node_and_indent(arm_expr.syntax(), buf);
+            edit.replace_node_and_indent(arm_expr.syntax(), buf);
-    })
+        },
+    )
 }
 // Assist: move_arm_cond_to_match_guard
@@ -100,7 +105,7 @@ pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContex
    let target = if_expr.syntax().text_range();
    acc.add(
-        AssistId("move_arm_cond_to_match_guard"),
+        AssistId("move_arm_cond_to_match_guard", AssistKind::RefactorRewrite),
        "Move condition to match guard",
        target,
        |edit| {
diff --git a/crates/ra_assists/src/handlers/raw_string.rs b/crates/ra_assists/src/handlers/raw_string.rs
index d22d0aa55..4e8a0c2db 100644
--- a/crates/ra_assists/src/handlers/raw_string.rs
+++ b/crates/ra_assists/src/handlers/raw_string.rs
@@ -1,11 +1,14 @@
+use std::borrow::Cow;
 use ra_syntax::{
-    ast::{self, HasStringValue},
+    ast::{self, HasQuotes, HasStringValue},
    AstToken,
    SyntaxKind::{RAW_STRING, STRING},
-    TextSize,
+    TextRange, TextSize,
 };
+use test_utils::mark;
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: make_raw_string
 //
@@ -26,14 +29,24 @@ pub(crate) fn make_raw_string(acc: &mut Assists, ctx: &AssistContext) -> Option<
    let token = ctx.find_token_at_offset(STRING).and_then(ast::String::cast)?;
    let value = token.value()?;
    let target = token.syntax().text_range();
-    acc.add(AssistId("make_raw_string"), "Rewrite as raw string", target, |edit| {
+    acc.add(
-        let max_hash_streak = count_hashes(&value);
+        AssistId("make_raw_string", AssistKind::RefactorRewrite),
-        let mut hashes = String::with_capacity(max_hash_streak + 1);
+        "Rewrite as raw string",
-        for _ in 0..hashes.capacity() {
+        target,
-            hashes.push('#');
+        |edit| {
-        }
+            let hashes = "#".repeat(required_hashes(&value).max(1));
-        edit.replace(token.syntax().text_range(), format!("r{}\"{}\"{}", hashes, value, hashes));
+            if matches!(value, Cow::Borrowed(_)) {
-    })
+                // Avoid replacing the whole string to better position the cursor.
+                edit.insert(token.syntax().text_range().start(), format!("r{}", hashes));
+                edit.insert(token.syntax().text_range().end(), format!("{}", hashes));
+            } else {
+                edit.replace(
+                    token.syntax().text_range(),
+                    format!("r{}\"{}\"{}", hashes, value, hashes),
+                );
+            }
+        },
+    )
 }
 // Assist: make_usual_string
@@ -55,11 +68,24 @@ pub(crate) fn make_usual_string(acc: &mut Assists, ctx: &AssistContext) -> Optio
    let token = ctx.find_token_at_offset(RAW_STRING).and_then(ast::RawString::cast)?;
    let value = token.value()?;
    let target = token.syntax().text_range();
-    acc.add(AssistId("make_usual_string"), "Rewrite as regular string", target, |edit| {
+    acc.add(
-        // parse inside string to escape `"`
+        AssistId("make_usual_string", AssistKind::RefactorRewrite),
-        let escaped = value.escape_default().to_string();
+        "Rewrite as regular string",
-        edit.replace(token.syntax().text_range(), format!("\"{}\"", escaped));
+        target,
-    })
+        |edit| {
+            // parse inside string to escape `"`
+            let escaped = value.escape_default().to_string();
+            if let Some(offsets) = token.quote_offsets() {
+                if token.text()[offsets.contents - token.syntax().text_range().start()] == escaped {
+                    edit.replace(offsets.quotes.0, "\"");
+                    edit.replace(offsets.quotes.1, "\"");
+                    return;
+                }
+            }
+            edit.replace(token.syntax().text_range(), format!("\"{}\"", escaped));
+        },
+    )
 }
 // Assist: add_hash
@@ -80,7 +106,7 @@ pub(crate) fn make_usual_string(acc: &mut Assists, ctx: &AssistContext) -> Optio
 pub(crate) fn add_hash(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    let token = ctx.find_token_at_offset(RAW_STRING)?;
    let target = token.text_range();
-    acc.add(AssistId("add_hash"), "Add # to raw string", target, |edit| {
+    acc.add(AssistId("add_hash", AssistKind::Refactor), "Add #", target, |edit| {
        edit.insert(token.text_range().start() + TextSize::of('r'), "#");
        edit.insert(token.text_range().end(), "#");
    })
@@ -102,44 +128,58 @@ pub(crate) fn add_hash(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
 // }
 // ```
 pub(crate) fn remove_hash(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let token = ctx.find_token_at_offset(RAW_STRING)?;
+    let token = ctx.find_token_at_offset(RAW_STRING).and_then(ast::RawString::cast)?;
    let text = token.text().as_str();
-    if text.starts_with("r\"") {
+    if !text.starts_with("r#") && text.ends_with('#') {
-        // no hash to remove
        return None;
    }
-    let target = token.text_range();
-    acc.add(AssistId("remove_hash"), "Remove hash from raw string", target, |edit| {
+    let existing_hashes = text.chars().skip(1).take_while(|&it| it == '#').count();
-        let result = &text[2..text.len() - 1];
-        let result = if result.starts_with('\"') {
+    let text_range = token.syntax().text_range();
-            // FIXME: this logic is wrong, not only the last has has to handled specially
+    let internal_text = &text[token.text_range_between_quotes()? - text_range.start()];
-            // no more hash, escape
-            let internal_str = &result[1..result.len() - 1];
+    if existing_hashes == required_hashes(internal_text) {
-            format!("\"{}\"", internal_str.escape_default().to_string())
+        mark::hit!(cant_remove_required_hash);
-        } else {
+        return None;
-            result.to_owned()
+    }
-        };
-        edit.replace(token.text_range(), format!("r{}", result));
+    acc.add(AssistId("remove_hash", AssistKind::RefactorRewrite), "Remove #", text_range, |edit| {
+        edit.delete(TextRange::at(text_range.start() + TextSize::of('r'), TextSize::of('#')));
+        edit.delete(TextRange::new(text_range.end() - TextSize::of('#'), text_range.end()));
    })
 }
-fn count_hashes(s: &str) -> usize {
+fn required_hashes(s: &str) -> usize {
-    let mut max_hash_streak = 0usize;
+    let mut res = 0usize;
-    for idx in s.match_indices("\"#").map(|(i, _)| i) {
+    for idx in s.match_indices('"').map(|(i, _)| i) {
        let (_, sub) = s.split_at(idx + 1);
-        let nb_hash = sub.chars().take_while(|c| *c == '#').count();
+        let n_hashes = sub.chars().take_while(|c| *c == '#').count();
-        if nb_hash > max_hash_streak {
+        res = res.max(n_hashes + 1)
-            max_hash_streak = nb_hash;
-        }
    }
-    max_hash_streak
+    res
+}
+#[test]
+fn test_required_hashes() {
+    assert_eq!(0, required_hashes("abc"));
+    assert_eq!(0, required_hashes("###"));
+    assert_eq!(1, required_hashes("\""));
+    assert_eq!(2, required_hashes("\"#abc"));
+    assert_eq!(0, required_hashes("#abc"));
+    assert_eq!(3, required_hashes("#ab\"##c"));
+    assert_eq!(5, required_hashes("#ab\"##\"####c"));
 }
 #[cfg(test)]
 mod test {
-    use super::*;
+    use test_utils::mark;
    use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};
+    use super::*;
    #[test]
    fn make_raw_string_target() {
        check_assist_target(
@@ -341,33 +381,21 @@ string"###;
    fn remove_hash_works() {
        check_assist(
            remove_hash,
-            r##"
+            r##"fn f() { let s = <|>r#"random string"#; }"##,
-            fn f() {
+            r#"fn f() { let s = r"random string"; }"#,
-                let s = <|>r#"random string"#;
-            }
-            "##,
-            r#"
-            fn f() {
-                let s = r"random string";
-            }
-            "#,
        )
    }
    #[test]
-    fn remove_hash_with_quote_works() {
+    fn cant_remove_required_hash() {
-        check_assist(
+        mark::check!(cant_remove_required_hash);
+        check_assist_not_applicable(
            remove_hash,
            r##"
            fn f() {
                let s = <|>r#"random"str"ing"#;
            }
            "##,
-            r#"
-            fn f() {
-                let s = r"random\"str\"ing";
-            }
-            "#,
        )
    }
@@ -389,27 +417,13 @@ string"###;
    }
    #[test]
-    fn remove_hash_not_works() {
+    fn remove_hash_doesnt_work() {
-        check_assist_not_applicable(
+        check_assist_not_applicable(remove_hash, r#"fn f() { let s = <|>"random string"; }"#);
-            remove_hash,
-            r#"
-            fn f() {
-                let s = <|>"random string";
-            }
-            "#,
-        );
    }
    #[test]
-    fn remove_hash_no_hash_not_works() {
+    fn remove_hash_no_hash_doesnt_work() {
-        check_assist_not_applicable(
+        check_assist_not_applicable(remove_hash, r#"fn f() { let s = <|>r"random string"; }"#);
-            remove_hash,
-            r#"
-            fn f() {
-                let s = <|>r"random string";
-            }
-            "#,
-        );
    }
    #[test]
@@ -487,14 +501,4 @@ string"###;
            "#,
        );
    }
-    #[test]
-    fn count_hashes_test() {
-        assert_eq!(0, count_hashes("abc"));
-        assert_eq!(0, count_hashes("###"));
-        assert_eq!(1, count_hashes("\"#abc"));
-        assert_eq!(0, count_hashes("#abc"));
-        assert_eq!(2, count_hashes("#ab\"##c"));
-        assert_eq!(4, count_hashes("#ab\"##\"####c"));
-    }
 }
diff --git a/crates/ra_assists/src/handlers/remove_dbg.rs b/crates/ra_assists/src/handlers/remove_dbg.rs
index 961ee1731..9430ce1b5 100644
--- a/crates/ra_assists/src/handlers/remove_dbg.rs
+++ b/crates/ra_assists/src/handlers/remove_dbg.rs
@@ -1,9 +1,9 @@
 use ra_syntax::{
    ast::{self, AstNode},
-    TextSize, T,
+    TextRange, TextSize, T,
 };
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: remove_dbg
 //
@@ -27,19 +27,33 @@ pub(crate) fn remove_dbg(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
        return None;
    }
-    let macro_range = macro_call.syntax().text_range();
+    let is_leaf = macro_call.syntax().next_sibling().is_none();
-    let macro_content = {
+    let macro_end = if macro_call.semicolon_token().is_some() {
-        let macro_args = macro_call.token_tree()?.syntax().clone();
+        macro_call.syntax().text_range().end() - TextSize::of(';')
+    } else {
+        macro_call.syntax().text_range().end()
+    };
-        let text = macro_args.text();
+    // macro_range determines what will be deleted and replaced with macro_content
-        let without_parens = TextSize::of('(')..text.len() - TextSize::of(')');
+    let macro_range = TextRange::new(macro_call.syntax().text_range().start(), macro_end);
-        text.slice(without_parens).to_string()
+    let paste_instead_of_dbg = {
+        let text = macro_call.token_tree()?.syntax().text();
+        // leafiness determines if we should include the parenthesis or not
+        let slice_index: TextRange = if is_leaf {
+            // leaf means - we can extract the contents of the dbg! in text
+            TextRange::new(TextSize::of('('), text.len() - TextSize::of(')'))
+        } else {
+            // not leaf - means we should keep the parens
+            TextRange::up_to(text.len())
+        };
+        text.slice(slice_index).to_string()
    };
    let target = macro_call.syntax().text_range();
-    acc.add(AssistId("remove_dbg"), "Remove dbg!()", target, |builder| {
+    acc.add(AssistId("remove_dbg", AssistKind::Refactor), "Remove dbg!()", target, |builder| {
-        builder.replace(macro_range, macro_content);
+        builder.replace(macro_range, paste_instead_of_dbg);
    })
 }
@@ -99,6 +113,7 @@ fn foo(n: usize) {
 ",
        );
    }
    #[test]
    fn test_remove_dbg_with_brackets_and_braces() {
        check_assist(remove_dbg, "dbg![<|>1 + 1]", "1 + 1");
@@ -113,7 +128,7 @@ fn foo(n: usize) {
    }
    #[test]
-    fn remove_dbg_target() {
+    fn test_remove_dbg_target() {
        check_assist_target(
            remove_dbg,
            "
@@ -126,4 +141,65 @@ fn foo(n: usize) {
            "dbg!(n.checked_sub(4))",
        );
    }
+    #[test]
+    fn test_remove_dbg_keep_semicolon() {
+        // https://github.com/rust-analyzer/rust-analyzer/issues/5129#issuecomment-651399779
+        // not quite though
+        // adding a comment at the end of the line makes
+        // the ast::MacroCall to include the semicolon at the end
+        check_assist(
+            remove_dbg,
+            r#"let res = <|>dbg!(1 * 20); // needless comment"#,
+            r#"let res = 1 * 20; // needless comment"#,
+        );
+    }
+    #[test]
+    fn test_remove_dbg_keep_expression() {
+        check_assist(
+            remove_dbg,
+            r#"let res = <|>dbg!(a + b).foo();"#,
+            r#"let res = (a + b).foo();"#,
+        );
+    }
+    #[test]
+    fn test_remove_dbg_from_inside_fn() {
+        check_assist_target(
+            remove_dbg,
+            r#"
+fn square(x: u32) -> u32 {
+    x * x
+}
+fn main() {
+    let x = square(dbg<|>!(5 + 10));
+    println!("{}", x);
+}"#,
+            "dbg!(5 + 10)",
+        );
+        check_assist(
+            remove_dbg,
+            r#"
+fn square(x: u32) -> u32 {
+    x * x
+}
+fn main() {
+    let x = square(dbg<|>!(5 + 10));
+    println!("{}", x);
+}"#,
+            r#"
+fn square(x: u32) -> u32 {
+    x * x
+}
+fn main() {
+    let x = square(5 + 10);
+    println!("{}", x);
+}"#,
+        );
+    }
 }
diff --git a/crates/ra_assists/src/handlers/remove_mut.rs b/crates/ra_assists/src/handlers/remove_mut.rs
index fe4eada03..ef55c354e 100644
--- a/crates/ra_assists/src/handlers/remove_mut.rs
+++ b/crates/ra_assists/src/handlers/remove_mut.rs
@@ -1,6 +1,6 @@
 use ra_syntax::{SyntaxKind, TextRange, T};
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: remove_mut
 //
@@ -26,7 +26,12 @@ pub(crate) fn remove_mut(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    };
    let target = mut_token.text_range();
-    acc.add(AssistId("remove_mut"), "Remove `mut` keyword", target, |builder| {
+    acc.add(
-        builder.delete(TextRange::new(delete_from, delete_to));
+        AssistId("remove_mut", AssistKind::Refactor),
-    })
+        "Remove `mut` keyword",
+        target,
+        |builder| {
+            builder.delete(TextRange::new(delete_from, delete_to));
+        },
+    )
 }
diff --git a/crates/ra_assists/src/handlers/reorder_fields.rs b/crates/ra_assists/src/handlers/reorder_fields.rs
index bc58ce5fe..120250e79 100644
--- a/crates/ra_assists/src/handlers/reorder_fields.rs
+++ b/crates/ra_assists/src/handlers/reorder_fields.rs
@@ -5,7 +5,7 @@ use hir::{Adt, ModuleDef, PathResolution, Semantics, Struct};
 use ra_ide_db::RootDatabase;
 use ra_syntax::{algo, ast, match_ast, AstNode, SyntaxKind, SyntaxKind::*, SyntaxNode};
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: reorder_fields
 //
@@ -23,7 +23,7 @@ use crate::{AssistContext, AssistId, Assists};
 // ```
 //
 pub(crate) fn reorder_fields(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    reorder::<ast::RecordLit>(acc, ctx).or_else(|| reorder::<ast::RecordPat>(acc, ctx))
+    reorder::<ast::RecordExpr>(acc, ctx).or_else(|| reorder::<ast::RecordPat>(acc, ctx))
 }
 fn reorder<R: AstNode>(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
@@ -42,16 +42,21 @@ fn reorder<R: AstNode>(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    }
    let target = record.syntax().text_range();
-    acc.add(AssistId("reorder_fields"), "Reorder record fields", target, |edit| {
+    acc.add(
-        for (old, new) in fields.iter().zip(&sorted_fields) {
+        AssistId("reorder_fields", AssistKind::RefactorRewrite),
-            algo::diff(old, new).into_text_edit(edit.text_edit_builder());
+        "Reorder record fields",
-        }
+        target,
-    })
+        |edit| {
+            for (old, new) in fields.iter().zip(&sorted_fields) {
+                algo::diff(old, new).into_text_edit(edit.text_edit_builder());
+            }
+        },
+    )
 }
 fn get_fields_kind(node: &SyntaxNode) -> Vec<SyntaxKind> {
    match node.kind() {
-        RECORD_LIT => vec![RECORD_FIELD],
+        RECORD_EXPR => vec![RECORD_EXPR_FIELD],
        RECORD_PAT => vec![RECORD_FIELD_PAT, BIND_PAT],
        _ => vec![],
    }
@@ -60,7 +65,7 @@ fn get_fields_kind(node: &SyntaxNode) -> Vec<SyntaxKind> {
 fn get_field_name(node: &SyntaxNode) -> String {
    let res = match_ast! {
        match node {
-            ast::RecordField(field) => field.field_name().map(|it| it.to_string()),
+            ast::RecordExprField(field) => field.field_name().map(|it| it.to_string()),
            ast::RecordFieldPat(field) => field.field_name().map(|it| it.to_string()),
            _ => None,
        }
@@ -90,10 +95,10 @@ fn struct_definition(path: &ast::Path, sema: &Semantics<RootDatabase>) -> Option
 fn compute_fields_ranks(path: &ast::Path, ctx: &AssistContext) -> Option<FxHashMap<String, usize>> {
    Some(
        struct_definition(path, &ctx.sema)?
-            .fields(ctx.db)
+            .fields(ctx.db())
            .iter()
            .enumerate()
-            .map(|(idx, field)| (field.name(ctx.db).to_string(), idx))
+            .map(|(idx, field)| (field.name(ctx.db()).to_string(), idx))
            .collect(),
    )
 }
diff --git a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
index dfcd787de..b7e30a7f2 100644
--- a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
@@ -8,7 +8,7 @@ use ra_syntax::{
    AstNode,
 };
-use crate::{utils::TryEnum, AssistContext, AssistId, Assists};
+use crate::{utils::TryEnum, AssistContext, AssistId, AssistKind, Assists};
 // Assist: replace_if_let_with_match
 //
@@ -48,29 +48,35 @@ pub(crate) fn replace_if_let_with_match(acc: &mut Assists, ctx: &AssistContext)
    };
    let target = if_expr.syntax().text_range();
-    acc.add(AssistId("replace_if_let_with_match"), "Replace with match", target, move |edit| {
+    acc.add(
-        let match_expr = {
+        AssistId("replace_if_let_with_match", AssistKind::RefactorRewrite),
-            let then_arm = {
+        "Replace with match",
-                let then_block = then_block.reset_indent().indent(IndentLevel(1));
+        target,
-                let then_expr = unwrap_trivial_block(then_block);
+        move |edit| {
-                make::match_arm(vec![pat.clone()], then_expr)
+            let match_expr = {
+                let then_arm = {
+                    let then_block = then_block.reset_indent().indent(IndentLevel(1));
+                    let then_expr = unwrap_trivial_block(then_block);
+                    make::match_arm(vec![pat.clone()], then_expr)
+                };
+                let else_arm = {
+                    let pattern = ctx
+                        .sema
+                        .type_of_pat(&pat)
+                        .and_then(|ty| TryEnum::from_ty(&ctx.sema, &ty))
+                        .map(|it| it.sad_pattern())
+                        .unwrap_or_else(|| make::placeholder_pat().into());
+                    let else_expr = unwrap_trivial_block(else_block);
+                    make::match_arm(vec![pattern], else_expr)
+                };
+                let match_expr =
+                    make::expr_match(expr, make::match_arm_list(vec![then_arm, else_arm]));
+                match_expr.indent(IndentLevel::from_node(if_expr.syntax()))
            };
-            let else_arm = {
-                let pattern = ctx
-                    .sema
-                    .type_of_pat(&pat)
-                    .and_then(|ty| TryEnum::from_ty(&ctx.sema, &ty))
-                    .map(|it| it.sad_pattern())
-                    .unwrap_or_else(|| make::placeholder_pat().into());
-                let else_expr = unwrap_trivial_block(else_block);
-                make::match_arm(vec![pattern], else_expr)
-            };
-            let match_expr = make::expr_match(expr, make::match_arm_list(vec![then_arm, else_arm]));
-            match_expr.indent(IndentLevel::from_node(if_expr.syntax()))
-        };
-        edit.replace_ast::<ast::Expr>(if_expr.into(), match_expr);
+            edit.replace_ast::<ast::Expr>(if_expr.into(), match_expr);
-    })
+        },
+    )
 }
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
index 761557ac0..a49292c97 100644
--- a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
@@ -9,7 +9,7 @@ use ra_syntax::{
    AstNode, T,
 };
-use crate::{utils::TryEnum, AssistContext, AssistId, Assists};
+use crate::{utils::TryEnum, AssistContext, AssistId, AssistKind, Assists};
 // Assist: replace_let_with_if_let
 //
@@ -44,24 +44,31 @@ pub(crate) fn replace_let_with_if_let(acc: &mut Assists, ctx: &AssistContext) ->
    let happy_variant = TryEnum::from_ty(&ctx.sema, &ty).map(|it| it.happy_case());
    let target = let_kw.text_range();
-    acc.add(AssistId("replace_let_with_if_let"), "Replace with if-let", target, |edit| {
+    acc.add(
-        let with_placeholder: ast::Pat = match happy_variant {
+        AssistId("replace_let_with_if_let", AssistKind::RefactorRewrite),
-            None => make::placeholder_pat().into(),
+        "Replace with if-let",
-            Some(var_name) => make::tuple_struct_pat(
+        target,
-                make::path_unqualified(make::path_segment(make::name_ref(var_name))),
+        |edit| {
-                once(make::placeholder_pat().into()),
+            let with_placeholder: ast::Pat = match happy_variant {
-            )
+                None => make::placeholder_pat().into(),
-            .into(),
+                Some(var_name) => make::tuple_struct_pat(
-        };
+                    make::path_unqualified(make::path_segment(make::name_ref(var_name))),
-        let block = make::block_expr(None, None).indent(IndentLevel::from_node(let_stmt.syntax()));
+                    once(make::placeholder_pat().into()),
-        let if_ = make::expr_if(make::condition(init, Some(with_placeholder)), block);
+                )
-        let stmt = make::expr_stmt(if_);
+                .into(),
+            };
+            let block =
+                make::block_expr(None, None).indent(IndentLevel::from_node(let_stmt.syntax()));
+            let if_ = make::expr_if(make::condition(init, Some(with_placeholder)), block);
+            let stmt = make::expr_stmt(if_);
-        let placeholder = stmt.syntax().descendants().find_map(ast::PlaceholderPat::cast).unwrap();
+            let placeholder =
-        let stmt = stmt.replace_descendant(placeholder.into(), original_pat);
+                stmt.syntax().descendants().find_map(ast::PlaceholderPat::cast).unwrap();
+            let stmt = stmt.replace_descendant(placeholder.into(), original_pat);
-        edit.replace_ast(ast::Stmt::from(let_stmt), ast::Stmt::from(stmt));
+            edit.replace_ast(ast::Stmt::from(let_stmt), ast::Stmt::from(stmt));
-    })
+        },
+    )
 }
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
index b4784c333..53496ede1 100644
--- a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
@@ -3,7 +3,7 @@ use ra_syntax::{algo::SyntaxRewriter, ast, match_ast, AstNode, SmolStr, SyntaxNo
 use crate::{
    utils::{find_insert_use_container, insert_use_statement},
-    AssistContext, AssistId, Assists,
+    AssistContext, AssistId, AssistKind, Assists,
 };
 // Assist: replace_qualified_name_with_use
@@ -25,7 +25,7 @@ pub(crate) fn replace_qualified_name_with_use(
 ) -> Option<()> {
    let path: ast::Path = ctx.find_node_at_offset()?;
    // We don't want to mess with use statements
-    if path.syntax().ancestors().find_map(ast::UseItem::cast).is_some() {
+    if path.syntax().ancestors().find_map(ast::Use::cast).is_some() {
        return None;
    }
@@ -37,7 +37,7 @@ pub(crate) fn replace_qualified_name_with_use(
    let target = path.syntax().text_range();
    acc.add(
-        AssistId("replace_qualified_name_with_use"),
+        AssistId("replace_qualified_name_with_use", AssistKind::RefactorRewrite),
        "Replace qualified path with use",
        target,
        |builder| {
@@ -85,7 +85,7 @@ fn shorten_paths(rewriter: &mut SyntaxRewriter<'static>, node: SyntaxNode, path:
            match child {
                // Don't modify `use` items, as this can break the `use` item when injecting a new
                // import into the use tree.
-                ast::UseItem(_it) => continue,
+                ast::Use(_it) => continue,
                // Don't descend into submodules, they don't have the same `use` items in scope.
                ast::Module(_it) => continue,
@@ -106,7 +106,7 @@ fn maybe_replace_path(
    path: ast::Path,
    target: ast::Path,
 ) -> Option<()> {
-    if !path_eq(path.clone(), target.clone()) {
+    if !path_eq(path.clone(), target) {
        return None;
    }
diff --git a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
index cff7dfb81..e5a4bb23c 100644
--- a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
+++ b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
@@ -11,7 +11,7 @@ use ra_syntax::{
 use crate::{
    utils::{render_snippet, Cursor, TryEnum},
-    AssistContext, AssistId, Assists,
+    AssistContext, AssistId, AssistKind, Assists,
 };
 // Assist: replace_unwrap_with_match
@@ -46,37 +46,43 @@ pub(crate) fn replace_unwrap_with_match(acc: &mut Assists, ctx: &AssistContext)
    let ty = ctx.sema.type_of_expr(&caller)?;
    let happy_variant = TryEnum::from_ty(&ctx.sema, &ty)?.happy_case();
    let target = method_call.syntax().text_range();
-    acc.add(AssistId("replace_unwrap_with_match"), "Replace unwrap with match", target, |builder| {
+    acc.add(
-        let ok_path = make::path_unqualified(make::path_segment(make::name_ref(happy_variant)));
+        AssistId("replace_unwrap_with_match", AssistKind::RefactorRewrite),
-        let it = make::bind_pat(make::name("a")).into();
+        "Replace unwrap with match",
-        let ok_tuple = make::tuple_struct_pat(ok_path, iter::once(it)).into();
+        target,
+        |builder| {
+            let ok_path = make::path_unqualified(make::path_segment(make::name_ref(happy_variant)));
+            let it = make::bind_pat(make::name("a")).into();
+            let ok_tuple = make::tuple_struct_pat(ok_path, iter::once(it)).into();
-        let bind_path = make::path_unqualified(make::path_segment(make::name_ref("a")));
+            let bind_path = make::path_unqualified(make::path_segment(make::name_ref("a")));
-        let ok_arm = make::match_arm(iter::once(ok_tuple), make::expr_path(bind_path));
+            let ok_arm = make::match_arm(iter::once(ok_tuple), make::expr_path(bind_path));
-        let unreachable_call = make::expr_unreachable();
+            let unreachable_call = make::expr_unreachable();
-        let err_arm = make::match_arm(iter::once(make::placeholder_pat().into()), unreachable_call);
+            let err_arm =
+                make::match_arm(iter::once(make::placeholder_pat().into()), unreachable_call);
-        let match_arm_list = make::match_arm_list(vec![ok_arm, err_arm]);
+            let match_arm_list = make::match_arm_list(vec![ok_arm, err_arm]);
-        let match_expr = make::expr_match(caller.clone(), match_arm_list)
+            let match_expr = make::expr_match(caller.clone(), match_arm_list)
-            .indent(IndentLevel::from_node(method_call.syntax()));
+                .indent(IndentLevel::from_node(method_call.syntax()));
-        let range = method_call.syntax().text_range();
+            let range = method_call.syntax().text_range();
-        match ctx.config.snippet_cap {
+            match ctx.config.snippet_cap {
-            Some(cap) => {
+                Some(cap) => {
-                let err_arm = match_expr
+                    let err_arm = match_expr
-                    .syntax()
+                        .syntax()
-                    .descendants()
+                        .descendants()
-                    .filter_map(ast::MatchArm::cast)
+                        .filter_map(ast::MatchArm::cast)
-                    .last()
+                        .last()
-                    .unwrap();
+                        .unwrap();
-                let snippet =
+                    let snippet =
-                    render_snippet(cap, match_expr.syntax(), Cursor::Before(err_arm.syntax()));
+                        render_snippet(cap, match_expr.syntax(), Cursor::Before(err_arm.syntax()));
-                builder.replace_snippet(cap, range, snippet)
+                    builder.replace_snippet(cap, range, snippet)
+                }
+                None => builder.replace(range, match_expr.to_string()),
            }
-            None => builder.replace(range, match_expr.to_string()),
+        },
-        }
+    )
-    })
 }
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/split_import.rs b/crates/ra_assists/src/handlers/split_import.rs
index 38aa199a0..4ca5c3ca1 100644
--- a/crates/ra_assists/src/handlers/split_import.rs
+++ b/crates/ra_assists/src/handlers/split_import.rs
@@ -2,7 +2,7 @@ use std::iter::successors;
 use ra_syntax::{ast, AstNode, T};
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: split_import
 //
@@ -28,7 +28,7 @@ pub(crate) fn split_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
    }
    let target = colon_colon.text_range();
-    acc.add(AssistId("split_import"), "Split import", target, |edit| {
+    acc.add(AssistId("split_import", AssistKind::RefactorRewrite), "Split import", target, |edit| {
        edit.replace_ast(use_tree, new_tree);
    })
 }
diff --git a/crates/ra_assists/src/handlers/unwrap_block.rs b/crates/ra_assists/src/handlers/unwrap_block.rs
index 1fb13f481..8b38695a9 100644
--- a/crates/ra_assists/src/handlers/unwrap_block.rs
+++ b/crates/ra_assists/src/handlers/unwrap_block.rs
@@ -7,7 +7,7 @@ use ra_syntax::{
    AstNode, TextRange, T,
 };
-use crate::{AssistContext, AssistId, Assists};
+use crate::{AssistContext, AssistId, AssistKind, Assists};
 // Assist: unwrap_block
 //
@@ -27,7 +27,7 @@ use crate::{AssistContext, AssistId, Assists};
 // }
 // ```
 pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let assist_id = AssistId("unwrap_block");
+    let assist_id = AssistId("unwrap_block", AssistKind::RefactorRewrite);
    let assist_label = "Unwrap block";
    let l_curly_token = ctx.find_token_at_offset(T!['{'])?;
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 1745f44a5..465b90415 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -26,10 +26,40 @@ pub(crate) use crate::assist_context::{AssistContext, Assists};
 pub use assist_config::AssistConfig;
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum AssistKind {
+    None,
+    QuickFix,
+    Generate,
+    Refactor,
+    RefactorExtract,
+    RefactorInline,
+    RefactorRewrite,
+}
+impl AssistKind {
+    pub fn contains(self, other: AssistKind) -> bool {
+        if self == other {
+            return true;
+        }
+        match self {
+            AssistKind::None | AssistKind::Generate => return true,
+            AssistKind::Refactor => match other {
+                AssistKind::RefactorExtract
+                | AssistKind::RefactorInline
+                | AssistKind::RefactorRewrite => return true,
+                _ => return false,
+            },
+            _ => return false,
+        }
+    }
+}
 /// Unique identifier of the assist, should not be shown to the user
 /// directly.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct AssistId(pub &'static str);
+pub struct AssistId(pub &'static str, pub AssistKind);
 #[derive(Clone, Debug)]
 pub struct GroupLabel(pub String);
@@ -102,13 +132,8 @@ mod handlers {
    pub(crate) type Handler = fn(&mut Assists, &AssistContext) -> Option<()>;
    mod add_custom_impl;
-    mod add_derive;
    mod add_explicit_type;
-    mod add_from_impl_for_enum;
-    mod add_function;
-    mod add_impl;
    mod add_missing_impl_members;
-    mod add_new;
    mod add_turbo_fish;
    mod apply_demorgan;
    mod auto_import;
@@ -122,6 +147,11 @@ mod handlers {
    mod flip_binexpr;
    mod flip_comma;
    mod flip_trait_bound;
+    mod generate_derive;
+    mod generate_from_impl_for_enum;
+    mod generate_function;
+    mod generate_impl;
+    mod generate_new;
    mod inline_local_variable;
    mod introduce_named_lifetime;
    mod invert_if;
@@ -144,12 +174,7 @@ mod handlers {
        &[
            // These are alphabetic for the foolish consistency
            add_custom_impl::add_custom_impl,
-            add_derive::add_derive,
            add_explicit_type::add_explicit_type,
-            add_from_impl_for_enum::add_from_impl_for_enum,
-            add_function::add_function,
-            add_impl::add_impl,
-            add_new::add_new,
            add_turbo_fish::add_turbo_fish,
            apply_demorgan::apply_demorgan,
            auto_import::auto_import,
@@ -163,6 +188,11 @@ mod handlers {
            flip_binexpr::flip_binexpr,
            flip_comma::flip_comma,
            flip_trait_bound::flip_trait_bound,
+            generate_derive::generate_derive,
+            generate_from_impl_for_enum::generate_from_impl_for_enum,
+            generate_function::generate_function,
+            generate_impl::generate_impl,
+            generate_new::generate_new,
            inline_local_variable::inline_local_variable,
            introduce_named_lifetime::introduce_named_lifetime,
            invert_if::invert_if,
diff --git a/crates/ra_assists/src/tests.rs b/crates/ra_assists/src/tests.rs
index 858f5ca80..18fcb9049 100644
--- a/crates/ra_assists/src/tests.rs
+++ b/crates/ra_assists/src/tests.rs
@@ -6,7 +6,7 @@ use ra_ide_db::RootDatabase;
 use ra_syntax::TextRange;
 use test_utils::{assert_eq_text, extract_offset, extract_range};
-use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, Assists};
+use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, AssistKind, Assists};
 use stdx::trim_indent;
 pub(crate) fn with_single_file(text: &str) -> (RootDatabase, FileId) {
@@ -134,3 +134,46 @@ fn assist_order_if_expr() {
    assert_eq!(assists.next().expect("expected assist").assist.label, "Extract into variable");
    assert_eq!(assists.next().expect("expected assist").assist.label, "Replace with match");
 }
+#[test]
+fn assist_filter_works() {
+    let before = "
+    pub fn test_some_range(a: int) -> bool {
+        if let 2..6 = <|>5<|> {
+            true
+        } else {
+            false
+        }
+    }";
+    let (range, before) = extract_range(before);
+    let (db, file_id) = with_single_file(&before);
+    let frange = FileRange { file_id, range };
+    {
+        let mut cfg = AssistConfig::default();
+        cfg.allowed = Some(vec![AssistKind::Refactor]);
+        let assists = Assist::resolved(&db, &cfg, frange);
+        let mut assists = assists.iter();
+        assert_eq!(assists.next().expect("expected assist").assist.label, "Extract into variable");
+        assert_eq!(assists.next().expect("expected assist").assist.label, "Replace with match");
+    }
+    {
+        let mut cfg = AssistConfig::default();
+        cfg.allowed = Some(vec![AssistKind::RefactorExtract]);
+        let assists = Assist::resolved(&db, &cfg, frange);
+        assert_eq!(assists.len(), 1);
+        let mut assists = assists.iter();
+        assert_eq!(assists.next().expect("expected assist").assist.label, "Extract into variable");
+    }
+    {
+        let mut cfg = AssistConfig::default();
+        cfg.allowed = Some(vec![AssistKind::QuickFix]);
+        let assists = Assist::resolved(&db, &cfg, frange);
+        assert!(assists.is_empty(), "All asserts but quickfixes should be filtered out");
+    }
+}
diff --git a/crates/ra_assists/src/tests/generated.rs b/crates/ra_assists/src/tests/generated.rs
index 31ea888c5..eff7feded 100644
--- a/crates/ra_assists/src/tests/generated.rs
+++ b/crates/ra_assists/src/tests/generated.rs
@@ -22,26 +22,6 @@ impl Debug for S {
 }
 #[test]
-fn doctest_add_derive() {
-    check_doc_test(
-        "add_derive",
-        r#####"
-struct Point {
-    x: u32,
-    y: u32,<|>
-}
-"#####,
-        r#####"
-#[derive($0)]
-struct Point {
-    x: u32,
-    y: u32,
-}
-"#####,
-    )
-}
-#[test]
 fn doctest_add_explicit_type() {
    check_doc_test(
        "add_explicit_type",
@@ -59,52 +39,6 @@ fn main() {
 }
 #[test]
-fn doctest_add_from_impl_for_enum() {
-    check_doc_test(
-        "add_from_impl_for_enum",
-        r#####"
-enum A { <|>One(u32) }
-"#####,
-        r#####"
-enum A { One(u32) }
-impl From<u32> for A {
-    fn from(v: u32) -> Self {
-        A::One(v)
-    }
-}
-"#####,
-    )
-}
-#[test]
-fn doctest_add_function() {
-    check_doc_test(
-        "add_function",
-        r#####"
-struct Baz;
-fn baz() -> Baz { Baz }
-fn foo() {
-    bar<|>("", baz());
-}
-"#####,
-        r#####"
-struct Baz;
-fn baz() -> Baz { Baz }
-fn foo() {
-    bar("", baz());
-}
-fn bar(arg: &str, baz: Baz) {
-    ${0:todo!()}
-}
-"#####,
-    )
-}
-#[test]
 fn doctest_add_hash() {
    check_doc_test(
        "add_hash",
@@ -122,27 +56,6 @@ fn main() {
 }
 #[test]
-fn doctest_add_impl() {
-    check_doc_test(
-        "add_impl",
-        r#####"
-struct Ctx<T: Clone> {
-    data: T,<|>
-}
-"#####,
-        r#####"
-struct Ctx<T: Clone> {
-    data: T,
-}
-impl<T: Clone> Ctx<T> {
-    $0
-}
-"#####,
-    )
-}
-#[test]
 fn doctest_add_impl_default_members() {
    check_doc_test(
        "add_impl_default_members",
@@ -209,28 +122,6 @@ impl Trait<u32> for () {
 }
 #[test]
-fn doctest_add_new() {
-    check_doc_test(
-        "add_new",
-        r#####"
-struct Ctx<T: Clone> {
-     data: T,<|>
-}
-"#####,
-        r#####"
-struct Ctx<T: Clone> {
-     data: T,
-}
-impl<T: Clone> Ctx<T> {
-    fn $0new(data: T) -> Self { Self { data } }
-}
-"#####,
-    )
-}
-#[test]
 fn doctest_add_turbo_fish() {
    check_doc_test(
        "add_turbo_fish",
@@ -467,6 +358,115 @@ fn foo<T: Copy + Clone>() { }
 }
 #[test]
+fn doctest_generate_derive() {
+    check_doc_test(
+        "generate_derive",
+        r#####"
+struct Point {
+    x: u32,
+    y: u32,<|>
+}
+"#####,
+        r#####"
+#[derive($0)]
+struct Point {
+    x: u32,
+    y: u32,
+}
+"#####,
+    )
+}
+#[test]
+fn doctest_generate_from_impl_for_enum() {
+    check_doc_test(
+        "generate_from_impl_for_enum",
+        r#####"
+enum A { <|>One(u32) }
+"#####,
+        r#####"
+enum A { One(u32) }
+impl From<u32> for A {
+    fn from(v: u32) -> Self {
+        A::One(v)
+    }
+}
+"#####,
+    )
+}
+#[test]
+fn doctest_generate_function() {
+    check_doc_test(
+        "generate_function",
+        r#####"
+struct Baz;
+fn baz() -> Baz { Baz }
+fn foo() {
+    bar<|>("", baz());
+}
+"#####,
+        r#####"
+struct Baz;
+fn baz() -> Baz { Baz }
+fn foo() {
+    bar("", baz());
+}
+fn bar(arg: &str, baz: Baz) {
+    ${0:todo!()}
+}
+"#####,
+    )
+}
+#[test]
+fn doctest_generate_impl() {
+    check_doc_test(
+        "generate_impl",
+        r#####"
+struct Ctx<T: Clone> {
+    data: T,<|>
+}
+"#####,
+        r#####"
+struct Ctx<T: Clone> {
+    data: T,
+}
+impl<T: Clone> Ctx<T> {
+    $0
+}
+"#####,
+    )
+}
+#[test]
+fn doctest_generate_new() {
+    check_doc_test(
+        "generate_new",
+        r#####"
+struct Ctx<T: Clone> {
+     data: T,<|>
+}
+"#####,
+        r#####"
+struct Ctx<T: Clone> {
+     data: T,
+}
+impl<T: Clone> Ctx<T> {
+    fn $0new(data: T) -> Self { Self { data } }
+}
+"#####,
+    )
+}
+#[test]
 fn doctest_inline_local_variable() {
    check_doc_test(
        "inline_local_variable",
diff --git a/crates/ra_assists/src/utils.rs b/crates/ra_assists/src/utils.rs
index 02de902d6..bb16ebd4e 100644
--- a/crates/ra_assists/src/utils.rs
+++ b/crates/ra_assists/src/utils.rs
@@ -56,33 +56,34 @@ pub(crate) fn render_snippet(_cap: SnippetCap, node: &SyntaxNode, cursor: Cursor
 pub fn get_missing_assoc_items(
    sema: &Semantics<RootDatabase>,
-    impl_def: &ast::ImplDef,
+    impl_def: &ast::Impl,
 ) -> Vec<hir::AssocItem> {
    // Names must be unique between constants and functions. However, type aliases
    // may share the same name as a function or constant.
    let mut impl_fns_consts = FxHashSet::default();
    let mut impl_type = FxHashSet::default();
-    if let Some(item_list) = impl_def.item_list() {
+    if let Some(item_list) = impl_def.assoc_item_list() {
        for item in item_list.assoc_items() {
            match item {
-                ast::AssocItem::FnDef(f) => {
+                ast::AssocItem::Fn(f) => {
                    if let Some(n) = f.name() {
                        impl_fns_consts.insert(n.syntax().to_string());
                    }
                }
-                ast::AssocItem::TypeAliasDef(t) => {
+                ast::AssocItem::TypeAlias(t) => {
                    if let Some(n) = t.name() {
                        impl_type.insert(n.syntax().to_string());
                    }
                }
-                ast::AssocItem::ConstDef(c) => {
+                ast::AssocItem::Const(c) => {
                    if let Some(n) = c.name() {
                        impl_fns_consts.insert(n.syntax().to_string());
                    }
                }
+                ast::AssocItem::MacroCall(_) => (),
            }
        }
    }
@@ -108,7 +109,7 @@ pub fn get_missing_assoc_items(
 pub(crate) fn resolve_target_trait(
    sema: &Semantics<RootDatabase>,
-    impl_def: &ast::ImplDef,
+    impl_def: &ast::Impl,
 ) -> Option<hir::Trait> {
    let ast_path = impl_def
        .target_trait()
diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/ra_assists/src/utils/insert_use.rs
index 8c4f33e59..617afe2e9 100644
--- a/crates/ra_assists/src/utils/insert_use.rs
+++ b/crates/ra_assists/src/utils/insert_use.rs
@@ -215,7 +215,7 @@ fn walk_use_tree_for_best_action(
    let prev_len = current_path_segments.len();
    let tree_list = current_use_tree.use_tree_list();
-    let alias = current_use_tree.alias();
+    let alias = current_use_tree.rename();
    let path = match current_use_tree.path() {
        Some(path) => path,
@@ -225,7 +225,7 @@ fn walk_use_tree_for_best_action(
                current_use_tree
                    .syntax()
                    .ancestors()
-                    .find_map(ast::UseItem::cast)
+                    .find_map(ast::Use::cast)
                    .map(|it| it.syntax().clone()),
                true,
            );
@@ -254,7 +254,7 @@ fn walk_use_tree_for_best_action(
            current_use_tree
                .syntax()
                .ancestors()
-                .find_map(ast::UseItem::cast)
+                .find_map(ast::Use::cast)
                .map(|it| it.syntax().clone()),
            true,
        ),
@@ -304,7 +304,7 @@ fn walk_use_tree_for_best_action(
                current_use_tree
                    .syntax()
                    .ancestors()
-                    .find_map(ast::UseItem::cast)
+                    .find_map(ast::Use::cast)
                    .map(|it| it.syntax().clone()),
                true,
            );
@@ -377,7 +377,7 @@ fn best_action_for_target(
    let mut storage = Vec::with_capacity(16); // this should be the only allocation
    let best_action = container
        .children()
-        .filter_map(ast::UseItem::cast)
+        .filter_map(ast::Use::cast)
        .filter_map(|it| it.use_tree())
        .map(|u| walk_use_tree_for_best_action(&mut storage, None, u, target))
        .fold(None, |best, a| match best {
diff --git a/crates/ra_cfg/Cargo.toml b/crates/ra_cfg/Cargo.toml
index 9165076a5..6425cd6d6 100644
--- a/crates/ra_cfg/Cargo.toml
+++ b/crates/ra_cfg/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_cfg"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_cfg/src/cfg_expr.rs b/crates/ra_cfg/src/cfg_expr.rs
index 85b100c6a..f48928aee 100644
--- a/crates/ra_cfg/src/cfg_expr.rs
+++ b/crates/ra_cfg/src/cfg_expr.rs
@@ -5,7 +5,6 @@
 use std::slice::Iter as SliceIter;
 use ra_syntax::SmolStr;
-use tt::{Leaf, Subtree, TokenTree};
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum CfgExpr {
@@ -18,6 +17,9 @@ pub enum CfgExpr {
 }
 impl CfgExpr {
+    pub fn parse(tt: &tt::Subtree) -> CfgExpr {
+        next_cfg_expr(&mut tt.token_trees.iter()).unwrap_or(CfgExpr::Invalid)
+    }
    /// Fold the cfg by querying all basic `Atom` and `KeyValue` predicates.
    pub fn fold(&self, query: &dyn Fn(&SmolStr, Option<&SmolStr>) -> bool) -> Option<bool> {
        match self {
@@ -35,22 +37,18 @@ impl CfgExpr {
    }
 }
-pub fn parse_cfg(tt: &Subtree) -> CfgExpr {
-    next_cfg_expr(&mut tt.token_trees.iter()).unwrap_or(CfgExpr::Invalid)
-}
 fn next_cfg_expr(it: &mut SliceIter<tt::TokenTree>) -> Option<CfgExpr> {
    let name = match it.next() {
        None => return None,
-        Some(TokenTree::Leaf(Leaf::Ident(ident))) => ident.text.clone(),
+        Some(tt::TokenTree::Leaf(tt::Leaf::Ident(ident))) => ident.text.clone(),
        Some(_) => return Some(CfgExpr::Invalid),
    };
    // Peek
    let ret = match it.as_slice().first() {
-        Some(TokenTree::Leaf(Leaf::Punct(punct))) if punct.char == '=' => {
+        Some(tt::TokenTree::Leaf(tt::Leaf::Punct(punct))) if punct.char == '=' => {
            match it.as_slice().get(1) {
-                Some(TokenTree::Leaf(Leaf::Literal(literal))) => {
+                Some(tt::TokenTree::Leaf(tt::Leaf::Literal(literal))) => {
                    it.next();
                    it.next();
                    // FIXME: escape? raw string?
@@ -61,7 +59,7 @@ fn next_cfg_expr(it: &mut SliceIter<tt::TokenTree>) -> Option<CfgExpr> {
                _ => return Some(CfgExpr::Invalid),
            }
        }
-        Some(TokenTree::Subtree(subtree)) => {
+        Some(tt::TokenTree::Subtree(subtree)) => {
            it.next();
            let mut sub_it = subtree.token_trees.iter();
            let mut subs = std::iter::from_fn(|| next_cfg_expr(&mut sub_it)).collect();
@@ -76,7 +74,7 @@ fn next_cfg_expr(it: &mut SliceIter<tt::TokenTree>) -> Option<CfgExpr> {
    };
    // Eat comma separator
-    if let Some(TokenTree::Leaf(Leaf::Punct(punct))) = it.as_slice().first() {
+    if let Some(tt::TokenTree::Leaf(tt::Leaf::Punct(punct))) = it.as_slice().first() {
        if punct.char == ',' {
            it.next();
        }
@@ -99,7 +97,8 @@ mod tests {
    fn assert_parse_result(input: &str, expected: CfgExpr) {
        let (tt, _) = get_token_tree_generated(input);
-        assert_eq!(parse_cfg(&tt), expected);
+        let cfg = CfgExpr::parse(&tt);
+        assert_eq!(cfg, expected);
    }
    #[test]
diff --git a/crates/ra_cfg/src/lib.rs b/crates/ra_cfg/src/lib.rs
index 57feabcb2..cd5a0a7b6 100644
--- a/crates/ra_cfg/src/lib.rs
+++ b/crates/ra_cfg/src/lib.rs
@@ -5,7 +5,7 @@ mod cfg_expr;
 use ra_syntax::SmolStr;
 use rustc_hash::FxHashSet;
-pub use cfg_expr::{parse_cfg, CfgExpr};
+pub use cfg_expr::CfgExpr;
 /// Configuration options used for conditional compilition on items with `cfg` attributes.
 /// We have two kind of options in different namespaces: atomic options like `unix`, and
@@ -31,19 +31,21 @@ impl CfgOptions {
        })
    }
-    pub fn is_cfg_enabled(&self, attr: &tt::Subtree) -> Option<bool> {
-        self.check(&parse_cfg(attr))
-    }
    pub fn insert_atom(&mut self, key: SmolStr) {
        self.atoms.insert(key);
    }
-    pub fn remove_atom(&mut self, name: &str) {
-        self.atoms.remove(name);
-    }
    pub fn insert_key_value(&mut self, key: SmolStr, value: SmolStr) {
        self.key_values.insert((key, value));
    }
+    pub fn append(&mut self, other: &CfgOptions) {
+        for atom in &other.atoms {
+            self.atoms.insert(atom.clone());
+        }
+        for (key, value) in &other.key_values {
+            self.key_values.insert((key.clone(), value.clone()));
+        }
+    }
 }
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 372fb242b..5f334d04f 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -3,13 +3,13 @@ edition = "2018"
 name = "ra_db"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
 [dependencies]
-salsa = "0.14.1"
+salsa = "0.15.0"
-relative-path = "1.0.0"
 rustc-hash = "1.1.0"
 ra_syntax = { path = "../ra_syntax" }
diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs
index 4f4fb4494..2aafb9965 100644
--- a/crates/ra_db/src/fixture.rs
+++ b/crates/ra_db/src/fixture.rs
@@ -149,15 +149,17 @@ fn with_files(
            let crate_id = crate_graph.add_crate_root(
                file_id,
                meta.edition,
-                Some(CrateName::new(&krate).unwrap()),
+                Some(krate.clone()),
                meta.cfg,
                meta.env,
                Default::default(),
            );
-            let prev = crates.insert(krate.clone(), crate_id);
+            let crate_name = CrateName::new(&krate).unwrap();
+            let prev = crates.insert(crate_name.clone(), crate_id);
            assert!(prev.is_none());
            for dep in meta.deps {
-                crate_deps.push((krate.clone(), dep))
+                let dep = CrateName::new(&dep).unwrap();
+                crate_deps.push((crate_name.clone(), dep))
            }
        } else if meta.path == "/main.rs" || meta.path == "/lib.rs" {
            assert!(default_crate_root.is_none());
@@ -220,7 +222,7 @@ impl From<Fixture> for FileMeta {
                .edition
                .as_ref()
                .map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()),
-            env: Env::from(f.env.iter()),
+            env: f.env.into_iter().collect(),
        }
    }
 }
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 7f3660118..6f2e5cfc7 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -6,7 +6,7 @@
 //! actual IO. See `vfs` and `project_model` in the `rust-analyzer` crate for how
 //! actual IO is done and lowered to input.
-use std::{fmt, ops, str::FromStr, sync::Arc};
+use std::{fmt, iter::FromIterator, ops, str::FromStr, sync::Arc};
 use ra_cfg::CfgOptions;
 use ra_syntax::SmolStr;
@@ -67,7 +67,7 @@ pub struct CrateGraph {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct CrateId(pub u32);
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct CrateName(SmolStr);
 impl CrateName {
@@ -94,6 +94,13 @@ impl fmt::Display for CrateName {
    }
 }
+impl ops::Deref for CrateName {
+    type Target = str;
+    fn deref(&self) -> &Self::Target {
+        &*self.0
+    }
+}
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub struct ProcMacroId(pub u32);
@@ -117,7 +124,7 @@ pub struct CrateData {
    /// The name to display to the end user.
    /// This actual crate name can be different in a particular dependent crate
    /// or may even be missing for some cases, such as a dummy crate for the code snippet.
-    pub display_name: Option<CrateName>,
+    pub display_name: Option<String>,
    pub cfg_options: CfgOptions,
    pub env: Env,
    pub dependencies: Vec<Dependency>,
@@ -138,7 +145,7 @@ pub struct Env {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Dependency {
    pub crate_id: CrateId,
-    pub name: SmolStr,
+    pub name: CrateName,
 }
 impl CrateGraph {
@@ -146,7 +153,7 @@ impl CrateGraph {
        &mut self,
        file_id: FileId,
        edition: Edition,
-        display_name: Option<CrateName>,
+        display_name: Option<String>,
        cfg_options: CfgOptions,
        env: Env,
        proc_macro: Vec<(SmolStr, Arc<dyn ra_tt::TokenExpander>)>,
@@ -178,7 +185,7 @@ impl CrateGraph {
        if self.dfs_find(from, to, &mut FxHashSet::default()) {
            return Err(CyclicDependenciesError);
        }
-        self.arena.get_mut(&from).unwrap().add_dep(name.0, to);
+        self.arena.get_mut(&from).unwrap().add_dep(name, to);
        Ok(())
    }
@@ -190,6 +197,23 @@ impl CrateGraph {
        self.arena.keys().copied()
    }
+    /// Returns an iterator over all transitive dependencies of the given crate.
+    pub fn transitive_deps(&self, of: CrateId) -> impl Iterator<Item = CrateId> + '_ {
+        let mut worklist = vec![of];
+        let mut deps = FxHashSet::default();
+        while let Some(krate) = worklist.pop() {
+            if !deps.insert(krate) {
+                continue;
+            }
+            worklist.extend(self[krate].dependencies.iter().map(|dep| dep.crate_id));
+        }
+        deps.remove(&of);
+        deps.into_iter()
+    }
    // FIXME: this only finds one crate with the given root; we could have multiple
    pub fn crate_id_for_crate_root(&self, file_id: FileId) -> Option<CrateId> {
        let (&crate_id, _) =
@@ -247,7 +271,7 @@ impl CrateId {
 }
 impl CrateData {
-    fn add_dep(&mut self, name: SmolStr, crate_id: CrateId) {
+    fn add_dep(&mut self, name: CrateName, crate_id: CrateId) {
        self.dependencies.push(Dependency { name, crate_id })
    }
 }
@@ -274,18 +298,9 @@ impl fmt::Display for Edition {
    }
 }
-impl<'a, T> From<T> for Env
+impl FromIterator<(String, String)> for Env {
-where
+    fn from_iter<T: IntoIterator<Item = (String, String)>>(iter: T) -> Self {
-    T: Iterator<Item = (&'a String, &'a String)>,
+        Env { entries: FromIterator::from_iter(iter) }
-{
-    fn from(iter: T) -> Self {
-        let mut result = Self::default();
-        for (k, v) in iter {
-            result.entries.insert(k.to_owned(), v.to_owned());
-        }
-        result
    }
 }
@@ -429,7 +444,10 @@ mod tests {
            .is_ok());
        assert_eq!(
            graph[crate1].dependencies,
-            vec![Dependency { crate_id: crate2, name: "crate_name_with_dashes".into() }]
+            vec![Dependency {
+                crate_id: crate2,
+                name: CrateName::new("crate_name_with_dashes").unwrap()
+            }]
        );
    }
 }
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 4a3ba57da..f25be24fe 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -16,9 +16,8 @@ pub use crate::{
        SourceRoot, SourceRootId,
    },
 };
-pub use relative_path::{RelativePath, RelativePathBuf};
 pub use salsa;
-pub use vfs::{file_set::FileSet, AbsPathBuf, VfsPath};
+pub use vfs::{file_set::FileSet, VfsPath};
 #[macro_export]
 macro_rules! impl_intern_key {
@@ -80,7 +79,7 @@ pub struct FilePosition {
    pub offset: TextSize,
 }
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub struct FileRange {
    pub file_id: FileId,
    pub range: TextRange,
@@ -93,9 +92,9 @@ pub trait FileLoader {
    fn file_text(&self, file_id: FileId) -> Arc<String>;
    /// Note that we intentionally accept a `&str` and not a `&Path` here. This
    /// method exists to handle `#[path = "/some/path.rs"] mod foo;` and such,
-    /// so the input is guaranteed to be utf-8 string. We might introduce
+    /// so the input is guaranteed to be utf-8 string. One might be tempted to
-    /// `struct StrPath(str)` for clarity some day, but it's a bit messy, so we
+    /// introduce some kind of "utf-8 path with / separators", but that's a bad idea. Behold
-    /// get by with a `&str` for the time being.
+    /// `#[path = "C://no/way"]`
    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId>;
    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>>;
 }
@@ -113,7 +112,7 @@ pub trait SourceDatabase: CheckCanceled + FileLoader + std::fmt::Debug {
    fn crate_graph(&self) -> Arc<CrateGraph>;
 }
-fn parse_query(db: &impl SourceDatabase, file_id: FileId) -> Parse<ast::SourceFile> {
+fn parse_query(db: &dyn SourceDatabase, file_id: FileId) -> Parse<ast::SourceFile> {
    let _p = profile("parse_query").detail(|| format!("{:?}", file_id));
    let text = db.file_text(file_id);
    SourceFile::parse(&*text)
@@ -136,10 +135,7 @@ pub trait SourceDatabaseExt: SourceDatabase {
    fn source_root_crates(&self, id: SourceRootId) -> Arc<FxHashSet<CrateId>>;
 }
-fn source_root_crates(
+fn source_root_crates(db: &dyn SourceDatabaseExt, id: SourceRootId) -> Arc<FxHashSet<CrateId>> {
-    db: &(impl SourceDatabaseExt + SourceDatabase),
-    id: SourceRootId,
-) -> Arc<FxHashSet<CrateId>> {
    let graph = db.crate_graph();
    let res = graph
        .iter()
diff --git a/crates/ra_fmt/Cargo.toml b/crates/ra_fmt/Cargo.toml
index e9d057afc..b4ef93f2b 100644
--- a/crates/ra_fmt/Cargo.toml
+++ b/crates/ra_fmt/Cargo.toml
@@ -4,6 +4,7 @@ name = "ra_fmt"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index ba7b39a19..c260bb193 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_hir"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -15,6 +16,7 @@ arrayvec = "0.5.1"
 itertools = "0.9.0"
+stdx = { path = "../stdx" }
 ra_syntax = { path = "../ra_syntax" }
 ra_db = { path = "../ra_db" }
 ra_prof = { path = "../ra_prof" }
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 8c5e1b746..5d88c5c64 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -1,5 +1,5 @@
 //! FIXME: write short doc here
-use std::sync::Arc;
+use std::{iter, sync::Arc};
 use arrayvec::ArrayVec;
 use either::Either;
@@ -12,6 +12,7 @@ use hir_def::{
    import_map,
    per_ns::PerNs,
    resolver::{HasResolver, Resolver},
+    src::HasSource as _,
    type_ref::{Mutability, TypeRef},
    AdtId, AssocContainerId, ConstId, DefWithBodyId, EnumId, FunctionId, GenericDefId, HasModule,
    ImplId, LocalEnumVariantId, LocalFieldId, LocalModuleId, Lookup, ModuleId, StaticId, StructId,
@@ -25,21 +26,22 @@ use hir_expand::{
 use hir_ty::{
    autoderef,
    display::{HirDisplayError, HirFormatter},
-    expr::ExprValidator,
+    method_resolution, ApplicationTy, CallableDefId, Canonical, FnSig, GenericPredicate,
-    method_resolution,
+    InEnvironment, Substs, TraitEnvironment, Ty, TyDefId, TypeCtor,
-    unsafe_validation::UnsafeValidator,
-    ApplicationTy, Canonical, GenericPredicate, InEnvironment, Substs, TraitEnvironment, Ty,
-    TyDefId, TypeCtor,
 };
-use ra_db::{CrateId, CrateName, Edition, FileId};
+use ra_db::{CrateId, Edition, FileId};
 use ra_prof::profile;
-use ra_syntax::ast::{self, AttrsOwner, NameOwner};
+use ra_syntax::{
+    ast::{self, AttrsOwner, NameOwner},
+    AstNode,
+};
 use rustc_hash::FxHashSet;
+use stdx::impl_from;
 use crate::{
    db::{DefDatabase, HirDatabase},
    has_source::HasSource,
-    CallableDef, HirDisplay, InFile, Name,
+    HirDisplay, InFile, Name,
 };
 /// hir::Crate describes a single crate. It's the main interface with which
@@ -94,8 +96,8 @@ impl Crate {
        db.crate_graph()[self.id].edition
    }
-    pub fn display_name(self, db: &dyn HirDatabase) -> Option<CrateName> {
+    pub fn display_name(self, db: &dyn HirDatabase) -> Option<String> {
-        db.crate_graph()[self.id].display_name.as_ref().cloned()
+        db.crate_graph()[self.id].display_name.clone()
    }
    pub fn query_external_importables(
@@ -139,8 +141,8 @@ pub enum ModuleDef {
    TypeAlias(TypeAlias),
    BuiltinType(BuiltinType),
 }
-impl_froms!(
+impl_from!(
-    ModuleDef: Module,
+    Module,
    Function,
    Adt(Struct, Enum, Union),
    EnumVariant,
@@ -149,6 +151,7 @@ impl_froms!(
    Trait,
    TypeAlias,
    BuiltinType
+    for ModuleDef
 );
 impl ModuleDef {
@@ -376,8 +379,8 @@ pub struct Field {
 #[derive(Debug, PartialEq, Eq)]
 pub enum FieldSource {
-    Named(ast::RecordFieldDef),
+    Named(ast::RecordField),
-    Pos(ast::TupleFieldDef),
+    Pos(ast::TupleField),
 }
 impl Field {
@@ -556,7 +559,7 @@ pub enum Adt {
    Union(Union),
    Enum(Enum),
 }
-impl_froms!(Adt: Struct, Union, Enum);
+impl_from!(Struct, Union, Enum for Adt);
 impl Adt {
    pub fn has_non_default_type_params(self, db: &dyn HirDatabase) -> bool {
@@ -599,7 +602,7 @@ pub enum VariantDef {
    Union(Union),
    EnumVariant(EnumVariant),
 }
-impl_froms!(VariantDef: Struct, Union, EnumVariant);
+impl_from!(Struct, Union, EnumVariant for VariantDef);
 impl VariantDef {
    pub fn fields(self, db: &dyn HirDatabase) -> Vec<Field> {
@@ -642,8 +645,7 @@ pub enum DefWithBody {
    Static(Static),
    Const(Const),
 }
+impl_from!(Function, Const, Static for DefWithBody);
-impl_froms!(DefWithBody: Function, Const, Static);
 impl DefWithBody {
    pub fn module(self, db: &dyn HirDatabase) -> Module {
@@ -694,13 +696,7 @@ impl Function {
    }
    pub fn diagnostics(self, db: &dyn HirDatabase, sink: &mut DiagnosticSink) {
-        let _p = profile("Function::diagnostics");
+        hir_ty::diagnostics::validate_body(db, self.id.into(), sink)
-        let infer = db.infer(self.id.into());
-        infer.add_diagnostics(db, self.id, sink);
-        let mut validator = ExprValidator::new(self.id, infer.clone(), sink);
-        validator.validate_body(db);
-        let mut validator = UnsafeValidator::new(self.id, infer, sink);
-        validator.validate_body(db);
    }
 }
@@ -945,14 +941,15 @@ pub enum GenericDef {
    // consts can have type parameters from their parents (i.e. associated consts of traits)
    Const(Const),
 }
-impl_froms!(
+impl_from!(
-    GenericDef: Function,
+    Function,
    Adt(Struct, Enum, Union),
    Trait,
    TypeAlias,
    ImplDef,
    EnumVariant,
    Const
+    for GenericDef
 );
 impl GenericDef {
@@ -973,6 +970,16 @@ pub struct Local {
 }
 impl Local {
+    pub fn is_param(self, db: &dyn HirDatabase) -> bool {
+        let src = self.source(db);
+        match src.value {
+            Either::Left(bind_pat) => {
+                bind_pat.syntax().ancestors().any(|it| ast::Param::can_cast(it.kind()))
+            }
+            Either::Right(_self_param) => true,
+        }
+    }
    // FIXME: why is this an option? It shouldn't be?
    pub fn name(self, db: &dyn HirDatabase) -> Option<Name> {
        let body = db.body(self.parent.into());
@@ -1071,12 +1078,14 @@ pub struct ImplDef {
 impl ImplDef {
    pub fn all_in_crate(db: &dyn HirDatabase, krate: Crate) -> Vec<ImplDef> {
-        let impls = db.impls_in_crate(krate.id);
+        let inherent = db.inherent_impls_in_crate(krate.id);
-        impls.all_impls().map(Self::from).collect()
+        let trait_ = db.trait_impls_in_crate(krate.id);
+        inherent.all_impls().chain(trait_.all_impls()).map(Self::from).collect()
    }
    pub fn for_trait(db: &dyn HirDatabase, krate: Crate, trait_: Trait) -> Vec<ImplDef> {
-        let impls = db.impls_in_crate(krate.id);
+        let impls = db.trait_impls_in_crate(krate.id);
-        impls.lookup_impl_defs_for_trait(trait_.id).map(Self::from).collect()
+        impls.for_trait(trait_.id).map(Self::from).collect()
    }
    pub fn target_trait(self, db: &dyn HirDatabase) -> Option<TypeRef> {
@@ -1178,6 +1187,12 @@ impl Type {
        Type::new(db, krate, def, ty)
    }
+    pub fn is_unit(&self) -> bool {
+        matches!(
+            self.ty.value,
+            Ty::Apply(ApplicationTy { ctor: TypeCtor::Tuple { cardinality: 0 }, .. })
+        )
+    }
    pub fn is_bool(&self) -> bool {
        matches!(self.ty.value, Ty::Apply(ApplicationTy { ctor: TypeCtor::Bool, .. }))
    }
@@ -1205,7 +1220,7 @@ impl Type {
            None => return false,
        };
-        let canonical_ty = Canonical { value: self.ty.value.clone(), num_vars: 0 };
+        let canonical_ty = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) };
        method_resolution::implements_trait(
            &canonical_ty,
            db,
@@ -1229,15 +1244,20 @@ impl Type {
                self.ty.environment.clone(),
                hir_ty::Obligation::Trait(trait_ref),
            ),
-            num_vars: 0,
+            kinds: Arc::new([]),
        };
        db.trait_solve(self.krate, goal).is_some()
    }
-    // FIXME: this method is broken, as it doesn't take closures into account.
+    pub fn as_callable(&self, db: &dyn HirDatabase) -> Option<Callable> {
-    pub fn as_callable(&self) -> Option<CallableDef> {
+        let def = match self.ty.value {
-        Some(self.ty.value.as_callable()?.0)
+            Ty::Apply(ApplicationTy { ctor: TypeCtor::FnDef(def), parameters: _ }) => Some(def),
+            _ => None,
+        };
+        let sig = self.ty.value.callable_sig(db)?;
+        Some(Callable { ty: self.clone(), sig, def, is_bound_method: false })
    }
    pub fn is_closure(&self) -> bool {
@@ -1304,7 +1324,7 @@ impl Type {
    pub fn autoderef<'a>(&'a self, db: &'a dyn HirDatabase) -> impl Iterator<Item = Type> + 'a {
        // There should be no inference vars in types passed here
        // FIXME check that?
-        let canonical = Canonical { value: self.ty.value.clone(), num_vars: 0 };
+        let canonical = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) };
        let environment = self.ty.environment.clone();
        let ty = InEnvironment { value: canonical, environment };
        autoderef(db, Some(self.krate), ty)
@@ -1321,10 +1341,10 @@ impl Type {
        mut callback: impl FnMut(AssocItem) -> Option<T>,
    ) -> Option<T> {
        for krate in self.ty.value.def_crates(db, krate.id)? {
-            let impls = db.impls_in_crate(krate);
+            let impls = db.inherent_impls_in_crate(krate);
-            for impl_def in impls.lookup_impl_defs(&self.ty.value) {
+            for impl_def in impls.for_self_ty(&self.ty.value) {
-                for &item in db.impl_data(impl_def).items.iter() {
+                for &item in db.impl_data(*impl_def).items.iter() {
                    if let Some(result) = callback(item.into()) {
                        return Some(result);
                    }
@@ -1345,7 +1365,7 @@ impl Type {
        // There should be no inference vars in types passed here
        // FIXME check that?
        // FIXME replace Unknown by bound vars here
-        let canonical = Canonical { value: self.ty.value.clone(), num_vars: 0 };
+        let canonical = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) };
        let env = self.ty.environment.clone();
        let krate = krate.id;
@@ -1376,7 +1396,7 @@ impl Type {
        // There should be no inference vars in types passed here
        // FIXME check that?
        // FIXME replace Unknown by bound vars here
-        let canonical = Canonical { value: self.ty.value.clone(), num_vars: 0 };
+        let canonical = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) };
        let env = self.ty.environment.clone();
        let krate = krate.id;
@@ -1522,6 +1542,74 @@ impl HirDisplay for Type {
    }
 }
+// FIXME: closures
+#[derive(Debug)]
+pub struct Callable {
+    ty: Type,
+    sig: FnSig,
+    def: Option<CallableDefId>,
+    pub(crate) is_bound_method: bool,
+}
+pub enum CallableKind {
+    Function(Function),
+    TupleStruct(Struct),
+    TupleEnumVariant(EnumVariant),
+    Closure,
+}
+impl Callable {
+    pub fn kind(&self) -> CallableKind {
+        match self.def {
+            Some(CallableDefId::FunctionId(it)) => CallableKind::Function(it.into()),
+            Some(CallableDefId::StructId(it)) => CallableKind::TupleStruct(it.into()),
+            Some(CallableDefId::EnumVariantId(it)) => CallableKind::TupleEnumVariant(it.into()),
+            None => CallableKind::Closure,
+        }
+    }
+    pub fn receiver_param(&self, db: &dyn HirDatabase) -> Option<ast::SelfParam> {
+        let func = match self.def {
+            Some(CallableDefId::FunctionId(it)) if self.is_bound_method => it,
+            _ => return None,
+        };
+        let src = func.lookup(db.upcast()).source(db.upcast());
+        let param_list = src.value.param_list()?;
+        param_list.self_param()
+    }
+    pub fn n_params(&self) -> usize {
+        self.sig.params().len() - if self.is_bound_method { 1 } else { 0 }
+    }
+    pub fn params(
+        &self,
+        db: &dyn HirDatabase,
+    ) -> Vec<(Option<Either<ast::SelfParam, ast::Pat>>, Type)> {
+        let types = self
+            .sig
+            .params()
+            .iter()
+            .skip(if self.is_bound_method { 1 } else { 0 })
+            .map(|ty| self.ty.derived(ty.clone()));
+        let patterns = match self.def {
+            Some(CallableDefId::FunctionId(func)) => {
+                let src = func.lookup(db.upcast()).source(db.upcast());
+                src.value.param_list().map(|param_list| {
+                    param_list
+                        .self_param()
+                        .map(|it| Some(Either::Left(it)))
+                        .filter(|_| !self.is_bound_method)
+                        .into_iter()
+                        .chain(param_list.params().map(|it| it.pat().map(Either::Right)))
+                })
+            }
+            _ => None,
+        };
+        patterns.into_iter().flatten().chain(iter::repeat(None)).zip(types).collect()
+    }
+    pub fn return_type(&self) -> Type {
+        self.ty.derived(self.sig.ret().clone())
+    }
+}
 /// For IDE only
 #[derive(Debug)]
 pub enum ScopeDef {
@@ -1581,8 +1669,8 @@ pub enum AttrDef {
    MacroDef(MacroDef),
 }
-impl_froms!(
+impl_from!(
-    AttrDef: Module,
+    Module,
    Field,
    Adt(Struct, Enum, Union),
    EnumVariant,
@@ -1592,6 +1680,7 @@ impl_froms!(
    Trait,
    TypeAlias,
    MacroDef
+    for AttrDef
 );
 pub trait HasAttrs {
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index bb67952de..a2b9f3e35 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -11,15 +11,15 @@ pub use hir_def::db::{
 };
 pub use hir_expand::db::{
    AstDatabase, AstDatabaseStorage, AstIdMapQuery, InternEagerExpansionQuery, InternMacroQuery,
-    MacroArgQuery, MacroDefQuery, MacroExpandQuery, ParseMacroQuery,
+    MacroArgTextQuery, MacroDefQuery, MacroExpandQuery, ParseMacroQuery,
 };
 pub use hir_ty::db::{
    AssociatedTyDataQuery, AssociatedTyValueQuery, CallableItemSignatureQuery, FieldTypesQuery,
    GenericDefaultsQuery, GenericPredicatesForParamQuery, GenericPredicatesQuery, HirDatabase,
-    HirDatabaseStorage, ImplDatumQuery, ImplSelfTyQuery, ImplTraitQuery, ImplsFromDepsQuery,
+    HirDatabaseStorage, ImplDatumQuery, ImplSelfTyQuery, ImplTraitQuery, InferQueryQuery,
-    ImplsInCrateQuery, InferQueryQuery, InternAssocTyValueQuery, InternChalkImplQuery,
+    InherentImplsInCrateQuery, InternTypeParamIdQuery, ReturnTypeImplTraitsQuery, StructDatumQuery,
-    InternTypeCtorQuery, InternTypeParamIdQuery, ReturnTypeImplTraitsQuery, StructDatumQuery,
+    TraitDatumQuery, TraitImplsInCrateQuery, TraitImplsInDepsQuery, TraitSolveQuery, TyQuery,
-    TraitDatumQuery, TraitSolveQuery, TyQuery, ValueTyQuery,
+    ValueTyQuery,
 };
 #[test]
diff --git a/crates/ra_hir/src/diagnostics.rs b/crates/ra_hir/src/diagnostics.rs
index c82883d0c..266b513dc 100644
--- a/crates/ra_hir/src/diagnostics.rs
+++ b/crates/ra_hir/src/diagnostics.rs
@@ -1,4 +1,8 @@
 //! FIXME: write short doc here
 pub use hir_def::diagnostics::UnresolvedModule;
-pub use hir_expand::diagnostics::{AstDiagnostic, Diagnostic, DiagnosticSink};
+pub use hir_expand::diagnostics::{
-pub use hir_ty::diagnostics::{MissingFields, MissingMatchArms, MissingOkInTailExpr, NoSuchField};
+    AstDiagnostic, Diagnostic, DiagnosticSink, DiagnosticSinkBuilder,
+};
+pub use hir_ty::diagnostics::{
+    MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, NoSuchField,
+};
diff --git a/crates/ra_hir/src/has_source.rs b/crates/ra_hir/src/has_source.rs
index 76c32fc17..1c691d961 100644
--- a/crates/ra_hir/src/has_source.rs
+++ b/crates/ra_hir/src/has_source.rs
@@ -57,56 +57,56 @@ impl HasSource for Field {
    }
 }
 impl HasSource for Struct {
-    type Ast = ast::StructDef;
+    type Ast = ast::Struct;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::StructDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Struct> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
 impl HasSource for Union {
-    type Ast = ast::UnionDef;
+    type Ast = ast::Union;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::UnionDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Union> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
 impl HasSource for Enum {
-    type Ast = ast::EnumDef;
+    type Ast = ast::Enum;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::EnumDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Enum> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
 impl HasSource for EnumVariant {
-    type Ast = ast::EnumVariant;
+    type Ast = ast::Variant;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::EnumVariant> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Variant> {
        self.parent.id.child_source(db.upcast()).map(|map| map[self.id].clone())
    }
 }
 impl HasSource for Function {
-    type Ast = ast::FnDef;
+    type Ast = ast::Fn;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::FnDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Fn> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
 impl HasSource for Const {
-    type Ast = ast::ConstDef;
+    type Ast = ast::Const;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::ConstDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Const> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
 impl HasSource for Static {
-    type Ast = ast::StaticDef;
+    type Ast = ast::Static;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::StaticDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Static> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
 impl HasSource for Trait {
-    type Ast = ast::TraitDef;
+    type Ast = ast::Trait;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::TraitDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Trait> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
 impl HasSource for TypeAlias {
-    type Ast = ast::TypeAliasDef;
+    type Ast = ast::TypeAlias;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::TypeAliasDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::TypeAlias> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
@@ -120,14 +120,14 @@ impl HasSource for MacroDef {
    }
 }
 impl HasSource for ImplDef {
-    type Ast = ast::ImplDef;
+    type Ast = ast::Impl;
-    fn source(self, db: &dyn HirDatabase) -> InFile<ast::ImplDef> {
+    fn source(self, db: &dyn HirDatabase) -> InFile<ast::Impl> {
        self.id.lookup(db.upcast()).source(db.upcast())
    }
 }
 impl HasSource for TypeParam {
-    type Ast = Either<ast::TraitDef, ast::TypeParam>;
+    type Ast = Either<ast::Trait, ast::TypeParam>;
    fn source(self, db: &dyn HirDatabase) -> InFile<Self::Ast> {
        let child_source = self.id.parent.child_source(db.upcast());
        child_source.map(|it| it[self.id.local_id].clone())
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index fe34b30bc..e2d13dbfd 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -19,25 +19,6 @@
 #![recursion_limit = "512"]
-macro_rules! impl_froms {
-    ($e:ident: $($v:ident $(($($sv:ident),*))?),*$(,)?) => {
-        $(
-            impl From<$v> for $e {
-                fn from(it: $v) -> $e {
-                    $e::$v(it)
-                }
-            }
-            $($(
-                impl From<$sv> for $e {
-                    fn from(it: $sv) -> $e {
-                        $e::$v($v::$sv(it))
-                    }
-                }
-            )*)?
-        )*
-    }
-}
 mod semantics;
 pub mod db;
 mod source_analyzer;
@@ -51,10 +32,10 @@ mod has_source;
 pub use crate::{
    code_model::{
-        Adt, AsAssocItem, AssocItem, AssocItemContainer, AttrDef, Const, Crate, CrateDependency,
+        Adt, AsAssocItem, AssocItem, AssocItemContainer, AttrDef, Callable, CallableKind, Const,
-        DefWithBody, Docs, Enum, EnumVariant, Field, FieldSource, Function, GenericDef, HasAttrs,
+        Crate, CrateDependency, DefWithBody, Docs, Enum, EnumVariant, Field, FieldSource, Function,
-        HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, ScopeDef, Static, Struct,
+        GenericDef, HasAttrs, HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef, ScopeDef,
-        Trait, Type, TypeAlias, TypeParam, Union, VariantDef, Visibility,
+        Static, Struct, Trait, Type, TypeAlias, TypeParam, Union, VariantDef, Visibility,
    },
    has_source::HasSource,
    semantics::{original_range, PathResolution, Semantics, SemanticsScope},
@@ -74,6 +55,7 @@ pub use hir_def::{
 pub use hir_expand::{
    hygiene::Hygiene,
    name::{AsName, Name},
-    HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, Origin,
+    HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, /* FIXME */
+    MacroFile, Origin,
 };
-pub use hir_ty::{display::HirDisplay, CallableDef};
+pub use hir_ty::display::HirDisplay;
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 6a49c424a..6f3b3dc9a 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -6,7 +6,7 @@ use std::{cell::RefCell, fmt, iter::successors};
 use hir_def::{
    resolver::{self, HasResolver, Resolver},
-    AsMacroCall, TraitId, VariantId,
+    AsMacroCall, FunctionId, TraitId, VariantId,
 };
 use hir_expand::{diagnostics::AstDiagnostic, hygiene::Hygiene, ExpansionInfo};
 use hir_ty::associated_type_shorthand_candidates;
@@ -24,8 +24,8 @@ use crate::{
    diagnostics::Diagnostic,
    semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
    source_analyzer::{resolve_hir_path, resolve_hir_path_qualifier, SourceAnalyzer},
-    AssocItem, Field, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module, ModuleDef,
+    AssocItem, Callable, Field, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module,
-    Name, Origin, Path, ScopeDef, Trait, Type, TypeAlias, TypeParam,
+    ModuleDef, Name, Origin, Path, ScopeDef, Trait, Type, TypeAlias, TypeParam, VariantDef,
 };
 use resolver::TypeNs;
@@ -83,7 +83,13 @@ impl PathResolution {
 /// Primary API to get semantic information, like types, from syntax trees.
 pub struct Semantics<'db, DB> {
    pub db: &'db DB,
+    imp: SemanticsImpl<'db>,
+}
+pub struct SemanticsImpl<'db> {
+    pub db: &'db dyn HirDatabase,
    s2d_cache: RefCell<SourceToDefCache>,
+    expansion_info_cache: RefCell<FxHashMap<HirFileId, Option<ExpansionInfo>>>,
    cache: RefCell<FxHashMap<SyntaxNode, HirFileId>>,
 }
@@ -95,23 +101,199 @@ impl<DB> fmt::Debug for Semantics<'_, DB> {
 impl<'db, DB: HirDatabase> Semantics<'db, DB> {
    pub fn new(db: &DB) -> Semantics<DB> {
-        Semantics { db, s2d_cache: Default::default(), cache: Default::default() }
+        let impl_ = SemanticsImpl::new(db);
+        Semantics { db, imp: impl_ }
    }
    pub fn parse(&self, file_id: FileId) -> ast::SourceFile {
-        let tree = self.db.parse(file_id).tree();
+        self.imp.parse(file_id)
-        self.cache(tree.syntax().clone(), file_id.into());
-        tree
    }
    pub fn ast<T: AstDiagnostic + Diagnostic>(&self, d: &T) -> <T as AstDiagnostic>::AST {
        let file_id = d.source().file_id;
        let root = self.db.parse_or_expand(file_id).unwrap();
-        self.cache(root, file_id);
+        self.imp.cache(root, file_id);
-        d.ast(self.db)
+        d.ast(self.db.upcast())
    }
    pub fn expand(&self, macro_call: &ast::MacroCall) -> Option<SyntaxNode> {
+        self.imp.expand(macro_call)
+    }
+    pub fn expand_hypothetical(
+        &self,
+        actual_macro_call: &ast::MacroCall,
+        hypothetical_args: &ast::TokenTree,
+        token_to_map: SyntaxToken,
+    ) -> Option<(SyntaxNode, SyntaxToken)> {
+        self.imp.expand_hypothetical(actual_macro_call, hypothetical_args, token_to_map)
+    }
+    pub fn descend_into_macros(&self, token: SyntaxToken) -> SyntaxToken {
+        self.imp.descend_into_macros(token)
+    }
+    pub fn descend_node_at_offset<N: ast::AstNode>(
+        &self,
+        node: &SyntaxNode,
+        offset: TextSize,
+    ) -> Option<N> {
+        self.imp.descend_node_at_offset(node, offset).find_map(N::cast)
+    }
+    pub fn original_range(&self, node: &SyntaxNode) -> FileRange {
+        self.imp.original_range(node)
+    }
+    pub fn diagnostics_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
+        self.imp.diagnostics_range(diagnostics)
+    }
+    pub fn ancestors_with_macros(&self, node: SyntaxNode) -> impl Iterator<Item = SyntaxNode> + '_ {
+        self.imp.ancestors_with_macros(node)
+    }
+    pub fn ancestors_at_offset_with_macros(
+        &self,
+        node: &SyntaxNode,
+        offset: TextSize,
+    ) -> impl Iterator<Item = SyntaxNode> + '_ {
+        self.imp.ancestors_at_offset_with_macros(node, offset)
+    }
+    /// Find a AstNode by offset inside SyntaxNode, if it is inside *Macrofile*,
+    /// search up until it is of the target AstNode type
+    pub fn find_node_at_offset_with_macros<N: AstNode>(
+        &self,
+        node: &SyntaxNode,
+        offset: TextSize,
+    ) -> Option<N> {
+        self.imp.ancestors_at_offset_with_macros(node, offset).find_map(N::cast)
+    }
+    /// Find a AstNode by offset inside SyntaxNode, if it is inside *MacroCall*,
+    /// descend it and find again
+    pub fn find_node_at_offset_with_descend<N: AstNode>(
+        &self,
+        node: &SyntaxNode,
+        offset: TextSize,
+    ) -> Option<N> {
+        if let Some(it) = find_node_at_offset(&node, offset) {
+            return Some(it);
+        }
+        self.imp.descend_node_at_offset(node, offset).find_map(N::cast)
+    }
+    pub fn type_of_expr(&self, expr: &ast::Expr) -> Option<Type> {
+        self.imp.type_of_expr(expr)
+    }
+    pub fn type_of_pat(&self, pat: &ast::Pat) -> Option<Type> {
+        self.imp.type_of_pat(pat)
+    }
+    pub fn type_of_self(&self, param: &ast::SelfParam) -> Option<Type> {
+        self.imp.type_of_self(param)
+    }
+    pub fn resolve_method_call(&self, call: &ast::MethodCallExpr) -> Option<Function> {
+        self.imp.resolve_method_call(call).map(Function::from)
+    }
+    pub fn resolve_method_call_as_callable(&self, call: &ast::MethodCallExpr) -> Option<Callable> {
+        self.imp.resolve_method_call_as_callable(call)
+    }
+    pub fn resolve_field(&self, field: &ast::FieldExpr) -> Option<Field> {
+        self.imp.resolve_field(field)
+    }
+    pub fn resolve_record_field(
+        &self,
+        field: &ast::RecordExprField,
+    ) -> Option<(Field, Option<Local>)> {
+        self.imp.resolve_record_field(field)
+    }
+    pub fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<Field> {
+        self.imp.resolve_record_field_pat(field)
+    }
+    pub fn resolve_macro_call(&self, macro_call: &ast::MacroCall) -> Option<MacroDef> {
+        self.imp.resolve_macro_call(macro_call)
+    }
+    pub fn resolve_path(&self, path: &ast::Path) -> Option<PathResolution> {
+        self.imp.resolve_path(path)
+    }
+    pub fn resolve_variant(&self, record_lit: ast::RecordExpr) -> Option<VariantDef> {
+        self.imp.resolve_variant(record_lit).map(VariantDef::from)
+    }
+    pub fn lower_path(&self, path: &ast::Path) -> Option<Path> {
+        self.imp.lower_path(path)
+    }
+    pub fn resolve_bind_pat_to_const(&self, pat: &ast::BindPat) -> Option<ModuleDef> {
+        self.imp.resolve_bind_pat_to_const(pat)
+    }
+    // FIXME: use this instead?
+    // pub fn resolve_name_ref(&self, name_ref: &ast::NameRef) -> Option<???>;
+    pub fn record_literal_missing_fields(&self, literal: &ast::RecordExpr) -> Vec<(Field, Type)> {
+        self.imp.record_literal_missing_fields(literal)
+    }
+    pub fn record_pattern_missing_fields(&self, pattern: &ast::RecordPat) -> Vec<(Field, Type)> {
+        self.imp.record_pattern_missing_fields(pattern)
+    }
+    pub fn to_def<T: ToDef>(&self, src: &T) -> Option<T::Def> {
+        let src = self.imp.find_file(src.syntax().clone()).with_value(src).cloned();
+        T::to_def(&self.imp, src)
+    }
+    pub fn to_module_def(&self, file: FileId) -> Option<Module> {
+        self.imp.to_module_def(file)
+    }
+    pub fn scope(&self, node: &SyntaxNode) -> SemanticsScope<'db> {
+        self.imp.scope(node)
+    }
+    pub fn scope_at_offset(&self, node: &SyntaxNode, offset: TextSize) -> SemanticsScope<'db> {
+        self.imp.scope_at_offset(node, offset)
+    }
+    pub fn scope_for_def(&self, def: Trait) -> SemanticsScope<'db> {
+        self.imp.scope_for_def(def)
+    }
+    pub fn assert_contains_node(&self, node: &SyntaxNode) {
+        self.imp.assert_contains_node(node)
+    }
+}
+impl<'db> SemanticsImpl<'db> {
+    fn new(db: &'db dyn HirDatabase) -> Self {
+        SemanticsImpl {
+            db,
+            s2d_cache: Default::default(),
+            cache: Default::default(),
+            expansion_info_cache: Default::default(),
+        }
+    }
+    fn parse(&self, file_id: FileId) -> ast::SourceFile {
+        let tree = self.db.parse(file_id).tree();
+        self.cache(tree.syntax().clone(), file_id.into());
+        tree
+    }
+    fn expand(&self, macro_call: &ast::MacroCall) -> Option<SyntaxNode> {
        let macro_call = self.find_file(macro_call.syntax().clone()).with_value(macro_call);
        let sa = self.analyze2(macro_call.map(|it| it.syntax()), None);
        let file_id = sa.expand(self.db, macro_call)?;
@@ -120,7 +302,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
        Some(node)
    }
-    pub fn expand_hypothetical(
+    fn expand_hypothetical(
        &self,
        actual_macro_call: &ast::MacroCall,
        hypothetical_args: &ast::TokenTree,
@@ -130,24 +312,38 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
            self.find_file(actual_macro_call.syntax().clone()).with_value(actual_macro_call);
        let sa = self.analyze2(macro_call.map(|it| it.syntax()), None);
        let krate = sa.resolver.krate()?;
-        let macro_call_id = macro_call
+        let macro_call_id = macro_call.as_call_id(self.db.upcast(), krate, |path| {
-            .as_call_id(self.db, krate, |path| sa.resolver.resolve_path_as_macro(self.db, &path))?;
+            sa.resolver.resolve_path_as_macro(self.db.upcast(), &path)
-        hir_expand::db::expand_hypothetical(self.db, macro_call_id, hypothetical_args, token_to_map)
+        })?;
-    }
+        hir_expand::db::expand_hypothetical(
+            self.db.upcast(),
-    pub fn descend_into_macros(&self, token: SyntaxToken) -> SyntaxToken {
+            macro_call_id,
+            hypothetical_args,
+            token_to_map,
+        )
+    }
+    fn descend_into_macros(&self, token: SyntaxToken) -> SyntaxToken {
+        let _p = profile("descend_into_macros");
        let parent = token.parent();
        let parent = self.find_file(parent);
        let sa = self.analyze2(parent.as_ref(), None);
        let token = successors(Some(parent.with_value(token)), |token| {
+            self.db.check_canceled();
            let macro_call = token.value.ancestors().find_map(ast::MacroCall::cast)?;
            let tt = macro_call.token_tree()?;
            if !tt.syntax().text_range().contains_range(token.value.text_range()) {
                return None;
            }
            let file_id = sa.expand(self.db, token.with_value(&macro_call))?;
-            let token = file_id.expansion_info(self.db)?.map_token_down(token.as_ref())?;
+            let token = self
+                .expansion_info_cache
+                .borrow_mut()
+                .entry(file_id)
+                .or_insert_with(|| file_id.expansion_info(self.db.upcast()))
+                .as_ref()?
+                .map_token_down(token.as_ref())?;
            self.cache(find_root(&token.value.parent()), token.file_id);
@@ -159,35 +355,36 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
        token.value
    }
-    pub fn descend_node_at_offset<N: ast::AstNode>(
+    fn descend_node_at_offset(
        &self,
        node: &SyntaxNode,
        offset: TextSize,
-    ) -> Option<N> {
+    ) -> impl Iterator<Item = SyntaxNode> + '_ {
        // Handle macro token cases
        node.token_at_offset(offset)
            .map(|token| self.descend_into_macros(token))
-            .find_map(|it| self.ancestors_with_macros(it.parent()).find_map(N::cast))
+            .map(|it| self.ancestors_with_macros(it.parent()))
+            .flatten()
    }
-    pub fn original_range(&self, node: &SyntaxNode) -> FileRange {
+    fn original_range(&self, node: &SyntaxNode) -> FileRange {
        let node = self.find_file(node.clone());
        original_range(self.db, node.as_ref())
    }
-    pub fn diagnostics_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
+    fn diagnostics_range(&self, diagnostics: &dyn Diagnostic) -> FileRange {
        let src = diagnostics.source();
        let root = self.db.parse_or_expand(src.file_id).unwrap();
        let node = src.value.to_node(&root);
        original_range(self.db, src.with_value(&node))
    }
-    pub fn ancestors_with_macros(&self, node: SyntaxNode) -> impl Iterator<Item = SyntaxNode> + '_ {
+    fn ancestors_with_macros(&self, node: SyntaxNode) -> impl Iterator<Item = SyntaxNode> + '_ {
        let node = self.find_file(node);
-        node.ancestors_with_macros(self.db).map(|it| it.value)
+        node.ancestors_with_macros(self.db.upcast()).map(|it| it.value)
    }
-    pub fn ancestors_at_offset_with_macros(
+    fn ancestors_at_offset_with_macros(
        &self,
        node: &SyntaxNode,
        offset: TextSize,
@@ -197,120 +394,104 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
            .kmerge_by(|node1, node2| node1.text_range().len() < node2.text_range().len())
    }
-    /// Find a AstNode by offset inside SyntaxNode, if it is inside *Macrofile*,
+    fn type_of_expr(&self, expr: &ast::Expr) -> Option<Type> {
-    /// search up until it is of the target AstNode type
+        self.analyze(expr.syntax()).type_of_expr(self.db, &expr)
-    pub fn find_node_at_offset_with_macros<N: AstNode>(
-        &self,
-        node: &SyntaxNode,
-        offset: TextSize,
-    ) -> Option<N> {
-        self.ancestors_at_offset_with_macros(node, offset).find_map(N::cast)
    }
-    /// Find a AstNode by offset inside SyntaxNode, if it is inside *MacroCall*,
+    fn type_of_pat(&self, pat: &ast::Pat) -> Option<Type> {
-    /// descend it and find again
+        self.analyze(pat.syntax()).type_of_pat(self.db, &pat)
-    pub fn find_node_at_offset_with_descend<N: AstNode>(
-        &self,
-        node: &SyntaxNode,
-        offset: TextSize,
-    ) -> Option<N> {
-        if let Some(it) = find_node_at_offset(&node, offset) {
-            return Some(it);
-        }
-        self.descend_node_at_offset(&node, offset)
    }
-    pub fn type_of_expr(&self, expr: &ast::Expr) -> Option<Type> {
+    fn type_of_self(&self, param: &ast::SelfParam) -> Option<Type> {
-        self.analyze(expr.syntax()).type_of(self.db, &expr)
+        self.analyze(param.syntax()).type_of_self(self.db, &param)
    }
-    pub fn type_of_pat(&self, pat: &ast::Pat) -> Option<Type> {
+    fn resolve_method_call(&self, call: &ast::MethodCallExpr) -> Option<FunctionId> {
-        self.analyze(pat.syntax()).type_of_pat(self.db, &pat)
+        self.analyze(call.syntax()).resolve_method_call(self.db, call)
    }
-    pub fn resolve_method_call(&self, call: &ast::MethodCallExpr) -> Option<Function> {
+    fn resolve_method_call_as_callable(&self, call: &ast::MethodCallExpr) -> Option<Callable> {
-        self.analyze(call.syntax()).resolve_method_call(self.db, call)
+        // FIXME: this erases Substs
+        let func = self.resolve_method_call(call)?;
+        let ty = self.db.value_ty(func.into());
+        let resolver = self.analyze(call.syntax()).resolver;
+        let ty = Type::new_with_resolver(self.db, &resolver, ty.value)?;
+        let mut res = ty.as_callable(self.db)?;
+        res.is_bound_method = true;
+        Some(res)
    }
-    pub fn resolve_field(&self, field: &ast::FieldExpr) -> Option<Field> {
+    fn resolve_field(&self, field: &ast::FieldExpr) -> Option<Field> {
        self.analyze(field.syntax()).resolve_field(self.db, field)
    }
-    pub fn resolve_record_field(&self, field: &ast::RecordField) -> Option<(Field, Option<Local>)> {
+    fn resolve_record_field(&self, field: &ast::RecordExprField) -> Option<(Field, Option<Local>)> {
        self.analyze(field.syntax()).resolve_record_field(self.db, field)
    }
-    pub fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<Field> {
+    fn resolve_record_field_pat(&self, field: &ast::RecordFieldPat) -> Option<Field> {
        self.analyze(field.syntax()).resolve_record_field_pat(self.db, field)
    }
-    pub fn resolve_macro_call(&self, macro_call: &ast::MacroCall) -> Option<MacroDef> {
+    fn resolve_macro_call(&self, macro_call: &ast::MacroCall) -> Option<MacroDef> {
        let sa = self.analyze(macro_call.syntax());
        let macro_call = self.find_file(macro_call.syntax().clone()).with_value(macro_call);
        sa.resolve_macro_call(self.db, macro_call)
    }
-    pub fn resolve_path(&self, path: &ast::Path) -> Option<PathResolution> {
+    fn resolve_path(&self, path: &ast::Path) -> Option<PathResolution> {
        self.analyze(path.syntax()).resolve_path(self.db, path)
    }
-    pub fn resolve_variant(&self, record_lit: ast::RecordLit) -> Option<VariantId> {
+    fn resolve_variant(&self, record_lit: ast::RecordExpr) -> Option<VariantId> {
        self.analyze(record_lit.syntax()).resolve_variant(self.db, record_lit)
    }
-    pub fn lower_path(&self, path: &ast::Path) -> Option<Path> {
+    fn lower_path(&self, path: &ast::Path) -> Option<Path> {
        let src = self.find_file(path.syntax().clone());
        Path::from_src(path.clone(), &Hygiene::new(self.db.upcast(), src.file_id.into()))
    }
-    pub fn resolve_bind_pat_to_const(&self, pat: &ast::BindPat) -> Option<ModuleDef> {
+    fn resolve_bind_pat_to_const(&self, pat: &ast::BindPat) -> Option<ModuleDef> {
        self.analyze(pat.syntax()).resolve_bind_pat_to_const(self.db, pat)
    }
-    // FIXME: use this instead?
+    fn record_literal_missing_fields(&self, literal: &ast::RecordExpr) -> Vec<(Field, Type)> {
-    // pub fn resolve_name_ref(&self, name_ref: &ast::NameRef) -> Option<???>;
-    pub fn record_literal_missing_fields(&self, literal: &ast::RecordLit) -> Vec<(Field, Type)> {
        self.analyze(literal.syntax())
            .record_literal_missing_fields(self.db, literal)
            .unwrap_or_default()
    }
-    pub fn record_pattern_missing_fields(&self, pattern: &ast::RecordPat) -> Vec<(Field, Type)> {
+    fn record_pattern_missing_fields(&self, pattern: &ast::RecordPat) -> Vec<(Field, Type)> {
        self.analyze(pattern.syntax())
            .record_pattern_missing_fields(self.db, pattern)
            .unwrap_or_default()
    }
-    pub fn to_def<T: ToDef>(&self, src: &T) -> Option<T::Def> {
-        let src = self.find_file(src.syntax().clone()).with_value(src).cloned();
-        T::to_def(self, src)
-    }
    fn with_ctx<F: FnOnce(&mut SourceToDefCtx) -> T, T>(&self, f: F) -> T {
        let mut cache = self.s2d_cache.borrow_mut();
        let mut ctx = SourceToDefCtx { db: self.db, cache: &mut *cache };
        f(&mut ctx)
    }
-    pub fn to_module_def(&self, file: FileId) -> Option<Module> {
+    fn to_module_def(&self, file: FileId) -> Option<Module> {
        self.with_ctx(|ctx| ctx.file_to_def(file)).map(Module::from)
    }
-    pub fn scope(&self, node: &SyntaxNode) -> SemanticsScope<'db, DB> {
+    fn scope(&self, node: &SyntaxNode) -> SemanticsScope<'db> {
        let node = self.find_file(node.clone());
        let resolver = self.analyze2(node.as_ref(), None).resolver;
        SemanticsScope { db: self.db, resolver }
    }
-    pub fn scope_at_offset(&self, node: &SyntaxNode, offset: TextSize) -> SemanticsScope<'db, DB> {
+    fn scope_at_offset(&self, node: &SyntaxNode, offset: TextSize) -> SemanticsScope<'db> {
        let node = self.find_file(node.clone());
        let resolver = self.analyze2(node.as_ref(), Some(offset)).resolver;
        SemanticsScope { db: self.db, resolver }
    }
-    pub fn scope_for_def(&self, def: Trait) -> SemanticsScope<'db, DB> {
+    fn scope_for_def(&self, def: Trait) -> SemanticsScope<'db> {
-        let resolver = def.id.resolver(self.db);
+        let resolver = def.id.resolver(self.db.upcast());
        SemanticsScope { db: self.db, resolver }
    }
@@ -331,12 +512,13 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
            ChildContainer::DefWithBodyId(def) => {
                return SourceAnalyzer::new_for_body(self.db, def, src, offset)
            }
-            ChildContainer::TraitId(it) => it.resolver(self.db),
+            ChildContainer::TraitId(it) => it.resolver(self.db.upcast()),
-            ChildContainer::ImplId(it) => it.resolver(self.db),
+            ChildContainer::ImplId(it) => it.resolver(self.db.upcast()),
-            ChildContainer::ModuleId(it) => it.resolver(self.db),
+            ChildContainer::ModuleId(it) => it.resolver(self.db.upcast()),
-            ChildContainer::EnumId(it) => it.resolver(self.db),
+            ChildContainer::EnumId(it) => it.resolver(self.db.upcast()),
-            ChildContainer::VariantId(it) => it.resolver(self.db),
+            ChildContainer::VariantId(it) => it.resolver(self.db.upcast()),
-            ChildContainer::GenericDefId(it) => it.resolver(self.db),
+            ChildContainer::TypeAliasId(it) => it.resolver(self.db.upcast()),
+            ChildContainer::GenericDefId(it) => it.resolver(self.db.upcast()),
        };
        SourceAnalyzer::new_for_resolver(resolver, src)
    }
@@ -348,7 +530,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
        assert!(prev == None || prev == Some(file_id))
    }
-    pub fn assert_contains_node(&self, node: &SyntaxNode) {
+    fn assert_contains_node(&self, node: &SyntaxNode) {
        self.find_file(node.clone());
    }
@@ -382,14 +564,14 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
 pub trait ToDef: AstNode + Clone {
    type Def;
-    fn to_def<DB: HirDatabase>(sema: &Semantics<DB>, src: InFile<Self>) -> Option<Self::Def>;
+    fn to_def(sema: &SemanticsImpl, src: InFile<Self>) -> Option<Self::Def>;
 }
 macro_rules! to_def_impls {
    ($(($def:path, $ast:path, $meth:ident)),* ,) => {$(
        impl ToDef for $ast {
            type Def = $def;
-            fn to_def<DB: HirDatabase>(sema: &Semantics<DB>, src: InFile<Self>) -> Option<Self::Def> {
+            fn to_def(sema: &SemanticsImpl, src: InFile<Self>) -> Option<Self::Def> {
                sema.with_ctx(|ctx| ctx.$meth(src)).map(<$def>::from)
            }
        }
@@ -398,18 +580,18 @@ macro_rules! to_def_impls {
 to_def_impls![
    (crate::Module, ast::Module, module_to_def),
-    (crate::Struct, ast::StructDef, struct_to_def),
+    (crate::Struct, ast::Struct, struct_to_def),
-    (crate::Enum, ast::EnumDef, enum_to_def),
+    (crate::Enum, ast::Enum, enum_to_def),
-    (crate::Union, ast::UnionDef, union_to_def),
+    (crate::Union, ast::Union, union_to_def),
-    (crate::Trait, ast::TraitDef, trait_to_def),
+    (crate::Trait, ast::Trait, trait_to_def),
-    (crate::ImplDef, ast::ImplDef, impl_to_def),
+    (crate::ImplDef, ast::Impl, impl_to_def),
-    (crate::TypeAlias, ast::TypeAliasDef, type_alias_to_def),
+    (crate::TypeAlias, ast::TypeAlias, type_alias_to_def),
-    (crate::Const, ast::ConstDef, const_to_def),
+    (crate::Const, ast::Const, const_to_def),
-    (crate::Static, ast::StaticDef, static_to_def),
+    (crate::Static, ast::Static, static_to_def),
-    (crate::Function, ast::FnDef, fn_to_def),
+    (crate::Function, ast::Fn, fn_to_def),
-    (crate::Field, ast::RecordFieldDef, record_field_to_def),
+    (crate::Field, ast::RecordField, record_field_to_def),
-    (crate::Field, ast::TupleFieldDef, tuple_field_to_def),
+    (crate::Field, ast::TupleField, tuple_field_to_def),
-    (crate::EnumVariant, ast::EnumVariant, enum_variant_to_def),
+    (crate::EnumVariant, ast::Variant, enum_variant_to_def),
    (crate::TypeParam, ast::TypeParam, type_param_to_def),
    (crate::MacroDef, ast::MacroCall, macro_call_to_def), // this one is dubious, not all calls are macros
    (crate::Local, ast::BindPat, bind_pat_to_def),
@@ -419,12 +601,13 @@ fn find_root(node: &SyntaxNode) -> SyntaxNode {
    node.ancestors().last().unwrap()
 }
-pub struct SemanticsScope<'a, DB> {
+#[derive(Debug)]
-    pub db: &'a DB,
+pub struct SemanticsScope<'a> {
+    pub db: &'a dyn HirDatabase,
    resolver: Resolver,
 }
-impl<'a, DB: HirDatabase> SemanticsScope<'a, DB> {
+impl<'a> SemanticsScope<'a> {
    pub fn module(&self) -> Option<Module> {
        Some(Module { id: self.resolver.module()? })
    }
@@ -433,13 +616,13 @@ impl<'a, DB: HirDatabase> SemanticsScope<'a, DB> {
    // FIXME: rename to visible_traits to not repeat scope?
    pub fn traits_in_scope(&self) -> FxHashSet<TraitId> {
        let resolver = &self.resolver;
-        resolver.traits_in_scope(self.db)
+        resolver.traits_in_scope(self.db.upcast())
    }
    pub fn process_all_names(&self, f: &mut dyn FnMut(Name, ScopeDef)) {
        let resolver = &self.resolver;
-        resolver.process_all_names(self.db, &mut |name, def| {
+        resolver.process_all_names(self.db.upcast(), &mut |name, def| {
            let def = match def {
                resolver::ScopeDef::PerNs(it) => {
                    let items = ScopeDef::all_items(it);
diff --git a/crates/ra_hir/src/semantics/source_to_def.rs b/crates/ra_hir/src/semantics/source_to_def.rs
index 8af64fdc1..d1994e2e7 100644
--- a/crates/ra_hir/src/semantics/source_to_def.rs
+++ b/crates/ra_hir/src/semantics/source_to_def.rs
@@ -16,6 +16,7 @@ use ra_syntax::{
    match_ast, AstNode, SyntaxNode,
 };
 use rustc_hash::FxHashMap;
+use stdx::impl_from;
 use crate::{db::HirDatabase, InFile, MacroDefId};
@@ -64,53 +65,44 @@ impl SourceToDefCtx<'_, '_> {
        Some(ModuleId { krate: parent_module.krate, local_id: child_id })
    }
-    pub(super) fn trait_to_def(&mut self, src: InFile<ast::TraitDef>) -> Option<TraitId> {
+    pub(super) fn trait_to_def(&mut self, src: InFile<ast::Trait>) -> Option<TraitId> {
        self.to_def(src, keys::TRAIT)
    }
-    pub(super) fn impl_to_def(&mut self, src: InFile<ast::ImplDef>) -> Option<ImplId> {
+    pub(super) fn impl_to_def(&mut self, src: InFile<ast::Impl>) -> Option<ImplId> {
        self.to_def(src, keys::IMPL)
    }
-    pub(super) fn fn_to_def(&mut self, src: InFile<ast::FnDef>) -> Option<FunctionId> {
+    pub(super) fn fn_to_def(&mut self, src: InFile<ast::Fn>) -> Option<FunctionId> {
        self.to_def(src, keys::FUNCTION)
    }
-    pub(super) fn struct_to_def(&mut self, src: InFile<ast::StructDef>) -> Option<StructId> {
+    pub(super) fn struct_to_def(&mut self, src: InFile<ast::Struct>) -> Option<StructId> {
        self.to_def(src, keys::STRUCT)
    }
-    pub(super) fn enum_to_def(&mut self, src: InFile<ast::EnumDef>) -> Option<EnumId> {
+    pub(super) fn enum_to_def(&mut self, src: InFile<ast::Enum>) -> Option<EnumId> {
        self.to_def(src, keys::ENUM)
    }
-    pub(super) fn union_to_def(&mut self, src: InFile<ast::UnionDef>) -> Option<UnionId> {
+    pub(super) fn union_to_def(&mut self, src: InFile<ast::Union>) -> Option<UnionId> {
        self.to_def(src, keys::UNION)
    }
-    pub(super) fn static_to_def(&mut self, src: InFile<ast::StaticDef>) -> Option<StaticId> {
+    pub(super) fn static_to_def(&mut self, src: InFile<ast::Static>) -> Option<StaticId> {
        self.to_def(src, keys::STATIC)
    }
-    pub(super) fn const_to_def(&mut self, src: InFile<ast::ConstDef>) -> Option<ConstId> {
+    pub(super) fn const_to_def(&mut self, src: InFile<ast::Const>) -> Option<ConstId> {
        self.to_def(src, keys::CONST)
    }
-    pub(super) fn type_alias_to_def(
+    pub(super) fn type_alias_to_def(&mut self, src: InFile<ast::TypeAlias>) -> Option<TypeAliasId> {
-        &mut self,
-        src: InFile<ast::TypeAliasDef>,
-    ) -> Option<TypeAliasId> {
        self.to_def(src, keys::TYPE_ALIAS)
    }
-    pub(super) fn record_field_to_def(
+    pub(super) fn record_field_to_def(&mut self, src: InFile<ast::RecordField>) -> Option<FieldId> {
-        &mut self,
-        src: InFile<ast::RecordFieldDef>,
-    ) -> Option<FieldId> {
        self.to_def(src, keys::RECORD_FIELD)
    }
-    pub(super) fn tuple_field_to_def(
+    pub(super) fn tuple_field_to_def(&mut self, src: InFile<ast::TupleField>) -> Option<FieldId> {
-        &mut self,
-        src: InFile<ast::TupleFieldDef>,
-    ) -> Option<FieldId> {
        self.to_def(src, keys::TUPLE_FIELD)
    }
    pub(super) fn enum_variant_to_def(
        &mut self,
-        src: InFile<ast::EnumVariant>,
+        src: InFile<ast::Variant>,
    ) -> Option<EnumVariantId> {
-        self.to_def(src, keys::ENUM_VARIANT)
+        self.to_def(src, keys::VARIANT)
    }
    pub(super) fn bind_pat_to_def(
        &mut self,
@@ -162,38 +154,42 @@ impl SourceToDefCtx<'_, '_> {
                        let def = self.module_to_def(container.with_value(it))?;
                        def.into()
                    },
-                    ast::TraitDef(it) => {
+                    ast::Trait(it) => {
                        let def = self.trait_to_def(container.with_value(it))?;
                        def.into()
                    },
-                    ast::ImplDef(it) => {
+                    ast::Impl(it) => {
                        let def = self.impl_to_def(container.with_value(it))?;
                        def.into()
                    },
-                    ast::FnDef(it) => {
+                    ast::Fn(it) => {
                        let def = self.fn_to_def(container.with_value(it))?;
                        DefWithBodyId::from(def).into()
                    },
-                    ast::StructDef(it) => {
+                    ast::Struct(it) => {
                        let def = self.struct_to_def(container.with_value(it))?;
                        VariantId::from(def).into()
                    },
-                    ast::EnumDef(it) => {
+                    ast::Enum(it) => {
                        let def = self.enum_to_def(container.with_value(it))?;
                        def.into()
                    },
-                    ast::UnionDef(it) => {
+                    ast::Union(it) => {
                        let def = self.union_to_def(container.with_value(it))?;
                        VariantId::from(def).into()
                    },
-                    ast::StaticDef(it) => {
+                    ast::Static(it) => {
                        let def = self.static_to_def(container.with_value(it))?;
                        DefWithBodyId::from(def).into()
                    },
-                    ast::ConstDef(it) => {
+                    ast::Const(it) => {
                        let def = self.const_to_def(container.with_value(it))?;
                        DefWithBodyId::from(def).into()
                    },
+                    ast::TypeAlias(it) => {
+                        let def = self.type_alias_to_def(container.with_value(it))?;
+                        def.into()
+                    },
                    _ => continue,
                }
            };
@@ -208,12 +204,12 @@ impl SourceToDefCtx<'_, '_> {
        for container in src.cloned().ancestors_with_macros(self.db.upcast()).skip(1) {
            let res: GenericDefId = match_ast! {
                match (container.value) {
-                    ast::FnDef(it) => self.fn_to_def(container.with_value(it))?.into(),
+                    ast::Fn(it) => self.fn_to_def(container.with_value(it))?.into(),
-                    ast::StructDef(it) => self.struct_to_def(container.with_value(it))?.into(),
+                    ast::Struct(it) => self.struct_to_def(container.with_value(it))?.into(),
-                    ast::EnumDef(it) => self.enum_to_def(container.with_value(it))?.into(),
+                    ast::Enum(it) => self.enum_to_def(container.with_value(it))?.into(),
-                    ast::TraitDef(it) => self.trait_to_def(container.with_value(it))?.into(),
+                    ast::Trait(it) => self.trait_to_def(container.with_value(it))?.into(),
-                    ast::TypeAliasDef(it) => self.type_alias_to_def(container.with_value(it))?.into(),
+                    ast::TypeAlias(it) => self.type_alias_to_def(container.with_value(it))?.into(),
-                    ast::ImplDef(it) => self.impl_to_def(container.with_value(it))?.into(),
+                    ast::Impl(it) => self.impl_to_def(container.with_value(it))?.into(),
                    _ => continue,
                }
            };
@@ -226,9 +222,9 @@ impl SourceToDefCtx<'_, '_> {
        for container in src.cloned().ancestors_with_macros(self.db.upcast()).skip(1) {
            let res: DefWithBodyId = match_ast! {
                match (container.value) {
-                    ast::ConstDef(it) => self.const_to_def(container.with_value(it))?.into(),
+                    ast::Const(it) => self.const_to_def(container.with_value(it))?.into(),
-                    ast::StaticDef(it) => self.static_to_def(container.with_value(it))?.into(),
+                    ast::Static(it) => self.static_to_def(container.with_value(it))?.into(),
-                    ast::FnDef(it) => self.fn_to_def(container.with_value(it))?.into(),
+                    ast::Fn(it) => self.fn_to_def(container.with_value(it))?.into(),
                    _ => continue,
                }
            };
@@ -246,19 +242,21 @@ pub(crate) enum ChildContainer {
    ImplId(ImplId),
    EnumId(EnumId),
    VariantId(VariantId),
+    TypeAliasId(TypeAliasId),
    /// XXX: this might be the same def as, for example an `EnumId`. However,
    /// here the children generic parameters, and not, eg enum variants.
    GenericDefId(GenericDefId),
 }
-impl_froms! {
+impl_from! {
-    ChildContainer:
    DefWithBodyId,
    ModuleId,
    TraitId,
    ImplId,
    EnumId,
    VariantId,
+    TypeAliasId,
    GenericDefId
+    for ChildContainer
 }
 impl ChildContainer {
@@ -271,6 +269,7 @@ impl ChildContainer {
            ChildContainer::ImplId(it) => it.child_by_source(db),
            ChildContainer::EnumId(it) => it.child_by_source(db),
            ChildContainer::VariantId(it) => it.child_by_source(db),
+            ChildContainer::TypeAliasId(_) => DynMap::default(),
            ChildContainer::GenericDefId(it) => it.child_by_source(db),
        }
    }
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index 1d6c47103..f2e630ef1 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -14,11 +14,11 @@ use hir_def::{
    },
    expr::{ExprId, Pat, PatId},
    resolver::{resolver_for_scope, Resolver, TypeNs, ValueNs},
-    AsMacroCall, DefWithBodyId, FieldId, LocalFieldId, VariantId,
+    AsMacroCall, DefWithBodyId, FieldId, FunctionId, LocalFieldId, VariantId,
 };
 use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile};
 use hir_ty::{
-    expr::{record_literal_missing_fields, record_pattern_missing_fields},
+    diagnostics::{record_literal_missing_fields, record_pattern_missing_fields},
    InferenceResult, Substs, Ty,
 };
 use ra_syntax::{
@@ -115,7 +115,7 @@ impl SourceAnalyzer {
        Some(res)
    }
-    pub(crate) fn type_of(&self, db: &dyn HirDatabase, expr: &ast::Expr) -> Option<Type> {
+    pub(crate) fn type_of_expr(&self, db: &dyn HirDatabase, expr: &ast::Expr) -> Option<Type> {
        let expr_id = self.expr_id(db, expr)?;
        let ty = self.infer.as_ref()?[expr_id].clone();
        Type::new_with_resolver(db, &self.resolver, ty)
@@ -127,13 +127,24 @@ impl SourceAnalyzer {
        Type::new_with_resolver(db, &self.resolver, ty)
    }
+    pub(crate) fn type_of_self(
+        &self,
+        db: &dyn HirDatabase,
+        param: &ast::SelfParam,
+    ) -> Option<Type> {
+        let src = InFile { file_id: self.file_id, value: param };
+        let pat_id = self.body_source_map.as_ref()?.node_self_param(src)?;
+        let ty = self.infer.as_ref()?[pat_id].clone();
+        Type::new_with_resolver(db, &self.resolver, ty)
+    }
    pub(crate) fn resolve_method_call(
        &self,
        db: &dyn HirDatabase,
        call: &ast::MethodCallExpr,
-    ) -> Option<Function> {
+    ) -> Option<FunctionId> {
        let expr_id = self.expr_id(db, &call.clone().into())?;
-        self.infer.as_ref()?.method_resolution(expr_id).map(Function::from)
+        self.infer.as_ref()?.method_resolution(expr_id)
    }
    pub(crate) fn resolve_field(
@@ -148,7 +159,7 @@ impl SourceAnalyzer {
    pub(crate) fn resolve_record_field(
        &self,
        db: &dyn HirDatabase,
-        field: &ast::RecordField,
+        field: &ast::RecordExprField,
    ) -> Option<(Field, Option<Local>)> {
        let expr = field.expr()?;
        let expr_id = self.expr_id(db, &expr)?;
@@ -235,7 +246,7 @@ impl SourceAnalyzer {
            }
        }
-        if let Some(rec_lit) = path.syntax().parent().and_then(ast::RecordLit::cast) {
+        if let Some(rec_lit) = path.syntax().parent().and_then(ast::RecordExpr::cast) {
            let expr_id = self.expr_id(db, &rec_lit.into())?;
            if let Some(VariantId::EnumVariantId(variant)) =
                self.infer.as_ref()?.variant_resolution_for_expr(expr_id)
@@ -273,7 +284,7 @@ impl SourceAnalyzer {
    pub(crate) fn record_literal_missing_fields(
        &self,
        db: &dyn HirDatabase,
-        literal: &ast::RecordLit,
+        literal: &ast::RecordExpr,
    ) -> Option<Vec<(Field, Type)>> {
        let krate = self.resolver.krate()?;
        let body = self.body.as_ref()?;
@@ -341,13 +352,13 @@ impl SourceAnalyzer {
        let macro_call_id = macro_call.as_call_id(db.upcast(), krate, |path| {
            self.resolver.resolve_path_as_macro(db.upcast(), &path)
        })?;
-        Some(macro_call_id.as_file())
+        Some(macro_call_id.as_file()).filter(|it| it.expansion_level(db.upcast()) < 64)
    }
    pub(crate) fn resolve_variant(
        &self,
        db: &dyn HirDatabase,
-        record_lit: ast::RecordLit,
+        record_lit: ast::RecordExpr,
    ) -> Option<VariantId> {
        let infer = self.infer.as_ref()?;
        let expr_id = self.expr_id(db, &record_lit.into())?;
@@ -394,8 +405,7 @@ fn scope_for_offset(
            )
        })
        .map(|(expr_range, scope)| {
-            adjust(db, scopes, source_map, expr_range, offset.file_id, offset.value)
+            adjust(db, scopes, source_map, expr_range, offset).unwrap_or(*scope)
-                .unwrap_or(*scope)
        })
 }
@@ -406,8 +416,7 @@ fn adjust(
    scopes: &ExprScopes,
    source_map: &BodySourceMap,
    expr_range: TextRange,
-    file_id: HirFileId,
+    offset: InFile<TextSize>,
-    offset: TextSize,
 ) -> Option<ScopeId> {
    let child_scopes = scopes
        .scope_by_expr()
@@ -415,7 +424,7 @@ fn adjust(
        .filter_map(|(id, scope)| {
            let source = source_map.expr_syntax(*id).ok()?;
            // FIXME: correctly handle macro expansion
-            if source.file_id != file_id {
+            if source.file_id != offset.file_id {
                return None;
            }
            let root = source.file_syntax(db.upcast());
@@ -423,7 +432,7 @@ fn adjust(
            Some((node.syntax().text_range(), scope))
        })
        .filter(|&(range, _)| {
-            range.start() <= offset && expr_range.contains_range(range) && range != expr_range
+            range.start() <= offset.value && expr_range.contains_range(range) && range != expr_range
        });
    child_scopes
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml
index 6d43924e3..d96a86b80 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_def/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_hir_def"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -32,4 +33,4 @@ ra_cfg = { path = "../ra_cfg" }
 tt = { path = "../ra_tt", package = "ra_tt" }
 [dev-dependencies]
-insta = "0.16.0"
+expect = { path = "../expect" }
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs
index 4994a2125..6cb56a1cd 100644
--- a/crates/ra_hir_def/src/adt.rs
+++ b/crates/ra_hir_def/src/adt.rs
@@ -8,7 +8,7 @@ use hir_expand::{
    InFile,
 };
 use ra_arena::{map::ArenaMap, Arena};
-use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner, VisibilityOwner};
+use ra_syntax::ast::{self, NameOwner, VisibilityOwner};
 use crate::{
    body::{CfgExpander, LowerCtx},
@@ -112,7 +112,7 @@ impl EnumData {
 impl HasChildSource for EnumId {
    type ChildId = LocalEnumVariantId;
-    type Value = ast::EnumVariant;
+    type Value = ast::Variant;
    fn child_source(&self, db: &dyn DefDatabase) -> InFile<ArenaMap<Self::ChildId, Self::Value>> {
        let src = self.lookup(db).source(db);
        let mut trace = Trace::new_for_map();
@@ -123,8 +123,8 @@ impl HasChildSource for EnumId {
 fn lower_enum(
    db: &dyn DefDatabase,
-    trace: &mut Trace<EnumVariantData, ast::EnumVariant>,
+    trace: &mut Trace<EnumVariantData, ast::Variant>,
-    ast: &InFile<ast::EnumDef>,
+    ast: &InFile<ast::Enum>,
    module_id: ModuleId,
 ) {
    let expander = CfgExpander::new(db, ast.file_id, module_id.krate);
@@ -179,7 +179,7 @@ impl VariantData {
 impl HasChildSource for VariantId {
    type ChildId = LocalFieldId;
-    type Value = Either<ast::TupleFieldDef, ast::RecordFieldDef>;
+    type Value = Either<ast::TupleField, ast::RecordField>;
    fn child_source(&self, db: &dyn DefDatabase) -> InFile<ArenaMap<Self::ChildId, Self::Value>> {
        let (src, module_id) = match self {
@@ -194,7 +194,7 @@ impl HasChildSource for VariantId {
            }
            VariantId::UnionId(it) => (
                it.lookup(db).source(db).map(|it| {
-                    it.record_field_def_list()
+                    it.record_field_list()
                        .map(ast::StructKind::Record)
                        .unwrap_or(ast::StructKind::Unit)
                }),
@@ -218,7 +218,7 @@ pub enum StructKind {
 fn lower_struct(
    db: &dyn DefDatabase,
    expander: &mut CfgExpander,
-    trace: &mut Trace<FieldData, Either<ast::TupleFieldDef, ast::RecordFieldDef>>,
+    trace: &mut Trace<FieldData, Either<ast::TupleField, ast::RecordField>>,
    ast: &InFile<ast::StructKind>,
 ) -> StructKind {
    let ctx = LowerCtx::new(db, ast.file_id);
@@ -234,7 +234,7 @@ fn lower_struct(
                    || Either::Left(fd.clone()),
                    || FieldData {
                        name: Name::new_tuple_field(i),
-                        type_ref: TypeRef::from_ast_opt(&ctx, fd.type_ref()),
+                        type_ref: TypeRef::from_ast_opt(&ctx, fd.ty()),
                        visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())),
                    },
                );
@@ -251,7 +251,7 @@ fn lower_struct(
                    || Either::Right(fd.clone()),
                    || FieldData {
                        name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing),
-                        type_ref: TypeRef::from_ast_opt(&ctx, fd.ascribed_type()),
+                        type_ref: TypeRef::from_ast_opt(&ctx, fd.ty()),
                        visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())),
                    },
                );
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs
index e228e2145..050832ce0 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/ra_hir_def/src/attr.rs
@@ -5,7 +5,7 @@ use std::{ops, sync::Arc};
 use either::Either;
 use hir_expand::{hygiene::Hygiene, AstId, InFile};
 use mbe::ast_to_token_tree;
-use ra_cfg::CfgOptions;
+use ra_cfg::{CfgExpr, CfgOptions};
 use ra_syntax::{
    ast::{self, AstNode, AttrsOwner},
    SmolStr,
@@ -125,9 +125,12 @@ impl Attrs {
        AttrQuery { attrs: self, key }
    }
-    pub(crate) fn is_cfg_enabled(&self, cfg_options: &CfgOptions) -> bool {
+    pub fn cfg(&self) -> impl Iterator<Item = CfgExpr> + '_ {
        // FIXME: handle cfg_attr :-)
-        self.by_key("cfg").tt_values().all(|tt| cfg_options.is_cfg_enabled(tt) != Some(false))
+        self.by_key("cfg").tt_values().map(CfgExpr::parse)
+    }
+    pub(crate) fn is_cfg_enabled(&self, cfg_options: &CfgOptions) -> bool {
+        self.cfg().all(|cfg| cfg_options.check(&cfg) != Some(false))
    }
 }
@@ -148,18 +151,15 @@ pub enum AttrInput {
 impl Attr {
    fn from_src(ast: ast::Attr, hygiene: &Hygiene) -> Option<Attr> {
        let path = ModPath::from_src(ast.path()?, hygiene)?;
-        let input = match ast.input() {
+        let input = if let Some(lit) = ast.literal() {
-            None => None,
+            // FIXME: escape? raw string?
-            Some(ast::AttrInput::Literal(lit)) => {
+            let value = lit.syntax().first_token()?.text().trim_matches('"').into();
-                // FIXME: escape? raw string?
+            Some(AttrInput::Literal(value))
-                let value = lit.syntax().first_token()?.text().trim_matches('"').into();
+        } else if let Some(tt) = ast.token_tree() {
-                Some(AttrInput::Literal(value))
+            Some(AttrInput::TokenTree(ast_to_token_tree(&tt)?.0))
-            }
+        } else {
-            Some(ast::AttrInput::TokenTree(tt)) => {
+            None
-                Some(AttrInput::TokenTree(ast_to_token_tree(&tt)?.0))
-            }
        };
        Some(Attr { path, input })
    }
 }
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index 4f2350915..d5f18b920 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -14,6 +14,7 @@ use ra_db::CrateId;
 use ra_prof::profile;
 use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashMap;
+use test_utils::mark;
 pub(crate) use lower::LowerCtx;
@@ -42,9 +43,15 @@ pub(crate) struct Expander {
    current_file_id: HirFileId,
    ast_id_map: Arc<AstIdMap>,
    module: ModuleId,
-    recursive_limit: usize,
+    recursion_limit: usize,
 }
+#[cfg(test)]
+const EXPANSION_RECURSION_LIMIT: usize = 32;
+#[cfg(not(test))]
+const EXPANSION_RECURSION_LIMIT: usize = 128;
 impl CfgExpander {
    pub(crate) fn new(
        db: &dyn DefDatabase,
@@ -81,7 +88,7 @@ impl Expander {
            current_file_id,
            ast_id_map,
            module,
-            recursive_limit: 0,
+            recursion_limit: 0,
        }
    }
@@ -91,7 +98,9 @@ impl Expander {
        local_scope: Option<&ItemScope>,
        macro_call: ast::MacroCall,
    ) -> Option<(Mark, T)> {
-        if self.recursive_limit > 1024 {
+        self.recursion_limit += 1;
+        if self.recursion_limit > EXPANSION_RECURSION_LIMIT {
+            mark::hit!(your_stack_belongs_to_me);
            return None;
        }
@@ -118,8 +127,6 @@ impl Expander {
                    self.cfg_expander.hygiene = Hygiene::new(db.upcast(), file_id);
                    self.current_file_id = file_id;
                    self.ast_id_map = db.ast_id_map(file_id);
-                    self.recursive_limit += 1;
                    return Some((mark, expr));
                }
            }
@@ -134,7 +141,7 @@ impl Expander {
        self.cfg_expander.hygiene = Hygiene::new(db.upcast(), mark.file_id);
        self.current_file_id = mark.file_id;
        self.ast_id_map = mem::take(&mut mark.ast_id_map);
-        self.recursive_limit -= 1;
+        self.recursion_limit -= 1;
        mark.bomb.defuse();
    }
@@ -209,7 +216,7 @@ pub struct BodySourceMap {
    expr_map_back: ArenaMap<ExprId, Result<ExprSource, SyntheticSyntax>>,
    pat_map: FxHashMap<PatSource, PatId>,
    pat_map_back: ArenaMap<PatId, Result<PatSource, SyntheticSyntax>>,
-    field_map: FxHashMap<(ExprId, usize), InFile<AstPtr<ast::RecordField>>>,
+    field_map: FxHashMap<(ExprId, usize), InFile<AstPtr<ast::RecordExprField>>>,
    expansions: FxHashMap<InFile<AstPtr<ast::MacroCall>>, HirFileId>,
 }
@@ -302,7 +309,53 @@ impl BodySourceMap {
        self.pat_map.get(&src).cloned()
    }
-    pub fn field_syntax(&self, expr: ExprId, field: usize) -> InFile<AstPtr<ast::RecordField>> {
+    pub fn node_self_param(&self, node: InFile<&ast::SelfParam>) -> Option<PatId> {
+        let src = node.map(|it| Either::Right(AstPtr::new(it)));
+        self.pat_map.get(&src).cloned()
+    }
+    pub fn field_syntax(&self, expr: ExprId, field: usize) -> InFile<AstPtr<ast::RecordExprField>> {
        self.field_map[&(expr, field)].clone()
    }
 }
+#[cfg(test)]
+mod tests {
+    use ra_db::{fixture::WithFixture, SourceDatabase};
+    use test_utils::mark;
+    use crate::ModuleDefId;
+    use super::*;
+    fn lower(ra_fixture: &str) -> Arc<Body> {
+        let (db, file_id) = crate::test_db::TestDB::with_single_file(ra_fixture);
+        let krate = db.crate_graph().iter().next().unwrap();
+        let def_map = db.crate_def_map(krate);
+        let module = def_map.modules_for_file(file_id).next().unwrap();
+        let module = &def_map[module];
+        let fn_def = match module.scope.declarations().next().unwrap() {
+            ModuleDefId::FunctionId(it) => it,
+            _ => panic!(),
+        };
+        db.body(fn_def.into())
+    }
+    #[test]
+    fn your_stack_belongs_to_me() {
+        mark::check!(your_stack_belongs_to_me);
+        lower(
+            "
+macro_rules! n_nuple {
+    ($e:tt) => ();
+    ($($rest:tt)*) => {{
+        (n_nuple!($($rest)*)None,)
+    }};
+}
+fn main() { n_nuple!(1,2,3); }
+",
+        );
+    }
+}
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs
index c6bc85e2f..827ced4ad 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/ra_hir_def/src/body/lower.rs
@@ -11,7 +11,7 @@ use ra_arena::Arena;
 use ra_syntax::{
    ast::{
        self, ArgListOwner, ArrayExprKind, LiteralKind, LoopBodyOwner, ModuleItemOwner, NameOwner,
-        SlicePatComponents, TypeAscriptionOwner,
+        SlicePatComponents,
    },
    AstNode, AstPtr,
 };
@@ -379,10 +379,10 @@ impl ExprCollector<'_> {
                let expr = e.expr().map(|e| self.collect_expr(e));
                self.alloc_expr(Expr::Return { expr }, syntax_ptr)
            }
-            ast::Expr::RecordLit(e) => {
+            ast::Expr::RecordExpr(e) => {
                let path = e.path().and_then(|path| self.expander.parse_path(path));
                let mut field_ptrs = Vec::new();
-                let record_lit = if let Some(nfl) = e.record_field_list() {
+                let record_lit = if let Some(nfl) = e.record_expr_field_list() {
                    let fields = nfl
                        .fields()
                        .inspect(|field| field_ptrs.push(AstPtr::new(field)))
@@ -432,7 +432,7 @@ impl ExprCollector<'_> {
            }
            ast::Expr::CastExpr(e) => {
                let expr = self.collect_expr_opt(e.expr());
-                let type_ref = TypeRef::from_ast_opt(&self.ctx(), e.type_ref());
+                let type_ref = TypeRef::from_ast_opt(&self.ctx(), e.ty());
                self.alloc_expr(Expr::Cast { expr, type_ref }, syntax_ptr)
            }
            ast::Expr::RefExpr(e) => {
@@ -466,16 +466,13 @@ impl ExprCollector<'_> {
                if let Some(pl) = e.param_list() {
                    for param in pl.params() {
                        let pat = self.collect_pat_opt(param.pat());
-                        let type_ref =
+                        let type_ref = param.ty().map(|it| TypeRef::from_ast(&self.ctx(), it));
-                            param.ascribed_type().map(|it| TypeRef::from_ast(&self.ctx(), it));
                        args.push(pat);
                        arg_types.push(type_ref);
                    }
                }
-                let ret_type = e
+                let ret_type =
-                    .ret_type()
+                    e.ret_type().and_then(|r| r.ty()).map(|it| TypeRef::from_ast(&self.ctx(), it));
-                    .and_then(|r| r.type_ref())
-                    .map(|it| TypeRef::from_ast(&self.ctx(), it));
                let body = self.collect_expr_opt(e.body());
                self.alloc_expr(Expr::Lambda { args, arg_types, ret_type, body }, syntax_ptr)
            }
@@ -607,8 +604,7 @@ impl ExprCollector<'_> {
            .map(|s| match s {
                ast::Stmt::LetStmt(stmt) => {
                    let pat = self.collect_pat_opt(stmt.pat());
-                    let type_ref =
+                    let type_ref = stmt.ty().map(|it| TypeRef::from_ast(&self.ctx(), it));
-                        stmt.ascribed_type().map(|it| TypeRef::from_ast(&self.ctx(), it));
                    let initializer = stmt.initializer().map(|e| self.collect_expr(e));
                    Statement::Let { pat, type_ref, initializer }
                }
@@ -627,53 +623,53 @@ impl ExprCollector<'_> {
            .items()
            .filter_map(|item| {
                let (def, name): (ModuleDefId, Option<ast::Name>) = match item {
-                    ast::ModuleItem::FnDef(def) => {
+                    ast::Item::Fn(def) => {
                        let id = self.find_inner_item(&def)?;
                        (
                            FunctionLoc { container: container.into(), id }.intern(self.db).into(),
                            def.name(),
                        )
                    }
-                    ast::ModuleItem::TypeAliasDef(def) => {
+                    ast::Item::TypeAlias(def) => {
                        let id = self.find_inner_item(&def)?;
                        (
                            TypeAliasLoc { container: container.into(), id }.intern(self.db).into(),
                            def.name(),
                        )
                    }
-                    ast::ModuleItem::ConstDef(def) => {
+                    ast::Item::Const(def) => {
                        let id = self.find_inner_item(&def)?;
                        (
                            ConstLoc { container: container.into(), id }.intern(self.db).into(),
                            def.name(),
                        )
                    }
-                    ast::ModuleItem::StaticDef(def) => {
+                    ast::Item::Static(def) => {
                        let id = self.find_inner_item(&def)?;
                        (StaticLoc { container, id }.intern(self.db).into(), def.name())
                    }
-                    ast::ModuleItem::StructDef(def) => {
+                    ast::Item::Struct(def) => {
                        let id = self.find_inner_item(&def)?;
                        (StructLoc { container, id }.intern(self.db).into(), def.name())
                    }
-                    ast::ModuleItem::EnumDef(def) => {
+                    ast::Item::Enum(def) => {
                        let id = self.find_inner_item(&def)?;
                        (EnumLoc { container, id }.intern(self.db).into(), def.name())
                    }
-                    ast::ModuleItem::UnionDef(def) => {
+                    ast::Item::Union(def) => {
                        let id = self.find_inner_item(&def)?;
                        (UnionLoc { container, id }.intern(self.db).into(), def.name())
                    }
-                    ast::ModuleItem::TraitDef(def) => {
+                    ast::Item::Trait(def) => {
                        let id = self.find_inner_item(&def)?;
                        (TraitLoc { container, id }.intern(self.db).into(), def.name())
                    }
-                    ast::ModuleItem::ExternBlock(_) => return None, // FIXME: collect from extern blocks
+                    ast::Item::ExternBlock(_) => return None, // FIXME: collect from extern blocks
-                    ast::ModuleItem::ImplDef(_)
+                    ast::Item::Impl(_)
-                    | ast::ModuleItem::UseItem(_)
+                    | ast::Item::Use(_)
-                    | ast::ModuleItem::ExternCrateItem(_)
+                    | ast::Item::ExternCrate(_)
-                    | ast::ModuleItem::Module(_)
+                    | ast::Item::Module(_)
-                    | ast::ModuleItem::MacroCall(_) => return None,
+                    | ast::Item::MacroCall(_) => return None,
                };
                Some((def, name))
diff --git a/crates/ra_hir_def/src/child_by_source.rs b/crates/ra_hir_def/src/child_by_source.rs
index a885ec96d..dcb00a1d9 100644
--- a/crates/ra_hir_def/src/child_by_source.rs
+++ b/crates/ra_hir_def/src/child_by_source.rs
@@ -162,7 +162,7 @@ impl ChildBySource for EnumId {
        let arena_map = arena_map.as_ref();
        for (local_id, source) in arena_map.value.iter() {
            let id = EnumVariantId { parent: *self, local_id };
-            res[keys::ENUM_VARIANT].insert(arena_map.with_value(source.clone()), id)
+            res[keys::VARIANT].insert(arena_map.with_value(source.clone()), id)
        }
        res
diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs
index 282ade2a3..88a8ef9bf 100644
--- a/crates/ra_hir_def/src/data.rs
+++ b/crates/ra_hir_def/src/data.rs
@@ -27,11 +27,12 @@ pub struct FunctionData {
    /// can be called as a method.
    pub has_self_param: bool,
    pub is_unsafe: bool,
+    pub is_varargs: bool,
    pub visibility: RawVisibility,
 }
 impl FunctionData {
-    pub(crate) fn fn_data_query(db: &impl DefDatabase, func: FunctionId) -> Arc<FunctionData> {
+    pub(crate) fn fn_data_query(db: &dyn DefDatabase, func: FunctionId) -> Arc<FunctionData> {
        let loc = func.lookup(db);
        let item_tree = db.item_tree(loc.id.file_id);
        let func = &item_tree[loc.id.value];
@@ -43,6 +44,7 @@ impl FunctionData {
            attrs: item_tree.attrs(ModItem::from(loc.id.value).into()).clone(),
            has_self_param: func.has_self_param,
            is_unsafe: func.is_unsafe,
+            is_varargs: func.is_varargs,
            visibility: item_tree[func.visibility].clone(),
        })
    }
diff --git a/crates/ra_hir_def/src/generics.rs b/crates/ra_hir_def/src/generics.rs
index 6a0f493a7..8ea61fcf2 100644
--- a/crates/ra_hir_def/src/generics.rs
+++ b/crates/ra_hir_def/src/generics.rs
@@ -12,7 +12,7 @@ use hir_expand::{
 use ra_arena::{map::ArenaMap, Arena};
 use ra_db::FileId;
 use ra_prof::profile;
-use ra_syntax::ast::{self, NameOwner, TypeBoundsOwner, TypeParamsOwner};
+use ra_syntax::ast::{self, GenericParamsOwner, NameOwner, TypeBoundsOwner};
 use crate::{
    body::LowerCtx,
@@ -66,7 +66,7 @@ pub enum WherePredicateTarget {
    TypeParam(LocalTypeParamId),
 }
-type SourceMap = ArenaMap<LocalTypeParamId, Either<ast::TraitDef, ast::TypeParam>>;
+type SourceMap = ArenaMap<LocalTypeParamId, Either<ast::Trait, ast::TypeParam>>;
 impl GenericParams {
    pub(crate) fn generic_params_query(
@@ -205,9 +205,9 @@ impl GenericParams {
        &mut self,
        lower_ctx: &LowerCtx,
        sm: &mut SourceMap,
-        node: &dyn TypeParamsOwner,
+        node: &dyn GenericParamsOwner,
    ) {
-        if let Some(params) = node.type_param_list() {
+        if let Some(params) = node.generic_param_list() {
            self.fill_params(lower_ctx, sm, params)
        }
        if let Some(where_clause) = node.where_clause() {
@@ -232,7 +232,7 @@ impl GenericParams {
        &mut self,
        lower_ctx: &LowerCtx,
        sm: &mut SourceMap,
-        params: ast::TypeParamList,
+        params: ast::GenericParamList,
    ) {
        for type_param in params.type_params() {
            let name = type_param.name().map_or_else(Name::missing, |it| it.as_name());
@@ -317,7 +317,7 @@ impl GenericParams {
 impl HasChildSource for GenericDefId {
    type ChildId = LocalTypeParamId;
-    type Value = Either<ast::TraitDef, ast::TypeParam>;
+    type Value = Either<ast::Trait, ast::TypeParam>;
    fn child_source(&self, db: &dyn DefDatabase) -> InFile<SourceMap> {
        let (_, sm) = GenericParams::new(db, *self);
        sm
diff --git a/crates/ra_hir_def/src/import_map.rs b/crates/ra_hir_def/src/import_map.rs
index 68e20d06b..9e4c30b1a 100644
--- a/crates/ra_hir_def/src/import_map.rs
+++ b/crates/ra_hir_def/src/import_map.rs
@@ -5,14 +5,16 @@ use std::{cmp::Ordering, fmt, hash::BuildHasherDefault, sync::Arc};
 use fst::{self, Streamer};
 use indexmap::{map::Entry, IndexMap};
 use ra_db::CrateId;
-use rustc_hash::FxHasher;
+use ra_syntax::SmolStr;
+use rustc_hash::{FxHashMap, FxHasher};
+use smallvec::SmallVec;
 use crate::{
    db::DefDatabase,
    item_scope::ItemInNs,
    path::{ModPath, PathKind},
    visibility::Visibility,
-    ModuleDefId, ModuleId,
+    AssocItemId, ModuleDefId, ModuleId, TraitId,
 };
 type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<FxHasher>>;
@@ -34,6 +36,7 @@ pub struct ImportInfo {
 ///
 /// Note that all paths are relative to the containing crate's root, so the crate name still needs
 /// to be prepended to the `ModPath` before the path is valid.
+#[derive(Default)]
 pub struct ImportMap {
    map: FxIndexMap<ItemInNs, ImportInfo>,
@@ -45,13 +48,17 @@ pub struct ImportMap {
    /// the index of the first one.
    importables: Vec<ItemInNs>,
    fst: fst::Map<Vec<u8>>,
+    /// Maps names of associated items to the item's ID. Only includes items whose defining trait is
+    /// exported.
+    assoc_map: FxHashMap<SmolStr, SmallVec<[AssocItemId; 1]>>,
 }
 impl ImportMap {
    pub fn import_map_query(db: &dyn DefDatabase, krate: CrateId) -> Arc<Self> {
        let _p = ra_prof::profile("import_map_query");
        let def_map = db.crate_def_map(krate);
-        let mut import_map = FxIndexMap::with_capacity_and_hasher(64, Default::default());
+        let mut import_map = Self::default();
        // We look only into modules that are public(ly reexported), starting with the crate root.
        let empty = ModPath { kind: PathKind::Plain, segments: vec![] };
@@ -85,7 +92,7 @@ impl ImportMap {
                for item in per_ns.iter_items() {
                    let path = mk_path();
-                    match import_map.entry(item) {
+                    match import_map.map.entry(item) {
                        Entry::Vacant(entry) => {
                            entry.insert(ImportInfo { path, container: module });
                        }
@@ -105,11 +112,16 @@ impl ImportMap {
                    if let Some(ModuleDefId::ModuleId(mod_id)) = item.as_module_def_id() {
                        worklist.push((mod_id, mk_path()));
                    }
+                    // If we've added a path to a trait, add the trait's methods to the method map.
+                    if let Some(ModuleDefId::TraitId(tr)) = item.as_module_def_id() {
+                        import_map.collect_trait_methods(db, tr);
+                    }
                }
            }
        }
-        let mut importables = import_map.iter().collect::<Vec<_>>();
+        let mut importables = import_map.map.iter().collect::<Vec<_>>();
        importables.sort_by(cmp);
@@ -133,10 +145,10 @@ impl ImportMap {
            builder.insert(key, start as u64).unwrap();
        }
-        let fst = fst::Map::new(builder.into_inner().unwrap()).unwrap();
+        import_map.fst = fst::Map::new(builder.into_inner().unwrap()).unwrap();
-        let importables = importables.iter().map(|(item, _)| **item).collect();
+        import_map.importables = importables.iter().map(|(item, _)| **item).collect();
-        Arc::new(Self { map: import_map, fst, importables })
+        Arc::new(import_map)
    }
    /// Returns the `ModPath` needed to import/mention `item`, relative to this crate's root.
@@ -147,6 +159,13 @@ impl ImportMap {
    pub fn import_info_for(&self, item: ItemInNs) -> Option<&ImportInfo> {
        self.map.get(&item)
    }
+    fn collect_trait_methods(&mut self, db: &dyn DefDatabase, tr: TraitId) {
+        let data = db.trait_data(tr);
+        for (name, item) in data.items.iter() {
+            self.assoc_map.entry(name.to_string().into()).or_default().push(*item);
+        }
+    }
 }
 impl PartialEq for ImportMap {
@@ -290,37 +309,32 @@ pub fn search_dependencies<'a>(
        }
    }
+    // Add all exported associated items whose names match the query (exactly).
+    for map in &import_maps {
+        if let Some(v) = map.assoc_map.get(&*query.query) {
+            res.extend(v.iter().map(|&assoc| {
+                ItemInNs::Types(match assoc {
+                    AssocItemId::FunctionId(it) => it.into(),
+                    AssocItemId::ConstId(it) => it.into(),
+                    AssocItemId::TypeAliasId(it) => it.into(),
+                })
+            }));
+        }
+    }
    res
 }
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use expect::{expect, Expect};
-    use crate::test_db::TestDB;
+    use ra_db::{fixture::WithFixture, SourceDatabase, Upcast};
-    use insta::assert_snapshot;
-    use itertools::Itertools;
-    use ra_db::fixture::WithFixture;
-    use ra_db::{SourceDatabase, Upcast};
-    fn import_map(ra_fixture: &str) -> String {
+    use crate::{test_db::TestDB, AssocContainerId, Lookup};
-        let db = TestDB::with_files(ra_fixture);
-        let crate_graph = db.crate_graph();
-        let s = crate_graph
+    use super::*;
-            .iter()
-            .filter_map(|krate| {
-                let cdata = &crate_graph[krate];
-                let name = cdata.display_name.as_ref()?;
-                let map = db.import_map(krate);
-                Some(format!("{}:\n{:?}", name, map))
-            })
-            .join("\n");
-        s
-    }
-    fn search_dependencies_of(ra_fixture: &str, krate_name: &str, query: Query) -> String {
+    fn check_search(ra_fixture: &str, krate_name: &str, query: Query, expect: Expect) {
        let db = TestDB::with_files(ra_fixture);
        let crate_graph = db.crate_graph();
        let krate = crate_graph
@@ -331,7 +345,7 @@ mod tests {
            })
            .unwrap();
-        search_dependencies(db.upcast(), krate, query)
+        let actual = search_dependencies(db.upcast(), krate, query)
            .into_iter()
            .filter_map(|item| {
                let mark = match item {
@@ -339,23 +353,67 @@ mod tests {
                    ItemInNs::Values(_) => "v",
                    ItemInNs::Macros(_) => "m",
                };
+                let item = assoc_to_trait(&db, item);
                item.krate(db.upcast()).map(|krate| {
                    let map = db.import_map(krate);
                    let path = map.path_of(item).unwrap();
                    format!(
-                        "{}::{} ({})",
+                        "{}::{} ({})\n",
                        crate_graph[krate].display_name.as_ref().unwrap(),
                        path,
                        mark
                    )
                })
            })
-            .join("\n")
+            .collect::<String>();
+        expect.assert_eq(&actual)
+    }
+    fn assoc_to_trait(db: &dyn DefDatabase, item: ItemInNs) -> ItemInNs {
+        let assoc: AssocItemId = match item {
+            ItemInNs::Types(it) | ItemInNs::Values(it) => match it {
+                ModuleDefId::TypeAliasId(it) => it.into(),
+                ModuleDefId::FunctionId(it) => it.into(),
+                ModuleDefId::ConstId(it) => it.into(),
+                _ => return item,
+            },
+            _ => return item,
+        };
+        let container = match assoc {
+            AssocItemId::FunctionId(it) => it.lookup(db).container,
+            AssocItemId::ConstId(it) => it.lookup(db).container,
+            AssocItemId::TypeAliasId(it) => it.lookup(db).container,
+        };
+        match container {
+            AssocContainerId::TraitId(it) => ItemInNs::Types(it.into()),
+            _ => item,
+        }
+    }
+    fn check(ra_fixture: &str, expect: Expect) {
+        let db = TestDB::with_files(ra_fixture);
+        let crate_graph = db.crate_graph();
+        let actual = crate_graph
+            .iter()
+            .filter_map(|krate| {
+                let cdata = &crate_graph[krate];
+                let name = cdata.display_name.as_ref()?;
+                let map = db.import_map(krate);
+                Some(format!("{}:\n{:?}\n", name, map))
+            })
+            .collect::<String>();
+        expect.assert_eq(&actual)
    }
    #[test]
    fn smoke() {
-        let map = import_map(
+        check(
            r"
            //- /main.rs crate:main deps:lib
@@ -380,24 +438,23 @@ mod tests {
            pub struct Pub2; // t + v
            struct Priv;
        ",
+            expect![[r#"
+                main:
+                - publ1 (t)
+                - real_pu2 (t)
+                - real_pub (t)
+                - real_pub::Pub (t)
+                lib:
+                - Pub (t)
+                - Pub2 (t)
+                - Pub2 (v)
+            "#]],
        );
-        assert_snapshot!(map, @r###"
-        main:
-        - publ1 (t)
-        - real_pu2 (t)
-        - real_pub (t)
-        - real_pub::Pub (t)
-        lib:
-        - Pub (t)
-        - Pub2 (t)
-        - Pub2 (v)
-        "###);
    }
    #[test]
    fn prefers_shortest_path() {
-        let map = import_map(
+        check(
            r"
            //- /main.rs crate:main
@@ -409,21 +466,20 @@ mod tests {
                pub use super::sub::subsub::Def;
            }
        ",
+            expect![[r#"
+                main:
+                - sub (t)
+                - sub::Def (t)
+                - sub::subsub (t)
+            "#]],
        );
-        assert_snapshot!(map, @r###"
-        main:
-        - sub (t)
-        - sub::Def (t)
-        - sub::subsub (t)
-        "###);
    }
    #[test]
    fn type_reexport_cross_crate() {
        // Reexports need to be visible from a crate, even if the original crate exports the item
        // at a shorter path.
-        let map = import_map(
+        check(
            r"
            //- /main.rs crate:main deps:lib
            pub mod m {
@@ -432,22 +488,21 @@ mod tests {
            //- /lib.rs crate:lib
            pub struct S;
        ",
+            expect![[r#"
+                main:
+                - m (t)
+                - m::S (t)
+                - m::S (v)
+                lib:
+                - S (t)
+                - S (v)
+            "#]],
        );
-        assert_snapshot!(map, @r###"
-        main:
-        - m (t)
-        - m::S (t)
-        - m::S (v)
-        lib:
-        - S (t)
-        - S (v)
-        "###);
    }
    #[test]
    fn macro_reexport() {
-        let map = import_map(
+        check(
            r"
            //- /main.rs crate:main deps:lib
            pub mod m {
@@ -459,21 +514,20 @@ mod tests {
                () => {};
            }
        ",
+            expect![[r#"
+                main:
+                - m (t)
+                - m::pub_macro (m)
+                lib:
+                - pub_macro (m)
+            "#]],
        );
-        assert_snapshot!(map, @r###"
-        main:
-        - m (t)
-        - m::pub_macro (m)
-        lib:
-        - pub_macro (m)
-        "###);
    }
    #[test]
    fn module_reexport() {
        // Reexporting modules from a dependency adds all contents to the import map.
-        let map = import_map(
+        check(
            r"
            //- /main.rs crate:main deps:lib
            pub use lib::module as reexported_module;
@@ -482,24 +536,23 @@ mod tests {
                pub struct S;
            }
        ",
+            expect![[r#"
+                main:
+                - reexported_module (t)
+                - reexported_module::S (t)
+                - reexported_module::S (v)
+                lib:
+                - module (t)
+                - module::S (t)
+                - module::S (v)
+            "#]],
        );
-        assert_snapshot!(map, @r###"
-        main:
-        - reexported_module (t)
-        - reexported_module::S (t)
-        - reexported_module::S (v)
-        lib:
-        - module (t)
-        - module::S (t)
-        - module::S (v)
-        "###);
    }
    #[test]
    fn cyclic_module_reexport() {
        // A cyclic reexport does not hang.
-        let map = import_map(
+        check(
            r"
            //- /lib.rs crate:lib
            pub mod module {
@@ -511,36 +564,35 @@ mod tests {
                pub use super::module;
            }
        ",
+            expect![[r#"
+                lib:
+                - module (t)
+                - module::S (t)
+                - module::S (v)
+                - sub (t)
+            "#]],
        );
-        assert_snapshot!(map, @r###"
-        lib:
-        - module (t)
-        - module::S (t)
-        - module::S (v)
-        - sub (t)
-        "###);
    }
    #[test]
    fn private_macro() {
-        let map = import_map(
+        check(
            r"
            //- /lib.rs crate:lib
            macro_rules! private_macro {
                () => {};
            }
        ",
-        );
+            expect![[r#"
+                lib:
-        assert_snapshot!(map, @r###"
+            "#]],
-        lib:
+        );
-        "###);
    }
    #[test]
    fn namespacing() {
-        let map = import_map(
+        check(
            r"
            //- /lib.rs crate:lib
            pub struct Thing;     // t + v
@@ -549,16 +601,15 @@ mod tests {
                () => {};
            }
        ",
+            expect![[r#"
+                lib:
+                - Thing (m)
+                - Thing (t)
+                - Thing (v)
+            "#]],
        );
-        assert_snapshot!(map, @r###"
+        check(
-        lib:
-        - Thing (m)
-        - Thing (t)
-        - Thing (v)
-        "###);
-        let map = import_map(
            r"
            //- /lib.rs crate:lib
            pub mod Thing {}      // t
@@ -567,13 +618,12 @@ mod tests {
                () => {};
            }
        ",
+            expect![[r#"
+                lib:
+                - Thing (m)
+                - Thing (t)
+            "#]],
        );
-        assert_snapshot!(map, @r###"
-        lib:
-        - Thing (m)
-        - Thing (t)
-        "###);
    }
    #[test]
@@ -602,23 +652,33 @@ mod tests {
            }
        "#;
-        let res = search_dependencies_of(ra_fixture, "main", Query::new("fmt"));
+        check_search(
-        assert_snapshot!(res, @r###"
+            ra_fixture,
-        dep::fmt (t)
+            "main",
-        dep::Fmt (t)
+            Query::new("fmt"),
-        dep::Fmt (v)
+            expect![[r#"
-        dep::Fmt (m)
+                dep::fmt (t)
-        dep::fmt::Display (t)
+                dep::Fmt (t)
-        dep::format (v)
+                dep::Fmt (v)
-        "###);
+                dep::Fmt (m)
+                dep::fmt::Display (t)
-        let res = search_dependencies_of(ra_fixture, "main", Query::new("fmt").anchor_end());
+                dep::format (v)
-        assert_snapshot!(res, @r###"
+                dep::fmt::Display (t)
-        dep::fmt (t)
+            "#]],
-        dep::Fmt (t)
+        );
-        dep::Fmt (v)
-        dep::Fmt (m)
+        check_search(
-        "###);
+            ra_fixture,
+            "main",
+            Query::new("fmt").anchor_end(),
+            expect![[r#"
+                dep::fmt (t)
+                dep::Fmt (t)
+                dep::Fmt (v)
+                dep::Fmt (m)
+                dep::fmt::Display (t)
+            "#]],
+        );
    }
    #[test]
@@ -631,26 +691,32 @@ mod tests {
            pub struct FMT;
        "#;
-        let res = search_dependencies_of(ra_fixture, "main", Query::new("FMT"));
+        check_search(
+            ra_fixture,
-        assert_snapshot!(res, @r###"
+            "main",
-        dep::fmt (t)
+            Query::new("FMT"),
-        dep::fmt (v)
+            expect![[r#"
-        dep::FMT (t)
+                dep::fmt (t)
-        dep::FMT (v)
+                dep::fmt (v)
-        "###);
+                dep::FMT (t)
+                dep::FMT (v)
-        let res = search_dependencies_of(ra_fixture, "main", Query::new("FMT").case_sensitive());
+            "#]],
+        );
-        assert_snapshot!(res, @r###"
+        check_search(
-        dep::FMT (t)
+            ra_fixture,
-        dep::FMT (v)
+            "main",
-        "###);
+            Query::new("FMT").case_sensitive(),
+            expect![[r#"
+                dep::FMT (t)
+                dep::FMT (v)
+            "#]],
+        );
    }
    #[test]
    fn search_limit() {
-        let res = search_dependencies_of(
+        check_search(
            r#"
        //- /main.rs crate:main deps:dep
        //- /dep.rs crate:dep
@@ -670,10 +736,10 @@ mod tests {
    "#,
            "main",
            Query::new("").limit(2),
+            expect![[r#"
+                dep::fmt (t)
+                dep::Fmt (t)
+            "#]],
        );
-        assert_snapshot!(res, @r###"
-        dep::fmt (t)
-        dep::Fmt (t)
-        "###);
    }
 }
diff --git a/crates/ra_hir_def/src/item_scope.rs b/crates/ra_hir_def/src/item_scope.rs
index 4d446c707..8fee4b15e 100644
--- a/crates/ra_hir_def/src/item_scope.rs
+++ b/crates/ra_hir_def/src/item_scope.rs
@@ -1,6 +1,8 @@
 //! Describes items defined or visible (ie, imported) in a certain scope.
 //! This is shared between modules and blocks.
+use std::collections::hash_map::Entry;
 use hir_expand::name::Name;
 use once_cell::sync::Lazy;
 use ra_db::CrateId;
@@ -27,9 +29,15 @@ pub struct PerNsGlobImports {
 #[derive(Debug, Default, PartialEq, Eq)]
 pub struct ItemScope {
-    visible: FxHashMap<Name, PerNs>,
+    types: FxHashMap<Name, (ModuleDefId, Visibility)>,
+    values: FxHashMap<Name, (ModuleDefId, Visibility)>,
+    macros: FxHashMap<Name, (MacroDefId, Visibility)>,
+    unresolved: FxHashSet<Name>,
    defs: Vec<ModuleDefId>,
    impls: Vec<ImplId>,
+    /// Traits imported via `use Trait as _;`.
+    unnamed_trait_imports: FxHashMap<TraitId, Visibility>,
    /// Macros visible in current module in legacy textual scope
    ///
    /// For macros invoked by an unqualified identifier like `bar!()`, `legacy_macros` will be searched in first.
@@ -65,14 +73,16 @@ pub(crate) enum BuiltinShadowMode {
 /// Other methods will only resolve values, types and module scoped macros only.
 impl ItemScope {
    pub fn entries<'a>(&'a self) -> impl Iterator<Item = (&'a Name, PerNs)> + 'a {
-        //FIXME: shadowing
+        // FIXME: shadowing
-        self.visible.iter().map(|(n, def)| (n, *def))
+        let keys: FxHashSet<_> = self
-    }
+            .types
+            .keys()
-    pub fn entries_without_primitives<'a>(
+            .chain(self.values.keys())
-        &'a self,
+            .chain(self.macros.keys())
-    ) -> impl Iterator<Item = (&'a Name, PerNs)> + 'a {
+            .chain(self.unresolved.iter())
-        self.visible.iter().map(|(n, def)| (n, *def))
+            .collect();
+        keys.into_iter().map(move |name| (name, self.get(name)))
    }
    pub fn declarations(&self) -> impl Iterator<Item = ModuleDefId> + '_ {
@@ -91,7 +101,7 @@ impl ItemScope {
    /// Iterate over all module scoped macros
    pub(crate) fn macros<'a>(&'a self) -> impl Iterator<Item = (&'a Name, MacroDefId)> + 'a {
-        self.visible.iter().filter_map(|(name, def)| def.take_macros().map(|macro_| (name, macro_)))
+        self.entries().filter_map(|(name, def)| def.take_macros().map(|macro_| (name, macro_)))
    }
    /// Iterate over all legacy textual scoped macros visible at the end of the module
@@ -101,12 +111,16 @@ impl ItemScope {
    /// Get a name from current module scope, legacy macros are not included
    pub(crate) fn get(&self, name: &Name) -> PerNs {
-        self.visible.get(name).copied().unwrap_or_else(PerNs::none)
+        PerNs {
+            types: self.types.get(name).copied(),
+            values: self.values.get(name).copied(),
+            macros: self.macros.get(name).copied(),
+        }
    }
    pub(crate) fn name_of(&self, item: ItemInNs) -> Option<(&Name, Visibility)> {
-        for (name, per_ns) in &self.visible {
+        for (name, per_ns) in self.entries() {
-            if let Some(vis) = item.match_with(*per_ns) {
+            if let Some(vis) = item.match_with(per_ns) {
                return Some((name, vis));
            }
        }
@@ -114,10 +128,13 @@ impl ItemScope {
    }
    pub(crate) fn traits<'a>(&'a self) -> impl Iterator<Item = TraitId> + 'a {
-        self.visible.values().filter_map(|def| match def.take_types() {
+        self.types
-            Some(ModuleDefId::TraitId(t)) => Some(t),
+            .values()
-            _ => None,
+            .filter_map(|(def, _)| match def {
-        })
+                ModuleDefId::TraitId(t) => Some(*t),
+                _ => None,
+            })
+            .chain(self.unnamed_trait_imports.keys().copied())
    }
    pub(crate) fn define_def(&mut self, def: ModuleDefId) {
@@ -136,23 +153,40 @@ impl ItemScope {
        self.legacy_macros.insert(name, mac);
    }
+    pub(crate) fn unnamed_trait_vis(&self, tr: TraitId) -> Option<Visibility> {
+        self.unnamed_trait_imports.get(&tr).copied()
+    }
+    pub(crate) fn push_unnamed_trait(&mut self, tr: TraitId, vis: Visibility) {
+        self.unnamed_trait_imports.insert(tr, vis);
+    }
    pub(crate) fn push_res(&mut self, name: Name, def: PerNs) -> bool {
        let mut changed = false;
-        let existing = self.visible.entry(name).or_default();
-        if existing.types.is_none() && def.types.is_some() {
+        if let Some(types) = def.types {
-            existing.types = def.types;
+            self.types.entry(name.clone()).or_insert_with(|| {
-            changed = true;
+                changed = true;
+                types
+            });
        }
+        if let Some(values) = def.values {
-        if existing.values.is_none() && def.values.is_some() {
+            self.values.entry(name.clone()).or_insert_with(|| {
-            existing.values = def.values;
+                changed = true;
-            changed = true;
+                values
+            });
+        }
+        if let Some(macros) = def.macros {
+            self.macros.entry(name.clone()).or_insert_with(|| {
+                changed = true;
+                macros
+            });
        }
-        if existing.macros.is_none() && def.macros.is_some() {
+        if def.is_none() {
-            existing.macros = def.macros;
+            if self.unresolved.insert(name) {
-            changed = true;
+                changed = true;
+            }
        }
        changed
@@ -166,17 +200,17 @@ impl ItemScope {
        def_import_type: ImportType,
    ) -> bool {
        let mut changed = false;
-        let existing = self.visible.entry(lookup.1.clone()).or_default();
        macro_rules! check_changed {
            (
                $changed:ident,
-                ( $existing:ident / $def:ident ) . $field:ident,
+                ( $this:ident / $def:ident ) . $field:ident,
                $glob_imports:ident [ $lookup:ident ],
                $def_import_type:ident
-            ) => {
+            ) => {{
-                match ($existing.$field, $def.$field) {
+                let existing = $this.$field.entry($lookup.1.clone());
-                    (None, Some(_)) => {
+                match (existing, $def.$field) {
+                    (Entry::Vacant(entry), Some(_)) => {
                        match $def_import_type {
                            ImportType::Glob => {
                                $glob_imports.$field.insert($lookup.clone());
@@ -186,32 +220,46 @@ impl ItemScope {
                            }
                        }
-                        $existing.$field = $def.$field;
+                        if let Some(fld) = $def.$field {
+                            entry.insert(fld);
+                        }
                        $changed = true;
                    }
-                    (Some(_), Some(_))
+                    (Entry::Occupied(mut entry), Some(_))
                        if $glob_imports.$field.contains(&$lookup)
                            && matches!($def_import_type, ImportType::Named) =>
                    {
                        mark::hit!(import_shadowed);
                        $glob_imports.$field.remove(&$lookup);
-                        $existing.$field = $def.$field;
+                        if let Some(fld) = $def.$field {
+                            entry.insert(fld);
+                        }
                        $changed = true;
                    }
                    _ => {}
                }
-            };
+            }};
        }
-        check_changed!(changed, (existing / def).types, glob_imports[lookup], def_import_type);
+        check_changed!(changed, (self / def).types, glob_imports[lookup], def_import_type);
-        check_changed!(changed, (existing / def).values, glob_imports[lookup], def_import_type);
+        check_changed!(changed, (self / def).values, glob_imports[lookup], def_import_type);
-        check_changed!(changed, (existing / def).macros, glob_imports[lookup], def_import_type);
+        check_changed!(changed, (self / def).macros, glob_imports[lookup], def_import_type);
+        if def.is_none() {
+            if self.unresolved.insert(lookup.1) {
+                changed = true;
+            }
+        }
        changed
    }
-    pub(crate) fn resolutions<'a>(&'a self) -> impl Iterator<Item = (Name, PerNs)> + 'a {
+    pub(crate) fn resolutions<'a>(&'a self) -> impl Iterator<Item = (Option<Name>, PerNs)> + 'a {
-        self.visible.iter().map(|(name, res)| (name.clone(), *res))
+        self.entries().map(|(name, res)| (Some(name.clone()), res)).chain(
+            self.unnamed_trait_imports
+                .iter()
+                .map(|(tr, vis)| (None, PerNs::types(ModuleDefId::TraitId(*tr), *vis))),
+        )
    }
    pub(crate) fn collect_legacy_macros(&self) -> FxHashMap<Name, MacroDefId> {
diff --git a/crates/ra_hir_def/src/item_tree.rs b/crates/ra_hir_def/src/item_tree.rs
index 3e603bd55..a67e75dac 100644
--- a/crates/ra_hir_def/src/item_tree.rs
+++ b/crates/ra_hir_def/src/item_tree.rs
@@ -13,7 +13,7 @@ use std::{
    sync::Arc,
 };
-use ast::{AstNode, AttrsOwner, NameOwner, StructKind, TypeAscriptionOwner};
+use ast::{AstNode, AttrsOwner, NameOwner, StructKind};
 use either::Either;
 use hir_expand::{
    ast_id_map::FileAstId,
@@ -70,7 +70,7 @@ impl GenericParamsId {
 pub struct ItemTree {
    top_level: SmallVec<[ModItem; 1]>,
    attrs: FxHashMap<AttrOwner, Attrs>,
-    inner_items: FxHashMap<FileAstId<ast::ModuleItem>, SmallVec<[ModItem; 1]>>,
+    inner_items: FxHashMap<FileAstId<ast::Item>, SmallVec<[ModItem; 1]>>,
    data: Option<Box<ItemTreeData>>,
 }
@@ -187,7 +187,7 @@ impl ItemTree {
    ///
    /// Most AST items are lowered to a single `ModItem`, but some (eg. `use` items) may be lowered
    /// to multiple items in the `ItemTree`.
-    pub fn inner_items(&self, ast: FileAstId<ast::ModuleItem>) -> &[ModItem] {
+    pub fn inner_items(&self, ast: FileAstId<ast::Item>) -> &[ModItem] {
        &self.inner_items[&ast]
    }
@@ -310,7 +310,7 @@ from_attrs!(ModItem(ModItem), Variant(Idx<Variant>), Field(Idx<Field>));
 /// Trait implemented by all item nodes in the item tree.
 pub trait ItemTreeNode: Clone {
-    type Source: AstNode + Into<ast::ModuleItem>;
+    type Source: AstNode + Into<ast::Item>;
    fn ast_id(&self) -> FileAstId<Self::Source>;
@@ -411,17 +411,17 @@ macro_rules! mod_items {
 }
 mod_items! {
-    Import in imports -> ast::UseItem,
+    Import in imports -> ast::Use,
-    ExternCrate in extern_crates -> ast::ExternCrateItem,
+    ExternCrate in extern_crates -> ast::ExternCrate,
-    Function in functions -> ast::FnDef,
+    Function in functions -> ast::Fn,
-    Struct in structs -> ast::StructDef,
+    Struct in structs -> ast::Struct,
-    Union in unions -> ast::UnionDef,
+    Union in unions -> ast::Union,
-    Enum in enums -> ast::EnumDef,
+    Enum in enums -> ast::Enum,
-    Const in consts -> ast::ConstDef,
+    Const in consts -> ast::Const,
-    Static in statics -> ast::StaticDef,
+    Static in statics -> ast::Static,
-    Trait in traits -> ast::TraitDef,
+    Trait in traits -> ast::Trait,
-    Impl in impls -> ast::ImplDef,
+    Impl in impls -> ast::Impl,
-    TypeAlias in type_aliases -> ast::TypeAliasDef,
+    TypeAlias in type_aliases -> ast::TypeAlias,
    Mod in mods -> ast::Module,
    MacroCall in macro_calls -> ast::MacroCall,
 }
@@ -482,7 +482,7 @@ pub struct Import {
    pub is_prelude: bool,
    /// AST ID of the `use` or `extern crate` item this import was derived from. Note that many
    /// `Import`s can map to the same `use` item.
-    pub ast_id: FileAstId<ast::UseItem>,
+    pub ast_id: FileAstId<ast::Use>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -492,7 +492,7 @@ pub struct ExternCrate {
    pub visibility: RawVisibilityId,
    /// Whether this is a `#[macro_use] extern crate ...`.
    pub is_macro_use: bool,
-    pub ast_id: FileAstId<ast::ExternCrateItem>,
+    pub ast_id: FileAstId<ast::ExternCrate>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -503,8 +503,9 @@ pub struct Function {
    pub has_self_param: bool,
    pub is_unsafe: bool,
    pub params: Box<[TypeRef]>,
+    pub is_varargs: bool,
    pub ret_type: TypeRef,
-    pub ast_id: FileAstId<ast::FnDef>,
+    pub ast_id: FileAstId<ast::Fn>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -513,7 +514,7 @@ pub struct Struct {
    pub visibility: RawVisibilityId,
    pub generic_params: GenericParamsId,
    pub fields: Fields,
-    pub ast_id: FileAstId<ast::StructDef>,
+    pub ast_id: FileAstId<ast::Struct>,
    pub kind: StructDefKind,
 }
@@ -533,7 +534,7 @@ pub struct Union {
    pub visibility: RawVisibilityId,
    pub generic_params: GenericParamsId,
    pub fields: Fields,
-    pub ast_id: FileAstId<ast::UnionDef>,
+    pub ast_id: FileAstId<ast::Union>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -542,7 +543,7 @@ pub struct Enum {
    pub visibility: RawVisibilityId,
    pub generic_params: GenericParamsId,
    pub variants: IdRange<Variant>,
-    pub ast_id: FileAstId<ast::EnumDef>,
+    pub ast_id: FileAstId<ast::Enum>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -551,7 +552,7 @@ pub struct Const {
    pub name: Option<Name>,
    pub visibility: RawVisibilityId,
    pub type_ref: TypeRef,
-    pub ast_id: FileAstId<ast::ConstDef>,
+    pub ast_id: FileAstId<ast::Const>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -560,7 +561,7 @@ pub struct Static {
    pub visibility: RawVisibilityId,
    pub mutable: bool,
    pub type_ref: TypeRef,
-    pub ast_id: FileAstId<ast::StaticDef>,
+    pub ast_id: FileAstId<ast::Static>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -570,7 +571,7 @@ pub struct Trait {
    pub generic_params: GenericParamsId,
    pub auto: bool,
    pub items: Box<[AssocItem]>,
-    pub ast_id: FileAstId<ast::TraitDef>,
+    pub ast_id: FileAstId<ast::Trait>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -580,7 +581,7 @@ pub struct Impl {
    pub target_type: TypeRef,
    pub is_negative: bool,
    pub items: Box<[AssocItem]>,
-    pub ast_id: FileAstId<ast::ImplDef>,
+    pub ast_id: FileAstId<ast::Impl>,
 }
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -591,7 +592,7 @@ pub struct TypeAlias {
    pub bounds: Box<[TypeBound]>,
    pub generic_params: GenericParamsId,
    pub type_ref: Option<TypeRef>,
-    pub ast_id: FileAstId<ast::TypeAliasDef>,
+    pub ast_id: FileAstId<ast::TypeAlias>,
 }
 #[derive(Debug, Clone, Eq, PartialEq)]
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs
index 5149dd141..feb31579e 100644
--- a/crates/ra_hir_def/src/item_tree/lower.rs
+++ b/crates/ra_hir_def/src/item_tree/lower.rs
@@ -1,10 +1,7 @@
 //! AST -> `ItemTree` lowering code.
-use super::*;
+use std::{collections::hash_map::Entry, mem, sync::Arc};
-use crate::{
-    attr::Attrs,
-    generics::{GenericParams, TypeParamData, TypeParamProvenance},
-};
 use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, HirFileId};
 use ra_arena::map::ArenaMap;
 use ra_syntax::{
@@ -12,7 +9,13 @@ use ra_syntax::{
    SyntaxNode,
 };
 use smallvec::SmallVec;
-use std::{collections::hash_map::Entry, mem, sync::Arc};
+use crate::{
+    attr::Attrs,
+    generics::{GenericParams, TypeParamData, TypeParamProvenance},
+};
+use super::*;
 fn id<N: ItemTreeNode>(index: Idx<N>) -> FileItemTreeId<N> {
    FileItemTreeId { index, _p: PhantomData }
@@ -70,19 +73,19 @@ impl Ctx {
        self.tree.data_mut()
    }
-    fn lower_mod_item(&mut self, item: &ast::ModuleItem, inner: bool) -> Option<ModItems> {
+    fn lower_mod_item(&mut self, item: &ast::Item, inner: bool) -> Option<ModItems> {
        assert!(inner || self.inner_items.is_empty());
        // Collect inner items for 1-to-1-lowered items.
        match item {
-            ast::ModuleItem::StructDef(_)
+            ast::Item::Struct(_)
-            | ast::ModuleItem::UnionDef(_)
+            | ast::Item::Union(_)
-            | ast::ModuleItem::EnumDef(_)
+            | ast::Item::Enum(_)
-            | ast::ModuleItem::FnDef(_)
+            | ast::Item::Fn(_)
-            | ast::ModuleItem::TypeAliasDef(_)
+            | ast::Item::TypeAlias(_)
-            | ast::ModuleItem::ConstDef(_)
+            | ast::Item::Const(_)
-            | ast::ModuleItem::StaticDef(_)
+            | ast::Item::Static(_)
-            | ast::ModuleItem::MacroCall(_) => {
+            | ast::Item::MacroCall(_) => {
                // Skip this if we're already collecting inner items. We'll descend into all nodes
                // already.
                if !inner {
@@ -92,34 +95,30 @@ impl Ctx {
            // These are handled in their respective `lower_X` method (since we can't just blindly
            // walk them).
-            ast::ModuleItem::TraitDef(_)
+            ast::Item::Trait(_) | ast::Item::Impl(_) | ast::Item::ExternBlock(_) => {}
-            | ast::ModuleItem::ImplDef(_)
-            | ast::ModuleItem::ExternBlock(_) => {}
            // These don't have inner items.
-            ast::ModuleItem::Module(_)
+            ast::Item::Module(_) | ast::Item::ExternCrate(_) | ast::Item::Use(_) => {}
-            | ast::ModuleItem::ExternCrateItem(_)
-            | ast::ModuleItem::UseItem(_) => {}
        };
        let attrs = Attrs::new(item, &self.hygiene);
        let items = match item {
-            ast::ModuleItem::StructDef(ast) => self.lower_struct(ast).map(Into::into),
+            ast::Item::Struct(ast) => self.lower_struct(ast).map(Into::into),
-            ast::ModuleItem::UnionDef(ast) => self.lower_union(ast).map(Into::into),
+            ast::Item::Union(ast) => self.lower_union(ast).map(Into::into),
-            ast::ModuleItem::EnumDef(ast) => self.lower_enum(ast).map(Into::into),
+            ast::Item::Enum(ast) => self.lower_enum(ast).map(Into::into),
-            ast::ModuleItem::FnDef(ast) => self.lower_function(ast).map(Into::into),
+            ast::Item::Fn(ast) => self.lower_function(ast).map(Into::into),
-            ast::ModuleItem::TypeAliasDef(ast) => self.lower_type_alias(ast).map(Into::into),
+            ast::Item::TypeAlias(ast) => self.lower_type_alias(ast).map(Into::into),
-            ast::ModuleItem::StaticDef(ast) => self.lower_static(ast).map(Into::into),
+            ast::Item::Static(ast) => self.lower_static(ast).map(Into::into),
-            ast::ModuleItem::ConstDef(ast) => Some(self.lower_const(ast).into()),
+            ast::Item::Const(ast) => Some(self.lower_const(ast).into()),
-            ast::ModuleItem::Module(ast) => self.lower_module(ast).map(Into::into),
+            ast::Item::Module(ast) => self.lower_module(ast).map(Into::into),
-            ast::ModuleItem::TraitDef(ast) => self.lower_trait(ast).map(Into::into),
+            ast::Item::Trait(ast) => self.lower_trait(ast).map(Into::into),
-            ast::ModuleItem::ImplDef(ast) => self.lower_impl(ast).map(Into::into),
+            ast::Item::Impl(ast) => self.lower_impl(ast).map(Into::into),
-            ast::ModuleItem::UseItem(ast) => Some(ModItems(
+            ast::Item::Use(ast) => Some(ModItems(
                self.lower_use(ast).into_iter().map(Into::into).collect::<SmallVec<_>>(),
            )),
-            ast::ModuleItem::ExternCrateItem(ast) => self.lower_extern_crate(ast).map(Into::into),
+            ast::Item::ExternCrate(ast) => self.lower_extern_crate(ast).map(Into::into),
-            ast::ModuleItem::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into),
+            ast::Item::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into),
-            ast::ModuleItem::ExternBlock(ast) => {
+            ast::Item::ExternBlock(ast) => {
                Some(ModItems(self.lower_extern_block(ast).into_iter().collect::<SmallVec<_>>()))
            }
        };
@@ -147,27 +146,26 @@ impl Ctx {
    fn collect_inner_items(&mut self, container: &SyntaxNode) {
        let forced_vis = self.forced_visibility.take();
        let mut inner_items = mem::take(&mut self.tree.inner_items);
-        inner_items.extend(
+        inner_items.extend(container.descendants().skip(1).filter_map(ast::Item::cast).filter_map(
-            container.descendants().skip(1).filter_map(ast::ModuleItem::cast).filter_map(|item| {
+            |item| {
                let ast_id = self.source_ast_id_map.ast_id(&item);
                Some((ast_id, self.lower_mod_item(&item, true)?.0))
-            }),
+            },
-        );
+        ));
        self.tree.inner_items = inner_items;
        self.forced_visibility = forced_vis;
    }
-    fn lower_assoc_item(&mut self, item: &ast::ModuleItem) -> Option<AssocItem> {
+    fn lower_assoc_item(&mut self, item: &ast::AssocItem) -> Option<AssocItem> {
        match item {
-            ast::ModuleItem::FnDef(ast) => self.lower_function(ast).map(Into::into),
+            ast::AssocItem::Fn(ast) => self.lower_function(ast).map(Into::into),
-            ast::ModuleItem::TypeAliasDef(ast) => self.lower_type_alias(ast).map(Into::into),
+            ast::AssocItem::TypeAlias(ast) => self.lower_type_alias(ast).map(Into::into),
-            ast::ModuleItem::ConstDef(ast) => Some(self.lower_const(ast).into()),
+            ast::AssocItem::Const(ast) => Some(self.lower_const(ast).into()),
-            ast::ModuleItem::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into),
+            ast::AssocItem::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into),
-            _ => None,
        }
    }
-    fn lower_struct(&mut self, strukt: &ast::StructDef) -> Option<FileItemTreeId<Struct>> {
+    fn lower_struct(&mut self, strukt: &ast::Struct) -> Option<FileItemTreeId<Struct>> {
        let visibility = self.lower_visibility(strukt);
        let name = strukt.name()?.as_name();
        let generic_params = self.lower_generic_params(GenericsOwner::Struct, strukt);
@@ -196,7 +194,7 @@ impl Ctx {
        }
    }
-    fn lower_record_fields(&mut self, fields: &ast::RecordFieldDefList) -> IdRange<Field> {
+    fn lower_record_fields(&mut self, fields: &ast::RecordFieldList) -> IdRange<Field> {
        let start = self.next_field_idx();
        for field in fields.fields() {
            if let Some(data) = self.lower_record_field(&field) {
@@ -208,42 +206,39 @@ impl Ctx {
        IdRange::new(start..end)
    }
-    fn lower_record_field(&mut self, field: &ast::RecordFieldDef) -> Option<Field> {
+    fn lower_record_field(&mut self, field: &ast::RecordField) -> Option<Field> {
        let name = field.name()?.as_name();
        let visibility = self.lower_visibility(field);
-        let type_ref = self.lower_type_ref(&field.ascribed_type()?);
+        let type_ref = self.lower_type_ref_opt(field.ty());
        let res = Field { name, type_ref, visibility };
        Some(res)
    }
-    fn lower_tuple_fields(&mut self, fields: &ast::TupleFieldDefList) -> IdRange<Field> {
+    fn lower_tuple_fields(&mut self, fields: &ast::TupleFieldList) -> IdRange<Field> {
        let start = self.next_field_idx();
        for (i, field) in fields.fields().enumerate() {
-            if let Some(data) = self.lower_tuple_field(i, &field) {
+            let data = self.lower_tuple_field(i, &field);
-                let idx = self.data().fields.alloc(data);
+            let idx = self.data().fields.alloc(data);
-                self.add_attrs(idx.into(), Attrs::new(&field, &self.hygiene));
+            self.add_attrs(idx.into(), Attrs::new(&field, &self.hygiene));
-            }
        }
        let end = self.next_field_idx();
        IdRange::new(start..end)
    }
-    fn lower_tuple_field(&mut self, idx: usize, field: &ast::TupleFieldDef) -> Option<Field> {
+    fn lower_tuple_field(&mut self, idx: usize, field: &ast::TupleField) -> Field {
        let name = Name::new_tuple_field(idx);
        let visibility = self.lower_visibility(field);
-        let type_ref = self.lower_type_ref(&field.type_ref()?);
+        let type_ref = self.lower_type_ref_opt(field.ty());
        let res = Field { name, type_ref, visibility };
-        Some(res)
+        res
    }
-    fn lower_union(&mut self, union: &ast::UnionDef) -> Option<FileItemTreeId<Union>> {
+    fn lower_union(&mut self, union: &ast::Union) -> Option<FileItemTreeId<Union>> {
        let visibility = self.lower_visibility(union);
        let name = union.name()?.as_name();
        let generic_params = self.lower_generic_params(GenericsOwner::Union, union);
-        let fields = match union.record_field_def_list() {
+        let fields = match union.record_field_list() {
-            Some(record_field_def_list) => {
+            Some(record_field_list) => self.lower_fields(&StructKind::Record(record_field_list)),
-                self.lower_fields(&StructKind::Record(record_field_def_list))
-            }
            None => Fields::Record(IdRange::new(self.next_field_idx()..self.next_field_idx())),
        };
        let ast_id = self.source_ast_id_map.ast_id(union);
@@ -251,7 +246,7 @@ impl Ctx {
        Some(id(self.data().unions.alloc(res)))
    }
-    fn lower_enum(&mut self, enum_: &ast::EnumDef) -> Option<FileItemTreeId<Enum>> {
+    fn lower_enum(&mut self, enum_: &ast::Enum) -> Option<FileItemTreeId<Enum>> {
        let visibility = self.lower_visibility(enum_);
        let name = enum_.name()?.as_name();
        let generic_params = self.lower_generic_params(GenericsOwner::Enum, enum_);
@@ -264,7 +259,7 @@ impl Ctx {
        Some(id(self.data().enums.alloc(res)))
    }
-    fn lower_variants(&mut self, variants: &ast::EnumVariantList) -> IdRange<Variant> {
+    fn lower_variants(&mut self, variants: &ast::VariantList) -> IdRange<Variant> {
        let start = self.next_variant_idx();
        for variant in variants.variants() {
            if let Some(data) = self.lower_variant(&variant) {
@@ -276,14 +271,14 @@ impl Ctx {
        IdRange::new(start..end)
    }
-    fn lower_variant(&mut self, variant: &ast::EnumVariant) -> Option<Variant> {
+    fn lower_variant(&mut self, variant: &ast::Variant) -> Option<Variant> {
        let name = variant.name()?.as_name();
        let fields = self.lower_fields(&variant.kind());
        let res = Variant { name, fields };
        Some(res)
    }
-    fn lower_function(&mut self, func: &ast::FnDef) -> Option<FileItemTreeId<Function>> {
+    fn lower_function(&mut self, func: &ast::Fn) -> Option<FileItemTreeId<Function>> {
        let visibility = self.lower_visibility(func);
        let name = func.name()?.as_name();
@@ -291,7 +286,7 @@ impl Ctx {
        let mut has_self_param = false;
        if let Some(param_list) = func.param_list() {
            if let Some(self_param) = param_list.self_param() {
-                let self_type = match self_param.ascribed_type() {
+                let self_type = match self_param.ty() {
                    Some(type_ref) => TypeRef::from_ast(&self.body_ctx, type_ref),
                    None => {
                        let self_type = TypeRef::Path(name![Self].into());
@@ -310,11 +305,19 @@ impl Ctx {
                has_self_param = true;
            }
            for param in param_list.params() {
-                let type_ref = TypeRef::from_ast_opt(&self.body_ctx, param.ascribed_type());
+                let type_ref = TypeRef::from_ast_opt(&self.body_ctx, param.ty());
                params.push(type_ref);
            }
        }
-        let ret_type = match func.ret_type().and_then(|rt| rt.type_ref()) {
+        let mut is_varargs = false;
+        if let Some(params) = func.param_list() {
+            if let Some(last) = params.params().last() {
+                is_varargs = last.dotdotdot_token().is_some();
+            }
+        }
+        let ret_type = match func.ret_type().and_then(|rt| rt.ty()) {
            Some(type_ref) => TypeRef::from_ast(&self.body_ctx, type_ref),
            _ => TypeRef::unit(),
        };
@@ -335,6 +338,7 @@ impl Ctx {
            has_self_param,
            is_unsafe: func.unsafe_token().is_some(),
            params: params.into_boxed_slice(),
+            is_varargs,
            ret_type,
            ast_id,
        };
@@ -345,10 +349,10 @@ impl Ctx {
    fn lower_type_alias(
        &mut self,
-        type_alias: &ast::TypeAliasDef,
+        type_alias: &ast::TypeAlias,
    ) -> Option<FileItemTreeId<TypeAlias>> {
        let name = type_alias.name()?.as_name();
-        let type_ref = type_alias.type_ref().map(|it| self.lower_type_ref(&it));
+        let type_ref = type_alias.ty().map(|it| self.lower_type_ref(&it));
        let visibility = self.lower_visibility(type_alias);
        let bounds = self.lower_type_bounds(type_alias);
        let generic_params = self.lower_generic_params(GenericsOwner::TypeAlias, type_alias);
@@ -364,9 +368,9 @@ impl Ctx {
        Some(id(self.data().type_aliases.alloc(res)))
    }
-    fn lower_static(&mut self, static_: &ast::StaticDef) -> Option<FileItemTreeId<Static>> {
+    fn lower_static(&mut self, static_: &ast::Static) -> Option<FileItemTreeId<Static>> {
        let name = static_.name()?.as_name();
-        let type_ref = self.lower_type_ref_opt(static_.ascribed_type());
+        let type_ref = self.lower_type_ref_opt(static_.ty());
        let visibility = self.lower_visibility(static_);
        let mutable = static_.mut_token().is_some();
        let ast_id = self.source_ast_id_map.ast_id(static_);
@@ -374,9 +378,9 @@ impl Ctx {
        Some(id(self.data().statics.alloc(res)))
    }
-    fn lower_const(&mut self, konst: &ast::ConstDef) -> FileItemTreeId<Const> {
+    fn lower_const(&mut self, konst: &ast::Const) -> FileItemTreeId<Const> {
        let name = konst.name().map(|it| it.as_name());
-        let type_ref = self.lower_type_ref_opt(konst.ascribed_type());
+        let type_ref = self.lower_type_ref_opt(konst.ty());
        let visibility = self.lower_visibility(konst);
        let ast_id = self.source_ast_id_map.ast_id(konst);
        let res = Const { name, visibility, type_ref, ast_id };
@@ -409,15 +413,15 @@ impl Ctx {
        Some(id(self.data().mods.alloc(res)))
    }
-    fn lower_trait(&mut self, trait_def: &ast::TraitDef) -> Option<FileItemTreeId<Trait>> {
+    fn lower_trait(&mut self, trait_def: &ast::Trait) -> Option<FileItemTreeId<Trait>> {
        let name = trait_def.name()?.as_name();
        let visibility = self.lower_visibility(trait_def);
        let generic_params =
            self.lower_generic_params_and_inner_items(GenericsOwner::Trait(trait_def), trait_def);
        let auto = trait_def.auto_token().is_some();
-        let items = trait_def.item_list().map(|list| {
+        let items = trait_def.assoc_item_list().map(|list| {
            self.with_inherited_visibility(visibility, |this| {
-                list.items()
+                list.assoc_items()
                    .filter_map(|item| {
                        let attrs = Attrs::new(&item, &this.hygiene);
                        this.collect_inner_items(item.syntax());
@@ -441,7 +445,7 @@ impl Ctx {
        Some(id(self.data().traits.alloc(res)))
    }
-    fn lower_impl(&mut self, impl_def: &ast::ImplDef) -> Option<FileItemTreeId<Impl>> {
+    fn lower_impl(&mut self, impl_def: &ast::Impl) -> Option<FileItemTreeId<Impl>> {
        let generic_params =
            self.lower_generic_params_and_inner_items(GenericsOwner::Impl, impl_def);
        let target_trait = impl_def.target_trait().map(|tr| self.lower_type_ref(&tr));
@@ -450,8 +454,9 @@ impl Ctx {
        // We cannot use `assoc_items()` here as that does not include macro calls.
        let items = impl_def
-            .item_list()?
+            .assoc_item_list()
-            .items()
+            .into_iter()
+            .flat_map(|it| it.assoc_items())
            .filter_map(|item| {
                self.collect_inner_items(item.syntax());
                let assoc = self.lower_assoc_item(&item)?;
@@ -465,7 +470,7 @@ impl Ctx {
        Some(id(self.data().impls.alloc(res)))
    }
-    fn lower_use(&mut self, use_item: &ast::UseItem) -> Vec<FileItemTreeId<Import>> {
+    fn lower_use(&mut self, use_item: &ast::Use) -> Vec<FileItemTreeId<Import>> {
        // FIXME: cfg_attr
        let is_prelude = use_item.has_atom_attr("prelude_import");
        let visibility = self.lower_visibility(use_item);
@@ -494,10 +499,10 @@ impl Ctx {
    fn lower_extern_crate(
        &mut self,
-        extern_crate: &ast::ExternCrateItem,
+        extern_crate: &ast::ExternCrate,
    ) -> Option<FileItemTreeId<ExternCrate>> {
        let path = ModPath::from_name_ref(&extern_crate.name_ref()?);
-        let alias = extern_crate.alias().map(|a| {
+        let alias = extern_crate.rename().map(|a| {
            a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias)
        });
        let visibility = self.lower_visibility(extern_crate);
@@ -543,14 +548,16 @@ impl Ctx {
                    self.collect_inner_items(item.syntax());
                    let attrs = Attrs::new(&item, &self.hygiene);
                    let id: ModItem = match item {
-                        ast::ExternItem::FnDef(ast) => {
+                        ast::ExternItem::Fn(ast) => {
                            let func = self.lower_function(&ast)?;
+                            self.data().functions[func.index].is_unsafe = true;
                            func.into()
                        }
-                        ast::ExternItem::StaticDef(ast) => {
+                        ast::ExternItem::Static(ast) => {
                            let statik = self.lower_static(&ast)?;
                            statik.into()
                        }
+                        ast::ExternItem::MacroCall(_) => return None,
                    };
                    self.add_attrs(id.into(), attrs);
                    Some(id)
@@ -563,10 +570,10 @@ impl Ctx {
    fn lower_generic_params_and_inner_items(
        &mut self,
        owner: GenericsOwner<'_>,
-        node: &impl ast::TypeParamsOwner,
+        node: &impl ast::GenericParamsOwner,
    ) -> GenericParamsId {
        // Generics are part of item headers and may contain inner items we need to collect.
-        if let Some(params) = node.type_param_list() {
+        if let Some(params) = node.generic_param_list() {
            self.collect_inner_items(params.syntax());
        }
        if let Some(clause) = node.where_clause() {
@@ -579,7 +586,7 @@ impl Ctx {
    fn lower_generic_params(
        &mut self,
        owner: GenericsOwner<'_>,
-        node: &impl ast::TypeParamsOwner,
+        node: &impl ast::GenericParamsOwner,
    ) -> GenericParamsId {
        let mut sm = &mut ArenaMap::default();
        let mut generics = GenericParams::default();
@@ -692,7 +699,7 @@ enum GenericsOwner<'a> {
    Enum,
    Union,
    /// The `TraitDef` is needed to fill the source map for the implicit `Self` parameter.
-    Trait(&'a ast::TraitDef),
+    Trait(&'a ast::Trait),
    TypeAlias,
    Impl,
 }
diff --git a/crates/ra_hir_def/src/item_tree/tests.rs b/crates/ra_hir_def/src/item_tree/tests.rs
index 08559fb92..a81497fa8 100644
--- a/crates/ra_hir_def/src/item_tree/tests.rs
+++ b/crates/ra_hir_def/src/item_tree/tests.rs
@@ -1,13 +1,15 @@
-use super::{ItemTree, ModItem, ModKind};
+use expect::{expect, Expect};
-use crate::{db::DefDatabase, test_db::TestDB};
 use hir_expand::{db::AstDatabase, HirFileId, InFile};
-use insta::assert_snapshot;
 use ra_db::fixture::WithFixture;
 use ra_syntax::{ast, AstNode};
 use rustc_hash::FxHashSet;
 use std::sync::Arc;
 use stdx::format_to;
+use crate::{db::DefDatabase, test_db::TestDB};
+use super::{ItemTree, ModItem, ModKind};
 fn test_inner_items(ra_fixture: &str) {
    let (db, file_id) = TestDB::with_single_file(ra_fixture);
    let file_id = HirFileId::from(file_id);
@@ -19,7 +21,7 @@ fn test_inner_items(ra_fixture: &str) {
    let mut outer_items = FxHashSet::default();
    let mut worklist = tree.top_level_items().to_vec();
    while let Some(item) = worklist.pop() {
-        let node: ast::ModuleItem = match item {
+        let node: ast::Item = match item {
            ModItem::Import(it) => tree.source(&db, InFile::new(file_id, it)).into(),
            ModItem::ExternCrate(it) => tree.source(&db, InFile::new(file_id, it)).into(),
            ModItem::Function(it) => tree.source(&db, InFile::new(file_id, it)).into(),
@@ -51,7 +53,7 @@ fn test_inner_items(ra_fixture: &str) {
    // Now descend the root node and check that all `ast::ModuleItem`s are either recorded above, or
    // registered as inner items.
-    for item in root.descendants().skip(1).filter_map(ast::ModuleItem::cast) {
+    for item in root.descendants().skip(1).filter_map(ast::Item::cast) {
        if outer_items.contains(&item) {
            continue;
        }
@@ -162,9 +164,15 @@ fn fmt_mod_item(out: &mut String, tree: &ItemTree, item: ModItem) {
    }
 }
+fn check(ra_fixture: &str, expect: Expect) {
+    let actual = print_item_tree(ra_fixture);
+    expect.assert_eq(&actual);
+}
 #[test]
 fn smoke() {
-    assert_snapshot!(print_item_tree(r"
+    check(
+        r"
        #![attr]
        #[attr_on_use]
@@ -214,42 +222,44 @@ fn smoke() {
            #[union_fld]
            fld: u16,
        }
-    "), @r###"
+    ",
-inner attrs: Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr"))] }, input: None }]) }
+        expect![[r##"
+            inner attrs: Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr"))] }, input: None }]) }
-top-level items:
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
+            top-level items:
-Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::UseItem>(0) }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
+            Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Use>(0) }
-Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::UseItem>(0) }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("ext_crate"))] }, input: None }]) }]
+            Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Use>(0) }
-ExternCrate { path: ModPath { kind: Plain, segments: [Name(Text("krate"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::ExternCrateItem>(1) }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("ext_crate"))] }, input: None }]) }]
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_trait"))] }, input: None }]) }]
+            ExternCrate { path: ModPath { kind: Plain, segments: [Name(Text("krate"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::ExternCrate>(1) }
-Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [TypeAlias(Idx::<TypeAlias>(0)), Const(Idx::<Const>(0)), Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::TraitDef>(2) }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_trait"))] }, input: None }]) }]
-> #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_ty"))] }, input: None }]) }]
+            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [TypeAlias(Idx::<TypeAlias>(0)), Const(Idx::<Const>(0)), Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Trait>(2) }
-> TypeAlias { name: Name(Text("AssocTy")), visibility: RawVisibilityId("pub(self)"), bounds: [Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Tr"))] }, generic_args: [Some(GenericArgs { args: [Type(Tuple([]))], has_self_type: false, bindings: [] })] })], generic_params: GenericParamsId(4294967295), type_ref: None, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::TypeAliasDef>(8) }
+            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_ty"))] }, input: None }]) }]
-> #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_const"))] }, input: None }]) }]
+            > TypeAlias { name: Name(Text("AssocTy")), visibility: RawVisibilityId("pub(self)"), bounds: [Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Tr"))] }, generic_args: [Some(GenericArgs { args: [Type(Tuple([]))], has_self_type: false, bindings: [] })] })], generic_params: GenericParamsId(4294967295), type_ref: None, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::TypeAlias>(8) }
-> Const { name: Some(Name(Text("CONST"))), visibility: RawVisibilityId("pub(self)"), type_ref: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("u8"))] }, generic_args: [None] }), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::ConstDef>(9) }
+            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_const"))] }, input: None }]) }]
-> #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_method"))] }, input: None }]) }]
+            > Const { name: Some(Name(Text("CONST"))), visibility: RawVisibilityId("pub(self)"), type_ref: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("u8"))] }, generic_args: [None] }), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Const>(9) }
-> Function { name: Name(Text("method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Shared)], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(10) }
+            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_method"))] }, input: None }]) }]
-> #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_dfl_method"))] }, input: None }]) }]
+            > Function { name: Name(Text("method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Shared)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(10) }
-> Function { name: Name(Text("dfl_method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Mut)], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(11) }
+            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_dfl_method"))] }, input: None }]) }]
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct0"))] }, input: None }]) }]
+            > Function { name: Name(Text("dfl_method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Mut)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(11) }
-Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::StructDef>(3), kind: Unit }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct0"))] }, input: None }]) }]
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct1"))] }, input: None }]) }]
+            Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Struct>(3), kind: Unit }
-Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::<ra_hir_def::item_tree::Field>(0..1)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::StructDef>(4), kind: Tuple }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct1"))] }, input: None }]) }]
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct2"))] }, input: None }]) }]
+            Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::<ra_hir_def::item_tree::Field>(0..1)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Struct>(4), kind: Tuple }
-Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(1..2)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::StructDef>(5), kind: Record }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct2"))] }, input: None }]) }]
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("en"))] }, input: None }]) }]
+            Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(1..2)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Struct>(5), kind: Record }
-Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::<ra_hir_def::item_tree::Variant>(0..1), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::EnumDef>(6) }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("en"))] }, input: None }]) }]
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("un"))] }, input: None }]) }]
+            Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::<ra_hir_def::item_tree::Variant>(0..1), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Enum>(6) }
-Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(3..4)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::UnionDef>(7) }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("un"))] }, input: None }]) }]
-    "###);
+            Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(3..4)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Union>(7) }
+        "##]],
+    );
 }
 #[test]
 fn simple_inner_items() {
-    let tree = print_item_tree(
+    check(
        r"
        impl<T:A> D for Response<T> {
            fn foo() {
@@ -260,26 +270,25 @@ fn simple_inner_items() {
            }
        }
    ",
-    );
+        expect![[r#"
+            inner attrs: Attrs { entries: None }
-    assert_snapshot!(tree, @r###"
+            top-level items:
-inner attrs: Attrs { entries: None }
+            Impl { generic_params: GenericParamsId(0), target_trait: Some(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("D"))] }, generic_args: [None] })), target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Response"))] }, generic_args: [Some(GenericArgs { args: [Type(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("T"))] }, generic_args: [None] }))], has_self_type: false, bindings: [] })] }), is_negative: false, items: [Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Impl>(0) }
+            > Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
-top-level items:
+            inner items:
-Impl { generic_params: GenericParamsId(0), target_trait: Some(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("D"))] }, generic_args: [None] })), target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Response"))] }, generic_args: [Some(GenericArgs { args: [Type(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("T"))] }, generic_args: [None] }))], has_self_type: false, bindings: [] })] }), is_negative: false, items: [Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::ImplDef>(0) }
-> Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(1) }
-inner items:
+            for AST FileAstId::<ra_syntax::ast::generated::nodes::Item>(2):
+            Function { name: Name(Text("end")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(2) }
-for AST FileAstId::<ra_syntax::ast::generated::nodes::ModuleItem>(2):
+        "#]],
-Function { name: Name(Text("end")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(2) }
+    );
-    "###);
 }
 #[test]
 fn extern_attrs() {
-    let tree = print_item_tree(
+    check(
        r#"
        #[block_attr]
        extern "C" {
@@ -289,22 +298,21 @@ fn extern_attrs() {
            fn b() {}
        }
    "#,
+        expect![[r##"
+            inner attrs: Attrs { entries: None }
+            top-level items:
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
+            Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
+            Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(2) }
+        "##]],
    );
-    assert_snapshot!(tree, @r###"
-inner attrs: Attrs { entries: None }
-top-level items:
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
-Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(1) }
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
-Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(2) }
-    "###);
 }
 #[test]
 fn trait_attrs() {
-    let tree = print_item_tree(
+    check(
        r#"
        #[trait_attr]
        trait Tr {
@@ -314,24 +322,23 @@ fn trait_attrs() {
            fn b() {}
        }
    "#,
+        expect![[r##"
+            inner attrs: Attrs { entries: None }
+            top-level items:
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("trait_attr"))] }, input: None }]) }]
+            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Trait>(0) }
+            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
+            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
+            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
+            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(2) }
+        "##]],
    );
-    assert_snapshot!(tree, @r###"
-inner attrs: Attrs { entries: None }
-top-level items:
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("trait_attr"))] }, input: None }]) }]
-Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::TraitDef>(0) }
-> #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
-> Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(1) }
-> #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
-> Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(2) }
-    "###);
 }
 #[test]
 fn impl_attrs() {
-    let tree = print_item_tree(
+    check(
        r#"
        #[impl_attr]
        impl Ty {
@@ -341,19 +348,18 @@ fn impl_attrs() {
            fn b() {}
        }
    "#,
+        expect![[r##"
+            inner attrs: Attrs { entries: None }
+            top-level items:
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("impl_attr"))] }, input: None }]) }]
+            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Ty"))] }, generic_args: [None] }), is_negative: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Impl>(0) }
+            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
+            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
+            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
+            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(2) }
+        "##]],
    );
-    assert_snapshot!(tree, @r###"
-inner attrs: Attrs { entries: None }
-top-level items:
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("impl_attr"))] }, input: None }]) }]
-Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Ty"))] }, generic_args: [None] }), is_negative: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::ImplDef>(0) }
-> #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
-> Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(1) }
-> #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
-> Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(2) }
-    "###);
 }
 #[test]
@@ -391,45 +397,43 @@ fn cursed_inner_items() {
 #[test]
 fn inner_item_attrs() {
-    let tree = print_item_tree(
+    check(
        r"
        fn foo() {
            #[on_inner]
            fn inner() {}
        }
    ",
-    );
+        expect![[r##"
+            inner attrs: Attrs { entries: None }
-    assert_snapshot!(tree, @r###"
-inner attrs: Attrs { entries: None }
-top-level items:
+            top-level items:
-Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(0) }
+            Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(0) }
-inner items:
+            inner items:
-for AST FileAstId::<ra_syntax::ast::generated::nodes::ModuleItem>(1):
+            for AST FileAstId::<ra_syntax::ast::generated::nodes::Item>(1):
-#[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_inner"))] }, input: None }]) }]
+            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_inner"))] }, input: None }]) }]
-Function { name: Name(Text("inner")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::FnDef>(1) }
+            Function { name: Name(Text("inner")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
-    "###);
+        "##]],
+    );
 }
 #[test]
 fn assoc_item_macros() {
-    let tree = print_item_tree(
+    check(
        r"
        impl S {
            items!();
        }
    ",
-    );
+        expect![[r#"
+            inner attrs: Attrs { entries: None }
-    assert_snapshot!(tree, @r###"
-inner attrs: Attrs { entries: None }
-top-level items:
+            top-level items:
-Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("S"))] }, generic_args: [None] }), is_negative: false, items: [MacroCall(Idx::<MacroCall>(0))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::ImplDef>(0) }
+            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("S"))] }, generic_args: [None] }), is_negative: false, items: [MacroCall(Idx::<MacroCall>(0))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Impl>(0) }
-> MacroCall { name: None, path: ModPath { kind: Plain, segments: [Name(Text("items"))] }, is_export: false, is_local_inner: false, is_builtin: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::MacroCall>(1) }
+            > MacroCall { name: None, path: ModPath { kind: Plain, segments: [Name(Text("items"))] }, is_export: false, is_local_inner: false, is_builtin: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::MacroCall>(1) }
-    "###);
+        "#]],
+    );
 }
diff --git a/crates/ra_hir_def/src/keys.rs b/crates/ra_hir_def/src/keys.rs
index a7349a21d..441bdbead 100644
--- a/crates/ra_hir_def/src/keys.rs
+++ b/crates/ra_hir_def/src/keys.rs
@@ -14,19 +14,19 @@ use crate::{
 pub type Key<K, V> = crate::dyn_map::Key<InFile<K>, V, AstPtrPolicy<K, V>>;
-pub const FUNCTION: Key<ast::FnDef, FunctionId> = Key::new();
+pub const FUNCTION: Key<ast::Fn, FunctionId> = Key::new();
-pub const CONST: Key<ast::ConstDef, ConstId> = Key::new();
+pub const CONST: Key<ast::Const, ConstId> = Key::new();
-pub const STATIC: Key<ast::StaticDef, StaticId> = Key::new();
+pub const STATIC: Key<ast::Static, StaticId> = Key::new();
-pub const TYPE_ALIAS: Key<ast::TypeAliasDef, TypeAliasId> = Key::new();
+pub const TYPE_ALIAS: Key<ast::TypeAlias, TypeAliasId> = Key::new();
-pub const IMPL: Key<ast::ImplDef, ImplId> = Key::new();
+pub const IMPL: Key<ast::Impl, ImplId> = Key::new();
-pub const TRAIT: Key<ast::TraitDef, TraitId> = Key::new();
+pub const TRAIT: Key<ast::Trait, TraitId> = Key::new();
-pub const STRUCT: Key<ast::StructDef, StructId> = Key::new();
+pub const STRUCT: Key<ast::Struct, StructId> = Key::new();
-pub const UNION: Key<ast::UnionDef, UnionId> = Key::new();
+pub const UNION: Key<ast::Union, UnionId> = Key::new();
-pub const ENUM: Key<ast::EnumDef, EnumId> = Key::new();
+pub const ENUM: Key<ast::Enum, EnumId> = Key::new();
-pub const ENUM_VARIANT: Key<ast::EnumVariant, EnumVariantId> = Key::new();
+pub const VARIANT: Key<ast::Variant, EnumVariantId> = Key::new();
-pub const TUPLE_FIELD: Key<ast::TupleFieldDef, FieldId> = Key::new();
+pub const TUPLE_FIELD: Key<ast::TupleField, FieldId> = Key::new();
-pub const RECORD_FIELD: Key<ast::RecordFieldDef, FieldId> = Key::new();
+pub const RECORD_FIELD: Key<ast::RecordField, FieldId> = Key::new();
 pub const TYPE_PARAM: Key<ast::TypeParam, TypeParamId> = Key::new();
 pub const MACRO: Key<ast::MacroCall, MacroDefId> = Key::new();
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index 564434ccc..237b1038a 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -65,6 +65,7 @@ use item_tree::{
    Const, Enum, Function, Impl, ItemTreeId, ItemTreeNode, ModItem, Static, Struct, Trait,
    TypeAlias, Union,
 };
+use stdx::impl_from;
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct ModuleId {
@@ -158,17 +159,17 @@ pub struct FunctionId(salsa::InternId);
 type FunctionLoc = AssocItemLoc<Function>;
 impl_intern!(FunctionId, FunctionLoc, intern_function, lookup_intern_function);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct StructId(salsa::InternId);
 type StructLoc = ItemLoc<Struct>;
 impl_intern!(StructId, StructLoc, intern_struct, lookup_intern_struct);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct UnionId(salsa::InternId);
 pub type UnionLoc = ItemLoc<Union>;
 impl_intern!(UnionId, UnionLoc, intern_union, lookup_intern_union);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct EnumId(salsa::InternId);
 pub type EnumLoc = ItemLoc<Enum>;
 impl_intern!(EnumId, EnumLoc, intern_enum, lookup_intern_enum);
@@ -223,25 +224,6 @@ pub struct TypeParamId {
 pub type LocalTypeParamId = Idx<generics::TypeParamData>;
-macro_rules! impl_froms {
-    ($e:ident: $($v:ident $(($($sv:ident),*))?),*) => {
-        $(
-            impl From<$v> for $e {
-                fn from(it: $v) -> $e {
-                    $e::$v(it)
-                }
-            }
-            $($(
-                impl From<$sv> for $e {
-                    fn from(it: $sv) -> $e {
-                        $e::$v($v::$sv(it))
-                    }
-                }
-            )*)?
-        )*
-    }
-}
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ContainerId {
    ModuleId(ModuleId),
@@ -254,16 +236,16 @@ pub enum AssocContainerId {
    ImplId(ImplId),
    TraitId(TraitId),
 }
-impl_froms!(AssocContainerId: ContainerId);
+impl_from!(ContainerId for AssocContainerId);
 /// A Data Type
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub enum AdtId {
    StructId(StructId),
    UnionId(UnionId),
    EnumId(EnumId),
 }
-impl_froms!(AdtId: StructId, UnionId, EnumId);
+impl_from!(StructId, UnionId, EnumId for AdtId);
 /// The defs which can be visible in the module.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -279,8 +261,8 @@ pub enum ModuleDefId {
    TypeAliasId(TypeAliasId),
    BuiltinType(BuiltinType),
 }
-impl_froms!(
+impl_from!(
-    ModuleDefId: ModuleId,
+    ModuleId,
    FunctionId,
    AdtId(StructId, EnumId, UnionId),
    EnumVariantId,
@@ -289,6 +271,7 @@ impl_froms!(
    TraitId,
    TypeAliasId,
    BuiltinType
+    for ModuleDefId
 );
 /// The defs which have a body.
@@ -299,7 +282,7 @@ pub enum DefWithBodyId {
    ConstId(ConstId),
 }
-impl_froms!(DefWithBodyId: FunctionId, ConstId, StaticId);
+impl_from!(FunctionId, ConstId, StaticId for DefWithBodyId);
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum AssocItemId {
@@ -311,7 +294,7 @@ pub enum AssocItemId {
 // sure that you can only turn actual assoc items into AssocItemIds. This would
 // require not implementing From, and instead having some checked way of
 // casting them, and somehow making the constructors private, which would be annoying.
-impl_froms!(AssocItemId: FunctionId, ConstId, TypeAliasId);
+impl_from!(FunctionId, ConstId, TypeAliasId for AssocItemId);
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 pub enum GenericDefId {
@@ -326,14 +309,15 @@ pub enum GenericDefId {
    // consts can have type parameters from their parents (i.e. associated consts of traits)
    ConstId(ConstId),
 }
-impl_froms!(
+impl_from!(
-    GenericDefId: FunctionId,
+    FunctionId,
    AdtId(StructId, EnumId, UnionId),
    TraitId,
    TypeAliasId,
    ImplId,
    EnumVariantId,
    ConstId
+    for GenericDefId
 );
 impl From<AssocItemId> for GenericDefId {
@@ -361,8 +345,8 @@ pub enum AttrDefId {
    ImplId(ImplId),
 }
-impl_froms!(
+impl_from!(
-    AttrDefId: ModuleId,
+    ModuleId,
    FieldId,
    AdtId(StructId, EnumId, UnionId),
    EnumVariantId,
@@ -373,6 +357,7 @@ impl_froms!(
    TypeAliasId,
    MacroDefId,
    ImplId
+    for AttrDefId
 );
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -381,7 +366,7 @@ pub enum VariantId {
    StructId(StructId),
    UnionId(UnionId),
 }
-impl_froms!(VariantId: EnumVariantId, StructId, UnionId);
+impl_from!(EnumVariantId, StructId, UnionId for VariantId);
 trait Intern {
    type ID;
@@ -536,7 +521,7 @@ impl AsMacroCall for AstIdWithPath<ast::MacroCall> {
    }
 }
-impl AsMacroCall for AstIdWithPath<ast::ModuleItem> {
+impl AsMacroCall for AstIdWithPath<ast::Item> {
    fn as_call_id(
        &self,
        db: &dyn db::DefDatabase,
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
index b279bdeef..3d9b55a73 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/ra_hir_def/src/nameres.rs
@@ -229,37 +229,37 @@ impl CrateDefMap {
    // even), as this should be a great debugging aid.
    pub fn dump(&self) -> String {
        let mut buf = String::new();
-        go(&mut buf, self, "\ncrate", self.root);
+        go(&mut buf, self, "crate", self.root);
-        return buf.trim().to_string();
+        return buf;
        fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: LocalModuleId) {
-            *buf += path;
+            format_to!(buf, "{}\n", path);
-            *buf += "\n";
            let mut entries: Vec<_> = map.modules[module].scope.resolutions().collect();
            entries.sort_by_key(|(name, _)| name.clone());
            for (name, def) in entries {
-                format_to!(buf, "{}:", name);
+                format_to!(buf, "{}:", name.map_or("_".to_string(), |name| name.to_string()));
                if def.types.is_some() {
-                    *buf += " t";
+                    buf.push_str(" t");
                }
                if def.values.is_some() {
-                    *buf += " v";
+                    buf.push_str(" v");
                }
                if def.macros.is_some() {
-                    *buf += " m";
+                    buf.push_str(" m");
                }
                if def.is_none() {
-                    *buf += " _";
+                    buf.push_str(" _");
                }
-                *buf += "\n";
+                buf.push_str("\n");
            }
            for (name, child) in map.modules[module].children.iter() {
-                let path = &format!("{}::{}", path, name);
+                let path = format!("{}::{}", path, name);
+                buf.push('\n');
                go(buf, map, &path, *child);
            }
        }
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index a35ac1024..28b7a20c5 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -36,6 +36,10 @@ use crate::{
    TraitLoc, TypeAliasLoc, UnionLoc,
 };
+const GLOB_RECURSION_LIMIT: usize = 100;
+const EXPANSION_DEPTH_LIMIT: usize = 128;
+const FIXED_POINT_LIMIT: usize = 8192;
 pub(super) fn collect_defs(db: &dyn DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap {
    let crate_graph = db.crate_graph();
@@ -166,7 +170,7 @@ struct MacroDirective {
 #[derive(Clone, Debug, Eq, PartialEq)]
 struct DeriveDirective {
    module_id: LocalModuleId,
-    ast_id: AstIdWithPath<ast::ModuleItem>,
+    ast_id: AstIdWithPath<ast::Item>,
 }
 struct DefData<'a> {
@@ -217,7 +221,7 @@ impl DefCollector<'_> {
                ReachedFixedPoint::Yes => break,
                ReachedFixedPoint::No => i += 1,
            }
-            if i == 10000 {
+            if i == FIXED_POINT_LIMIT {
                log::error!("name resolution is stuck");
                break;
            }
@@ -306,7 +310,7 @@ impl DefCollector<'_> {
        if export {
            self.update(
                self.def_map.root,
-                &[(name, PerNs::macros(macro_, Visibility::Public))],
+                &[(Some(name), PerNs::macros(macro_, Visibility::Public))],
                Visibility::Public,
                ImportType::Named,
            );
@@ -332,7 +336,7 @@ impl DefCollector<'_> {
    fn define_proc_macro(&mut self, name: Name, macro_: MacroDefId) {
        self.update(
            self.def_map.root,
-            &[(name, PerNs::macros(macro_, Visibility::Public))],
+            &[(Some(name), PerNs::macros(macro_, Visibility::Public))],
            Visibility::Public,
            ImportType::Named,
        );
@@ -530,7 +534,7 @@ impl DefCollector<'_> {
                            let name = variant_data.name.clone();
                            let variant = EnumVariantId { parent: e, local_id };
                            let res = PerNs::both(variant.into(), variant.into(), vis);
-                            (name, res)
+                            (Some(name), res)
                        })
                        .collect::<Vec<_>>();
                    self.update(module_id, &resolutions, vis, ImportType::Glob);
@@ -546,15 +550,15 @@ impl DefCollector<'_> {
            match import.path.segments.last() {
                Some(last_segment) => {
                    let name = match &import.alias {
-                        Some(ImportAlias::Alias(name)) => name.clone(),
+                        Some(ImportAlias::Alias(name)) => Some(name.clone()),
-                        Some(ImportAlias::Underscore) => last_segment.clone(), // FIXME rust-analyzer#2736
+                        Some(ImportAlias::Underscore) => None,
-                        None => last_segment.clone(),
+                        None => Some(last_segment.clone()),
                    };
                    log::debug!("resolved import {:?} ({:?}) to {:?}", name, import, def);
                    // extern crates in the crate root are special-cased to insert entries into the extern prelude: rust-lang/rust#54658
                    if import.is_extern_crate && module_id == self.def_map.root {
-                        if let Some(def) = def.take_types() {
+                        if let (Some(def), Some(name)) = (def.take_types(), name.as_ref()) {
                            self.def_map.extern_prelude.insert(name.clone(), def);
                        }
                    }
@@ -569,36 +573,73 @@ impl DefCollector<'_> {
    fn update(
        &mut self,
        module_id: LocalModuleId,
-        resolutions: &[(Name, PerNs)],
+        resolutions: &[(Option<Name>, PerNs)],
        vis: Visibility,
        import_type: ImportType,
    ) {
+        self.db.check_canceled();
        self.update_recursive(module_id, resolutions, vis, import_type, 0)
    }
    fn update_recursive(
        &mut self,
        module_id: LocalModuleId,
-        resolutions: &[(Name, PerNs)],
+        resolutions: &[(Option<Name>, PerNs)],
        // All resolutions are imported with this visibility; the visibilies in
        // the `PerNs` values are ignored and overwritten
        vis: Visibility,
        import_type: ImportType,
        depth: usize,
    ) {
-        if depth > 100 {
+        if depth > GLOB_RECURSION_LIMIT {
            // prevent stack overflows (but this shouldn't be possible)
            panic!("infinite recursion in glob imports!");
        }
-        let scope = &mut self.def_map.modules[module_id].scope;
        let mut changed = false;
        for (name, res) in resolutions {
-            changed |= scope.push_res_with_import(
+            match name {
-                &mut self.from_glob_import,
+                Some(name) => {
-                (module_id, name.clone()),
+                    let scope = &mut self.def_map.modules[module_id].scope;
-                res.with_visibility(vis),
+                    changed |= scope.push_res_with_import(
-                import_type,
+                        &mut self.from_glob_import,
-            );
+                        (module_id, name.clone()),
+                        res.with_visibility(vis),
+                        import_type,
+                    );
+                }
+                None => {
+                    let tr = match res.take_types() {
+                        Some(ModuleDefId::TraitId(tr)) => tr,
+                        Some(other) => {
+                            log::debug!("non-trait `_` import of {:?}", other);
+                            continue;
+                        }
+                        None => continue,
+                    };
+                    let old_vis = self.def_map.modules[module_id].scope.unnamed_trait_vis(tr);
+                    let should_update = match old_vis {
+                        None => true,
+                        Some(old_vis) => {
+                            let max_vis = old_vis.max(vis, &self.def_map).unwrap_or_else(|| {
+                                panic!("`Tr as _` imports with unrelated visibilities {:?} and {:?} (trait {:?})", old_vis, vis, tr);
+                            });
+                            if max_vis == old_vis {
+                                false
+                            } else {
+                                mark::hit!(upgrade_underscore_visibility);
+                                true
+                            }
+                        }
+                    };
+                    if should_update {
+                        changed = true;
+                        self.def_map.modules[module_id].scope.push_unnamed_trait(tr, vis);
+                    }
+                }
+            }
        }
        if !changed {
@@ -609,14 +650,15 @@ impl DefCollector<'_> {
            .get(&module_id)
            .into_iter()
            .flat_map(|v| v.iter())
+            .filter(|(glob_importing_module, _)| {
+                // we know all resolutions have the same visibility (`vis`), so we
+                // just need to check that once
+                vis.is_visible_from_def_map(&self.def_map, *glob_importing_module)
+            })
            .cloned()
            .collect::<Vec<_>>();
        for (glob_importing_module, glob_import_vis) in glob_imports {
-            // we know all resolutions have the same visibility (`vis`), so we
-            // just need to check that once
-            if !vis.is_visible_from_def_map(&self.def_map, glob_importing_module) {
-                continue;
-            }
            self.update_recursive(
                glob_importing_module,
                resolutions,
@@ -677,10 +719,6 @@ impl DefCollector<'_> {
        self.unexpanded_attribute_macros = attribute_macros;
        for (module_id, macro_call_id, depth) in resolved {
-            if depth > 1024 {
-                log::debug!("Max macro expansion depth reached");
-                continue;
-            }
            self.collect_macro_expansion(module_id, macro_call_id, depth);
        }
@@ -717,6 +755,11 @@ impl DefCollector<'_> {
        macro_call_id: MacroCallId,
        depth: usize,
    ) {
+        if depth > EXPANSION_DEPTH_LIMIT {
+            mark::hit!(macro_expansion_overflow);
+            log::warn!("macro expansion is too deep");
+            return;
+        }
        let file_id: HirFileId = macro_call_id.as_file();
        let item_tree = self.db.item_tree(file_id);
        let mod_dir = self.mod_dirs[&module_id].clone();
@@ -943,7 +986,7 @@ impl ModCollector<'_, '_> {
                        .unwrap_or(Visibility::Public);
                    self.def_collector.update(
                        self.module_id,
-                        &[(name.clone(), PerNs::from_def(id, vis, has_constructor))],
+                        &[(Some(name.clone()), PerNs::from_def(id, vis, has_constructor))],
                        vis,
                        ImportType::Named,
                    )
@@ -1050,14 +1093,14 @@ impl ModCollector<'_, '_> {
        self.def_collector.def_map.modules[self.module_id].scope.define_def(def);
        self.def_collector.update(
            self.module_id,
-            &[(name, PerNs::from_def(def, vis, false))],
+            &[(Some(name), PerNs::from_def(def, vis, false))],
            vis,
            ImportType::Named,
        );
        res
    }
-    fn collect_derives(&mut self, attrs: &Attrs, ast_id: FileAstId<ast::ModuleItem>) {
+    fn collect_derives(&mut self, attrs: &Attrs, ast_id: FileAstId<ast::Item>) {
        for derive_subtree in attrs.by_key("derive").tt_values() {
            // for #[derive(Copy, Clone)], `derive_subtree` is the `(Copy, Clone)` subtree
            for tt in &derive_subtree.token_trees {
diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/ra_hir_def/src/nameres/mod_resolution.rs
index 39e9a6d97..953961632 100644
--- a/crates/ra_hir_def/src/nameres/mod_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/mod_resolution.rs
@@ -1,23 +1,24 @@
 //! This module resolves `mod foo;` declaration to file.
 use hir_expand::name::Name;
-use ra_db::{FileId, RelativePathBuf};
+use ra_db::FileId;
 use ra_syntax::SmolStr;
 use crate::{db::DefDatabase, HirFileId};
 #[derive(Clone, Debug)]
 pub(super) struct ModDir {
-    /// `.` for `mod.rs`, `lib.rs`
+    /// `` for `mod.rs`, `lib.rs`
-    /// `./foo` for `foo.rs`
+    /// `foo/` for `foo.rs`
-    /// `./foo/bar` for `mod bar { mod x; }` nested in `foo.rs`
+    /// `foo/bar/` for `mod bar { mod x; }` nested in `foo.rs`
-    path: RelativePathBuf,
+    /// Invariant: path.is_empty() || path.ends_with('/')
+    dir_path: DirPath,
    /// inside `./foo.rs`, mods with `#[path]` should *not* be relative to `./foo/`
    root_non_dir_owner: bool,
 }
 impl ModDir {
    pub(super) fn root() -> ModDir {
-        ModDir { path: RelativePathBuf::default(), root_non_dir_owner: false }
+        ModDir { dir_path: DirPath::empty(), root_non_dir_owner: false }
    }
    pub(super) fn descend_into_definition(
@@ -25,17 +26,21 @@ impl ModDir {
        name: &Name,
        attr_path: Option<&SmolStr>,
    ) -> ModDir {
-        let mut path = self.path.clone();
+        let path = match attr_path.map(|it| it.as_str()) {
-        match attr_to_path(attr_path) {
+            None => {
-            None => path.push(&name.to_string()),
+                let mut path = self.dir_path.clone();
+                path.push(&name.to_string());
+                path
+            }
            Some(attr_path) => {
-                if self.root_non_dir_owner {
+                let mut path = self.dir_path.join_attr(attr_path, self.root_non_dir_owner);
-                    assert!(path.pop());
+                if !(path.is_empty() || path.ends_with('/')) {
+                    path.push('/')
                }
-                path.push(attr_path);
+                DirPath::new(path)
            }
-        }
+        };
-        ModDir { path, root_non_dir_owner: false }
+        ModDir { dir_path: path, root_non_dir_owner: false }
    }
    pub(super) fn resolve_declaration(
@@ -48,34 +53,87 @@ impl ModDir {
        let file_id = file_id.original_file(db.upcast());
        let mut candidate_files = Vec::new();
-        match attr_to_path(attr_path) {
+        match attr_path {
            Some(attr_path) => {
-                let base =
+                candidate_files.push(self.dir_path.join_attr(attr_path, self.root_non_dir_owner))
-                    if self.root_non_dir_owner { self.path.parent().unwrap() } else { &self.path };
-                candidate_files.push(base.join(attr_path).to_string())
            }
            None => {
-                candidate_files.push(self.path.join(&format!("{}.rs", name)).to_string());
+                candidate_files.push(format!("{}{}.rs", self.dir_path.0, name));
-                candidate_files.push(self.path.join(&format!("{}/mod.rs", name)).to_string());
+                candidate_files.push(format!("{}{}/mod.rs", self.dir_path.0, name));
            }
        };
        for candidate in candidate_files.iter() {
            if let Some(file_id) = db.resolve_path(file_id, candidate.as_str()) {
-                let mut root_non_dir_owner = false;
-                let mut mod_path = RelativePathBuf::new();
                let is_mod_rs = candidate.ends_with("mod.rs");
-                if !(is_mod_rs || attr_path.is_some()) {
-                    root_non_dir_owner = true;
+                let (dir_path, root_non_dir_owner) = if is_mod_rs || attr_path.is_some() {
-                    mod_path.push(&name.to_string());
+                    (DirPath::empty(), false)
-                }
+                } else {
-                return Ok((file_id, is_mod_rs, ModDir { path: mod_path, root_non_dir_owner }));
+                    (DirPath::new(format!("{}/", name)), true)
+                };
+                return Ok((file_id, is_mod_rs, ModDir { dir_path, root_non_dir_owner }));
            }
        }
        Err(candidate_files.remove(0))
    }
 }
-fn attr_to_path(attr: Option<&SmolStr>) -> Option<RelativePathBuf> {
+#[derive(Clone, Debug)]
-    attr.and_then(|it| RelativePathBuf::from_path(&it.replace("\\", "/")).ok())
+struct DirPath(String);
+impl DirPath {
+    fn assert_invariant(&self) {
+        assert!(self.0.is_empty() || self.0.ends_with('/'));
+    }
+    fn new(repr: String) -> DirPath {
+        let res = DirPath(repr);
+        res.assert_invariant();
+        res
+    }
+    fn empty() -> DirPath {
+        DirPath::new(String::new())
+    }
+    fn push(&mut self, name: &str) {
+        self.0.push_str(name);
+        self.0.push('/');
+        self.assert_invariant();
+    }
+    fn parent(&self) -> Option<&str> {
+        if self.0.is_empty() {
+            return None;
+        };
+        let idx =
+            self.0[..self.0.len() - '/'.len_utf8()].rfind('/').map_or(0, |it| it + '/'.len_utf8());
+        Some(&self.0[..idx])
+    }
+    /// So this is the case which doesn't really work I think if we try to be
+    /// 100% platform agnostic:
+    ///
+    /// ```
+    /// mod a {
+    ///     #[path="C://sad/face"]
+    ///     mod b { mod c; }
+    /// }
+    /// ```
+    ///
+    /// Here, we need to join logical dir path to a string path from an
+    /// attribute. Ideally, we should somehow losslessly communicate the whole
+    /// construction to `FileLoader`.
+    fn join_attr(&self, mut attr: &str, relative_to_parent: bool) -> String {
+        let base = if relative_to_parent { self.parent().unwrap() } else { &self.0 };
+        if attr.starts_with("./") {
+            attr = &attr["./".len()..];
+        }
+        let tmp;
+        let attr = if attr.contains('\\') {
+            tmp = attr.replace('\\', "/");
+            &tmp
+        } else {
+            attr
+        };
+        let res = format!("{}{}", base, attr);
+        res
+    }
 }
diff --git a/crates/ra_hir_def/src/nameres/path_resolution.rs b/crates/ra_hir_def/src/nameres/path_resolution.rs
index 19692e70c..dbfa7fccb 100644
--- a/crates/ra_hir_def/src/nameres/path_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/path_resolution.rs
@@ -226,7 +226,15 @@ impl CrateDefMap {
                    match enum_data.variant(&segment) {
                        Some(local_id) => {
                            let variant = EnumVariantId { parent: e, local_id };
-                            PerNs::both(variant.into(), variant.into(), Visibility::Public)
+                            match &*enum_data.variants[local_id].variant_data {
+                                crate::adt::VariantData::Record(_) => {
+                                    PerNs::types(variant.into(), Visibility::Public)
+                                }
+                                crate::adt::VariantData::Tuple(_)
+                                | crate::adt::VariantData::Unit => {
+                                    PerNs::both(variant.into(), variant.into(), Visibility::Public)
+                                }
+                            }
                        }
                        None => {
                            return ResolvePathResult::with(
diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/ra_hir_def/src/nameres/tests.rs
index 503099fb7..839b1de57 100644
--- a/crates/ra_hir_def/src/nameres/tests.rs
+++ b/crates/ra_hir_def/src/nameres/tests.rs
@@ -6,558 +6,531 @@ mod primitives;
 use std::sync::Arc;
-use insta::assert_snapshot;
+use expect::{expect, Expect};
 use ra_db::{fixture::WithFixture, SourceDatabase};
 use test_utils::mark;
 use crate::{db::DefDatabase, nameres::*, test_db::TestDB};
-fn def_map(ra_fixture: &str) -> String {
-    compute_crate_def_map(ra_fixture).dump()
-}
 fn compute_crate_def_map(fixture: &str) -> Arc<CrateDefMap> {
    let db = TestDB::with_files(fixture);
    let krate = db.crate_graph().iter().next().unwrap();
    db.crate_def_map(krate)
 }
+fn check(ra_fixture: &str, expect: Expect) {
+    let db = TestDB::with_files(ra_fixture);
+    let krate = db.crate_graph().iter().next().unwrap();
+    let actual = db.crate_def_map(krate).dump();
+    expect.assert_eq(&actual);
+}
 #[test]
 fn crate_def_map_smoke_test() {
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        struct S;
+struct S;
-        use crate::foo::bar::E;
+use crate::foo::bar::E;
-        use self::E::V;
+use self::E::V;
-        //- /foo/mod.rs
-        pub mod bar;
-        fn f() {}
-        //- /foo/bar.rs
-        pub struct Baz;
-        union U {
-            to_be: bool,
-            not_to_be: u8,
-        }
-        enum E { V }
+//- /foo/mod.rs
+pub mod bar;
+fn f() {}
-        extern {
+//- /foo/bar.rs
-            static EXT: u8;
+pub struct Baz;
-            fn ext();
-        }
+union U { to_be: bool, not_to_be: u8 }
-        ",
+enum E { V }
+extern {
+    static EXT: u8;
+    fn ext();
+}
+"#,
+        expect![[r#"
+            crate
+            E: t
+            S: t v
+            V: t v
+            foo: t
+            crate::foo
+            bar: t
+            f: v
+            crate::foo::bar
+            Baz: t v
+            E: t
+            EXT: v
+            U: t
+            ext: v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮E: t
-        ⋮S: t v
-        ⋮V: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮f: v
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-        ⋮E: t
-        ⋮EXT: v
-        ⋮U: t
-        ⋮ext: v
-    "###)
 }
 #[test]
 fn crate_def_map_super_super() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+mod a {
-        mod a {
+    const A: usize = 0;
-            const A: usize = 0;
+    mod b {
+        const B: usize = 0;
-            mod b {
+        mod c {
-                const B: usize = 0;
+            use super::super::*;
-                mod c {
-                    use super::super::*;
-                }
-            }
        }
-        ",
+    }
+}
+"#,
+        expect![[r#"
+            crate
+            a: t
+            crate::a
+            A: v
+            b: t
+            crate::a::b
+            B: v
+            c: t
+            crate::a::b::c
+            A: v
+            b: t
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮a: t
-        ⋮
-        ⋮crate::a
-        ⋮A: v
-        ⋮b: t
-        ⋮
-        ⋮crate::a::b
-        ⋮B: v
-        ⋮c: t
-        ⋮
-        ⋮crate::a::b::c
-        ⋮A: v
-        ⋮b: t
-    "###)
 }
 #[test]
 fn crate_def_map_fn_mod_same_name() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+mod m {
-        mod m {
+    pub mod z {}
-            pub mod z {}
+    pub fn z() {}
-            pub fn z() {}
+}
-        }
+"#,
-        ",
+        expect![[r#"
+            crate
+            m: t
+            crate::m
+            z: t v
+            crate::m::z
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮m: t
-        ⋮
-        ⋮crate::m
-        ⋮z: t v
-        ⋮
-        ⋮crate::m::z
-    "###)
 }
 #[test]
 fn bogus_paths() {
    mark::check!(bogus_paths);
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        struct S;
+struct S;
-        use self;
+use self;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        use super;
+use super;
-        use crate;
+use crate;
+"#,
-        ",
+        expect![[r#"
+            crate
+            S: t v
+            foo: t
+            crate::foo
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮S: t v
-   ⋮foo: t
-   ⋮
-   ⋮crate::foo
-    "###
-    )
 }
 #[test]
 fn use_as() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
+use crate::foo::Baz as Foo;
-        use crate::foo::Baz as Foo;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        pub struct Baz;
+pub struct Baz;
-        ",
+"#,
-    );
+        expect![[r#"
-    assert_snapshot!(map,
+            crate
-        @r###"
+            Foo: t v
-   ⋮crate
+            foo: t
-   ⋮Foo: t v
-   ⋮foo: t
+            crate::foo
-   ⋮
+            Baz: t v
-   ⋮crate::foo
+        "#]],
-   ⋮Baz: t v
-    "###
    );
 }
 #[test]
 fn use_trees() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
+use crate::foo::bar::{Baz, Quux};
-        use crate::foo::bar::{Baz, Quux};
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        pub mod bar;
+pub mod bar;
-        //- /foo/bar.rs
+//- /foo/bar.rs
-        pub struct Baz;
+pub struct Baz;
-        pub enum Quux {};
+pub enum Quux {};
-        ",
+"#,
+        expect![[r#"
+            crate
+            Baz: t v
+            Quux: t
+            foo: t
+            crate::foo
+            bar: t
+            crate::foo::bar
+            Baz: t v
+            Quux: t
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: t v
-        ⋮Quux: t
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-        ⋮Quux: t
-    "###);
 }
 #[test]
 fn re_exports() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
+use self::foo::Baz;
-        use self::foo::Baz;
-        //- /foo/mod.rs
-        pub mod bar;
-        pub use self::bar::Baz;
+//- /foo/mod.rs
+pub mod bar;
+pub use self::bar::Baz;
-        //- /foo/bar.rs
+//- /foo/bar.rs
-        pub struct Baz;
+pub struct Baz;
-        ",
+"#,
+        expect![[r#"
+            crate
+            Baz: t v
+            foo: t
+            crate::foo
+            Baz: t v
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn std_prelude() {
    mark::check!(std_prelude);
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:test_crate
+//- /main.rs crate:main deps:test_crate
-        use Foo::*;
+use Foo::*;
-        //- /lib.rs crate:test_crate
+//- /lib.rs crate:test_crate
-        mod prelude;
+mod prelude;
-        #[prelude_import]
+#[prelude_import]
-        use prelude::*;
+use prelude::*;
-        //- /prelude.rs
+//- /prelude.rs
-        pub enum Foo { Bar, Baz };
+pub enum Foo { Bar, Baz };
-        ",
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn can_import_enum_variant() {
    mark::check!(can_import_enum_variant);
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+enum E { V }
-        enum E { V }
+use self::E::V;
-        use self::E::V;
+"#,
-        ",
+        expect![[r#"
-    );
+            crate
-    assert_snapshot!(map, @r###"
+            E: t
-        ⋮crate
+            V: t v
-        ⋮E: t
+        "#]],
-        ⋮V: t v
-    "###
    );
 }
 #[test]
 fn edition_2015_imports() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:other_crate edition:2015
+//- /main.rs crate:main deps:other_crate edition:2015
-        mod foo;
+mod foo;
-        mod bar;
+mod bar;
-        //- /bar.rs
-        struct Bar;
-        //- /foo.rs
-        use bar::Bar;
-        use other_crate::FromLib;
-        //- /lib.rs crate:other_crate edition:2018
-        struct FromLib;
-        ",
-    );
-    assert_snapshot!(map, @r###"
+//- /bar.rs
-        ⋮crate
+struct Bar;
-        ⋮bar: t
-        ⋮foo: t
+//- /foo.rs
-        ⋮
+use bar::Bar;
-        ⋮crate::bar
+use other_crate::FromLib;
-        ⋮Bar: t v
-        ⋮
+//- /lib.rs crate:other_crate edition:2018
-        ⋮crate::foo
+struct FromLib;
-        ⋮Bar: t v
+"#,
-        ⋮FromLib: t v
+        expect![[r#"
-    "###);
+            crate
+            bar: t
+            foo: t
+            crate::bar
+            Bar: t v
+            crate::foo
+            Bar: t v
+            FromLib: t v
+        "#]],
+    );
 }
 #[test]
 fn item_map_using_self() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        use crate::foo::bar::Baz::{self};
+use crate::foo::bar::Baz::{self};
-        //- /foo/mod.rs
-        pub mod bar;
+//- /foo/mod.rs
-        //- /foo/bar.rs
+pub mod bar;
-        pub struct Baz;
-        ",
+//- /foo/bar.rs
+pub struct Baz;
+"#,
+        expect![[r#"
+            crate
+            Baz: t v
+            foo: t
+            crate::foo
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn item_map_across_crates() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:test_crate
+//- /main.rs crate:main deps:test_crate
-        use test_crate::Baz;
+use test_crate::Baz;
-        //- /lib.rs crate:test_crate
-        pub struct Baz;
-        ",
-    );
-    assert_snapshot!(map, @r###"
+//- /lib.rs crate:test_crate
-        ⋮crate
+pub struct Baz;
-        ⋮Baz: t v
+"#,
-    "###);
+        expect![[r#"
+            crate
+            Baz: t v
+        "#]],
+    );
 }
 #[test]
 fn extern_crate_rename() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:alloc
+//- /main.rs crate:main deps:alloc
-        extern crate alloc as alloc_crate;
+extern crate alloc as alloc_crate;
+mod alloc;
-        mod alloc;
+mod sync;
-        mod sync;
-        //- /sync.rs
+//- /sync.rs
-        use alloc_crate::Arc;
+use alloc_crate::Arc;
-        //- /lib.rs crate:alloc
+//- /lib.rs crate:alloc
-        struct Arc;
+struct Arc;
-        ",
+"#,
+        expect![[r#"
+            crate
+            alloc_crate: t
+            sync: t
+            crate::sync
+            Arc: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮alloc_crate: t
-   ⋮sync: t
-   ⋮
-   ⋮crate::sync
-   ⋮Arc: t v
-    "###);
 }
 #[test]
 fn extern_crate_rename_2015_edition() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:alloc edition:2015
+//- /main.rs crate:main deps:alloc edition:2015
-        extern crate alloc as alloc_crate;
+extern crate alloc as alloc_crate;
+mod alloc;
-        mod alloc;
+mod sync;
-        mod sync;
-        //- /sync.rs
-        use alloc_crate::Arc;
-        //- /lib.rs crate:alloc
+//- /sync.rs
-        struct Arc;
+use alloc_crate::Arc;
-        ",
-    );
-    assert_snapshot!(map,
+//- /lib.rs crate:alloc
-        @r###"
+struct Arc;
-   ⋮crate
+"#,
-   ⋮alloc_crate: t
+        expect![[r#"
-   ⋮sync: t
+            crate
-   ⋮
+            alloc_crate: t
-   ⋮crate::sync
+            sync: t
-   ⋮Arc: t v
-    "###
+            crate::sync
+            Arc: t v
+        "#]],
    );
 }
 #[test]
 fn reexport_across_crates() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:test_crate
+//- /main.rs crate:main deps:test_crate
-        use test_crate::Baz;
+use test_crate::Baz;
-        //- /lib.rs crate:test_crate
-        pub use foo::Baz;
-        mod foo;
+//- /lib.rs crate:test_crate
+pub use foo::Baz;
+mod foo;
-        //- /foo.rs
+//- /foo.rs
-        pub struct Baz;
+pub struct Baz;
-        ",
+"#,
+        expect![[r#"
+            crate
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn values_dont_shadow_extern_crates() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        fn foo() {}
+fn foo() {}
-        use foo::Bar;
+use foo::Bar;
-        //- /foo/lib.rs crate:foo
-        pub struct Bar;
-        ",
-    );
-    assert_snapshot!(map, @r###"
+//- /foo/lib.rs crate:foo
-        ⋮crate
+pub struct Bar;
-        ⋮Bar: t v
+"#,
-        ⋮foo: v
+        expect![[r#"
-    "###);
+            crate
+            Bar: t v
+            foo: v
+        "#]],
+    );
 }
 #[test]
 fn std_prelude_takes_precedence_above_core_prelude() {
-    let map = def_map(
+    check(
        r#"
-        //- /main.rs crate:main deps:core,std
+//- /main.rs crate:main deps:core,std
-        use {Foo, Bar};
+use {Foo, Bar};
-        //- /std.rs crate:std deps:core
+//- /std.rs crate:std deps:core
-        #[prelude_import]
+#[prelude_import]
-        pub use self::prelude::*;
+pub use self::prelude::*;
-        mod prelude {
+mod prelude {
-            pub struct Foo;
+    pub struct Foo;
-            pub use core::prelude::Bar;
+    pub use core::prelude::Bar;
-        }
+}
-        //- /core.rs crate:core
+//- /core.rs crate:core
-        #[prelude_import]
+#[prelude_import]
-        pub use self::prelude::*;
+pub use self::prelude::*;
-        mod prelude {
+mod prelude {
-            pub struct Bar;
+    pub struct Bar;
-        }
+}
-        "#,
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            Foo: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮Foo: t v
-    "###);
 }
 #[test]
 fn cfg_not_test() {
-    let map = def_map(
+    check(
        r#"
-        //- /main.rs crate:main deps:std
+//- /main.rs crate:main deps:std
-        use {Foo, Bar, Baz};
+use {Foo, Bar, Baz};
-        //- /lib.rs crate:std
+//- /lib.rs crate:std
-        #[prelude_import]
+#[prelude_import]
-        pub use self::prelude::*;
+pub use self::prelude::*;
-        mod prelude {
+mod prelude {
-            #[cfg(test)]
+    #[cfg(test)]
-            pub struct Foo;
+    pub struct Foo;
-            #[cfg(not(test))]
+    #[cfg(not(test))]
-            pub struct Bar;
+    pub struct Bar;
-            #[cfg(all(not(any()), feature = "foo", feature = "bar", opt = "42"))]
+    #[cfg(all(not(any()), feature = "foo", feature = "bar", opt = "42"))]
-            pub struct Baz;
+    pub struct Baz;
-        }
+}
-        "#,
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            Baz: _
+            Foo: _
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮Baz: _
-        ⋮Foo: _
-    "###);
 }
 #[test]
 fn cfg_test() {
-    let map = def_map(
+    check(
        r#"
-        //- /main.rs crate:main deps:std
+//- /main.rs crate:main deps:std
-        use {Foo, Bar, Baz};
+use {Foo, Bar, Baz};
-        //- /lib.rs crate:std cfg:test,feature=foo,feature=bar,opt=42
+//- /lib.rs crate:std cfg:test,feature=foo,feature=bar,opt=42
-        #[prelude_import]
+#[prelude_import]
-        pub use self::prelude::*;
+pub use self::prelude::*;
-        mod prelude {
+mod prelude {
-            #[cfg(test)]
+    #[cfg(test)]
-            pub struct Foo;
+    pub struct Foo;
-            #[cfg(not(test))]
+    #[cfg(not(test))]
-            pub struct Bar;
+    pub struct Bar;
-            #[cfg(all(not(any()), feature = "foo", feature = "bar", opt = "42"))]
+    #[cfg(all(not(any()), feature = "foo", feature = "bar", opt = "42"))]
-            pub struct Baz;
+    pub struct Baz;
-        }
+}
-        "#,
+"#,
+        expect![[r#"
+            crate
+            Bar: _
+            Baz: t v
+            Foo: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: _
-        ⋮Baz: t v
-        ⋮Foo: t v
-    "###);
 }
 #[test]
 fn infer_multiple_namespace() {
-    let map = def_map(
+    check(
        r#"
 //- /main.rs
 mod a {
@@ -571,18 +544,147 @@ mod b {
    pub const T: () = ();
 }
 "#,
+        expect![[r#"
+            crate
+            T: t v
+            a: t
+            b: t
+            crate::b
+            T: v
+            crate::a
+            T: t v
+        "#]],
+    );
+}
+#[test]
+fn underscore_import() {
+    check(
+        r#"
+//- /main.rs
+use tr::Tr as _;
+use tr::Tr2 as _;
+mod tr {
+    pub trait Tr {}
+    pub trait Tr2 {}
+}
+    "#,
+        expect![[r#"
+            crate
+            _: t
+            _: t
+            tr: t
+            crate::tr
+            Tr: t
+            Tr2: t
+        "#]],
+    );
+}
+#[test]
+fn underscore_reexport() {
+    check(
+        r#"
+//- /main.rs
+mod tr {
+    pub trait PubTr {}
+    pub trait PrivTr {}
+}
+mod reex {
+    use crate::tr::PrivTr as _;
+    pub use crate::tr::PubTr as _;
+}
+use crate::reex::*;
+    "#,
+        expect![[r#"
+            crate
+            _: t
+            reex: t
+            tr: t
+            crate::tr
+            PrivTr: t
+            PubTr: t
+            crate::reex
+            _: t
+            _: t
+        "#]],
+    );
+}
+#[test]
+fn underscore_pub_crate_reexport() {
+    mark::check!(upgrade_underscore_visibility);
+    check(
+        r#"
+//- /main.rs crate:main deps:lib
+use lib::*;
+//- /lib.rs crate:lib
+use tr::Tr as _;
+pub use tr::Tr as _;
+mod tr {
+    pub trait Tr {}
+}
+    "#,
+        expect![[r#"
+            crate
+            _: t
+        "#]],
+    );
+}
+#[test]
+fn underscore_nontrait() {
+    check(
+        r#"
+//- /main.rs
+mod m {
+    pub struct Struct;
+    pub enum Enum {}
+    pub const CONST: () = ();
+}
+use crate::m::{Struct as _, Enum as _, CONST as _};
+    "#,
+        expect![[r#"
+            crate
+            m: t
+            crate::m
+            CONST: v
+            Enum: t
+            Struct: t v
+        "#]],
    );
+}
+#[test]
+fn underscore_name_conflict() {
+    check(
+        r#"
+//- /main.rs
+struct Tr;
+use tr::Tr as _;
-    assert_snapshot!(map, @r###"
+mod tr {
-    ⋮crate
+    pub trait Tr {}
-    ⋮T: t v
+}
-    ⋮a: t
+    "#,
-    ⋮b: t
+        expect![[r#"
-    ⋮
+            crate
-    ⋮crate::b
+            _: t
-    ⋮T: v
+            Tr: t v
-    ⋮
+            tr: t
-    ⋮crate::a
-    ⋮T: t v
+            crate::tr
-"###);
+            Tr: t
+        "#]],
+    );
 }
diff --git a/crates/ra_hir_def/src/nameres/tests/globs.rs b/crates/ra_hir_def/src/nameres/tests/globs.rs
index 7f3d7509c..2ae836e3c 100644
--- a/crates/ra_hir_def/src/nameres/tests/globs.rs
+++ b/crates/ra_hir_def/src/nameres/tests/globs.rs
@@ -2,367 +2,337 @@ use super::*;
 #[test]
 fn glob_1() {
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        use foo::*;
+use foo::*;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        pub mod bar;
+pub mod bar;
-        pub use self::bar::Baz;
+pub use self::bar::Baz;
-        pub struct Foo;
+pub struct Foo;
-        //- /foo/bar.rs
+//- /foo/bar.rs
-        pub struct Baz;
+pub struct Baz;
-        ",
+"#,
-    );
+        expect![[r#"
-    assert_snapshot!(map, @r###"
+            crate
-   ⋮crate
+            Baz: t v
-   ⋮Baz: t v
+            Foo: t v
-   ⋮Foo: t v
+            bar: t
-   ⋮bar: t
+            foo: t
-   ⋮foo: t
-   ⋮
+            crate::foo
-   ⋮crate::foo
+            Baz: t v
-   ⋮Baz: t v
+            Foo: t v
-   ⋮Foo: t v
+            bar: t
-   ⋮bar: t
-   ⋮
+            crate::foo::bar
-   ⋮crate::foo::bar
+            Baz: t v
-   ⋮Baz: t v
+        "#]],
-    "###
    );
 }
 #[test]
 fn glob_2() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        use foo::*;
+use foo::*;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        pub mod bar;
+pub mod bar;
-        pub use self::bar::*;
+pub use self::bar::*;
-        pub struct Foo;
+pub struct Foo;
-        //- /foo/bar.rs
+//- /foo/bar.rs
-        pub struct Baz;
+pub struct Baz;
-        pub use super::*;
+pub use super::*;
-        ",
+"#,
-    );
+        expect![[r#"
-    assert_snapshot!(map, @r###"
+            crate
-   ⋮crate
+            Baz: t v
-   ⋮Baz: t v
+            Foo: t v
-   ⋮Foo: t v
+            bar: t
-   ⋮bar: t
+            foo: t
-   ⋮foo: t
-   ⋮
+            crate::foo
-   ⋮crate::foo
+            Baz: t v
-   ⋮Baz: t v
+            Foo: t v
-   ⋮Foo: t v
+            bar: t
-   ⋮bar: t
-   ⋮
+            crate::foo::bar
-   ⋮crate::foo::bar
+            Baz: t v
-   ⋮Baz: t v
+            Foo: t v
-   ⋮Foo: t v
+            bar: t
-   ⋮bar: t
+        "#]],
-    "###
    );
 }
 #[test]
 fn glob_privacy_1() {
-    let map = def_map(
+    check(
        r"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        use foo::*;
+use foo::*;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        pub mod bar;
+pub mod bar;
-        pub use self::bar::*;
+pub use self::bar::*;
-        struct PrivateStructFoo;
+struct PrivateStructFoo;
-        //- /foo/bar.rs
+//- /foo/bar.rs
-        pub struct Baz;
+pub struct Baz;
-        struct PrivateStructBar;
+struct PrivateStructBar;
-        pub use super::*;
+pub use super::*;
-        ",
+",
-    );
+        expect![[r#"
-    assert_snapshot!(map, @r###"
+            crate
-        ⋮crate
+            Baz: t v
-        ⋮Baz: t v
+            bar: t
-        ⋮bar: t
+            foo: t
-        ⋮foo: t
-        ⋮
+            crate::foo
-        ⋮crate::foo
+            Baz: t v
-        ⋮Baz: t v
+            PrivateStructFoo: t v
-        ⋮PrivateStructFoo: t v
+            bar: t
-        ⋮bar: t
-        ⋮
+            crate::foo::bar
-        ⋮crate::foo::bar
+            Baz: t v
-        ⋮Baz: t v
+            PrivateStructBar: t v
-        ⋮PrivateStructBar: t v
+            PrivateStructFoo: t v
-        ⋮PrivateStructFoo: t v
+            bar: t
-        ⋮bar: t
+        "#]],
-    "###
    );
 }
 #[test]
 fn glob_privacy_2() {
-    let map = def_map(
+    check(
        r"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        use foo::*;
+use foo::*;
-        use foo::bar::*;
+use foo::bar::*;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        mod bar;
+mod bar;
-        fn Foo() {};
+fn Foo() {};
-        pub struct Foo {};
+pub struct Foo {};
-        //- /foo/bar.rs
+//- /foo/bar.rs
-        pub(super) struct PrivateBaz;
+pub(super) struct PrivateBaz;
-        struct PrivateBar;
+struct PrivateBar;
-        pub(crate) struct PubCrateStruct;
+pub(crate) struct PubCrateStruct;
-        ",
+",
-    );
+        expect![[r#"
-    assert_snapshot!(map, @r###"
+            crate
-        ⋮crate
+            Foo: t
-        ⋮Foo: t
+            PubCrateStruct: t v
-        ⋮PubCrateStruct: t v
+            foo: t
-        ⋮foo: t
-        ⋮
+            crate::foo
-        ⋮crate::foo
+            Foo: t v
-        ⋮Foo: t v
+            bar: t
-        ⋮bar: t
-        ⋮
+            crate::foo::bar
-        ⋮crate::foo::bar
+            PrivateBar: t v
-        ⋮PrivateBar: t v
+            PrivateBaz: t v
-        ⋮PrivateBaz: t v
+            PubCrateStruct: t v
-        ⋮PubCrateStruct: t v
+        "#]],
-    "###
    );
 }
 #[test]
 fn glob_across_crates() {
    mark::check!(glob_across_crates);
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /main.rs crate:main deps:test_crate
+//- /main.rs crate:main deps:test_crate
-        use test_crate::*;
+use test_crate::*;
-        //- /lib.rs crate:test_crate
+//- /lib.rs crate:test_crate
-        pub struct Baz;
+pub struct Baz;
-        ",
+"#,
-    );
+        expect![[r#"
-    assert_snapshot!(map, @r###"
+            crate
-        ⋮crate
+            Baz: t v
-        ⋮Baz: t v
+        "#]],
-    "###
    );
 }
 #[test]
 fn glob_privacy_across_crates() {
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /main.rs crate:main deps:test_crate
+//- /main.rs crate:main deps:test_crate
-        use test_crate::*;
+use test_crate::*;
-        //- /lib.rs crate:test_crate
+//- /lib.rs crate:test_crate
-        pub struct Baz;
+pub struct Baz;
-        struct Foo;
+struct Foo;
-        ",
+"#,
-    );
+        expect![[r#"
-    assert_snapshot!(map, @r###"
+            crate
-        ⋮crate
+            Baz: t v
-        ⋮Baz: t v
+        "#]],
-    "###
    );
 }
 #[test]
 fn glob_enum() {
    mark::check!(glob_enum);
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+enum Foo { Bar, Baz }
-        enum Foo {
+use self::Foo::*;
-            Bar, Baz
+"#,
-        }
+        expect![[r#"
-        use self::Foo::*;
+            crate
-        ",
+            Bar: t v
-    );
+            Baz: t v
-    assert_snapshot!(map, @r###"
+            Foo: t
-        ⋮crate
+        "#]],
-        ⋮Bar: t v
-        ⋮Baz: t v
-        ⋮Foo: t
-    "###
    );
 }
 #[test]
 fn glob_enum_group() {
    mark::check!(glob_enum_group);
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /lib.rs
+enum Foo { Bar, Baz }
-        enum Foo {
+use self::Foo::{*};
-            Bar, Baz
+"#,
-        }
+        expect![[r#"
-        use self::Foo::{*};
+            crate
-        ",
+            Bar: t v
-    );
+            Baz: t v
-    assert_snapshot!(map, @r###"
+            Foo: t
-        ⋮crate
+        "#]],
-        ⋮Bar: t v
-        ⋮Baz: t v
-        ⋮Foo: t
-    "###
    );
 }
 #[test]
 fn glob_shadowed_def() {
    mark::check!(import_shadowed);
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        mod bar;
+mod bar;
+use foo::*;
-        use foo::*;
+use bar::baz;
-        use bar::baz;
+use baz::Bar;
-        use baz::Bar;
+//- /foo.rs
+pub mod baz { pub struct Foo; }
-        //- /foo.rs
-        pub mod baz {
+//- /bar.rs
-            pub struct Foo;
+pub mod baz { pub struct Bar; }
-        }
+"#,
+        expect![[r#"
-        //- /bar.rs
+            crate
-        pub mod baz {
+            Bar: t v
-            pub struct Bar;
+            bar: t
-        }
+            baz: t
-        "###,
+            foo: t
-    );
-    assert_snapshot!(map, @r###"
+            crate::bar
-        ⋮crate
+            baz: t
-        ⋮Bar: t v
-        ⋮bar: t
+            crate::bar::baz
-        ⋮baz: t
+            Bar: t v
-        ⋮foo: t
-        ⋮
+            crate::foo
-        ⋮crate::bar
+            baz: t
-        ⋮baz: t
-        ⋮
+            crate::foo::baz
-        ⋮crate::bar::baz
+            Foo: t v
-        ⋮Bar: t v
+        "#]],
-        ⋮
-        ⋮crate::foo
-        ⋮baz: t
-        ⋮
-        ⋮crate::foo::baz
-        ⋮Foo: t v
-    "###
    );
 }
 #[test]
 fn glob_shadowed_def_reversed() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        mod bar;
+mod bar;
+use bar::baz;
-        use bar::baz;
+use foo::*;
-        use foo::*;
+use baz::Bar;
-        use baz::Bar;
+//- /foo.rs
+pub mod baz { pub struct Foo; }
-        //- /foo.rs
-        pub mod baz {
+//- /bar.rs
-            pub struct Foo;
+pub mod baz { pub struct Bar; }
-        }
+"#,
+        expect![[r#"
-        //- /bar.rs
+            crate
-        pub mod baz {
+            Bar: t v
-            pub struct Bar;
+            bar: t
-        }
+            baz: t
-        "###,
+            foo: t
-    );
-    assert_snapshot!(map, @r###"
+            crate::bar
-        ⋮crate
+            baz: t
-        ⋮Bar: t v
-        ⋮bar: t
+            crate::bar::baz
-        ⋮baz: t
+            Bar: t v
-        ⋮foo: t
-        ⋮
+            crate::foo
-        ⋮crate::bar
+            baz: t
-        ⋮baz: t
-        ⋮
+            crate::foo::baz
-        ⋮crate::bar::baz
+            Foo: t v
-        ⋮Bar: t v
+        "#]],
-        ⋮
-        ⋮crate::foo
-        ⋮baz: t
-        ⋮
-        ⋮crate::foo::baz
-        ⋮Foo: t v
-    "###
    );
 }
 #[test]
 fn glob_shadowed_def_dependencies() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /lib.rs
+mod a { pub mod foo { pub struct X; } }
-        mod a { pub mod foo { pub struct X; } }
+mod b { pub use super::a::foo; }
-        mod b { pub use super::a::foo; }
+mod c { pub mod foo { pub struct Y; } }
-        mod c { pub mod foo { pub struct Y; } }
+mod d {
-        mod d {
+    use super::c::foo;
-            use super::c::foo;
+    use super::b::*;
-            use super::b::*;
+    use foo::Y;
-            use foo::Y;
+}
-        }
+"#,
-        "###,
+        expect![[r#"
-    );
+            crate
-    assert_snapshot!(map, @r###"
+            a: t
-        ⋮crate
+            b: t
-        ⋮a: t
+            c: t
-        ⋮b: t
+            d: t
-        ⋮c: t
-        ⋮d: t
+            crate::d
-        ⋮
+            Y: t v
-        ⋮crate::d
+            foo: t
-        ⋮Y: t v
-        ⋮foo: t
+            crate::c
-        ⋮
+            foo: t
-        ⋮crate::c
-        ⋮foo: t
+            crate::c::foo
-        ⋮
+            Y: t v
-        ⋮crate::c::foo
-        ⋮Y: t v
+            crate::b
-        ⋮
+            foo: t
-        ⋮crate::b
-        ⋮foo: t
+            crate::a
-        ⋮
+            foo: t
-        ⋮crate::a
-        ⋮foo: t
+            crate::a::foo
-        ⋮
+            X: t v
-        ⋮crate::a::foo
+        "#]],
-        ⋮X: t v
-    "###
    );
 }
diff --git a/crates/ra_hir_def/src/nameres/tests/macros.rs b/crates/ra_hir_def/src/nameres/tests/macros.rs
index 84480d9f6..e0fb8bdef 100644
--- a/crates/ra_hir_def/src/nameres/tests/macros.rs
+++ b/crates/ra_hir_def/src/nameres/tests/macros.rs
@@ -2,639 +2,631 @@ use super::*;
 #[test]
 fn macro_rules_are_globally_visible() {
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        macro_rules! structs {
+macro_rules! structs {
-            ($($i:ident),*) => {
+    ($($i:ident),*) => {
-                $(struct $i { field: u32 } )*
+        $(struct $i { field: u32 } )*
-            }
+    }
-        }
+}
-        structs!(Foo);
+structs!(Foo);
-        mod nested;
+mod nested;
-        //- /nested.rs
+//- /nested.rs
-        structs!(Bar, Baz);
+structs!(Bar, Baz);
-        ",
+"#,
+        expect![[r#"
+            crate
+            Foo: t
+            nested: t
+            crate::nested
+            Bar: t
+            Baz: t
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Foo: t
-   ⋮nested: t
-   ⋮
-   ⋮crate::nested
-   ⋮Bar: t
-   ⋮Baz: t
-    "###);
 }
 #[test]
 fn macro_rules_can_define_modules() {
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        macro_rules! m {
+macro_rules! m {
-            ($name:ident) => { mod $name;  }
+    ($name:ident) => { mod $name;  }
-        }
+}
-        m!(n1);
+m!(n1);
+mod m { m!(n3) }
-        mod m {
-            m!(n3)
+//- /n1.rs
-        }
+m!(n2)
+//- /n1/n2.rs
-        //- /n1.rs
+struct X;
-        m!(n2)
+//- /m/n3.rs
-        //- /n1/n2.rs
+struct Y;
-        struct X;
+"#,
-        //- /m/n3.rs
+        expect![[r#"
-        struct Y;
+            crate
-        ",
+            m: t
+            n1: t
+            crate::m
+            n3: t
+            crate::m::n3
+            Y: t v
+            crate::n1
+            n2: t
+            crate::n1::n2
+            X: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮m: t
-        ⋮n1: t
-        ⋮
-        ⋮crate::m
-        ⋮n3: t
-        ⋮
-        ⋮crate::m::n3
-        ⋮Y: t v
-        ⋮
-        ⋮crate::n1
-        ⋮n2: t
-        ⋮
-        ⋮crate::n1::n2
-        ⋮X: t v
-    "###);
 }
 #[test]
 fn macro_rules_from_other_crates_are_visible() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        foo::structs!(Foo, Bar)
+foo::structs!(Foo, Bar)
-        mod bar;
+mod bar;
-        //- /bar.rs
+//- /bar.rs
-        use crate::*;
+use crate::*;
-        //- /lib.rs crate:foo
+//- /lib.rs crate:foo
-        #[macro_export]
+#[macro_export]
-        macro_rules! structs {
+macro_rules! structs {
-            ($($i:ident),*) => {
+    ($($i:ident),*) => {
-                $(struct $i { field: u32 } )*
+        $(struct $i { field: u32 } )*
-            }
+    }
-        }
+}
-        ",
+"#,
+        expect![[r#"
+            crate
+            Bar: t
+            Foo: t
+            bar: t
+            crate::bar
+            Bar: t
+            Foo: t
+            bar: t
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t
-   ⋮Foo: t
-   ⋮bar: t
-   ⋮
-   ⋮crate::bar
-   ⋮Bar: t
-   ⋮Foo: t
-   ⋮bar: t
-    "###);
 }
 #[test]
 fn macro_rules_export_with_local_inner_macros_are_visible() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        foo::structs!(Foo, Bar)
+foo::structs!(Foo, Bar)
-        mod bar;
+mod bar;
-        //- /bar.rs
+//- /bar.rs
-        use crate::*;
+use crate::*;
-        //- /lib.rs crate:foo
+//- /lib.rs crate:foo
-        #[macro_export(local_inner_macros)]
+#[macro_export(local_inner_macros)]
-        macro_rules! structs {
+macro_rules! structs {
-            ($($i:ident),*) => {
+    ($($i:ident),*) => {
-                $(struct $i { field: u32 } )*
+        $(struct $i { field: u32 } )*
-            }
+    }
-        }
+}
-        ",
+"#,
+        expect![[r#"
+            crate
+            Bar: t
+            Foo: t
+            bar: t
+            crate::bar
+            Bar: t
+            Foo: t
+            bar: t
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t
-   ⋮Foo: t
-   ⋮bar: t
-   ⋮
-   ⋮crate::bar
-   ⋮Bar: t
-   ⋮Foo: t
-   ⋮bar: t
-    "###);
 }
 #[test]
 fn local_inner_macros_makes_local_macros_usable() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        foo::structs!(Foo, Bar);
+foo::structs!(Foo, Bar);
-        mod bar;
+mod bar;
-        //- /bar.rs
-        use crate::*;
+//- /bar.rs
-        //- /lib.rs crate:foo
+use crate::*;
-        #[macro_export(local_inner_macros)]
-        macro_rules! structs {
+//- /lib.rs crate:foo
-            ($($i:ident),*) => {
+#[macro_export(local_inner_macros)]
-                inner!($($i),*);
+macro_rules! structs {
-            }
+    ($($i:ident),*) => {
-        }
+        inner!($($i),*);
-        #[macro_export]
+    }
-        macro_rules! inner {
+}
-            ($($i:ident),*) => {
+#[macro_export]
-                $(struct $i { field: u32 } )*
+macro_rules! inner {
-            }
+    ($($i:ident),*) => {
-        }
+        $(struct $i { field: u32 } )*
-        ",
+    }
+}
+"#,
+        expect![[r#"
+            crate
+            Bar: t
+            Foo: t
+            bar: t
+            crate::bar
+            Bar: t
+            Foo: t
+            bar: t
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t
-   ⋮Foo: t
-   ⋮bar: t
-   ⋮
-   ⋮crate::bar
-   ⋮Bar: t
-   ⋮Foo: t
-   ⋮bar: t
-    "###);
 }
 #[test]
 fn unexpanded_macro_should_expand_by_fixedpoint_loop() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        macro_rules! baz {
+macro_rules! baz {
-            () => {
+    () => {
-                use foo::bar;
+        use foo::bar;
-            }
+    }
-        }
+}
+foo!();
-        foo!();
+bar!();
-        bar!();
+baz!();
-        baz!();
+//- /lib.rs crate:foo
-        //- /lib.rs crate:foo
+#[macro_export]
-        #[macro_export]
+macro_rules! foo {
-        macro_rules! foo {
+    () => {
-            () => {
+        struct Foo { field: u32 }
-                struct Foo { field: u32 }
+    }
-            }
+}
-        }
+#[macro_export]
-        #[macro_export]
+macro_rules! bar {
-        macro_rules! bar {
+    () => {
-            () => {
+        use foo::foo;
-                use foo::foo;
+    }
-            }
+}
-        }
+"#,
-        ",
+        expect![[r#"
+            crate
+            Foo: t
+            bar: m
+            foo: m
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Foo: t
-   ⋮bar: m
-   ⋮foo: m
-    "###);
 }
 #[test]
 fn macro_rules_from_other_crates_are_visible_with_macro_use() {
    mark::check!(macro_rules_from_other_crates_are_visible_with_macro_use);
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        structs!(Foo);
+structs!(Foo);
-        structs_priv!(Bar);
+structs_priv!(Bar);
-        structs_not_exported!(MacroNotResolved1);
+structs_not_exported!(MacroNotResolved1);
-        crate::structs!(MacroNotResolved2);
+crate::structs!(MacroNotResolved2);
-        mod bar;
+mod bar;
-        #[macro_use]
+#[macro_use]
-        extern crate foo;
+extern crate foo;
-        //- /bar.rs
+//- /bar.rs
-        structs!(Baz);
+structs!(Baz);
-        crate::structs!(MacroNotResolved3);
+crate::structs!(MacroNotResolved3);
-        //- /lib.rs crate:foo
+//- /lib.rs crate:foo
-        #[macro_export]
+#[macro_export]
-        macro_rules! structs {
+macro_rules! structs {
-            ($i:ident) => { struct $i; }
+    ($i:ident) => { struct $i; }
-        }
+}
-        macro_rules! structs_not_exported {
+macro_rules! structs_not_exported {
-            ($i:ident) => { struct $i; }
+    ($i:ident) => { struct $i; }
-        }
+}
-        mod priv_mod {
+mod priv_mod {
-            #[macro_export]
+    #[macro_export]
-            macro_rules! structs_priv {
+    macro_rules! structs_priv {
-                ($i:ident) => { struct $i; }
+        ($i:ident) => { struct $i; }
-            }
+    }
-        }
+}
-        ",
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            Foo: t v
+            bar: t
+            foo: t
+            crate::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t v
-   ⋮Foo: t v
-   ⋮bar: t
-   ⋮foo: t
-   ⋮
-   ⋮crate::bar
-   ⋮Baz: t v
-    "###);
 }
 #[test]
 fn prelude_is_macro_use() {
    mark::check!(prelude_is_macro_use);
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        structs!(Foo);
+structs!(Foo);
-        structs_priv!(Bar);
+structs_priv!(Bar);
-        structs_outside!(Out);
+structs_outside!(Out);
-        crate::structs!(MacroNotResolved2);
+crate::structs!(MacroNotResolved2);
-        mod bar;
+mod bar;
-        //- /bar.rs
-        structs!(Baz);
-        crate::structs!(MacroNotResolved3);
-        //- /lib.rs crate:foo
-        #[prelude_import]
-        use self::prelude::*;
-        mod prelude {
-            #[macro_export]
-            macro_rules! structs {
-                ($i:ident) => { struct $i; }
-            }
-            mod priv_mod {
-                #[macro_export]
-                macro_rules! structs_priv {
-                    ($i:ident) => { struct $i; }
-                }
-            }
-        }
+//- /bar.rs
+structs!(Baz);
+crate::structs!(MacroNotResolved3);
+//- /lib.rs crate:foo
+#[prelude_import]
+use self::prelude::*;
+mod prelude {
+    #[macro_export]
+    macro_rules! structs {
+        ($i:ident) => { struct $i; }
+    }
+    mod priv_mod {
        #[macro_export]
-        macro_rules! structs_outside {
+        macro_rules! structs_priv {
            ($i:ident) => { struct $i; }
        }
-        ",
+    }
+}
+#[macro_export]
+macro_rules! structs_outside {
+    ($i:ident) => { struct $i; }
+}
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            Foo: t v
+            Out: t v
+            bar: t
+            crate::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Bar: t v
-   ⋮Foo: t v
-   ⋮Out: t v
-   ⋮bar: t
-   ⋮
-   ⋮crate::bar
-   ⋮Baz: t v
-    "###);
 }
 #[test]
 fn prelude_cycle() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+#[prelude_import]
-        #[prelude_import]
+use self::prelude::*;
-        use self::prelude::*;
-        declare_mod!();
+declare_mod!();
-        mod prelude {
+mod prelude {
-            macro_rules! declare_mod {
+    macro_rules! declare_mod {
-                () => (mod foo {})
+        () => (mod foo {})
-            }
+    }
-        }
+}
-        ",
+"#,
+        expect![[r#"
+            crate
+            prelude: t
+            crate::prelude
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮prelude: t
-        ⋮
-        ⋮crate::prelude
-    "###);
 }
 #[test]
 fn plain_macros_are_legacy_textual_scoped() {
-    let map = def_map(
+    check(
        r#"
-        //- /main.rs
+//- /main.rs
-        mod m1;
+mod m1;
-        bar!(NotFoundNotMacroUse);
+bar!(NotFoundNotMacroUse);
-        mod m2 {
+mod m2 { foo!(NotFoundBeforeInside2); }
-            foo!(NotFoundBeforeInside2);
-        }
-        macro_rules! foo {
+macro_rules! foo {
-            ($x:ident) => { struct $x; }
+    ($x:ident) => { struct $x; }
-        }
+}
-        foo!(Ok);
+foo!(Ok);
-        mod m3;
-        foo!(OkShadowStop);
-        bar!(NotFoundMacroUseStop);
-        #[macro_use]
-        mod m5 {
-            #[macro_use]
-            mod m6 {
-                macro_rules! foo {
-                    ($x:ident) => { fn $x() {} }
-                }
-            }
-        }
-        foo!(ok_double_macro_use_shadow);
-        baz!(NotFoundBefore);
-        #[macro_use]
-        mod m7 {
-            macro_rules! baz {
-                ($x:ident) => { struct $x; }
-            }
-        }
-        baz!(OkAfter);
-        //- /m1.rs
+mod m3;
-        foo!(NotFoundBeforeInside1);
+foo!(OkShadowStop);
-        macro_rules! bar {
+bar!(NotFoundMacroUseStop);
-            ($x:ident) => { struct $x; }
-        }
-        //- /m3/mod.rs
+#[macro_use]
-        foo!(OkAfterInside);
+mod m5 {
+    #[macro_use]
+    mod m6 {
        macro_rules! foo {
            ($x:ident) => { fn $x() {} }
        }
-        foo!(ok_shadow);
+    }
+}
+foo!(ok_double_macro_use_shadow);
+baz!(NotFoundBefore);
+#[macro_use]
+mod m7 {
+    macro_rules! baz {
+        ($x:ident) => { struct $x; }
+    }
+}
+baz!(OkAfter);
-        #[macro_use]
+//- /m1.rs
-        mod m4;
+foo!(NotFoundBeforeInside1);
-        bar!(OkMacroUse);
+macro_rules! bar {
+    ($x:ident) => { struct $x; }
+}
-        //- /m3/m4.rs
+//- /m3/mod.rs
-        foo!(ok_shadow_deep);
+foo!(OkAfterInside);
-        macro_rules! bar {
+macro_rules! foo {
-            ($x:ident) => { struct $x; }
+    ($x:ident) => { fn $x() {} }
-        }
+}
-        "#,
+foo!(ok_shadow);
+#[macro_use]
+mod m4;
+bar!(OkMacroUse);
+//- /m3/m4.rs
+foo!(ok_shadow_deep);
+macro_rules! bar {
+    ($x:ident) => { struct $x; }
+}
+"#,
+        expect![[r#"
+            crate
+            Ok: t v
+            OkAfter: t v
+            OkShadowStop: t v
+            m1: t
+            m2: t
+            m3: t
+            m5: t
+            m7: t
+            ok_double_macro_use_shadow: v
+            crate::m7
+            crate::m1
+            crate::m5
+            m6: t
+            crate::m5::m6
+            crate::m2
+            crate::m3
+            OkAfterInside: t v
+            OkMacroUse: t v
+            m4: t
+            ok_shadow: v
+            crate::m3::m4
+            ok_shadow_deep: v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-   ⋮crate
-   ⋮Ok: t v
-   ⋮OkAfter: t v
-   ⋮OkShadowStop: t v
-   ⋮m1: t
-   ⋮m2: t
-   ⋮m3: t
-   ⋮m5: t
-   ⋮m7: t
-   ⋮ok_double_macro_use_shadow: v
-   ⋮
-   ⋮crate::m7
-   ⋮
-   ⋮crate::m1
-   ⋮
-   ⋮crate::m5
-   ⋮m6: t
-   ⋮
-   ⋮crate::m5::m6
-   ⋮
-   ⋮crate::m2
-   ⋮
-   ⋮crate::m3
-   ⋮OkAfterInside: t v
-   ⋮OkMacroUse: t v
-   ⋮m4: t
-   ⋮ok_shadow: v
-   ⋮
-   ⋮crate::m3::m4
-   ⋮ok_shadow_deep: v
-    "###);
 }
 #[test]
 fn type_value_macro_live_in_different_scopes() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs
+#[macro_export]
-        #[macro_export]
+macro_rules! foo {
-        macro_rules! foo {
+    ($x:ident) => { type $x = (); }
-            ($x:ident) => { type $x = (); }
+}
-        }
-        foo!(foo);
-        use foo as bar;
-        use self::foo as baz;
+foo!(foo);
-        fn baz() {}
+use foo as bar;
-        ",
+use self::foo as baz;
+fn baz() {}
+"#,
+        expect![[r#"
+            crate
+            bar: t m
+            baz: t v m
+            foo: t m
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮bar: t m
-        ⋮baz: t v m
-        ⋮foo: t m
-    "###);
 }
 #[test]
 fn macro_use_can_be_aliased() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        #[macro_use]
+#[macro_use]
-        extern crate foo;
+extern crate foo;
-        foo!(Direct);
+foo!(Direct);
-        bar!(Alias);
+bar!(Alias);
-        //- /lib.rs crate:foo
+//- /lib.rs crate:foo
-        use crate::foo as bar;
+use crate::foo as bar;
-        mod m {
+mod m {
-            #[macro_export]
+    #[macro_export]
-            macro_rules! foo {
+    macro_rules! foo {
-                ($x:ident) => { struct $x; }
+        ($x:ident) => { struct $x; }
-            }
+    }
-        }
+}
-        ",
+"#,
+        expect![[r#"
+            crate
+            Alias: t v
+            Direct: t v
+            foo: t
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Alias: t v
-        ⋮Direct: t v
-        ⋮foo: t
-    "###);
 }
 #[test]
 fn path_qualified_macros() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs
+macro_rules! foo {
-        macro_rules! foo {
+    ($x:ident) => { struct $x; }
-            ($x:ident) => { struct $x; }
+}
-        }
-        crate::foo!(NotResolved);
+crate::foo!(NotResolved);
-        crate::bar!(OkCrate);
+crate::bar!(OkCrate);
-        bar!(OkPlain);
+bar!(OkPlain);
-        alias1!(NotHere);
+alias1!(NotHere);
-        m::alias1!(OkAliasPlain);
+m::alias1!(OkAliasPlain);
-        m::alias2!(OkAliasSuper);
+m::alias2!(OkAliasSuper);
-        m::alias3!(OkAliasCrate);
+m::alias3!(OkAliasCrate);
-        not_found!(NotFound);
+not_found!(NotFound);
-        mod m {
+mod m {
-            #[macro_export]
+    #[macro_export]
-            macro_rules! bar {
+    macro_rules! bar {
-                ($x:ident) => { struct $x; }
+        ($x:ident) => { struct $x; }
-            }
+    }
+    pub use bar as alias1;
-            pub use bar as alias1;
+    pub use super::bar as alias2;
-            pub use super::bar as alias2;
+    pub use crate::bar as alias3;
-            pub use crate::bar as alias3;
+    pub use self::bar as not_found;
-            pub use self::bar as not_found;
+}
-        }
+"#,
-        ",
+        expect![[r#"
+            crate
+            OkAliasCrate: t v
+            OkAliasPlain: t v
+            OkAliasSuper: t v
+            OkCrate: t v
+            OkPlain: t v
+            bar: m
+            m: t
+            crate::m
+            alias1: m
+            alias2: m
+            alias3: m
+            not_found: _
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮OkAliasCrate: t v
-        ⋮OkAliasPlain: t v
-        ⋮OkAliasSuper: t v
-        ⋮OkCrate: t v
-        ⋮OkPlain: t v
-        ⋮bar: m
-        ⋮m: t
-        ⋮
-        ⋮crate::m
-        ⋮alias1: m
-        ⋮alias2: m
-        ⋮alias3: m
-        ⋮not_found: _
-    "###);
 }
 #[test]
 fn macro_dollar_crate_is_correct_in_item() {
    mark::check!(macro_dollar_crate_self);
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /main.rs crate:main deps:foo
+//- /main.rs crate:main deps:foo
-        #[macro_use]
+#[macro_use]
-        extern crate foo;
+extern crate foo;
-        #[macro_use]
+#[macro_use]
-        mod m {
+mod m {
-            macro_rules! current {
+    macro_rules! current {
-                () => {
+        () => {
-                    use $crate::Foo as FooSelf;
+            use $crate::Foo as FooSelf;
-                }
-            }
        }
+    }
+}
-        struct Foo;
+struct Foo;
-        current!();
+current!();
-        not_current1!();
+not_current1!();
-        foo::not_current2!();
+foo::not_current2!();
-        //- /lib.rs crate:foo
-        mod m {
-            #[macro_export]
-            macro_rules! not_current1 {
-                () => {
-                    use $crate::Bar;
-                }
-            }
-        }
-        #[macro_export]
+//- /lib.rs crate:foo
-        macro_rules! not_current2 {
+mod m {
-            () => {
+    #[macro_export]
-                use $crate::Baz;
+    macro_rules! not_current1 {
-            }
+        () => {
+            use $crate::Bar;
        }
+    }
+}
-        struct Bar;
+#[macro_export]
-        struct Baz;
+macro_rules! not_current2 {
-        ",
+    () => {
+        use $crate::Baz;
+    }
+}
+struct Bar;
+struct Baz;
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            Baz: t v
+            Foo: t v
+            FooSelf: t v
+            foo: t
+            m: t
+            crate::m
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮Baz: t v
-        ⋮Foo: t v
-        ⋮FooSelf: t v
-        ⋮foo: t
-        ⋮m: t
-        ⋮
-        ⋮crate::m
-    "###);
 }
 #[test]
 fn macro_dollar_crate_is_correct_in_indirect_deps() {
    mark::check!(macro_dollar_crate_other);
    // From std
-    let map = def_map(
+    check(
        r#"
-        //- /main.rs crate:main deps:std
+//- /main.rs crate:main deps:std
-        foo!();
+foo!();
-        //- /std.rs crate:std deps:core
+//- /std.rs crate:std deps:core
-        #[prelude_import]
+#[prelude_import]
-        use self::prelude::*;
+use self::prelude::*;
-        pub use core::foo;
+pub use core::foo;
-        mod prelude {}
+mod prelude {}
-        #[macro_use]
+#[macro_use]
-        mod std_macros;
+mod std_macros;
-        //- /core.rs crate:core
+//- /core.rs crate:core
-        #[macro_export]
+#[macro_export]
-        macro_rules! foo {
+macro_rules! foo {
-            () => {
+    () => {
-                use $crate::bar;
+        use $crate::bar;
-            }
+    }
-        }
+}
-        pub struct bar;
+pub struct bar;
-        "#,
+"#,
+        expect![[r#"
+            crate
+            bar: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮bar: t v
-    "###);
 }
 #[test]
@@ -642,21 +634,36 @@ fn expand_derive() {
    let map = compute_crate_def_map(
        "
        //- /main.rs
-        #[derive(Clone)]
+        #[derive(Copy, Clone)]
        struct Foo;
        ",
    );
-    assert_eq!(map.modules[map.root].scope.impls().len(), 1);
+    assert_eq!(map.modules[map.root].scope.impls().len(), 2);
 }
 #[test]
-fn expand_multiple_derive() {
+fn macro_expansion_overflow() {
-    let map = compute_crate_def_map(
+    mark::check!(macro_expansion_overflow);
-        "
+    check(
-        //- /main.rs
+        r#"
-        #[derive(Copy, Clone)]
+macro_rules! a {
-        struct Foo;
+    ($e:expr; $($t:tt)*) => {
-        ",
+        b!($($t)*);
+    };
+    () => {};
+}
+macro_rules! b {
+    (static = $e:expr; $($t:tt)*) => {
+        a!($e; $($t)*);
+    };
+    () => {};
+}
+b! { static = #[] (); }
+"#,
+        expect![[r#"
+            crate
+        "#]],
    );
-    assert_eq!(map.modules[map.root].scope.impls().len(), 2);
 }
diff --git a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs
index 753684201..ae58948c4 100644
--- a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs
@@ -3,710 +3,672 @@ use super::*;
 #[test]
 fn name_res_works_for_broken_modules() {
    mark::check!(name_res_works_for_broken_modules);
-    let map = def_map(
+    check(
        r"
-        //- /lib.rs
+//- /lib.rs
-        mod foo // no `;`, no body
+mod foo // no `;`, no body
+use self::foo::Baz;
-        use self::foo::Baz;
+//- /foo/mod.rs
-        //- /foo/mod.rs
+pub mod bar;
-        pub mod bar;
+pub use self::bar::Baz;
-        pub use self::bar::Baz;
+//- /foo/bar.rs
+pub struct Baz;
-        //- /foo/bar.rs
+",
-        pub struct Baz;
+        expect![[r#"
-        ",
+            crate
+            Baz: _
+            foo: t
+            crate::foo
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-crate
-Baz: _
-foo: t
-crate::foo
-    "###);
 }
 #[test]
 fn nested_module_resolution() {
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod n1;
+mod n1;
-        //- /n1.rs
+//- /n1.rs
-        mod n2;
+mod n2;
-        //- /n1/n2.rs
+//- /n1/n2.rs
-        struct X;
+struct X;
-        ",
+"#,
+        expect![[r#"
+            crate
+            n1: t
+            crate::n1
+            n2: t
+            crate::n1::n2
+            X: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮n1: t
-        ⋮
-        ⋮crate::n1
-        ⋮n2: t
-        ⋮
-        ⋮crate::n1::n2
-        ⋮X: t v
-    "###);
 }
 #[test]
 fn nested_module_resolution_2() {
-    let map = def_map(
+    check(
-        r"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod prelude;
+mod prelude;
-        mod iter;
+mod iter;
-        //- /prelude.rs
+//- /prelude.rs
-        pub use crate::iter::Iterator;
+pub use crate::iter::Iterator;
-        //- /iter.rs
+//- /iter.rs
-        pub use self::traits::Iterator;
+pub use self::traits::Iterator;
-        mod traits;
+mod traits;
-        //- /iter/traits.rs
+//- /iter/traits.rs
-        pub use self::iterator::Iterator;
+pub use self::iterator::Iterator;
-        mod iterator;
+mod iterator;
-        //- /iter/traits/iterator.rs
+//- /iter/traits/iterator.rs
-        pub trait Iterator;
+pub trait Iterator;
-        ",
+"#,
+        expect![[r#"
+            crate
+            iter: t
+            prelude: t
+            crate::iter
+            Iterator: t
+            traits: t
+            crate::iter::traits
+            Iterator: t
+            iterator: t
+            crate::iter::traits::iterator
+            Iterator: t
+            crate::prelude
+            Iterator: t
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮iter: t
-        ⋮prelude: t
-        ⋮
-        ⋮crate::iter
-        ⋮Iterator: t
-        ⋮traits: t
-        ⋮
-        ⋮crate::iter::traits
-        ⋮Iterator: t
-        ⋮iterator: t
-        ⋮
-        ⋮crate::iter::traits::iterator
-        ⋮Iterator: t
-        ⋮
-        ⋮crate::prelude
-        ⋮Iterator: t
-    "###);
 }
 #[test]
 fn module_resolution_works_for_non_standard_filenames() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /my_library.rs crate:my_library
+//- /my_library.rs crate:my_library
-        mod foo;
+mod foo;
-        use self::foo::Bar;
+use self::foo::Bar;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        pub struct Bar;
+pub struct Bar;
-        ",
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            foo: t
+            crate::foo
+            Bar: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Bar: t v
-    "###);
 }
 #[test]
 fn module_resolution_works_for_raw_modules() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod r#async;
+mod r#async;
-        use self::r#async::Bar;
+use self::r#async::Bar;
-        //- /async.rs
+//- /async.rs
-        pub struct Bar;
+pub struct Bar;
-        ",
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            async: t
+            crate::async
+            Bar: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮async: t
-        ⋮
-        ⋮crate::async
-        ⋮Bar: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_path() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        #[path = "bar/baz/foo.rs"]
+#[path = "bar/baz/foo.rs"]
-        mod foo;
+mod foo;
-        use self::foo::Bar;
+use self::foo::Bar;
-        //- /bar/baz/foo.rs
+//- /bar/baz/foo.rs
-        pub struct Bar;
+pub struct Bar;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            Bar: t v
+            foo: t
+            crate::foo
+            Bar: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Bar: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Bar: t v
-    "###);
 }
 #[test]
 fn module_resolution_module_with_path_in_mod_rs() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo;
+mod foo;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        #[path = "baz.rs"]
+#[path = "baz.rs"]
-        pub mod bar;
+pub mod bar;
+use self::bar::Baz;
-        use self::bar::Baz;
+//- /foo/baz.rs
-        //- /foo/baz.rs
+pub struct Baz;
-        pub struct Baz;
+"#,
-        "###,
+        expect![[r#"
+            crate
+            foo: t
+            crate::foo
+            Baz: t v
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_module_with_path_non_crate_root() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo;
+mod foo;
-        //- /foo.rs
+//- /foo.rs
-        #[path = "baz.rs"]
+#[path = "baz.rs"]
-        pub mod bar;
+pub mod bar;
+use self::bar::Baz;
-        use self::bar::Baz;
+//- /baz.rs
-        //- /baz.rs
+pub struct Baz;
-        pub struct Baz;
+"#,
-        "###,
+        expect![[r#"
+            crate
+            foo: t
+            crate::foo
+            Baz: t v
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_module_decl_path_super() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = "bar/baz/module.rs"]
+#[path = "bar/baz/module.rs"]
-        mod foo;
+mod foo;
-        pub struct Baz;
+pub struct Baz;
-        //- /bar/baz/module.rs
+//- /bar/baz/module.rs
-        use super::Baz;
+use super::Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            Baz: t v
+            foo: t
+            crate::foo
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_explicit_path_mod_rs() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = "module/mod.rs"]
+#[path = "module/mod.rs"]
-        mod foo;
+mod foo;
-        //- /module/mod.rs
+//- /module/mod.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            foo: t
+            crate::foo
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_relative_path() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo;
+mod foo;
-        //- /foo.rs
+//- /foo.rs
-        #[path = "./sub.rs"]
+#[path = "./sub.rs"]
-        pub mod foo_bar;
+pub mod foo_bar;
-        //- /sub.rs
+//- /sub.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            foo: t
+            crate::foo
+            foo_bar: t
+            crate::foo::foo_bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮foo_bar: t
-        ⋮
-        ⋮crate::foo::foo_bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_relative_path_2() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo;
+mod foo;
-        //- /foo/mod.rs
+//- /foo/mod.rs
-        #[path="../sub.rs"]
+#[path="../sub.rs"]
-        pub mod foo_bar;
+pub mod foo_bar;
-        //- /sub.rs
+//- /sub.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            foo: t
+            crate::foo
+            foo_bar: t
+            crate::foo::foo_bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮foo_bar: t
-        ⋮
-        ⋮crate::foo::foo_bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_relative_path_outside_root() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
+#[path="../../../../../outside.rs"]
-        #[path="../../../../../outside.rs"]
+mod foo;
-        mod foo;
+"#,
-        "###,
+        expect![[r#"
+            crate
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-    "###);
 }
 #[test]
 fn module_resolution_explicit_path_mod_rs_2() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = "module/bar/mod.rs"]
+#[path = "module/bar/mod.rs"]
-        mod foo;
+mod foo;
-        //- /module/bar/mod.rs
+//- /module/bar/mod.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            foo: t
+            crate::foo
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_explicit_path_mod_rs_with_win_separator() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = "module\bar\mod.rs"]
+#[path = "module\bar\mod.rs"]
-        mod foo;
+mod foo;
-        //- /module/bar/mod.rs
+//- /module/bar/mod.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            foo: t
+            crate::foo
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_with_path_attribute() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = "models"]
+#[path = "models"]
-        mod foo {
+mod foo { mod bar; }
-            mod bar;
-        }
+//- /models/bar.rs
+pub struct Baz;
-        //- /models/bar.rs
+"#,
-        pub struct Baz;
+        expect![[r#"
-        "###,
+            crate
+            foo: t
+            crate::foo
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo {
+mod foo { mod bar; }
-            mod bar;
-        }
+//- /foo/bar.rs
+pub struct Baz;
-        //- /foo/bar.rs
+"#,
-        pub struct Baz;
+        expect![[r#"
-        "###,
+            crate
+            foo: t
+            crate::foo
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = "models/db"]
+#[path = "models/db"]
-        mod foo {
+mod foo { mod bar; }
-            mod bar;
-        }
+//- /models/db/bar.rs
+pub struct Baz;
-        //- /models/db/bar.rs
+"#,
-        pub struct Baz;
+        expect![[r#"
-        "###,
+            crate
+            foo: t
+            crate::foo
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_3() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = "models/db"]
+#[path = "models/db"]
-        mod foo {
+mod foo {
-            #[path = "users.rs"]
+    #[path = "users.rs"]
-            mod bar;
+    mod bar;
-        }
+}
-        //- /models/db/users.rs
+//- /models/db/users.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
-    );
+        expect![[r#"
+            crate
+            foo: t
-    assert_snapshot!(map, @r###"
+            crate::foo
-        ⋮crate
+            bar: t
-        ⋮foo: t
-        ⋮
+            crate::foo::bar
-        ⋮crate::foo
+            Baz: t v
-        ⋮bar: t
+        "#]],
-        ⋮
+    );
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_empty_path() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = ""]
+#[path = ""]
-        mod foo {
+mod foo {
-            #[path = "users.rs"]
+    #[path = "users.rs"]
-            mod bar;
+    mod bar;
-        }
+}
-        //- /users.rs
-        pub struct Baz;
-        "###,
-    );
-    assert_snapshot!(map, @r###"
+//- /users.rs
-        ⋮crate
+pub struct Baz;
-        ⋮foo: t
+"#,
-        ⋮
+        expect![[r#"
-        ⋮crate::foo
+            crate
-        ⋮bar: t
+            foo: t
-        ⋮
-        ⋮crate::foo::bar
+            crate::foo
-        ⋮Baz: t v
+            bar: t
-    "###);
+            crate::foo::bar
+            Baz: t v
+        "#]],
+    );
 }
 #[test]
 fn module_resolution_decl_empty_path() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = ""] // Should try to read `/` (a directory)
+#[path = ""] // Should try to read `/` (a directory)
-        mod foo;
+mod foo;
-        //- /foo.rs
+//- /foo.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_relative_path() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path = "./models"]
+#[path = "./models"]
-        mod foo {
+mod foo { mod bar; }
-            mod bar;
-        }
+//- /models/bar.rs
+pub struct Baz;
-        //- /models/bar.rs
+"#,
-        pub struct Baz;
+        expect![[r#"
-        "###,
+            crate
+            foo: t
+            crate::foo
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_in_crate_root() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo {
+mod foo {
-            #[path = "baz.rs"]
+    #[path = "baz.rs"]
-            mod bar;
+    mod bar;
-        }
+}
-        use self::foo::bar::Baz;
+use self::foo::bar::Baz;
-        //- /foo/baz.rs
+//- /foo/baz.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            Baz: t v
+            foo: t
+            crate::foo
+            bar: t
+            crate::foo::bar
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮Baz: t v
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_in_mod_rs() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo;
+mod foo;
+//- /foo/mod.rs
+mod bar {
+    #[path = "qwe.rs"]
+    pub mod baz;
+}
+use self::bar::baz::Baz;
-        //- /foo/mod.rs
+//- /foo/bar/qwe.rs
-        mod bar {
+pub struct Baz;
-            #[path = "qwe.rs"]
+"#,
-            pub mod baz;
+        expect![[r#"
-        }
+            crate
-        use self::bar::baz::Baz;
+            foo: t
-        //- /foo/bar/qwe.rs
+            crate::foo
-        pub struct Baz;
+            Baz: t v
-        "###,
+            bar: t
-    );
+            crate::foo::bar
+            baz: t
-    assert_snapshot!(map, @r###"
+            crate::foo::bar::baz
-        ⋮crate
+            Baz: t v
-        ⋮foo: t
+        "#]],
-        ⋮
+    );
-        ⋮crate::foo
-        ⋮Baz: t v
-        ⋮bar: t
-        ⋮
-        ⋮crate::foo::bar
-        ⋮baz: t
-        ⋮
-        ⋮crate::foo::bar::baz
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo;
+mod foo;
+//- /foo.rs
+mod bar {
+    #[path = "qwe.rs"]
+    pub mod baz;
+}
+use self::bar::baz::Baz;
-        //- /foo.rs
+//- /foo/bar/qwe.rs
-        mod bar {
+pub struct Baz;
-            #[path = "qwe.rs"]
+"#,
-            pub mod baz;
+        expect![[r#"
-        }
+            crate
-        use self::bar::baz::Baz;
+            foo: t
-        //- /foo/bar/qwe.rs
-        pub struct Baz;
-        "###,
-    );
-    assert_snapshot!(map, @r###"
+            crate::foo
-        ⋮crate
+            Baz: t v
-        ⋮foo: t
+            bar: t
-        ⋮
-        ⋮crate::foo
+            crate::foo::bar
-        ⋮Baz: t v
+            baz: t
-        ⋮bar: t
-        ⋮
+            crate::foo::bar::baz
-        ⋮crate::foo::bar
+            Baz: t v
-        ⋮baz: t
+        "#]],
-        ⋮
+    );
-        ⋮crate::foo::bar::baz
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_in_non_crate_root_2() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        mod foo;
+mod foo;
+//- /foo.rs
+#[path = "bar"]
+mod bar {
+    pub mod baz;
+}
+use self::bar::baz::Baz;
-        //- /foo.rs
+//- /bar/baz.rs
-        #[path = "bar"]
+pub struct Baz;
-        mod bar {
+"#,
-            pub mod baz;
+        expect![[r#"
-        }
+            crate
-        use self::bar::baz::Baz;
+            foo: t
-        //- /bar/baz.rs
+            crate::foo
-        pub struct Baz;
+            Baz: t v
-        "###,
+            bar: t
-    );
-    assert_snapshot!(map, @r###"
+            crate::foo::bar
-        ⋮crate
+            baz: t
-        ⋮foo: t
-        ⋮
+            crate::foo::bar::baz
-        ⋮crate::foo
+            Baz: t v
-        ⋮Baz: t v
+        "#]],
-        ⋮bar: t
+    );
-        ⋮
-        ⋮crate::foo::bar
-        ⋮baz: t
-        ⋮
-        ⋮crate::foo::bar::baz
-        ⋮Baz: t v
-    "###);
 }
 #[test]
@@ -724,116 +686,111 @@ fn unresolved_module_diagnostics() {
    let crate_def_map = db.crate_def_map(krate);
-    insta::assert_debug_snapshot!(
+    expect![[r#"
-        crate_def_map.diagnostics,
+        [
-        @r###"
+            UnresolvedModule {
-    [
+                module: Idx::<ModuleData>(0),
-        UnresolvedModule {
+                declaration: InFile {
-            module: Idx::<ModuleData>(0),
+                    file_id: HirFileId(
-            declaration: InFile {
-                file_id: HirFileId(
-                    FileId(
                        FileId(
-                            0,
+                            FileId(
+                                0,
+                            ),
                        ),
                    ),
-                ),
+                    value: FileAstId::<ra_syntax::ast::generated::nodes::Module>(1),
-                value: FileAstId::<ra_syntax::ast::generated::nodes::Module>(1),
+                },
+                candidate: "bar.rs",
            },
-            candidate: "bar.rs",
+        ]
-        },
+    "#]]
-    ]
+    .assert_debug_eq(&crate_def_map.diagnostics);
-    "###
-    );
 }
 #[test]
 fn module_resolution_decl_inside_module_in_non_crate_root_2() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /main.rs
+//- /main.rs
-        #[path="module/m2.rs"]
+#[path="module/m2.rs"]
-        mod module;
+mod module;
-        //- /module/m2.rs
+//- /module/m2.rs
-        pub mod submod;
+pub mod submod;
-        //- /module/submod.rs
+//- /module/submod.rs
-        pub struct Baz;
+pub struct Baz;
-        "###,
+"#,
+        expect![[r#"
+            crate
+            module: t
+            crate::module
+            submod: t
+            crate::module::submod
+            Baz: t v
+        "#]],
    );
-    assert_snapshot!(map, @r###"
-        ⋮crate
-        ⋮module: t
-        ⋮
-        ⋮crate::module
-        ⋮submod: t
-        ⋮
-        ⋮crate::module::submod
-        ⋮Baz: t v
-    "###);
 }
 #[test]
 fn nested_out_of_line_module() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod a {
+mod a {
-            mod b {
+    mod b {
-                mod c;
+        mod c;
-            }
+    }
-        }
+}
-        //- /a/b/c.rs
-        struct X;
-        "###,
-    );
-    assert_snapshot!(map, @r###"
+//- /a/b/c.rs
-        ⋮crate
+struct X;
-        ⋮a: t
+"#,
-        ⋮
+        expect![[r#"
-        ⋮crate::a
+            crate
-        ⋮b: t
+            a: t
-        ⋮
-        ⋮crate::a::b
+            crate::a
-        ⋮c: t
+            b: t
-        ⋮
-        ⋮crate::a::b::c
+            crate::a::b
-        ⋮X: t v
+            c: t
-    "###);
+            crate::a::b::c
+            X: t v
+        "#]],
+    );
 }
 #[test]
 fn nested_out_of_line_module_with_path() {
-    let map = def_map(
+    check(
-        r###"
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod a {
+mod a {
-            #[path = "d/e"]
+    #[path = "d/e"]
-            mod b {
+    mod b {
-                mod c;
+        mod c;
-            }
+    }
-        }
+}
-        //- /a/d/e/c.rs
+//- /a/d/e/c.rs
-        struct X;
+struct X;
-        "###,
+"#,
-    );
+        expect![[r#"
+            crate
+            a: t
-    assert_snapshot!(map, @r###"
+            crate::a
-        ⋮crate
+            b: t
-        ⋮a: t
-        ⋮
+            crate::a::b
-        ⋮crate::a
+            c: t
-        ⋮b: t
-        ⋮
+            crate::a::b::c
-        ⋮crate::a::b
+            X: t v
-        ⋮c: t
+        "#]],
-        ⋮
+    );
-        ⋮crate::a::b::c
-        ⋮X: t v
-    "###);
 }
diff --git a/crates/ra_hir_def/src/nameres/tests/primitives.rs b/crates/ra_hir_def/src/nameres/tests/primitives.rs
index 0e2708658..215e8952d 100644
--- a/crates/ra_hir_def/src/nameres/tests/primitives.rs
+++ b/crates/ra_hir_def/src/nameres/tests/primitives.rs
@@ -2,23 +2,22 @@ use super::*;
 #[test]
 fn primitive_reexport() {
-    let map = def_map(
+    check(
-        "
+        r#"
-        //- /lib.rs
+//- /lib.rs
-        mod foo;
+mod foo;
-        use foo::int;
+use foo::int;
-        //- /foo.rs
+//- /foo.rs
-        pub use i32 as int;
+pub use i32 as int;
-        ",
+"#,
-    );
+        expect![[r#"
-    assert_snapshot!(map, @r###"
+            crate
-   ⋮crate
+            foo: t
-   ⋮foo: t
+            int: t
-   ⋮int: t
-   ⋮
+            crate::foo
-   ⋮crate::foo
+            int: t
-   ⋮int: t
+        "#]],
-    "###
    );
 }
diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs
index 190d6d98d..68b9f89c3 100644
--- a/crates/ra_hir_def/src/path.rs
+++ b/crates/ra_hir_def/src/path.rs
@@ -67,7 +67,7 @@ impl ModPath {
    /// Calls `cb` with all paths, represented by this use item.
    pub(crate) fn expand_use_item(
-        item_src: InFile<ast::UseItem>,
+        item_src: InFile<ast::Use>,
        hygiene: &Hygiene,
        mut cb: impl FnMut(ModPath, &ast::UseTree, /* is_glob */ bool, Option<ImportAlias>),
    ) {
diff --git a/crates/ra_hir_def/src/path/lower.rs b/crates/ra_hir_def/src/path/lower.rs
index 6a0c019fd..07d17916a 100644
--- a/crates/ra_hir_def/src/path/lower.rs
+++ b/crates/ra_hir_def/src/path/lower.rs
@@ -9,7 +9,7 @@ use hir_expand::{
    hygiene::Hygiene,
    name::{name, AsName},
 };
-use ra_syntax::ast::{self, AstNode, TypeAscriptionOwner, TypeBoundsOwner};
+use ra_syntax::ast::{self, AstNode, TypeBoundsOwner};
 use super::AssociatedTypeBinding;
 use crate::{
@@ -189,14 +189,14 @@ fn lower_generic_args_from_fn_path(
    if let Some(params) = params {
        let mut param_types = Vec::new();
        for param in params.params() {
-            let type_ref = TypeRef::from_ast_opt(&ctx, param.ascribed_type());
+            let type_ref = TypeRef::from_ast_opt(&ctx, param.ty());
            param_types.push(type_ref);
        }
        let arg = GenericArg::Type(TypeRef::Tuple(param_types));
        args.push(arg);
    }
    if let Some(ret_type) = ret_type {
-        let type_ref = TypeRef::from_ast_opt(&ctx, ret_type.type_ref());
+        let type_ref = TypeRef::from_ast_opt(&ctx, ret_type.ty());
        bindings.push(AssociatedTypeBinding {
            name: name![Output],
            type_ref: Some(type_ref),
diff --git a/crates/ra_hir_def/src/path/lower/lower_use.rs b/crates/ra_hir_def/src/path/lower/lower_use.rs
index 7cc655487..794be45e8 100644
--- a/crates/ra_hir_def/src/path/lower/lower_use.rs
+++ b/crates/ra_hir_def/src/path/lower/lower_use.rs
@@ -31,7 +31,7 @@ pub(crate) fn lower_use_tree(
            lower_use_tree(prefix.clone(), child_tree, hygiene, cb);
        }
    } else {
-        let alias = tree.alias().map(|a| {
+        let alias = tree.rename().map(|a| {
            a.name().map(|it| it.as_name()).map_or(ImportAlias::Underscore, ImportAlias::Alias)
        });
        let is_glob = tree.star_token().is_some();
diff --git a/crates/ra_hir_def/src/resolver.rs b/crates/ra_hir_def/src/resolver.rs
index 15fdd9019..0bf51eb7b 100644
--- a/crates/ra_hir_def/src/resolver.rs
+++ b/crates/ra_hir_def/src/resolver.rs
@@ -511,11 +511,9 @@ impl Scope {
                    });
                }
            }
-            Scope::LocalItemsScope(body) => {
+            Scope::LocalItemsScope(body) => body.item_scope.entries().for_each(|(name, def)| {
-                body.item_scope.entries_without_primitives().for_each(|(name, def)| {
+                f(name.clone(), ScopeDef::PerNs(def));
-                    f(name.clone(), ScopeDef::PerNs(def));
+            }),
-                })
-            }
            Scope::GenericParams { params, def } => {
                for (local_id, param) in params.types.iter() {
                    if let Some(name) = &param.name {
diff --git a/crates/ra_hir_def/src/test_db.rs b/crates/ra_hir_def/src/test_db.rs
index 4581d8745..339f819b8 100644
--- a/crates/ra_hir_def/src/test_db.rs
+++ b/crates/ra_hir_def/src/test_db.rs
@@ -1,7 +1,7 @@
 //! Database used for testing `hir_def`.
 use std::{
-    panic,
+    fmt, panic,
    sync::{Arc, Mutex},
 };
@@ -18,10 +18,10 @@ use crate::db::DefDatabase;
    crate::db::InternDatabaseStorage,
    crate::db::DefDatabaseStorage
 )]
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct TestDB {
-    runtime: salsa::Runtime<TestDB>,
+    storage: salsa::Storage<TestDB>,
-    events: Mutex<Option<Vec<salsa::Event<TestDB>>>>,
+    events: Mutex<Option<Vec<salsa::Event>>>,
 }
 impl Upcast<dyn AstDatabase> for TestDB {
@@ -37,20 +37,20 @@ impl Upcast<dyn DefDatabase> for TestDB {
 }
 impl salsa::Database for TestDB {
-    fn salsa_runtime(&self) -> &salsa::Runtime<Self> {
+    fn salsa_event(&self, event: salsa::Event) {
-        &self.runtime
-    }
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime<Self> {
-        &mut self.runtime
-    }
-    fn salsa_event(&self, event: impl Fn() -> salsa::Event<TestDB>) {
        let mut events = self.events.lock().unwrap();
        if let Some(events) = &mut *events {
-            events.push(event());
+            events.push(event);
        }
    }
 }
+impl fmt::Debug for TestDB {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("TestDB").finish()
+    }
+}
 impl panic::RefUnwindSafe for TestDB {}
 impl FileLoader for TestDB {
@@ -78,7 +78,7 @@ impl TestDB {
        panic!("Can't find module for file")
    }
-    pub fn log(&self, f: impl FnOnce()) -> Vec<salsa::Event<TestDB>> {
+    pub fn log(&self, f: impl FnOnce()) -> Vec<salsa::Event> {
        *self.events.lock().unwrap() = Some(Vec::new());
        f();
        self.events.lock().unwrap().take().unwrap()
@@ -92,7 +92,7 @@ impl TestDB {
                // This pretty horrible, but `Debug` is the only way to inspect
                // QueryDescriptor at the moment.
                salsa::EventKind::WillExecute { database_key } => {
-                    Some(format!("{:?}", database_key))
+                    Some(format!("{:?}", database_key.debug(self)))
                }
                _ => None,
            })
diff --git a/crates/ra_hir_def/src/type_ref.rs b/crates/ra_hir_def/src/type_ref.rs
index 86a77b704..a5dc10eac 100644
--- a/crates/ra_hir_def/src/type_ref.rs
+++ b/crates/ra_hir_def/src/type_ref.rs
@@ -1,7 +1,7 @@
 //! HIR for references to types. Paths in these are not yet resolved. They can
 //! be directly created from an ast::TypeRef, without further queries.
-use ra_syntax::ast::{self, TypeAscriptionOwner, TypeBoundsOwner};
+use ra_syntax::ast::{self};
 use crate::{body::LowerCtx, path::Path};
@@ -63,7 +63,7 @@ pub enum TypeRef {
    Array(Box<TypeRef> /*, Expr*/),
    Slice(Box<TypeRef>),
    /// A fn pointer. Last element of the vector is the return type.
-    Fn(Vec<TypeRef>),
+    Fn(Vec<TypeRef>, bool /*varargs*/),
    // For
    ImplTrait(Vec<TypeBound>),
    DynTrait(Vec<TypeBound>),
@@ -82,7 +82,7 @@ impl TypeRef {
    /// Converts an `ast::TypeRef` to a `hir::TypeRef`.
    pub(crate) fn from_ast(ctx: &LowerCtx, node: ast::TypeRef) -> Self {
        match node {
-            ast::TypeRef::ParenType(inner) => TypeRef::from_ast_opt(&ctx, inner.type_ref()),
+            ast::TypeRef::ParenType(inner) => TypeRef::from_ast_opt(&ctx, inner.ty()),
            ast::TypeRef::TupleType(inner) => {
                TypeRef::Tuple(inner.fields().map(|it| TypeRef::from_ast(ctx, it)).collect())
            }
@@ -96,18 +96,18 @@ impl TypeRef {
                    .unwrap_or(TypeRef::Error)
            }
            ast::TypeRef::PointerType(inner) => {
-                let inner_ty = TypeRef::from_ast_opt(&ctx, inner.type_ref());
+                let inner_ty = TypeRef::from_ast_opt(&ctx, inner.ty());
                let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                TypeRef::RawPtr(Box::new(inner_ty), mutability)
            }
            ast::TypeRef::ArrayType(inner) => {
-                TypeRef::Array(Box::new(TypeRef::from_ast_opt(&ctx, inner.type_ref())))
+                TypeRef::Array(Box::new(TypeRef::from_ast_opt(&ctx, inner.ty())))
            }
            ast::TypeRef::SliceType(inner) => {
-                TypeRef::Slice(Box::new(TypeRef::from_ast_opt(&ctx, inner.type_ref())))
+                TypeRef::Slice(Box::new(TypeRef::from_ast_opt(&ctx, inner.ty())))
            }
            ast::TypeRef::ReferenceType(inner) => {
-                let inner_ty = TypeRef::from_ast_opt(&ctx, inner.type_ref());
+                let inner_ty = TypeRef::from_ast_opt(&ctx, inner.ty());
                let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                TypeRef::Reference(Box::new(inner_ty), mutability)
            }
@@ -115,22 +115,24 @@ impl TypeRef {
            ast::TypeRef::FnPointerType(inner) => {
                let ret_ty = inner
                    .ret_type()
-                    .and_then(|rt| rt.type_ref())
+                    .and_then(|rt| rt.ty())
                    .map(|it| TypeRef::from_ast(ctx, it))
                    .unwrap_or_else(|| TypeRef::Tuple(Vec::new()));
+                let mut is_varargs = false;
                let mut params = if let Some(pl) = inner.param_list() {
-                    pl.params()
+                    if let Some(param) = pl.params().last() {
-                        .map(|p| p.ascribed_type())
+                        is_varargs = param.dotdotdot_token().is_some();
-                        .map(|it| TypeRef::from_ast_opt(&ctx, it))
+                    }
-                        .collect()
+                    pl.params().map(|p| p.ty()).map(|it| TypeRef::from_ast_opt(&ctx, it)).collect()
                } else {
                    Vec::new()
                };
                params.push(ret_ty);
-                TypeRef::Fn(params)
+                TypeRef::Fn(params, is_varargs)
            }
            // for types are close enough for our purposes to the inner type for now...
-            ast::TypeRef::ForType(inner) => TypeRef::from_ast_opt(&ctx, inner.type_ref()),
+            ast::TypeRef::ForType(inner) => TypeRef::from_ast_opt(&ctx, inner.ty()),
            ast::TypeRef::ImplTraitType(inner) => {
                TypeRef::ImplTrait(type_bounds_from_ast(ctx, inner.type_bound_list()))
            }
@@ -158,7 +160,9 @@ impl TypeRef {
        fn go(type_ref: &TypeRef, f: &mut impl FnMut(&TypeRef)) {
            f(type_ref);
            match type_ref {
-                TypeRef::Fn(types) | TypeRef::Tuple(types) => types.iter().for_each(|t| go(t, f)),
+                TypeRef::Fn(types, _) | TypeRef::Tuple(types) => {
+                    types.iter().for_each(|t| go(t, f))
+                }
                TypeRef::RawPtr(type_ref, _)
                | TypeRef::Reference(type_ref, _)
                | TypeRef::Array(type_ref)
diff --git a/crates/ra_hir_def/src/visibility.rs b/crates/ra_hir_def/src/visibility.rs
index 8136cb50c..1abffb4c3 100644
--- a/crates/ra_hir_def/src/visibility.rs
+++ b/crates/ra_hir_def/src/visibility.rs
@@ -5,6 +5,7 @@ use ra_syntax::ast;
 use crate::{
    db::DefDatabase,
+    nameres::CrateDefMap,
    path::{ModPath, PathKind},
    ModuleId,
 };
@@ -115,7 +116,7 @@ impl Visibility {
    pub(crate) fn is_visible_from_def_map(
        self,
-        def_map: &crate::nameres::CrateDefMap,
+        def_map: &CrateDefMap,
        from_module: crate::LocalModuleId,
    ) -> bool {
        let to_module = match self {
@@ -129,4 +130,42 @@ impl Visibility {
        });
        ancestors.any(|m| m == to_module.local_id)
    }
+    /// Returns the most permissive visibility of `self` and `other`.
+    ///
+    /// If there is no subset relation between `self` and `other`, returns `None` (ie. they're only
+    /// visible in unrelated modules).
+    pub(crate) fn max(self, other: Visibility, def_map: &CrateDefMap) -> Option<Visibility> {
+        match (self, other) {
+            (Visibility::Module(_), Visibility::Public)
+            | (Visibility::Public, Visibility::Module(_))
+            | (Visibility::Public, Visibility::Public) => Some(Visibility::Public),
+            (Visibility::Module(mod_a), Visibility::Module(mod_b)) => {
+                if mod_a.krate != mod_b.krate {
+                    return None;
+                }
+                let mut a_ancestors = std::iter::successors(Some(mod_a.local_id), |m| {
+                    let parent_id = def_map[*m].parent?;
+                    Some(parent_id)
+                });
+                let mut b_ancestors = std::iter::successors(Some(mod_b.local_id), |m| {
+                    let parent_id = def_map[*m].parent?;
+                    Some(parent_id)
+                });
+                if a_ancestors.any(|m| m == mod_b.local_id) {
+                    // B is above A
+                    return Some(Visibility::Module(mod_b));
+                }
+                if b_ancestors.any(|m| m == mod_a.local_id) {
+                    // A is above B
+                    return Some(Visibility::Module(mod_a));
+                }
+                None
+            }
+        }
+    }
 }
diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/ra_hir_expand/Cargo.toml
index e5c9f3e99..6da0e2a16 100644
--- a/crates/ra_hir_expand/Cargo.toml
+++ b/crates/ra_hir_expand/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_hir_expand"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_hir_expand/src/ast_id_map.rs b/crates/ra_hir_expand/src/ast_id_map.rs
index f4d31526a..8bfe1b4ba 100644
--- a/crates/ra_hir_expand/src/ast_id_map.rs
+++ b/crates/ra_hir_expand/src/ast_id_map.rs
@@ -73,7 +73,7 @@ impl AstIdMap {
        // change parent's id. This means that, say, adding a new function to a
        // trait does not change ids of top-level items, which helps caching.
        bfs(node, |it| {
-            if let Some(module_item) = ast::ModuleItem::cast(it) {
+            if let Some(module_item) = ast::Item::cast(it) {
                res.alloc(module_item.syntax());
            }
        });
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs
index 26b667b55..69fa907cb 100644
--- a/crates/ra_hir_expand/src/builtin_derive.rs
+++ b/crates/ra_hir_expand/src/builtin_derive.rs
@@ -4,7 +4,7 @@ use log::debug;
 use ra_parser::FragmentKind;
 use ra_syntax::{
-    ast::{self, AstNode, ModuleItemOwner, NameOwner, TypeParamsOwner},
+    ast::{self, AstNode, GenericParamsOwner, ModuleItemOwner, NameOwner},
    match_ast,
 };
@@ -72,9 +72,9 @@ fn parse_adt(tt: &tt::Subtree) -> Result<BasicAdtInfo, mbe::ExpandError> {
    let node = item.syntax();
    let (name, params) = match_ast! {
        match node {
-            ast::StructDef(it) => (it.name(), it.type_param_list()),
+            ast::Struct(it) => (it.name(), it.generic_param_list()),
-            ast::EnumDef(it) => (it.name(), it.type_param_list()),
+            ast::Enum(it) => (it.name(), it.generic_param_list()),
-            ast::UnionDef(it) => (it.name(), it.type_param_list()),
+            ast::Union(it) => (it.name(), it.generic_param_list()),
            _ => {
                debug!("unexpected node is {:?}", node);
                return Err(mbe::ExpandError::ConversionError)
@@ -161,7 +161,7 @@ fn find_builtin_crate(db: &dyn AstDatabase, id: LazyMacroId) -> tt::TokenTree {
    // XXX
    //  All crates except core itself should have a dependency on core,
    //  We detect `core` by seeing whether it doesn't have such a dependency.
-    let tt = if cg[krate].dependencies.iter().any(|dep| dep.name == "core") {
+    let tt = if cg[krate].dependencies.iter().any(|dep| &*dep.name == "core") {
        quote! { core }
    } else {
        quote! { crate }
@@ -276,7 +276,7 @@ mod tests {
        let file_id = file_pos.file_id;
        let parsed = db.parse(file_id);
        let items: Vec<_> =
-            parsed.syntax_node().descendants().filter_map(ast::ModuleItem::cast).collect();
+            parsed.syntax_node().descendants().filter_map(ast::Item::cast).collect();
        let ast_id_map = db.ast_id_map(file_id.into());
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index 626f9efd0..9f50569dc 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -272,7 +272,7 @@ fn format_args_expand(
 fn unquote_str(lit: &tt::Literal) -> Option<String> {
    let lit = ast::make::tokens::literal(&lit.to_string());
    let token = ast::String::cast(lit)?;
-    token.value()
+    token.value().map(|it| it.into_owned())
 }
 fn concat_expand(
diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs
index bf30d7151..41df66696 100644
--- a/crates/ra_hir_expand/src/db.rs
+++ b/crates/ra_hir_expand/src/db.rs
@@ -6,7 +6,7 @@ use mbe::{ExpandResult, MacroRules};
 use ra_db::{salsa, SourceDatabase};
 use ra_parser::FragmentKind;
 use ra_prof::profile;
-use ra_syntax::{algo::diff, AstNode, Parse, SyntaxKind::*, SyntaxNode};
+use ra_syntax::{algo::diff, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode};
 use crate::{
    ast_id_map::AstIdMap, BuiltinDeriveExpander, BuiltinFnLikeExpander, EagerCallLoc, EagerMacroId,
@@ -72,6 +72,8 @@ pub trait AstDatabase: SourceDatabase {
    #[salsa::interned]
    fn intern_macro(&self, macro_call: MacroCallLoc) -> LazyMacroId;
+    fn macro_arg_text(&self, id: MacroCallId) -> Option<GreenNode>;
+    #[salsa::transparent]
    fn macro_arg(&self, id: MacroCallId) -> Option<Arc<(tt::Subtree, mbe::TokenMap)>>;
    fn macro_def(&self, id: MacroDefId) -> Option<Arc<(TokenExpander, mbe::TokenMap)>>;
    fn parse_macro(&self, macro_file: MacroFile)
@@ -148,10 +150,7 @@ pub(crate) fn macro_def(
    }
 }
-pub(crate) fn macro_arg(
+pub(crate) fn macro_arg_text(db: &dyn AstDatabase, id: MacroCallId) -> Option<GreenNode> {
-    db: &dyn AstDatabase,
-    id: MacroCallId,
-) -> Option<Arc<(tt::Subtree, mbe::TokenMap)>> {
    let id = match id {
        MacroCallId::LazyMacro(id) => id,
        MacroCallId::EagerMacro(_id) => {
@@ -161,7 +160,15 @@ pub(crate) fn macro_arg(
    };
    let loc = db.lookup_intern_macro(id);
    let arg = loc.kind.arg(db)?;
-    let (tt, tmap) = mbe::syntax_node_to_token_tree(&arg)?;
+    Some(arg.green().clone())
+}
+pub(crate) fn macro_arg(
+    db: &dyn AstDatabase,
+    id: MacroCallId,
+) -> Option<Arc<(tt::Subtree, mbe::TokenMap)>> {
+    let arg = db.macro_arg_text(id)?;
+    let (tt, tmap) = mbe::syntax_node_to_token_tree(&SyntaxNode::new_root(arg))?;
    Some(Arc::new((tt, tmap)))
 }
@@ -379,7 +386,7 @@ fn to_fragment_kind(db: &dyn AstDatabase, id: MacroCallId) -> FragmentKind {
        MATCH_EXPR => FragmentKind::Expr,
        MATCH_ARM => FragmentKind::Expr,
        MATCH_GUARD => FragmentKind::Expr,
-        RECORD_FIELD => FragmentKind::Expr,
+        RECORD_EXPR_FIELD => FragmentKind::Expr,
        CALL_EXPR => FragmentKind::Expr,
        INDEX_EXPR => FragmentKind::Expr,
        METHOD_CALL_EXPR => FragmentKind::Expr,
diff --git a/crates/ra_hir_expand/src/diagnostics.rs b/crates/ra_hir_expand/src/diagnostics.rs
index 99209c6e8..84ba97b14 100644
--- a/crates/ra_hir_expand/src/diagnostics.rs
+++ b/crates/ra_hir_expand/src/diagnostics.rs
@@ -24,11 +24,14 @@ pub trait Diagnostic: Any + Send + Sync + fmt::Debug + 'static {
    fn message(&self) -> String;
    fn source(&self) -> InFile<SyntaxNodePtr>;
    fn as_any(&self) -> &(dyn Any + Send + 'static);
+    fn is_experimental(&self) -> bool {
+        false
+    }
 }
 pub trait AstDiagnostic {
    type AST;
-    fn ast(&self, db: &impl AstDatabase) -> Self::AST;
+    fn ast(&self, db: &dyn AstDatabase) -> Self::AST;
 }
 impl dyn Diagnostic {
@@ -44,16 +47,48 @@ impl dyn Diagnostic {
 pub struct DiagnosticSink<'a> {
    callbacks: Vec<Box<dyn FnMut(&dyn Diagnostic) -> Result<(), ()> + 'a>>,
+    filters: Vec<Box<dyn FnMut(&dyn Diagnostic) -> bool + 'a>>,
    default_callback: Box<dyn FnMut(&dyn Diagnostic) + 'a>,
 }
 impl<'a> DiagnosticSink<'a> {
-    /// FIXME: split `new` and `on` into a separate builder type
+    pub fn push(&mut self, d: impl Diagnostic) {
-    pub fn new(cb: impl FnMut(&dyn Diagnostic) + 'a) -> DiagnosticSink<'a> {
+        let d: &dyn Diagnostic = &d;
-        DiagnosticSink { callbacks: Vec::new(), default_callback: Box::new(cb) }
+        self._push(d);
+    }
+    fn _push(&mut self, d: &dyn Diagnostic) {
+        for filter in &mut self.filters {
+            if !filter(d) {
+                return;
+            }
+        }
+        for cb in &mut self.callbacks {
+            match cb(d) {
+                Ok(()) => return,
+                Err(()) => (),
+            }
+        }
+        (self.default_callback)(d)
    }
+}
-    pub fn on<D: Diagnostic, F: FnMut(&D) + 'a>(mut self, mut cb: F) -> DiagnosticSink<'a> {
+pub struct DiagnosticSinkBuilder<'a> {
+    callbacks: Vec<Box<dyn FnMut(&dyn Diagnostic) -> Result<(), ()> + 'a>>,
+    filters: Vec<Box<dyn FnMut(&dyn Diagnostic) -> bool + 'a>>,
+}
+impl<'a> DiagnosticSinkBuilder<'a> {
+    pub fn new() -> Self {
+        Self { callbacks: Vec::new(), filters: Vec::new() }
+    }
+    pub fn filter<F: FnMut(&dyn Diagnostic) -> bool + 'a>(mut self, cb: F) -> Self {
+        self.filters.push(Box::new(cb));
+        self
+    }
+    pub fn on<D: Diagnostic, F: FnMut(&D) + 'a>(mut self, mut cb: F) -> Self {
        let cb = move |diag: &dyn Diagnostic| match diag.downcast_ref::<D>() {
            Some(d) => {
                cb(d);
@@ -65,18 +100,11 @@ impl<'a> DiagnosticSink<'a> {
        self
    }
-    pub fn push(&mut self, d: impl Diagnostic) {
+    pub fn build<F: FnMut(&dyn Diagnostic) + 'a>(self, default_callback: F) -> DiagnosticSink<'a> {
-        let d: &dyn Diagnostic = &d;
+        DiagnosticSink {
-        self._push(d);
+            callbacks: self.callbacks,
-    }
+            filters: self.filters,
+            default_callback: Box::new(default_callback),
-    fn _push(&mut self, d: &dyn Diagnostic) {
-        for cb in self.callbacks.iter_mut() {
-            match cb(d) {
-                Ok(()) => return,
-                Err(()) => (),
-            }
        }
-        (self.default_callback)(d)
    }
 }
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index 5eac2605b..2e8d63691 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs
@@ -88,6 +88,25 @@ impl HirFileId {
        }
    }
+    pub fn expansion_level(self, db: &dyn db::AstDatabase) -> u32 {
+        let mut level = 0;
+        let mut curr = self;
+        while let HirFileIdRepr::MacroFile(macro_file) = curr.0 {
+            level += 1;
+            curr = match macro_file.macro_call_id {
+                MacroCallId::LazyMacro(id) => {
+                    let loc = db.lookup_intern_macro(id);
+                    loc.kind.file_id()
+                }
+                MacroCallId::EagerMacro(id) => {
+                    let loc = db.lookup_intern_eager_expansion(id);
+                    loc.file_id
+                }
+            };
+        }
+        level
+    }
    /// If this is a macro call, returns the syntax node of the call.
    pub fn call_node(self, db: &dyn db::AstDatabase) -> Option<InFile<SyntaxNode>> {
        match self.0 {
@@ -140,7 +159,7 @@ impl HirFileId {
    }
    /// Indicate it is macro file generated for builtin derive
-    pub fn is_builtin_derive(&self, db: &dyn db::AstDatabase) -> Option<InFile<ast::ModuleItem>> {
+    pub fn is_builtin_derive(&self, db: &dyn db::AstDatabase) -> Option<InFile<ast::Item>> {
        match self.0 {
            HirFileIdRepr::FileId(_) => None,
            HirFileIdRepr::MacroFile(macro_file) => {
@@ -155,7 +174,7 @@ impl HirFileId {
                    MacroDefKind::BuiltInDerive(_) => loc.kind.node(db),
                    _ => return None,
                };
-                Some(item.with_value(ast::ModuleItem::cast(item.value.clone())?))
+                Some(item.with_value(ast::Item::cast(item.value.clone())?))
            }
        }
    }
@@ -239,18 +258,18 @@ pub struct MacroCallLoc {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum MacroCallKind {
    FnLike(AstId<ast::MacroCall>),
-    Attr(AstId<ast::ModuleItem>, String),
+    Attr(AstId<ast::Item>, String),
 }
 impl MacroCallKind {
-    pub fn file_id(&self) -> HirFileId {
+    fn file_id(&self) -> HirFileId {
        match self {
            MacroCallKind::FnLike(ast_id) => ast_id.file_id,
            MacroCallKind::Attr(ast_id, _) => ast_id.file_id,
        }
    }
-    pub fn node(&self, db: &dyn db::AstDatabase) -> InFile<SyntaxNode> {
+    fn node(&self, db: &dyn db::AstDatabase) -> InFile<SyntaxNode> {
        match self {
            MacroCallKind::FnLike(ast_id) => ast_id.with_value(ast_id.to_node(db).syntax().clone()),
            MacroCallKind::Attr(ast_id, _) => {
@@ -259,7 +278,7 @@ impl MacroCallKind {
        }
    }
-    pub fn arg(&self, db: &dyn db::AstDatabase) -> Option<SyntaxNode> {
+    fn arg(&self, db: &dyn db::AstDatabase) -> Option<SyntaxNode> {
        match self {
            MacroCallKind::FnLike(ast_id) => {
                Some(ast_id.to_node(db).token_tree()?.syntax().clone())
diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs
index 1b0303685..969a2e5b8 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/ra_hir_expand/src/name.rs
@@ -117,7 +117,7 @@ impl AsName for ast::FieldKind {
 impl AsName for ra_db::Dependency {
    fn as_name(&self) -> Name {
-        Name::new_text(self.name.clone())
+        Name::new_text(SmolStr::new(&*self.name))
    }
 }
diff --git a/crates/ra_hir_expand/src/test_db.rs b/crates/ra_hir_expand/src/test_db.rs
index 09fc18c36..332fa556f 100644
--- a/crates/ra_hir_expand/src/test_db.rs
+++ b/crates/ra_hir_expand/src/test_db.rs
@@ -1,7 +1,7 @@
 //! Database used for testing `hir_expand`.
 use std::{
-    panic,
+    fmt, panic,
    sync::{Arc, Mutex},
 };
@@ -13,25 +13,23 @@ use rustc_hash::FxHashSet;
    ra_db::SourceDatabaseStorage,
    crate::db::AstDatabaseStorage
 )]
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct TestDB {
-    runtime: salsa::Runtime<TestDB>,
+    storage: salsa::Storage<TestDB>,
-    events: Mutex<Option<Vec<salsa::Event<TestDB>>>>,
+    events: Mutex<Option<Vec<salsa::Event>>>,
 }
-impl salsa::Database for TestDB {
+impl fmt::Debug for TestDB {
-    fn salsa_runtime(&self) -> &salsa::Runtime<Self> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        &self.runtime
+        f.debug_struct("TestDB").finish()
-    }
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime<Self> {
-        &mut self.runtime
    }
+}
-    fn salsa_event(&self, event: impl Fn() -> salsa::Event<TestDB>) {
+impl salsa::Database for TestDB {
+    fn salsa_event(&self, event: salsa::Event) {
        let mut events = self.events.lock().unwrap();
        if let Some(events) = &mut *events {
-            events.push(event());
+            events.push(event);
        }
    }
 }
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index d6df48db2..623ce261a 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_hir_ty"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -27,8 +28,13 @@ test_utils = { path = "../test_utils" }
 scoped-tls = "1"
-chalk-solve = { version = "0.15.0" }
+chalk-solve = { version = "0.19.0" }
-chalk-ir = { version = "0.15.0" }
+chalk-ir = { version = "0.19.0" }
+chalk-recursive = { version = "0.19.0" }
 [dev-dependencies]
-insta = "0.16.0"
+expect = { path = "../expect" }
+tracing = "0.1"
+tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] }
+tracing-tree = { version = "0.1.4" }
diff --git a/crates/ra_hir_ty/src/autoderef.rs b/crates/ra_hir_ty/src/autoderef.rs
index 1b0f84c5c..c727012c6 100644
--- a/crates/ra_hir_ty/src/autoderef.rs
+++ b/crates/ra_hir_ty/src/autoderef.rs
@@ -37,7 +37,7 @@ pub(crate) fn deref(
    ty: InEnvironment<&Canonical<Ty>>,
 ) -> Option<Canonical<Ty>> {
    if let Some(derefed) = ty.value.value.builtin_deref() {
-        Some(Canonical { value: derefed, num_vars: ty.value.num_vars })
+        Some(Canonical { value: derefed, kinds: ty.value.kinds.clone() })
    } else {
        deref_by_trait(db, krate, ty)
    }
@@ -68,8 +68,8 @@ fn deref_by_trait(
    // Check that the type implements Deref at all
    let trait_ref = TraitRef { trait_: deref_trait, substs: parameters.clone() };
-    let implements_goal = super::Canonical {
+    let implements_goal = Canonical {
-        num_vars: ty.value.num_vars,
+        kinds: ty.value.kinds.clone(),
        value: InEnvironment {
            value: Obligation::Trait(trait_ref),
            environment: ty.environment.clone(),
@@ -81,7 +81,7 @@ fn deref_by_trait(
    // Now do the assoc type projection
    let projection = super::traits::ProjectionPredicate {
-        ty: Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, ty.value.num_vars)),
+        ty: Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, ty.value.kinds.len())),
        projection_ty: super::ProjectionTy { associated_ty: target, parameters },
    };
@@ -89,7 +89,8 @@ fn deref_by_trait(
    let in_env = InEnvironment { value: obligation, environment: ty.environment };
-    let canonical = super::Canonical { num_vars: 1 + ty.value.num_vars, value: in_env };
+    let canonical =
+        Canonical::new(in_env, ty.value.kinds.iter().copied().chain(Some(super::TyKind::General)));
    let solution = db.trait_solve(krate, canonical)?;
@@ -110,7 +111,7 @@ fn deref_by_trait(
            // assumptions will be broken. We would need to properly introduce
            // new variables in that case
-            for i in 1..vars.0.num_vars {
+            for i in 1..vars.0.kinds.len() {
                if vars.0.value[i - 1] != Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, i - 1))
                {
                    warn!("complex solution for derefing {:?}: {:?}, ignoring", ty.value, solution);
@@ -119,7 +120,7 @@ fn deref_by_trait(
            }
            Some(Canonical {
                value: vars.0.value[vars.0.value.len() - 1].clone(),
-                num_vars: vars.0.num_vars,
+                kinds: vars.0.kinds.clone(),
            })
        }
        Solution::Ambig(_) => {
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs
index cad553273..c773adc67 100644
--- a/crates/ra_hir_ty/src/db.rs
+++ b/crates/ra_hir_ty/src/db.rs
@@ -3,23 +3,22 @@
 use std::sync::Arc;
 use hir_def::{
-    db::DefDatabase, DefWithBodyId, FunctionId, GenericDefId, ImplId, LocalFieldId, TypeParamId,
+    db::DefDatabase, expr::ExprId, DefWithBodyId, FunctionId, GenericDefId, ImplId, LocalFieldId,
-    VariantId,
+    TypeParamId, VariantId,
 };
 use ra_arena::map::ArenaMap;
 use ra_db::{impl_intern_key, salsa, CrateId, Upcast};
 use ra_prof::profile;
 use crate::{
-    method_resolution::CrateImplDefs,
+    method_resolution::{InherentImpls, TraitImpls},
-    traits::{chalk, AssocTyValue, Impl},
+    traits::chalk,
-    Binders, CallableDef, GenericPredicate, InferenceResult, OpaqueTyId, PolyFnSig,
+    Binders, CallableDefId, GenericPredicate, InferenceResult, OpaqueTyId, PolyFnSig,
-    ReturnTypeImplTraits, TraitRef, Ty, TyDefId, TypeCtor, ValueTyDefId,
+    ReturnTypeImplTraits, TraitRef, Ty, TyDefId, ValueTyDefId,
 };
 use hir_expand::name::Name;
 #[salsa::query_group(HirDatabaseStorage)]
-#[salsa::requires(salsa::Database)]
 pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
    #[salsa::invoke(infer_wait)]
    #[salsa::transparent]
@@ -46,7 +45,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
    fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalFieldId, Binders<Ty>>>;
    #[salsa::invoke(crate::callable_item_sig)]
-    fn callable_item_signature(&self, def: CallableDef) -> PolyFnSig;
+    fn callable_item_signature(&self, def: CallableDefId) -> PolyFnSig;
    #[salsa::invoke(crate::lower::return_type_impl_traits)]
    fn return_type_impl_traits(
@@ -67,25 +66,24 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
    #[salsa::invoke(crate::lower::generic_defaults_query)]
    fn generic_defaults(&self, def: GenericDefId) -> Arc<[Binders<Ty>]>;
-    #[salsa::invoke(crate::method_resolution::CrateImplDefs::impls_in_crate_query)]
+    #[salsa::invoke(InherentImpls::inherent_impls_in_crate_query)]
-    fn impls_in_crate(&self, krate: CrateId) -> Arc<CrateImplDefs>;
+    fn inherent_impls_in_crate(&self, krate: CrateId) -> Arc<InherentImpls>;
-    #[salsa::invoke(crate::method_resolution::CrateImplDefs::impls_from_deps_query)]
+    #[salsa::invoke(TraitImpls::trait_impls_in_crate_query)]
-    fn impls_from_deps(&self, krate: CrateId) -> Arc<CrateImplDefs>;
+    fn trait_impls_in_crate(&self, krate: CrateId) -> Arc<TraitImpls>;
+    #[salsa::invoke(TraitImpls::trait_impls_in_deps_query)]
+    fn trait_impls_in_deps(&self, krate: CrateId) -> Arc<TraitImpls>;
    // Interned IDs for Chalk integration
    #[salsa::interned]
-    fn intern_type_ctor(&self, type_ctor: TypeCtor) -> crate::TypeCtorId;
+    fn intern_callable_def(&self, callable_def: CallableDefId) -> InternedCallableDefId;
-    #[salsa::interned]
-    fn intern_callable_def(&self, callable_def: CallableDef) -> crate::CallableDefId;
    #[salsa::interned]
    fn intern_type_param_id(&self, param_id: TypeParamId) -> GlobalTypeParamId;
    #[salsa::interned]
    fn intern_impl_trait_id(&self, id: OpaqueTyId) -> InternedOpaqueTyId;
    #[salsa::interned]
-    fn intern_chalk_impl(&self, impl_: Impl) -> crate::traits::GlobalImplId;
+    fn intern_closure(&self, id: (DefWithBodyId, ExprId)) -> ClosureId;
-    #[salsa::interned]
-    fn intern_assoc_ty_value(&self, assoc_ty_value: AssocTyValue) -> crate::traits::AssocTyValueId;
    #[salsa::invoke(chalk::associated_ty_data_query)]
    fn associated_ty_data(&self, id: chalk::AssocTypeId) -> Arc<chalk::AssociatedTyDatum>;
@@ -149,3 +147,13 @@ impl_intern_key!(GlobalTypeParamId);
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct InternedOpaqueTyId(salsa::InternId);
 impl_intern_key!(InternedOpaqueTyId);
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct ClosureId(salsa::InternId);
+impl_intern_key!(ClosureId);
+/// This exists just for Chalk, because Chalk just has a single `FnDefId` where
+/// we have different IDs for struct and enum variant constructors.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
+pub struct InternedCallableDefId(salsa::InternId);
+impl_intern_key!(InternedCallableDefId);
diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs
index a59efb347..f210c305a 100644
--- a/crates/ra_hir_ty/src/diagnostics.rs
+++ b/crates/ra_hir_ty/src/diagnostics.rs
@@ -1,18 +1,35 @@
 //! FIXME: write short doc here
+mod expr;
+mod match_check;
+mod unsafe_check;
 use std::any::Any;
+use hir_def::DefWithBodyId;
+use hir_expand::diagnostics::{AstDiagnostic, Diagnostic, DiagnosticSink};
 use hir_expand::{db::AstDatabase, name::Name, HirFileId, InFile};
+use ra_prof::profile;
 use ra_syntax::{ast, AstNode, AstPtr, SyntaxNodePtr};
 use stdx::format_to;
-pub use hir_def::{diagnostics::UnresolvedModule, expr::MatchArm, path::Path};
+use crate::db::HirDatabase;
-pub use hir_expand::diagnostics::{AstDiagnostic, Diagnostic, DiagnosticSink};
+pub use crate::diagnostics::expr::{record_literal_missing_fields, record_pattern_missing_fields};
+pub fn validate_body(db: &dyn HirDatabase, owner: DefWithBodyId, sink: &mut DiagnosticSink<'_>) {
+    let _p = profile("validate_body");
+    let infer = db.infer(owner);
+    infer.add_diagnostics(db, owner, sink);
+    let mut validator = expr::ExprValidator::new(owner, infer.clone(), sink);
+    validator.validate_body(db);
+    let mut validator = unsafe_check::UnsafeValidator::new(owner, infer, sink);
+    validator.validate_body(db);
+}
 #[derive(Debug)]
 pub struct NoSuchField {
    pub file: HirFileId,
-    pub field: AstPtr<ast::RecordField>,
+    pub field: AstPtr<ast::RecordExprField>,
 }
 impl Diagnostic for NoSuchField {
@@ -30,19 +47,19 @@ impl Diagnostic for NoSuchField {
 }
 impl AstDiagnostic for NoSuchField {
-    type AST = ast::RecordField;
+    type AST = ast::RecordExprField;
-    fn ast(&self, db: &impl AstDatabase) -> Self::AST {
+    fn ast(&self, db: &dyn AstDatabase) -> Self::AST {
        let root = db.parse_or_expand(self.source().file_id).unwrap();
        let node = self.source().value.to_node(&root);
-        ast::RecordField::cast(node).unwrap()
+        ast::RecordExprField::cast(node).unwrap()
    }
 }
 #[derive(Debug)]
 pub struct MissingFields {
    pub file: HirFileId,
-    pub field_list: AstPtr<ast::RecordFieldList>,
+    pub field_list: AstPtr<ast::RecordExprFieldList>,
    pub missed_fields: Vec<Name>,
 }
@@ -63,12 +80,12 @@ impl Diagnostic for MissingFields {
 }
 impl AstDiagnostic for MissingFields {
-    type AST = ast::RecordFieldList;
+    type AST = ast::RecordExprFieldList;
-    fn ast(&self, db: &impl AstDatabase) -> Self::AST {
+    fn ast(&self, db: &dyn AstDatabase) -> Self::AST {
        let root = db.parse_or_expand(self.source().file_id).unwrap();
        let node = self.source().value.to_node(&root);
-        ast::RecordFieldList::cast(node).unwrap()
+        ast::RecordExprFieldList::cast(node).unwrap()
    }
 }
@@ -135,7 +152,7 @@ impl Diagnostic for MissingOkInTailExpr {
 impl AstDiagnostic for MissingOkInTailExpr {
    type AST = ast::Expr;
-    fn ast(&self, db: &impl AstDatabase) -> Self::AST {
+    fn ast(&self, db: &dyn AstDatabase) -> Self::AST {
        let root = db.parse_or_expand(self.file).unwrap();
        let node = self.source().value.to_node(&root);
        ast::Expr::cast(node).unwrap()
@@ -163,7 +180,7 @@ impl Diagnostic for BreakOutsideOfLoop {
 impl AstDiagnostic for BreakOutsideOfLoop {
    type AST = ast::Expr;
-    fn ast(&self, db: &impl AstDatabase) -> Self::AST {
+    fn ast(&self, db: &dyn AstDatabase) -> Self::AST {
        let root = db.parse_or_expand(self.file).unwrap();
        let node = self.source().value.to_node(&root);
        ast::Expr::cast(node).unwrap()
@@ -191,9 +208,274 @@ impl Diagnostic for MissingUnsafe {
 impl AstDiagnostic for MissingUnsafe {
    type AST = ast::Expr;
-    fn ast(&self, db: &impl AstDatabase) -> Self::AST {
+    fn ast(&self, db: &dyn AstDatabase) -> Self::AST {
        let root = db.parse_or_expand(self.source().file_id).unwrap();
        let node = self.source().value.to_node(&root);
        ast::Expr::cast(node).unwrap()
    }
 }
+#[derive(Debug)]
+pub struct MismatchedArgCount {
+    pub file: HirFileId,
+    pub call_expr: AstPtr<ast::Expr>,
+    pub expected: usize,
+    pub found: usize,
+}
+impl Diagnostic for MismatchedArgCount {
+    fn message(&self) -> String {
+        let s = if self.expected == 1 { "" } else { "s" };
+        format!("Expected {} argument{}, found {}", self.expected, s, self.found)
+    }
+    fn source(&self) -> InFile<SyntaxNodePtr> {
+        InFile { file_id: self.file, value: self.call_expr.clone().into() }
+    }
+    fn as_any(&self) -> &(dyn Any + Send + 'static) {
+        self
+    }
+    fn is_experimental(&self) -> bool {
+        true
+    }
+}
+impl AstDiagnostic for MismatchedArgCount {
+    type AST = ast::CallExpr;
+    fn ast(&self, db: &dyn AstDatabase) -> Self::AST {
+        let root = db.parse_or_expand(self.source().file_id).unwrap();
+        let node = self.source().value.to_node(&root);
+        ast::CallExpr::cast(node).unwrap()
+    }
+}
+#[cfg(test)]
+mod tests {
+    use hir_def::{db::DefDatabase, AssocItemId, ModuleDefId};
+    use hir_expand::diagnostics::{Diagnostic, DiagnosticSinkBuilder};
+    use ra_db::{fixture::WithFixture, FileId, SourceDatabase, SourceDatabaseExt};
+    use ra_syntax::{TextRange, TextSize};
+    use rustc_hash::FxHashMap;
+    use crate::{diagnostics::validate_body, test_db::TestDB};
+    impl TestDB {
+        fn diagnostics<F: FnMut(&dyn Diagnostic)>(&self, mut cb: F) {
+            let crate_graph = self.crate_graph();
+            for krate in crate_graph.iter() {
+                let crate_def_map = self.crate_def_map(krate);
+                let mut fns = Vec::new();
+                for (module_id, _) in crate_def_map.modules.iter() {
+                    for decl in crate_def_map[module_id].scope.declarations() {
+                        if let ModuleDefId::FunctionId(f) = decl {
+                            fns.push(f)
+                        }
+                    }
+                    for impl_id in crate_def_map[module_id].scope.impls() {
+                        let impl_data = self.impl_data(impl_id);
+                        for item in impl_data.items.iter() {
+                            if let AssocItemId::FunctionId(f) = item {
+                                fns.push(*f)
+                            }
+                        }
+                    }
+                }
+                for f in fns {
+                    let mut sink = DiagnosticSinkBuilder::new().build(&mut cb);
+                    validate_body(self, f.into(), &mut sink);
+                }
+            }
+        }
+    }
+    pub(crate) fn check_diagnostics(ra_fixture: &str) {
+        let db = TestDB::with_files(ra_fixture);
+        let annotations = db.extract_annotations();
+        let mut actual: FxHashMap<FileId, Vec<(TextRange, String)>> = FxHashMap::default();
+        db.diagnostics(|d| {
+            // FXIME: macros...
+            let file_id = d.source().file_id.original_file(&db);
+            let range = d.syntax_node(&db).text_range();
+            let message = d.message().to_owned();
+            actual.entry(file_id).or_default().push((range, message));
+        });
+        for (file_id, diags) in actual.iter_mut() {
+            diags.sort_by_key(|it| it.0.start());
+            let text = db.file_text(*file_id);
+            // For multiline spans, place them on line start
+            for (range, content) in diags {
+                if text[*range].contains('\n') {
+                    *range = TextRange::new(range.start(), range.start() + TextSize::from(1));
+                    *content = format!("... {}", content);
+                }
+            }
+        }
+        assert_eq!(annotations, actual);
+    }
+    #[test]
+    fn no_such_field_diagnostics() {
+        check_diagnostics(
+            r#"
+struct S { foo: i32, bar: () }
+impl S {
+    fn new() -> S {
+        S {
+        //^... Missing structure fields:
+        //|    - bar
+            foo: 92,
+            baz: 62,
+          //^^^^^^^ no such field
+        }
+    }
+}
+"#,
+        );
+    }
+    #[test]
+    fn no_such_field_with_feature_flag_diagnostics() {
+        check_diagnostics(
+            r#"
+//- /lib.rs crate:foo cfg:feature=foo
+struct MyStruct {
+    my_val: usize,
+    #[cfg(feature = "foo")]
+    bar: bool,
+}
+impl MyStruct {
+    #[cfg(feature = "foo")]
+    pub(crate) fn new(my_val: usize, bar: bool) -> Self {
+        Self { my_val, bar }
+    }
+    #[cfg(not(feature = "foo"))]
+    pub(crate) fn new(my_val: usize, _bar: bool) -> Self {
+        Self { my_val }
+    }
+}
+"#,
+        );
+    }
+    #[test]
+    fn no_such_field_enum_with_feature_flag_diagnostics() {
+        check_diagnostics(
+            r#"
+//- /lib.rs crate:foo cfg:feature=foo
+enum Foo {
+    #[cfg(not(feature = "foo"))]
+    Buz,
+    #[cfg(feature = "foo")]
+    Bar,
+    Baz
+}
+fn test_fn(f: Foo) {
+    match f {
+        Foo::Bar => {},
+        Foo::Baz => {},
+    }
+}
+"#,
+        );
+    }
+    #[test]
+    fn no_such_field_with_feature_flag_diagnostics_on_struct_lit() {
+        check_diagnostics(
+            r#"
+//- /lib.rs crate:foo cfg:feature=foo
+struct S {
+    #[cfg(feature = "foo")]
+    foo: u32,
+    #[cfg(not(feature = "foo"))]
+    bar: u32,
+}
+impl S {
+    #[cfg(feature = "foo")]
+    fn new(foo: u32) -> Self {
+        Self { foo }
+    }
+    #[cfg(not(feature = "foo"))]
+    fn new(bar: u32) -> Self {
+        Self { bar }
+    }
+    fn new2(bar: u32) -> Self {
+        #[cfg(feature = "foo")]
+        { Self { foo: bar } }
+        #[cfg(not(feature = "foo"))]
+        { Self { bar } }
+    }
+    fn new2(val: u32) -> Self {
+        Self {
+            #[cfg(feature = "foo")]
+            foo: val,
+            #[cfg(not(feature = "foo"))]
+            bar: val,
+        }
+    }
+}
+"#,
+        );
+    }
+    #[test]
+    fn no_such_field_with_type_macro() {
+        check_diagnostics(
+            r#"
+macro_rules! Type { () => { u32 }; }
+struct Foo { bar: Type![] }
+impl Foo {
+    fn new() -> Self {
+        Foo { bar: 0 }
+    }
+}
+"#,
+        );
+    }
+    #[test]
+    fn missing_record_pat_field_diagnostic() {
+        check_diagnostics(
+            r#"
+struct S { foo: i32, bar: () }
+fn baz(s: S) {
+    let S { foo: _ } = s;
+        //^^^^^^^^^^ Missing structure fields:
+        //         | - bar
+}
+"#,
+        );
+    }
+    #[test]
+    fn missing_record_pat_field_no_diagnostic_if_not_exhaustive() {
+        check_diagnostics(
+            r"
+struct S { foo: i32, bar: () }
+fn baz(s: S) -> i32 {
+    match s {
+        S { foo, .. } => foo,
+    }
+}
+",
+        )
+    }
+    #[test]
+    fn break_outside_of_loop() {
+        check_diagnostics(
+            r#"
+fn foo() { break; }
+         //^^^^^ break outside of loop
+"#,
+        );
+    }
+}
diff --git a/crates/ra_hir_ty/src/expr.rs b/crates/ra_hir_ty/src/diagnostics/expr.rs
index 7db928dde..f0e0f2988 100644
--- a/crates/ra_hir_ty/src/expr.rs
+++ b/crates/ra_hir_ty/src/diagnostics/expr.rs
@@ -2,17 +2,19 @@
 use std::sync::Arc;
-use hir_def::{path::path, resolver::HasResolver, AdtId, FunctionId};
+use hir_def::{path::path, resolver::HasResolver, AdtId, DefWithBodyId};
 use hir_expand::diagnostics::DiagnosticSink;
 use ra_syntax::{ast, AstPtr};
 use rustc_hash::FxHashSet;
 use crate::{
    db::HirDatabase,
-    diagnostics::{MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields},
+    diagnostics::{
+        match_check::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
+        MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields,
+    },
    utils::variant_data,
    ApplicationTy, InferenceResult, Ty, TypeCtor,
-    _match::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
 };
 pub use hir_def::{
@@ -24,26 +26,27 @@ pub use hir_def::{
        ArithOp, Array, BinaryOp, BindingAnnotation, CmpOp, Expr, ExprId, Literal, LogicOp,
        MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement, UnaryOp,
    },
-    LocalFieldId, VariantId,
+    src::HasSource,
+    LocalFieldId, Lookup, VariantId,
 };
-pub struct ExprValidator<'a, 'b: 'a> {
+pub(super) struct ExprValidator<'a, 'b: 'a> {
-    func: FunctionId,
+    owner: DefWithBodyId,
    infer: Arc<InferenceResult>,
    sink: &'a mut DiagnosticSink<'b>,
 }
 impl<'a, 'b> ExprValidator<'a, 'b> {
-    pub fn new(
+    pub(super) fn new(
-        func: FunctionId,
+        owner: DefWithBodyId,
        infer: Arc<InferenceResult>,
        sink: &'a mut DiagnosticSink<'b>,
    ) -> ExprValidator<'a, 'b> {
-        ExprValidator { func, infer, sink }
+        ExprValidator { owner, infer, sink }
    }
-    pub fn validate_body(&mut self, db: &dyn HirDatabase) {
+    pub(super) fn validate_body(&mut self, db: &dyn HirDatabase) {
-        let body = db.body(self.func.into());
+        let body = db.body(self.owner.into());
        for (id, expr) in body.exprs.iter() {
            if let Some((variant_def, missed_fields, true)) =
@@ -56,8 +59,15 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
                    missed_fields,
                );
            }
-            if let Expr::Match { expr, arms } = expr {
-                self.validate_match(id, *expr, arms, db, self.infer.clone());
+            match expr {
+                Expr::Match { expr, arms } => {
+                    self.validate_match(id, *expr, arms, db, self.infer.clone());
+                }
+                Expr::Call { .. } | Expr::MethodCall { .. } => {
+                    self.validate_call(db, id, expr);
+                }
+                _ => {}
            }
        }
        for (id, pat) in body.pats.iter() {
@@ -86,12 +96,12 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
        missed_fields: Vec<LocalFieldId>,
    ) {
        // XXX: only look at source_map if we do have missing fields
-        let (_, source_map) = db.body_with_source_map(self.func.into());
+        let (_, source_map) = db.body_with_source_map(self.owner.into());
        if let Ok(source_ptr) = source_map.expr_syntax(id) {
            let root = source_ptr.file_syntax(db.upcast());
-            if let ast::Expr::RecordLit(record_lit) = &source_ptr.value.to_node(&root) {
+            if let ast::Expr::RecordExpr(record_lit) = &source_ptr.value.to_node(&root) {
-                if let Some(field_list) = record_lit.record_field_list() {
+                if let Some(field_list) = record_lit.record_expr_field_list() {
                    let variant_data = variant_data(db.upcast(), variant_def);
                    let missed_fields = missed_fields
                        .into_iter()
@@ -115,7 +125,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
        missed_fields: Vec<LocalFieldId>,
    ) {
        // XXX: only look at source_map if we do have missing fields
-        let (_, source_map) = db.body_with_source_map(self.func.into());
+        let (_, source_map) = db.body_with_source_map(self.owner.into());
        if let Ok(source_ptr) = source_map.pat_syntax(id) {
            if let Some(expr) = source_ptr.value.as_ref().left() {
@@ -138,6 +148,65 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
        }
    }
+    fn validate_call(&mut self, db: &dyn HirDatabase, call_id: ExprId, expr: &Expr) -> Option<()> {
+        // Check that the number of arguments matches the number of parameters.
+        // FIXME: Due to shortcomings in the current type system implementation, only emit this
+        // diagnostic if there are no type mismatches in the containing function.
+        if self.infer.type_mismatches.iter().next().is_some() {
+            return Some(());
+        }
+        let is_method_call = matches!(expr, Expr::MethodCall { .. });
+        let (sig, args) = match expr {
+            Expr::Call { callee, args } => {
+                let callee = &self.infer.type_of_expr[*callee];
+                let sig = callee.callable_sig(db)?;
+                (sig, args.clone())
+            }
+            Expr::MethodCall { receiver, args, .. } => {
+                let mut args = args.clone();
+                args.insert(0, *receiver);
+                // FIXME: note that we erase information about substs here. This
+                // is not right, but, luckily, doesn't matter as we care only
+                // about the number of params
+                let callee = self.infer.method_resolution(call_id)?;
+                let sig = db.callable_item_signature(callee.into()).value;
+                (sig, args)
+            }
+            _ => return None,
+        };
+        if sig.is_varargs {
+            return None;
+        }
+        let params = sig.params();
+        let mut param_count = params.len();
+        let mut arg_count = args.len();
+        if arg_count != param_count {
+            let (_, source_map) = db.body_with_source_map(self.owner.into());
+            if let Ok(source_ptr) = source_map.expr_syntax(call_id) {
+                if is_method_call {
+                    param_count -= 1;
+                    arg_count -= 1;
+                }
+                self.sink.push(MismatchedArgCount {
+                    file: source_ptr.file_id,
+                    call_expr: source_ptr.value,
+                    expected: param_count,
+                    found: arg_count,
+                });
+            }
+        }
+        None
+    }
    fn validate_match(
        &mut self,
        id: ExprId,
@@ -147,7 +216,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
        infer: Arc<InferenceResult>,
    ) {
        let (body, source_map): (Arc<Body>, Arc<BodySourceMap>) =
-            db.body_with_source_map(self.func.into());
+            db.body_with_source_map(self.owner.into());
        let match_expr_ty = match infer.type_of_expr.get(match_expr) {
            Some(ty) => ty,
@@ -228,7 +297,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
        let core_result_path = path![core::result::Result];
-        let resolver = self.func.resolver(db.upcast());
+        let resolver = self.owner.resolver(db.upcast());
        let core_result_enum = match resolver.resolve_known_enum(db.upcast(), &core_result_path) {
            Some(it) => it,
            _ => return,
@@ -243,7 +312,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
        };
        if params.len() == 2 && params[0] == mismatch.actual {
-            let (_, source_map) = db.body_with_source_map(self.func.into());
+            let (_, source_map) = db.body_with_source_map(self.owner.into());
            if let Ok(source_ptr) = source_map.expr_syntax(id) {
                self.sink
@@ -312,3 +381,185 @@ pub fn record_pattern_missing_fields(
    }
    Some((variant_def, missed_fields, exhaustive))
 }
+#[cfg(test)]
+mod tests {
+    use crate::diagnostics::tests::check_diagnostics;
+    #[test]
+    fn simple_free_fn_zero() {
+        check_diagnostics(
+            r#"
+fn zero() {}
+fn f() { zero(1); }
+       //^^^^^^^ Expected 0 arguments, found 1
+"#,
+        );
+        check_diagnostics(
+            r#"
+fn zero() {}
+fn f() { zero(); }
+"#,
+        );
+    }
+    #[test]
+    fn simple_free_fn_one() {
+        check_diagnostics(
+            r#"
+fn one(arg: u8) {}
+fn f() { one(); }
+       //^^^^^ Expected 1 argument, found 0
+"#,
+        );
+        check_diagnostics(
+            r#"
+fn one(arg: u8) {}
+fn f() { one(1); }
+"#,
+        );
+    }
+    #[test]
+    fn method_as_fn() {
+        check_diagnostics(
+            r#"
+struct S;
+impl S { fn method(&self) {} }
+fn f() {
+    S::method();
+} //^^^^^^^^^^^ Expected 1 argument, found 0
+"#,
+        );
+        check_diagnostics(
+            r#"
+struct S;
+impl S { fn method(&self) {} }
+fn f() {
+    S::method(&S);
+    S.method();
+}
+"#,
+        );
+    }
+    #[test]
+    fn method_with_arg() {
+        check_diagnostics(
+            r#"
+struct S;
+impl S { fn method(&self, arg: u8) {} }
+            fn f() {
+                S.method();
+            } //^^^^^^^^^^ Expected 1 argument, found 0
+            "#,
+        );
+        check_diagnostics(
+            r#"
+struct S;
+impl S { fn method(&self, arg: u8) {} }
+fn f() {
+    S::method(&S, 0);
+    S.method(1);
+}
+"#,
+        );
+    }
+    #[test]
+    fn tuple_struct() {
+        check_diagnostics(
+            r#"
+struct Tup(u8, u16);
+fn f() {
+    Tup(0);
+} //^^^^^^ Expected 2 arguments, found 1
+"#,
+        )
+    }
+    #[test]
+    fn enum_variant() {
+        check_diagnostics(
+            r#"
+enum En { Variant(u8, u16), }
+fn f() {
+    En::Variant(0);
+} //^^^^^^^^^^^^^^ Expected 2 arguments, found 1
+"#,
+        )
+    }
+    #[test]
+    fn enum_variant_type_macro() {
+        check_diagnostics(
+            r#"
+macro_rules! Type {
+    () => { u32 };
+}
+enum Foo {
+    Bar(Type![])
+}
+impl Foo {
+    fn new() {
+        Foo::Bar(0);
+        Foo::Bar(0, 1);
+      //^^^^^^^^^^^^^^ Expected 1 argument, found 2
+        Foo::Bar();
+      //^^^^^^^^^^ Expected 1 argument, found 0
+    }
+}
+        "#,
+        );
+    }
+    #[test]
+    fn varargs() {
+        check_diagnostics(
+            r#"
+extern "C" {
+    fn fixed(fixed: u8);
+    fn varargs(fixed: u8, ...);
+    fn varargs2(...);
+}
+fn f() {
+    unsafe {
+        fixed(0);
+        fixed(0, 1);
+      //^^^^^^^^^^^ Expected 1 argument, found 2
+        varargs(0);
+        varargs(0, 1);
+        varargs2();
+        varargs2(0);
+        varargs2(0, 1);
+    }
+}
+        "#,
+        )
+    }
+    #[test]
+    fn arg_count_lambda() {
+        check_diagnostics(
+            r#"
+fn main() {
+    let f = |()| ();
+    f();
+  //^^^ Expected 1 argument, found 0
+    f(());
+    f((), ());
+  //^^^^^^^^^ Expected 1 argument, found 2
+}
+"#,
+        )
+    }
+}
diff --git a/crates/ra_hir_ty/src/_match.rs b/crates/ra_hir_ty/src/diagnostics/match_check.rs
index 5495ce284..507edcb7d 100644
--- a/crates/ra_hir_ty/src/_match.rs
+++ b/crates/ra_hir_ty/src/diagnostics/match_check.rs
@@ -41,9 +41,9 @@
 //! ```ignore
 //! // x: (Option<bool>, Result<()>)
 //! match x {
-//!     (Some(true), _) => {}
+//!     (Some(true), _) => (),
-//!     (None, Err(())) => {}
+//!     (None, Err(())) => (),
-//!     (None, Err(_)) => {}
+//!     (None, Err(_)) => (),
 //! }
 //! ```
 //!
@@ -218,15 +218,16 @@
 //!   ```
 use std::sync::Arc;
-use smallvec::{smallvec, SmallVec};
+use hir_def::{
+    adt::VariantData,
-use crate::{
+    body::Body,
-    db::HirDatabase,
+    expr::{Expr, Literal, Pat, PatId},
-    expr::{Body, Expr, Literal, Pat, PatId},
+    AdtId, EnumVariantId, VariantId,
-    ApplicationTy, InferenceResult, Ty, TypeCtor,
 };
-use hir_def::{adt::VariantData, AdtId, EnumVariantId, VariantId};
 use ra_arena::Idx;
+use smallvec::{smallvec, SmallVec};
+use crate::{db::HirDatabase, ApplicationTy, InferenceResult, Ty, TypeCtor};
 #[derive(Debug, Clone, Copy)]
 /// Either a pattern from the source code being analyzed, represented as
@@ -271,7 +272,7 @@ impl From<&PatId> for PatIdOrWild {
 }
 #[derive(Debug, Clone, Copy, PartialEq)]
-pub enum MatchCheckErr {
+pub(super) enum MatchCheckErr {
    NotImplemented,
    MalformedMatchArm,
    /// Used when type inference cannot resolve the type of
@@ -286,21 +287,21 @@ pub enum MatchCheckErr {
 ///
 /// The `std::result::Result` type is used here rather than a custom enum
 /// to allow the use of `?`.
-pub type MatchCheckResult<T> = Result<T, MatchCheckErr>;
+pub(super) type MatchCheckResult<T> = Result<T, MatchCheckErr>;
 #[derive(Debug)]
 /// A row in a Matrix.
 ///
 /// This type is modeled from the struct of the same name in `rustc`.
-pub(crate) struct PatStack(PatStackInner);
+pub(super) struct PatStack(PatStackInner);
 type PatStackInner = SmallVec<[PatIdOrWild; 2]>;
 impl PatStack {
-    pub(crate) fn from_pattern(pat_id: PatId) -> PatStack {
+    pub(super) fn from_pattern(pat_id: PatId) -> PatStack {
        Self(smallvec!(pat_id.into()))
    }
-    pub(crate) fn from_wild() -> PatStack {
+    pub(super) fn from_wild() -> PatStack {
        Self(smallvec!(PatIdOrWild::Wild))
    }
@@ -509,14 +510,14 @@ impl PatStack {
 /// A collection of PatStack.
 ///
 /// This type is modeled from the struct of the same name in `rustc`.
-pub(crate) struct Matrix(Vec<PatStack>);
+pub(super) struct Matrix(Vec<PatStack>);
 impl Matrix {
-    pub(crate) fn empty() -> Self {
+    pub(super) fn empty() -> Self {
        Self(vec![])
    }
-    pub(crate) fn push(&mut self, cx: &MatchCheckCtx, row: PatStack) {
+    pub(super) fn push(&mut self, cx: &MatchCheckCtx, row: PatStack) {
        if let Some(Pat::Or(pat_ids)) = row.get_head().map(|pat_id| pat_id.as_pat(cx)) {
            // Or patterns are expanded here
            for pat_id in pat_ids {
@@ -578,16 +579,16 @@ impl Matrix {
 /// not matched by an prior match arms.
 ///
 /// We may eventually need an `Unknown` variant here.
-pub enum Usefulness {
+pub(super) enum Usefulness {
    Useful,
    NotUseful,
 }
-pub struct MatchCheckCtx<'a> {
+pub(super) struct MatchCheckCtx<'a> {
-    pub match_expr: Idx<Expr>,
+    pub(super) match_expr: Idx<Expr>,
-    pub body: Arc<Body>,
+    pub(super) body: Arc<Body>,
-    pub infer: Arc<InferenceResult>,
+    pub(super) infer: Arc<InferenceResult>,
-    pub db: &'a dyn HirDatabase,
+    pub(super) db: &'a dyn HirDatabase,
 }
 /// Given a set of patterns `matrix`, and pattern to consider `v`, determines
@@ -598,7 +599,7 @@ pub struct MatchCheckCtx<'a> {
 /// expected that you have already type checked the match arms. All patterns in
 /// matrix should be the same type as v, as well as they should all be the same
 /// type as the match expression.
-pub(crate) fn is_useful(
+pub(super) fn is_useful(
    cx: &MatchCheckCtx,
    matrix: &Matrix,
    v: &PatStack,
@@ -836,685 +837,251 @@ fn enum_variant_matches(cx: &MatchCheckCtx, pat_id: PatId, enum_variant_id: Enum
 #[cfg(test)]
 mod tests {
-    pub(super) use insta::assert_snapshot;
+    use crate::diagnostics::tests::check_diagnostics;
-    pub(super) use ra_db::fixture::WithFixture;
-    pub(super) use crate::{diagnostics::MissingMatchArms, test_db::TestDB};
-    pub(super) fn check_diagnostic_message(ra_fixture: &str) -> String {
-        TestDB::with_single_file(ra_fixture).0.diagnostic::<MissingMatchArms>().0
-    }
-    pub(super) fn check_diagnostic(ra_fixture: &str) {
-        let diagnostic_count =
-            TestDB::with_single_file(ra_fixture).0.diagnostic::<MissingMatchArms>().1;
-        assert_eq!(1, diagnostic_count, "no diagnostic reported");
-    }
-    pub(super) fn check_no_diagnostic(ra_fixture: &str) {
-        let (s, diagnostic_count) =
-            TestDB::with_single_file(ra_fixture).0.diagnostic::<MissingMatchArms>();
-        assert_eq!(0, diagnostic_count, "expected no diagnostic, found one: {}", s);
-    }
-    #[test]
-    fn empty_tuple_no_arms_diagnostic_message() {
-        assert_snapshot!(
-            check_diagnostic_message(r"
-                fn test_fn() {
-                    match () {
-                    }
-                }
-            "),
-            @"\"()\": Missing match arm\n"
-        );
-    }
-    #[test]
-    fn empty_tuple_no_arms() {
-        check_diagnostic(
-            r"
-            fn test_fn() {
-                match () {
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn empty_tuple_wild() {
-        check_no_diagnostic(
-            r"
-            fn test_fn() {
-                match () {
-                    _ => {}
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn empty_tuple_no_diagnostic() {
-        check_no_diagnostic(
-            r"
-            fn test_fn() {
-                match () {
-                    () => {}
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn tuple_of_empty_tuple_no_arms() {
-        check_diagnostic(
-            r"
-            fn test_fn() {
-                match (()) {
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn tuple_of_empty_tuple_no_diagnostic() {
-        check_no_diagnostic(
-            r"
-            fn test_fn() {
-                match (()) {
-                    (()) => {}
-                }
-            }
-        ",
-        );
-    }
    #[test]
-    fn tuple_of_two_empty_tuple_no_arms() {
+    fn empty_tuple() {
-        check_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            fn test_fn() {
+fn main() {
-                match ((), ()) {
+    match () { }
-                }
+        //^^ Missing match arm
-            }
+   match (()) { }
-        ",
+       //^^^^ Missing match arm
-        );
-    }
-    #[test]
+    match () { _ => (), }
-    fn tuple_of_two_empty_tuple_no_diagnostic() {
+    match () { () => (), }
-        check_no_diagnostic(
+    match (()) { (()) => (), }
-            r"
+}
-            fn test_fn() {
+"#,
-                match ((), ()) {
-                    ((), ()) => {}
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn bool_no_arms() {
-        check_diagnostic(
-            r"
-            fn test_fn() {
-                match false {
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn bool_missing_arm() {
-        check_diagnostic(
-            r"
-            fn test_fn() {
-                match false {
-                    true => {}
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn bool_no_diagnostic() {
-        check_no_diagnostic(
-            r"
-            fn test_fn() {
-                match false {
-                    true => {}
-                    false => {}
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn tuple_of_bools_no_arms() {
-        check_diagnostic(
-            r"
-            fn test_fn() {
-                match (false, true) {
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn tuple_of_bools_missing_arms() {
-        check_diagnostic(
-            r"
-            fn test_fn() {
-                match (false, true) {
-                    (true, true) => {},
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn tuple_of_bools_missing_arm() {
-        check_diagnostic(
-            r"
-            fn test_fn() {
-                match (false, true) {
-                    (false, true) => {},
-                    (false, false) => {},
-                    (true, false) => {},
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn tuple_of_bools_with_wilds() {
-        check_no_diagnostic(
-            r"
-            fn test_fn() {
-                match (false, true) {
-                    (false, _) => {},
-                    (true, false) => {},
-                    (_, true) => {},
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn tuple_of_bools_no_diagnostic() {
+    fn tuple_of_two_empty_tuple() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            fn test_fn() {
+fn main() {
-                match (false, true) {
+    match ((), ()) { }
-                    (true, true) => {},
+        //^^^^^^^^ Missing match arm
-                    (true, false) => {},
-                    (false, true) => {},
-                    (false, false) => {},
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+    match ((), ()) { ((), ()) => (), }
-    fn tuple_of_bools_binding_missing_arms() {
+}
-        check_diagnostic(
+"#,
-            r"
+        );
-            fn test_fn() {
+    }
-                match (false, true) {
-                    (true, _x) => {},
+    #[test]
-                }
+    fn boolean() {
-            }
+        check_diagnostics(
-        ",
+            r#"
-        );
+fn test_main() {
-    }
+    match false { }
+        //^^^^^ Missing match arm
-    #[test]
+    match false { true => (), }
-    fn tuple_of_bools_binding_no_diagnostic() {
+        //^^^^^ Missing match arm
-        check_no_diagnostic(
+    match (false, true) {}
-            r"
+        //^^^^^^^^^^^^^ Missing match arm
-            fn test_fn() {
+    match (false, true) { (true, true) => (), }
-                match (false, true) {
+        //^^^^^^^^^^^^^ Missing match arm
-                    (true, _x) => {},
+    match (false, true) {
-                    (false, true) => {},
+        //^^^^^^^^^^^^^ Missing match arm
-                    (false, false) => {},
+        (false, true) => (),
-                }
+        (false, false) => (),
-            }
+        (true, false) => (),
-        ",
+    }
+    match (false, true) { (true, _x) => (), }
+        //^^^^^^^^^^^^^ Missing match arm
+    match false { true => (), false => (), }
+    match (false, true) {
+        (false, _) => (),
+        (true, false) => (),
+        (_, true) => (),
+    }
+    match (false, true) {
+        (true, true) => (),
+        (true, false) => (),
+        (false, true) => (),
+        (false, false) => (),
+    }
+    match (false, true) {
+        (true, _x) => (),
+        (false, true) => (),
+        (false, false) => (),
+    }
+    match (false, true, false) {
+        (false, ..) => (),
+        (true, ..) => (),
+    }
+    match (false, true, false) {
+        (.., false) => (),
+        (.., true) => (),
+    }
+    match (false, true, false) { (..) => (), }
+}
+"#,
        );
    }
    #[test]
-    fn tuple_of_bools_with_ellipsis_at_end_no_diagnostic() {
+    fn tuple_of_tuple_and_bools() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            fn test_fn() {
+fn main() {
-                match (false, true, false) {
+    match (false, ((), false)) {}
-                    (false, ..) => {},
+        //^^^^^^^^^^^^^^^^^^^^ Missing match arm
-                    (true, ..) => {},
+    match (false, ((), false)) { (true, ((), true)) => (), }
-                }
+        //^^^^^^^^^^^^^^^^^^^^ Missing match arm
-            }
+    match (false, ((), false)) { (true, _) => (), }
-        ",
+        //^^^^^^^^^^^^^^^^^^^^ Missing match arm
-        );
-    }
-    #[test]
+    match (false, ((), false)) {
-    fn tuple_of_bools_with_ellipsis_at_beginning_no_diagnostic() {
+        (true, ((), true)) => (),
-        check_no_diagnostic(
+        (true, ((), false)) => (),
-            r"
+        (false, ((), true)) => (),
-            fn test_fn() {
+        (false, ((), false)) => (),
-                match (false, true, false) {
-                    (.., false) => {},
-                    (.., true) => {},
-                }
-            }
-        ",
-        );
    }
+    match (false, ((), false)) {
-    #[test]
+        (true, ((), true)) => (),
-    fn tuple_of_bools_with_ellipsis_no_diagnostic() {
+        (true, ((), false)) => (),
-        check_no_diagnostic(
+        (false, _) => (),
-            r"
-            fn test_fn() {
-                match (false, true, false) {
-                    (..) => {},
-                }
-            }
-        ",
-        );
    }
+}
-    #[test]
+"#,
-    fn tuple_of_tuple_and_bools_no_arms() {
-        check_diagnostic(
-            r"
-            fn test_fn() {
-                match (false, ((), false)) {
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn tuple_of_tuple_and_bools_missing_arms() {
+    fn enums() {
-        check_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            fn test_fn() {
+enum Either { A, B, }
-                match (false, ((), false)) {
-                    (true, ((), true)) => {},
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn main() {
-    fn tuple_of_tuple_and_bools_no_diagnostic() {
+    match Either::A { }
-        check_no_diagnostic(
+        //^^^^^^^^^ Missing match arm
-            r"
+    match Either::B { Either::A => (), }
-            fn test_fn() {
+        //^^^^^^^^^ Missing match arm
-                match (false, ((), false)) {
-                    (true, ((), true)) => {},
-                    (true, ((), false)) => {},
-                    (false, ((), true)) => {},
-                    (false, ((), false)) => {},
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+    match &Either::B {
-    fn tuple_of_tuple_and_bools_wildcard_missing_arms() {
+        //^^^^^^^^^^ Missing match arm
-        check_diagnostic(
+        Either::A => (),
-            r"
-            fn test_fn() {
-                match (false, ((), false)) {
-                    (true, _) => {},
-                }
-            }
-        ",
-        );
    }
-    #[test]
+    match Either::B {
-    fn tuple_of_tuple_and_bools_wildcard_no_diagnostic() {
+        Either::A => (), Either::B => (),
-        check_no_diagnostic(
-            r"
-            fn test_fn() {
-                match (false, ((), false)) {
-                    (true, ((), true)) => {},
-                    (true, ((), false)) => {},
-                    (false, _) => {},
-                }
-            }
-        ",
-        );
    }
+    match &Either::B {
-    #[test]
+        Either::A => (), Either::B => (),
-    fn enum_no_arms() {
-        check_diagnostic(
-            r"
-            enum Either {
-                A,
-                B,
-            }
-            fn test_fn() {
-                match Either::A {
-                }
-            }
-        ",
-        );
    }
+}
-    #[test]
+"#,
-    fn enum_missing_arms() {
-        check_diagnostic(
-            r"
-            enum Either {
-                A,
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A => {},
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn enum_no_diagnostic() {
+    fn enum_containing_bool() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either {
+enum Either { A(bool), B }
-                A,
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A => {},
-                    Either::B => {},
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn main() {
-    fn enum_ref_missing_arms() {
+    match Either::B { }
-        check_diagnostic(
+        //^^^^^^^^^ Missing match arm
-            r"
+    match Either::B {
-            enum Either {
+        //^^^^^^^^^ Missing match arm
-                A,
+        Either::A(true) => (), Either::B => ()
-                B,
-            }
-            fn test_fn() {
-                match &Either::B {
-                    Either::A => {},
-                }
-            }
-        ",
-        );
    }
-    #[test]
+    match Either::B {
-    fn enum_ref_no_diagnostic() {
+        Either::A(true) => (),
-        check_no_diagnostic(
+        Either::A(false) => (),
-            r"
+        Either::B => (),
-            enum Either {
-                A,
-                B,
-            }
-            fn test_fn() {
-                match &Either::B {
-                    Either::A => {},
-                    Either::B => {},
-                }
-            }
-        ",
-        );
    }
+    match Either::B {
-    #[test]
+        Either::B => (),
-    fn enum_containing_bool_no_arms() {
+        _ => (),
-        check_diagnostic(
-            r"
-            enum Either {
-                A(bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                }
-            }
-        ",
-        );
    }
+    match Either::B {
-    #[test]
+        Either::A(_) => (),
-    fn enum_containing_bool_missing_arms() {
+        Either::B => (),
-        check_diagnostic(
-            r"
-            enum Either {
-                A(bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A(true) => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
    }
-    #[test]
+}
-    fn enum_containing_bool_no_diagnostic() {
+        "#,
-        check_no_diagnostic(
-            r"
-            enum Either {
-                A(bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A(true) => (),
-                    Either::A(false) => (),
-                    Either::B => (),
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn enum_containing_bool_with_wild_no_diagnostic() {
+    fn enum_different_sizes() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either {
+enum Either { A(bool), B(bool, bool) }
-                A(bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::B => (),
-                    _ => (),
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn main() {
-    fn enum_containing_bool_with_wild_2_no_diagnostic() {
+    match Either::A(false) {
-        check_no_diagnostic(
+        //^^^^^^^^^^^^^^^^ Missing match arm
-            r"
+        Either::A(_) => (),
-            enum Either {
+        Either::B(false, _) => (),
-                A(bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A(_) => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
    }
-    #[test]
+    match Either::A(false) {
-    fn enum_different_sizes_missing_arms() {
+        Either::A(_) => (),
-        check_diagnostic(
+        Either::B(true, _) => (),
-            r"
+        Either::B(false, _) => (),
-            enum Either {
-                A(bool),
-                B(bool, bool),
-            }
-            fn test_fn() {
-                match Either::A(false) {
-                    Either::A(_) => (),
-                    Either::B(false, _) => (),
-                }
-            }
-        ",
-        );
    }
+    match Either::A(false) {
-    #[test]
+        Either::A(true) | Either::A(false) => (),
-    fn enum_different_sizes_no_diagnostic() {
+        Either::B(true, _) => (),
-        check_no_diagnostic(
+        Either::B(false, _) => (),
-            r"
-            enum Either {
-                A(bool),
-                B(bool, bool),
-            }
-            fn test_fn() {
-                match Either::A(false) {
-                    Either::A(_) => (),
-                    Either::B(true, _) => (),
-                    Either::B(false, _) => (),
-                }
-            }
-        ",
-        );
    }
+}
-    #[test]
+"#,
-    fn or_no_diagnostic() {
-        check_no_diagnostic(
-            r"
-            enum Either {
-                A(bool),
-                B(bool, bool),
-            }
-            fn test_fn() {
-                match Either::A(false) {
-                    Either::A(true) | Either::A(false) => (),
-                    Either::B(true, _) => (),
-                    Either::B(false, _) => (),
-                }
-            }
-        ",
        );
    }
    #[test]
    fn tuple_of_enum_no_diagnostic() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either {
+enum Either { A(bool), B(bool, bool) }
-                A(bool),
+enum Either2 { C, D }
-                B(bool, bool),
-            }
+fn main() {
-            enum Either2 {
+    match (Either::A(false), Either2::C) {
-                C,
+        (Either::A(true), _) | (Either::A(false), _) => (),
-                D,
+        (Either::B(true, _), Either2::C) => (),
-            }
+        (Either::B(false, _), Either2::C) => (),
-            fn test_fn() {
+        (Either::B(_, _), Either2::D) => (),
-                match (Either::A(false), Either2::C) {
-                    (Either::A(true), _) | (Either::A(false), _) => (),
-                    (Either::B(true, _), Either2::C) => (),
-                    (Either::B(false, _), Either2::C) => (),
-                    (Either::B(_, _), Either2::D) => (),
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn mismatched_types() {
-        // Match statements with arms that don't match the
-        // expression pattern do not fire this diagnostic.
-        check_no_diagnostic(
-            r"
-            enum Either {
-                A,
-                B,
-            }
-            enum Either2 {
-                C,
-                D,
-            }
-            fn test_fn() {
-                match Either::A {
-                    Either2::C => (),
-                    Either2::D => (),
-                }
-            }
-        ",
-        );
    }
+}
-    #[test]
+"#,
-    fn mismatched_types_with_different_arity() {
-        // Match statements with arms that don't match the
-        // expression pattern do not fire this diagnostic.
-        check_no_diagnostic(
-            r"
-            fn test_fn() {
-                match (true, false) {
-                    (true, false, true) => (),
-                    (true) => (),
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn malformed_match_arm_tuple_missing_pattern() {
+    fn mismatched_types() {
        // Match statements with arms that don't match the
        // expression pattern do not fire this diagnostic.
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            fn test_fn() {
+enum Either { A, B }
-                match (0) {
+enum Either2 { C, D }
-                    () => (),
-                }
+fn main() {
-            }
+    match Either::A {
-        ",
+        Either2::C => (),
+        Either2::D => (),
+    }
+    match (true, false) {
+        (true, false, true) => (),
+        (true) => (),
+    }
+    match (0) { () => () }
+    match Unresolved::Bar { Unresolved::Baz => () }
+}
+        "#,
        );
    }
@@ -1522,636 +1089,333 @@ mod tests {
    fn malformed_match_arm_tuple_enum_missing_pattern() {
        // We are testing to be sure we don't panic here when the match
        // arm `Either::B` is missing its pattern.
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either {
+enum Either { A, B(u32) }
-                A,
-                B(u32),
-            }
-            fn test_fn() {
-                match Either::A {
-                    Either::A => (),
-                    Either::B() => (),
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn main() {
-    fn enum_not_in_scope() {
+    match Either::A {
-        // The enum is not in scope so we don't perform exhaustiveness
+        Either::A => (),
-        // checking, but we want to be sure we don't panic here (and
+        Either::B() => (),
-        // we don't create a diagnostic).
+    }
-        check_no_diagnostic(
+}
-            r"
+"#,
-            fn test_fn() {
-                match Foo::Bar {
-                    Foo::Baz => (),
-                }
-            }
-        ",
        );
    }
    #[test]
    fn expr_diverges() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either {
+enum Either { A, B }
-                A,
-                B,
-            }
-            fn test_fn() {
-                match loop {} {
-                    Either::A => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn main() {
-    fn expr_loop_with_break() {
+    match loop {} {
-        check_no_diagnostic(
+        Either::A => (),
-            r"
+        Either::B => (),
-            enum Either {
+    }
-                A,
+    match loop {} {
-                B,
+        Either::A => (),
-            }
+    }
-            fn test_fn() {
+    match loop { break Foo::A } {
-                match loop { break Foo::A } {
+        //^^^^^^^^^^^^^^^^^^^^^ Missing match arm
-                    Either::A => (),
+        Either::A => (),
-                    Either::B => (),
+    }
-                }
+    match loop { break Foo::A } {
-            }
+        Either::A => (),
-        ",
+        Either::B => (),
+    }
+}
+"#,
        );
    }
    #[test]
    fn expr_partially_diverges() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either<T> {
+enum Either<T> { A(T), B }
-                A(T),
-                B,
-            }
-            fn foo() -> Either<!> {
-                Either::B
-            }
-            fn test_fn() -> u32 {
-                match foo() {
-                    Either::A(val) => val,
-                    Either::B => 0,
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn foo() -> Either<!> { Either::B }
-    fn enum_record_no_arms() {
+fn main() -> u32 {
-        check_diagnostic(
+    match foo() {
-            r"
+        Either::A(val) => val,
-            enum Either {
+        Either::B => 0,
-                A { foo: bool },
-                B,
-            }
-            fn test_fn() {
-                let a = Either::A { foo: true };
-                match a {
-                }
-            }
-        ",
-        );
    }
+}
-    #[test]
+"#,
-    fn enum_record_missing_arms() {
-        check_diagnostic(
-            r"
-            enum Either {
-                A { foo: bool },
-                B,
-            }
-            fn test_fn() {
-                let a = Either::A { foo: true };
-                match a {
-                    Either::A { foo: true } => (),
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn enum_record_no_diagnostic() {
+    fn enum_record() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either {
+enum Either { A { foo: bool }, B }
-                A { foo: bool },
-                B,
-            }
-            fn test_fn() {
-                let a = Either::A { foo: true };
-                match a {
-                    Either::A { foo: true } => (),
-                    Either::A { foo: false } => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn main() {
-    fn enum_record_missing_field_no_diagnostic() {
+    let a = Either::A { foo: true };
-        // When `Either::A` is missing a struct member, we don't want
+    match a { }
-        // to fire the missing match arm diagnostic. This should fire
+        //^ Missing match arm
-        // some other diagnostic.
+    match a { Either::A { foo: true } => () }
-        check_no_diagnostic(
+        //^ Missing match arm
-            r"
+    match a {
-            enum Either {
+        Either::A { } => (),
-                A { foo: bool },
+                //^^^ Missing structure fields:
-                B,
+                //  | - foo
-            }
+        Either::B => (),
-            fn test_fn() {
-                let a = Either::B;
-                match a {
-                    Either::A { } => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
    }
+    match a {
+        //^ Missing match arm
+        Either::A { } => (),
+    }           //^^^ Missing structure fields:
+                //  | - foo
-    #[test]
+    match a {
-    fn enum_record_missing_field_missing_match_arm() {
+        Either::A { foo: true } => (),
-        // Even though `Either::A` is missing fields, we still want to fire
+        Either::A { foo: false } => (),
-        // the missing arm diagnostic here, since we know `Either::B` is missing.
+        Either::B => (),
-        check_diagnostic(
-            r"
-            enum Either {
-                A { foo: bool },
-                B,
-            }
-            fn test_fn() {
-                let a = Either::B;
-                match a {
-                    Either::A { } => (),
-                }
-            }
-        ",
-        );
    }
+    match a {
-    #[test]
+        Either::A { foo: _ } => (),
-    fn enum_record_no_diagnostic_wild() {
+        Either::B => (),
-        check_no_diagnostic(
-            r"
-            enum Either {
-                A { foo: bool },
-                B,
-            }
-            fn test_fn() {
-                let a = Either::A { foo: true };
-                match a {
-                    Either::A { foo: _ } => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
    }
+}
-    #[test]
+"#,
-    fn enum_record_fields_out_of_order_missing_arm() {
-        check_diagnostic(
-            r"
-            enum Either {
-                A { foo: bool, bar: () },
-                B,
-            }
-            fn test_fn() {
-                let a = Either::A { foo: true };
-                match a {
-                    Either::A { bar: (), foo: false } => (),
-                    Either::A { foo: true, bar: () } => (),
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn enum_record_fields_out_of_order_no_diagnostic() {
+    fn enum_record_fields_out_of_order() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either {
+enum Either {
-                A { foo: bool, bar: () },
+    A { foo: bool, bar: () },
-                B,
+    B,
-            }
+}
-            fn test_fn() {
-                let a = Either::A { foo: true };
-                match a {
-                    Either::A { bar: (), foo: false } => (),
-                    Either::A { foo: true, bar: () } => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn main() {
-    fn enum_record_ellipsis_missing_arm() {
+    let a = Either::A { foo: true, bar: () };
-        check_diagnostic(
+    match a {
-            r"
+        //^ Missing match arm
-            enum Either {
+        Either::A { bar: (), foo: false } => (),
-                A { foo: bool, bar: bool },
+        Either::A { foo: true, bar: () } => (),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A { foo: true, .. } => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
    }
-    #[test]
+    match a {
-    fn enum_record_ellipsis_no_diagnostic() {
+        Either::A { bar: (), foo: false } => (),
-        check_no_diagnostic(
+        Either::A { foo: true, bar: () } => (),
-            r"
+        Either::B => (),
-            enum Either {
-                A { foo: bool, bar: bool },
-                B,
-            }
-            fn test_fn() {
-                let a = Either::A { foo: true };
-                match a {
-                    Either::A { foo: true, .. } => (),
-                    Either::A { foo: false, .. } => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
    }
+}
-    #[test]
+"#,
-    fn enum_record_ellipsis_all_fields_missing_arm() {
-        check_diagnostic(
-            r"
-            enum Either {
-                A { foo: bool, bar: bool },
-                B,
-            }
-            fn test_fn() {
-                let a = Either::B;
-                match a {
-                    Either::A { .. } => (),
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn enum_record_ellipsis_all_fields_no_diagnostic() {
+    fn enum_record_ellipsis() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Either {
+enum Either {
-                A { foo: bool, bar: bool },
+    A { foo: bool, bar: bool },
-                B,
+    B,
-            }
+}
-            fn test_fn() {
-                let a = Either::B;
-                match a {
-                    Either::A { .. } => (),
-                    Either::B => (),
-                }
-            }
-        ",
-        );
-    }
-    #[test]
+fn main() {
-    fn enum_tuple_partial_ellipsis_no_diagnostic() {
+    let a = Either::B;
-        check_no_diagnostic(
+    match a {
-            r"
+        //^ Missing match arm
-            enum Either {
+        Either::A { foo: true, .. } => (),
-                A(bool, bool, bool, bool),
+        Either::B => (),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A(true, .., true) => {},
-                    Either::A(true, .., false) => {},
-                    Either::A(false, .., true) => {},
-                    Either::A(false, .., false) => {},
-                    Either::B => {},
-                }
-            }
-        ",
-        );
    }
+    match a {
-    #[test]
+        //^ Missing match arm
-    fn enum_tuple_partial_ellipsis_2_no_diagnostic() {
+        Either::A { .. } => (),
-        check_no_diagnostic(
-            r"
-            enum Either {
-                A(bool, bool, bool, bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A(true, .., true) => {},
-                    Either::A(true, .., false) => {},
-                    Either::A(.., true) => {},
-                    Either::A(.., false) => {},
-                    Either::B => {},
-                }
-            }
-        ",
-        );
    }
-    #[test]
+    match a {
-    fn enum_tuple_partial_ellipsis_missing_arm() {
+        Either::A { foo: true, .. } => (),
-        check_diagnostic(
+        Either::A { foo: false, .. } => (),
-            r"
+        Either::B => (),
-            enum Either {
-                A(bool, bool, bool, bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A(true, .., true) => {},
-                    Either::A(true, .., false) => {},
-                    Either::A(false, .., false) => {},
-                    Either::B => {},
-                }
-            }
-        ",
-        );
    }
-    #[test]
+    match a {
-    fn enum_tuple_partial_ellipsis_2_missing_arm() {
+        Either::A { .. } => (),
-        check_diagnostic(
+        Either::B => (),
-            r"
-            enum Either {
-                A(bool, bool, bool, bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A(true, .., true) => {},
-                    Either::A(true, .., false) => {},
-                    Either::A(.., true) => {},
-                    Either::B => {},
-                }
-            }
-        ",
-        );
    }
+}
-    #[test]
+"#,
-    fn enum_tuple_ellipsis_no_diagnostic() {
-        check_no_diagnostic(
-            r"
-            enum Either {
-                A(bool, bool, bool, bool),
-                B,
-            }
-            fn test_fn() {
-                match Either::B {
-                    Either::A(..) => {},
-                    Either::B => {},
-                }
-            }
-        ",
        );
    }
    #[test]
-    fn enum_never() {
+    fn enum_tuple_partial_ellipsis() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Never {}
+enum Either {
+    A(bool, bool, bool, bool),
+    B,
+}
-            fn test_fn(never: Never) {
+fn main() {
-                match never {}
+    match Either::B {
-            }
+        //^^^^^^^^^ Missing match arm
-        ",
+        Either::A(true, .., true) => (),
-        );
+        Either::A(true, .., false) => (),
+        Either::A(false, .., false) => (),
+        Either::B => (),
+    }
+    match Either::B {
+        //^^^^^^^^^ Missing match arm
+        Either::A(true, .., true) => (),
+        Either::A(true, .., false) => (),
+        Either::A(.., true) => (),
+        Either::B => (),
+    }
+    match Either::B {
+        Either::A(true, .., true) => (),
+        Either::A(true, .., false) => (),
+        Either::A(false, .., true) => (),
+        Either::A(false, .., false) => (),
+        Either::B => (),
+    }
+    match Either::B {
+        Either::A(true, .., true) => (),
+        Either::A(true, .., false) => (),
+        Either::A(.., true) => (),
+        Either::A(.., false) => (),
+        Either::B => (),
    }
+}
-    #[test]
+"#,
-    fn type_never() {
-        check_no_diagnostic(
-            r"
-            fn test_fn(never: !) {
-                match never {}
-            }
-        ",
        );
    }
    #[test]
-    fn enum_never_ref() {
+    fn never() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            enum Never {}
+enum Never {}
-            fn test_fn(never: &Never) {
+fn enum_(never: Never) {
-                match never {}
+    match never {}
-            }
+}
-        ",
+fn enum_ref(never: &Never) {
-        );
+    match never {}
-    }
+}
+fn bang(never: !) {
-    #[test]
+    match never {}
-    fn expr_diverges_missing_arm() {
+}
-        check_no_diagnostic(
+"#,
-            r"
-            enum Either {
-                A,
-                B,
-            }
-            fn test_fn() {
-                match loop {} {
-                    Either::A => (),
-                }
-            }
-        ",
        );
    }
    #[test]
    fn or_pattern_panic() {
-        check_no_diagnostic(
+        check_diagnostics(
-            r"
+            r#"
-            pub enum Category {
+pub enum Category { Infinity, Zero }
-                Infinity,
-                Zero,
-            }
-            fn panic(a: Category, b: Category) {
+fn panic(a: Category, b: Category) {
-                match (a, b) {
+    match (a, b) {
-                    (Category::Zero | Category::Infinity, _) => {}
+        (Category::Zero | Category::Infinity, _) => (),
-                    (_, Category::Zero | Category::Infinity) => {}
+        (_, Category::Zero | Category::Infinity) => (),
-                }
-            }
-        ",
-        );
    }
-    #[test]
+    // FIXME: This is a false positive, but the code used to cause a panic in the match checker,
-    fn or_pattern_panic_2() {
+    // so this acts as a regression test for that.
-        // FIXME: This is a false positive, but the code used to cause a panic in the match checker,
+    match (a, b) {
-        // so this acts as a regression test for that.
+        //^^^^^^ Missing match arm
-        check_diagnostic(
+        (Category::Infinity, Category::Infinity) | (Category::Zero, Category::Zero) => (),
-            r"
+        (Category::Infinity | Category::Zero, _) => (),
-            pub enum Category {
-                Infinity,
-                Zero,
-            }
-            fn panic(a: Category, b: Category) {
-                match (a, b) {
-                    (Category::Infinity, Category::Infinity) | (Category::Zero, Category::Zero) => {}
-                    (Category::Infinity | Category::Zero, _) => {}
-                }
-            }
-        ",
-        );
    }
 }
+"#,
-#[cfg(test)]
+        );
-mod false_negatives {
+    }
-    //! The implementation of match checking here is a work in progress. As we roll this out, we
-    //! prefer false negatives to false positives (ideally there would be no false positives). This
+    mod false_negatives {
-    //! test module should document known false negatives. Eventually we will have a complete
+        //! The implementation of match checking here is a work in progress. As we roll this out, we
-    //! implementation of match checking and this module will be empty.
+        //! prefer false negatives to false positives (ideally there would be no false positives). This
-    //!
+        //! test module should document known false negatives. Eventually we will have a complete
-    //! The reasons for documenting known false negatives:
+        //! implementation of match checking and this module will be empty.
-    //!
+        //!
-    //!   1. It acts as a backlog of work that can be done to improve the behavior of the system.
+        //! The reasons for documenting known false negatives:
-    //!   2. It ensures the code doesn't panic when handling these cases.
+        //!
+        //!   1. It acts as a backlog of work that can be done to improve the behavior of the system.
-    use super::tests::*;
+        //!   2. It ensures the code doesn't panic when handling these cases.
+        use super::*;
-    #[test]
-    fn integers() {
+        #[test]
-        // This is a false negative.
+        fn integers() {
-        // We don't currently check integer exhaustiveness.
+            // We don't currently check integer exhaustiveness.
-        check_no_diagnostic(
+            check_diagnostics(
-            r"
+                r#"
-            fn test_fn() {
+fn main() {
-                match 5 {
+    match 5 {
-                    10 => (),
+        10 => (),
-                    11..20 => (),
+        11..20 => (),
-                }
-            }
-        ",
-        );
-    }
-    #[test]
-    fn internal_or() {
-        // This is a false negative.
-        // We do not currently handle patterns with internal `or`s.
-        check_no_diagnostic(
-            r"
-            fn test_fn() {
-                enum Either {
-                    A(bool),
-                    B,
-                }
-                match Either::B {
-                    Either::A(true | false) => (),
-                }
-            }
-        ",
-        );
    }
+}
+"#,
+            );
+        }
-    #[test]
+        #[test]
-    fn expr_loop_missing_arm() {
+        fn internal_or() {
-        // This is a false negative.
+            // We do not currently handle patterns with internal `or`s.
-        // We currently infer the type of `loop { break Foo::A }` to `!`, which
+            check_diagnostics(
-        // causes us to skip the diagnostic since `Either::A` doesn't type check
+                r#"
-        // with `!`.
+fn main() {
-        check_diagnostic(
+    enum Either { A(bool), B }
-            r"
+    match Either::B {
-            enum Either {
+        Either::A(true | false) => (),
-                A,
-                B,
-            }
-            fn test_fn() {
-                match loop { break Foo::A } {
-                    Either::A => (),
-                }
-            }
-        ",
-        );
    }
+}
+"#,
+            );
+        }
-    #[test]
+        #[test]
-    fn tuple_of_bools_with_ellipsis_at_end_missing_arm() {
+        fn tuple_of_bools_with_ellipsis_at_end_missing_arm() {
-        // This is a false negative.
+            // We don't currently handle tuple patterns with ellipsis.
-        // We don't currently handle tuple patterns with ellipsis.
+            check_diagnostics(
-        check_no_diagnostic(
+                r#"
-            r"
+fn main() {
-            fn test_fn() {
+    match (false, true, false) {
-                match (false, true, false) {
+        (false, ..) => (),
-                    (false, ..) => {},
-                }
-            }
-        ",
-        );
    }
+}
+"#,
+            );
+        }
-    #[test]
+        #[test]
-    fn tuple_of_bools_with_ellipsis_at_beginning_missing_arm() {
+        fn tuple_of_bools_with_ellipsis_at_beginning_missing_arm() {
-        // This is a false negative.
+            // We don't currently handle tuple patterns with ellipsis.
-        // We don't currently handle tuple patterns with ellipsis.
+            check_diagnostics(
-        check_no_diagnostic(
+                r#"
-            r"
+fn main() {
-            fn test_fn() {
+    match (false, true, false) {
-                match (false, true, false) {
+        (.., false) => (),
-                    (.., false) => {},
-                }
-            }
-        ",
-        );
    }
+}
+"#,
+            );
+        }
-    #[test]
+        #[test]
-    fn struct_missing_arm() {
+        fn struct_missing_arm() {
-        // This is a false negative.
+            // We don't currently handle structs.
-        // We don't currently handle structs.
+            check_diagnostics(
-        check_no_diagnostic(
+                r#"
-            r"
+struct Foo { a: bool }
-            struct Foo {
+fn main(f: Foo) {
-                a: bool,
+    match f { Foo { a: true } => () }
-            }
+}
-            fn test_fn(f: Foo) {
+"#,
-                match f {
+            );
-                    Foo { a: true } => {},
+        }
-                }
-            }
-        ",
-        );
    }
 }
diff --git a/crates/ra_hir_ty/src/unsafe_validation.rs b/crates/ra_hir_ty/src/diagnostics/unsafe_check.rs
index c512c4f8e..5cc76bdce 100644
--- a/crates/ra_hir_ty/src/unsafe_validation.rs
+++ b/crates/ra_hir_ty/src/diagnostics/unsafe_check.rs
@@ -6,35 +6,38 @@ use std::sync::Arc;
 use hir_def::{
    body::Body,
    expr::{Expr, ExprId, UnaryOp},
-    DefWithBodyId, FunctionId,
+    DefWithBodyId,
 };
 use hir_expand::diagnostics::DiagnosticSink;
 use crate::{
-    db::HirDatabase, diagnostics::MissingUnsafe, lower::CallableDef, ApplicationTy,
+    db::HirDatabase, diagnostics::MissingUnsafe, lower::CallableDefId, ApplicationTy,
    InferenceResult, Ty, TypeCtor,
 };
-pub struct UnsafeValidator<'a, 'b: 'a> {
+pub(super) struct UnsafeValidator<'a, 'b: 'a> {
-    func: FunctionId,
+    owner: DefWithBodyId,
    infer: Arc<InferenceResult>,
    sink: &'a mut DiagnosticSink<'b>,
 }
 impl<'a, 'b> UnsafeValidator<'a, 'b> {
-    pub fn new(
+    pub(super) fn new(
-        func: FunctionId,
+        owner: DefWithBodyId,
        infer: Arc<InferenceResult>,
        sink: &'a mut DiagnosticSink<'b>,
    ) -> UnsafeValidator<'a, 'b> {
-        UnsafeValidator { func, infer, sink }
+        UnsafeValidator { owner, infer, sink }
    }
-    pub fn validate_body(&mut self, db: &dyn HirDatabase) {
+    pub(super) fn validate_body(&mut self, db: &dyn HirDatabase) {
-        let def = self.func.into();
+        let def = self.owner.into();
        let unsafe_expressions = unsafe_expressions(db, self.infer.as_ref(), def);
-        let func_data = db.function_data(self.func);
+        let is_unsafe = match self.owner {
-        if func_data.is_unsafe
+            DefWithBodyId::FunctionId(it) => db.function_data(it).is_unsafe,
+            DefWithBodyId::StaticId(_) | DefWithBodyId::ConstId(_) => false,
+        };
+        if is_unsafe
            || unsafe_expressions
                .iter()
                .filter(|unsafe_expr| !unsafe_expr.inside_unsafe_block)
@@ -85,7 +88,7 @@ fn walk_unsafe(
        Expr::Call { callee, .. } => {
            let ty = &infer[*callee];
            if let &Ty::Apply(ApplicationTy {
-                ctor: TypeCtor::FnDef(CallableDef::FunctionId(func)),
+                ctor: TypeCtor::FnDef(CallableDefId::FunctionId(func)),
                ..
            }) = ty
            {
@@ -118,3 +121,53 @@ fn walk_unsafe(
        walk_unsafe(unsafe_exprs, db, infer, body, child, inside_unsafe_block);
    });
 }
+#[cfg(test)]
+mod tests {
+    use crate::diagnostics::tests::check_diagnostics;
+    #[test]
+    fn missing_unsafe_diagnostic_with_raw_ptr() {
+        check_diagnostics(
+            r#"
+fn main() {
+    let x = &5 as *const usize;
+    unsafe { let y = *x; }
+    let z = *x;
+}         //^^ This operation is unsafe and requires an unsafe function or block
+"#,
+        )
+    }
+    #[test]
+    fn missing_unsafe_diagnostic_with_unsafe_call() {
+        check_diagnostics(
+            r#"
+struct HasUnsafe;
+impl HasUnsafe {
+    unsafe fn unsafe_fn(&self) {
+        let x = &5 as *const usize;
+        let y = *x;
+    }
+}
+unsafe fn unsafe_fn() {
+    let x = &5 as *const usize;
+    let y = *x;
+}
+fn main() {
+    unsafe_fn();
+  //^^^^^^^^^^^ This operation is unsafe and requires an unsafe function or block
+    HasUnsafe.unsafe_fn();
+  //^^^^^^^^^^^^^^^^^^^^^ This operation is unsafe and requires an unsafe function or block
+    unsafe {
+        unsafe_fn();
+        HasUnsafe.unsafe_fn();
+    }
+}
+"#,
+        );
+    }
+}
diff --git a/crates/ra_hir_ty/src/display.rs b/crates/ra_hir_ty/src/display.rs
index 23cea1a2a..19770e609 100644
--- a/crates/ra_hir_ty/src/display.rs
+++ b/crates/ra_hir_ty/src/display.rs
@@ -3,7 +3,7 @@
 use std::fmt;
 use crate::{
-    db::HirDatabase, utils::generics, ApplicationTy, CallableDef, FnSig, GenericPredicate,
+    db::HirDatabase, utils::generics, ApplicationTy, CallableDefId, FnSig, GenericPredicate,
    Obligation, OpaqueTyId, ProjectionTy, Substs, TraitRef, Ty, TypeCtor,
 };
 use hir_def::{
@@ -243,22 +243,36 @@ impl HirDisplay for ApplicationTy {
                    write!(f, ")")?;
                }
            }
-            TypeCtor::FnPtr { .. } => {
+            TypeCtor::FnPtr { is_varargs, .. } => {
-                let sig = FnSig::from_fn_ptr_substs(&self.parameters);
+                let sig = FnSig::from_fn_ptr_substs(&self.parameters, is_varargs);
                write!(f, "fn(")?;
                f.write_joined(sig.params(), ", ")?;
+                if is_varargs {
+                    if sig.params().is_empty() {
+                        write!(f, "...")?;
+                    } else {
+                        write!(f, ", ...")?;
+                    }
+                }
                write!(f, ")")?;
                let ret = sig.ret();
                if *ret != Ty::unit() {
-                    write!(f, " -> {}", ret.display(f.db))?;
+                    let ret_display = if f.omit_verbose_types() {
+                        ret.display_truncated(f.db, f.max_size)
+                    } else {
+                        ret.display(f.db)
+                    };
+                    write!(f, " -> {}", ret_display)?;
                }
            }
            TypeCtor::FnDef(def) => {
                let sig = f.db.callable_item_signature(def).subst(&self.parameters);
                match def {
-                    CallableDef::FunctionId(ff) => write!(f, "fn {}", f.db.function_data(ff).name)?,
+                    CallableDefId::FunctionId(ff) => {
-                    CallableDef::StructId(s) => write!(f, "{}", f.db.struct_data(s).name)?,
+                        write!(f, "fn {}", f.db.function_data(ff).name)?
-                    CallableDef::EnumVariantId(e) => {
+                    }
+                    CallableDefId::StructId(s) => write!(f, "{}", f.db.struct_data(s).name)?,
+                    CallableDefId::EnumVariantId(e) => {
                        write!(f, "{}", f.db.enum_data(e.parent).variants[e.local_id].name)?
                    }
                };
@@ -279,7 +293,12 @@ impl HirDisplay for ApplicationTy {
                write!(f, ")")?;
                let ret = sig.ret();
                if *ret != Ty::unit() {
-                    write!(f, " -> {}", ret.display(f.db))?;
+                    let ret_display = if f.omit_verbose_types() {
+                        ret.display_truncated(f.db, f.max_size)
+                    } else {
+                        ret.display(f.db)
+                    };
+                    write!(f, " -> {}", ret_display)?;
                }
            }
            TypeCtor::Adt(def_id) => {
@@ -369,7 +388,7 @@ impl HirDisplay for ApplicationTy {
                        let data = (*datas)
                            .as_ref()
                            .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
-                        data.clone().subst(&self.parameters)
+                        data.subst(&self.parameters)
                    }
                };
                write!(f, "impl ")?;
@@ -388,7 +407,13 @@ impl HirDisplay for ApplicationTy {
                        f.write_joined(sig.params(), ", ")?;
                        write!(f, "|")?;
                    };
-                    write!(f, " -> {}", sig.ret().display(f.db))?;
+                    let ret_display = if f.omit_verbose_types() {
+                        sig.ret().display_truncated(f.db, f.max_size)
+                    } else {
+                        sig.ret().display(f.db)
+                    };
+                    write!(f, " -> {}", ret_display)?;
                } else {
                    write!(f, "{{closure}}")?;
                }
@@ -456,7 +481,7 @@ impl HirDisplay for Ty {
                        let data = (*datas)
                            .as_ref()
                            .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
-                        data.clone().subst(&opaque_ty.parameters)
+                        data.subst(&opaque_ty.parameters)
                    }
                };
                write!(f, "impl ")?;
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs
index 3719f76a6..28f32a0a4 100644
--- a/crates/ra_hir_ty/src/infer.rs
+++ b/crates/ra_hir_ty/src/infer.rs
@@ -18,8 +18,6 @@ use std::mem;
 use std::ops::Index;
 use std::sync::Arc;
-use rustc_hash::FxHashMap;
 use hir_def::{
    body::Body,
    data::{ConstData, FunctionData, StaticData},
@@ -28,13 +26,15 @@ use hir_def::{
    path::{path, Path},
    resolver::{HasResolver, Resolver, TypeNs},
    type_ref::{Mutability, TypeRef},
-    AdtId, AssocItemId, DefWithBodyId, EnumVariantId, FieldId, FunctionId, TraitId, TypeAliasId,
+    AdtId, AssocItemId, DefWithBodyId, EnumVariantId, FieldId, FunctionId, Lookup, TraitId,
-    VariantId,
+    TypeAliasId, VariantId,
 };
 use hir_expand::{diagnostics::DiagnosticSink, name::name};
 use ra_arena::map::ArenaMap;
 use ra_prof::profile;
 use ra_syntax::SmolStr;
+use rustc_hash::FxHashMap;
+use stdx::impl_from;
 use super::{
    primitive::{FloatTy, IntTy},
@@ -84,8 +84,7 @@ enum ExprOrPatId {
    ExprId(ExprId),
    PatId(PatId),
 }
+impl_from!(ExprId, PatId for ExprOrPatId);
-impl_froms!(ExprOrPatId: ExprId, PatId);
 /// Binding modes inferred for patterns.
 /// https://doc.rust-lang.org/reference/patterns.html#binding-modes
@@ -169,7 +168,7 @@ impl InferenceResult {
    pub fn add_diagnostics(
        &self,
        db: &dyn HirDatabase,
-        owner: FunctionId,
+        owner: DefWithBodyId,
        sink: &mut DiagnosticSink,
    ) {
        self.diagnostics.iter().for_each(|it| it.add_to(db, owner, sink))
@@ -376,17 +375,21 @@ impl<'a> InferenceContext<'a> {
    ) -> Ty {
        match assoc_ty {
            Some(res_assoc_ty) => {
+                let trait_ = match res_assoc_ty.lookup(self.db.upcast()).container {
+                    hir_def::AssocContainerId::TraitId(trait_) => trait_,
+                    _ => panic!("resolve_associated_type called with non-associated type"),
+                };
                let ty = self.table.new_type_var();
-                let builder = Substs::build_for_def(self.db, res_assoc_ty)
+                let substs = Substs::build_for_def(self.db, res_assoc_ty)
                    .push(inner_ty)
-                    .fill(params.iter().cloned());
+                    .fill(params.iter().cloned())
+                    .build();
+                let trait_ref = TraitRef { trait_, substs: substs.clone() };
                let projection = ProjectionPredicate {
                    ty: ty.clone(),
-                    projection_ty: ProjectionTy {
+                    projection_ty: ProjectionTy { associated_ty: res_assoc_ty, parameters: substs },
-                        associated_ty: res_assoc_ty,
-                        parameters: builder.build(),
-                    },
                };
+                self.obligations.push(Obligation::Trait(trait_ref));
                self.obligations.push(Obligation::Projection(projection));
                self.resolve_ty_as_possible(ty)
            }
@@ -757,7 +760,7 @@ impl std::ops::BitOrAssign for Diverges {
 }
 mod diagnostics {
-    use hir_def::{expr::ExprId, FunctionId};
+    use hir_def::{expr::ExprId, DefWithBodyId};
    use hir_expand::diagnostics::DiagnosticSink;
    use crate::{
@@ -775,17 +778,17 @@ mod diagnostics {
        pub(super) fn add_to(
            &self,
            db: &dyn HirDatabase,
-            owner: FunctionId,
+            owner: DefWithBodyId,
            sink: &mut DiagnosticSink,
        ) {
            match self {
                InferenceDiagnostic::NoSuchField { expr, field } => {
-                    let (_, source_map) = db.body_with_source_map(owner.into());
+                    let (_, source_map) = db.body_with_source_map(owner);
                    let field = source_map.field_syntax(*expr, *field);
                    sink.push(NoSuchField { file: field.file_id, field: field.value })
                }
                InferenceDiagnostic::BreakOutsideOfLoop { expr } => {
-                    let (_, source_map) = db.body_with_source_map(owner.into());
+                    let (_, source_map) = db.body_with_source_map(owner);
                    let ptr = source_map
                        .expr_syntax(*expr)
                        .expect("break outside of loop in synthetic syntax");
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs
index 22884522a..731b062c2 100644
--- a/crates/ra_hir_ty/src/infer/expr.rs
+++ b/crates/ra_hir_ty/src/infer/expr.rs
@@ -17,7 +17,7 @@ use crate::{
    autoderef, method_resolution, op,
    traits::{FnTrait, InEnvironment},
    utils::{generics, variant_data, Generics},
-    ApplicationTy, Binders, CallableDef, InferTy, IntTy, Mutability, Obligation, Rawness, Substs,
+    ApplicationTy, Binders, CallableDefId, InferTy, IntTy, Mutability, Obligation, Rawness, Substs,
    TraitRef, Ty, TypeCtor,
 };
@@ -85,10 +85,8 @@ impl<'a> InferenceContext<'a> {
            ctor: TypeCtor::Tuple { cardinality: num_args as u16 },
            parameters,
        });
-        let substs = Substs::build_for_generics(&generic_params)
+        let substs =
-            .push(ty.clone())
+            Substs::build_for_generics(&generic_params).push(ty.clone()).push(arg_ty).build();
-            .push(arg_ty.clone())
-            .build();
        let trait_env = Arc::clone(&self.trait_env);
        let implements_fn_trait =
@@ -222,7 +220,7 @@ impl<'a> InferenceContext<'a> {
                };
                sig_tys.push(ret_ty.clone());
                let sig_ty = Ty::apply(
-                    TypeCtor::FnPtr { num_args: sig_tys.len() as u16 - 1 },
+                    TypeCtor::FnPtr { num_args: sig_tys.len() as u16 - 1, is_varargs: false },
                    Substs(sig_tys.clone().into()),
                );
                let closure_ty =
@@ -407,8 +405,15 @@ impl<'a> InferenceContext<'a> {
                                    .subst(&a_ty.parameters)
                            })
                        }
-                        // FIXME:
+                        TypeCtor::Adt(AdtId::UnionId(u)) => {
-                        TypeCtor::Adt(AdtId::UnionId(_)) => None,
+                            self.db.union_data(u).variant_data.field(name).map(|local_id| {
+                                let field = FieldId { parent: u.into(), local_id };
+                                self.write_field_resolution(tgt_expr, field);
+                                self.db.field_types(u.into())[field.local_id]
+                                    .clone()
+                                    .subst(&a_ty.parameters)
+                            })
+                        }
                        _ => None,
                    },
                    _ => None,
@@ -849,7 +854,7 @@ impl<'a> InferenceContext<'a> {
                }
                // add obligation for trait implementation, if this is a trait method
                match def {
-                    CallableDef::FunctionId(f) => {
+                    CallableDefId::FunctionId(f) => {
                        if let AssocContainerId::TraitId(trait_) =
                            f.lookup(self.db.upcast()).container
                        {
@@ -860,7 +865,7 @@ impl<'a> InferenceContext<'a> {
                            self.obligations.push(Obligation::Trait(TraitRef { trait_, substs }));
                        }
                    }
-                    CallableDef::StructId(_) | CallableDef::EnumVariantId(_) => {}
+                    CallableDefId::StructId(_) | CallableDefId::EnumVariantId(_) => {}
                }
            }
        }
diff --git a/crates/ra_hir_ty/src/infer/unify.rs b/crates/ra_hir_ty/src/infer/unify.rs
index 269495ca0..2e895d911 100644
--- a/crates/ra_hir_ty/src/infer/unify.rs
+++ b/crates/ra_hir_ty/src/infer/unify.rs
@@ -9,7 +9,7 @@ use test_utils::mark;
 use super::{InferenceContext, Obligation};
 use crate::{
    BoundVar, Canonical, DebruijnIndex, GenericPredicate, InEnvironment, InferTy, Substs, Ty,
-    TypeCtor, TypeWalk,
+    TyKind, TypeCtor, TypeWalk,
 };
 impl<'a> InferenceContext<'a> {
@@ -86,10 +86,20 @@ where
    }
    fn into_canonicalized<T>(self, result: T) -> Canonicalized<T> {
-        Canonicalized {
+        let kinds = self
-            value: Canonical { value: result, num_vars: self.free_vars.len() },
+            .free_vars
-            free_vars: self.free_vars,
+            .iter()
-        }
+            .map(|v| match v {
+                // mapping MaybeNeverTypeVar to the same kind as general ones
+                // should be fine, because as opposed to int or float type vars,
+                // they don't restrict what kind of type can go into them, they
+                // just affect fallback.
+                InferTy::TypeVar(_) | InferTy::MaybeNeverTypeVar(_) => TyKind::General,
+                InferTy::IntVar(_) => TyKind::Integer,
+                InferTy::FloatVar(_) => TyKind::Float,
+            })
+            .collect();
+        Canonicalized { value: Canonical { value: result, kinds }, free_vars: self.free_vars }
    }
    pub(crate) fn canonicalize_ty(mut self, ty: Ty) -> Canonicalized<Ty> {
@@ -131,26 +141,41 @@ impl<T> Canonicalized<T> {
        ty
    }
-    pub fn apply_solution(&self, ctx: &mut InferenceContext<'_>, solution: Canonical<Vec<Ty>>) {
+    pub fn apply_solution(&self, ctx: &mut InferenceContext<'_>, solution: Canonical<Substs>) {
        // the solution may contain new variables, which we need to convert to new inference vars
-        let new_vars = Substs((0..solution.num_vars).map(|_| ctx.table.new_type_var()).collect());
+        let new_vars = Substs(
+            solution
+                .kinds
+                .iter()
+                .map(|k| match k {
+                    TyKind::General => ctx.table.new_type_var(),
+                    TyKind::Integer => ctx.table.new_integer_var(),
+                    TyKind::Float => ctx.table.new_float_var(),
+                })
+                .collect(),
+        );
        for (i, ty) in solution.value.into_iter().enumerate() {
            let var = self.free_vars[i];
            // eagerly replace projections in the type; we may be getting types
            // e.g. from where clauses where this hasn't happened yet
-            let ty = ctx.normalize_associated_types_in(ty.subst_bound_vars(&new_vars));
+            let ty = ctx.normalize_associated_types_in(ty.clone().subst_bound_vars(&new_vars));
            ctx.table.unify(&Ty::Infer(var), &ty);
        }
    }
 }
-pub fn unify(ty1: &Canonical<Ty>, ty2: &Canonical<Ty>) -> Option<Substs> {
+pub fn unify(tys: &Canonical<(Ty, Ty)>) -> Option<Substs> {
    let mut table = InferenceTable::new();
-    let num_vars = ty1.num_vars.max(ty2.num_vars);
+    let vars = Substs(
-    let vars =
+        tys.kinds
-        Substs::builder(num_vars).fill(std::iter::repeat_with(|| table.new_type_var())).build();
+            .iter()
-    let ty1_with_vars = ty1.value.clone().subst_bound_vars(&vars);
+            // we always use type vars here because we want everything to
-    let ty2_with_vars = ty2.value.clone().subst_bound_vars(&vars);
+            // fallback to Unknown in the end (kind of hacky, as below)
+            .map(|_| table.new_type_var())
+            .collect(),
+    );
+    let ty1_with_vars = tys.value.0.clone().subst_bound_vars(&vars);
+    let ty2_with_vars = tys.value.1.clone().subst_bound_vars(&vars);
    if !table.unify(&ty1_with_vars, &ty2_with_vars) {
        return None;
    }
@@ -162,7 +187,7 @@ pub fn unify(ty1: &Canonical<Ty>, ty2: &Canonical<Ty>) -> Option<Substs> {
        }
    }
    Some(
-        Substs::builder(ty1.num_vars)
+        Substs::builder(tys.kinds.len())
            .fill(vars.iter().map(|v| table.resolve_ty_completely(v.clone())))
            .build(),
    )
diff --git a/crates/ra_hir_ty/src/lib.rs b/crates/ra_hir_ty/src/lib.rs
index c9513b752..7698cb0d4 100644
--- a/crates/ra_hir_ty/src/lib.rs
+++ b/crates/ra_hir_ty/src/lib.rs
@@ -6,25 +6,6 @@ macro_rules! eprintln {
    ($($tt:tt)*) => { stdx::eprintln!($($tt)*) };
 }
-macro_rules! impl_froms {
-    ($e:ident: $($v:ident $(($($sv:ident),*))?),*) => {
-        $(
-            impl From<$v> for $e {
-                fn from(it: $v) -> $e {
-                    $e::$v(it)
-                }
-            }
-            $($(
-                impl From<$sv> for $e {
-                    fn from(it: $sv) -> $e {
-                        $e::$v($v::$sv(it))
-                    }
-                }
-            )*)?
-        )*
-    }
-}
 mod autoderef;
 pub mod primitive;
 pub mod traits;
@@ -32,22 +13,18 @@ pub mod method_resolution;
 mod op;
 mod lower;
 pub(crate) mod infer;
-pub mod display;
 pub(crate) mod utils;
+pub mod display;
 pub mod db;
 pub mod diagnostics;
-pub mod expr;
-pub mod unsafe_validation;
 #[cfg(test)]
 mod tests;
 #[cfg(test)]
 mod test_db;
-mod _match;
-use std::ops::Deref;
+use std::{iter, mem, ops::Deref, sync::Arc};
-use std::sync::Arc;
-use std::{iter, mem};
 use hir_def::{
    expr::ExprId,
@@ -55,18 +32,19 @@ use hir_def::{
    AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId,
    TypeParamId,
 };
-use ra_db::{impl_intern_key, salsa, CrateId};
+use itertools::Itertools;
+use ra_db::{salsa, CrateId};
 use crate::{
    db::HirDatabase,
+    display::HirDisplay,
    primitive::{FloatTy, IntTy},
    utils::{generics, make_mut_slice, Generics},
 };
-use display::HirDisplay;
 pub use autoderef::autoderef;
 pub use infer::{InferTy, InferenceResult};
-pub use lower::CallableDef;
+pub use lower::CallableDefId;
 pub use lower::{
    associated_type_shorthand_candidates, callable_item_sig, ImplTraitLoweringMode, TyDefId,
    TyLoweringContext, ValueTyDefId,
@@ -74,7 +52,6 @@ pub use lower::{
 pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
 pub use chalk_ir::{BoundVar, DebruijnIndex};
-use itertools::Itertools;
 /// A type constructor or type name: this might be something like the primitive
 /// type `bool`, a struct like `Vec`, or things like function pointers or
@@ -125,7 +102,7 @@ pub enum TypeCtor {
    /// fn foo() -> i32 { 1 }
    /// let bar = foo; // bar: fn() -> i32 {foo}
    /// ```
-    FnDef(CallableDef),
+    FnDef(CallableDefId),
    /// A pointer to a function.  Written as `fn() -> i32`.
    ///
@@ -135,7 +112,8 @@ pub enum TypeCtor {
    /// fn foo() -> i32 { 1 }
    /// let bar: fn() -> i32 = foo;
    /// ```
-    FnPtr { num_args: u16 },
+    // FIXME make this a Ty variant like in Chalk
+    FnPtr { num_args: u16, is_varargs: bool },
    /// The never type `!`.
    Never,
@@ -162,19 +140,6 @@ pub enum TypeCtor {
    Closure { def: DefWithBodyId, expr: ExprId },
 }
-/// This exists just for Chalk, because Chalk just has a single `StructId` where
-/// we have different kinds of ADTs, primitive types and special type
-/// constructors like tuples and function pointers.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
-pub struct TypeCtorId(salsa::InternId);
-impl_intern_key!(TypeCtorId);
-/// This exists just for Chalk, because Chalk just has a single `FnDefId` where
-/// we have different IDs for struct and enum variant constructors.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
-pub struct CallableDefId(salsa::InternId);
-impl_intern_key!(CallableDefId);
 impl TypeCtor {
    pub fn num_ty_params(self, db: &dyn HirDatabase) -> usize {
        match self {
@@ -210,7 +175,7 @@ impl TypeCtor {
                    }
                }
            }
-            TypeCtor::FnPtr { num_args } => num_args as usize + 1,
+            TypeCtor::FnPtr { num_args, is_varargs: _ } => num_args as usize + 1,
            TypeCtor::Tuple { cardinality } => cardinality as usize,
        }
    }
@@ -662,13 +627,27 @@ impl TypeWalk for GenericPredicate {
 /// Basically a claim (currently not validated / checked) that the contained
 /// type / trait ref contains no inference variables; any inference variables it
-/// contained have been replaced by bound variables, and `num_vars` tells us how
+/// contained have been replaced by bound variables, and `kinds` tells us how
-/// many there are. This is used to erase irrelevant differences between types
+/// many there are and whether they were normal or float/int variables. This is
-/// before using them in queries.
+/// used to erase irrelevant differences between types before using them in
+/// queries.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Canonical<T> {
    pub value: T,
-    pub num_vars: usize,
+    pub kinds: Arc<[TyKind]>,
+}
+impl<T> Canonical<T> {
+    pub fn new(value: T, kinds: impl IntoIterator<Item = TyKind>) -> Self {
+        Self { value, kinds: kinds.into_iter().collect() }
+    }
+}
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+pub enum TyKind {
+    General,
+    Integer,
+    Float,
 }
 /// A function signature as seen by type inference: Several parameter types and
@@ -676,19 +655,20 @@ pub struct Canonical<T> {
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct FnSig {
    params_and_return: Arc<[Ty]>,
+    is_varargs: bool,
 }
 /// A polymorphic function signature.
 pub type PolyFnSig = Binders<FnSig>;
 impl FnSig {
-    pub fn from_params_and_return(mut params: Vec<Ty>, ret: Ty) -> FnSig {
+    pub fn from_params_and_return(mut params: Vec<Ty>, ret: Ty, is_varargs: bool) -> FnSig {
        params.push(ret);
-        FnSig { params_and_return: params.into() }
+        FnSig { params_and_return: params.into(), is_varargs }
    }
-    pub fn from_fn_ptr_substs(substs: &Substs) -> FnSig {
+    pub fn from_fn_ptr_substs(substs: &Substs, is_varargs: bool) -> FnSig {
-        FnSig { params_and_return: Arc::clone(&substs.0) }
+        FnSig { params_and_return: Arc::clone(&substs.0), is_varargs }
    }
    pub fn params(&self) -> &[Ty] {
@@ -733,7 +713,7 @@ impl Ty {
    }
    pub fn fn_ptr(sig: FnSig) -> Self {
        Ty::apply(
-            TypeCtor::FnPtr { num_args: sig.params().len() as u16 },
+            TypeCtor::FnPtr { num_args: sig.params().len() as u16, is_varargs: sig.is_varargs },
            Substs(sig.params_and_return),
        )
    }
@@ -787,15 +767,6 @@ impl Ty {
        }
    }
-    pub fn as_callable(&self) -> Option<(CallableDef, &Substs)> {
-        match self {
-            Ty::Apply(ApplicationTy { ctor: TypeCtor::FnDef(callable_def), parameters }) => {
-                Some((*callable_def, parameters))
-            }
-            _ => None,
-        }
-    }
    pub fn is_never(&self) -> bool {
        matches!(self, Ty::Apply(ApplicationTy { ctor: TypeCtor::Never, .. }))
    }
@@ -827,10 +798,12 @@ impl Ty {
        }
    }
-    fn callable_sig(&self, db: &dyn HirDatabase) -> Option<FnSig> {
+    pub fn callable_sig(&self, db: &dyn HirDatabase) -> Option<FnSig> {
        match self {
            Ty::Apply(a_ty) => match a_ty.ctor {
-                TypeCtor::FnPtr { .. } => Some(FnSig::from_fn_ptr_substs(&a_ty.parameters)),
+                TypeCtor::FnPtr { is_varargs, .. } => {
+                    Some(FnSig::from_fn_ptr_substs(&a_ty.parameters, is_varargs))
+                }
                TypeCtor::FnDef(def) => {
                    let sig = db.callable_item_signature(def);
                    Some(sig.subst(&a_ty.parameters))
@@ -877,7 +850,7 @@ impl Ty {
                            let data = (*it)
                                .as_ref()
                                .map(|rpit| rpit.impl_traits[idx as usize].bounds.clone());
-                            data.clone().subst(&opaque_ty.parameters)
+                            data.subst(&opaque_ty.parameters)
                        })
                    }
                };
diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs
index 3dc154e92..1eacc6f95 100644
--- a/crates/ra_hir_ty/src/lower.rs
+++ b/crates/ra_hir_ty/src/lower.rs
@@ -5,10 +5,7 @@
 //!  - Building the type for an item: This happens through the `type_for_def` query.
 //!
 //! This usually involves resolving names, collecting generic arguments etc.
-use std::iter;
+use std::{iter, sync::Arc};
-use std::sync::Arc;
-use smallvec::SmallVec;
 use hir_def::{
    adt::StructKind,
@@ -24,6 +21,8 @@ use hir_def::{
 use hir_expand::name::Name;
 use ra_arena::map::ArenaMap;
 use ra_db::CrateId;
+use smallvec::SmallVec;
+use stdx::impl_from;
 use test_utils::mark;
 use crate::{
@@ -177,9 +176,12 @@ impl Ty {
                Ty::apply_one(TypeCtor::Ref(*mutability), inner_ty)
            }
            TypeRef::Placeholder => Ty::Unknown,
-            TypeRef::Fn(params) => {
+            TypeRef::Fn(params, is_varargs) => {
                let sig = Substs(params.iter().map(|tr| Ty::from_hir(ctx, tr)).collect());
-                Ty::apply(TypeCtor::FnPtr { num_args: sig.len() as u16 - 1 }, sig)
+                Ty::apply(
+                    TypeCtor::FnPtr { num_args: sig.len() as u16 - 1, is_varargs: *is_varargs },
+                    sig,
+                )
            }
            TypeRef::DynTrait(bounds) => {
                let self_ty = Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, 0));
@@ -339,7 +341,7 @@ impl Ty {
                    let segment = remaining_segments.first().unwrap();
                    let found = associated_type_by_name_including_super_traits(
                        ctx.db,
-                        trait_ref.clone(),
+                        trait_ref,
                        &segment.name,
                    );
                    match found {
@@ -720,8 +722,7 @@ fn assoc_type_bindings_from_type_bound<'a>(
                None => return SmallVec::<[GenericPredicate; 1]>::new(),
                Some(t) => t,
            };
-            let projection_ty =
+            let projection_ty = ProjectionTy { associated_ty, parameters: super_trait_ref.substs };
-                ProjectionTy { associated_ty, parameters: super_trait_ref.substs.clone() };
            let mut preds = SmallVec::with_capacity(
                binding.type_ref.as_ref().map_or(0, |_| 1) + binding.bounds.len(),
            );
@@ -767,11 +768,11 @@ fn count_impl_traits(type_ref: &TypeRef) -> usize {
 }
 /// Build the signature of a callable item (function, struct or enum variant).
-pub fn callable_item_sig(db: &dyn HirDatabase, def: CallableDef) -> PolyFnSig {
+pub fn callable_item_sig(db: &dyn HirDatabase, def: CallableDefId) -> PolyFnSig {
    match def {
-        CallableDef::FunctionId(f) => fn_sig_for_fn(db, f),
+        CallableDefId::FunctionId(f) => fn_sig_for_fn(db, f),
-        CallableDef::StructId(s) => fn_sig_for_struct_constructor(db, s),
+        CallableDefId::StructId(s) => fn_sig_for_struct_constructor(db, s),
-        CallableDef::EnumVariantId(e) => fn_sig_for_enum_variant_constructor(db, e),
+        CallableDefId::EnumVariantId(e) => fn_sig_for_enum_variant_constructor(db, e),
    }
 }
@@ -998,7 +999,7 @@ fn fn_sig_for_fn(db: &dyn HirDatabase, def: FunctionId) -> PolyFnSig {
    let ret = Ty::from_hir(&ctx_ret, &data.ret_type);
    let generics = generics(db.upcast(), def.into());
    let num_binders = generics.len();
-    Binders::new(num_binders, FnSig::from_params_and_return(params, ret))
+    Binders::new(num_binders, FnSig::from_params_and_return(params, ret, data.is_varargs))
 }
 /// Build the declared type of a function. This should not need to look at the
@@ -1049,7 +1050,7 @@ fn fn_sig_for_struct_constructor(db: &dyn HirDatabase, def: StructId) -> PolyFnS
    let params =
        fields.iter().map(|(_, field)| Ty::from_hir(&ctx, &field.type_ref)).collect::<Vec<_>>();
    let ret = type_for_adt(db, def.into());
-    Binders::new(ret.num_binders, FnSig::from_params_and_return(params, ret.value))
+    Binders::new(ret.num_binders, FnSig::from_params_and_return(params, ret.value, false))
 }
 /// Build the type of a tuple struct constructor.
@@ -1073,7 +1074,7 @@ fn fn_sig_for_enum_variant_constructor(db: &dyn HirDatabase, def: EnumVariantId)
    let params =
        fields.iter().map(|(_, field)| Ty::from_hir(&ctx, &field.type_ref)).collect::<Vec<_>>();
    let ret = type_for_adt(db, def.parent.into());
-    Binders::new(ret.num_binders, FnSig::from_params_and_return(params, ret.value))
+    Binders::new(ret.num_binders, FnSig::from_params_and_return(params, ret.value, false))
 }
 /// Build the type of a tuple enum variant constructor.
@@ -1106,31 +1107,31 @@ fn type_for_type_alias(db: &dyn HirDatabase, t: TypeAliasId) -> Binders<Ty> {
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum CallableDef {
+pub enum CallableDefId {
    FunctionId(FunctionId),
    StructId(StructId),
    EnumVariantId(EnumVariantId),
 }
-impl_froms!(CallableDef: FunctionId, StructId, EnumVariantId);
+impl_from!(FunctionId, StructId, EnumVariantId for CallableDefId);
-impl CallableDef {
+impl CallableDefId {
    pub fn krate(self, db: &dyn HirDatabase) -> CrateId {
        let db = db.upcast();
        match self {
-            CallableDef::FunctionId(f) => f.lookup(db).module(db),
+            CallableDefId::FunctionId(f) => f.lookup(db).module(db),
-            CallableDef::StructId(s) => s.lookup(db).container.module(db),
+            CallableDefId::StructId(s) => s.lookup(db).container.module(db),
-            CallableDef::EnumVariantId(e) => e.parent.lookup(db).container.module(db),
+            CallableDefId::EnumVariantId(e) => e.parent.lookup(db).container.module(db),
        }
        .krate
    }
 }
-impl From<CallableDef> for GenericDefId {
+impl From<CallableDefId> for GenericDefId {
-    fn from(def: CallableDef) -> GenericDefId {
+    fn from(def: CallableDefId) -> GenericDefId {
        match def {
-            CallableDef::FunctionId(f) => f.into(),
+            CallableDefId::FunctionId(f) => f.into(),
-            CallableDef::StructId(s) => s.into(),
+            CallableDefId::StructId(s) => s.into(),
-            CallableDef::EnumVariantId(e) => e.into(),
+            CallableDefId::EnumVariantId(e) => e.into(),
        }
    }
 }
@@ -1141,7 +1142,7 @@ pub enum TyDefId {
    AdtId(AdtId),
    TypeAliasId(TypeAliasId),
 }
-impl_froms!(TyDefId: BuiltinType, AdtId(StructId, EnumId, UnionId), TypeAliasId);
+impl_from!(BuiltinType, AdtId(StructId, EnumId, UnionId), TypeAliasId for TyDefId);
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ValueTyDefId {
@@ -1151,7 +1152,7 @@ pub enum ValueTyDefId {
    ConstId(ConstId),
    StaticId(StaticId),
 }
-impl_froms!(ValueTyDefId: FunctionId, StructId, EnumVariantId, ConstId, StaticId);
+impl_from!(FunctionId, StructId, EnumVariantId, ConstId, StaticId for ValueTyDefId);
 /// Build the declared type of an item. This depends on the namespace; e.g. for
 /// `struct Foo(usize)`, we have two types: The type of the struct itself, and
@@ -1216,7 +1217,7 @@ pub(crate) fn impl_trait_query(db: &dyn HirDatabase, impl_id: ImplId) -> Option<
 }
 pub(crate) fn return_type_impl_traits(
-    db: &impl HirDatabase,
+    db: &dyn HirDatabase,
    def: hir_def::FunctionId,
 ) -> Option<Arc<Binders<ReturnTypeImplTraits>>> {
    // FIXME unify with fn_sig_for_fn instead of doing lowering twice, maybe
diff --git a/crates/ra_hir_ty/src/method_resolution.rs b/crates/ra_hir_ty/src/method_resolution.rs
index c19519cf1..fb4b30a13 100644
--- a/crates/ra_hir_ty/src/method_resolution.rs
+++ b/crates/ra_hir_ty/src/method_resolution.rs
@@ -2,12 +2,14 @@
 //! For details about how this works in rustc, see the method lookup page in the
 //! [rustc guide](https://rust-lang.github.io/rustc-guide/method-lookup.html)
 //! and the corresponding code mostly in librustc_typeck/check/method/probe.rs.
-use std::sync::Arc;
+use std::{iter, sync::Arc};
 use arrayvec::ArrayVec;
 use hir_def::{
-    lang_item::LangItemTarget, type_ref::Mutability, AssocContainerId, AssocItemId, FunctionId,
+    builtin_type::{IntBitness, Signedness},
-    HasModule, ImplId, Lookup, TraitId,
+    lang_item::LangItemTarget,
+    type_ref::Mutability,
+    AssocContainerId, AssocItemId, FunctionId, HasModule, ImplId, Lookup, TraitId,
 };
 use hir_expand::name::Name;
 use ra_db::CrateId;
@@ -16,8 +18,12 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use super::Substs;
 use crate::{
-    autoderef, db::HirDatabase, primitive::FloatBitness, utils::all_super_traits, ApplicationTy,
+    autoderef,
-    Canonical, DebruijnIndex, InEnvironment, TraitEnvironment, TraitRef, Ty, TypeCtor, TypeWalk,
+    db::HirDatabase,
+    primitive::{FloatBitness, FloatTy, IntTy},
+    utils::all_super_traits,
+    ApplicationTy, Canonical, DebruijnIndex, InEnvironment, TraitEnvironment, TraitRef, Ty, TyKind,
+    TypeCtor, TypeWalk,
 };
 /// This is used as a key for indexing impls.
@@ -38,136 +44,187 @@ impl TyFingerprint {
    }
 }
-/// A queryable and mergeable collection of impls.
+pub(crate) const ALL_INT_FPS: [TyFingerprint; 12] = [
-#[derive(Debug, PartialEq, Eq)]
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
-pub struct CrateImplDefs {
+        signedness: Signedness::Unsigned,
-    inherent_impls: FxHashMap<TyFingerprint, Vec<ImplId>>,
+        bitness: IntBitness::X8,
-    impls_by_trait: FxHashMap<TraitId, FxHashMap<Option<TyFingerprint>, Vec<ImplId>>>,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Unsigned,
+        bitness: IntBitness::X16,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Unsigned,
+        bitness: IntBitness::X32,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Unsigned,
+        bitness: IntBitness::X64,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Unsigned,
+        bitness: IntBitness::X128,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Unsigned,
+        bitness: IntBitness::Xsize,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Signed,
+        bitness: IntBitness::X8,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Signed,
+        bitness: IntBitness::X16,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Signed,
+        bitness: IntBitness::X32,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Signed,
+        bitness: IntBitness::X64,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Signed,
+        bitness: IntBitness::X128,
+    })),
+    TyFingerprint::Apply(TypeCtor::Int(IntTy {
+        signedness: Signedness::Signed,
+        bitness: IntBitness::Xsize,
+    })),
+];
+pub(crate) const ALL_FLOAT_FPS: [TyFingerprint; 2] = [
+    TyFingerprint::Apply(TypeCtor::Float(FloatTy { bitness: FloatBitness::X32 })),
+    TyFingerprint::Apply(TypeCtor::Float(FloatTy { bitness: FloatBitness::X64 })),
+];
+/// Trait impls defined or available in some crate.
+#[derive(Debug, Eq, PartialEq)]
+pub struct TraitImpls {
+    // If the `Option<TyFingerprint>` is `None`, the impl may apply to any self type.
+    map: FxHashMap<TraitId, FxHashMap<Option<TyFingerprint>, Vec<ImplId>>>,
 }
-impl CrateImplDefs {
+impl TraitImpls {
-    pub(crate) fn impls_in_crate_query(db: &dyn HirDatabase, krate: CrateId) -> Arc<CrateImplDefs> {
+    pub(crate) fn trait_impls_in_crate_query(db: &dyn HirDatabase, krate: CrateId) -> Arc<Self> {
-        let _p = profile("impls_in_crate_query");
+        let _p = profile("trait_impls_in_crate_query");
-        let mut res = CrateImplDefs {
+        let mut impls = Self { map: FxHashMap::default() };
-            inherent_impls: FxHashMap::default(),
-            impls_by_trait: FxHashMap::default(),
-        };
-        res.fill(db, krate);
-        Arc::new(res)
+        let crate_def_map = db.crate_def_map(krate);
+        for (_module_id, module_data) in crate_def_map.modules.iter() {
+            for impl_id in module_data.scope.impls() {
+                let target_trait = match db.impl_trait(impl_id) {
+                    Some(tr) => tr.value.trait_,
+                    None => continue,
+                };
+                let self_ty = db.impl_self_ty(impl_id);
+                let self_ty_fp = TyFingerprint::for_impl(&self_ty.value);
+                impls
+                    .map
+                    .entry(target_trait)
+                    .or_default()
+                    .entry(self_ty_fp)
+                    .or_default()
+                    .push(impl_id);
+            }
+        }
+        Arc::new(impls)
    }
-    /// Collects all impls from transitive dependencies of `krate` that may be used by `krate`.
+    pub(crate) fn trait_impls_in_deps_query(db: &dyn HirDatabase, krate: CrateId) -> Arc<Self> {
-    ///
+        let _p = profile("trait_impls_in_deps_query");
-    /// The full set of impls that can be used by `krate` is the returned map plus all the impls
-    /// from `krate` itself.
-    pub(crate) fn impls_from_deps_query(
-        db: &dyn HirDatabase,
-        krate: CrateId,
-    ) -> Arc<CrateImplDefs> {
-        let _p = profile("impls_from_deps_query");
        let crate_graph = db.crate_graph();
-        let mut res = CrateImplDefs {
+        let mut res = Self { map: FxHashMap::default() };
-            inherent_impls: FxHashMap::default(),
-            impls_by_trait: FxHashMap::default(),
-        };
-        // For each dependency, calculate `impls_from_deps` recursively, then add its own
+        for krate in crate_graph.transitive_deps(krate) {
-        // `impls_in_crate`.
+            res.merge(&db.trait_impls_in_crate(krate));
-        // As we might visit crates multiple times, `merge` has to deduplicate impls to avoid
-        // wasting memory.
-        for dep in &crate_graph[krate].dependencies {
-            res.merge(&db.impls_from_deps(dep.crate_id));
-            res.merge(&db.impls_in_crate(dep.crate_id));
        }
        Arc::new(res)
    }
-    fn fill(&mut self, db: &dyn HirDatabase, krate: CrateId) {
-        let crate_def_map = db.crate_def_map(krate);
-        for (_module_id, module_data) in crate_def_map.modules.iter() {
-            for impl_id in module_data.scope.impls() {
-                match db.impl_trait(impl_id) {
-                    Some(tr) => {
-                        let self_ty = db.impl_self_ty(impl_id);
-                        let self_ty_fp = TyFingerprint::for_impl(&self_ty.value);
-                        self.impls_by_trait
-                            .entry(tr.value.trait_)
-                            .or_default()
-                            .entry(self_ty_fp)
-                            .or_default()
-                            .push(impl_id);
-                    }
-                    None => {
-                        let self_ty = db.impl_self_ty(impl_id);
-                        if let Some(self_ty_fp) = TyFingerprint::for_impl(&self_ty.value) {
-                            self.inherent_impls.entry(self_ty_fp).or_default().push(impl_id);
-                        }
-                    }
-                }
-            }
-        }
-    }
    fn merge(&mut self, other: &Self) {
-        for (fp, impls) in &other.inherent_impls {
+        for (trait_, other_map) in &other.map {
-            let vec = self.inherent_impls.entry(*fp).or_default();
+            let map = self.map.entry(*trait_).or_default();
-            vec.extend(impls);
-            vec.sort();
-            vec.dedup();
-        }
-        for (trait_, other_map) in &other.impls_by_trait {
-            let map = self.impls_by_trait.entry(*trait_).or_default();
            for (fp, impls) in other_map {
                let vec = map.entry(*fp).or_default();
                vec.extend(impls);
-                vec.sort();
-                vec.dedup();
            }
        }
    }
-    pub fn lookup_impl_defs(&self, ty: &Ty) -> impl Iterator<Item = ImplId> + '_ {
+    /// Queries all impls of the given trait.
-        let fingerprint = TyFingerprint::for_impl(ty);
+    pub fn for_trait(&self, trait_: TraitId) -> impl Iterator<Item = ImplId> + '_ {
-        fingerprint.and_then(|f| self.inherent_impls.get(&f)).into_iter().flatten().copied()
+        self.map
-    }
+            .get(&trait_)
-    pub fn lookup_impl_defs_for_trait(&self, tr: TraitId) -> impl Iterator<Item = ImplId> + '_ {
-        self.impls_by_trait
-            .get(&tr)
            .into_iter()
-            .flat_map(|m| m.values().flat_map(|v| v.iter().copied()))
+            .flat_map(|map| map.values().flat_map(|v| v.iter().copied()))
    }
-    pub fn lookup_impl_defs_for_trait_and_ty(
+    /// Queries all impls of `trait_` that may apply to `self_ty`.
+    pub fn for_trait_and_self_ty(
        &self,
-        tr: TraitId,
+        trait_: TraitId,
-        fp: TyFingerprint,
+        self_ty: TyFingerprint,
    ) -> impl Iterator<Item = ImplId> + '_ {
-        self.impls_by_trait
+        self.map
-            .get(&tr)
+            .get(&trait_)
-            .and_then(|m| m.get(&Some(fp)))
            .into_iter()
-            .flatten()
+            .flat_map(move |map| map.get(&None).into_iter().chain(map.get(&Some(self_ty))))
-            .copied()
+            .flat_map(|v| v.iter().copied())
-            .chain(
+    }
-                self.impls_by_trait
-                    .get(&tr)
+    pub fn all_impls(&self) -> impl Iterator<Item = ImplId> + '_ {
-                    .and_then(|m| m.get(&None))
+        self.map.values().flat_map(|map| map.values().flat_map(|v| v.iter().copied()))
-                    .into_iter()
+    }
-                    .flatten()
+}
-                    .copied(),
-            )
+/// Inherent impls defined in some crate.
+///
+/// Inherent impls can only be defined in the crate that also defines the self type of the impl
+/// (note that some primitives are considered to be defined by both libcore and liballoc).
+///
+/// This makes inherent impl lookup easier than trait impl lookup since we only have to consider a
+/// single crate.
+#[derive(Debug, Eq, PartialEq)]
+pub struct InherentImpls {
+    map: FxHashMap<TyFingerprint, Vec<ImplId>>,
+}
+impl InherentImpls {
+    pub(crate) fn inherent_impls_in_crate_query(db: &dyn HirDatabase, krate: CrateId) -> Arc<Self> {
+        let mut map: FxHashMap<_, Vec<_>> = FxHashMap::default();
+        let crate_def_map = db.crate_def_map(krate);
+        for (_module_id, module_data) in crate_def_map.modules.iter() {
+            for impl_id in module_data.scope.impls() {
+                let data = db.impl_data(impl_id);
+                if data.target_trait.is_some() {
+                    continue;
+                }
+                let self_ty = db.impl_self_ty(impl_id);
+                if let Some(fp) = TyFingerprint::for_impl(&self_ty.value) {
+                    map.entry(fp).or_default().push(impl_id);
+                }
+            }
+        }
+        Arc::new(Self { map })
+    }
+    pub fn for_self_ty(&self, self_ty: &Ty) -> &[ImplId] {
+        match TyFingerprint::for_impl(self_ty) {
+            Some(fp) => self.map.get(&fp).map(|vec| vec.as_ref()).unwrap_or(&[]),
+            None => &[],
+        }
    }
-    pub fn all_impls<'a>(&'a self) -> impl Iterator<Item = ImplId> + 'a {
+    pub fn all_impls(&self) -> impl Iterator<Item = ImplId> + '_ {
-        self.inherent_impls
+        self.map.values().flat_map(|v| v.iter().copied())
-            .values()
-            .chain(self.impls_by_trait.values().flat_map(|m| m.values()))
-            .flatten()
-            .copied()
    }
 }
@@ -377,7 +434,7 @@ fn iterate_method_candidates_with_autoref(
        return true;
    }
    let refed = Canonical {
-        num_vars: deref_chain[0].num_vars,
+        kinds: deref_chain[0].kinds.clone(),
        value: Ty::apply_one(TypeCtor::Ref(Mutability::Shared), deref_chain[0].value.clone()),
    };
    if iterate_method_candidates_by_receiver(
@@ -393,7 +450,7 @@ fn iterate_method_candidates_with_autoref(
        return true;
    }
    let ref_muted = Canonical {
-        num_vars: deref_chain[0].num_vars,
+        kinds: deref_chain[0].kinds.clone(),
        value: Ty::apply_one(TypeCtor::Ref(Mutability::Mut), deref_chain[0].value.clone()),
    };
    if iterate_method_candidates_by_receiver(
@@ -524,9 +581,9 @@ fn iterate_inherent_methods(
        None => return false,
    };
    for krate in def_crates {
-        let impls = db.impls_in_crate(krate);
+        let impls = db.inherent_impls_in_crate(krate);
-        for impl_def in impls.lookup_impl_defs(&self_ty.value) {
+        for &impl_def in impls.for_self_ty(&self_ty.value) {
            for &item in db.impl_data(impl_def).items.iter() {
                if !is_valid_candidate(db, name, receiver_ty, item, self_ty) {
                    continue;
@@ -612,18 +669,19 @@ pub(crate) fn inherent_impl_substs(
    // we create a var for each type parameter of the impl; we need to keep in
    // mind here that `self_ty` might have vars of its own
    let vars = Substs::build_for_def(db, impl_id)
-        .fill_with_bound_vars(DebruijnIndex::INNERMOST, self_ty.num_vars)
+        .fill_with_bound_vars(DebruijnIndex::INNERMOST, self_ty.kinds.len())
        .build();
    let self_ty_with_vars = db.impl_self_ty(impl_id).subst(&vars);
-    let self_ty_with_vars =
+    let mut kinds = self_ty.kinds.to_vec();
-        Canonical { num_vars: vars.len() + self_ty.num_vars, value: self_ty_with_vars };
+    kinds.extend(iter::repeat(TyKind::General).take(vars.len()));
-    let substs = super::infer::unify(&self_ty_with_vars, self_ty);
+    let tys = Canonical { kinds: kinds.into(), value: (self_ty_with_vars, self_ty.value.clone()) };
+    let substs = super::infer::unify(&tys);
    // We only want the substs for the vars we added, not the ones from self_ty.
    // Also, if any of the vars we added are still in there, we replace them by
    // Unknown. I think this can only really happen if self_ty contained
    // Unknown, and in that case we want the result to contain Unknown in those
    // places again.
-    substs.map(|s| fallback_bound_vars(s.suffix(vars.len()), self_ty.num_vars))
+    substs.map(|s| fallback_bound_vars(s.suffix(vars.len()), self_ty.kinds.len()))
 }
 /// This replaces any 'free' Bound vars in `s` (i.e. those with indices past
@@ -683,15 +741,15 @@ fn generic_implements_goal(
    trait_: TraitId,
    self_ty: Canonical<Ty>,
 ) -> Canonical<InEnvironment<super::Obligation>> {
-    let num_vars = self_ty.num_vars;
+    let mut kinds = self_ty.kinds.to_vec();
    let substs = super::Substs::build_for_def(db, trait_)
        .push(self_ty.value)
-        .fill_with_bound_vars(DebruijnIndex::INNERMOST, num_vars)
+        .fill_with_bound_vars(DebruijnIndex::INNERMOST, kinds.len())
        .build();
-    let num_vars = substs.len() - 1 + self_ty.num_vars;
+    kinds.extend(iter::repeat(TyKind::General).take(substs.len() - 1));
    let trait_ref = TraitRef { trait_, substs };
    let obligation = super::Obligation::Trait(trait_ref);
-    Canonical { num_vars, value: InEnvironment::new(env, obligation) }
+    Canonical { kinds: kinds.into(), value: InEnvironment::new(env, obligation) }
 }
 fn autoderef_method_receiver(
@@ -704,9 +762,9 @@ fn autoderef_method_receiver(
    if let Some(Ty::Apply(ApplicationTy { ctor: TypeCtor::Array, parameters })) =
        deref_chain.last().map(|ty| &ty.value)
    {
-        let num_vars = deref_chain.last().unwrap().num_vars;
+        let kinds = deref_chain.last().unwrap().kinds.clone();
        let unsized_ty = Ty::apply(TypeCtor::Slice, parameters.clone());
-        deref_chain.push(Canonical { value: unsized_ty, num_vars })
+        deref_chain.push(Canonical { value: unsized_ty, kinds })
    }
    deref_chain
 }
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs
index 0481a7b12..a1714ff0f 100644
--- a/crates/ra_hir_ty/src/test_db.rs
+++ b/crates/ra_hir_ty/src/test_db.rs
@@ -1,20 +1,16 @@
 //! Database used for testing `hir`.
 use std::{
-    panic,
+    fmt, panic,
    sync::{Arc, Mutex},
 };
-use hir_def::{db::DefDatabase, AssocItemId, ModuleDefId, ModuleId};
+use hir_def::{db::DefDatabase, ModuleId};
-use hir_expand::{db::AstDatabase, diagnostics::DiagnosticSink};
+use hir_expand::db::AstDatabase;
 use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast};
-use rustc_hash::FxHashSet;
+use ra_syntax::TextRange;
-use stdx::format_to;
+use rustc_hash::{FxHashMap, FxHashSet};
+use test_utils::extract_annotations;
-use crate::{
-    db::HirDatabase, diagnostics::Diagnostic, expr::ExprValidator,
-    unsafe_validation::UnsafeValidator,
-};
 #[salsa::database(
    ra_db::SourceDatabaseExtStorage,
@@ -24,10 +20,15 @@ use crate::{
    hir_def::db::DefDatabaseStorage,
    crate::db::HirDatabaseStorage
 )]
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct TestDB {
-    events: Mutex<Option<Vec<salsa::Event<TestDB>>>>,
+    storage: salsa::Storage<TestDB>,
-    runtime: salsa::Runtime<TestDB>,
+    events: Mutex<Option<Vec<salsa::Event>>>,
+}
+impl fmt::Debug for TestDB {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("TestDB").finish()
+    }
 }
 impl Upcast<dyn AstDatabase> for TestDB {
@@ -43,18 +44,10 @@ impl Upcast<dyn DefDatabase> for TestDB {
 }
 impl salsa::Database for TestDB {
-    fn salsa_runtime(&self) -> &salsa::Runtime<TestDB> {
+    fn salsa_event(&self, event: salsa::Event) {
-        &self.runtime
-    }
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime<Self> {
-        &mut self.runtime
-    }
-    fn salsa_event(&self, event: impl Fn() -> salsa::Event<TestDB>) {
        let mut events = self.events.lock().unwrap();
        if let Some(events) = &mut *events {
-            events.push(event());
+            events.push(event);
        }
    }
 }
@@ -62,8 +55,8 @@ impl salsa::Database for TestDB {
 impl salsa::ParallelDatabase for TestDB {
    fn snapshot(&self) -> salsa::Snapshot<TestDB> {
        salsa::Snapshot::new(TestDB {
+            storage: self.storage.snapshot(),
            events: Default::default(),
-            runtime: self.runtime.snapshot(self),
        })
    }
 }
@@ -83,7 +76,7 @@ impl FileLoader for TestDB {
 }
 impl TestDB {
-    pub fn module_for_file(&self, file_id: FileId) -> ModuleId {
+    pub(crate) fn module_for_file(&self, file_id: FileId) -> ModuleId {
        for &krate in self.relevant_crates(file_id).iter() {
            let crate_def_map = self.crate_def_map(krate);
            for (local_id, data) in crate_def_map.modules.iter() {
@@ -95,82 +88,32 @@ impl TestDB {
        panic!("Can't find module for file")
    }
-    fn diag<F: FnMut(&dyn Diagnostic)>(&self, mut cb: F) {
+    pub(crate) fn extract_annotations(&self) -> FxHashMap<FileId, Vec<(TextRange, String)>> {
-        let crate_graph = self.crate_graph();
+        let mut files = Vec::new();
-        for krate in crate_graph.iter() {
-            let crate_def_map = self.crate_def_map(krate);
-            let mut fns = Vec::new();
-            for (module_id, _) in crate_def_map.modules.iter() {
-                for decl in crate_def_map[module_id].scope.declarations() {
-                    if let ModuleDefId::FunctionId(f) = decl {
-                        fns.push(f)
-                    }
-                }
-                for impl_id in crate_def_map[module_id].scope.impls() {
-                    let impl_data = self.impl_data(impl_id);
-                    for item in impl_data.items.iter() {
-                        if let AssocItemId::FunctionId(f) = item {
-                            fns.push(*f)
-                        }
-                    }
-                }
-            }
-            for f in fns {
-                let infer = self.infer(f.into());
-                let mut sink = DiagnosticSink::new(&mut cb);
-                infer.add_diagnostics(self, f, &mut sink);
-                let mut validator = ExprValidator::new(f, infer.clone(), &mut sink);
-                validator.validate_body(self);
-                let mut validator = UnsafeValidator::new(f, infer, &mut sink);
-                validator.validate_body(self);
-            }
-        }
-    }
-    pub fn diagnostics(&self) -> (String, u32) {
-        let mut buf = String::new();
-        let mut count = 0;
-        self.diag(|d| {
-            format_to!(buf, "{:?}: {}\n", d.syntax_node(self).text(), d.message());
-            count += 1;
-        });
-        (buf, count)
-    }
-    /// Like `diagnostics`, but filtered for a single diagnostic.
-    pub fn diagnostic<D: Diagnostic>(&self) -> (String, u32) {
-        let mut buf = String::new();
-        let mut count = 0;
-        self.diag(|d| {
-            // We want to filter diagnostics by the particular one we are testing for, to
-            // avoid surprising results in tests.
-            if d.downcast_ref::<D>().is_some() {
-                format_to!(buf, "{:?}: {}\n", d.syntax_node(self).text(), d.message());
-                count += 1;
-            };
-        });
-        (buf, count)
-    }
-    pub fn all_files(&self) -> Vec<FileId> {
-        let mut res = Vec::new();
        let crate_graph = self.crate_graph();
        for krate in crate_graph.iter() {
            let crate_def_map = self.crate_def_map(krate);
            for (module_id, _) in crate_def_map.modules.iter() {
                let file_id = crate_def_map[module_id].origin.file_id();
-                res.extend(file_id)
+                files.extend(file_id)
            }
        }
-        res
+        files
+            .into_iter()
+            .filter_map(|file_id| {
+                let text = self.file_text(file_id);
+                let annotations = extract_annotations(&text);
+                if annotations.is_empty() {
+                    return None;
+                }
+                Some((file_id, annotations))
+            })
+            .collect()
    }
 }
 impl TestDB {
-    pub fn log(&self, f: impl FnOnce()) -> Vec<salsa::Event<TestDB>> {
+    pub fn log(&self, f: impl FnOnce()) -> Vec<salsa::Event> {
        *self.events.lock().unwrap() = Some(Vec::new());
        f();
        self.events.lock().unwrap().take().unwrap()
@@ -184,7 +127,7 @@ impl TestDB {
                // This pretty horrible, but `Debug` is the only way to inspect
                // QueryDescriptor at the moment.
                salsa::EventKind::WillExecute { database_key } => {
-                    Some(format!("{:?}", database_key))
+                    Some(format!("{:?}", database_key.debug(self)))
                }
                _ => None,
            })
diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs
index 5424e6bb1..016e689ff 100644
--- a/crates/ra_hir_ty/src/tests.rs
+++ b/crates/ra_hir_ty/src/tests.rs
@@ -10,6 +10,7 @@ mod display_source_code;
 use std::sync::Arc;
+use expect::Expect;
 use hir_def::{
    body::{BodySourceMap, SyntheticSyntax},
    child_by_source::ChildBySource,
@@ -20,23 +21,34 @@ use hir_def::{
    AssocItemId, DefWithBodyId, LocalModuleId, Lookup, ModuleDefId,
 };
 use hir_expand::{db::AstDatabase, InFile};
-use insta::assert_snapshot;
+use ra_db::{fixture::WithFixture, FileRange, SourceDatabase, SourceDatabaseExt};
-use ra_db::{fixture::WithFixture, salsa::Database, FileRange, SourceDatabase};
 use ra_syntax::{
    algo,
    ast::{self, AstNode},
    SyntaxNode,
 };
 use stdx::format_to;
-use test_utils::extract_annotations;
 use crate::{
    db::HirDatabase, display::HirDisplay, infer::TypeMismatch, test_db::TestDB, InferenceResult, Ty,
 };
 // These tests compare the inference results for all expressions in a file
-// against snapshots of the expected results using insta. Use cargo-insta to
+// against snapshots of the expected results using expect. Use
-// update the snapshots.
+// `env UPDATE_EXPECT=1 cargo test -p ra_hir_ty` to update the snapshots.
+fn setup_tracing() -> tracing::subscriber::DefaultGuard {
+    use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
+    use tracing_tree::HierarchicalLayer;
+    let filter = EnvFilter::from_env("CHALK_DEBUG");
+    let layer = HierarchicalLayer::default()
+        .with_indent_lines(true)
+        .with_ansi(false)
+        .with_indent_amount(2)
+        .with_writer(std::io::stderr);
+    let subscriber = Registry::default().with(filter).with(layer);
+    tracing::subscriber::set_default(subscriber)
+}
 fn check_types(ra_fixture: &str) {
    check_types_impl(ra_fixture, false)
@@ -47,11 +59,10 @@ fn check_types_source_code(ra_fixture: &str) {
 }
 fn check_types_impl(ra_fixture: &str, display_source: bool) {
+    let _tracing = setup_tracing();
    let db = TestDB::with_files(ra_fixture);
    let mut checked_one = false;
-    for file_id in db.all_files() {
+    for (file_id, annotations) in db.extract_annotations() {
-        let text = db.parse(file_id).syntax_node().to_string();
-        let annotations = extract_annotations(&text);
        for (range, expected) in annotations {
            let ty = type_at_range(&db, FileRange { file_id, range });
            let actual = if display_source {
@@ -70,7 +81,7 @@ fn check_types_impl(ra_fixture: &str, display_source: bool) {
 fn type_at_range(db: &TestDB, pos: FileRange) -> Ty {
    let file = db.parse(pos.file_id).ok().unwrap();
    let expr = algo::find_node_at_range::<ast::Expr>(file.syntax(), pos.range).unwrap();
-    let fn_def = expr.syntax().ancestors().find_map(ast::FnDef::cast).unwrap();
+    let fn_def = expr.syntax().ancestors().find_map(ast::Fn::cast).unwrap();
    let module = db.module_for_file(pos.file_id);
    let func = *module.child_by_source(db)[keys::FUNCTION]
        .get(&InFile::new(pos.file_id.into(), fn_def))
@@ -89,6 +100,7 @@ fn infer(ra_fixture: &str) -> String {
 }
 fn infer_with_mismatches(content: &str, include_mismatches: bool) -> String {
+    let _tracing = setup_tracing();
    let (db, file_id) = TestDB::with_single_file(content);
    let mut buf = String::new();
@@ -320,7 +332,7 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
    "
    .to_string();
-    db.query_mut(ra_db::FileTextQuery).set(pos.file_id, Arc::new(new_text));
+    db.set_file_text(pos.file_id, Arc::new(new_text));
    {
        let events = db.log_executed(|| {
@@ -334,385 +346,14 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
    }
 }
-#[test]
+fn check_infer(ra_fixture: &str, expect: Expect) {
-fn no_such_field_diagnostics() {
+    let mut actual = infer(ra_fixture);
-    let diagnostics = TestDB::with_files(
+    actual.push('\n');
-        r"
+    expect.assert_eq(&actual);
-        //- /lib.rs
-        struct S { foo: i32, bar: () }
-        impl S {
-            fn new() -> S {
-                S {
-                    foo: 92,
-                    baz: 62,
-                }
-            }
-        }
-        ",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r###"
-    "baz: 62": no such field
-    "{\n            foo: 92,\n            baz: 62,\n        }": Missing structure fields:
-    - bar
-    "###
-    );
-}
-#[test]
-fn no_such_field_with_feature_flag_diagnostics() {
-    let diagnostics = TestDB::with_files(
-        r#"
-        //- /lib.rs crate:foo cfg:feature=foo
-        struct MyStruct {
-            my_val: usize,
-            #[cfg(feature = "foo")]
-            bar: bool,
-        }
-        impl MyStruct {
-            #[cfg(feature = "foo")]
-            pub(crate) fn new(my_val: usize, bar: bool) -> Self {
-                Self { my_val, bar }
-            }
-            #[cfg(not(feature = "foo"))]
-            pub(crate) fn new(my_val: usize, _bar: bool) -> Self {
-                Self { my_val }
-            }
-        }
-        "#,
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r###""###);
-}
-#[test]
-fn no_such_field_enum_with_feature_flag_diagnostics() {
-    let diagnostics = TestDB::with_files(
-        r#"
-        //- /lib.rs crate:foo cfg:feature=foo
-        enum Foo {
-            #[cfg(not(feature = "foo"))]
-            Buz,
-            #[cfg(feature = "foo")]
-            Bar,
-            Baz
-        }
-        fn test_fn(f: Foo) {
-            match f {
-                Foo::Bar => {},
-                Foo::Baz => {},
-            }
-        }
-        "#,
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r###""###);
-}
-#[test]
-fn no_such_field_with_feature_flag_diagnostics_on_struct_lit() {
-    let diagnostics = TestDB::with_files(
-        r#"
-        //- /lib.rs crate:foo cfg:feature=foo
-        struct S {
-            #[cfg(feature = "foo")]
-            foo: u32,
-            #[cfg(not(feature = "foo"))]
-            bar: u32,
-        }
-        impl S {
-            #[cfg(feature = "foo")]
-            fn new(foo: u32) -> Self {
-                Self { foo }
-            }
-            #[cfg(not(feature = "foo"))]
-            fn new(bar: u32) -> Self {
-                Self { bar }
-            }
-        }
-        "#,
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r###""###);
-}
-#[test]
-fn no_such_field_with_feature_flag_diagnostics_on_block_expr() {
-    let diagnostics = TestDB::with_files(
-        r#"
-        //- /lib.rs crate:foo cfg:feature=foo
-        struct S {
-            #[cfg(feature = "foo")]
-            foo: u32,
-            #[cfg(not(feature = "foo"))]
-            bar: u32,
-        }
-        impl S {
-            fn new(bar: u32) -> Self {
-                #[cfg(feature = "foo")]
-                {
-                Self { foo: bar }
-                }
-                #[cfg(not(feature = "foo"))]
-                {
-                Self { bar }
-                }
-            }
-        }
-        "#,
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r###""###);
-}
-#[test]
-fn no_such_field_with_feature_flag_diagnostics_on_struct_fields() {
-    let diagnostics = TestDB::with_files(
-        r#"
-        //- /lib.rs crate:foo cfg:feature=foo
-        struct S {
-            #[cfg(feature = "foo")]
-            foo: u32,
-            #[cfg(not(feature = "foo"))]
-            bar: u32,
-        }
-        impl S {
-            fn new(val: u32) -> Self {
-                Self {
-                    #[cfg(feature = "foo")]
-                    foo: val,
-                    #[cfg(not(feature = "foo"))]
-                    bar: val,
-                }
-            }
-        }
-        "#,
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r###""###);
-}
-#[test]
-fn missing_record_pat_field_diagnostic() {
-    let diagnostics = TestDB::with_files(
-        r"
-        //- /lib.rs
-        struct S { foo: i32, bar: () }
-        fn baz(s: S) {
-            let S { foo: _ } = s;
-        }
-        ",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r###"
-    "{ foo: _ }": Missing structure fields:
-    - bar
-    "###
-    );
-}
-#[test]
-fn missing_record_pat_field_no_diagnostic_if_not_exhaustive() {
-    let diagnostics = TestDB::with_files(
-        r"
-        //- /lib.rs
-        struct S { foo: i32, bar: () }
-        fn baz(s: S) -> i32 {
-            match s {
-                S { foo, .. } => foo,
-            }
-        }
-        ",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @"");
-}
-#[test]
-fn missing_unsafe_diagnostic_with_raw_ptr() {
-    let diagnostics = TestDB::with_files(
-        r"
-//- /lib.rs
-fn missing_unsafe() {
-    let x = &5 as *const usize;
-    let y = *x;
-}
-",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r#""*x": This operation is unsafe and requires an unsafe function or block"#);
-}
-#[test]
-fn missing_unsafe_diagnostic_with_unsafe_call() {
-    let diagnostics = TestDB::with_files(
-        r"
-//- /lib.rs
-unsafe fn unsafe_fn() {
-    let x = &5 as *const usize;
-    let y = *x;
-}
-fn missing_unsafe() {
-    unsafe_fn();
-}
-",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r#""unsafe_fn()": This operation is unsafe and requires an unsafe function or block"#);
-}
-#[test]
-fn missing_unsafe_diagnostic_with_unsafe_method_call() {
-    let diagnostics = TestDB::with_files(
-        r"
-struct HasUnsafe;
-impl HasUnsafe {
-    unsafe fn unsafe_fn(&self) {
-        let x = &5 as *const usize;
-        let y = *x;
-    }
-}
-fn missing_unsafe() {
-    HasUnsafe.unsafe_fn();
 }
-",
+fn check_infer_with_mismatches(ra_fixture: &str, expect: Expect) {
-    )
+    let mut actual = infer_with_mismatches(ra_fixture, true);
-    .diagnostics()
+    actual.push('\n');
-    .0;
+    expect.assert_eq(&actual);
-    assert_snapshot!(diagnostics, @r#""HasUnsafe.unsafe_fn()": This operation is unsafe and requires an unsafe function or block"#);
-}
-#[test]
-fn no_missing_unsafe_diagnostic_with_raw_ptr_in_unsafe_block() {
-    let diagnostics = TestDB::with_files(
-        r"
-fn nothing_to_see_move_along() {
-    let x = &5 as *const usize;
-    unsafe {
-        let y = *x;
-    }
-}
-",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @"");
-}
-#[test]
-fn missing_unsafe_diagnostic_with_raw_ptr_outside_unsafe_block() {
-    let diagnostics = TestDB::with_files(
-        r"
-fn nothing_to_see_move_along() {
-    let x = &5 as *const usize;
-    unsafe {
-        let y = *x;
-    }
-    let z = *x;
-}
-",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r#""*x": This operation is unsafe and requires an unsafe function or block"#);
-}
-#[test]
-fn no_missing_unsafe_diagnostic_with_unsafe_call_in_unsafe_block() {
-    let diagnostics = TestDB::with_files(
-        r"
-unsafe fn unsafe_fn() {
-    let x = &5 as *const usize;
-    let y = *x;
-}
-fn nothing_to_see_move_along() {
-    unsafe {
-        unsafe_fn();
-    }
-}
-",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @"");
-}
-#[test]
-fn no_missing_unsafe_diagnostic_with_unsafe_method_call_in_unsafe_block() {
-    let diagnostics = TestDB::with_files(
-        r"
-struct HasUnsafe;
-impl HasUnsafe {
-    unsafe fn unsafe_fn() {
-        let x = &5 as *const usize;
-        let y = *x;
-    }
-}
-fn nothing_to_see_move_along() {
-    unsafe {
-        HasUnsafe.unsafe_fn();
-    }
-}
-",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @"");
-}
-#[test]
-fn break_outside_of_loop() {
-    let diagnostics = TestDB::with_files(
-        r"
-        //- /lib.rs
-        fn foo() {
-            break;
-        }
-        ",
-    )
-    .diagnostics()
-    .0;
-    assert_snapshot!(diagnostics, @r###""break": break outside of loop
-    "###
-    );
 }
diff --git a/crates/ra_hir_ty/src/tests/coercion.rs b/crates/ra_hir_ty/src/tests/coercion.rs
index 136d28a91..17efd75cb 100644
--- a/crates/ra_hir_ty/src/tests/coercion.rs
+++ b/crates/ra_hir_ty/src/tests/coercion.rs
@@ -1,345 +1,381 @@
-use insta::assert_snapshot;
+use expect::expect;
 use test_utils::mark;
-use super::infer_with_mismatches;
+use super::{check_infer, check_infer_with_mismatches};
-// Infer with some common definitions and impls.
-fn infer(source: &str) -> String {
-    let defs = r#"
-        #[lang = "sized"]
-        pub trait Sized {}
-        #[lang = "unsize"]
-        pub trait Unsize<T: ?Sized> {}
-        #[lang = "coerce_unsized"]
-        pub trait CoerceUnsized<T> {}
-        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
-        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
-    "#;
-    // Append to the end to keep positions unchanged.
-    super::infer(&format!("{}{}", source, defs))
-}
 #[test]
 fn infer_block_expr_type_mismatch() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r"
-fn test() {
+        fn test() {
-    let a: i32 = { 1i64 };
+            let a: i32 = { 1i64 };
-}
+        }
-"#),
+        ",
-        @r###"
+        expect![[r"
-    10..40 '{     ...4 }; }': ()
+            10..40 '{     ...4 }; }': ()
-    20..21 'a': i32
+            20..21 'a': i32
-    29..37 '{ 1i64 }': i64
+            29..37 '{ 1i64 }': i64
-    31..35 '1i64': i64
+            31..35 '1i64': i64
-    "###);
+        "]],
+    );
 }
 #[test]
 fn coerce_places() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct S<T> { a: T }
+        struct S<T> { a: T }
-fn f<T>(_: &[T]) -> T { loop {} }
+        fn f<T>(_: &[T]) -> T { loop {} }
-fn g<T>(_: S<&[T]>) -> T { loop {} }
+        fn g<T>(_: S<&[T]>) -> T { loop {} }
-fn gen<T>() -> *mut [T; 2] { loop {} }
+        fn gen<T>() -> *mut [T; 2] { loop {} }
-fn test1<U>() -> *mut [U] {
+        fn test1<U>() -> *mut [U] {
-    gen()
+            gen()
-}
+        }
-fn test2() {
+        fn test2() {
-    let arr: &[u8; 1] = &[1];
+            let arr: &[u8; 1] = &[1];
-    let a: &[_] = arr;
+            let a: &[_] = arr;
-    let b = f(arr);
+            let b = f(arr);
-    let c: &[_] = { arr };
+            let c: &[_] = { arr };
-    let d = g(S { a: arr });
+            let d = g(S { a: arr });
-    let e: [&[_]; 1] = [arr];
+            let e: [&[_]; 1] = [arr];
-    let f: [&[_]; 2] = [arr; 2];
+            let f: [&[_]; 2] = [arr; 2];
-    let g: (&[_], &[_]) = (arr, arr);
+            let g: (&[_], &[_]) = (arr, arr);
-}
+        }
-"#),
-        @r###"
+        #[lang = "sized"]
-    30..31 '_': &[T]
+        pub trait Sized {}
-    44..55 '{ loop {} }': T
+        #[lang = "unsize"]
-    46..53 'loop {}': !
+        pub trait Unsize<T: ?Sized> {}
-    51..53 '{}': ()
+        #[lang = "coerce_unsized"]
-    64..65 '_': S<&[T]>
+        pub trait CoerceUnsized<T> {}
-    81..92 '{ loop {} }': T
-    83..90 'loop {}': !
+        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
-    88..90 '{}': ()
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
-    121..132 '{ loop {} }': *mut [T; _]
+        "#,
-    123..130 'loop {}': !
+        expect![[r"
-    128..130 '{}': ()
+            30..31 '_': &[T]
-    159..172 '{     gen() }': *mut [U]
+            44..55 '{ loop {} }': T
-    165..168 'gen': fn gen<U>() -> *mut [U; _]
+            46..53 'loop {}': !
-    165..170 'gen()': *mut [U; _]
+            51..53 '{}': ()
-    185..419 '{     ...rr); }': ()
+            64..65 '_': S<&[T]>
-    195..198 'arr': &[u8; _]
+            81..92 '{ loop {} }': T
-    211..215 '&[1]': &[u8; _]
+            83..90 'loop {}': !
-    212..215 '[1]': [u8; _]
+            88..90 '{}': ()
-    213..214 '1': u8
+            121..132 '{ loop {} }': *mut [T; _]
-    226..227 'a': &[u8]
+            123..130 'loop {}': !
-    236..239 'arr': &[u8; _]
+            128..130 '{}': ()
-    249..250 'b': u8
+            159..172 '{     gen() }': *mut [U]
-    253..254 'f': fn f<u8>(&[u8]) -> u8
+            165..168 'gen': fn gen<U>() -> *mut [U; _]
-    253..259 'f(arr)': u8
+            165..170 'gen()': *mut [U; _]
-    255..258 'arr': &[u8; _]
+            185..419 '{     ...rr); }': ()
-    269..270 'c': &[u8]
+            195..198 'arr': &[u8; _]
-    279..286 '{ arr }': &[u8]
+            211..215 '&[1]': &[u8; _]
-    281..284 'arr': &[u8; _]
+            212..215 '[1]': [u8; _]
-    296..297 'd': u8
+            213..214 '1': u8
-    300..301 'g': fn g<u8>(S<&[u8]>) -> u8
+            226..227 'a': &[u8]
-    300..315 'g(S { a: arr })': u8
+            236..239 'arr': &[u8; _]
-    302..314 'S { a: arr }': S<&[u8]>
+            249..250 'b': u8
-    309..312 'arr': &[u8; _]
+            253..254 'f': fn f<u8>(&[u8]) -> u8
-    325..326 'e': [&[u8]; _]
+            253..259 'f(arr)': u8
-    340..345 '[arr]': [&[u8]; _]
+            255..258 'arr': &[u8; _]
-    341..344 'arr': &[u8; _]
+            269..270 'c': &[u8]
-    355..356 'f': [&[u8]; _]
+            279..286 '{ arr }': &[u8]
-    370..378 '[arr; 2]': [&[u8]; _]
+            281..284 'arr': &[u8; _]
-    371..374 'arr': &[u8; _]
+            296..297 'd': u8
-    376..377 '2': usize
+            300..301 'g': fn g<u8>(S<&[u8]>) -> u8
-    388..389 'g': (&[u8], &[u8])
+            300..315 'g(S { a: arr })': u8
-    406..416 '(arr, arr)': (&[u8], &[u8])
+            302..314 'S { a: arr }': S<&[u8]>
-    407..410 'arr': &[u8; _]
+            309..312 'arr': &[u8; _]
-    412..415 'arr': &[u8; _]
+            325..326 'e': [&[u8]; _]
-    "###
+            340..345 '[arr]': [&[u8]; _]
+            341..344 'arr': &[u8; _]
+            355..356 'f': [&[u8]; _]
+            370..378 '[arr; 2]': [&[u8]; _]
+            371..374 'arr': &[u8; _]
+            376..377 '2': usize
+            388..389 'g': (&[u8], &[u8])
+            406..416 '(arr, arr)': (&[u8], &[u8])
+            407..410 'arr': &[u8; _]
+            412..415 'arr': &[u8; _]
+        "]],
    );
 }
 #[test]
 fn infer_let_stmt_coerce() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r"
-fn test() {
+        fn test() {
-    let x: &[isize] = &[1];
+            let x: &[isize] = &[1];
-    let x: *const [isize] = &[1];
+            let x: *const [isize] = &[1];
-}
+        }
-"#),
+        ",
-        @r###"
+        expect![[r"
-    10..75 '{     ...[1]; }': ()
+            10..75 '{     ...[1]; }': ()
-    20..21 'x': &[isize]
+            20..21 'x': &[isize]
-    34..38 '&[1]': &[isize; _]
+            34..38 '&[1]': &[isize; _]
-    35..38 '[1]': [isize; _]
+            35..38 '[1]': [isize; _]
-    36..37 '1': isize
+            36..37 '1': isize
-    48..49 'x': *const [isize]
+            48..49 'x': *const [isize]
-    68..72 '&[1]': &[isize; _]
+            68..72 '&[1]': &[isize; _]
-    69..72 '[1]': [isize; _]
+            69..72 '[1]': [isize; _]
-    70..71 '1': isize
+            70..71 '1': isize
-    "###);
+        "]],
+    );
 }
 #[test]
 fn infer_custom_coerce_unsized() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<T: ?Sized>(*const T);
+        struct A<T: ?Sized>(*const T);
-struct B<T: ?Sized>(*const T);
+        struct B<T: ?Sized>(*const T);
-struct C<T: ?Sized> { inner: *const T }
+        struct C<T: ?Sized> { inner: *const T }
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<B<U>> for B<T> {}
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<B<U>> for B<T> {}
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<C<U>> for C<T> {}
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<C<U>> for C<T> {}
-fn foo1<T>(x: A<[T]>) -> A<[T]> { x }
+        fn foo1<T>(x: A<[T]>) -> A<[T]> { x }
-fn foo2<T>(x: B<[T]>) -> B<[T]> { x }
+        fn foo2<T>(x: B<[T]>) -> B<[T]> { x }
-fn foo3<T>(x: C<[T]>) -> C<[T]> { x }
+        fn foo3<T>(x: C<[T]>) -> C<[T]> { x }
-fn test(a: A<[u8; 2]>, b: B<[u8; 2]>, c: C<[u8; 2]>) {
+        fn test(a: A<[u8; 2]>, b: B<[u8; 2]>, c: C<[u8; 2]>) {
-    let d = foo1(a);
+            let d = foo1(a);
-    let e = foo2(b);
+            let e = foo2(b);
-    let f = foo3(c);
+            let f = foo3(c);
-}
+        }
-"#),
-        @r###"
-    257..258 'x': A<[T]>
+        #[lang = "sized"]
-    278..283 '{ x }': A<[T]>
+        pub trait Sized {}
-    280..281 'x': A<[T]>
+        #[lang = "unsize"]
-    295..296 'x': B<[T]>
+        pub trait Unsize<T: ?Sized> {}
-    316..321 '{ x }': B<[T]>
+        #[lang = "coerce_unsized"]
-    318..319 'x': B<[T]>
+        pub trait CoerceUnsized<T> {}
-    333..334 'x': C<[T]>
-    354..359 '{ x }': C<[T]>
+        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
-    356..357 'x': C<[T]>
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
-    369..370 'a': A<[u8; _]>
+        "#,
-    384..385 'b': B<[u8; _]>
+        expect![[r"
-    399..400 'c': C<[u8; _]>
+            257..258 'x': A<[T]>
-    414..480 '{     ...(c); }': ()
+            278..283 '{ x }': A<[T]>
-    424..425 'd': A<[{unknown}]>
+            280..281 'x': A<[T]>
-    428..432 'foo1': fn foo1<{unknown}>(A<[{unknown}]>) -> A<[{unknown}]>
+            295..296 'x': B<[T]>
-    428..435 'foo1(a)': A<[{unknown}]>
+            316..321 '{ x }': B<[T]>
-    433..434 'a': A<[u8; _]>
+            318..319 'x': B<[T]>
-    445..446 'e': B<[u8]>
+            333..334 'x': C<[T]>
-    449..453 'foo2': fn foo2<u8>(B<[u8]>) -> B<[u8]>
+            354..359 '{ x }': C<[T]>
-    449..456 'foo2(b)': B<[u8]>
+            356..357 'x': C<[T]>
-    454..455 'b': B<[u8; _]>
+            369..370 'a': A<[u8; _]>
-    466..467 'f': C<[u8]>
+            384..385 'b': B<[u8; _]>
-    470..474 'foo3': fn foo3<u8>(C<[u8]>) -> C<[u8]>
+            399..400 'c': C<[u8; _]>
-    470..477 'foo3(c)': C<[u8]>
+            414..480 '{     ...(c); }': ()
-    475..476 'c': C<[u8; _]>
+            424..425 'd': A<[{unknown}]>
-    "###
+            428..432 'foo1': fn foo1<{unknown}>(A<[{unknown}]>) -> A<[{unknown}]>
+            428..435 'foo1(a)': A<[{unknown}]>
+            433..434 'a': A<[u8; _]>
+            445..446 'e': B<[u8]>
+            449..453 'foo2': fn foo2<u8>(B<[u8]>) -> B<[u8]>
+            449..456 'foo2(b)': B<[u8]>
+            454..455 'b': B<[u8; _]>
+            466..467 'f': C<[u8]>
+            470..474 'foo3': fn foo3<u8>(C<[u8]>) -> C<[u8]>
+            470..477 'foo3(c)': C<[u8]>
+            475..476 'c': C<[u8; _]>
+        "]],
    );
 }
 #[test]
 fn infer_if_coerce() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo<T>(x: &[T]) -> &[T] { loop {} }
+        fn foo<T>(x: &[T]) -> &[T] { loop {} }
-fn test() {
+        fn test() {
-    let x = if true {
+            let x = if true {
-        foo(&[1])
+                foo(&[1])
-    } else {
+            } else {
-        &[1]
+                &[1]
-    };
+            };
-}
+        }
-"#),
-        @r###"
-    10..11 'x': &[T]
+        #[lang = "sized"]
-    27..38 '{ loop {} }': &[T]
+        pub trait Sized {}
-    29..36 'loop {}': !
+        #[lang = "unsize"]
-    34..36 '{}': ()
+        pub trait Unsize<T: ?Sized> {}
-    49..125 '{     ...  }; }': ()
+        "#,
-    59..60 'x': &[i32]
+        expect![[r"
-    63..122 'if tru...     }': &[i32]
+            10..11 'x': &[T]
-    66..70 'true': bool
+            27..38 '{ loop {} }': &[T]
-    71..96 '{     ...     }': &[i32]
+            29..36 'loop {}': !
-    81..84 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            34..36 '{}': ()
-    81..90 'foo(&[1])': &[i32]
+            49..125 '{     ...  }; }': ()
-    85..89 '&[1]': &[i32; _]
+            59..60 'x': &[i32]
-    86..89 '[1]': [i32; _]
+            63..122 'if tru...     }': &[i32]
-    87..88 '1': i32
+            66..70 'true': bool
-    102..122 '{     ...     }': &[i32; _]
+            71..96 '{     ...     }': &[i32]
-    112..116 '&[1]': &[i32; _]
+            81..84 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    113..116 '[1]': [i32; _]
+            81..90 'foo(&[1])': &[i32]
-    114..115 '1': i32
+            85..89 '&[1]': &[i32; _]
-    "###
+            86..89 '[1]': [i32; _]
+            87..88 '1': i32
+            102..122 '{     ...     }': &[i32; _]
+            112..116 '&[1]': &[i32; _]
+            113..116 '[1]': [i32; _]
+            114..115 '1': i32
+        "]],
    );
 }
 #[test]
 fn infer_if_else_coerce() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo<T>(x: &[T]) -> &[T] { loop {} }
+        fn foo<T>(x: &[T]) -> &[T] { loop {} }
-fn test() {
+        fn test() {
-    let x = if true {
+            let x = if true {
-        &[1]
+                &[1]
-    } else {
+            } else {
-        foo(&[1])
+                foo(&[1])
-    };
+            };
-}
+        }
-"#),
-        @r###"
+        #[lang = "sized"]
-    10..11 'x': &[T]
+        pub trait Sized {}
-    27..38 '{ loop {} }': &[T]
+        #[lang = "unsize"]
-    29..36 'loop {}': !
+        pub trait Unsize<T: ?Sized> {}
-    34..36 '{}': ()
+        #[lang = "coerce_unsized"]
-    49..125 '{     ...  }; }': ()
+        pub trait CoerceUnsized<T> {}
-    59..60 'x': &[i32]
-    63..122 'if tru...     }': &[i32]
+        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
-    66..70 'true': bool
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
-    71..91 '{     ...     }': &[i32; _]
+        "#,
-    81..85 '&[1]': &[i32; _]
+        expect![[r"
-    82..85 '[1]': [i32; _]
+            10..11 'x': &[T]
-    83..84 '1': i32
+            27..38 '{ loop {} }': &[T]
-    97..122 '{     ...     }': &[i32]
+            29..36 'loop {}': !
-    107..110 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            34..36 '{}': ()
-    107..116 'foo(&[1])': &[i32]
+            49..125 '{     ...  }; }': ()
-    111..115 '&[1]': &[i32; _]
+            59..60 'x': &[i32]
-    112..115 '[1]': [i32; _]
+            63..122 'if tru...     }': &[i32]
-    113..114 '1': i32
+            66..70 'true': bool
-    "###
+            71..91 '{     ...     }': &[i32; _]
-    );
+            81..85 '&[1]': &[i32; _]
+            82..85 '[1]': [i32; _]
+            83..84 '1': i32
+            97..122 '{     ...     }': &[i32]
+            107..110 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            107..116 'foo(&[1])': &[i32]
+            111..115 '&[1]': &[i32; _]
+            112..115 '[1]': [i32; _]
+            113..114 '1': i32
+        "]],
+    )
 }
 #[test]
 fn infer_match_first_coerce() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo<T>(x: &[T]) -> &[T] { loop {} }
+        fn foo<T>(x: &[T]) -> &[T] { loop {} }
-fn test(i: i32) {
+        fn test(i: i32) {
-    let x = match i {
+            let x = match i {
-        2 => foo(&[2]),
+                2 => foo(&[2]),
-        1 => &[1],
+                1 => &[1],
-        _ => &[3],
+                _ => &[3],
-    };
+            };
-}
+        }
-"#),
-        @r###"
+        #[lang = "sized"]
-    10..11 'x': &[T]
+        pub trait Sized {}
-    27..38 '{ loop {} }': &[T]
+        #[lang = "unsize"]
-    29..36 'loop {}': !
+        pub trait Unsize<T: ?Sized> {}
-    34..36 '{}': ()
+        "#,
-    47..48 'i': i32
+        expect![[r"
-    55..149 '{     ...  }; }': ()
+            10..11 'x': &[T]
-    65..66 'x': &[i32]
+            27..38 '{ loop {} }': &[T]
-    69..146 'match ...     }': &[i32]
+            29..36 'loop {}': !
-    75..76 'i': i32
+            34..36 '{}': ()
-    87..88 '2': i32
+            47..48 'i': i32
-    87..88 '2': i32
+            55..149 '{     ...  }; }': ()
-    92..95 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            65..66 'x': &[i32]
-    92..101 'foo(&[2])': &[i32]
+            69..146 'match ...     }': &[i32]
-    96..100 '&[2]': &[i32; _]
+            75..76 'i': i32
-    97..100 '[2]': [i32; _]
+            87..88 '2': i32
-    98..99 '2': i32
+            87..88 '2': i32
-    111..112 '1': i32
+            92..95 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    111..112 '1': i32
+            92..101 'foo(&[2])': &[i32]
-    116..120 '&[1]': &[i32; _]
+            96..100 '&[2]': &[i32; _]
-    117..120 '[1]': [i32; _]
+            97..100 '[2]': [i32; _]
-    118..119 '1': i32
+            98..99 '2': i32
-    130..131 '_': i32
+            111..112 '1': i32
-    135..139 '&[3]': &[i32; _]
+            111..112 '1': i32
-    136..139 '[3]': [i32; _]
+            116..120 '&[1]': &[i32; _]
-    137..138 '3': i32
+            117..120 '[1]': [i32; _]
-    "###
+            118..119 '1': i32
+            130..131 '_': i32
+            135..139 '&[3]': &[i32; _]
+            136..139 '[3]': [i32; _]
+            137..138 '3': i32
+    "]],
    );
 }
 #[test]
 fn infer_match_second_coerce() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo<T>(x: &[T]) -> &[T] { loop {} }
+        fn foo<T>(x: &[T]) -> &[T] { loop {} }
-fn test(i: i32) {
+        fn test(i: i32) {
-    let x = match i {
+            let x = match i {
-        1 => &[1],
+                1 => &[1],
-        2 => foo(&[2]),
+                2 => foo(&[2]),
-        _ => &[3],
+                _ => &[3],
-    };
+            };
-}
+        }
-"#),
-        @r###"
+        #[lang = "sized"]
-    10..11 'x': &[T]
+        pub trait Sized {}
-    27..38 '{ loop {} }': &[T]
+        #[lang = "unsize"]
-    29..36 'loop {}': !
+        pub trait Unsize<T: ?Sized> {}
-    34..36 '{}': ()
+        #[lang = "coerce_unsized"]
-    47..48 'i': i32
+        pub trait CoerceUnsized<T> {}
-    55..149 '{     ...  }; }': ()
-    65..66 'x': &[i32]
+        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
-    69..146 'match ...     }': &[i32]
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
-    75..76 'i': i32
+        "#,
-    87..88 '1': i32
+        expect![[r"
-    87..88 '1': i32
+            10..11 'x': &[T]
-    92..96 '&[1]': &[i32; _]
+            27..38 '{ loop {} }': &[T]
-    93..96 '[1]': [i32; _]
+            29..36 'loop {}': !
-    94..95 '1': i32
+            34..36 '{}': ()
-    106..107 '2': i32
+            47..48 'i': i32
-    106..107 '2': i32
+            55..149 '{     ...  }; }': ()
-    111..114 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            65..66 'x': &[i32]
-    111..120 'foo(&[2])': &[i32]
+            69..146 'match ...     }': &[i32]
-    115..119 '&[2]': &[i32; _]
+            75..76 'i': i32
-    116..119 '[2]': [i32; _]
+            87..88 '1': i32
-    117..118 '2': i32
+            87..88 '1': i32
-    130..131 '_': i32
+            92..96 '&[1]': &[i32; _]
-    135..139 '&[3]': &[i32; _]
+            93..96 '[1]': [i32; _]
-    136..139 '[3]': [i32; _]
+            94..95 '1': i32
-    137..138 '3': i32
+            106..107 '2': i32
-    "###
+            106..107 '2': i32
+            111..114 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            111..120 'foo(&[2])': &[i32]
+            115..119 '&[2]': &[i32; _]
+            116..119 '[2]': [i32; _]
+            117..118 '2': i32
+            130..131 '_': i32
+            135..139 '&[3]': &[i32; _]
+            136..139 '[3]': [i32; _]
+            137..138 '3': i32
+    "]],
    );
 }
@@ -347,405 +383,453 @@ fn test(i: i32) {
 fn coerce_merge_one_by_one1() {
    mark::check!(coerce_merge_fail_fallback);
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r"
-fn test() {
+        fn test() {
-    let t = &mut 1;
+            let t = &mut 1;
-    let x = match 1 {
+            let x = match 1 {
-        1 => t as *mut i32,
+                1 => t as *mut i32,
-        2 => t as &i32,
+                2 => t as &i32,
-        _ => t as *const i32,
+                _ => t as *const i32,
-    };
+            };
-}
+        }
-"#),
+        ",
-        @r###"
+        expect![[r"
-    10..144 '{     ...  }; }': ()
+            10..144 '{     ...  }; }': ()
-    20..21 't': &mut i32
+            20..21 't': &mut i32
-    24..30 '&mut 1': &mut i32
+            24..30 '&mut 1': &mut i32
-    29..30 '1': i32
+            29..30 '1': i32
-    40..41 'x': *const i32
+            40..41 'x': *const i32
-    44..141 'match ...     }': *const i32
+            44..141 'match ...     }': *const i32
-    50..51 '1': i32
+            50..51 '1': i32
-    62..63 '1': i32
+            62..63 '1': i32
-    62..63 '1': i32
+            62..63 '1': i32
-    67..68 't': &mut i32
+            67..68 't': &mut i32
-    67..80 't as *mut i32': *mut i32
+            67..80 't as *mut i32': *mut i32
-    90..91 '2': i32
+            90..91 '2': i32
-    90..91 '2': i32
+            90..91 '2': i32
-    95..96 't': &mut i32
+            95..96 't': &mut i32
-    95..104 't as &i32': &i32
+            95..104 't as &i32': &i32
-    114..115 '_': i32
+            114..115 '_': i32
-    119..120 't': &mut i32
+            119..120 't': &mut i32
-    119..134 't as *const i32': *const i32
+            119..134 't as *const i32': *const i32
-    "###
+    "]],
    );
 }
 #[test]
 fn return_coerce_unknown() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r"
-fn foo() -> u32 {
+        fn foo() -> u32 {
-    return unknown;
+            return unknown;
-}
+        }
-"#, true),
+        ",
-        @r###"
+        expect![[r"
-    16..39 '{     ...own; }': u32
+            16..39 '{     ...own; }': u32
-    22..36 'return unknown': !
+            22..36 'return unknown': !
-    29..36 'unknown': u32
+            29..36 'unknown': u32
-    "###
+        "]],
    );
 }
 #[test]
 fn coerce_autoderef() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r"
-struct Foo;
+        struct Foo;
-fn takes_ref_foo(x: &Foo) {}
+        fn takes_ref_foo(x: &Foo) {}
-fn test() {
+        fn test() {
-    takes_ref_foo(&Foo);
+            takes_ref_foo(&Foo);
-    takes_ref_foo(&&Foo);
+            takes_ref_foo(&&Foo);
-    takes_ref_foo(&&&Foo);
+            takes_ref_foo(&&&Foo);
-}
+        }
-"#, true),
+        ",
-        @r###"
+        expect![[r"
-    29..30 'x': &Foo
+            29..30 'x': &Foo
-    38..40 '{}': ()
+            38..40 '{}': ()
-    51..132 '{     ...oo); }': ()
+            51..132 '{     ...oo); }': ()
-    57..70 'takes_ref_foo': fn takes_ref_foo(&Foo)
+            57..70 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    57..76 'takes_...(&Foo)': ()
+            57..76 'takes_...(&Foo)': ()
-    71..75 '&Foo': &Foo
+            71..75 '&Foo': &Foo
-    72..75 'Foo': Foo
+            72..75 'Foo': Foo
-    82..95 'takes_ref_foo': fn takes_ref_foo(&Foo)
+            82..95 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    82..102 'takes_...&&Foo)': ()
+            82..102 'takes_...&&Foo)': ()
-    96..101 '&&Foo': &&Foo
+            96..101 '&&Foo': &&Foo
-    97..101 '&Foo': &Foo
+            97..101 '&Foo': &Foo
-    98..101 'Foo': Foo
+            98..101 'Foo': Foo
-    108..121 'takes_ref_foo': fn takes_ref_foo(&Foo)
+            108..121 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    108..129 'takes_...&&Foo)': ()
+            108..129 'takes_...&&Foo)': ()
-    122..128 '&&&Foo': &&&Foo
+            122..128 '&&&Foo': &&&Foo
-    123..128 '&&Foo': &&Foo
+            123..128 '&&Foo': &&Foo
-    124..128 '&Foo': &Foo
+            124..128 '&Foo': &Foo
-    125..128 'Foo': Foo
+            125..128 'Foo': Foo
-    "###
+        "]],
    );
 }
 #[test]
 fn coerce_autoderef_generic() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r"
-struct Foo;
+        struct Foo;
-fn takes_ref<T>(x: &T) -> T { *x }
+        fn takes_ref<T>(x: &T) -> T { *x }
-fn test() {
+        fn test() {
-    takes_ref(&Foo);
+            takes_ref(&Foo);
-    takes_ref(&&Foo);
+            takes_ref(&&Foo);
-    takes_ref(&&&Foo);
+            takes_ref(&&&Foo);
-}
+        }
-"#, true),
+        ",
-        @r###"
+        expect![[r"
-    28..29 'x': &T
+            28..29 'x': &T
-    40..46 '{ *x }': T
+            40..46 '{ *x }': T
-    42..44 '*x': T
+            42..44 '*x': T
-    43..44 'x': &T
+            43..44 'x': &T
-    57..126 '{     ...oo); }': ()
+            57..126 '{     ...oo); }': ()
-    63..72 'takes_ref': fn takes_ref<Foo>(&Foo) -> Foo
+            63..72 'takes_ref': fn takes_ref<Foo>(&Foo) -> Foo
-    63..78 'takes_ref(&Foo)': Foo
+            63..78 'takes_ref(&Foo)': Foo
-    73..77 '&Foo': &Foo
+            73..77 '&Foo': &Foo
-    74..77 'Foo': Foo
+            74..77 'Foo': Foo
-    84..93 'takes_ref': fn takes_ref<&Foo>(&&Foo) -> &Foo
+            84..93 'takes_ref': fn takes_ref<&Foo>(&&Foo) -> &Foo
-    84..100 'takes_...&&Foo)': &Foo
+            84..100 'takes_...&&Foo)': &Foo
-    94..99 '&&Foo': &&Foo
+            94..99 '&&Foo': &&Foo
-    95..99 '&Foo': &Foo
+            95..99 '&Foo': &Foo
-    96..99 'Foo': Foo
+            96..99 'Foo': Foo
-    106..115 'takes_ref': fn takes_ref<&&Foo>(&&&Foo) -> &&Foo
+            106..115 'takes_ref': fn takes_ref<&&Foo>(&&&Foo) -> &&Foo
-    106..123 'takes_...&&Foo)': &&Foo
+            106..123 'takes_...&&Foo)': &&Foo
-    116..122 '&&&Foo': &&&Foo
+            116..122 '&&&Foo': &&&Foo
-    117..122 '&&Foo': &&Foo
+            117..122 '&&Foo': &&Foo
-    118..122 '&Foo': &Foo
+            118..122 '&Foo': &Foo
-    119..122 'Foo': Foo
+            119..122 'Foo': Foo
-    "###
+        "]],
    );
 }
 #[test]
 fn coerce_autoderef_block() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-struct String {}
+        struct String {}
-#[lang = "deref"]
+        #[lang = "deref"]
-trait Deref { type Target; }
+        trait Deref { type Target; }
-impl Deref for String { type Target = str; }
+        impl Deref for String { type Target = str; }
-fn takes_ref_str(x: &str) {}
+        fn takes_ref_str(x: &str) {}
-fn returns_string() -> String { loop {} }
+        fn returns_string() -> String { loop {} }
-fn test() {
+        fn test() {
-    takes_ref_str(&{ returns_string() });
+            takes_ref_str(&{ returns_string() });
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r"
-    126..127 'x': &str
+            126..127 'x': &str
-    135..137 '{}': ()
+            135..137 '{}': ()
-    168..179 '{ loop {} }': String
+            168..179 '{ loop {} }': String
-    170..177 'loop {}': !
+            170..177 'loop {}': !
-    175..177 '{}': ()
+            175..177 '{}': ()
-    190..235 '{     ... }); }': ()
+            190..235 '{     ... }); }': ()
-    196..209 'takes_ref_str': fn takes_ref_str(&str)
+            196..209 'takes_ref_str': fn takes_ref_str(&str)
-    196..232 'takes_...g() })': ()
+            196..232 'takes_...g() })': ()
-    210..231 '&{ ret...ng() }': &String
+            210..231 '&{ ret...ng() }': &String
-    211..231 '{ retu...ng() }': String
+            211..231 '{ retu...ng() }': String
-    213..227 'returns_string': fn returns_string() -> String
+            213..227 'returns_string': fn returns_string() -> String
-    213..229 'return...ring()': String
+            213..229 'return...ring()': String
-    "###
+        "]],
    );
 }
 #[test]
 fn closure_return_coerce() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r"
-fn foo() {
+        fn foo() {
-    let x = || {
+            let x = || {
-        if true {
+                if true {
-            return &1u32;
+                    return &1u32;
+                }
+                &&1u32
+            };
        }
-        &&1u32
+        ",
-    };
+        expect![[r"
-}
+            9..105 '{     ...  }; }': ()
-"#, true),
+            19..20 'x': || -> &u32
-        @r###"
+            23..102 '|| {  ...     }': || -> &u32
-    9..105 '{     ...  }; }': ()
+            26..102 '{     ...     }': &u32
-    19..20 'x': || -> &u32
+            36..81 'if tru...     }': ()
-    23..102 '|| {  ...     }': || -> &u32
+            39..43 'true': bool
-    26..102 '{     ...     }': &u32
+            44..81 '{     ...     }': ()
-    36..81 'if tru...     }': ()
+            58..70 'return &1u32': !
-    39..43 'true': bool
+            65..70 '&1u32': &u32
-    44..81 '{     ...     }': ()
+            66..70 '1u32': u32
-    58..70 'return &1u32': !
+            90..96 '&&1u32': &&u32
-    65..70 '&1u32': &u32
+            91..96 '&1u32': &u32
-    66..70 '1u32': u32
+            92..96 '1u32': u32
-    90..96 '&&1u32': &&u32
+        "]],
-    91..96 '&1u32': &u32
-    92..96 '1u32': u32
-    "###
    );
 }
 #[test]
 fn coerce_fn_item_to_fn_ptr() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r"
-fn foo(x: u32) -> isize { 1 }
+        fn foo(x: u32) -> isize { 1 }
-fn test() {
+        fn test() {
-    let f: fn(u32) -> isize = foo;
+            let f: fn(u32) -> isize = foo;
-}
+        }
-"#, true),
+        ",
-        @r###"
+        expect![[r"
-    7..8 'x': u32
+            7..8 'x': u32
-    24..29 '{ 1 }': isize
+            24..29 '{ 1 }': isize
-    26..27 '1': isize
+            26..27 '1': isize
-    40..78 '{     ...foo; }': ()
+            40..78 '{     ...foo; }': ()
-    50..51 'f': fn(u32) -> isize
+            50..51 'f': fn(u32) -> isize
-    72..75 'foo': fn foo(u32) -> isize
+            72..75 'foo': fn foo(u32) -> isize
-    "###
+        "]],
    );
 }
 #[test]
 fn coerce_fn_items_in_match_arms() {
    mark::check!(coerce_fn_reification);
-    assert_snapshot!(
-        infer_with_mismatches(r#"
+    check_infer_with_mismatches(
-fn foo1(x: u32) -> isize { 1 }
+        r"
-fn foo2(x: u32) -> isize { 2 }
+        fn foo1(x: u32) -> isize { 1 }
-fn foo3(x: u32) -> isize { 3 }
+        fn foo2(x: u32) -> isize { 2 }
-fn test() {
+        fn foo3(x: u32) -> isize { 3 }
-    let x = match 1 {
+        fn test() {
-        1 => foo1,
+            let x = match 1 {
-        2 => foo2,
+                1 => foo1,
-        _ => foo3,
+                2 => foo2,
-    };
+                _ => foo3,
-}
+            };
-"#, true),
+        }
-        @r###"
+        ",
-    8..9 'x': u32
+        expect![[r"
-    25..30 '{ 1 }': isize
+            8..9 'x': u32
-    27..28 '1': isize
+            25..30 '{ 1 }': isize
-    39..40 'x': u32
+            27..28 '1': isize
-    56..61 '{ 2 }': isize
+            39..40 'x': u32
-    58..59 '2': isize
+            56..61 '{ 2 }': isize
-    70..71 'x': u32
+            58..59 '2': isize
-    87..92 '{ 3 }': isize
+            70..71 'x': u32
-    89..90 '3': isize
+            87..92 '{ 3 }': isize
-    103..192 '{     ...  }; }': ()
+            89..90 '3': isize
-    113..114 'x': fn(u32) -> isize
+            103..192 '{     ...  }; }': ()
-    117..189 'match ...     }': fn(u32) -> isize
+            113..114 'x': fn(u32) -> isize
-    123..124 '1': i32
+            117..189 'match ...     }': fn(u32) -> isize
-    135..136 '1': i32
+            123..124 '1': i32
-    135..136 '1': i32
+            135..136 '1': i32
-    140..144 'foo1': fn foo1(u32) -> isize
+            135..136 '1': i32
-    154..155 '2': i32
+            140..144 'foo1': fn foo1(u32) -> isize
-    154..155 '2': i32
+            154..155 '2': i32
-    159..163 'foo2': fn foo2(u32) -> isize
+            154..155 '2': i32
-    173..174 '_': i32
+            159..163 'foo2': fn foo2(u32) -> isize
-    178..182 'foo3': fn foo3(u32) -> isize
+            173..174 '_': i32
-    "###
+            178..182 'foo3': fn foo3(u32) -> isize
+        "]],
    );
 }
 #[test]
 fn coerce_closure_to_fn_ptr() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r"
-fn test() {
+        fn test() {
-    let f: fn(u32) -> isize = |x| { 1 };
+            let f: fn(u32) -> isize = |x| { 1 };
-}
+        }
-"#, true),
+        ",
-        @r###"
+        expect![[r"
-    10..54 '{     ...1 }; }': ()
+            10..54 '{     ...1 }; }': ()
-    20..21 'f': fn(u32) -> isize
+            20..21 'f': fn(u32) -> isize
-    42..51 '|x| { 1 }': |u32| -> isize
+            42..51 '|x| { 1 }': |u32| -> isize
-    43..44 'x': u32
+            43..44 'x': u32
-    46..51 '{ 1 }': isize
+            46..51 '{ 1 }': isize
-    48..49 '1': isize
+            48..49 '1': isize
-    "###
+        "]],
    );
 }
 #[test]
 fn coerce_placeholder_ref() {
    // placeholders should unify, even behind references
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r"
-struct S<T> { t: T }
+        struct S<T> { t: T }
-impl<TT> S<TT> {
+        impl<TT> S<TT> {
-    fn get(&self) -> &TT {
+            fn get(&self) -> &TT {
-        &self.t
+                &self.t
-    }
+            }
-}
+        }
-"#, true),
+        ",
-        @r###"
+        expect![[r"
-    50..54 'self': &S<TT>
+            50..54 'self': &S<TT>
-    63..86 '{     ...     }': &TT
+            63..86 '{     ...     }': &TT
-    73..80 '&self.t': &TT
+            73..80 '&self.t': &TT
-    74..78 'self': &S<TT>
+            74..78 'self': &S<TT>
-    74..80 'self.t': TT
+            74..80 'self.t': TT
-    "###
+        "]],
    );
 }
 #[test]
 fn coerce_unsize_array() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-#[lang = "unsize"]
+        #[lang = "unsize"]
-pub trait Unsize<T> {}
+        pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
+        #[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
+        pub trait CoerceUnsized<T> {}
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
-fn test() {
+        fn test() {
-    let f: &[usize] = &[1, 2, 3];
+            let f: &[usize] = &[1, 2, 3];
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r"
-    161..198 '{     ... 3]; }': ()
+            161..198 '{     ... 3]; }': ()
-    171..172 'f': &[usize]
+            171..172 'f': &[usize]
-    185..195 '&[1, 2, 3]': &[usize; _]
+            185..195 '&[1, 2, 3]': &[usize; _]
-    186..195 '[1, 2, 3]': [usize; _]
+            186..195 '[1, 2, 3]': [usize; _]
-    187..188 '1': usize
+            187..188 '1': usize
-    190..191 '2': usize
+            190..191 '2': usize
-    193..194 '3': usize
+            193..194 '3': usize
-    "###
+        "]],
    );
 }
 #[test]
-fn coerce_unsize_trait_object() {
+fn coerce_unsize_trait_object_simple() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-#[lang = "sized"]
+        #[lang = "sized"]
-pub trait Sized {}
+        pub trait Sized {}
-#[lang = "unsize"]
+        #[lang = "unsize"]
-pub trait Unsize<T> {}
+        pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
+        #[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
+        pub trait CoerceUnsized<T> {}
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
-trait Foo<T, U> {}
+        trait Foo<T, U> {}
-trait Bar<U, T, X>: Foo<T, U> {}
+        trait Bar<U, T, X>: Foo<T, U> {}
-trait Baz<T, X>: Bar<usize, T, X> {}
+        trait Baz<T, X>: Bar<usize, T, X> {}
-struct S<T, X>;
+        struct S<T, X>;
-impl<T, X> Foo<T, usize> for S<T, X> {}
+        impl<T, X> Foo<T, usize> for S<T, X> {}
-impl<T, X> Bar<usize, T, X> for S<T, X> {}
+        impl<T, X> Bar<usize, T, X> for S<T, X> {}
-impl<T, X> Baz<T, X> for S<T, X> {}
+        impl<T, X> Baz<T, X> for S<T, X> {}
-fn test() {
+        fn test() {
-    let obj: &dyn Baz<i8, i16> = &S;
+            let obj: &dyn Baz<i8, i16> = &S;
-    let obj: &dyn Bar<_, _, _> = obj;
+            let obj: &dyn Bar<_, i8, i16> = &S;
-    let obj: &dyn Foo<_, _> = obj;
+            let obj: &dyn Foo<i8, _> = &S;
-    let obj2: &dyn Baz<i8, i16> = &S;
+        }
-    let _: &dyn Foo<_, _> = obj2;
+        "#,
+        expect![[r"
+            424..539 '{     ... &S; }': ()
+            434..437 'obj': &dyn Baz<i8, i16>
+            459..461 '&S': &S<i8, i16>
+            460..461 'S': S<i8, i16>
+            471..474 'obj': &dyn Bar<usize, i8, i16>
+            499..501 '&S': &S<i8, i16>
+            500..501 'S': S<i8, i16>
+            511..514 'obj': &dyn Foo<i8, usize>
+            534..536 '&S': &S<i8, {unknown}>
+            535..536 'S': S<i8, {unknown}>
+        "]],
+    );
 }
-"#, true),
-        @r###"
+#[test]
-    424..609 '{     ...bj2; }': ()
+// The rust reference says this should be possible, but rustc doesn't implement
-    434..437 'obj': &dyn Baz<i8, i16>
+// it. We used to support it, but Chalk doesn't.
-    459..461 '&S': &S<i8, i16>
+#[ignore]
-    460..461 'S': S<i8, i16>
+fn coerce_unsize_trait_object_to_trait_object() {
-    471..474 'obj': &dyn Bar<usize, i8, i16>
+    check_infer_with_mismatches(
-    496..499 'obj': &dyn Baz<i8, i16>
+        r#"
-    509..512 'obj': &dyn Foo<i8, usize>
+        #[lang = "sized"]
-    531..534 'obj': &dyn Bar<usize, i8, i16>
+        pub trait Sized {}
-    544..548 'obj2': &dyn Baz<i8, i16>
+        #[lang = "unsize"]
-    570..572 '&S': &S<i8, i16>
+        pub trait Unsize<T> {}
-    571..572 'S': S<i8, i16>
+        #[lang = "coerce_unsized"]
-    582..583 '_': &dyn Foo<i8, usize>
+        pub trait CoerceUnsized<T> {}
-    602..606 'obj2': &dyn Baz<i8, i16>
-    "###
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+        trait Foo<T, U> {}
+        trait Bar<U, T, X>: Foo<T, U> {}
+        trait Baz<T, X>: Bar<usize, T, X> {}
+        struct S<T, X>;
+        impl<T, X> Foo<T, usize> for S<T, X> {}
+        impl<T, X> Bar<usize, T, X> for S<T, X> {}
+        impl<T, X> Baz<T, X> for S<T, X> {}
+        fn test() {
+            let obj: &dyn Baz<i8, i16> = &S;
+            let obj: &dyn Bar<_, _, _> = obj;
+            let obj: &dyn Foo<_, _> = obj;
+            let obj2: &dyn Baz<i8, i16> = &S;
+            let _: &dyn Foo<_, _> = obj2;
+        }
+        "#,
+        expect![[r"
+            424..609 '{     ...bj2; }': ()
+            434..437 'obj': &dyn Baz<i8, i16>
+            459..461 '&S': &S<i8, i16>
+            460..461 'S': S<i8, i16>
+            471..474 'obj': &dyn Bar<usize, i8, i16>
+            496..499 'obj': &dyn Baz<i8, i16>
+            509..512 'obj': &dyn Foo<i8, usize>
+            531..534 'obj': &dyn Bar<usize, i8, i16>
+            544..548 'obj2': &dyn Baz<i8, i16>
+            570..572 '&S': &S<i8, i16>
+            571..572 'S': S<i8, i16>
+            582..583 '_': &dyn Foo<i8, usize>
+            602..606 'obj2': &dyn Baz<i8, i16>
+        "]],
    );
 }
 #[test]
 fn coerce_unsize_super_trait_cycle() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-#[lang = "sized"]
+        #[lang = "sized"]
-pub trait Sized {}
+        pub trait Sized {}
-#[lang = "unsize"]
+        #[lang = "unsize"]
-pub trait Unsize<T> {}
+        pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
+        #[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
+        pub trait CoerceUnsized<T> {}
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
-trait A {}
+        trait A {}
-trait B: C + A {}
+        trait B: C + A {}
-trait C: B {}
+        trait C: B {}
-trait D: C
+        trait D: C
-struct S;
+        struct S;
-impl A for S {}
+        impl A for S {}
-impl B for S {}
+        impl B for S {}
-impl C for S {}
+        impl C for S {}
-impl D for S {}
+        impl D for S {}
-fn test() {
+        fn test() {
-    let obj: &dyn D = &S;
+            let obj: &dyn D = &S;
-    let obj: &dyn A = obj;
+            let obj: &dyn A = &S;
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r"
-    328..384 '{     ...obj; }': ()
+            328..383 '{     ... &S; }': ()
-    338..341 'obj': &dyn D
+            338..341 'obj': &dyn D
-    352..354 '&S': &S
+            352..354 '&S': &S
-    353..354 'S': S
+            353..354 'S': S
-    364..367 'obj': &dyn A
+            364..367 'obj': &dyn A
-    378..381 'obj': &dyn D
+            378..380 '&S': &S
-    "###
+            379..380 'S': S
+        "]],
    );
 }
@@ -754,24 +838,24 @@ fn test() {
 fn coerce_unsize_generic() {
    // FIXME: Implement this
    // https://doc.rust-lang.org/reference/type-coercions.html#unsized-coercions
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-#[lang = "unsize"]
+        #[lang = "unsize"]
-pub trait Unsize<T> {}
+        pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
+        #[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
+        pub trait CoerceUnsized<T> {}
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
-struct Foo<T> { t: T };
+        struct Foo<T> { t: T };
-struct Bar<T>(Foo<T>);
+        struct Bar<T>(Foo<T>);
-fn test() {
+        fn test() {
-    let _: &Foo<[usize]> = &Foo { t: [1, 2, 3] };
+            let _: &Foo<[usize]> = &Foo { t: [1, 2, 3] };
-    let _: &Bar<[usize]> = &Bar(Foo { t: [1, 2, 3] });
+            let _: &Bar<[usize]> = &Bar(Foo { t: [1, 2, 3] });
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r"
-    "###
+        "]],
    );
 }
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs
index 45c4e309e..24c53eb02 100644
--- a/crates/ra_hir_ty/src/tests/macros.rs
+++ b/crates/ra_hir_ty/src/tests/macros.rs
@@ -1,9 +1,9 @@
 use std::fs;
-use insta::assert_snapshot;
+use expect::expect;
 use test_utils::project_dir;
-use super::{check_types, infer};
+use super::{check_infer, check_types};
 #[test]
 fn cfg_impl_def() {
@@ -46,204 +46,204 @@ impl S {
 #[test]
 fn infer_macros_expanded() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Foo(Vec<i32>);
+        struct Foo(Vec<i32>);
-macro_rules! foo {
+        macro_rules! foo {
-    ($($item:expr),*) => {
+            ($($item:expr),*) => {
-            {
+                    {
-                Foo(vec![$($item,)*])
+                        Foo(vec![$($item,)*])
-            }
+                    }
-    };
+            };
-}
+        }
-fn main() {
+        fn main() {
-    let x = foo!(1,2);
+            let x = foo!(1,2);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..17 '{Foo(v...,2,])}': Foo
+            !0..17 '{Foo(v...,2,])}': Foo
-    !1..4 'Foo': Foo({unknown}) -> Foo
+            !1..4 'Foo': Foo({unknown}) -> Foo
-    !1..16 'Foo(vec![1,2,])': Foo
+            !1..16 'Foo(vec![1,2,])': Foo
-    !5..15 'vec![1,2,]': {unknown}
+            !5..15 'vec![1,2,]': {unknown}
-    155..181 '{     ...,2); }': ()
+            155..181 '{     ...,2); }': ()
-    165..166 'x': Foo
+            165..166 'x': Foo
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_legacy_textual_scoped_macros_expanded() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Foo(Vec<i32>);
+        struct Foo(Vec<i32>);
-#[macro_use]
+        #[macro_use]
-mod m {
+        mod m {
-    macro_rules! foo {
+            macro_rules! foo {
-        ($($item:expr),*) => {
+                ($($item:expr),*) => {
-            {
+                    {
-                Foo(vec![$($item,)*])
+                        Foo(vec![$($item,)*])
+                    }
+                };
            }
-        };
+        }
-    }
-}
-fn main() {
+        fn main() {
-    let x = foo!(1,2);
+            let x = foo!(1,2);
-    let y = crate::foo!(1,2);
+            let y = crate::foo!(1,2);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..17 '{Foo(v...,2,])}': Foo
+            !0..17 '{Foo(v...,2,])}': Foo
-    !1..4 'Foo': Foo({unknown}) -> Foo
+            !1..4 'Foo': Foo({unknown}) -> Foo
-    !1..16 'Foo(vec![1,2,])': Foo
+            !1..16 'Foo(vec![1,2,])': Foo
-    !5..15 'vec![1,2,]': {unknown}
+            !5..15 'vec![1,2,]': {unknown}
-    194..250 '{     ...,2); }': ()
+            194..250 '{     ...,2); }': ()
-    204..205 'x': Foo
+            204..205 'x': Foo
-    227..228 'y': {unknown}
+            227..228 'y': {unknown}
-    231..247 'crate:...!(1,2)': {unknown}
+            231..247 'crate:...!(1,2)': {unknown}
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_path_qualified_macros_expanded() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[macro_export]
+        #[macro_export]
-macro_rules! foo {
+        macro_rules! foo {
-    () => { 42i32 }
+            () => { 42i32 }
-}
+        }
-mod m {
+        mod m {
-    pub use super::foo as bar;
+            pub use super::foo as bar;
-}
+        }
-fn main() {
+        fn main() {
-    let x = crate::foo!();
+            let x = crate::foo!();
-    let y = m::bar!();
+            let y = m::bar!();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..5 '42i32': i32
+            !0..5 '42i32': i32
-    !0..5 '42i32': i32
+            !0..5 '42i32': i32
-    110..163 '{     ...!(); }': ()
+            110..163 '{     ...!(); }': ()
-    120..121 'x': i32
+            120..121 'x': i32
-    147..148 'y': i32
+            147..148 'y': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn expr_macro_expanded_in_various_places() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-macro_rules! spam {
+        macro_rules! spam {
-    () => (1isize);
+            () => (1isize);
-}
+        }
-fn spam() {
+        fn spam() {
-    spam!();
+            spam!();
-    (spam!());
+            (spam!());
-    spam!().spam(spam!());
+            spam!().spam(spam!());
-    for _ in spam!() {}
+            for _ in spam!() {}
-    || spam!();
+            || spam!();
-    while spam!() {}
+            while spam!() {}
-    break spam!();
+            break spam!();
-    return spam!();
+            return spam!();
-    match spam!() {
+            match spam!() {
-        _ if spam!() => spam!(),
+                _ if spam!() => spam!(),
-    }
+            }
-    spam!()(spam!());
+            spam!()(spam!());
-    Spam { spam: spam!() };
+            Spam { spam: spam!() };
-    spam!()[spam!()];
+            spam!()[spam!()];
-    await spam!();
+            await spam!();
-    spam!() as usize;
+            spam!() as usize;
-    &spam!();
+            &spam!();
-    -spam!();
+            -spam!();
-    spam!()..spam!();
+            spam!()..spam!();
-    spam!() + spam!();
+            spam!() + spam!();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    !0..6 '1isize': isize
+            !0..6 '1isize': isize
-    53..456 '{     ...!(); }': ()
+            53..456 '{     ...!(); }': ()
-    87..108 'spam!(...am!())': {unknown}
+            87..108 'spam!(...am!())': {unknown}
-    114..133 'for _ ...!() {}': ()
+            114..133 'for _ ...!() {}': ()
-    118..119 '_': {unknown}
+            118..119 '_': {unknown}
-    131..133 '{}': ()
+            131..133 '{}': ()
-    138..148 '|| spam!()': || -> isize
+            138..148 '|| spam!()': || -> isize
-    154..170 'while ...!() {}': ()
+            154..170 'while ...!() {}': ()
-    168..170 '{}': ()
+            168..170 '{}': ()
-    175..188 'break spam!()': !
+            175..188 'break spam!()': !
-    194..208 'return spam!()': !
+            194..208 'return spam!()': !
-    214..268 'match ...     }': isize
+            214..268 'match ...     }': isize
-    238..239 '_': isize
+            238..239 '_': isize
-    273..289 'spam!(...am!())': {unknown}
+            273..289 'spam!(...am!())': {unknown}
-    295..317 'Spam {...m!() }': {unknown}
+            295..317 'Spam {...m!() }': {unknown}
-    323..339 'spam!(...am!()]': {unknown}
+            323..339 'spam!(...am!()]': {unknown}
-    364..380 'spam!(... usize': usize
+            364..380 'spam!(... usize': usize
-    386..394 '&spam!()': &isize
+            386..394 '&spam!()': &isize
-    400..408 '-spam!()': isize
+            400..408 '-spam!()': isize
-    414..430 'spam!(...pam!()': {unknown}
+            414..430 'spam!(...pam!()': {unknown}
-    436..453 'spam!(...pam!()': isize
+            436..453 'spam!(...pam!()': isize
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_type_value_macro_having_same_name() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[macro_export]
+        #[macro_export]
-macro_rules! foo {
+        macro_rules! foo {
-    () => {
+            () => {
-        mod foo {
+                mod foo {
-            pub use super::foo;
+                    pub use super::foo;
+                }
+            };
+            ($x:tt) => {
+                $x
+            };
        }
-    };
-    ($x:tt) => {
-        $x
-    };
-}
-foo!();
+        foo!();
-fn foo() {
+        fn foo() {
-    let foo = foo::foo!(42i32);
+            let foo = foo::foo!(42i32);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..5 '42i32': i32
+            !0..5 '42i32': i32
-    170..205 '{     ...32); }': ()
+            170..205 '{     ...32); }': ()
-    180..183 'foo': i32
+            180..183 'foo': i32
-    "###
+        "#]],
    );
 }
@@ -372,50 +372,50 @@ expand!();
 #[test]
 fn infer_type_value_non_legacy_macro_use_as() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-mod m {
+        mod m {
-    macro_rules! _foo {
+            macro_rules! _foo {
-        ($x:ident) => { type $x = u64; }
+                ($x:ident) => { type $x = u64; }
-    }
+            }
-    pub(crate) use _foo as foo;
+            pub(crate) use _foo as foo;
-}
+        }
-m::foo!(foo);
+        m::foo!(foo);
-use foo as bar;
+        use foo as bar;
-fn f() -> bar { 0 }
+        fn f() -> bar { 0 }
-fn main() {
+        fn main() {
-    let _a  = f();
+            let _a  = f();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    158..163 '{ 0 }': u64
+            158..163 '{ 0 }': u64
-    160..161 '0': u64
+            160..161 '0': u64
-    174..196 '{     ...f(); }': ()
+            174..196 '{     ...f(); }': ()
-    184..186 '_a': u64
+            184..186 '_a': u64
-    190..191 'f': fn f() -> u64
+            190..191 'f': fn f() -> u64
-    190..193 'f()': u64
+            190..193 'f()': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_local_macro() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn main() {
+        fn main() {
-    macro_rules! foo {
+            macro_rules! foo {
-        () => { 1usize }
+                () => { 1usize }
-    }
+            }
-    let _a  = foo!();
+            let _a  = foo!();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..6 '1usize': usize
+            !0..6 '1usize': usize
-    10..89 '{     ...!(); }': ()
+            10..89 '{     ...!(); }': ()
-    16..65 'macro_...     }': {unknown}
+            16..65 'macro_...     }': {unknown}
-    74..76 '_a': usize
+            74..76 '_a': usize
-    "###
+        "#]],
    );
 }
@@ -446,77 +446,77 @@ macro_rules! bar {
 #[test]
 fn infer_builtin_macros_line() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[rustc_builtin_macro]
+        #[rustc_builtin_macro]
-macro_rules! line {() => {}}
+        macro_rules! line {() => {}}
-fn main() {
+        fn main() {
-    let x = line!();
+            let x = line!();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..1 '0': i32
+            !0..1 '0': i32
-    63..87 '{     ...!(); }': ()
+            63..87 '{     ...!(); }': ()
-    73..74 'x': i32
+            73..74 'x': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_builtin_macros_file() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[rustc_builtin_macro]
+        #[rustc_builtin_macro]
-macro_rules! file {() => {}}
+        macro_rules! file {() => {}}
-fn main() {
+        fn main() {
-    let x = file!();
+            let x = file!();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..2 '""': &str
+            !0..2 '""': &str
-    63..87 '{     ...!(); }': ()
+            63..87 '{     ...!(); }': ()
-    73..74 'x': &str
+            73..74 'x': &str
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_builtin_macros_column() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[rustc_builtin_macro]
+        #[rustc_builtin_macro]
-macro_rules! column {() => {}}
+        macro_rules! column {() => {}}
-fn main() {
+        fn main() {
-    let x = column!();
+            let x = column!();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..1 '0': i32
+            !0..1 '0': i32
-    65..91 '{     ...!(); }': ()
+            65..91 '{     ...!(); }': ()
-    75..76 'x': i32
+            75..76 'x': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_builtin_macros_concat() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[rustc_builtin_macro]
+        #[rustc_builtin_macro]
-macro_rules! concat {() => {}}
+        macro_rules! concat {() => {}}
-fn main() {
+        fn main() {
-    let x = concat!("hello", concat!("world", "!"));
+            let x = concat!("hello", concat!("world", "!"));
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..13 '"helloworld!"': &str
+            !0..13 '"helloworld!"': &str
-    65..121 '{     ...")); }': ()
+            65..121 '{     ...")); }': ()
-    75..76 'x': &str
+            75..76 'x': &str
-    "###
+        "#]],
    );
 }
@@ -622,7 +622,7 @@ macro_rules! include {() => {}}
 include!("main.rs");
 fn main() {
-    0
+            0
 } //^ i32
 "#,
    );
@@ -630,42 +630,42 @@ fn main() {
 #[test]
 fn infer_builtin_macros_concat_with_lazy() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-macro_rules! hello {() => {"hello"}}
+        macro_rules! hello {() => {"hello"}}
-#[rustc_builtin_macro]
+        #[rustc_builtin_macro]
-macro_rules! concat {() => {}}
+        macro_rules! concat {() => {}}
-fn main() {
+        fn main() {
-    let x = concat!(hello!(), concat!("world", "!"));
+            let x = concat!(hello!(), concat!("world", "!"));
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..13 '"helloworld!"': &str
+            !0..13 '"helloworld!"': &str
-    103..160 '{     ...")); }': ()
+            103..160 '{     ...")); }': ()
-    113..114 'x': &str
+            113..114 'x': &str
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_builtin_macros_env() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-//- /main.rs env:foo=bar
+        //- /main.rs env:foo=bar
-#[rustc_builtin_macro]
+        #[rustc_builtin_macro]
-macro_rules! env {() => {}}
+        macro_rules! env {() => {}}
-fn main() {
+        fn main() {
-    let x = env!("foo");
+            let x = env!("foo");
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..22 '"__RA_...TED__"': &str
+            !0..22 '"__RA_...TED__"': &str
-    62..90 '{     ...o"); }': ()
+            62..90 '{     ...o"); }': ()
-    72..73 'x': &str
+            72..73 'x': &str
-    "###
+        "#]],
    );
 }
@@ -763,25 +763,25 @@ fn test() {
 #[test]
 fn macro_in_arm() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-macro_rules! unit {
+        macro_rules! unit {
-    () => { () };
+            () => { () };
-}
+        }
-fn main() {
+        fn main() {
-    let x = match () {
+            let x = match () {
-        unit!() => 92u32,
+                unit!() => 92u32,
-    };
+            };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    51..110 '{     ...  }; }': ()
+            51..110 '{     ...  }; }': ()
-    61..62 'x': u32
+            61..62 'x': u32
-    65..107 'match ...     }': u32
+            65..107 'match ...     }': u32
-    71..73 '()': ()
+            71..73 '()': ()
-    84..91 'unit!()': ()
+            84..91 'unit!()': ()
-    95..100 '92u32': u32
+            95..100 '92u32': u32
-    "###
+        "#]],
    );
 }
diff --git a/crates/ra_hir_ty/src/tests/method_resolution.rs b/crates/ra_hir_ty/src/tests/method_resolution.rs
index 9c8f22314..fa68355aa 100644
--- a/crates/ra_hir_ty/src/tests/method_resolution.rs
+++ b/crates/ra_hir_ty/src/tests/method_resolution.rs
@@ -1,245 +1,245 @@
-use insta::assert_snapshot;
+use expect::expect;
-use super::{check_types, infer};
+use super::{check_infer, check_types};
 #[test]
 fn infer_slice_method() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang = "slice"]
+        #[lang = "slice"]
-impl<T> [T] {
+        impl<T> [T] {
-    fn foo(&self) -> T {
+            fn foo(&self) -> T {
-        loop {}
+                loop {}
-    }
+            }
-}
+        }
-#[lang = "slice_alloc"]
+        #[lang = "slice_alloc"]
-impl<T> [T] {}
+        impl<T> [T] {}
-fn test(x: &[u8]) {
+        fn test(x: &[u8]) {
-    <[_]>::foo(x);
+            <[_]>::foo(x);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    44..48 'self': &[T]
+            44..48 'self': &[T]
-    55..78 '{     ...     }': T
+            55..78 '{     ...     }': T
-    65..72 'loop {}': !
+            65..72 'loop {}': !
-    70..72 '{}': ()
+            70..72 '{}': ()
-    130..131 'x': &[u8]
+            130..131 'x': &[u8]
-    140..162 '{     ...(x); }': ()
+            140..162 '{     ...(x); }': ()
-    146..156 '<[_]>::foo': fn foo<u8>(&[u8]) -> u8
+            146..156 '<[_]>::foo': fn foo<u8>(&[u8]) -> u8
-    146..159 '<[_]>::foo(x)': u8
+            146..159 '<[_]>::foo(x)': u8
-    157..158 'x': &[u8]
+            157..158 'x': &[u8]
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_associated_method_struct() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A { x: u32 }
+        struct A { x: u32 }
-impl A {
+        impl A {
-    fn new() -> A {
+            fn new() -> A {
-        A { x: 0 }
+                A { x: 0 }
-    }
+            }
-}
+        }
-fn test() {
+        fn test() {
-    let a = A::new();
+            let a = A::new();
-    a.x;
+            a.x;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    48..74 '{     ...     }': A
+            48..74 '{     ...     }': A
-    58..68 'A { x: 0 }': A
+            58..68 'A { x: 0 }': A
-    65..66 '0': u32
+            65..66 '0': u32
-    87..121 '{     ...a.x; }': ()
+            87..121 '{     ...a.x; }': ()
-    97..98 'a': A
+            97..98 'a': A
-    101..107 'A::new': fn new() -> A
+            101..107 'A::new': fn new() -> A
-    101..109 'A::new()': A
+            101..109 'A::new()': A
-    115..116 'a': A
+            115..116 'a': A
-    115..118 'a.x': u32
+            115..118 'a.x': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_associated_method_enum() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum A { B, C }
+        enum A { B, C }
-impl A {
+        impl A {
-    pub fn b() -> A {
+            pub fn b() -> A {
-        A::B
+                A::B
-    }
+            }
-    pub fn c() -> A {
+            pub fn c() -> A {
-        A::C
+                A::C
-    }
+            }
-}
+        }
-fn test() {
+        fn test() {
-    let a = A::b();
+            let a = A::b();
-    a;
+            a;
-    let c = A::c();
+            let c = A::c();
-    c;
+            c;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    46..66 '{     ...     }': A
+            46..66 '{     ...     }': A
-    56..60 'A::B': A
+            56..60 'A::B': A
-    87..107 '{     ...     }': A
+            87..107 '{     ...     }': A
-    97..101 'A::C': A
+            97..101 'A::C': A
-    120..177 '{     ...  c; }': ()
+            120..177 '{     ...  c; }': ()
-    130..131 'a': A
+            130..131 'a': A
-    134..138 'A::b': fn b() -> A
+            134..138 'A::b': fn b() -> A
-    134..140 'A::b()': A
+            134..140 'A::b()': A
-    146..147 'a': A
+            146..147 'a': A
-    157..158 'c': A
+            157..158 'c': A
-    161..165 'A::c': fn c() -> A
+            161..165 'A::c': fn c() -> A
-    161..167 'A::c()': A
+            161..167 'A::c()': A
-    173..174 'c': A
+            173..174 'c': A
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_associated_method_with_modules() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-mod a {
+        mod a {
-    struct A;
+            struct A;
-    impl A { pub fn thing() -> A { A {} }}
+            impl A { pub fn thing() -> A { A {} }}
-}
+        }
-mod b {
+        mod b {
-    struct B;
+            struct B;
-    impl B { pub fn thing() -> u32 { 99 }}
+            impl B { pub fn thing() -> u32 { 99 }}
-    mod c {
+            mod c {
-        struct C;
+                struct C;
-        impl C { pub fn thing() -> C { C {} }}
+                impl C { pub fn thing() -> C { C {} }}
-    }
+            }
-}
+        }
-use b::c;
+        use b::c;
-fn test() {
+        fn test() {
-    let x = a::A::thing();
+            let x = a::A::thing();
-    let y = b::B::thing();
+            let y = b::B::thing();
-    let z = c::C::thing();
+            let z = c::C::thing();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    55..63 '{ A {} }': A
+            55..63 '{ A {} }': A
-    57..61 'A {}': A
+            57..61 'A {}': A
-    125..131 '{ 99 }': u32
+            125..131 '{ 99 }': u32
-    127..129 '99': u32
+            127..129 '99': u32
-    201..209 '{ C {} }': C
+            201..209 '{ C {} }': C
-    203..207 'C {}': C
+            203..207 'C {}': C
-    240..324 '{     ...g(); }': ()
+            240..324 '{     ...g(); }': ()
-    250..251 'x': A
+            250..251 'x': A
-    254..265 'a::A::thing': fn thing() -> A
+            254..265 'a::A::thing': fn thing() -> A
-    254..267 'a::A::thing()': A
+            254..267 'a::A::thing()': A
-    277..278 'y': u32
+            277..278 'y': u32
-    281..292 'b::B::thing': fn thing() -> u32
+            281..292 'b::B::thing': fn thing() -> u32
-    281..294 'b::B::thing()': u32
+            281..294 'b::B::thing()': u32
-    304..305 'z': C
+            304..305 'z': C
-    308..319 'c::C::thing': fn thing() -> C
+            308..319 'c::C::thing': fn thing() -> C
-    308..321 'c::C::thing()': C
+            308..321 'c::C::thing()': C
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_associated_method_generics() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Gen<T> {
+        struct Gen<T> {
-    val: T
+            val: T
-}
+        }
-impl<T> Gen<T> {
+        impl<T> Gen<T> {
-    pub fn make(val: T) -> Gen<T> {
+            pub fn make(val: T) -> Gen<T> {
-        Gen { val }
+                Gen { val }
-    }
+            }
-}
+        }
-fn test() {
+        fn test() {
-    let a = Gen::make(0u32);
+            let a = Gen::make(0u32);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    63..66 'val': T
+            63..66 'val': T
-    81..108 '{     ...     }': Gen<T>
+            81..108 '{     ...     }': Gen<T>
-    91..102 'Gen { val }': Gen<T>
+            91..102 'Gen { val }': Gen<T>
-    97..100 'val': T
+            97..100 'val': T
-    122..154 '{     ...32); }': ()
+            122..154 '{     ...32); }': ()
-    132..133 'a': Gen<u32>
+            132..133 'a': Gen<u32>
-    136..145 'Gen::make': fn make<u32>(u32) -> Gen<u32>
+            136..145 'Gen::make': fn make<u32>(u32) -> Gen<u32>
-    136..151 'Gen::make(0u32)': Gen<u32>
+            136..151 'Gen::make(0u32)': Gen<u32>
-    146..150 '0u32': u32
+            146..150 '0u32': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_associated_method_generics_without_args() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Gen<T> {
+        struct Gen<T> {
-    val: T
+            val: T
-}
+        }
-impl<T> Gen<T> {
+        impl<T> Gen<T> {
-    pub fn make() -> Gen<T> {
+            pub fn make() -> Gen<T> {
-        loop { }
+                loop { }
-    }
+            }
-}
+        }
-fn test() {
+        fn test() {
-    let a = Gen::<u32>::make();
+            let a = Gen::<u32>::make();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    75..99 '{     ...     }': Gen<T>
+            75..99 '{     ...     }': Gen<T>
-    85..93 'loop { }': !
+            85..93 'loop { }': !
-    90..93 '{ }': ()
+            90..93 '{ }': ()
-    113..148 '{     ...e(); }': ()
+            113..148 '{     ...e(); }': ()
-    123..124 'a': Gen<u32>
+            123..124 'a': Gen<u32>
-    127..143 'Gen::<...::make': fn make<u32>() -> Gen<u32>
+            127..143 'Gen::<...::make': fn make<u32>() -> Gen<u32>
-    127..145 'Gen::<...make()': Gen<u32>
+            127..145 'Gen::<...make()': Gen<u32>
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_associated_method_generics_2_type_params_without_args() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Gen<T, U> {
+        struct Gen<T, U> {
-    val: T,
+            val: T,
-    val2: U,
+            val2: U,
-}
+        }
-impl<T> Gen<u32, T> {
+        impl<T> Gen<u32, T> {
-    pub fn make() -> Gen<u32,T> {
+            pub fn make() -> Gen<u32,T> {
-        loop { }
+                loop { }
-    }
+            }
-}
+        }
-fn test() {
+        fn test() {
-    let a = Gen::<u32, u64>::make();
+            let a = Gen::<u32, u64>::make();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    101..125 '{     ...     }': Gen<u32, T>
+            101..125 '{     ...     }': Gen<u32, T>
-    111..119 'loop { }': !
+            111..119 'loop { }': !
-    116..119 '{ }': ()
+            116..119 '{ }': ()
-    139..179 '{     ...e(); }': ()
+            139..179 '{     ...e(); }': ()
-    149..150 'a': Gen<u32, u64>
+            149..150 'a': Gen<u32, u64>
-    153..174 'Gen::<...::make': fn make<u64>() -> Gen<u32, u64>
+            153..174 'Gen::<...::make': fn make<u64>() -> Gen<u32, u64>
-    153..176 'Gen::<...make()': Gen<u32, u64>
+            153..176 'Gen::<...make()': Gen<u32, u64>
-    "###
+        "#]],
    );
 }
@@ -267,416 +267,416 @@ mod foo {
 #[test]
 fn infer_trait_method_simple() {
    // the trait implementation is intentionally incomplete -- it shouldn't matter
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait1 {
+        trait Trait1 {
-    fn method(&self) -> u32;
+            fn method(&self) -> u32;
-}
+        }
-struct S1;
+        struct S1;
-impl Trait1 for S1 {}
+        impl Trait1 for S1 {}
-trait Trait2 {
+        trait Trait2 {
-    fn method(&self) -> i128;
+            fn method(&self) -> i128;
-}
+        }
-struct S2;
+        struct S2;
-impl Trait2 for S2 {}
+        impl Trait2 for S2 {}
-fn test() {
+        fn test() {
-    S1.method(); // -> u32
+            S1.method(); // -> u32
-    S2.method(); // -> i128
+            S2.method(); // -> i128
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    30..34 'self': &Self
+            30..34 'self': &Self
-    109..113 'self': &Self
+            109..113 'self': &Self
-    169..227 '{     ...i128 }': ()
+            169..227 '{     ...i128 }': ()
-    175..177 'S1': S1
+            175..177 'S1': S1
-    175..186 'S1.method()': u32
+            175..186 'S1.method()': u32
-    202..204 'S2': S2
+            202..204 'S2': S2
-    202..213 'S2.method()': i128
+            202..213 'S2.method()': i128
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_method_scoped() {
    // the trait implementation is intentionally incomplete -- it shouldn't matter
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct S;
+        struct S;
-mod foo {
+        mod foo {
-    pub trait Trait1 {
+            pub trait Trait1 {
-        fn method(&self) -> u32;
+                fn method(&self) -> u32;
-    }
+            }
-    impl Trait1 for super::S {}
+            impl Trait1 for super::S {}
-}
+        }
-mod bar {
+        mod bar {
-    pub trait Trait2 {
+            pub trait Trait2 {
-        fn method(&self) -> i128;
+                fn method(&self) -> i128;
-    }
+            }
-    impl Trait2 for super::S {}
+            impl Trait2 for super::S {}
-}
+        }
-mod foo_test {
+        mod foo_test {
-    use super::S;
+            use super::S;
-    use super::foo::Trait1;
+            use super::foo::Trait1;
-    fn test() {
+            fn test() {
-        S.method(); // -> u32
+                S.method(); // -> u32
-    }
+            }
-}
+        }
-mod bar_test {
+        mod bar_test {
-    use super::S;
+            use super::S;
-    use super::bar::Trait2;
+            use super::bar::Trait2;
-    fn test() {
+            fn test() {
-        S.method(); // -> i128
+                S.method(); // -> i128
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    62..66 'self': &Self
+            62..66 'self': &Self
-    168..172 'self': &Self
+            168..172 'self': &Self
-    299..336 '{     ...     }': ()
+            299..336 '{     ...     }': ()
-    309..310 'S': S
+            309..310 'S': S
-    309..319 'S.method()': u32
+            309..319 'S.method()': u32
-    415..453 '{     ...     }': ()
+            415..453 '{     ...     }': ()
-    425..426 'S': S
+            425..426 'S': S
-    425..435 'S.method()': i128
+            425..435 'S.method()': i128
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_method_generic_1() {
    // the trait implementation is intentionally incomplete -- it shouldn't matter
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn method(&self) -> T;
+            fn method(&self) -> T;
-}
+        }
-struct S;
+        struct S;
-impl Trait<u32> for S {}
+        impl Trait<u32> for S {}
-fn test() {
+        fn test() {
-    S.method();
+            S.method();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    32..36 'self': &Self
+            32..36 'self': &Self
-    91..110 '{     ...d(); }': ()
+            91..110 '{     ...d(); }': ()
-    97..98 'S': S
+            97..98 'S': S
-    97..107 'S.method()': u32
+            97..107 'S.method()': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_method_generic_more_params() {
    // the trait implementation is intentionally incomplete -- it shouldn't matter
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T1, T2, T3> {
+        trait Trait<T1, T2, T3> {
-    fn method1(&self) -> (T1, T2, T3);
+            fn method1(&self) -> (T1, T2, T3);
-    fn method2(&self) -> (T3, T2, T1);
+            fn method2(&self) -> (T3, T2, T1);
-}
+        }
-struct S1;
+        struct S1;
-impl Trait<u8, u16, u32> for S1 {}
+        impl Trait<u8, u16, u32> for S1 {}
-struct S2;
+        struct S2;
-impl<T> Trait<i8, i16, T> for S2 {}
+        impl<T> Trait<i8, i16, T> for S2 {}
-fn test() {
+        fn test() {
-    S1.method1(); // u8, u16, u32
+            S1.method1(); // u8, u16, u32
-    S1.method2(); // u32, u16, u8
+            S1.method2(); // u32, u16, u8
-    S2.method1(); // i8, i16, {unknown}
+            S2.method1(); // i8, i16, {unknown}
-    S2.method2(); // {unknown}, i16, i8
+            S2.method2(); // {unknown}, i16, i8
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    42..46 'self': &Self
+            42..46 'self': &Self
-    81..85 'self': &Self
+            81..85 'self': &Self
-    209..360 '{     ..., i8 }': ()
+            209..360 '{     ..., i8 }': ()
-    215..217 'S1': S1
+            215..217 'S1': S1
-    215..227 'S1.method1()': (u8, u16, u32)
+            215..227 'S1.method1()': (u8, u16, u32)
-    249..251 'S1': S1
+            249..251 'S1': S1
-    249..261 'S1.method2()': (u32, u16, u8)
+            249..261 'S1.method2()': (u32, u16, u8)
-    283..285 'S2': S2
+            283..285 'S2': S2
-    283..295 'S2.method1()': (i8, i16, {unknown})
+            283..295 'S2.method1()': (i8, i16, {unknown})
-    323..325 'S2': S2
+            323..325 'S2': S2
-    323..335 'S2.method2()': ({unknown}, i16, i8)
+            323..335 'S2.method2()': ({unknown}, i16, i8)
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_method_generic_2() {
    // the trait implementation is intentionally incomplete -- it shouldn't matter
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn method(&self) -> T;
+            fn method(&self) -> T;
-}
+        }
-struct S<T>(T);
+        struct S<T>(T);
-impl<U> Trait<U> for S<U> {}
+        impl<U> Trait<U> for S<U> {}
-fn test() {
+        fn test() {
-    S(1u32).method();
+            S(1u32).method();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    32..36 'self': &Self
+            32..36 'self': &Self
-    101..126 '{     ...d(); }': ()
+            101..126 '{     ...d(); }': ()
-    107..108 'S': S<u32>(u32) -> S<u32>
+            107..108 'S': S<u32>(u32) -> S<u32>
-    107..114 'S(1u32)': S<u32>
+            107..114 'S(1u32)': S<u32>
-    107..123 'S(1u32...thod()': u32
+            107..123 'S(1u32...thod()': u32
-    109..113 '1u32': u32
+            109..113 '1u32': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_assoc_method() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Default {
+        trait Default {
-    fn default() -> Self;
+            fn default() -> Self;
-}
+        }
-struct S;
+        struct S;
-impl Default for S {}
+        impl Default for S {}
-fn test() {
+        fn test() {
-    let s1: S = Default::default();
+            let s1: S = Default::default();
-    let s2 = S::default();
+            let s2 = S::default();
-    let s3 = <S as Default>::default();
+            let s3 = <S as Default>::default();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    86..192 '{     ...t(); }': ()
+            86..192 '{     ...t(); }': ()
-    96..98 's1': S
+            96..98 's1': S
-    104..120 'Defaul...efault': fn default<S>() -> S
+            104..120 'Defaul...efault': fn default<S>() -> S
-    104..122 'Defaul...ault()': S
+            104..122 'Defaul...ault()': S
-    132..134 's2': S
+            132..134 's2': S
-    137..147 'S::default': fn default<S>() -> S
+            137..147 'S::default': fn default<S>() -> S
-    137..149 'S::default()': S
+            137..149 'S::default()': S
-    159..161 's3': S
+            159..161 's3': S
-    164..187 '<S as ...efault': fn default<S>() -> S
+            164..187 '<S as ...efault': fn default<S>() -> S
-    164..189 '<S as ...ault()': S
+            164..189 '<S as ...ault()': S
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_assoc_method_generics_1() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn make() -> T;
+            fn make() -> T;
-}
+        }
-struct S;
+        struct S;
-impl Trait<u32> for S {}
+        impl Trait<u32> for S {}
-struct G<T>;
+        struct G<T>;
-impl<T> Trait<T> for G<T> {}
+        impl<T> Trait<T> for G<T> {}
-fn test() {
+        fn test() {
-    let a = S::make();
+            let a = S::make();
-    let b = G::<u64>::make();
+            let b = G::<u64>::make();
-    let c: f64 = G::make();
+            let c: f64 = G::make();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    126..210 '{     ...e(); }': ()
+            126..210 '{     ...e(); }': ()
-    136..137 'a': u32
+            136..137 'a': u32
-    140..147 'S::make': fn make<S, u32>() -> u32
+            140..147 'S::make': fn make<S, u32>() -> u32
-    140..149 'S::make()': u32
+            140..149 'S::make()': u32
-    159..160 'b': u64
+            159..160 'b': u64
-    163..177 'G::<u64>::make': fn make<G<u64>, u64>() -> u64
+            163..177 'G::<u64>::make': fn make<G<u64>, u64>() -> u64
-    163..179 'G::<u6...make()': u64
+            163..179 'G::<u6...make()': u64
-    189..190 'c': f64
+            189..190 'c': f64
-    198..205 'G::make': fn make<G<f64>, f64>() -> f64
+            198..205 'G::make': fn make<G<f64>, f64>() -> f64
-    198..207 'G::make()': f64
+            198..207 'G::make()': f64
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_assoc_method_generics_2() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn make<U>() -> (T, U);
+            fn make<U>() -> (T, U);
-}
+        }
-struct S;
+        struct S;
-impl Trait<u32> for S {}
+        impl Trait<u32> for S {}
-struct G<T>;
+        struct G<T>;
-impl<T> Trait<T> for G<T> {}
+        impl<T> Trait<T> for G<T> {}
-fn test() {
+        fn test() {
-    let a = S::make::<i64>();
+            let a = S::make::<i64>();
-    let b: (_, i64) = S::make();
+            let b: (_, i64) = S::make();
-    let c = G::<u32>::make::<i64>();
+            let c = G::<u32>::make::<i64>();
-    let d: (u32, _) = G::make::<i64>();
+            let d: (u32, _) = G::make::<i64>();
-    let e: (u32, i64) = G::make();
+            let e: (u32, i64) = G::make();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    134..312 '{     ...e(); }': ()
+            134..312 '{     ...e(); }': ()
-    144..145 'a': (u32, i64)
+            144..145 'a': (u32, i64)
-    148..162 'S::make::<i64>': fn make<S, u32, i64>() -> (u32, i64)
+            148..162 'S::make::<i64>': fn make<S, u32, i64>() -> (u32, i64)
-    148..164 'S::mak...i64>()': (u32, i64)
+            148..164 'S::mak...i64>()': (u32, i64)
-    174..175 'b': (u32, i64)
+            174..175 'b': (u32, i64)
-    188..195 'S::make': fn make<S, u32, i64>() -> (u32, i64)
+            188..195 'S::make': fn make<S, u32, i64>() -> (u32, i64)
-    188..197 'S::make()': (u32, i64)
+            188..197 'S::make()': (u32, i64)
-    207..208 'c': (u32, i64)
+            207..208 'c': (u32, i64)
-    211..232 'G::<u3...:<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
+            211..232 'G::<u3...:<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
-    211..234 'G::<u3...i64>()': (u32, i64)
+            211..234 'G::<u3...i64>()': (u32, i64)
-    244..245 'd': (u32, i64)
+            244..245 'd': (u32, i64)
-    258..272 'G::make::<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
+            258..272 'G::make::<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
-    258..274 'G::mak...i64>()': (u32, i64)
+            258..274 'G::mak...i64>()': (u32, i64)
-    284..285 'e': (u32, i64)
+            284..285 'e': (u32, i64)
-    300..307 'G::make': fn make<G<u32>, u32, i64>() -> (u32, i64)
+            300..307 'G::make': fn make<G<u32>, u32, i64>() -> (u32, i64)
-    300..309 'G::make()': (u32, i64)
+            300..309 'G::make()': (u32, i64)
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_assoc_method_generics_3() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn make() -> (Self, T);
+            fn make() -> (Self, T);
-}
+        }
-struct S<T>;
+        struct S<T>;
-impl Trait<i64> for S<i32> {}
+        impl Trait<i64> for S<i32> {}
-fn test() {
+        fn test() {
-    let a = S::make();
+            let a = S::make();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    100..126 '{     ...e(); }': ()
+            100..126 '{     ...e(); }': ()
-    110..111 'a': (S<i32>, i64)
+            110..111 'a': (S<i32>, i64)
-    114..121 'S::make': fn make<S<i32>, i64>() -> (S<i32>, i64)
+            114..121 'S::make': fn make<S<i32>, i64>() -> (S<i32>, i64)
-    114..123 'S::make()': (S<i32>, i64)
+            114..123 'S::make()': (S<i32>, i64)
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_assoc_method_generics_4() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn make() -> (Self, T);
+            fn make() -> (Self, T);
-}
+        }
-struct S<T>;
+        struct S<T>;
-impl Trait<i64> for S<u64> {}
+        impl Trait<i64> for S<u64> {}
-impl Trait<i32> for S<u32> {}
+        impl Trait<i32> for S<u32> {}
-fn test() {
+        fn test() {
-    let a: (S<u64>, _) = S::make();
+            let a: (S<u64>, _) = S::make();
-    let b: (_, i32) = S::make();
+            let b: (_, i32) = S::make();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    130..202 '{     ...e(); }': ()
+            130..202 '{     ...e(); }': ()
-    140..141 'a': (S<u64>, i64)
+            140..141 'a': (S<u64>, i64)
-    157..164 'S::make': fn make<S<u64>, i64>() -> (S<u64>, i64)
+            157..164 'S::make': fn make<S<u64>, i64>() -> (S<u64>, i64)
-    157..166 'S::make()': (S<u64>, i64)
+            157..166 'S::make()': (S<u64>, i64)
-    176..177 'b': (S<u32>, i32)
+            176..177 'b': (S<u32>, i32)
-    190..197 'S::make': fn make<S<u32>, i32>() -> (S<u32>, i32)
+            190..197 'S::make': fn make<S<u32>, i32>() -> (S<u32>, i32)
-    190..199 'S::make()': (S<u32>, i32)
+            190..199 'S::make()': (S<u32>, i32)
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_trait_assoc_method_generics_5() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn make<U>() -> (Self, T, U);
+            fn make<U>() -> (Self, T, U);
-}
+        }
-struct S<T>;
+        struct S<T>;
-impl Trait<i64> for S<u64> {}
+        impl Trait<i64> for S<u64> {}
-fn test() {
+        fn test() {
-    let a = <S as Trait<i64>>::make::<u8>();
+            let a = <S as Trait<i64>>::make::<u8>();
-    let b: (S<u64>, _, _) = Trait::<i64>::make::<u8>();
+            let b: (S<u64>, _, _) = Trait::<i64>::make::<u8>();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    106..210 '{     ...>(); }': ()
+            106..210 '{     ...>(); }': ()
-    116..117 'a': (S<u64>, i64, u8)
+            116..117 'a': (S<u64>, i64, u8)
-    120..149 '<S as ...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
+            120..149 '<S as ...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
-    120..151 '<S as ...<u8>()': (S<u64>, i64, u8)
+            120..151 '<S as ...<u8>()': (S<u64>, i64, u8)
-    161..162 'b': (S<u64>, i64, u8)
+            161..162 'b': (S<u64>, i64, u8)
-    181..205 'Trait:...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
+            181..205 'Trait:...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
-    181..207 'Trait:...<u8>()': (S<u64>, i64, u8)
+            181..207 'Trait:...<u8>()': (S<u64>, i64, u8)
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_call_trait_method_on_generic_param_1() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait {
+        trait Trait {
-    fn method(&self) -> u32;
+            fn method(&self) -> u32;
-}
+        }
-fn test<T: Trait>(t: T) {
+        fn test<T: Trait>(t: T) {
-    t.method();
+            t.method();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    29..33 'self': &Self
+            29..33 'self': &Self
-    63..64 't': T
+            63..64 't': T
-    69..88 '{     ...d(); }': ()
+            69..88 '{     ...d(); }': ()
-    75..76 't': T
+            75..76 't': T
-    75..85 't.method()': u32
+            75..85 't.method()': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_call_trait_method_on_generic_param_2() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn method(&self) -> T;
+            fn method(&self) -> T;
-}
+        }
-fn test<U, T: Trait<U>>(t: T) {
+        fn test<U, T: Trait<U>>(t: T) {
-    t.method();
+            t.method();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    32..36 'self': &Self
+            32..36 'self': &Self
-    70..71 't': T
+            70..71 't': T
-    76..95 '{     ...d(); }': ()
+            76..95 '{     ...d(); }': ()
-    82..83 't': T
+            82..83 't': T
-    82..92 't.method()': U
+            82..92 't.method()': U
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_with_multiple_trait_impls() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Into<T> {
+        trait Into<T> {
-    fn into(self) -> T;
+            fn into(self) -> T;
-}
+        }
-struct S;
+        struct S;
-impl Into<u32> for S {}
+        impl Into<u32> for S {}
-impl Into<u64> for S {}
+        impl Into<u64> for S {}
-fn test() {
+        fn test() {
-    let x: u32 = S.into();
+            let x: u32 = S.into();
-    let y: u64 = S.into();
+            let y: u64 = S.into();
-    let z = Into::<u64>::into(S);
+            let z = Into::<u64>::into(S);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    28..32 'self': Self
+            28..32 'self': Self
-    110..201 '{     ...(S); }': ()
+            110..201 '{     ...(S); }': ()
-    120..121 'x': u32
+            120..121 'x': u32
-    129..130 'S': S
+            129..130 'S': S
-    129..137 'S.into()': u32
+            129..137 'S.into()': u32
-    147..148 'y': u64
+            147..148 'y': u64
-    156..157 'S': S
+            156..157 'S': S
-    156..164 'S.into()': u64
+            156..164 'S.into()': u64
-    174..175 'z': u64
+            174..175 'z': u64
-    178..195 'Into::...::into': fn into<S, u64>(S) -> u64
+            178..195 'Into::...::into': fn into<S, u64>(S) -> u64
-    178..198 'Into::...nto(S)': u64
+            178..198 'Into::...nto(S)': u64
-    196..197 'S': S
+            196..197 'S': S
-    "###
+        "#]],
    );
 }
@@ -1023,31 +1023,31 @@ fn test() { (S {}).method(); }
 #[test]
 fn dyn_trait_super_trait_not_in_scope() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-mod m {
+        mod m {
-    pub trait SuperTrait {
+            pub trait SuperTrait {
-        fn foo(&self) -> u32 { 0 }
+                fn foo(&self) -> u32 { 0 }
-    }
+            }
-}
+        }
-trait Trait: m::SuperTrait {}
+        trait Trait: m::SuperTrait {}
-struct S;
+        struct S;
-impl m::SuperTrait for S {}
+        impl m::SuperTrait for S {}
-impl Trait for S {}
+        impl Trait for S {}
-fn test(d: &dyn Trait) {
+        fn test(d: &dyn Trait) {
-    d.foo();
+            d.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    51..55 'self': &Self
+            51..55 'self': &Self
-    64..69 '{ 0 }': u32
+            64..69 '{ 0 }': u32
-    66..67 '0': u32
+            66..67 '0': u32
-    176..177 'd': &dyn Trait
+            176..177 'd': &dyn Trait
-    191..207 '{     ...o(); }': ()
+            191..207 '{     ...o(); }': ()
-    197..198 'd': &dyn Trait
+            197..198 'd': &dyn Trait
-    197..204 'd.foo()': u32
+            197..204 'd.foo()': u32
-    "###
+        "#]],
    );
 }
diff --git a/crates/ra_hir_ty/src/tests/never_type.rs b/crates/ra_hir_ty/src/tests/never_type.rs
index 64d421d40..49538b572 100644
--- a/crates/ra_hir_ty/src/tests/never_type.rs
+++ b/crates/ra_hir_ty/src/tests/never_type.rs
@@ -1,6 +1,6 @@
-use insta::assert_snapshot;
+use expect::expect;
-use super::{check_types, infer_with_mismatches};
+use super::{check_infer_with_mismatches, check_types};
 #[test]
 fn infer_never1() {
@@ -240,173 +240,170 @@ fn test(a: i32) {
 #[test]
 fn diverging_expression_1() {
-    let t = infer_with_mismatches(
+    check_infer_with_mismatches(
-        r#"
+        r"
-//- /main.rs
+        //- /main.rs
-fn test1() {
+        fn test1() {
-    let x: u32 = return;
+            let x: u32 = return;
-}
+        }
-fn test2() {
+        fn test2() {
-    let x: u32 = { return; };
+            let x: u32 = { return; };
-}
+        }
-fn test3() {
+        fn test3() {
-    let x: u32 = loop {};
+            let x: u32 = loop {};
-}
+        }
-fn test4() {
+        fn test4() {
-    let x: u32 = { loop {} };
+            let x: u32 = { loop {} };
-}
+        }
-fn test5() {
+        fn test5() {
-    let x: u32 = { if true { loop {}; } else { loop {}; } };
+            let x: u32 = { if true { loop {}; } else { loop {}; } };
-}
+        }
-fn test6() {
+        fn test6() {
-    let x: u32 = { let y: u32 = { loop {}; }; };
+            let x: u32 = { let y: u32 = { loop {}; }; };
-}
+        }
-"#,
+        ",
-        true,
+        expect![[r"
+            11..39 '{     ...urn; }': ()
+            21..22 'x': u32
+            30..36 'return': !
+            51..84 '{     ...; }; }': ()
+            61..62 'x': u32
+            70..81 '{ return; }': u32
+            72..78 'return': !
+            96..125 '{     ... {}; }': ()
+            106..107 'x': u32
+            115..122 'loop {}': !
+            120..122 '{}': ()
+            137..170 '{     ...} }; }': ()
+            147..148 'x': u32
+            156..167 '{ loop {} }': u32
+            158..165 'loop {}': !
+            163..165 '{}': ()
+            182..246 '{     ...} }; }': ()
+            192..193 'x': u32
+            201..243 '{ if t...}; } }': u32
+            203..241 'if tru... {}; }': u32
+            206..210 'true': bool
+            211..223 '{ loop {}; }': u32
+            213..220 'loop {}': !
+            218..220 '{}': ()
+            229..241 '{ loop {}; }': u32
+            231..238 'loop {}': !
+            236..238 '{}': ()
+            258..310 '{     ...; }; }': ()
+            268..269 'x': u32
+            277..307 '{ let ...; }; }': u32
+            283..284 'y': u32
+            292..304 '{ loop {}; }': u32
+            294..301 'loop {}': !
+            299..301 '{}': ()
+        "]],
    );
-    assert_snapshot!(t, @r###"
-    11..39 '{     ...urn; }': ()
-    21..22 'x': u32
-    30..36 'return': !
-    51..84 '{     ...; }; }': ()
-    61..62 'x': u32
-    70..81 '{ return; }': u32
-    72..78 'return': !
-    96..125 '{     ... {}; }': ()
-    106..107 'x': u32
-    115..122 'loop {}': !
-    120..122 '{}': ()
-    137..170 '{     ...} }; }': ()
-    147..148 'x': u32
-    156..167 '{ loop {} }': u32
-    158..165 'loop {}': !
-    163..165 '{}': ()
-    182..246 '{     ...} }; }': ()
-    192..193 'x': u32
-    201..243 '{ if t...}; } }': u32
-    203..241 'if tru... {}; }': u32
-    206..210 'true': bool
-    211..223 '{ loop {}; }': u32
-    213..220 'loop {}': !
-    218..220 '{}': ()
-    229..241 '{ loop {}; }': u32
-    231..238 'loop {}': !
-    236..238 '{}': ()
-    258..310 '{     ...; }; }': ()
-    268..269 'x': u32
-    277..307 '{ let ...; }; }': u32
-    283..284 'y': u32
-    292..304 '{ loop {}; }': u32
-    294..301 'loop {}': !
-    299..301 '{}': ()
-    "###);
 }
 #[test]
 fn diverging_expression_2() {
-    let t = infer_with_mismatches(
+    check_infer_with_mismatches(
        r#"
-//- /main.rs
+        //- /main.rs
-fn test1() {
+        fn test1() {
-    // should give type mismatch
+            // should give type mismatch
-    let x: u32 = { loop {}; "foo" };
+            let x: u32 = { loop {}; "foo" };
-}
+        }
-"#,
+        "#,
-        true,
+        expect![[r#"
+            11..84 '{     ..." }; }': ()
+            54..55 'x': u32
+            63..81 '{ loop...foo" }': &str
+            65..72 'loop {}': !
+            70..72 '{}': ()
+            74..79 '"foo"': &str
+            63..81: expected u32, got &str
+            74..79: expected u32, got &str
+        "#]],
    );
-    assert_snapshot!(t, @r###"
-    11..84 '{     ..." }; }': ()
-    54..55 'x': u32
-    63..81 '{ loop...foo" }': &str
-    65..72 'loop {}': !
-    70..72 '{}': ()
-    74..79 '"foo"': &str
-    63..81: expected u32, got &str
-    74..79: expected u32, got &str
-    "###);
 }
 #[test]
 fn diverging_expression_3_break() {
-    let t = infer_with_mismatches(
+    check_infer_with_mismatches(
-        r#"
+        r"
-//- /main.rs
+        //- /main.rs
-fn test1() {
+        fn test1() {
-    // should give type mismatch
+            // should give type mismatch
-    let x: u32 = { loop { break; } };
+            let x: u32 = { loop { break; } };
-}
+        }
-fn test2() {
+        fn test2() {
-    // should give type mismatch
+            // should give type mismatch
-    let x: u32 = { for a in b { break; }; };
+            let x: u32 = { for a in b { break; }; };
-    // should give type mismatch as well
+            // should give type mismatch as well
-    let x: u32 = { for a in b {}; };
+            let x: u32 = { for a in b {}; };
-    // should give type mismatch as well
+            // should give type mismatch as well
-    let x: u32 = { for a in b { return; }; };
+            let x: u32 = { for a in b { return; }; };
-}
+        }
-fn test3() {
+        fn test3() {
-    // should give type mismatch
+            // should give type mismatch
-    let x: u32 = { while true { break; }; };
+            let x: u32 = { while true { break; }; };
-    // should give type mismatch as well -- there's an implicit break, even if it's never hit
+            // should give type mismatch as well -- there's an implicit break, even if it's never hit
-    let x: u32 = { while true {}; };
+            let x: u32 = { while true {}; };
-    // should give type mismatch as well
+            // should give type mismatch as well
-    let x: u32 = { while true { return; }; };
+            let x: u32 = { while true { return; }; };
-}
+        }
-"#,
+        ",
-        true,
+        expect![[r"
+            11..85 '{     ...} }; }': ()
+            54..55 'x': u32
+            63..82 '{ loop...k; } }': ()
+            65..80 'loop { break; }': ()
+            70..80 '{ break; }': ()
+            72..77 'break': !
+            63..82: expected u32, got ()
+            65..80: expected u32, got ()
+            97..343 '{     ...; }; }': ()
+            140..141 'x': u32
+            149..175 '{ for ...; }; }': ()
+            151..172 'for a ...eak; }': ()
+            155..156 'a': {unknown}
+            160..161 'b': {unknown}
+            162..172 '{ break; }': ()
+            164..169 'break': !
+            226..227 'x': u32
+            235..253 '{ for ... {}; }': ()
+            237..250 'for a in b {}': ()
+            241..242 'a': {unknown}
+            246..247 'b': {unknown}
+            248..250 '{}': ()
+            304..305 'x': u32
+            313..340 '{ for ...; }; }': ()
+            315..337 'for a ...urn; }': ()
+            319..320 'a': {unknown}
+            324..325 'b': {unknown}
+            326..337 '{ return; }': ()
+            328..334 'return': !
+            149..175: expected u32, got ()
+            235..253: expected u32, got ()
+            313..340: expected u32, got ()
+            355..654 '{     ...; }; }': ()
+            398..399 'x': u32
+            407..433 '{ whil...; }; }': ()
+            409..430 'while ...eak; }': ()
+            415..419 'true': bool
+            420..430 '{ break; }': ()
+            422..427 'break': !
+            537..538 'x': u32
+            546..564 '{ whil... {}; }': ()
+            548..561 'while true {}': ()
+            554..558 'true': bool
+            559..561 '{}': ()
+            615..616 'x': u32
+            624..651 '{ whil...; }; }': ()
+            626..648 'while ...urn; }': ()
+            632..636 'true': bool
+            637..648 '{ return; }': ()
+            639..645 'return': !
+            407..433: expected u32, got ()
+            546..564: expected u32, got ()
+            624..651: expected u32, got ()
+        "]],
    );
-    assert_snapshot!(t, @r###"
-    11..85 '{     ...} }; }': ()
-    54..55 'x': u32
-    63..82 '{ loop...k; } }': ()
-    65..80 'loop { break; }': ()
-    70..80 '{ break; }': ()
-    72..77 'break': !
-    63..82: expected u32, got ()
-    65..80: expected u32, got ()
-    97..343 '{     ...; }; }': ()
-    140..141 'x': u32
-    149..175 '{ for ...; }; }': ()
-    151..172 'for a ...eak; }': ()
-    155..156 'a': {unknown}
-    160..161 'b': {unknown}
-    162..172 '{ break; }': ()
-    164..169 'break': !
-    226..227 'x': u32
-    235..253 '{ for ... {}; }': ()
-    237..250 'for a in b {}': ()
-    241..242 'a': {unknown}
-    246..247 'b': {unknown}
-    248..250 '{}': ()
-    304..305 'x': u32
-    313..340 '{ for ...; }; }': ()
-    315..337 'for a ...urn; }': ()
-    319..320 'a': {unknown}
-    324..325 'b': {unknown}
-    326..337 '{ return; }': ()
-    328..334 'return': !
-    149..175: expected u32, got ()
-    235..253: expected u32, got ()
-    313..340: expected u32, got ()
-    355..654 '{     ...; }; }': ()
-    398..399 'x': u32
-    407..433 '{ whil...; }; }': ()
-    409..430 'while ...eak; }': ()
-    415..419 'true': bool
-    420..430 '{ break; }': ()
-    422..427 'break': !
-    537..538 'x': u32
-    546..564 '{ whil... {}; }': ()
-    548..561 'while true {}': ()
-    554..558 'true': bool
-    559..561 '{}': ()
-    615..616 'x': u32
-    624..651 '{ whil...; }; }': ()
-    626..648 'while ...urn; }': ()
-    632..636 'true': bool
-    637..648 '{ return; }': ()
-    639..645 'return': !
-    407..433: expected u32, got ()
-    546..564: expected u32, got ()
-    624..651: expected u32, got ()
-    "###);
 }
diff --git a/crates/ra_hir_ty/src/tests/patterns.rs b/crates/ra_hir_ty/src/tests/patterns.rs
index f937426bd..39fabf7eb 100644
--- a/crates/ra_hir_ty/src/tests/patterns.rs
+++ b/crates/ra_hir_ty/src/tests/patterns.rs
@@ -1,561 +1,561 @@
-use insta::assert_snapshot;
+use expect::expect;
 use test_utils::mark;
-use super::{infer, infer_with_mismatches};
+use super::{check_infer, check_infer_with_mismatches};
 #[test]
 fn infer_pattern() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test(x: &i32) {
+        fn test(x: &i32) {
-    let y = x;
+            let y = x;
-    let &z = x;
+            let &z = x;
-    let a = z;
+            let a = z;
-    let (c, d) = (1, "hello");
+            let (c, d) = (1, "hello");
-    for (e, f) in some_iter {
+            for (e, f) in some_iter {
-        let g = e;
+                let g = e;
-    }
+            }
-    if let [val] = opt {
+            if let [val] = opt {
-        let h = val;
+                let h = val;
-    }
+            }
-    let lambda = |a: u64, b, c: i32| { a + b; c };
+            let lambda = |a: u64, b, c: i32| { a + b; c };
-    let ref ref_to_x = x;
+            let ref ref_to_x = x;
-    let mut mut_x = x;
+            let mut mut_x = x;
-    let ref mut mut_ref_to_x = x;
+            let ref mut mut_ref_to_x = x;
-    let k = mut_ref_to_x;
+            let k = mut_ref_to_x;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    8..9 'x': &i32
+            8..9 'x': &i32
-    17..368 '{     ...o_x; }': ()
+            17..368 '{     ...o_x; }': ()
-    27..28 'y': &i32
+            27..28 'y': &i32
-    31..32 'x': &i32
+            31..32 'x': &i32
-    42..44 '&z': &i32
+            42..44 '&z': &i32
-    43..44 'z': i32
+            43..44 'z': i32
-    47..48 'x': &i32
+            47..48 'x': &i32
-    58..59 'a': i32
+            58..59 'a': i32
-    62..63 'z': i32
+            62..63 'z': i32
-    73..79 '(c, d)': (i32, &str)
+            73..79 '(c, d)': (i32, &str)
-    74..75 'c': i32
+            74..75 'c': i32
-    77..78 'd': &str
+            77..78 'd': &str
-    82..94 '(1, "hello")': (i32, &str)
+            82..94 '(1, "hello")': (i32, &str)
-    83..84 '1': i32
+            83..84 '1': i32
-    86..93 '"hello"': &str
+            86..93 '"hello"': &str
-    101..151 'for (e...     }': ()
+            101..151 'for (e...     }': ()
-    105..111 '(e, f)': ({unknown}, {unknown})
+            105..111 '(e, f)': ({unknown}, {unknown})
-    106..107 'e': {unknown}
+            106..107 'e': {unknown}
-    109..110 'f': {unknown}
+            109..110 'f': {unknown}
-    115..124 'some_iter': {unknown}
+            115..124 'some_iter': {unknown}
-    125..151 '{     ...     }': ()
+            125..151 '{     ...     }': ()
-    139..140 'g': {unknown}
+            139..140 'g': {unknown}
-    143..144 'e': {unknown}
+            143..144 'e': {unknown}
-    157..204 'if let...     }': ()
+            157..204 'if let...     }': ()
-    164..169 '[val]': [{unknown}]
+            164..169 '[val]': [{unknown}]
-    165..168 'val': {unknown}
+            165..168 'val': {unknown}
-    172..175 'opt': [{unknown}]
+            172..175 'opt': [{unknown}]
-    176..204 '{     ...     }': ()
+            176..204 '{     ...     }': ()
-    190..191 'h': {unknown}
+            190..191 'h': {unknown}
-    194..197 'val': {unknown}
+            194..197 'val': {unknown}
-    214..220 'lambda': |u64, u64, i32| -> i32
+            214..220 'lambda': |u64, u64, i32| -> i32
-    223..255 '|a: u6...b; c }': |u64, u64, i32| -> i32
+            223..255 '|a: u6...b; c }': |u64, u64, i32| -> i32
-    224..225 'a': u64
+            224..225 'a': u64
-    232..233 'b': u64
+            232..233 'b': u64
-    235..236 'c': i32
+            235..236 'c': i32
-    243..255 '{ a + b; c }': i32
+            243..255 '{ a + b; c }': i32
-    245..246 'a': u64
+            245..246 'a': u64
-    245..250 'a + b': u64
+            245..250 'a + b': u64
-    249..250 'b': u64
+            249..250 'b': u64
-    252..253 'c': i32
+            252..253 'c': i32
-    266..278 'ref ref_to_x': &&i32
+            266..278 'ref ref_to_x': &&i32
-    281..282 'x': &i32
+            281..282 'x': &i32
-    292..301 'mut mut_x': &i32
+            292..301 'mut mut_x': &i32
-    304..305 'x': &i32
+            304..305 'x': &i32
-    315..335 'ref mu...f_to_x': &mut &i32
+            315..335 'ref mu...f_to_x': &mut &i32
-    338..339 'x': &i32
+            338..339 'x': &i32
-    349..350 'k': &mut &i32
+            349..350 'k': &mut &i32
-    353..365 'mut_ref_to_x': &mut &i32
+            353..365 'mut_ref_to_x': &mut &i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_literal_pattern() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-fn any<T>() -> T { loop {} }
+        fn any<T>() -> T { loop {} }
-fn test(x: &i32) {
+        fn test(x: &i32) {
-    if let "foo" = any() {}
+            if let "foo" = any() {}
-    if let 1 = any() {}
+            if let 1 = any() {}
-    if let 1u32 = any() {}
+            if let 1u32 = any() {}
-    if let 1f32 = any() {}
+            if let 1f32 = any() {}
-    if let 1.0 = any() {}
+            if let 1.0 = any() {}
-    if let true = any() {}
+            if let true = any() {}
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    17..28 '{ loop {} }': T
+            17..28 '{ loop {} }': T
-    19..26 'loop {}': !
+            19..26 'loop {}': !
-    24..26 '{}': ()
+            24..26 '{}': ()
-    37..38 'x': &i32
+            37..38 'x': &i32
-    46..208 '{     ...) {} }': ()
+            46..208 '{     ...) {} }': ()
-    52..75 'if let...y() {}': ()
+            52..75 'if let...y() {}': ()
-    59..64 '"foo"': &str
+            59..64 '"foo"': &str
-    59..64 '"foo"': &str
+            59..64 '"foo"': &str
-    67..70 'any': fn any<&str>() -> &str
+            67..70 'any': fn any<&str>() -> &str
-    67..72 'any()': &str
+            67..72 'any()': &str
-    73..75 '{}': ()
+            73..75 '{}': ()
-    80..99 'if let...y() {}': ()
+            80..99 'if let...y() {}': ()
-    87..88 '1': i32
+            87..88 '1': i32
-    87..88 '1': i32
+            87..88 '1': i32
-    91..94 'any': fn any<i32>() -> i32
+            91..94 'any': fn any<i32>() -> i32
-    91..96 'any()': i32
+            91..96 'any()': i32
-    97..99 '{}': ()
+            97..99 '{}': ()
-    104..126 'if let...y() {}': ()
+            104..126 'if let...y() {}': ()
-    111..115 '1u32': u32
+            111..115 '1u32': u32
-    111..115 '1u32': u32
+            111..115 '1u32': u32
-    118..121 'any': fn any<u32>() -> u32
+            118..121 'any': fn any<u32>() -> u32
-    118..123 'any()': u32
+            118..123 'any()': u32
-    124..126 '{}': ()
+            124..126 '{}': ()
-    131..153 'if let...y() {}': ()
+            131..153 'if let...y() {}': ()
-    138..142 '1f32': f32
+            138..142 '1f32': f32
-    138..142 '1f32': f32
+            138..142 '1f32': f32
-    145..148 'any': fn any<f32>() -> f32
+            145..148 'any': fn any<f32>() -> f32
-    145..150 'any()': f32
+            145..150 'any()': f32
-    151..153 '{}': ()
+            151..153 '{}': ()
-    158..179 'if let...y() {}': ()
+            158..179 'if let...y() {}': ()
-    165..168 '1.0': f64
+            165..168 '1.0': f64
-    165..168 '1.0': f64
+            165..168 '1.0': f64
-    171..174 'any': fn any<f64>() -> f64
+            171..174 'any': fn any<f64>() -> f64
-    171..176 'any()': f64
+            171..176 'any()': f64
-    177..179 '{}': ()
+            177..179 '{}': ()
-    184..206 'if let...y() {}': ()
+            184..206 'if let...y() {}': ()
-    191..195 'true': bool
+            191..195 'true': bool
-    191..195 'true': bool
+            191..195 'true': bool
-    198..201 'any': fn any<bool>() -> bool
+            198..201 'any': fn any<bool>() -> bool
-    198..203 'any()': bool
+            198..203 'any()': bool
-    204..206 '{}': ()
+            204..206 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_range_pattern() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-fn test(x: &i32) {
+        fn test(x: &i32) {
-    if let 1..76 = 2u32 {}
+            if let 1..76 = 2u32 {}
-    if let 1..=76 = 2u32 {}
+            if let 1..=76 = 2u32 {}
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    8..9 'x': &i32
+            8..9 'x': &i32
-    17..75 '{     ...2 {} }': ()
+            17..75 '{     ...2 {} }': ()
-    23..45 'if let...u32 {}': ()
+            23..45 'if let...u32 {}': ()
-    30..35 '1..76': u32
+            30..35 '1..76': u32
-    38..42 '2u32': u32
+            38..42 '2u32': u32
-    43..45 '{}': ()
+            43..45 '{}': ()
-    50..73 'if let...u32 {}': ()
+            50..73 'if let...u32 {}': ()
-    57..63 '1..=76': u32
+            57..63 '1..=76': u32
-    66..70 '2u32': u32
+            66..70 '2u32': u32
-    71..73 '{}': ()
+            71..73 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_pattern_match_ergonomics() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<T>(T);
+        struct A<T>(T);
-fn test() {
+        fn test() {
-    let A(n) = &A(1);
+            let A(n) = &A(1);
-    let A(n) = &mut A(1);
+            let A(n) = &mut A(1);
-}
+        }
-"#),
+        "#,
-    @r###"
+        expect![[r#"
-    27..78 '{     ...(1); }': ()
+            27..78 '{     ...(1); }': ()
-    37..41 'A(n)': A<i32>
+            37..41 'A(n)': A<i32>
-    39..40 'n': &i32
+            39..40 'n': &i32
-    44..49 '&A(1)': &A<i32>
+            44..49 '&A(1)': &A<i32>
-    45..46 'A': A<i32>(i32) -> A<i32>
+            45..46 'A': A<i32>(i32) -> A<i32>
-    45..49 'A(1)': A<i32>
+            45..49 'A(1)': A<i32>
-    47..48 '1': i32
+            47..48 '1': i32
-    59..63 'A(n)': A<i32>
+            59..63 'A(n)': A<i32>
-    61..62 'n': &mut i32
+            61..62 'n': &mut i32
-    66..75 '&mut A(1)': &mut A<i32>
+            66..75 '&mut A(1)': &mut A<i32>
-    71..72 'A': A<i32>(i32) -> A<i32>
+            71..72 'A': A<i32>(i32) -> A<i32>
-    71..75 'A(1)': A<i32>
+            71..75 'A(1)': A<i32>
-    73..74 '1': i32
+            73..74 '1': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_pattern_match_ergonomics_ref() {
    mark::check!(match_ergonomics_ref);
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-    let v = &(1, &2);
+            let v = &(1, &2);
-    let (_, &w) = v;
+            let (_, &w) = v;
-}
+        }
-"#),
+        "#,
-    @r###"
+        expect![[r#"
-    10..56 '{     ...= v; }': ()
+            10..56 '{     ...= v; }': ()
-    20..21 'v': &(i32, &i32)
+            20..21 'v': &(i32, &i32)
-    24..32 '&(1, &2)': &(i32, &i32)
+            24..32 '&(1, &2)': &(i32, &i32)
-    25..32 '(1, &2)': (i32, &i32)
+            25..32 '(1, &2)': (i32, &i32)
-    26..27 '1': i32
+            26..27 '1': i32
-    29..31 '&2': &i32
+            29..31 '&2': &i32
-    30..31 '2': i32
+            30..31 '2': i32
-    42..49 '(_, &w)': (i32, &i32)
+            42..49 '(_, &w)': (i32, &i32)
-    43..44 '_': i32
+            43..44 '_': i32
-    46..48 '&w': &i32
+            46..48 '&w': &i32
-    47..48 'w': i32
+            47..48 'w': i32
-    52..53 'v': &(i32, &i32)
+            52..53 'v': &(i32, &i32)
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_pattern_match_slice() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-    let slice: &[f64] = &[0.0];
+            let slice: &[f64] = &[0.0];
-    match slice {
+            match slice {
-        &[] => {},
+                &[] => {},
-        &[a] => {
+                &[a] => {
-            a;
+                    a;
-        },
+                },
-        &[b, c] => {
+                &[b, c] => {
-            b;
+                    b;
-            c;
+                    c;
+                }
+                _ => {}
+            }
        }
-        _ => {}
+        "#,
-    }
+        expect![[r#"
-}
+            10..209 '{     ...   } }': ()
-"#),
+            20..25 'slice': &[f64]
-    @r###"
+            36..42 '&[0.0]': &[f64; _]
-    10..209 '{     ...   } }': ()
+            37..42 '[0.0]': [f64; _]
-    20..25 'slice': &[f64]
+            38..41 '0.0': f64
-    36..42 '&[0.0]': &[f64; _]
+            48..207 'match ...     }': ()
-    37..42 '[0.0]': [f64; _]
+            54..59 'slice': &[f64]
-    38..41 '0.0': f64
+            70..73 '&[]': &[f64]
-    48..207 'match ...     }': ()
+            71..73 '[]': [f64]
-    54..59 'slice': &[f64]
+            77..79 '{}': ()
-    70..73 '&[]': &[f64]
+            89..93 '&[a]': &[f64]
-    71..73 '[]': [f64]
+            90..93 '[a]': [f64]
-    77..79 '{}': ()
+            91..92 'a': f64
-    89..93 '&[a]': &[f64]
+            97..123 '{     ...     }': ()
-    90..93 '[a]': [f64]
+            111..112 'a': f64
-    91..92 'a': f64
+            133..140 '&[b, c]': &[f64]
-    97..123 '{     ...     }': ()
+            134..140 '[b, c]': [f64]
-    111..112 'a': f64
+            135..136 'b': f64
-    133..140 '&[b, c]': &[f64]
+            138..139 'c': f64
-    134..140 '[b, c]': [f64]
+            144..185 '{     ...     }': ()
-    135..136 'b': f64
+            158..159 'b': f64
-    138..139 'c': f64
+            173..174 'c': f64
-    144..185 '{     ...     }': ()
+            194..195 '_': &[f64]
-    158..159 'b': f64
+            199..201 '{}': ()
-    173..174 'c': f64
+        "#]],
-    194..195 '_': &[f64]
-    199..201 '{}': ()
-    "###
    );
 }
 #[test]
 fn infer_pattern_match_string_literal() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-fn test() {
+        fn test() {
-    let s: &str = "hello";
+            let s: &str = "hello";
-    match s {
+            match s {
-        "hello" => {}
+                "hello" => {}
-        _ => {}
+                _ => {}
-    }
+            }
-}
+        }
-"#, true),
+        "#,
-    @r###"
+        expect![[r#"
-    10..98 '{     ...   } }': ()
+            10..98 '{     ...   } }': ()
-    20..21 's': &str
+            20..21 's': &str
-    30..37 '"hello"': &str
+            30..37 '"hello"': &str
-    43..96 'match ...     }': ()
+            43..96 'match ...     }': ()
-    49..50 's': &str
+            49..50 's': &str
-    61..68 '"hello"': &str
+            61..68 '"hello"': &str
-    61..68 '"hello"': &str
+            61..68 '"hello"': &str
-    72..74 '{}': ()
+            72..74 '{}': ()
-    83..84 '_': &str
+            83..84 '_': &str
-    88..90 '{}': ()
+            88..90 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_pattern_match_or() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-fn test() {
+        fn test() {
-    let s: &str = "hello";
+            let s: &str = "hello";
-    match s {
+            match s {
-        "hello" | "world" => {}
+                "hello" | "world" => {}
-        _ => {}
+                _ => {}
-    }
+            }
-}
+        }
-"#, true),
+        "#,
-    @r###"
+        expect![[r#"
-    10..108 '{     ...   } }': ()
+            10..108 '{     ...   } }': ()
-    20..21 's': &str
+            20..21 's': &str
-    30..37 '"hello"': &str
+            30..37 '"hello"': &str
-    43..106 'match ...     }': ()
+            43..106 'match ...     }': ()
-    49..50 's': &str
+            49..50 's': &str
-    61..68 '"hello"': &str
+            61..68 '"hello"': &str
-    61..68 '"hello"': &str
+            61..68 '"hello"': &str
-    61..78 '"hello...world"': &str
+            61..78 '"hello...world"': &str
-    71..78 '"world"': &str
+            71..78 '"world"': &str
-    71..78 '"world"': &str
+            71..78 '"world"': &str
-    82..84 '{}': ()
+            82..84 '{}': ()
-    93..94 '_': &str
+            93..94 '_': &str
-    98..100 '{}': ()
+            98..100 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_pattern_match_arr() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-    let arr: [f64; 2] = [0.0, 1.0];
+            let arr: [f64; 2] = [0.0, 1.0];
-    match arr {
+            match arr {
-        [1.0, a] => {
+                [1.0, a] => {
-            a;
+                    a;
-        },
+                },
-        [b, c] => {
+                [b, c] => {
-            b;
+                    b;
-            c;
+                    c;
+                }
+            }
        }
-    }
+        "#,
-}
+        expect![[r#"
-"#),
+            10..179 '{     ...   } }': ()
-    @r###"
+            20..23 'arr': [f64; _]
-    10..179 '{     ...   } }': ()
+            36..46 '[0.0, 1.0]': [f64; _]
-    20..23 'arr': [f64; _]
+            37..40 '0.0': f64
-    36..46 '[0.0, 1.0]': [f64; _]
+            42..45 '1.0': f64
-    37..40 '0.0': f64
+            52..177 'match ...     }': ()
-    42..45 '1.0': f64
+            58..61 'arr': [f64; _]
-    52..177 'match ...     }': ()
+            72..80 '[1.0, a]': [f64; _]
-    58..61 'arr': [f64; _]
+            73..76 '1.0': f64
-    72..80 '[1.0, a]': [f64; _]
+            73..76 '1.0': f64
-    73..76 '1.0': f64
+            78..79 'a': f64
-    73..76 '1.0': f64
+            84..110 '{     ...     }': ()
-    78..79 'a': f64
+            98..99 'a': f64
-    84..110 '{     ...     }': ()
+            120..126 '[b, c]': [f64; _]
-    98..99 'a': f64
+            121..122 'b': f64
-    120..126 '[b, c]': [f64; _]
+            124..125 'c': f64
-    121..122 'b': f64
+            130..171 '{     ...     }': ()
-    124..125 'c': f64
+            144..145 'b': f64
-    130..171 '{     ...     }': ()
+            159..160 'c': f64
-    144..145 'b': f64
+        "#]],
-    159..160 'c': f64
-    "###
    );
 }
 #[test]
 fn infer_adt_pattern() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum E {
+        enum E {
-    A { x: usize },
+            A { x: usize },
-    B
+            B
-}
+        }
-struct S(u32, E);
+        struct S(u32, E);
-fn test() {
+        fn test() {
-    let e = E::A { x: 3 };
+            let e = E::A { x: 3 };
-    let S(y, z) = foo;
+            let S(y, z) = foo;
-    let E::A { x: new_var } = e;
+            let E::A { x: new_var } = e;
-    match e {
+            match e {
-        E::A { x } => x,
+                E::A { x } => x,
-        E::B if foo => 1,
+                E::B if foo => 1,
-        E::B => 10,
+                E::B => 10,
-    };
+            };
-    let ref d @ E::A { .. } = e;
+            let ref d @ E::A { .. } = e;
-    d;
+            d;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    67..288 '{     ...  d; }': ()
+            67..288 '{     ...  d; }': ()
-    77..78 'e': E
+            77..78 'e': E
-    81..94 'E::A { x: 3 }': E
+            81..94 'E::A { x: 3 }': E
-    91..92 '3': usize
+            91..92 '3': usize
-    105..112 'S(y, z)': S
+            105..112 'S(y, z)': S
-    107..108 'y': u32
+            107..108 'y': u32
-    110..111 'z': E
+            110..111 'z': E
-    115..118 'foo': S
+            115..118 'foo': S
-    128..147 'E::A {..._var }': E
+            128..147 'E::A {..._var }': E
-    138..145 'new_var': usize
+            138..145 'new_var': usize
-    150..151 'e': E
+            150..151 'e': E
-    158..244 'match ...     }': usize
+            158..244 'match ...     }': usize
-    164..165 'e': E
+            164..165 'e': E
-    176..186 'E::A { x }': E
+            176..186 'E::A { x }': E
-    183..184 'x': usize
+            183..184 'x': usize
-    190..191 'x': usize
+            190..191 'x': usize
-    201..205 'E::B': E
+            201..205 'E::B': E
-    209..212 'foo': bool
+            209..212 'foo': bool
-    216..217 '1': usize
+            216..217 '1': usize
-    227..231 'E::B': E
+            227..231 'E::B': E
-    235..237 '10': usize
+            235..237 '10': usize
-    255..274 'ref d ...{ .. }': &E
+            255..274 'ref d ...{ .. }': &E
-    263..274 'E::A { .. }': E
+            263..274 'E::A { .. }': E
-    277..278 'e': E
+            277..278 'e': E
-    284..285 'd': &E
+            284..285 'd': &E
-    "###
+        "#]],
    );
 }
 #[test]
 fn enum_variant_through_self_in_pattern() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum E {
+        enum E {
-    A { x: usize },
+            A { x: usize },
-    B(usize),
+            B(usize),
-    C
+            C
-}
+        }
-impl E {
+        impl E {
-    fn test() {
+            fn test() {
-        match (loop {}) {
+                match (loop {}) {
-            Self::A { x } => { x; },
+                    Self::A { x } => { x; },
-            Self::B(x) => { x; },
+                    Self::B(x) => { x; },
-            Self::C => {},
+                    Self::C => {},
-        };
+                };
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    75..217 '{     ...     }': ()
+            75..217 '{     ...     }': ()
-    85..210 'match ...     }': ()
+            85..210 'match ...     }': ()
-    92..99 'loop {}': !
+            92..99 'loop {}': !
-    97..99 '{}': ()
+            97..99 '{}': ()
-    115..128 'Self::A { x }': E
+            115..128 'Self::A { x }': E
-    125..126 'x': usize
+            125..126 'x': usize
-    132..138 '{ x; }': ()
+            132..138 '{ x; }': ()
-    134..135 'x': usize
+            134..135 'x': usize
-    152..162 'Self::B(x)': E
+            152..162 'Self::B(x)': E
-    160..161 'x': usize
+            160..161 'x': usize
-    166..172 '{ x; }': ()
+            166..172 '{ x; }': ()
-    168..169 'x': usize
+            168..169 'x': usize
-    186..193 'Self::C': E
+            186..193 'Self::C': E
-    197..199 '{}': ()
+            197..199 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_generics_in_patterns() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<T> {
+        struct A<T> {
-    x: T,
+            x: T,
-}
+        }
-enum Option<T> {
+        enum Option<T> {
-    Some(T),
+            Some(T),
-    None,
+            None,
-}
+        }
-fn test(a1: A<u32>, o: Option<u64>) {
+        fn test(a1: A<u32>, o: Option<u64>) {
-    let A { x: x2 } = a1;
+            let A { x: x2 } = a1;
-    let A::<i64> { x: x3 } = A { x: 1 };
+            let A::<i64> { x: x3 } = A { x: 1 };
-    match o {
+            match o {
-        Option::Some(t) => t,
+                Option::Some(t) => t,
-        _ => 1,
+                _ => 1,
-    };
+            };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    78..80 'a1': A<u32>
+            78..80 'a1': A<u32>
-    90..91 'o': Option<u64>
+            90..91 'o': Option<u64>
-    106..243 '{     ...  }; }': ()
+            106..243 '{     ...  }; }': ()
-    116..127 'A { x: x2 }': A<u32>
+            116..127 'A { x: x2 }': A<u32>
-    123..125 'x2': u32
+            123..125 'x2': u32
-    130..132 'a1': A<u32>
+            130..132 'a1': A<u32>
-    142..160 'A::<i6...: x3 }': A<i64>
+            142..160 'A::<i6...: x3 }': A<i64>
-    156..158 'x3': i64
+            156..158 'x3': i64
-    163..173 'A { x: 1 }': A<i64>
+            163..173 'A { x: 1 }': A<i64>
-    170..171 '1': i64
+            170..171 '1': i64
-    179..240 'match ...     }': u64
+            179..240 'match ...     }': u64
-    185..186 'o': Option<u64>
+            185..186 'o': Option<u64>
-    197..212 'Option::Some(t)': Option<u64>
+            197..212 'Option::Some(t)': Option<u64>
-    210..211 't': u64
+            210..211 't': u64
-    216..217 't': u64
+            216..217 't': u64
-    227..228 '_': Option<u64>
+            227..228 '_': Option<u64>
-    232..233 '1': u64
+            232..233 '1': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_const_pattern() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-enum Option<T> { None }
+        enum Option<T> { None }
-use Option::None;
+        use Option::None;
-struct Foo;
+        struct Foo;
-const Bar: usize = 1;
+        const Bar: usize = 1;
-fn test() {
+        fn test() {
-    let a: Option<u32> = None;
+            let a: Option<u32> = None;
-    let b: Option<i64> = match a {
+            let b: Option<i64> = match a {
-        None => None,
+                None => None,
-    };
+            };
-    let _: () = match () { Foo => Foo }; // Expected mismatch
+            let _: () = match () { Foo => Foo }; // Expected mismatch
-    let _: () = match () { Bar => Bar }; // Expected mismatch
+            let _: () = match () { Bar => Bar }; // Expected mismatch
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    73..74 '1': usize
+            73..74 '1': usize
-    87..309 '{     ...atch }': ()
+            87..309 '{     ...atch }': ()
-    97..98 'a': Option<u32>
+            97..98 'a': Option<u32>
-    114..118 'None': Option<u32>
+            114..118 'None': Option<u32>
-    128..129 'b': Option<i64>
+            128..129 'b': Option<i64>
-    145..182 'match ...     }': Option<i64>
+            145..182 'match ...     }': Option<i64>
-    151..152 'a': Option<u32>
+            151..152 'a': Option<u32>
-    163..167 'None': Option<u32>
+            163..167 'None': Option<u32>
-    171..175 'None': Option<i64>
+            171..175 'None': Option<i64>
-    192..193 '_': ()
+            192..193 '_': ()
-    200..223 'match ... Foo }': Foo
+            200..223 'match ... Foo }': Foo
-    206..208 '()': ()
+            206..208 '()': ()
-    211..214 'Foo': Foo
+            211..214 'Foo': Foo
-    218..221 'Foo': Foo
+            218..221 'Foo': Foo
-    254..255 '_': ()
+            254..255 '_': ()
-    262..285 'match ... Bar }': usize
+            262..285 'match ... Bar }': usize
-    268..270 '()': ()
+            268..270 '()': ()
-    273..276 'Bar': usize
+            273..276 'Bar': usize
-    280..283 'Bar': usize
+            280..283 'Bar': usize
-    200..223: expected (), got Foo
+            200..223: expected (), got Foo
-    262..285: expected (), got usize
+            262..285: expected (), got usize
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_guard() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
 struct S;
 impl S { fn foo(&self) -> bool { false } }
@@ -564,91 +564,93 @@ fn main() {
        s if s.foo() => (),
    }
 }
-    "#), @r###"
+        "#,
-    27..31 'self': &S
+        expect![[r#"
-    41..50 '{ false }': bool
+            27..31 'self': &S
-    43..48 'false': bool
+            41..50 '{ false }': bool
-    64..115 '{     ...   } }': ()
+            43..48 'false': bool
-    70..113 'match ...     }': ()
+            64..115 '{     ...   } }': ()
-    76..77 'S': S
+            70..113 'match ...     }': ()
-    88..89 's': S
+            76..77 'S': S
-    93..94 's': S
+            88..89 's': S
-    93..100 's.foo()': bool
+            93..94 's': S
-    104..106 '()': ()
+            93..100 's.foo()': bool
-    "###)
+            104..106 '()': ()
+    "#]],
+    )
 }
 #[test]
 fn match_ergonomics_in_closure_params() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang = "fn_once"]
+        #[lang = "fn_once"]
-trait FnOnce<Args> {
+        trait FnOnce<Args> {
-    type Output;
+            type Output;
-}
+        }
-fn foo<T, U, F: FnOnce(T) -> U>(t: T, f: F) -> U { loop {} }
+        fn foo<T, U, F: FnOnce(T) -> U>(t: T, f: F) -> U { loop {} }
-fn test() {
+        fn test() {
-    foo(&(1, "a"), |&(x, y)| x); // normal, no match ergonomics
+            foo(&(1, "a"), |&(x, y)| x); // normal, no match ergonomics
-    foo(&(1, "a"), |(x, y)| x);
+            foo(&(1, "a"), |(x, y)| x);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    93..94 't': T
+            93..94 't': T
-    99..100 'f': F
+            99..100 'f': F
-    110..121 '{ loop {} }': U
+            110..121 '{ loop {} }': U
-    112..119 'loop {}': !
+            112..119 'loop {}': !
-    117..119 '{}': ()
+            117..119 '{}': ()
-    133..232 '{     ... x); }': ()
+            133..232 '{     ... x); }': ()
-    139..142 'foo': fn foo<&(i32, &str), i32, |&(i32, &str)| -> i32>(&(i32, &str), |&(i32, &str)| -> i32) -> i32
+            139..142 'foo': fn foo<&(i32, &str), i32, |&(i32, &str)| -> i32>(&(i32, &str), |&(i32, &str)| -> i32) -> i32
-    139..166 'foo(&(...y)| x)': i32
+            139..166 'foo(&(...y)| x)': i32
-    143..152 '&(1, "a")': &(i32, &str)
+            143..152 '&(1, "a")': &(i32, &str)
-    144..152 '(1, "a")': (i32, &str)
+            144..152 '(1, "a")': (i32, &str)
-    145..146 '1': i32
+            145..146 '1': i32
-    148..151 '"a"': &str
+            148..151 '"a"': &str
-    154..165 '|&(x, y)| x': |&(i32, &str)| -> i32
+            154..165 '|&(x, y)| x': |&(i32, &str)| -> i32
-    155..162 '&(x, y)': &(i32, &str)
+            155..162 '&(x, y)': &(i32, &str)
-    156..162 '(x, y)': (i32, &str)
+            156..162 '(x, y)': (i32, &str)
-    157..158 'x': i32
+            157..158 'x': i32
-    160..161 'y': &str
+            160..161 'y': &str
-    164..165 'x': i32
+            164..165 'x': i32
-    203..206 'foo': fn foo<&(i32, &str), &i32, |&(i32, &str)| -> &i32>(&(i32, &str), |&(i32, &str)| -> &i32) -> &i32
+            203..206 'foo': fn foo<&(i32, &str), &i32, |&(i32, &str)| -> &i32>(&(i32, &str), |&(i32, &str)| -> &i32) -> &i32
-    203..229 'foo(&(...y)| x)': &i32
+            203..229 'foo(&(...y)| x)': &i32
-    207..216 '&(1, "a")': &(i32, &str)
+            207..216 '&(1, "a")': &(i32, &str)
-    208..216 '(1, "a")': (i32, &str)
+            208..216 '(1, "a")': (i32, &str)
-    209..210 '1': i32
+            209..210 '1': i32
-    212..215 '"a"': &str
+            212..215 '"a"': &str
-    218..228 '|(x, y)| x': |&(i32, &str)| -> &i32
+            218..228 '|(x, y)| x': |&(i32, &str)| -> &i32
-    219..225 '(x, y)': (i32, &str)
+            219..225 '(x, y)': (i32, &str)
-    220..221 'x': &i32
+            220..221 'x': &i32
-    223..224 'y': &&str
+            223..224 'y': &&str
-    227..228 'x': &i32
+            227..228 'x': &i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn slice_tail_pattern() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo(params: &[i32]) {
+        fn foo(params: &[i32]) {
-    match params {
+            match params {
-        [head, tail @ ..] => {
+                [head, tail @ ..] => {
+                }
+            }
        }
-    }
+        "#,
-}
+        expect![[r#"
-"#),
+            7..13 'params': &[i32]
-        @r###"
+            23..92 '{     ...   } }': ()
-    7..13 'params': &[i32]
+            29..90 'match ...     }': ()
-    23..92 '{     ...   } }': ()
+            35..41 'params': &[i32]
-    29..90 'match ...     }': ()
+            52..69 '[head,... @ ..]': [i32]
-    35..41 'params': &[i32]
+            53..57 'head': &i32
-    52..69 '[head,... @ ..]': [i32]
+            59..68 'tail @ ..': &[i32]
-    53..57 'head': &i32
+            66..68 '..': [i32]
-    59..68 'tail @ ..': &[i32]
+            73..84 '{         }': ()
-    66..68 '..': [i32]
+        "#]],
-    73..84 '{         }': ()
-    "###
    );
 }
diff --git a/crates/ra_hir_ty/src/tests/regression.rs b/crates/ra_hir_ty/src/tests/regression.rs
index d806e0ffb..b9ab0f357 100644
--- a/crates/ra_hir_ty/src/tests/regression.rs
+++ b/crates/ra_hir_ty/src/tests/regression.rs
@@ -1,87 +1,87 @@
-use insta::assert_snapshot;
+use expect::expect;
 use test_utils::mark;
-use super::{check_types, infer};
+use super::{check_infer, check_types};
 #[test]
 fn bug_484() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-   let x = if true {};
+            let x = if true {};
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    10..36 '{    l... {}; }': ()
+            10..37 '{     ... {}; }': ()
-    19..20 'x': ()
+            20..21 'x': ()
-    23..33 'if true {}': ()
+            24..34 'if true {}': ()
-    26..30 'true': bool
+            27..31 'true': bool
-    31..33 '{}': ()
+            32..34 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn no_panic_on_field_of_enum() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum X {}
+        enum X {}
-fn test(x: X) {
+        fn test(x: X) {
-    x.some_field;
+            x.some_field;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    19..20 'x': X
+            19..20 'x': X
-    25..46 '{     ...eld; }': ()
+            25..46 '{     ...eld; }': ()
-    31..32 'x': X
+            31..32 'x': X
-    31..43 'x.some_field': {unknown}
+            31..43 'x.some_field': {unknown}
-    "###
+        "#]],
    );
 }
 #[test]
 fn bug_585() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-    X {};
+            X {};
-    match x {
+            match x {
-        A::B {} => (),
+                A::B {} => (),
-        A::Y() => (),
+                A::Y() => (),
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    10..88 '{     ...   } }': ()
+            10..88 '{     ...   } }': ()
-    16..20 'X {}': {unknown}
+            16..20 'X {}': {unknown}
-    26..86 'match ...     }': ()
+            26..86 'match ...     }': ()
-    32..33 'x': {unknown}
+            32..33 'x': {unknown}
-    44..51 'A::B {}': {unknown}
+            44..51 'A::B {}': {unknown}
-    55..57 '()': ()
+            55..57 '()': ()
-    67..73 'A::Y()': {unknown}
+            67..73 'A::Y()': {unknown}
-    77..79 '()': ()
+            77..79 '()': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn bug_651() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn quux() {
+        fn quux() {
-    let y = 92;
+            let y = 92;
-    1 + y;
+            1 + y;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    10..40 '{     ...+ y; }': ()
+            10..40 '{     ...+ y; }': ()
-    20..21 'y': i32
+            20..21 'y': i32
-    24..26 '92': i32
+            24..26 '92': i32
-    32..33 '1': i32
+            32..33 '1': i32
-    32..37 '1 + y': i32
+            32..37 '1 + y': i32
-    36..37 'y': i32
+            36..37 'y': i32
-    "###
+        "#]],
    );
 }
@@ -89,78 +89,78 @@ fn quux() {
 fn recursive_vars() {
    mark::check!(type_var_cycles_resolve_completely);
    mark::check!(type_var_cycles_resolve_as_possible);
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-    let y = unknown;
+            let y = unknown;
-    [y, &y];
+            [y, &y];
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    10..47 '{     ...&y]; }': ()
+            10..47 '{     ...&y]; }': ()
-    20..21 'y': &{unknown}
+            20..21 'y': &{unknown}
-    24..31 'unknown': &{unknown}
+            24..31 'unknown': &{unknown}
-    37..44 '[y, &y]': [&&{unknown}; _]
+            37..44 '[y, &y]': [&&{unknown}; _]
-    38..39 'y': &{unknown}
+            38..39 'y': &{unknown}
-    41..43 '&y': &&{unknown}
+            41..43 '&y': &&{unknown}
-    42..43 'y': &{unknown}
+            42..43 'y': &{unknown}
-    "###
+        "#]],
    );
 }
 #[test]
 fn recursive_vars_2() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-    let x = unknown;
+            let x = unknown;
-    let y = unknown;
+            let y = unknown;
-    [(x, y), (&y, &x)];
+            [(x, y), (&y, &x)];
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    10..79 '{     ...x)]; }': ()
+            10..79 '{     ...x)]; }': ()
-    20..21 'x': &&{unknown}
+            20..21 'x': &&{unknown}
-    24..31 'unknown': &&{unknown}
+            24..31 'unknown': &&{unknown}
-    41..42 'y': &&{unknown}
+            41..42 'y': &&{unknown}
-    45..52 'unknown': &&{unknown}
+            45..52 'unknown': &&{unknown}
-    58..76 '[(x, y..., &x)]': [(&&&{unknown}, &&&{unknown}); _]
+            58..76 '[(x, y..., &x)]': [(&&&{unknown}, &&&{unknown}); _]
-    59..65 '(x, y)': (&&&{unknown}, &&&{unknown})
+            59..65 '(x, y)': (&&&{unknown}, &&&{unknown})
-    60..61 'x': &&{unknown}
+            60..61 'x': &&{unknown}
-    63..64 'y': &&{unknown}
+            63..64 'y': &&{unknown}
-    67..75 '(&y, &x)': (&&&{unknown}, &&&{unknown})
+            67..75 '(&y, &x)': (&&&{unknown}, &&&{unknown})
-    68..70 '&y': &&&{unknown}
+            68..70 '&y': &&&{unknown}
-    69..70 'y': &&{unknown}
+            69..70 'y': &&{unknown}
-    72..74 '&x': &&&{unknown}
+            72..74 '&x': &&&{unknown}
-    73..74 'x': &&{unknown}
+            73..74 'x': &&{unknown}
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_std_crash_1() {
    // caused stack overflow, taken from std
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum Maybe<T> {
+        enum Maybe<T> {
-    Real(T),
+            Real(T),
-    Fake,
+            Fake,
-}
+        }
-fn write() {
+        fn write() {
-    match something_unknown {
+            match something_unknown {
-        Maybe::Real(ref mut something) => (),
+                Maybe::Real(ref mut something) => (),
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    53..138 '{     ...   } }': ()
+            53..138 '{     ...   } }': ()
-    59..136 'match ...     }': ()
+            59..136 'match ...     }': ()
-    65..82 'someth...nknown': Maybe<{unknown}>
+            65..82 'someth...nknown': Maybe<{unknown}>
-    93..123 'Maybe:...thing)': Maybe<{unknown}>
+            93..123 'Maybe:...thing)': Maybe<{unknown}>
-    105..122 'ref mu...ething': &mut {unknown}
+            105..122 'ref mu...ething': &mut {unknown}
-    127..129 '()': ()
+            127..129 '()': ()
-    "###
+        "#]],
    );
 }
@@ -168,234 +168,235 @@ fn write() {
 fn infer_std_crash_2() {
    mark::check!(type_var_resolves_to_int_var);
    // caused "equating two type variables, ...", taken from std
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test_line_buffer() {
+        fn test_line_buffer() {
-    &[0, b'\n', 1, b'\n'];
+            &[0, b'\n', 1, b'\n'];
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    22..52 '{     ...n']; }': ()
+            22..52 '{     ...n']; }': ()
-    28..49 '&[0, b...b'\n']': &[u8; _]
+            28..49 '&[0, b...b'\n']': &[u8; _]
-    29..49 '[0, b'...b'\n']': [u8; _]
+            29..49 '[0, b'...b'\n']': [u8; _]
-    30..31 '0': u8
+            30..31 '0': u8
-    33..38 'b'\n'': u8
+            33..38 'b'\n'': u8
-    40..41 '1': u8
+            40..41 '1': u8
-    43..48 'b'\n'': u8
+            43..48 'b'\n'': u8
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_std_crash_3() {
    // taken from rustc
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-pub fn compute() {
+        pub fn compute() {
-    match nope!() {
+            match nope!() {
-        SizeSkeleton::Pointer { non_zero: true, tail } => {}
+                SizeSkeleton::Pointer { non_zero: true, tail } => {}
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    17..107 '{     ...   } }': ()
+            17..107 '{     ...   } }': ()
-    23..105 'match ...     }': ()
+            23..105 'match ...     }': ()
-    29..36 'nope!()': {unknown}
+            29..36 'nope!()': {unknown}
-    47..93 'SizeSk...tail }': {unknown}
+            47..93 'SizeSk...tail }': {unknown}
-    81..85 'true': bool
+            81..85 'true': bool
-    81..85 'true': bool
+            81..85 'true': bool
-    87..91 'tail': {unknown}
+            87..91 'tail': {unknown}
-    97..99 '{}': ()
+            97..99 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_std_crash_4() {
    // taken from rustc
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-pub fn primitive_type() {
+        pub fn primitive_type() {
-    match *self {
+            match *self {
-        BorrowedRef { type_: Primitive(p), ..} => {},
+                BorrowedRef { type_: Primitive(p), ..} => {},
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    24..105 '{     ...   } }': ()
+            24..105 '{     ...   } }': ()
-    30..103 'match ...     }': ()
+            30..103 'match ...     }': ()
-    36..41 '*self': {unknown}
+            36..41 '*self': {unknown}
-    37..41 'self': {unknown}
+            37..41 'self': {unknown}
-    52..90 'Borrow...), ..}': {unknown}
+            52..90 'Borrow...), ..}': {unknown}
-    73..85 'Primitive(p)': {unknown}
+            73..85 'Primitive(p)': {unknown}
-    83..84 'p': {unknown}
+            83..84 'p': {unknown}
-    94..96 '{}': ()
+            94..96 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_std_crash_5() {
    // taken from rustc
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn extra_compiler_flags() {
+        fn extra_compiler_flags() {
-    for content in doesnt_matter {
+            for content in doesnt_matter {
-        let name = if doesnt_matter {
+                let name = if doesnt_matter {
-            first
+                    first
-        } else {
+                } else {
-            &content
+                    &content
-        };
+                };
-        let content = if ICE_REPORT_COMPILER_FLAGS_STRIP_VALUE.contains(&name) {
+                let content = if ICE_REPORT_COMPILER_FLAGS_STRIP_VALUE.contains(&name) {
-            name
+                    name
-        } else {
+                } else {
-            content
+                    content
-        };
+                };
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    26..322 '{     ...   } }': ()
+            26..322 '{     ...   } }': ()
-    32..320 'for co...     }': ()
+            32..320 'for co...     }': ()
-    36..43 'content': &{unknown}
+            36..43 'content': &{unknown}
-    47..60 'doesnt_matter': {unknown}
+            47..60 'doesnt_matter': {unknown}
-    61..320 '{     ...     }': ()
+            61..320 '{     ...     }': ()
-    75..79 'name': &&{unknown}
+            75..79 'name': &&{unknown}
-    82..166 'if doe...     }': &&{unknown}
+            82..166 'if doe...     }': &&{unknown}
-    85..98 'doesnt_matter': bool
+            85..98 'doesnt_matter': bool
-    99..128 '{     ...     }': &&{unknown}
+            99..128 '{     ...     }': &&{unknown}
-    113..118 'first': &&{unknown}
+            113..118 'first': &&{unknown}
-    134..166 '{     ...     }': &&{unknown}
+            134..166 '{     ...     }': &&{unknown}
-    148..156 '&content': &&{unknown}
+            148..156 '&content': &&{unknown}
-    149..156 'content': &{unknown}
+            149..156 'content': &{unknown}
-    181..188 'content': &{unknown}
+            181..188 'content': &{unknown}
-    191..313 'if ICE...     }': &{unknown}
+            191..313 'if ICE...     }': &{unknown}
-    194..231 'ICE_RE..._VALUE': {unknown}
+            194..231 'ICE_RE..._VALUE': {unknown}
-    194..247 'ICE_RE...&name)': bool
+            194..247 'ICE_RE...&name)': bool
-    241..246 '&name': &&&{unknown}
+            241..246 '&name': &&&{unknown}
-    242..246 'name': &&{unknown}
+            242..246 'name': &&{unknown}
-    248..276 '{     ...     }': &&{unknown}
+            248..276 '{     ...     }': &&{unknown}
-    262..266 'name': &&{unknown}
+            262..266 'name': &&{unknown}
-    282..313 '{     ...     }': &{unknown}
+            282..313 '{     ...     }': &{unknown}
-    296..303 'content': &{unknown}
+            296..303 'content': &{unknown}
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_nested_generics_crash() {
    // another crash found typechecking rustc
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Canonical<V> {
+        struct Canonical<V> {
-    value: V,
+            value: V,
-}
+        }
-struct QueryResponse<V> {
+        struct QueryResponse<V> {
-    value: V,
+            value: V,
-}
+        }
-fn test<R>(query_response: Canonical<QueryResponse<R>>) {
+        fn test<R>(query_response: Canonical<QueryResponse<R>>) {
-    &query_response.value;
+            &query_response.value;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    91..105 'query_response': Canonical<QueryResponse<R>>
+            91..105 'query_response': Canonical<QueryResponse<R>>
-    136..166 '{     ...lue; }': ()
+            136..166 '{     ...lue; }': ()
-    142..163 '&query....value': &QueryResponse<R>
+            142..163 '&query....value': &QueryResponse<R>
-    143..157 'query_response': Canonical<QueryResponse<R>>
+            143..157 'query_response': Canonical<QueryResponse<R>>
-    143..163 'query_....value': QueryResponse<R>
+            143..163 'query_....value': QueryResponse<R>
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_paren_macro_call() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-macro_rules! bar { () => {0u32} }
+        macro_rules! bar { () => {0u32} }
-fn test() {
+        fn test() {
-    let a = (bar!());
+            let a = (bar!());
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    !0..4 '0u32': u32
+            !0..4 '0u32': u32
-    44..69 '{     ...()); }': ()
+            44..69 '{     ...()); }': ()
-    54..55 'a': u32
+            54..55 'a': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn bug_1030() {
-    assert_snapshot!(infer(r#"
+    check_infer(
-struct HashSet<T, H>;
+        r#"
-struct FxHasher;
+        struct HashSet<T, H>;
-type FxHashSet<T> = HashSet<T, FxHasher>;
+        struct FxHasher;
+        type FxHashSet<T> = HashSet<T, FxHasher>;
-impl<T, H> HashSet<T, H> {
+        impl<T, H> HashSet<T, H> {
-    fn default() -> HashSet<T, H> {}
+            fn default() -> HashSet<T, H> {}
-}
+        }
-pub fn main_loop() {
+        pub fn main_loop() {
-    FxHashSet::default();
+            FxHashSet::default();
-}
+        }
-"#),
+        "#,
-    @r###"
+        expect![[r#"
-    143..145 '{}': ()
+            143..145 '{}': ()
-    168..197 '{     ...t(); }': ()
+            168..197 '{     ...t(); }': ()
-    174..192 'FxHash...efault': fn default<{unknown}, FxHasher>() -> HashSet<{unknown}, FxHasher>
+            174..192 'FxHash...efault': fn default<{unknown}, FxHasher>() -> HashSet<{unknown}, FxHasher>
-    174..194 'FxHash...ault()': HashSet<{unknown}, FxHasher>
+            174..194 'FxHash...ault()': HashSet<{unknown}, FxHasher>
-    "###
+        "#]],
    );
 }
 #[test]
 fn issue_2669() {
-    assert_snapshot!(
+    check_infer(
-        infer(
+        r#"
-            r#"trait A {}
+        trait A {}
-    trait Write {}
+        trait Write {}
-    struct Response<T> {}
+        struct Response<T> {}
-    trait D {
-        fn foo();
-    }
-    impl<T:A> D for Response<T> {
+        trait D {
-        fn foo() {
+            fn foo();
-            end();
+        }
-            fn end<W: Write>() {
-                let _x: T =  loop {};
+        impl<T:A> D for Response<T> {
+            fn foo() {
+                end();
+                fn end<W: Write>() {
+                    let _x: T =  loop {};
+                }
            }
        }
-    }"#
+        "#,
-        ),
+        expect![[r#"
-        @r###"
+            119..214 '{     ...     }': ()
-    147..262 '{     ...     }': ()
+            129..132 'end': fn end<{unknown}>()
-    161..164 'end': fn end<{unknown}>()
+            129..134 'end()': ()
-    161..166 'end()': ()
+            163..208 '{     ...     }': ()
-    199..252 '{     ...     }': ()
+            181..183 '_x': !
-    221..223 '_x': !
+            190..197 'loop {}': !
-    230..237 'loop {}': !
+            195..197 '{}': ()
-    235..237 '{}': ()
+        "#]],
-    "###
    )
 }
 #[test]
 fn issue_2705() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait {}
+        trait Trait {}
-fn test() {
+        fn test() {
-    <Trait<u32>>::foo()
+            <Trait<u32>>::foo()
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    25..52 '{     ...oo() }': ()
+            25..52 '{     ...oo() }': ()
-    31..48 '<Trait...>::foo': {unknown}
+            31..48 '<Trait...>::foo': {unknown}
-    31..50 '<Trait...:foo()': ()
+            31..50 '<Trait...:foo()': ()
-    "###
+        "#]],
    );
 }
@@ -479,25 +480,25 @@ fn main() {
 #[test]
 fn issue_3999_slice() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo(params: &[usize]) {
+        fn foo(params: &[usize]) {
-    match params {
+            match params {
-        [ps @ .., _] => {}
+                [ps @ .., _] => {}
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    7..13 'params': &[usize]
+            7..13 'params': &[usize]
-    25..80 '{     ...   } }': ()
+            25..80 '{     ...   } }': ()
-    31..78 'match ...     }': ()
+            31..78 'match ...     }': ()
-    37..43 'params': &[usize]
+            37..43 'params': &[usize]
-    54..66 '[ps @ .., _]': [usize]
+            54..66 '[ps @ .., _]': [usize]
-    55..62 'ps @ ..': &[usize]
+            55..62 'ps @ ..': &[usize]
-    60..62 '..': [usize]
+            60..62 '..': [usize]
-    64..65 '_': usize
+            64..65 '_': usize
-    70..72 '{}': ()
+            70..72 '{}': ()
-    "###
+        "#]],
    );
 }
@@ -505,277 +506,337 @@ fn foo(params: &[usize]) {
 fn issue_3999_struct() {
    // rust-analyzer should not panic on seeing this malformed
    // record pattern.
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Bar {
+        struct Bar {
-    a: bool,
+            a: bool,
-}
+        }
-fn foo(b: Bar) {
+        fn foo(b: Bar) {
-    match b {
+            match b {
-        Bar { a: .. } => {},
+                Bar { a: .. } => {},
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    35..36 'b': Bar
+            35..36 'b': Bar
-    43..95 '{     ...   } }': ()
+            43..95 '{     ...   } }': ()
-    49..93 'match ...     }': ()
+            49..93 'match ...     }': ()
-    55..56 'b': Bar
+            55..56 'b': Bar
-    67..80 'Bar { a: .. }': Bar
+            67..80 'Bar { a: .. }': Bar
-    76..78 '..': bool
+            76..78 '..': bool
-    84..86 '{}': ()
+            84..86 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn issue_4235_name_conflicts() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct FOO {}
+        struct FOO {}
-static FOO:FOO = FOO {};
+        static FOO:FOO = FOO {};
-impl FOO {
+        impl FOO {
-    fn foo(&self) {}
+            fn foo(&self) {}
-}
+        }
-fn main() {
+        fn main() {
-    let a = &FOO;
+            let a = &FOO;
-    a.foo();
+            a.foo();
-}
+        }
-"#), @r###"
+        "#,
-    31..37 'FOO {}': FOO
+        expect![[r#"
-    63..67 'self': &FOO
+            31..37 'FOO {}': FOO
-    69..71 '{}': ()
+            63..67 'self': &FOO
-    85..119 '{     ...o(); }': ()
+            69..71 '{}': ()
-    95..96 'a': &FOO
+            85..119 '{     ...o(); }': ()
-    99..103 '&FOO': &FOO
+            95..96 'a': &FOO
-    100..103 'FOO': FOO
+            99..103 '&FOO': &FOO
-    109..110 'a': &FOO
+            100..103 'FOO': FOO
-    109..116 'a.foo()': ()
+            109..110 'a': &FOO
-    "###
+            109..116 'a.foo()': ()
+        "#]],
    );
 }
 #[test]
 fn issue_4465_dollar_crate_at_type() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-pub struct Foo {}
+        pub struct Foo {}
-pub fn anything<T>() -> T {
+        pub fn anything<T>() -> T {
-    loop {}
+            loop {}
-}
+        }
-macro_rules! foo {
+        macro_rules! foo {
-    () => {{
+            () => {{
-        let r: $crate::Foo = anything();
+                let r: $crate::Foo = anything();
-        r
+                r
-    }};
+            }};
-}
+        }
-fn main() {
+        fn main() {
-    let _a = foo!();
+            let _a = foo!();
-}
+        }
-"#), @r###"
+        "#,
-    44..59 '{     loop {} }': T
+        expect![[r#"
-    50..57 'loop {}': !
+            44..59 '{     loop {} }': T
-    55..57 '{}': ()
+            50..57 'loop {}': !
-    !0..31 '{letr:...g();r}': Foo
+            55..57 '{}': ()
-    !4..5 'r': Foo
+            !0..31 '{letr:...g();r}': Foo
-    !18..26 'anything': fn anything<Foo>() -> Foo
+            !4..5 'r': Foo
-    !18..28 'anything()': Foo
+            !18..26 'anything': fn anything<Foo>() -> Foo
-    !29..30 'r': Foo
+            !18..28 'anything()': Foo
-    163..187 '{     ...!(); }': ()
+            !29..30 'r': Foo
-    173..175 '_a': Foo
+            163..187 '{     ...!(); }': ()
-    "###);
+            173..175 '_a': Foo
+        "#]],
+    );
 }
 #[test]
 fn issue_4053_diesel_where_clauses() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait BoxedDsl<DB> {
+        trait BoxedDsl<DB> {
-    type Output;
+            type Output;
-    fn internal_into_boxed(self) -> Self::Output;
+            fn internal_into_boxed(self) -> Self::Output;
-}
+        }
-struct SelectStatement<From, Select, Distinct, Where, Order, LimitOffset, GroupBy, Locking> {
+        struct SelectStatement<From, Select, Distinct, Where, Order, LimitOffset, GroupBy, Locking> {
-    order: Order,
+            order: Order,
-}
+        }
-trait QueryFragment<DB: Backend> {}
+        trait QueryFragment<DB: Backend> {}
-trait Into<T> { fn into(self) -> T; }
+        trait Into<T> { fn into(self) -> T; }
-impl<F, S, D, W, O, LOf, DB> BoxedDsl<DB>
+        impl<F, S, D, W, O, LOf, DB> BoxedDsl<DB>
-    for SelectStatement<F, S, D, W, O, LOf, G>
+            for SelectStatement<F, S, D, W, O, LOf, G>
-where
+        where
-    O: Into<dyn QueryFragment<DB>>,
+            O: Into<dyn QueryFragment<DB>>,
-{
+        {
-    type Output = XXX;
+            type Output = XXX;
-    fn internal_into_boxed(self) -> Self::Output {
+            fn internal_into_boxed(self) -> Self::Output {
-        self.order.into();
+                self.order.into();
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    65..69 'self': Self
+            65..69 'self': Self
-    267..271 'self': Self
+            267..271 'self': Self
-    466..470 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
+            466..470 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
-    488..522 '{     ...     }': ()
+            488..522 '{     ...     }': ()
-    498..502 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
+            498..502 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
-    498..508 'self.order': O
+            498..508 'self.order': O
-    498..515 'self.o...into()': dyn QueryFragment<DB>
+            498..515 'self.o...into()': dyn QueryFragment<DB>
-    "###
+        "#]],
    );
 }
 #[test]
 fn issue_4953() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-pub struct Foo(pub i64);
+        pub struct Foo(pub i64);
-impl Foo {
+        impl Foo {
-    fn test() -> Self { Self(0i64) }
+            fn test() -> Self { Self(0i64) }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    58..72 '{ Self(0i64) }': Foo
+            58..72 '{ Self(0i64) }': Foo
-    60..64 'Self': Foo(i64) -> Foo
+            60..64 'Self': Foo(i64) -> Foo
-    60..70 'Self(0i64)': Foo
+            60..70 'Self(0i64)': Foo
-    65..69 '0i64': i64
+            65..69 '0i64': i64
-    "###
+        "#]],
    );
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-pub struct Foo<T>(pub T);
+        pub struct Foo<T>(pub T);
-impl Foo<i64> {
+        impl Foo<i64> {
-    fn test() -> Self { Self(0i64) }
+            fn test() -> Self { Self(0i64) }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    64..78 '{ Self(0i64) }': Foo<i64>
+            64..78 '{ Self(0i64) }': Foo<i64>
-    66..70 'Self': Foo<i64>(i64) -> Foo<i64>
+            66..70 'Self': Foo<i64>(i64) -> Foo<i64>
-    66..76 'Self(0i64)': Foo<i64>
+            66..76 'Self(0i64)': Foo<i64>
-    71..75 '0i64': i64
+            71..75 '0i64': i64
-    "###
+        "#]],
    );
 }
 #[test]
 fn issue_4931() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Div<T> {
+        trait Div<T> {
-    type Output;
+            type Output;
-}
+        }
-trait CheckedDiv: Div<()> {}
+        trait CheckedDiv: Div<()> {}
-trait PrimInt: CheckedDiv<Output = ()> {
+        trait PrimInt: CheckedDiv<Output = ()> {
-    fn pow(self);
+            fn pow(self);
-}
+        }
-fn check<T: PrimInt>(i: T) {
+        fn check<T: PrimInt>(i: T) {
-    i.pow();
+            i.pow();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    117..121 'self': Self
+            117..121 'self': Self
-    148..149 'i': T
+            148..149 'i': T
-    154..170 '{     ...w(); }': ()
+            154..170 '{     ...w(); }': ()
-    160..161 'i': T
+            160..161 'i': T
-    160..167 'i.pow()': ()
+            160..167 'i.pow()': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn issue_4885() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang = "coerce_unsized"]
+        #[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
+        pub trait CoerceUnsized<T> {}
-trait Future {
+        trait Future {
-    type Output;
+            type Output;
-}
+        }
-trait Foo<R> {
+        trait Foo<R> {
-    type Bar;
+            type Bar;
-}
+        }
-fn foo<R, K>(key: &K) -> impl Future<Output = K::Bar>
+        fn foo<R, K>(key: &K) -> impl Future<Output = K::Bar>
-where
+        where
-    K: Foo<R>,
+            K: Foo<R>,
-{
+        {
-    bar(key)
+            bar(key)
-}
+        }
-fn bar<R, K>(key: &K) -> impl Future<Output = K::Bar>
+        fn bar<R, K>(key: &K) -> impl Future<Output = K::Bar>
-where
+        where
-    K: Foo<R>,
+            K: Foo<R>,
-{
+        {
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    136..139 'key': &K
+            136..139 'key': &K
-    198..214 '{     ...key) }': impl Future<Output = <K as Foo<R>>::Bar>
+            198..214 '{     ...key) }': impl Future<Output = <K as Foo<R>>::Bar>
-    204..207 'bar': fn bar<R, K>(&K) -> impl Future<Output = <K as Foo<R>>::Bar>
+            204..207 'bar': fn bar<R, K>(&K) -> impl Future<Output = <K as Foo<R>>::Bar>
-    204..212 'bar(key)': impl Future<Output = <K as Foo<R>>::Bar>
+            204..212 'bar(key)': impl Future<Output = <K as Foo<R>>::Bar>
-    208..211 'key': &K
+            208..211 'key': &K
-    228..231 'key': &K
+            228..231 'key': &K
-    290..293 '{ }': ()
+            290..293 '{ }': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn issue_4800() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Debug {}
+        trait Debug {}
-struct Foo<T>;
+        struct Foo<T>;
-type E1<T> = (T, T, T);
+        type E1<T> = (T, T, T);
-type E2<T> = E1<E1<E1<(T, T, T)>>>;
+        type E2<T> = E1<E1<E1<(T, T, T)>>>;
-impl Debug for Foo<E2<()>> {}
+        impl Debug for Foo<E2<()>> {}
-struct Request;
+        struct Request;
-pub trait Future {
+        pub trait Future {
-    type Output;
+            type Output;
-}
+        }
-pub struct PeerSet<D>;
+        pub struct PeerSet<D>;
-impl<D> Service<Request> for PeerSet<D>
+        impl<D> Service<Request> for PeerSet<D>
-where
+        where
-    D: Discover,
+            D: Discover,
-    D::Key: Debug,
+            D::Key: Debug,
-{
+        {
-    type Error = ();
+            type Error = ();
-    type Future = dyn Future<Output = Self::Error>;
+            type Future = dyn Future<Output = Self::Error>;
-    fn call(&mut self) -> Self::Future {
+            fn call(&mut self) -> Self::Future {
-        loop {}
+                loop {}
-    }
+            }
-}
+        }
-pub trait Discover {
+        pub trait Discover {
-    type Key;
+            type Key;
-}
+        }
-pub trait Service<Request> {
+        pub trait Service<Request> {
-    type Error;
+            type Error;
-    type Future: Future<Output = Self::Error>;
+            type Future: Future<Output = Self::Error>;
-    fn call(&mut self) -> Self::Future;
+            fn call(&mut self) -> Self::Future;
+        }
+        "#,
+        expect![[r#"
+            379..383 'self': &mut PeerSet<D>
+            401..424 '{     ...     }': dyn Future<Output = ()>
+            411..418 'loop {}': !
+            416..418 '{}': ()
+            575..579 'self': &mut Self
+        "#]],
+    );
 }
-"#),
-        @r###"
+#[test]
-    379..383 'self': &mut PeerSet<D>
+fn issue_4966() {
-    401..424 '{     ...     }': dyn Future<Output = ()>
+    check_infer(
-    411..418 'loop {}': !
+        r#"
-    416..418 '{}': ()
+        pub trait IntoIterator {
-    575..579 'self': &mut Self
+            type Item;
-    "###
+        }
+        struct Repeat<A> { element: A }
+        struct Map<F> { f: F }
+        struct Vec<T> {}
+        #[lang = "deref"]
+        pub trait Deref {
+            type Target;
+        }
+        impl<T> Deref for Vec<T> {
+            type Target = [T];
+        }
+        fn from_iter<A, T: IntoIterator<Item = A>>(iter: T) -> Vec<A> {}
+        fn main() {
+            let inner = Map { f: |_: &f64| 0.0 };
+            let repeat = Repeat { element: inner };
+            let vec = from_iter(repeat);
+            vec.foo_bar();
+        }
+        "#,
+        expect![[r#"
+            270..274 'iter': T
+            289..291 '{}': ()
+            303..447 '{     ...r(); }': ()
+            313..318 'inner': Map<|&f64| -> f64>
+            321..345 'Map { ... 0.0 }': Map<|&f64| -> f64>
+            330..343 '|_: &f64| 0.0': |&f64| -> f64
+            331..332 '_': &f64
+            340..343 '0.0': f64
+            356..362 'repeat': Repeat<Map<|&f64| -> f64>>
+            365..390 'Repeat...nner }': Repeat<Map<|&f64| -> f64>>
+            383..388 'inner': Map<|&f64| -> f64>
+            401..404 'vec': Vec<IntoIterator::Item<Repeat<Map<|&f64| -> f64>>>>
+            407..416 'from_iter': fn from_iter<IntoIterator::Item<Repeat<Map<|&f64| -> f64>>>, Repeat<Map<|&f64| -> f64>>>(Repeat<Map<|&f64| -> f64>>) -> Vec<IntoIterator::Item<Repeat<Map<|&f64| -> f64>>>>
+            407..424 'from_i...epeat)': Vec<IntoIterator::Item<Repeat<Map<|&f64| -> f64>>>>
+            417..423 'repeat': Repeat<Map<|&f64| -> f64>>
+            431..434 'vec': Vec<IntoIterator::Item<Repeat<Map<|&f64| -> f64>>>>
+            431..444 'vec.foo_bar()': {unknown}
+        "#]],
    );
 }
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs
index de63f4cce..3fd7d5cd4 100644
--- a/crates/ra_hir_ty/src/tests/simple.rs
+++ b/crates/ra_hir_ty/src/tests/simple.rs
@@ -1,6 +1,6 @@
-use insta::assert_snapshot;
+use expect::expect;
-use super::{check_types, infer};
+use super::{check_infer, check_types};
 #[test]
 fn infer_box() {
@@ -45,43 +45,44 @@ fn test() {
 #[test]
 fn self_in_struct_lit() {
-    assert_snapshot!(infer(
+    check_infer(
        r#"
-//- /main.rs
+        //- /main.rs
-struct S<T> { x: T }
+        struct S<T> { x: T }
-impl S<u32> {
+        impl S<u32> {
-    fn foo() {
+            fn foo() {
-        Self { x: 1 };
+                Self { x: 1 };
-    }
+            }
-}
+        }
-"#,
+        "#,
-    ), @r###"
+        expect![[r#"
-    49..79 '{     ...     }': ()
+            49..79 '{     ...     }': ()
-    59..72 'Self { x: 1 }': S<u32>
+            59..72 'Self { x: 1 }': S<u32>
-    69..70 '1': u32
+            69..70 '1': u32
-    "###);
+        "#]],
+    );
 }
 #[test]
 fn type_alias_in_struct_lit() {
-    assert_snapshot!(infer(
+    check_infer(
        r#"
-//- /main.rs
+        //- /main.rs
-struct S<T> { x: T }
+        struct S<T> { x: T }
-type SS = S<u32>;
+        type SS = S<u32>;
-fn foo() {
+        fn foo() {
-    SS { x: 1 };
+            SS { x: 1 };
-}
+        }
+        "#,
-"#,
+        expect![[r#"
-    ), @r###"
+            50..70 '{     ...1 }; }': ()
-    50..70 '{     ...1 }; }': ()
+            56..67 'SS { x: 1 }': S<u32>
-    56..67 'SS { x: 1 }': S<u32>
+            64..65 '1': u32
-    64..65 '1': u32
+        "#]],
-    "###);
+    );
 }
 #[test]
@@ -148,1526 +149,1549 @@ fn test() {
 #[test]
 fn infer_basics() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test(a: u32, b: isize, c: !, d: &str) {
+        fn test(a: u32, b: isize, c: !, d: &str) {
-    a;
+            a;
-    b;
+            b;
-    c;
+            c;
-    d;
+            d;
-    1usize;
+            1usize;
-    1isize;
+            1isize;
-    "test";
+            "test";
-    1.0f32;
+            1.0f32;
-}"#),
+        }"#,
-        @r###"
+        expect![[r#"
-    8..9 'a': u32
+            8..9 'a': u32
-    16..17 'b': isize
+            16..17 'b': isize
-    26..27 'c': !
+            26..27 'c': !
-    32..33 'd': &str
+            32..33 'd': &str
-    41..120 '{     ...f32; }': ()
+            41..120 '{     ...f32; }': ()
-    47..48 'a': u32
+            47..48 'a': u32
-    54..55 'b': isize
+            54..55 'b': isize
-    61..62 'c': !
+            61..62 'c': !
-    68..69 'd': &str
+            68..69 'd': &str
-    75..81 '1usize': usize
+            75..81 '1usize': usize
-    87..93 '1isize': isize
+            87..93 '1isize': isize
-    99..105 '"test"': &str
+            99..105 '"test"': &str
-    111..117 '1.0f32': f32
+            111..117 '1.0f32': f32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_let() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-    let a = 1isize;
+            let a = 1isize;
-    let b: usize = 1;
+            let b: usize = 1;
-    let c = b;
+            let c = b;
-    let d: u32;
+            let d: u32;
-    let e;
+            let e;
-    let f: i32 = e;
+            let f: i32 = e;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    10..117 '{     ...= e; }': ()
+            10..117 '{     ...= e; }': ()
-    20..21 'a': isize
+            20..21 'a': isize
-    24..30 '1isize': isize
+            24..30 '1isize': isize
-    40..41 'b': usize
+            40..41 'b': usize
-    51..52 '1': usize
+            51..52 '1': usize
-    62..63 'c': usize
+            62..63 'c': usize
-    66..67 'b': usize
+            66..67 'b': usize
-    77..78 'd': u32
+            77..78 'd': u32
-    93..94 'e': i32
+            93..94 'e': i32
-    104..105 'f': i32
+            104..105 'f': i32
-    113..114 'e': i32
+            113..114 'e': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_paths() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn a() -> u32 { 1 }
+        fn a() -> u32 { 1 }
-mod b {
+        mod b {
-    fn c() -> u32 { 1 }
+            fn c() -> u32 { 1 }
-}
+        }
-fn test() {
+        fn test() {
-    a();
+            a();
-    b::c();
+            b::c();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    14..19 '{ 1 }': u32
+            14..19 '{ 1 }': u32
-    16..17 '1': u32
+            16..17 '1': u32
-    47..52 '{ 1 }': u32
+            47..52 '{ 1 }': u32
-    49..50 '1': u32
+            49..50 '1': u32
-    66..90 '{     ...c(); }': ()
+            66..90 '{     ...c(); }': ()
-    72..73 'a': fn a() -> u32
+            72..73 'a': fn a() -> u32
-    72..75 'a()': u32
+            72..75 'a()': u32
-    81..85 'b::c': fn c() -> u32
+            81..85 'b::c': fn c() -> u32
-    81..87 'b::c()': u32
+            81..87 'b::c()': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_path_type() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct S;
+        struct S;
-impl S {
+        impl S {
-    fn foo() -> i32 { 1 }
+            fn foo() -> i32 { 1 }
-}
+        }
-fn test() {
+        fn test() {
-    S::foo();
+            S::foo();
-    <S>::foo();
+            <S>::foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    40..45 '{ 1 }': i32
+            40..45 '{ 1 }': i32
-    42..43 '1': i32
+            42..43 '1': i32
-    59..92 '{     ...o(); }': ()
+            59..92 '{     ...o(); }': ()
-    65..71 'S::foo': fn foo() -> i32
+            65..71 'S::foo': fn foo() -> i32
-    65..73 'S::foo()': i32
+            65..73 'S::foo()': i32
-    79..87 '<S>::foo': fn foo() -> i32
+            79..87 '<S>::foo': fn foo() -> i32
-    79..89 '<S>::foo()': i32
+            79..89 '<S>::foo()': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_struct() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A {
+        struct A {
-    b: B,
+            b: B,
-    c: C,
+            c: C,
-}
+        }
-struct B;
+        struct B;
-struct C(usize);
+        struct C(usize);
-fn test() {
+        fn test() {
-    let c = C(1);
+            let c = C(1);
-    B;
+            B;
-    let a: A = A { b: B, c: C(1) };
+            let a: A = A { b: B, c: C(1) };
-    a.b;
+            a.b;
-    a.c;
+            a.c;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    71..153 '{     ...a.c; }': ()
+            71..153 '{     ...a.c; }': ()
-    81..82 'c': C
+            81..82 'c': C
-    85..86 'C': C(usize) -> C
+            85..86 'C': C(usize) -> C
-    85..89 'C(1)': C
+            85..89 'C(1)': C
-    87..88 '1': usize
+            87..88 '1': usize
-    95..96 'B': B
+            95..96 'B': B
-    106..107 'a': A
+            106..107 'a': A
-    113..132 'A { b:...C(1) }': A
+            113..132 'A { b:...C(1) }': A
-    120..121 'B': B
+            120..121 'B': B
-    126..127 'C': C(usize) -> C
+            126..127 'C': C(usize) -> C
-    126..130 'C(1)': C
+            126..130 'C(1)': C
-    128..129 '1': usize
+            128..129 '1': usize
-    138..139 'a': A
+            138..139 'a': A
-    138..141 'a.b': B
+            138..141 'a.b': B
-    147..148 'a': A
+            147..148 'a': A
-    147..150 'a.c': C
+            147..150 'a.c': C
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_enum() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum E {
+        enum E {
-  V1 { field: u32 },
+            V1 { field: u32 },
-  V2
+            V2
+        }
+        fn test() {
+            E::V1 { field: 1 };
+            E::V2;
+        }"#,
+        expect![[r#"
+            51..89 '{     ...:V2; }': ()
+            57..75 'E::V1 ...d: 1 }': E
+            72..73 '1': u32
+            81..86 'E::V2': E
+        "#]],
+    );
 }
-fn test() {
-  E::V1 { field: 1 };
+#[test]
-  E::V2;
+fn infer_union() {
-}"#),
+    check_infer(
-        @r###"
+        r#"
-    47..81 '{   E:...:V2; }': ()
+        union MyUnion {
-    51..69 'E::V1 ...d: 1 }': E
+            foo: u32,
-    66..67 '1': u32
+            bar: f32,
-    73..78 'E::V2': E
+        }
-    "###
+        unsafe fn baz(u: MyUnion) {
+            let inner = u.foo;
+        }
+        "#,
+        expect![[r#"
+            61..62 'u': MyUnion
+            73..99 '{     ...foo; }': ()
+            83..88 'inner': u32
+            91..92 'u': MyUnion
+            91..96 'u.foo': u32
+        "#]],
    );
 }
 #[test]
 fn infer_refs() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test(a: &u32, b: &mut u32, c: *const u32, d: *mut u32) {
+        fn test(a: &u32, b: &mut u32, c: *const u32, d: *mut u32) {
-    a;
+            a;
-    *a;
+            *a;
-    &a;
+            &a;
-    &mut a;
+            &mut a;
-    b;
+            b;
-    *b;
+            *b;
-    &b;
+            &b;
-    c;
+            c;
-    *c;
+            *c;
-    d;
+            d;
-    *d;
+            *d;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    8..9 'a': &u32
+            8..9 'a': &u32
-    17..18 'b': &mut u32
+            17..18 'b': &mut u32
-    30..31 'c': *const u32
+            30..31 'c': *const u32
-    45..46 'd': *mut u32
+            45..46 'd': *mut u32
-    58..149 '{     ... *d; }': ()
+            58..149 '{     ... *d; }': ()
-    64..65 'a': &u32
+            64..65 'a': &u32
-    71..73 '*a': u32
+            71..73 '*a': u32
-    72..73 'a': &u32
+            72..73 'a': &u32
-    79..81 '&a': &&u32
+            79..81 '&a': &&u32
-    80..81 'a': &u32
+            80..81 'a': &u32
-    87..93 '&mut a': &mut &u32
+            87..93 '&mut a': &mut &u32
-    92..93 'a': &u32
+            92..93 'a': &u32
-    99..100 'b': &mut u32
+            99..100 'b': &mut u32
-    106..108 '*b': u32
+            106..108 '*b': u32
-    107..108 'b': &mut u32
+            107..108 'b': &mut u32
-    114..116 '&b': &&mut u32
+            114..116 '&b': &&mut u32
-    115..116 'b': &mut u32
+            115..116 'b': &mut u32
-    122..123 'c': *const u32
+            122..123 'c': *const u32
-    129..131 '*c': u32
+            129..131 '*c': u32
-    130..131 'c': *const u32
+            130..131 'c': *const u32
-    137..138 'd': *mut u32
+            137..138 'd': *mut u32
-    144..146 '*d': u32
+            144..146 '*d': u32
-    145..146 'd': *mut u32
+            145..146 'd': *mut u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_raw_ref() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test(a: i32) {
+        fn test(a: i32) {
-    &raw mut a;
+            &raw mut a;
-    &raw const a;
+            &raw const a;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    8..9 'a': i32
+            8..9 'a': i32
-    16..53 '{     ...t a; }': ()
+            16..53 '{     ...t a; }': ()
-    22..32 '&raw mut a': *mut i32
+            22..32 '&raw mut a': *mut i32
-    31..32 'a': i32
+            31..32 'a': i32
-    38..50 '&raw const a': *const i32
+            38..50 '&raw const a': *const i32
-    49..50 'a': i32
+            49..50 'a': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_literals() {
-    assert_snapshot!(
+    check_infer(
-        infer(r##"
+        r##"
-fn test() {
+        fn test() {
-    5i32;
+            5i32;
-    5f32;
+            5f32;
-    5f64;
+            5f64;
-    "hello";
+            "hello";
-    b"bytes";
+            b"bytes";
-    'c';
+            'c';
-    b'b';
+            b'b';
-    3.14;
+            3.14;
-    5000;
+            5000;
-    false;
+            false;
-    true;
+            true;
-    r#"
+            r#"
-        //! doc
+                //! doc
-        // non-doc
+                // non-doc
-        mod foo {}
+                mod foo {}
-        "#;
+            "#;
-    br#"yolo"#;
+            br#"yolo"#;
-}
+        }
-"##),
+        "##,
-        @r###"
+        expect![[r##"
-    10..220 '{     ...o"#; }': ()
+            10..216 '{     ...o"#; }': ()
-    16..20 '5i32': i32
+            16..20 '5i32': i32
-    26..30 '5f32': f32
+            26..30 '5f32': f32
-    36..40 '5f64': f64
+            36..40 '5f64': f64
-    46..53 '"hello"': &str
+            46..53 '"hello"': &str
-    59..67 'b"bytes"': &[u8; _]
+            59..67 'b"bytes"': &[u8; _]
-    73..76 ''c'': char
+            73..76 ''c'': char
-    82..86 'b'b'': u8
+            82..86 'b'b'': u8
-    92..96 '3.14': f64
+            92..96 '3.14': f64
-    102..106 '5000': i32
+            102..106 '5000': i32
-    112..117 'false': bool
+            112..117 'false': bool
-    123..127 'true': bool
+            123..127 'true': bool
-    133..201 'r#"   ...    "#': &str
+            133..197 'r#"   ...    "#': &str
-    207..217 'br#"yolo"#': &[u8; _]
+            203..213 'br#"yolo"#': &[u8; _]
-    "###
+        "##]],
    );
 }
 #[test]
 fn infer_unary_op() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum SomeType {}
+        enum SomeType {}
-fn test(x: SomeType) {
+        fn test(x: SomeType) {
-    let b = false;
+            let b = false;
-    let c = !b;
+            let c = !b;
-    let a = 100;
+            let a = 100;
-    let d: i128 = -a;
+            let d: i128 = -a;
-    let e = -100;
+            let e = -100;
-    let f = !!!true;
+            let f = !!!true;
-    let g = !42;
+            let g = !42;
-    let h = !10u32;
+            let h = !10u32;
-    let j = !a;
+            let j = !a;
-    -3.14;
+            -3.14;
-    !3;
+            !3;
-    -x;
+            -x;
-    !x;
+            !x;
-    -"hello";
+            -"hello";
-    !"hello";
+            !"hello";
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    26..27 'x': SomeType
+            26..27 'x': SomeType
-    39..271 '{     ...lo"; }': ()
+            39..271 '{     ...lo"; }': ()
-    49..50 'b': bool
+            49..50 'b': bool
-    53..58 'false': bool
+            53..58 'false': bool
-    68..69 'c': bool
+            68..69 'c': bool
-    72..74 '!b': bool
+            72..74 '!b': bool
-    73..74 'b': bool
+            73..74 'b': bool
-    84..85 'a': i128
+            84..85 'a': i128
-    88..91 '100': i128
+            88..91 '100': i128
-    101..102 'd': i128
+            101..102 'd': i128
-    111..113 '-a': i128
+            111..113 '-a': i128
-    112..113 'a': i128
+            112..113 'a': i128
-    123..124 'e': i32
+            123..124 'e': i32
-    127..131 '-100': i32
+            127..131 '-100': i32
-    128..131 '100': i32
+            128..131 '100': i32
-    141..142 'f': bool
+            141..142 'f': bool
-    145..152 '!!!true': bool
+            145..152 '!!!true': bool
-    146..152 '!!true': bool
+            146..152 '!!true': bool
-    147..152 '!true': bool
+            147..152 '!true': bool
-    148..152 'true': bool
+            148..152 'true': bool
-    162..163 'g': i32
+            162..163 'g': i32
-    166..169 '!42': i32
+            166..169 '!42': i32
-    167..169 '42': i32
+            167..169 '42': i32
-    179..180 'h': u32
+            179..180 'h': u32
-    183..189 '!10u32': u32
+            183..189 '!10u32': u32
-    184..189 '10u32': u32
+            184..189 '10u32': u32
-    199..200 'j': i128
+            199..200 'j': i128
-    203..205 '!a': i128
+            203..205 '!a': i128
-    204..205 'a': i128
+            204..205 'a': i128
-    211..216 '-3.14': f64
+            211..216 '-3.14': f64
-    212..216 '3.14': f64
+            212..216 '3.14': f64
-    222..224 '!3': i32
+            222..224 '!3': i32
-    223..224 '3': i32
+            223..224 '3': i32
-    230..232 '-x': {unknown}
+            230..232 '-x': {unknown}
-    231..232 'x': SomeType
+            231..232 'x': SomeType
-    238..240 '!x': {unknown}
+            238..240 '!x': {unknown}
-    239..240 'x': SomeType
+            239..240 'x': SomeType
-    246..254 '-"hello"': {unknown}
+            246..254 '-"hello"': {unknown}
-    247..254 '"hello"': &str
+            247..254 '"hello"': &str
-    260..268 '!"hello"': {unknown}
+            260..268 '!"hello"': {unknown}
-    261..268 '"hello"': &str
+            261..268 '"hello"': &str
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_backwards() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn takes_u32(x: u32) {}
+        fn takes_u32(x: u32) {}
-struct S { i32_field: i32 }
+        struct S { i32_field: i32 }
-fn test() -> &mut &f64 {
+        fn test() -> &mut &f64 {
-    let a = unknown_function();
+            let a = unknown_function();
-    takes_u32(a);
+            takes_u32(a);
-    let b = unknown_function();
+            let b = unknown_function();
-    S { i32_field: b };
+            S { i32_field: b };
-    let c = unknown_function();
+            let c = unknown_function();
-    &mut &c
+            &mut &c
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    13..14 'x': u32
+            13..14 'x': u32
-    21..23 '{}': ()
+            21..23 '{}': ()
-    77..230 '{     ...t &c }': &mut &f64
+            77..230 '{     ...t &c }': &mut &f64
-    87..88 'a': u32
+            87..88 'a': u32
-    91..107 'unknow...nction': {unknown}
+            91..107 'unknow...nction': {unknown}
-    91..109 'unknow...tion()': u32
+            91..109 'unknow...tion()': u32
-    115..124 'takes_u32': fn takes_u32(u32)
+            115..124 'takes_u32': fn takes_u32(u32)
-    115..127 'takes_u32(a)': ()
+            115..127 'takes_u32(a)': ()
-    125..126 'a': u32
+            125..126 'a': u32
-    137..138 'b': i32
+            137..138 'b': i32
-    141..157 'unknow...nction': {unknown}
+            141..157 'unknow...nction': {unknown}
-    141..159 'unknow...tion()': i32
+            141..159 'unknow...tion()': i32
-    165..183 'S { i3...d: b }': S
+            165..183 'S { i3...d: b }': S
-    180..181 'b': i32
+            180..181 'b': i32
-    193..194 'c': f64
+            193..194 'c': f64
-    197..213 'unknow...nction': {unknown}
+            197..213 'unknow...nction': {unknown}
-    197..215 'unknow...tion()': f64
+            197..215 'unknow...tion()': f64
-    221..228 '&mut &c': &mut &f64
+            221..228 '&mut &c': &mut &f64
-    226..228 '&c': &f64
+            226..228 '&c': &f64
-    227..228 'c': f64
+            227..228 'c': f64
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_self() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct S;
+        struct S;
-impl S {
+        impl S {
-    fn test(&self) {
+            fn test(&self) {
-        self;
+                self;
-    }
+            }
-    fn test2(self: &Self) {
+            fn test2(self: &Self) {
-        self;
+                self;
-    }
+            }
-    fn test3() -> Self {
+            fn test3() -> Self {
-        S {}
+                S {}
-    }
+            }
-    fn test4() -> Self {
+            fn test4() -> Self {
-        Self {}
+                Self {}
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    33..37 'self': &S
+            33..37 'self': &S
-    39..60 '{     ...     }': ()
+            39..60 '{     ...     }': ()
-    49..53 'self': &S
+            49..53 'self': &S
-    74..78 'self': &S
+            74..78 'self': &S
-    87..108 '{     ...     }': ()
+            87..108 '{     ...     }': ()
-    97..101 'self': &S
+            97..101 'self': &S
-    132..152 '{     ...     }': S
+            132..152 '{     ...     }': S
-    142..146 'S {}': S
+            142..146 'S {}': S
-    176..199 '{     ...     }': S
+            176..199 '{     ...     }': S
-    186..193 'Self {}': S
+            186..193 'Self {}': S
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_self_as_path() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct S1;
+        struct S1;
-struct S2(isize);
+        struct S2(isize);
-enum E {
+        enum E {
-    V1,
+            V1,
-    V2(u32),
+            V2(u32),
-}
+        }
-impl S1 {
+        impl S1 {
-    fn test() {
+            fn test() {
-        Self;
+                Self;
-    }
+            }
-}
+        }
-impl S2 {
+        impl S2 {
-    fn test() {
+            fn test() {
-        Self(1);
+                Self(1);
-    }
+            }
-}
+        }
-impl E {
+        impl E {
-    fn test() {
+            fn test() {
-        Self::V1;
+                Self::V1;
-        Self::V2(1);
+                Self::V2(1);
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    86..107 '{     ...     }': ()
+            86..107 '{     ...     }': ()
-    96..100 'Self': S1
+            96..100 'Self': S1
-    134..158 '{     ...     }': ()
+            134..158 '{     ...     }': ()
-    144..148 'Self': S2(isize) -> S2
+            144..148 'Self': S2(isize) -> S2
-    144..151 'Self(1)': S2
+            144..151 'Self(1)': S2
-    149..150 '1': isize
+            149..150 '1': isize
-    184..230 '{     ...     }': ()
+            184..230 '{     ...     }': ()
-    194..202 'Self::V1': E
+            194..202 'Self::V1': E
-    212..220 'Self::V2': V2(u32) -> E
+            212..220 'Self::V2': V2(u32) -> E
-    212..223 'Self::V2(1)': E
+            212..223 'Self::V2(1)': E
-    221..222 '1': u32
+            221..222 '1': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_binary_op() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn f(x: bool) -> i32 {
+        fn f(x: bool) -> i32 {
-    0i32
+            0i32
-}
+        }
-fn test() -> bool {
+        fn test() -> bool {
-    let x = a && b;
+            let x = a && b;
-    let y = true || false;
+            let y = true || false;
-    let z = x == y;
+            let z = x == y;
-    let t = x != y;
+            let t = x != y;
-    let minus_forty: isize = -40isize;
+            let minus_forty: isize = -40isize;
-    let h = minus_forty <= CONST_2;
+            let h = minus_forty <= CONST_2;
-    let c = f(z || y) + 5;
+            let c = f(z || y) + 5;
-    let d = b;
+            let d = b;
-    let g = minus_forty ^= i;
+            let g = minus_forty ^= i;
-    let ten: usize = 10;
+            let ten: usize = 10;
-    let ten_is_eleven = ten == some_num;
+            let ten_is_eleven = ten == some_num;
-    ten < 3
+            ten < 3
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    5..6 'x': bool
+            5..6 'x': bool
-    21..33 '{     0i32 }': i32
+            21..33 '{     0i32 }': i32
-    27..31 '0i32': i32
+            27..31 '0i32': i32
-    53..369 '{     ... < 3 }': bool
+            53..369 '{     ... < 3 }': bool
-    63..64 'x': bool
+            63..64 'x': bool
-    67..68 'a': bool
+            67..68 'a': bool
-    67..73 'a && b': bool
+            67..73 'a && b': bool
-    72..73 'b': bool
+            72..73 'b': bool
-    83..84 'y': bool
+            83..84 'y': bool
-    87..91 'true': bool
+            87..91 'true': bool
-    87..100 'true || false': bool
+            87..100 'true || false': bool
-    95..100 'false': bool
+            95..100 'false': bool
-    110..111 'z': bool
+            110..111 'z': bool
-    114..115 'x': bool
+            114..115 'x': bool
-    114..120 'x == y': bool
+            114..120 'x == y': bool
-    119..120 'y': bool
+            119..120 'y': bool
-    130..131 't': bool
+            130..131 't': bool
-    134..135 'x': bool
+            134..135 'x': bool
-    134..140 'x != y': bool
+            134..140 'x != y': bool
-    139..140 'y': bool
+            139..140 'y': bool
-    150..161 'minus_forty': isize
+            150..161 'minus_forty': isize
-    171..179 '-40isize': isize
+            171..179 '-40isize': isize
-    172..179 '40isize': isize
+            172..179 '40isize': isize
-    189..190 'h': bool
+            189..190 'h': bool
-    193..204 'minus_forty': isize
+            193..204 'minus_forty': isize
-    193..215 'minus_...ONST_2': bool
+            193..215 'minus_...ONST_2': bool
-    208..215 'CONST_2': isize
+            208..215 'CONST_2': isize
-    225..226 'c': i32
+            225..226 'c': i32
-    229..230 'f': fn f(bool) -> i32
+            229..230 'f': fn f(bool) -> i32
-    229..238 'f(z || y)': i32
+            229..238 'f(z || y)': i32
-    229..242 'f(z || y) + 5': i32
+            229..242 'f(z || y) + 5': i32
-    231..232 'z': bool
+            231..232 'z': bool
-    231..237 'z || y': bool
+            231..237 'z || y': bool
-    236..237 'y': bool
+            236..237 'y': bool
-    241..242 '5': i32
+            241..242 '5': i32
-    252..253 'd': {unknown}
+            252..253 'd': {unknown}
-    256..257 'b': {unknown}
+            256..257 'b': {unknown}
-    267..268 'g': ()
+            267..268 'g': ()
-    271..282 'minus_forty': isize
+            271..282 'minus_forty': isize
-    271..287 'minus_...y ^= i': ()
+            271..287 'minus_...y ^= i': ()
-    286..287 'i': isize
+            286..287 'i': isize
-    297..300 'ten': usize
+            297..300 'ten': usize
-    310..312 '10': usize
+            310..312 '10': usize
-    322..335 'ten_is_eleven': bool
+            322..335 'ten_is_eleven': bool
-    338..341 'ten': usize
+            338..341 'ten': usize
-    338..353 'ten == some_num': bool
+            338..353 'ten == some_num': bool
-    345..353 'some_num': usize
+            345..353 'some_num': usize
-    360..363 'ten': usize
+            360..363 'ten': usize
-    360..367 'ten < 3': bool
+            360..367 'ten < 3': bool
-    366..367 '3': usize
+            366..367 '3': usize
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_shift_op() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test() {
+        fn test() {
-    1u32 << 5u8;
+            1u32 << 5u8;
-    1u32 >> 5u8;
+            1u32 >> 5u8;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    10..47 '{     ...5u8; }': ()
+            10..47 '{     ...5u8; }': ()
-    16..20 '1u32': u32
+            16..20 '1u32': u32
-    16..27 '1u32 << 5u8': u32
+            16..27 '1u32 << 5u8': u32
-    24..27 '5u8': u8
+            24..27 '5u8': u8
-    33..37 '1u32': u32
+            33..37 '1u32': u32
-    33..44 '1u32 >> 5u8': u32
+            33..44 '1u32 >> 5u8': u32
-    41..44 '5u8': u8
+            41..44 '5u8': u8
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_field_autoderef() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A {
+        struct A {
-    b: B,
+            b: B,
-}
+        }
-struct B;
+        struct B;
-fn test1(a: A) {
+        fn test1(a: A) {
-    let a1 = a;
+            let a1 = a;
-    a1.b;
+            a1.b;
-    let a2 = &a;
+            let a2 = &a;
-    a2.b;
+            a2.b;
-    let a3 = &mut a;
+            let a3 = &mut a;
-    a3.b;
+            a3.b;
-    let a4 = &&&&&&&a;
+            let a4 = &&&&&&&a;
-    a4.b;
+            a4.b;
-    let a5 = &mut &&mut &&mut a;
+            let a5 = &mut &&mut &&mut a;
-    a5.b;
+            a5.b;
-}
+        }
-fn test2(a1: *const A, a2: *mut A) {
+        fn test2(a1: *const A, a2: *mut A) {
-    a1.b;
+            a1.b;
-    a2.b;
+            a2.b;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    43..44 'a': A
+            43..44 'a': A
-    49..212 '{     ...5.b; }': ()
+            49..212 '{     ...5.b; }': ()
-    59..61 'a1': A
+            59..61 'a1': A
-    64..65 'a': A
+            64..65 'a': A
-    71..73 'a1': A
+            71..73 'a1': A
-    71..75 'a1.b': B
+            71..75 'a1.b': B
-    85..87 'a2': &A
+            85..87 'a2': &A
-    90..92 '&a': &A
+            90..92 '&a': &A
-    91..92 'a': A
+            91..92 'a': A
-    98..100 'a2': &A
+            98..100 'a2': &A
-    98..102 'a2.b': B
+            98..102 'a2.b': B
-    112..114 'a3': &mut A
+            112..114 'a3': &mut A
-    117..123 '&mut a': &mut A
+            117..123 '&mut a': &mut A
-    122..123 'a': A
+            122..123 'a': A
-    129..131 'a3': &mut A
+            129..131 'a3': &mut A
-    129..133 'a3.b': B
+            129..133 'a3.b': B
-    143..145 'a4': &&&&&&&A
+            143..145 'a4': &&&&&&&A
-    148..156 '&&&&&&&a': &&&&&&&A
+            148..156 '&&&&&&&a': &&&&&&&A
-    149..156 '&&&&&&a': &&&&&&A
+            149..156 '&&&&&&a': &&&&&&A
-    150..156 '&&&&&a': &&&&&A
+            150..156 '&&&&&a': &&&&&A
-    151..156 '&&&&a': &&&&A
+            151..156 '&&&&a': &&&&A
-    152..156 '&&&a': &&&A
+            152..156 '&&&a': &&&A
-    153..156 '&&a': &&A
+            153..156 '&&a': &&A
-    154..156 '&a': &A
+            154..156 '&a': &A
-    155..156 'a': A
+            155..156 'a': A
-    162..164 'a4': &&&&&&&A
+            162..164 'a4': &&&&&&&A
-    162..166 'a4.b': B
+            162..166 'a4.b': B
-    176..178 'a5': &mut &&mut &&mut A
+            176..178 'a5': &mut &&mut &&mut A
-    181..199 '&mut &...&mut a': &mut &&mut &&mut A
+            181..199 '&mut &...&mut a': &mut &&mut &&mut A
-    186..199 '&&mut &&mut a': &&mut &&mut A
+            186..199 '&&mut &&mut a': &&mut &&mut A
-    187..199 '&mut &&mut a': &mut &&mut A
+            187..199 '&mut &&mut a': &mut &&mut A
-    192..199 '&&mut a': &&mut A
+            192..199 '&&mut a': &&mut A
-    193..199 '&mut a': &mut A
+            193..199 '&mut a': &mut A
-    198..199 'a': A
+            198..199 'a': A
-    205..207 'a5': &mut &&mut &&mut A
+            205..207 'a5': &mut &&mut &&mut A
-    205..209 'a5.b': B
+            205..209 'a5.b': B
-    223..225 'a1': *const A
+            223..225 'a1': *const A
-    237..239 'a2': *mut A
+            237..239 'a2': *mut A
-    249..272 '{     ...2.b; }': ()
+            249..272 '{     ...2.b; }': ()
-    255..257 'a1': *const A
+            255..257 'a1': *const A
-    255..259 'a1.b': B
+            255..259 'a1.b': B
-    265..267 'a2': *mut A
+            265..267 'a2': *mut A
-    265..269 'a2.b': B
+            265..269 'a2.b': B
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_argument_autoderef() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang = "deref"]
+        #[lang = "deref"]
-pub trait Deref {
+        pub trait Deref {
-    type Target;
+            type Target;
-    fn deref(&self) -> &Self::Target;
+            fn deref(&self) -> &Self::Target;
-}
+        }
-struct A<T>(T);
+        struct A<T>(T);
-impl<T> A<T> {
+        impl<T> A<T> {
-    fn foo(&self) -> &T {
+            fn foo(&self) -> &T {
-        &self.0
+                &self.0
-    }
+            }
-}
+        }
-struct B<T>(T);
+        struct B<T>(T);
-impl<T> Deref for B<T> {
+        impl<T> Deref for B<T> {
-    type Target = T;
+            type Target = T;
-    fn deref(&self) -> &Self::Target {
+            fn deref(&self) -> &Self::Target {
-        &self.0
+                &self.0
-    }
+            }
-}
+        }
-fn test() {
+        fn test() {
-    let t = A::foo(&&B(B(A(42))));
+            let t = A::foo(&&B(B(A(42))));
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    67..71 'self': &Self
+            67..71 'self': &Self
-    138..142 'self': &A<T>
+            138..142 'self': &A<T>
-    150..173 '{     ...     }': &T
+            150..173 '{     ...     }': &T
-    160..167 '&self.0': &T
+            160..167 '&self.0': &T
-    161..165 'self': &A<T>
+            161..165 'self': &A<T>
-    161..167 'self.0': T
+            161..167 'self.0': T
-    254..258 'self': &B<T>
+            254..258 'self': &B<T>
-    277..300 '{     ...     }': &T
+            277..300 '{     ...     }': &T
-    287..294 '&self.0': &T
+            287..294 '&self.0': &T
-    288..292 'self': &B<T>
+            288..292 'self': &B<T>
-    288..294 'self.0': T
+            288..294 'self.0': T
-    314..352 '{     ...))); }': ()
+            314..352 '{     ...))); }': ()
-    324..325 't': &i32
+            324..325 't': &i32
-    328..334 'A::foo': fn foo<i32>(&A<i32>) -> &i32
+            328..334 'A::foo': fn foo<i32>(&A<i32>) -> &i32
-    328..349 'A::foo...42))))': &i32
+            328..349 'A::foo...42))))': &i32
-    335..348 '&&B(B(A(42)))': &&B<B<A<i32>>>
+            335..348 '&&B(B(A(42)))': &&B<B<A<i32>>>
-    336..348 '&B(B(A(42)))': &B<B<A<i32>>>
+            336..348 '&B(B(A(42)))': &B<B<A<i32>>>
-    337..338 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
+            337..338 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
-    337..348 'B(B(A(42)))': B<B<A<i32>>>
+            337..348 'B(B(A(42)))': B<B<A<i32>>>
-    339..340 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
+            339..340 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
-    339..347 'B(A(42))': B<A<i32>>
+            339..347 'B(A(42))': B<A<i32>>
-    341..342 'A': A<i32>(i32) -> A<i32>
+            341..342 'A': A<i32>(i32) -> A<i32>
-    341..346 'A(42)': A<i32>
+            341..346 'A(42)': A<i32>
-    343..345 '42': i32
+            343..345 '42': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_method_argument_autoderef() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang = "deref"]
+        #[lang = "deref"]
-pub trait Deref {
+        pub trait Deref {
-    type Target;
+            type Target;
-    fn deref(&self) -> &Self::Target;
+            fn deref(&self) -> &Self::Target;
-}
+        }
-struct A<T>(*mut T);
+        struct A<T>(*mut T);
-impl<T> A<T> {
+        impl<T> A<T> {
-    fn foo(&self, x: &A<T>) -> &T {
+            fn foo(&self, x: &A<T>) -> &T {
-        &*x.0
+                &*x.0
-    }
+            }
-}
+        }
-struct B<T>(T);
+        struct B<T>(T);
-impl<T> Deref for B<T> {
+        impl<T> Deref for B<T> {
-    type Target = T;
+            type Target = T;
-    fn deref(&self) -> &Self::Target {
+            fn deref(&self) -> &Self::Target {
-        &self.0
+                &self.0
-    }
+            }
-}
+        }
-fn test(a: A<i32>) {
+        fn test(a: A<i32>) {
-    let t = A(0 as *mut _).foo(&&B(B(a)));
+            let t = A(0 as *mut _).foo(&&B(B(a)));
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    67..71 'self': &Self
+            67..71 'self': &Self
-    143..147 'self': &A<T>
+            143..147 'self': &A<T>
-    149..150 'x': &A<T>
+            149..150 'x': &A<T>
-    165..186 '{     ...     }': &T
+            165..186 '{     ...     }': &T
-    175..180 '&*x.0': &T
+            175..180 '&*x.0': &T
-    176..180 '*x.0': T
+            176..180 '*x.0': T
-    177..178 'x': &A<T>
+            177..178 'x': &A<T>
-    177..180 'x.0': *mut T
+            177..180 'x.0': *mut T
-    267..271 'self': &B<T>
+            267..271 'self': &B<T>
-    290..313 '{     ...     }': &T
+            290..313 '{     ...     }': &T
-    300..307 '&self.0': &T
+            300..307 '&self.0': &T
-    301..305 'self': &B<T>
+            301..305 'self': &B<T>
-    301..307 'self.0': T
+            301..307 'self.0': T
-    325..326 'a': A<i32>
+            325..326 'a': A<i32>
-    336..382 '{     ...))); }': ()
+            336..382 '{     ...))); }': ()
-    346..347 't': &i32
+            346..347 't': &i32
-    350..351 'A': A<i32>(*mut i32) -> A<i32>
+            350..351 'A': A<i32>(*mut i32) -> A<i32>
-    350..364 'A(0 as *mut _)': A<i32>
+            350..364 'A(0 as *mut _)': A<i32>
-    350..379 'A(0 as...B(a)))': &i32
+            350..379 'A(0 as...B(a)))': &i32
-    352..353 '0': i32
+            352..353 '0': i32
-    352..363 '0 as *mut _': *mut i32
+            352..363 '0 as *mut _': *mut i32
-    369..378 '&&B(B(a))': &&B<B<A<i32>>>
+            369..378 '&&B(B(a))': &&B<B<A<i32>>>
-    370..378 '&B(B(a))': &B<B<A<i32>>>
+            370..378 '&B(B(a))': &B<B<A<i32>>>
-    371..372 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
+            371..372 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
-    371..378 'B(B(a))': B<B<A<i32>>>
+            371..378 'B(B(a))': B<B<A<i32>>>
-    373..374 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
+            373..374 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
-    373..377 'B(a)': B<A<i32>>
+            373..377 'B(a)': B<A<i32>>
-    375..376 'a': A<i32>
+            375..376 'a': A<i32>
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_in_elseif() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Foo { field: i32 }
+        struct Foo { field: i32 }
-fn main(foo: Foo) {
+        fn main(foo: Foo) {
-    if true {
+            if true {
-    } else if false {
+            } else if false {
-        foo.field
+                foo.field
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    34..37 'foo': Foo
+            34..37 'foo': Foo
-    44..108 '{     ...   } }': ()
+            44..108 '{     ...   } }': ()
-    50..106 'if tru...     }': ()
+            50..106 'if tru...     }': ()
-    53..57 'true': bool
+            53..57 'true': bool
-    58..66 '{      }': ()
+            58..66 '{      }': ()
-    72..106 'if fal...     }': i32
+            72..106 'if fal...     }': i32
-    75..80 'false': bool
+            75..80 'false': bool
-    81..106 '{     ...     }': i32
+            81..106 '{     ...     }': i32
-    91..94 'foo': Foo
+            91..94 'foo': Foo
-    91..100 'foo.field': i32
+            91..100 'foo.field': i32
-    "###
+        "#]],
    )
 }
 #[test]
 fn infer_if_match_with_return() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo() {
+        fn foo() {
-    let _x1 = if true {
+            let _x1 = if true {
-        1
+                1
-    } else {
+            } else {
-        return;
+                return;
-    };
+            };
-    let _x2 = if true {
+            let _x2 = if true {
-        2
+                2
-    } else {
+            } else {
-        return
+                return
-    };
+            };
-    let _x3 = match true {
+            let _x3 = match true {
-        true => 3,
+                true => 3,
-        _ => {
+                _ => {
-            return;
+                    return;
-        }
+                }
-    };
+            };
-    let _x4 = match true {
+            let _x4 = match true {
-        true => 4,
+                true => 4,
-        _ => return
+                _ => return
-    };
+            };
-}"#),
+        }"#,
-        @r###"
+        expect![[r#"
-    9..322 '{     ...  }; }': ()
+            9..322 '{     ...  }; }': ()
-    19..22 '_x1': i32
+            19..22 '_x1': i32
-    25..79 'if tru...     }': i32
+            25..79 'if tru...     }': i32
-    28..32 'true': bool
+            28..32 'true': bool
-    33..50 '{     ...     }': i32
+            33..50 '{     ...     }': i32
-    43..44 '1': i32
+            43..44 '1': i32
-    56..79 '{     ...     }': i32
+            56..79 '{     ...     }': i32
-    66..72 'return': !
+            66..72 'return': !
-    89..92 '_x2': i32
+            89..92 '_x2': i32
-    95..148 'if tru...     }': i32
+            95..148 'if tru...     }': i32
-    98..102 'true': bool
+            98..102 'true': bool
-    103..120 '{     ...     }': i32
+            103..120 '{     ...     }': i32
-    113..114 '2': i32
+            113..114 '2': i32
-    126..148 '{     ...     }': !
+            126..148 '{     ...     }': !
-    136..142 'return': !
+            136..142 'return': !
-    158..161 '_x3': i32
+            158..161 '_x3': i32
-    164..246 'match ...     }': i32
+            164..246 'match ...     }': i32
-    170..174 'true': bool
+            170..174 'true': bool
-    185..189 'true': bool
+            185..189 'true': bool
-    185..189 'true': bool
+            185..189 'true': bool
-    193..194 '3': i32
+            193..194 '3': i32
-    204..205 '_': bool
+            204..205 '_': bool
-    209..240 '{     ...     }': i32
+            209..240 '{     ...     }': i32
-    223..229 'return': !
+            223..229 'return': !
-    256..259 '_x4': i32
+            256..259 '_x4': i32
-    262..319 'match ...     }': i32
+            262..319 'match ...     }': i32
-    268..272 'true': bool
+            268..272 'true': bool
-    283..287 'true': bool
+            283..287 'true': bool
-    283..287 'true': bool
+            283..287 'true': bool
-    291..292 '4': i32
+            291..292 '4': i32
-    302..303 '_': bool
+            302..303 '_': bool
-    307..313 'return': !
+            307..313 'return': !
-    "###
+        "#]],
    )
 }
 #[test]
 fn infer_inherent_method() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A;
+        struct A;
-impl A {
+        impl A {
-    fn foo(self, x: u32) -> i32 {}
+            fn foo(self, x: u32) -> i32 {}
-}
+        }
-mod b {
+        mod b {
-    impl super::A {
+            impl super::A {
-        fn bar(&self, x: u64) -> i64 {}
+                fn bar(&self, x: u64) -> i64 {}
-    }
+            }
-}
+        }
-fn test(a: A) {
+        fn test(a: A) {
-    a.foo(1);
+            a.foo(1);
-    (&a).bar(1);
+            (&a).bar(1);
-    a.bar(1);
+            a.bar(1);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    31..35 'self': A
+            31..35 'self': A
-    37..38 'x': u32
+            37..38 'x': u32
-    52..54 '{}': ()
+            52..54 '{}': ()
-    102..106 'self': &A
+            102..106 'self': &A
-    108..109 'x': u64
+            108..109 'x': u64
-    123..125 '{}': ()
+            123..125 '{}': ()
-    143..144 'a': A
+            143..144 'a': A
-    149..197 '{     ...(1); }': ()
+            149..197 '{     ...(1); }': ()
-    155..156 'a': A
+            155..156 'a': A
-    155..163 'a.foo(1)': i32
+            155..163 'a.foo(1)': i32
-    161..162 '1': u32
+            161..162 '1': u32
-    169..180 '(&a).bar(1)': i64
+            169..180 '(&a).bar(1)': i64
-    170..172 '&a': &A
+            170..172 '&a': &A
-    171..172 'a': A
+            171..172 'a': A
-    178..179 '1': u64
+            178..179 '1': u64
-    186..187 'a': A
+            186..187 'a': A
-    186..194 'a.bar(1)': i64
+            186..194 'a.bar(1)': i64
-    192..193 '1': u64
+            192..193 '1': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_inherent_method_str() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang = "str"]
+        #[lang = "str"]
-impl str {
+        impl str {
-    fn foo(&self) -> i32 {}
+            fn foo(&self) -> i32 {}
-}
+        }
-fn test() {
+        fn test() {
-    "foo".foo();
+            "foo".foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    39..43 'self': &str
+            39..43 'self': &str
-    52..54 '{}': ()
+            52..54 '{}': ()
-    68..88 '{     ...o(); }': ()
+            68..88 '{     ...o(); }': ()
-    74..79 '"foo"': &str
+            74..79 '"foo"': &str
-    74..85 '"foo".foo()': i32
+            74..85 '"foo".foo()': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_tuple() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test(x: &str, y: isize) {
+        fn test(x: &str, y: isize) {
-    let a: (u32, &str) = (1, "a");
+            let a: (u32, &str) = (1, "a");
-    let b = (a, x);
+            let b = (a, x);
-    let c = (y, x);
+            let c = (y, x);
-    let d = (c, x);
+            let d = (c, x);
-    let e = (1, "e");
+            let e = (1, "e");
-    let f = (e, "d");
+            let f = (e, "d");
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    8..9 'x': &str
+            8..9 'x': &str
-    17..18 'y': isize
+            17..18 'y': isize
-    27..169 '{     ...d"); }': ()
+            27..169 '{     ...d"); }': ()
-    37..38 'a': (u32, &str)
+            37..38 'a': (u32, &str)
-    54..62 '(1, "a")': (u32, &str)
+            54..62 '(1, "a")': (u32, &str)
-    55..56 '1': u32
+            55..56 '1': u32
-    58..61 '"a"': &str
+            58..61 '"a"': &str
-    72..73 'b': ((u32, &str), &str)
+            72..73 'b': ((u32, &str), &str)
-    76..82 '(a, x)': ((u32, &str), &str)
+            76..82 '(a, x)': ((u32, &str), &str)
-    77..78 'a': (u32, &str)
+            77..78 'a': (u32, &str)
-    80..81 'x': &str
+            80..81 'x': &str
-    92..93 'c': (isize, &str)
+            92..93 'c': (isize, &str)
-    96..102 '(y, x)': (isize, &str)
+            96..102 '(y, x)': (isize, &str)
-    97..98 'y': isize
+            97..98 'y': isize
-    100..101 'x': &str
+            100..101 'x': &str
-    112..113 'd': ((isize, &str), &str)
+            112..113 'd': ((isize, &str), &str)
-    116..122 '(c, x)': ((isize, &str), &str)
+            116..122 '(c, x)': ((isize, &str), &str)
-    117..118 'c': (isize, &str)
+            117..118 'c': (isize, &str)
-    120..121 'x': &str
+            120..121 'x': &str
-    132..133 'e': (i32, &str)
+            132..133 'e': (i32, &str)
-    136..144 '(1, "e")': (i32, &str)
+            136..144 '(1, "e")': (i32, &str)
-    137..138 '1': i32
+            137..138 '1': i32
-    140..143 '"e"': &str
+            140..143 '"e"': &str
-    154..155 'f': ((i32, &str), &str)
+            154..155 'f': ((i32, &str), &str)
-    158..166 '(e, "d")': ((i32, &str), &str)
+            158..166 '(e, "d")': ((i32, &str), &str)
-    159..160 'e': (i32, &str)
+            159..160 'e': (i32, &str)
-    162..165 '"d"': &str
+            162..165 '"d"': &str
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_array() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn test(x: &str, y: isize) {
+        fn test(x: &str, y: isize) {
-    let a = [x];
+            let a = [x];
-    let b = [a, a];
+            let b = [a, a];
-    let c = [b, b];
+            let c = [b, b];
-    let d = [y, 1, 2, 3];
+            let d = [y, 1, 2, 3];
-    let d = [1, y, 2, 3];
+            let d = [1, y, 2, 3];
-    let e = [y];
+            let e = [y];
-    let f = [d, d];
+            let f = [d, d];
-    let g = [e, e];
+            let g = [e, e];
-    let h = [1, 2];
+            let h = [1, 2];
-    let i = ["a", "b"];
+            let i = ["a", "b"];
-    let b = [a, ["b"]];
+            let b = [a, ["b"]];
-    let x: [u8; 0] = [];
+            let x: [u8; 0] = [];
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    8..9 'x': &str
+            8..9 'x': &str
-    17..18 'y': isize
+            17..18 'y': isize
-    27..292 '{     ... []; }': ()
+            27..292 '{     ... []; }': ()
-    37..38 'a': [&str; _]
+            37..38 'a': [&str; _]
-    41..44 '[x]': [&str; _]
+            41..44 '[x]': [&str; _]
-    42..43 'x': &str
+            42..43 'x': &str
-    54..55 'b': [[&str; _]; _]
+            54..55 'b': [[&str; _]; _]
-    58..64 '[a, a]': [[&str; _]; _]
+            58..64 '[a, a]': [[&str; _]; _]
-    59..60 'a': [&str; _]
+            59..60 'a': [&str; _]
-    62..63 'a': [&str; _]
+            62..63 'a': [&str; _]
-    74..75 'c': [[[&str; _]; _]; _]
+            74..75 'c': [[[&str; _]; _]; _]
-    78..84 '[b, b]': [[[&str; _]; _]; _]
+            78..84 '[b, b]': [[[&str; _]; _]; _]
-    79..80 'b': [[&str; _]; _]
+            79..80 'b': [[&str; _]; _]
-    82..83 'b': [[&str; _]; _]
+            82..83 'b': [[&str; _]; _]
-    95..96 'd': [isize; _]
+            95..96 'd': [isize; _]
-    99..111 '[y, 1, 2, 3]': [isize; _]
+            99..111 '[y, 1, 2, 3]': [isize; _]
-    100..101 'y': isize
+            100..101 'y': isize
-    103..104 '1': isize
+            103..104 '1': isize
-    106..107 '2': isize
+            106..107 '2': isize
-    109..110 '3': isize
+            109..110 '3': isize
-    121..122 'd': [isize; _]
+            121..122 'd': [isize; _]
-    125..137 '[1, y, 2, 3]': [isize; _]
+            125..137 '[1, y, 2, 3]': [isize; _]
-    126..127 '1': isize
+            126..127 '1': isize
-    129..130 'y': isize
+            129..130 'y': isize
-    132..133 '2': isize
+            132..133 '2': isize
-    135..136 '3': isize
+            135..136 '3': isize
-    147..148 'e': [isize; _]
+            147..148 'e': [isize; _]
-    151..154 '[y]': [isize; _]
+            151..154 '[y]': [isize; _]
-    152..153 'y': isize
+            152..153 'y': isize
-    164..165 'f': [[isize; _]; _]
+            164..165 'f': [[isize; _]; _]
-    168..174 '[d, d]': [[isize; _]; _]
+            168..174 '[d, d]': [[isize; _]; _]
-    169..170 'd': [isize; _]
+            169..170 'd': [isize; _]
-    172..173 'd': [isize; _]
+            172..173 'd': [isize; _]
-    184..185 'g': [[isize; _]; _]
+            184..185 'g': [[isize; _]; _]
-    188..194 '[e, e]': [[isize; _]; _]
+            188..194 '[e, e]': [[isize; _]; _]
-    189..190 'e': [isize; _]
+            189..190 'e': [isize; _]
-    192..193 'e': [isize; _]
+            192..193 'e': [isize; _]
-    205..206 'h': [i32; _]
+            205..206 'h': [i32; _]
-    209..215 '[1, 2]': [i32; _]
+            209..215 '[1, 2]': [i32; _]
-    210..211 '1': i32
+            210..211 '1': i32
-    213..214 '2': i32
+            213..214 '2': i32
-    225..226 'i': [&str; _]
+            225..226 'i': [&str; _]
-    229..239 '["a", "b"]': [&str; _]
+            229..239 '["a", "b"]': [&str; _]
-    230..233 '"a"': &str
+            230..233 '"a"': &str
-    235..238 '"b"': &str
+            235..238 '"b"': &str
-    250..251 'b': [[&str; _]; _]
+            250..251 'b': [[&str; _]; _]
-    254..264 '[a, ["b"]]': [[&str; _]; _]
+            254..264 '[a, ["b"]]': [[&str; _]; _]
-    255..256 'a': [&str; _]
+            255..256 'a': [&str; _]
-    258..263 '["b"]': [&str; _]
+            258..263 '["b"]': [&str; _]
-    259..262 '"b"': &str
+            259..262 '"b"': &str
-    274..275 'x': [u8; _]
+            274..275 'x': [u8; _]
-    287..289 '[]': [u8; _]
+            287..289 '[]': [u8; _]
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_struct_generics() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<T> {
+        struct A<T> {
-    x: T,
+            x: T,
-}
+        }
-fn test(a1: A<u32>, i: i32) {
+        fn test(a1: A<u32>, i: i32) {
-    a1.x;
+            a1.x;
-    let a2 = A { x: i };
+            let a2 = A { x: i };
-    a2.x;
+            a2.x;
-    let a3 = A::<i128> { x: 1 };
+            let a3 = A::<i128> { x: 1 };
-    a3.x;
+            a3.x;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    35..37 'a1': A<u32>
+            35..37 'a1': A<u32>
-    47..48 'i': i32
+            47..48 'i': i32
-    55..146 '{     ...3.x; }': ()
+            55..146 '{     ...3.x; }': ()
-    61..63 'a1': A<u32>
+            61..63 'a1': A<u32>
-    61..65 'a1.x': u32
+            61..65 'a1.x': u32
-    75..77 'a2': A<i32>
+            75..77 'a2': A<i32>
-    80..90 'A { x: i }': A<i32>
+            80..90 'A { x: i }': A<i32>
-    87..88 'i': i32
+            87..88 'i': i32
-    96..98 'a2': A<i32>
+            96..98 'a2': A<i32>
-    96..100 'a2.x': i32
+            96..100 'a2.x': i32
-    110..112 'a3': A<i128>
+            110..112 'a3': A<i128>
-    115..133 'A::<i1...x: 1 }': A<i128>
+            115..133 'A::<i1...x: 1 }': A<i128>
-    130..131 '1': i128
+            130..131 '1': i128
-    139..141 'a3': A<i128>
+            139..141 'a3': A<i128>
-    139..143 'a3.x': i128
+            139..143 'a3.x': i128
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_tuple_struct_generics() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<T>(T);
+        struct A<T>(T);
-enum Option<T> { Some(T), None }
+        enum Option<T> { Some(T), None }
-use Option::*;
+        use Option::*;
-fn test() {
+        fn test() {
-    A(42);
+            A(42);
-    A(42u128);
+            A(42u128);
-    Some("x");
+            Some("x");
-    Option::Some("x");
+            Option::Some("x");
-    None;
+            None;
-    let x: Option<i64> = None;
+            let x: Option<i64> = None;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    75..183 '{     ...one; }': ()
+            75..183 '{     ...one; }': ()
-    81..82 'A': A<i32>(i32) -> A<i32>
+            81..82 'A': A<i32>(i32) -> A<i32>
-    81..86 'A(42)': A<i32>
+            81..86 'A(42)': A<i32>
-    83..85 '42': i32
+            83..85 '42': i32
-    92..93 'A': A<u128>(u128) -> A<u128>
+            92..93 'A': A<u128>(u128) -> A<u128>
-    92..101 'A(42u128)': A<u128>
+            92..101 'A(42u128)': A<u128>
-    94..100 '42u128': u128
+            94..100 '42u128': u128
-    107..111 'Some': Some<&str>(&str) -> Option<&str>
+            107..111 'Some': Some<&str>(&str) -> Option<&str>
-    107..116 'Some("x")': Option<&str>
+            107..116 'Some("x")': Option<&str>
-    112..115 '"x"': &str
+            112..115 '"x"': &str
-    122..134 'Option::Some': Some<&str>(&str) -> Option<&str>
+            122..134 'Option::Some': Some<&str>(&str) -> Option<&str>
-    122..139 'Option...e("x")': Option<&str>
+            122..139 'Option...e("x")': Option<&str>
-    135..138 '"x"': &str
+            135..138 '"x"': &str
-    145..149 'None': Option<{unknown}>
+            145..149 'None': Option<{unknown}>
-    159..160 'x': Option<i64>
+            159..160 'x': Option<i64>
-    176..180 'None': Option<i64>
+            176..180 'None': Option<i64>
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_function_generics() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn id<T>(t: T) -> T { t }
+        fn id<T>(t: T) -> T { t }
-fn test() {
+        fn test() {
-    id(1u32);
+            id(1u32);
-    id::<i128>(1);
+            id::<i128>(1);
-    let x: u64 = id(1);
+            let x: u64 = id(1);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    9..10 't': T
+            9..10 't': T
-    20..25 '{ t }': T
+            20..25 '{ t }': T
-    22..23 't': T
+            22..23 't': T
-    37..97 '{     ...(1); }': ()
+            37..97 '{     ...(1); }': ()
-    43..45 'id': fn id<u32>(u32) -> u32
+            43..45 'id': fn id<u32>(u32) -> u32
-    43..51 'id(1u32)': u32
+            43..51 'id(1u32)': u32
-    46..50 '1u32': u32
+            46..50 '1u32': u32
-    57..67 'id::<i128>': fn id<i128>(i128) -> i128
+            57..67 'id::<i128>': fn id<i128>(i128) -> i128
-    57..70 'id::<i128>(1)': i128
+            57..70 'id::<i128>(1)': i128
-    68..69 '1': i128
+            68..69 '1': i128
-    80..81 'x': u64
+            80..81 'x': u64
-    89..91 'id': fn id<u64>(u64) -> u64
+            89..91 'id': fn id<u64>(u64) -> u64
-    89..94 'id(1)': u64
+            89..94 'id(1)': u64
-    92..93 '1': u64
+            92..93 '1': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_impl_generics_basic() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<T1, T2> {
+        struct A<T1, T2> {
-    x: T1,
+            x: T1,
-    y: T2,
+            y: T2,
-}
+        }
-impl<Y, X> A<X, Y> {
+        impl<Y, X> A<X, Y> {
-    fn x(self) -> X {
+            fn x(self) -> X {
-        self.x
+                self.x
-    }
+            }
-    fn y(self) -> Y {
+            fn y(self) -> Y {
-        self.y
+                self.y
-    }
+            }
-    fn z<T>(self, t: T) -> (X, Y, T) {
+            fn z<T>(self, t: T) -> (X, Y, T) {
-        (self.x, self.y, t)
+                (self.x, self.y, t)
-    }
+            }
-}
+        }
-fn test() -> i128 {
+        fn test() -> i128 {
-    let a = A { x: 1u64, y: 1i64 };
+            let a = A { x: 1u64, y: 1i64 };
-    a.x();
+            a.x();
-    a.y();
+            a.y();
-    a.z(1i128);
+            a.z(1i128);
-    a.z::<u128>(1);
+            a.z::<u128>(1);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    73..77 'self': A<X, Y>
+            73..77 'self': A<X, Y>
-    84..106 '{     ...     }': X
+            84..106 '{     ...     }': X
-    94..98 'self': A<X, Y>
+            94..98 'self': A<X, Y>
-    94..100 'self.x': X
+            94..100 'self.x': X
-    116..120 'self': A<X, Y>
+            116..120 'self': A<X, Y>
-    127..149 '{     ...     }': Y
+            127..149 '{     ...     }': Y
-    137..141 'self': A<X, Y>
+            137..141 'self': A<X, Y>
-    137..143 'self.y': Y
+            137..143 'self.y': Y
-    162..166 'self': A<X, Y>
+            162..166 'self': A<X, Y>
-    168..169 't': T
+            168..169 't': T
-    187..222 '{     ...     }': (X, Y, T)
+            187..222 '{     ...     }': (X, Y, T)
-    197..216 '(self.....y, t)': (X, Y, T)
+            197..216 '(self.....y, t)': (X, Y, T)
-    198..202 'self': A<X, Y>
+            198..202 'self': A<X, Y>
-    198..204 'self.x': X
+            198..204 'self.x': X
-    206..210 'self': A<X, Y>
+            206..210 'self': A<X, Y>
-    206..212 'self.y': Y
+            206..212 'self.y': Y
-    214..215 't': T
+            214..215 't': T
-    244..341 '{     ...(1); }': ()
+            244..341 '{     ...(1); }': ()
-    254..255 'a': A<u64, i64>
+            254..255 'a': A<u64, i64>
-    258..280 'A { x:...1i64 }': A<u64, i64>
+            258..280 'A { x:...1i64 }': A<u64, i64>
-    265..269 '1u64': u64
+            265..269 '1u64': u64
-    274..278 '1i64': i64
+            274..278 '1i64': i64
-    286..287 'a': A<u64, i64>
+            286..287 'a': A<u64, i64>
-    286..291 'a.x()': u64
+            286..291 'a.x()': u64
-    297..298 'a': A<u64, i64>
+            297..298 'a': A<u64, i64>
-    297..302 'a.y()': i64
+            297..302 'a.y()': i64
-    308..309 'a': A<u64, i64>
+            308..309 'a': A<u64, i64>
-    308..318 'a.z(1i128)': (u64, i64, i128)
+            308..318 'a.z(1i128)': (u64, i64, i128)
-    312..317 '1i128': i128
+            312..317 '1i128': i128
-    324..325 'a': A<u64, i64>
+            324..325 'a': A<u64, i64>
-    324..338 'a.z::<u128>(1)': (u64, i64, u128)
+            324..338 'a.z::<u128>(1)': (u64, i64, u128)
-    336..337 '1': u128
+            336..337 '1': u128
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_impl_generics_with_autoderef() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum Option<T> {
+        enum Option<T> {
-    Some(T),
+            Some(T),
-    None,
+            None,
-}
+        }
-impl<T> Option<T> {
+        impl<T> Option<T> {
-    fn as_ref(&self) -> Option<&T> {}
+            fn as_ref(&self) -> Option<&T> {}
-}
+        }
-fn test(o: Option<u32>) {
+        fn test(o: Option<u32>) {
-    (&o).as_ref();
+            (&o).as_ref();
-    o.as_ref();
+            o.as_ref();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    77..81 'self': &Option<T>
+            77..81 'self': &Option<T>
-    97..99 '{}': ()
+            97..99 '{}': ()
-    110..111 'o': Option<u32>
+            110..111 'o': Option<u32>
-    126..164 '{     ...f(); }': ()
+            126..164 '{     ...f(); }': ()
-    132..145 '(&o).as_ref()': Option<&u32>
+            132..145 '(&o).as_ref()': Option<&u32>
-    133..135 '&o': &Option<u32>
+            133..135 '&o': &Option<u32>
-    134..135 'o': Option<u32>
+            134..135 'o': Option<u32>
-    151..152 'o': Option<u32>
+            151..152 'o': Option<u32>
-    151..161 'o.as_ref()': Option<&u32>
+            151..161 'o.as_ref()': Option<&u32>
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_generic_chain() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<T> {
+        struct A<T> {
-    x: T,
+            x: T,
-}
+        }
-impl<T2> A<T2> {
+        impl<T2> A<T2> {
-    fn x(self) -> T2 {
+            fn x(self) -> T2 {
-        self.x
+                self.x
-    }
+            }
-}
+        }
-fn id<T>(t: T) -> T { t }
+        fn id<T>(t: T) -> T { t }
-fn test() -> i128 {
+        fn test() -> i128 {
-     let x = 1;
+            let x = 1;
-     let y = id(x);
+            let y = id(x);
-     let a = A { x: id(y) };
+            let a = A { x: id(y) };
-     let z = id(a.x);
+            let z = id(a.x);
-     let b = A { x: z };
+            let b = A { x: z };
-     b.x()
+            b.x()
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    52..56 'self': A<T2>
+            52..56 'self': A<T2>
-    64..86 '{     ...     }': T2
+            64..86 '{     ...     }': T2
-    74..78 'self': A<T2>
+            74..78 'self': A<T2>
-    74..80 'self.x': T2
+            74..80 'self.x': T2
-    98..99 't': T
+            98..99 't': T
-    109..114 '{ t }': T
+            109..114 '{ t }': T
-    111..112 't': T
+            111..112 't': T
-    134..260 '{     ....x() }': i128
+            134..254 '{     ....x() }': i128
-    145..146 'x': i128
+            144..145 'x': i128
-    149..150 '1': i128
+            148..149 '1': i128
-    161..162 'y': i128
+            159..160 'y': i128
-    165..167 'id': fn id<i128>(i128) -> i128
+            163..165 'id': fn id<i128>(i128) -> i128
-    165..170 'id(x)': i128
+            163..168 'id(x)': i128
-    168..169 'x': i128
+            166..167 'x': i128
-    181..182 'a': A<i128>
+            178..179 'a': A<i128>
-    185..199 'A { x: id(y) }': A<i128>
+            182..196 'A { x: id(y) }': A<i128>
-    192..194 'id': fn id<i128>(i128) -> i128
+            189..191 'id': fn id<i128>(i128) -> i128
-    192..197 'id(y)': i128
+            189..194 'id(y)': i128
-    195..196 'y': i128
+            192..193 'y': i128
-    210..211 'z': i128
+            206..207 'z': i128
-    214..216 'id': fn id<i128>(i128) -> i128
+            210..212 'id': fn id<i128>(i128) -> i128
-    214..221 'id(a.x)': i128
+            210..217 'id(a.x)': i128
-    217..218 'a': A<i128>
+            213..214 'a': A<i128>
-    217..220 'a.x': i128
+            213..216 'a.x': i128
-    232..233 'b': A<i128>
+            227..228 'b': A<i128>
-    236..246 'A { x: z }': A<i128>
+            231..241 'A { x: z }': A<i128>
-    243..244 'z': i128
+            238..239 'z': i128
-    253..254 'b': A<i128>
+            247..248 'b': A<i128>
-    253..258 'b.x()': i128
+            247..252 'b.x()': i128
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_associated_const() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Struct;
+        struct Struct;
-impl Struct {
+        impl Struct {
-    const FOO: u32 = 1;
+            const FOO: u32 = 1;
-}
+        }
-enum Enum {}
+        enum Enum {}
-impl Enum {
+        impl Enum {
-    const BAR: u32 = 2;
+            const BAR: u32 = 2;
-}
+        }
-trait Trait {
+        trait Trait {
-    const ID: u32;
+            const ID: u32;
-}
+        }
-struct TraitTest;
+        struct TraitTest;
-impl Trait for TraitTest {
+        impl Trait for TraitTest {
-    const ID: u32 = 5;
+            const ID: u32 = 5;
-}
+        }
-fn test() {
+        fn test() {
-    let x = Struct::FOO;
+            let x = Struct::FOO;
-    let y = Enum::BAR;
+            let y = Enum::BAR;
-    let z = TraitTest::ID;
+            let z = TraitTest::ID;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    51..52 '1': u32
+            51..52 '1': u32
-    104..105 '2': u32
+            104..105 '2': u32
-    212..213 '5': u32
+            212..213 '5': u32
-    228..306 '{     ...:ID; }': ()
+            228..306 '{     ...:ID; }': ()
-    238..239 'x': u32
+            238..239 'x': u32
-    242..253 'Struct::FOO': u32
+            242..253 'Struct::FOO': u32
-    263..264 'y': u32
+            263..264 'y': u32
-    267..276 'Enum::BAR': u32
+            267..276 'Enum::BAR': u32
-    286..287 'z': u32
+            286..287 'z': u32
-    290..303 'TraitTest::ID': u32
+            290..303 'TraitTest::ID': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_type_alias() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<X, Y> { x: X, y: Y }
+        struct A<X, Y> { x: X, y: Y }
-type Foo = A<u32, i128>;
+        type Foo = A<u32, i128>;
-type Bar<T> = A<T, u128>;
+        type Bar<T> = A<T, u128>;
-type Baz<U, V> = A<V, U>;
+        type Baz<U, V> = A<V, U>;
-fn test(x: Foo, y: Bar<&str>, z: Baz<i8, u8>) {
+        fn test(x: Foo, y: Bar<&str>, z: Baz<i8, u8>) {
-    x.x;
+            x.x;
-    x.y;
+            x.y;
-    y.x;
+            y.x;
-    y.y;
+            y.y;
-    z.x;
+            z.x;
-    z.y;
+            z.y;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    115..116 'x': A<u32, i128>
+            115..116 'x': A<u32, i128>
-    123..124 'y': A<&str, u128>
+            123..124 'y': A<&str, u128>
-    137..138 'z': A<u8, i8>
+            137..138 'z': A<u8, i8>
-    153..210 '{     ...z.y; }': ()
+            153..210 '{     ...z.y; }': ()
-    159..160 'x': A<u32, i128>
+            159..160 'x': A<u32, i128>
-    159..162 'x.x': u32
+            159..162 'x.x': u32
-    168..169 'x': A<u32, i128>
+            168..169 'x': A<u32, i128>
-    168..171 'x.y': i128
+            168..171 'x.y': i128
-    177..178 'y': A<&str, u128>
+            177..178 'y': A<&str, u128>
-    177..180 'y.x': &str
+            177..180 'y.x': &str
-    186..187 'y': A<&str, u128>
+            186..187 'y': A<&str, u128>
-    186..189 'y.y': u128
+            186..189 'y.y': u128
-    195..196 'z': A<u8, i8>
+            195..196 'z': A<u8, i8>
-    195..198 'z.x': u8
+            195..198 'z.x': u8
-    204..205 'z': A<u8, i8>
+            204..205 'z': A<u8, i8>
-    204..207 'z.y': i8
+            204..207 'z.y': i8
-    "###
+        "#]],
    )
 }
 #[test]
 fn recursive_type_alias() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct A<X> {}
+        struct A<X> {}
-type Foo = Foo;
+        type Foo = Foo;
-type Bar = A<Bar>;
+        type Bar = A<Bar>;
-fn test(x: Foo) {}
+        fn test(x: Foo) {}
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    58..59 'x': {unknown}
+            58..59 'x': {unknown}
-    66..68 '{}': ()
+            66..68 '{}': ()
-    "###
+        "#]],
    )
 }
 #[test]
 fn infer_type_param() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn id<T>(x: T) -> T {
+        fn id<T>(x: T) -> T {
-    x
+            x
-}
+        }
-fn clone<T>(x: &T) -> T {
+        fn clone<T>(x: &T) -> T {
-    *x
+            *x
-}
+        }
-fn test() {
+        fn test() {
-    let y = 10u32;
+            let y = 10u32;
-    id(y);
+            id(y);
-    let x: bool = clone(z);
+            let x: bool = clone(z);
-    id::<i128>(1);
+            id::<i128>(1);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    9..10 'x': T
+            9..10 'x': T
-    20..29 '{     x }': T
+            20..29 '{     x }': T
-    26..27 'x': T
+            26..27 'x': T
-    43..44 'x': &T
+            43..44 'x': &T
-    55..65 '{     *x }': T
+            55..65 '{     *x }': T
-    61..63 '*x': T
+            61..63 '*x': T
-    62..63 'x': &T
+            62..63 'x': &T
-    77..157 '{     ...(1); }': ()
+            77..157 '{     ...(1); }': ()
-    87..88 'y': u32
+            87..88 'y': u32
-    91..96 '10u32': u32
+            91..96 '10u32': u32
-    102..104 'id': fn id<u32>(u32) -> u32
+            102..104 'id': fn id<u32>(u32) -> u32
-    102..107 'id(y)': u32
+            102..107 'id(y)': u32
-    105..106 'y': u32
+            105..106 'y': u32
-    117..118 'x': bool
+            117..118 'x': bool
-    127..132 'clone': fn clone<bool>(&bool) -> bool
+            127..132 'clone': fn clone<bool>(&bool) -> bool
-    127..135 'clone(z)': bool
+            127..135 'clone(z)': bool
-    133..134 'z': &bool
+            133..134 'z': &bool
-    141..151 'id::<i128>': fn id<i128>(i128) -> i128
+            141..151 'id::<i128>': fn id<i128>(i128) -> i128
-    141..154 'id::<i128>(1)': i128
+            141..154 'id::<i128>(1)': i128
-    152..153 '1': i128
+            152..153 '1': i128
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_const() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Foo;
+        struct Foo;
-impl Foo { const ASSOC_CONST: u32 = 0; }
+        impl Foo { const ASSOC_CONST: u32 = 0; }
-const GLOBAL_CONST: u32 = 101;
+        const GLOBAL_CONST: u32 = 101;
-fn test() {
+        fn test() {
-    const LOCAL_CONST: u32 = 99;
+            const LOCAL_CONST: u32 = 99;
-    let x = LOCAL_CONST;
+            let x = LOCAL_CONST;
-    let z = GLOBAL_CONST;
+            let z = GLOBAL_CONST;
-    let id = Foo::ASSOC_CONST;
+            let id = Foo::ASSOC_CONST;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    48..49 '0': u32
+            48..49 '0': u32
-    79..82 '101': u32
+            79..82 '101': u32
-    94..212 '{     ...NST; }': ()
+            94..212 '{     ...NST; }': ()
-    137..138 'x': u32
+            137..138 'x': u32
-    141..152 'LOCAL_CONST': u32
+            141..152 'LOCAL_CONST': u32
-    162..163 'z': u32
+            162..163 'z': u32
-    166..178 'GLOBAL_CONST': u32
+            166..178 'GLOBAL_CONST': u32
-    188..190 'id': u32
+            188..190 'id': u32
-    193..209 'Foo::A..._CONST': u32
+            193..209 'Foo::A..._CONST': u32
-    125..127 '99': u32
+            125..127 '99': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_static() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-static GLOBAL_STATIC: u32 = 101;
+        static GLOBAL_STATIC: u32 = 101;
-static mut GLOBAL_STATIC_MUT: u32 = 101;
+        static mut GLOBAL_STATIC_MUT: u32 = 101;
-fn test() {
+        fn test() {
-    static LOCAL_STATIC: u32 = 99;
+            static LOCAL_STATIC: u32 = 99;
-    static mut LOCAL_STATIC_MUT: u32 = 99;
+            static mut LOCAL_STATIC_MUT: u32 = 99;
-    let x = LOCAL_STATIC;
+            let x = LOCAL_STATIC;
-    let y = LOCAL_STATIC_MUT;
+            let y = LOCAL_STATIC_MUT;
-    let z = GLOBAL_STATIC;
+            let z = GLOBAL_STATIC;
-    let w = GLOBAL_STATIC_MUT;
+            let w = GLOBAL_STATIC_MUT;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    28..31 '101': u32
+            28..31 '101': u32
-    69..72 '101': u32
+            69..72 '101': u32
-    84..279 '{     ...MUT; }': ()
+            84..279 '{     ...MUT; }': ()
-    172..173 'x': u32
+            172..173 'x': u32
-    176..188 'LOCAL_STATIC': u32
+            176..188 'LOCAL_STATIC': u32
-    198..199 'y': u32
+            198..199 'y': u32
-    202..218 'LOCAL_...IC_MUT': u32
+            202..218 'LOCAL_...IC_MUT': u32
-    228..229 'z': u32
+            228..229 'z': u32
-    232..245 'GLOBAL_STATIC': u32
+            232..245 'GLOBAL_STATIC': u32
-    255..256 'w': u32
+            255..256 'w': u32
-    259..276 'GLOBAL...IC_MUT': u32
+            259..276 'GLOBAL...IC_MUT': u32
-    117..119 '99': u32
+            117..119 '99': u32
-    160..162 '99': u32
+            160..162 '99': u32
-    "###
+        "#]],
    );
 }
@@ -1754,413 +1778,413 @@ fn main() {
 #[test]
 fn closure_return() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo() -> u32 {
+        fn foo() -> u32 {
-    let x = || -> usize { return 1; };
+            let x = || -> usize { return 1; };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    16..58 '{     ...; }; }': ()
+            16..58 '{     ...; }; }': ()
-    26..27 'x': || -> usize
+            26..27 'x': || -> usize
-    30..55 '|| -> ...n 1; }': || -> usize
+            30..55 '|| -> ...n 1; }': || -> usize
-    42..55 '{ return 1; }': usize
+            42..55 '{ return 1; }': usize
-    44..52 'return 1': !
+            44..52 'return 1': !
-    51..52 '1': usize
+            51..52 '1': usize
-    "###
+        "#]],
    );
 }
 #[test]
 fn closure_return_unit() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo() -> u32 {
+        fn foo() -> u32 {
-    let x = || { return; };
+            let x = || { return; };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    16..47 '{     ...; }; }': ()
+            16..47 '{     ...; }; }': ()
-    26..27 'x': || -> ()
+            26..27 'x': || -> ()
-    30..44 '|| { return; }': || -> ()
+            30..44 '|| { return; }': || -> ()
-    33..44 '{ return; }': ()
+            33..44 '{ return; }': ()
-    35..41 'return': !
+            35..41 'return': !
-    "###
+        "#]],
    );
 }
 #[test]
 fn closure_return_inferred() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo() -> u32 {
+        fn foo() -> u32 {
-    let x = || { "test" };
+            let x = || { "test" };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    16..46 '{     ..." }; }': ()
+            16..46 '{     ..." }; }': ()
-    26..27 'x': || -> &str
+            26..27 'x': || -> &str
-    30..43 '|| { "test" }': || -> &str
+            30..43 '|| { "test" }': || -> &str
-    33..43 '{ "test" }': &str
+            33..43 '{ "test" }': &str
-    35..41 '"test"': &str
+            35..41 '"test"': &str
-    "###
+        "#]],
    );
 }
 #[test]
 fn fn_pointer_return() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Vtable {
+        struct Vtable {
-    method: fn(),
+            method: fn(),
-}
+        }
-fn main() {
+        fn main() {
-    let vtable = Vtable { method: || {} };
+            let vtable = Vtable { method: || {} };
-    let m = vtable.method;
+            let m = vtable.method;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    47..120 '{     ...hod; }': ()
+            47..120 '{     ...hod; }': ()
-    57..63 'vtable': Vtable
+            57..63 'vtable': Vtable
-    66..90 'Vtable...| {} }': Vtable
+            66..90 'Vtable...| {} }': Vtable
-    83..88 '|| {}': || -> ()
+            83..88 '|| {}': || -> ()
-    86..88 '{}': ()
+            86..88 '{}': ()
-    100..101 'm': fn()
+            100..101 'm': fn()
-    104..110 'vtable': Vtable
+            104..110 'vtable': Vtable
-    104..117 'vtable.method': fn()
+            104..117 'vtable.method': fn()
-    "###
+        "#]],
    );
 }
 #[test]
 fn effects_smoke_test() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn main() {
+        fn main() {
-    let x = unsafe { 92 };
+            let x = unsafe { 92 };
-    let y = async { async { () }.await };
+            let y = async { async { () }.await };
-    let z = try { () };
+            let z = try { () };
-    let t = 'a: { 92 };
+            let t = 'a: { 92 };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    10..130 '{     ...2 }; }': ()
+            10..130 '{     ...2 }; }': ()
-    20..21 'x': i32
+            20..21 'x': i32
-    24..37 'unsafe { 92 }': i32
+            24..37 'unsafe { 92 }': i32
-    31..37 '{ 92 }': i32
+            31..37 '{ 92 }': i32
-    33..35 '92': i32
+            33..35 '92': i32
-    47..48 'y': {unknown}
+            47..48 'y': {unknown}
-    57..79 '{ asyn...wait }': {unknown}
+            57..79 '{ asyn...wait }': {unknown}
-    59..77 'async ....await': {unknown}
+            59..77 'async ....await': {unknown}
-    65..71 '{ () }': ()
+            65..71 '{ () }': ()
-    67..69 '()': ()
+            67..69 '()': ()
-    89..90 'z': {unknown}
+            89..90 'z': {unknown}
-    93..103 'try { () }': {unknown}
+            93..103 'try { () }': {unknown}
-    97..103 '{ () }': ()
+            97..103 '{ () }': ()
-    99..101 '()': ()
+            99..101 '()': ()
-    113..114 't': i32
+            113..114 't': i32
-    121..127 '{ 92 }': i32
+            121..127 '{ 92 }': i32
-    123..125 '92': i32
+            123..125 '92': i32
-    "###
+        "#]],
    )
 }
 #[test]
 fn infer_generic_from_later_assignment() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum Option<T> { Some(T), None }
+        enum Option<T> { Some(T), None }
-use Option::*;
+        use Option::*;
-fn test() {
+        fn test() {
-    let mut end = None;
+            let mut end = None;
-    loop {
+            loop {
-        end = Some(true);
+                end = Some(true);
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    59..129 '{     ...   } }': ()
+            59..129 '{     ...   } }': ()
-    69..76 'mut end': Option<bool>
+            69..76 'mut end': Option<bool>
-    79..83 'None': Option<bool>
+            79..83 'None': Option<bool>
-    89..127 'loop {...     }': !
+            89..127 'loop {...     }': !
-    94..127 '{     ...     }': ()
+            94..127 '{     ...     }': ()
-    104..107 'end': Option<bool>
+            104..107 'end': Option<bool>
-    104..120 'end = ...(true)': ()
+            104..120 'end = ...(true)': ()
-    110..114 'Some': Some<bool>(bool) -> Option<bool>
+            110..114 'Some': Some<bool>(bool) -> Option<bool>
-    110..120 'Some(true)': Option<bool>
+            110..120 'Some(true)': Option<bool>
-    115..119 'true': bool
+            115..119 'true': bool
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_loop_break_with_val() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum Option<T> { Some(T), None }
+        enum Option<T> { Some(T), None }
-use Option::*;
+        use Option::*;
-fn test() {
+        fn test() {
-    let x = loop {
+            let x = loop {
-        if false {
+                if false {
-            break None;
+                    break None;
-        }
+                }
-        break Some(true);
+                break Some(true);
-    };
+            };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    59..168 '{     ...  }; }': ()
+            59..168 '{     ...  }; }': ()
-    69..70 'x': Option<bool>
+            69..70 'x': Option<bool>
-    73..165 'loop {...     }': Option<bool>
+            73..165 'loop {...     }': Option<bool>
-    78..165 '{     ...     }': ()
+            78..165 '{     ...     }': ()
-    88..132 'if fal...     }': ()
+            88..132 'if fal...     }': ()
-    91..96 'false': bool
+            91..96 'false': bool
-    97..132 '{     ...     }': ()
+            97..132 '{     ...     }': ()
-    111..121 'break None': !
+            111..121 'break None': !
-    117..121 'None': Option<bool>
+            117..121 'None': Option<bool>
-    142..158 'break ...(true)': !
+            142..158 'break ...(true)': !
-    148..152 'Some': Some<bool>(bool) -> Option<bool>
+            148..152 'Some': Some<bool>(bool) -> Option<bool>
-    148..158 'Some(true)': Option<bool>
+            148..158 'Some(true)': Option<bool>
-    153..157 'true': bool
+            153..157 'true': bool
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_loop_break_without_val() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-enum Option<T> { Some(T), None }
+        enum Option<T> { Some(T), None }
-use Option::*;
+        use Option::*;
-fn test() {
+        fn test() {
-    let x = loop {
+            let x = loop {
-        if false {
+                if false {
-            break;
+                    break;
-        }
+                }
-    };
+            };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    59..136 '{     ...  }; }': ()
+            59..136 '{     ...  }; }': ()
-    69..70 'x': ()
+            69..70 'x': ()
-    73..133 'loop {...     }': ()
+            73..133 'loop {...     }': ()
-    78..133 '{     ...     }': ()
+            78..133 '{     ...     }': ()
-    88..127 'if fal...     }': ()
+            88..127 'if fal...     }': ()
-    91..96 'false': bool
+            91..96 'false': bool
-    97..127 '{     ...     }': ()
+            97..127 '{     ...     }': ()
-    111..116 'break': !
+            111..116 'break': !
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_labelled_break_with_val() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-fn foo() {
+        fn foo() {
-    let _x = || 'outer: loop {
+            let _x = || 'outer: loop {
-        let inner = 'inner: loop {
+                let inner = 'inner: loop {
-            let i = Default::default();
+                    let i = Default::default();
-            if (break 'outer i) {
+                    if (break 'outer i) {
-                loop { break 'inner 5i8; };
+                        loop { break 'inner 5i8; };
-            } else if true {
+                    } else if true {
-                break 'inner 6;
+                        break 'inner 6;
-            }
+                    }
-            break 7;
+                    break 7;
-        };
+                };
-        break inner < 8;
+                break inner < 8;
-    };
+            };
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    9..335 '{     ...  }; }': ()
+            9..335 '{     ...  }; }': ()
-    19..21 '_x': || -> bool
+            19..21 '_x': || -> bool
-    24..332 '|| 'ou...     }': || -> bool
+            24..332 '|| 'ou...     }': || -> bool
-    27..332 ''outer...     }': bool
+            27..332 ''outer...     }': bool
-    40..332 '{     ...     }': ()
+            40..332 '{     ...     }': ()
-    54..59 'inner': i8
+            54..59 'inner': i8
-    62..300 ''inner...     }': i8
+            62..300 ''inner...     }': i8
-    75..300 '{     ...     }': ()
+            75..300 '{     ...     }': ()
-    93..94 'i': bool
+            93..94 'i': bool
-    97..113 'Defaul...efault': {unknown}
+            97..113 'Defaul...efault': {unknown}
-    97..115 'Defaul...ault()': bool
+            97..115 'Defaul...ault()': bool
-    129..269 'if (br...     }': ()
+            129..269 'if (br...     }': ()
-    133..147 'break 'outer i': !
+            133..147 'break 'outer i': !
-    146..147 'i': bool
+            146..147 'i': bool
-    149..208 '{     ...     }': ()
+            149..208 '{     ...     }': ()
-    167..193 'loop {...5i8; }': !
+            167..193 'loop {...5i8; }': !
-    172..193 '{ brea...5i8; }': ()
+            172..193 '{ brea...5i8; }': ()
-    174..190 'break ...er 5i8': !
+            174..190 'break ...er 5i8': !
-    187..190 '5i8': i8
+            187..190 '5i8': i8
-    214..269 'if tru...     }': ()
+            214..269 'if tru...     }': ()
-    217..221 'true': bool
+            217..221 'true': bool
-    222..269 '{     ...     }': ()
+            222..269 '{     ...     }': ()
-    240..254 'break 'inner 6': !
+            240..254 'break 'inner 6': !
-    253..254 '6': i8
+            253..254 '6': i8
-    282..289 'break 7': !
+            282..289 'break 7': !
-    288..289 '7': i8
+            288..289 '7': i8
-    310..325 'break inner < 8': !
+            310..325 'break inner < 8': !
-    316..321 'inner': i8
+            316..321 'inner': i8
-    316..325 'inner < 8': bool
+            316..325 'inner < 8': bool
-    324..325 '8': i8
+            324..325 '8': i8
-    "###
+        "#]],
    );
 }
 #[test]
 fn generic_default() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Thing<T = ()> { t: T }
+        struct Thing<T = ()> { t: T }
-enum OtherThing<T = ()> {
+        enum OtherThing<T = ()> {
-    One { t: T },
+            One { t: T },
-    Two(T),
+            Two(T),
-}
+        }
-fn test(t1: Thing, t2: OtherThing, t3: Thing<i32>, t4: OtherThing<i32>) {
+        fn test(t1: Thing, t2: OtherThing, t3: Thing<i32>, t4: OtherThing<i32>) {
-    t1.t;
+            t1.t;
-    t3.t;
+            t3.t;
-    match t2 {
+            match t2 {
-        OtherThing::One { t } => { t; },
+                OtherThing::One { t } => { t; },
-        OtherThing::Two(t) => { t; },
+                OtherThing::Two(t) => { t; },
-    }
+            }
-    match t4 {
+            match t4 {
-        OtherThing::One { t } => { t; },
+                OtherThing::One { t } => { t; },
-        OtherThing::Two(t) => { t; },
+                OtherThing::Two(t) => { t; },
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    97..99 't1': Thing<()>
+            97..99 't1': Thing<()>
-    108..110 't2': OtherThing<()>
+            108..110 't2': OtherThing<()>
-    124..126 't3': Thing<i32>
+            124..126 't3': Thing<i32>
-    140..142 't4': OtherThing<i32>
+            140..142 't4': OtherThing<i32>
-    161..384 '{     ...   } }': ()
+            161..384 '{     ...   } }': ()
-    167..169 't1': Thing<()>
+            167..169 't1': Thing<()>
-    167..171 't1.t': ()
+            167..171 't1.t': ()
-    177..179 't3': Thing<i32>
+            177..179 't3': Thing<i32>
-    177..181 't3.t': i32
+            177..181 't3.t': i32
-    187..282 'match ...     }': ()
+            187..282 'match ...     }': ()
-    193..195 't2': OtherThing<()>
+            193..195 't2': OtherThing<()>
-    206..227 'OtherT... { t }': OtherThing<()>
+            206..227 'OtherT... { t }': OtherThing<()>
-    224..225 't': ()
+            224..225 't': ()
-    231..237 '{ t; }': ()
+            231..237 '{ t; }': ()
-    233..234 't': ()
+            233..234 't': ()
-    247..265 'OtherT...Two(t)': OtherThing<()>
+            247..265 'OtherT...Two(t)': OtherThing<()>
-    263..264 't': ()
+            263..264 't': ()
-    269..275 '{ t; }': ()
+            269..275 '{ t; }': ()
-    271..272 't': ()
+            271..272 't': ()
-    287..382 'match ...     }': ()
+            287..382 'match ...     }': ()
-    293..295 't4': OtherThing<i32>
+            293..295 't4': OtherThing<i32>
-    306..327 'OtherT... { t }': OtherThing<i32>
+            306..327 'OtherT... { t }': OtherThing<i32>
-    324..325 't': i32
+            324..325 't': i32
-    331..337 '{ t; }': ()
+            331..337 '{ t; }': ()
-    333..334 't': i32
+            333..334 't': i32
-    347..365 'OtherT...Two(t)': OtherThing<i32>
+            347..365 'OtherT...Two(t)': OtherThing<i32>
-    363..364 't': i32
+            363..364 't': i32
-    369..375 '{ t; }': ()
+            369..375 '{ t; }': ()
-    371..372 't': i32
+            371..372 't': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn generic_default_in_struct_literal() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct Thing<T = ()> { t: T }
+        struct Thing<T = ()> { t: T }
-enum OtherThing<T = ()> {
+        enum OtherThing<T = ()> {
-    One { t: T },
+            One { t: T },
-    Two(T),
+            Two(T),
-}
+        }
-fn test() {
+        fn test() {
-    let x = Thing { t: loop {} };
+            let x = Thing { t: loop {} };
-    let y = Thing { t: () };
+            let y = Thing { t: () };
-    let z = Thing { t: 1i32 };
+            let z = Thing { t: 1i32 };
-    if let Thing { t } = z {
+            if let Thing { t } = z {
-        t;
+                t;
-    }
+            }
-    let a = OtherThing::One { t: 1i32 };
+            let a = OtherThing::One { t: 1i32 };
-    let b = OtherThing::Two(1i32);
+            let b = OtherThing::Two(1i32);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    99..319 '{     ...32); }': ()
+            99..319 '{     ...32); }': ()
-    109..110 'x': Thing<!>
+            109..110 'x': Thing<!>
-    113..133 'Thing ...p {} }': Thing<!>
+            113..133 'Thing ...p {} }': Thing<!>
-    124..131 'loop {}': !
+            124..131 'loop {}': !
-    129..131 '{}': ()
+            129..131 '{}': ()
-    143..144 'y': Thing<()>
+            143..144 'y': Thing<()>
-    147..162 'Thing { t: () }': Thing<()>
+            147..162 'Thing { t: () }': Thing<()>
-    158..160 '()': ()
+            158..160 '()': ()
-    172..173 'z': Thing<i32>
+            172..173 'z': Thing<i32>
-    176..193 'Thing ...1i32 }': Thing<i32>
+            176..193 'Thing ...1i32 }': Thing<i32>
-    187..191 '1i32': i32
+            187..191 '1i32': i32
-    199..240 'if let...     }': ()
+            199..240 'if let...     }': ()
-    206..217 'Thing { t }': Thing<i32>
+            206..217 'Thing { t }': Thing<i32>
-    214..215 't': i32
+            214..215 't': i32
-    220..221 'z': Thing<i32>
+            220..221 'z': Thing<i32>
-    222..240 '{     ...     }': ()
+            222..240 '{     ...     }': ()
-    232..233 't': i32
+            232..233 't': i32
-    250..251 'a': OtherThing<i32>
+            250..251 'a': OtherThing<i32>
-    254..281 'OtherT...1i32 }': OtherThing<i32>
+            254..281 'OtherT...1i32 }': OtherThing<i32>
-    275..279 '1i32': i32
+            275..279 '1i32': i32
-    291..292 'b': OtherThing<i32>
+            291..292 'b': OtherThing<i32>
-    295..310 'OtherThing::Two': Two<i32>(i32) -> OtherThing<i32>
+            295..310 'OtherThing::Two': Two<i32>(i32) -> OtherThing<i32>
-    295..316 'OtherT...(1i32)': OtherThing<i32>
+            295..316 'OtherT...(1i32)': OtherThing<i32>
-    311..315 '1i32': i32
+            311..315 '1i32': i32
-    "###
+        "#]],
    );
 }
 #[test]
 fn generic_default_depending_on_other_type_arg() {
-    assert_snapshot!(
+    // FIXME: the {unknown} is a bug
-        infer(r#"
+    check_infer(
-struct Thing<T = u128, F = fn() -> T> { t: T }
+        r#"
+        struct Thing<T = u128, F = fn() -> T> { t: T }
-fn test(t1: Thing<u32>, t2: Thing) {
-    t1;
+        fn test(t1: Thing<u32>, t2: Thing) {
-    t2;
+            t1;
-    Thing::<_> { t: 1u32 };
+            t2;
-}
+            Thing::<_> { t: 1u32 };
-"#),
+        }
-        // FIXME: the {unknown} is a bug
+        "#,
-        @r###"
+        expect![[r#"
-    56..58 't1': Thing<u32, fn() -> u32>
+            56..58 't1': Thing<u32, fn() -> u32>
-    72..74 't2': Thing<u128, fn() -> u128>
+            72..74 't2': Thing<u128, fn() -> u128>
-    83..130 '{     ...2 }; }': ()
+            83..130 '{     ...2 }; }': ()
-    89..91 't1': Thing<u32, fn() -> u32>
+            89..91 't1': Thing<u32, fn() -> u32>
-    97..99 't2': Thing<u128, fn() -> u128>
+            97..99 't2': Thing<u128, fn() -> u128>
-    105..127 'Thing:...1u32 }': Thing<u32, fn() -> {unknown}>
+            105..127 'Thing:...1u32 }': Thing<u32, fn() -> {unknown}>
-    121..125 '1u32': u32
+            121..125 '1u32': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn generic_default_depending_on_other_type_arg_forward() {
-    assert_snapshot!(
+    // the {unknown} here is intentional, as defaults are not allowed to
-        infer(r#"
+    // refer to type parameters coming later
-struct Thing<F = fn() -> T, T = u128> { t: T }
+    check_infer(
+        r#"
-fn test(t1: Thing) {
+        struct Thing<F = fn() -> T, T = u128> { t: T }
-    t1;
-}
+        fn test(t1: Thing) {
-"#),
+            t1;
-        // the {unknown} here is intentional, as defaults are not allowed to
+        }
-        // refer to type parameters coming later
+        "#,
-        @r###"
+        expect![[r#"
-    56..58 't1': Thing<fn() -> {unknown}, u128>
+            56..58 't1': Thing<fn() -> {unknown}, u128>
-    67..78 '{     t1; }': ()
+            67..78 '{     t1; }': ()
-    73..75 't1': Thing<fn() -> {unknown}, u128>
+            73..75 't1': Thing<fn() -> {unknown}, u128>
-    "###
+        "#]],
    );
 }
diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs
index 01c919a7e..526e61caf 100644
--- a/crates/ra_hir_ty/src/tests/traits.rs
+++ b/crates/ra_hir_ty/src/tests/traits.rs
@@ -1,7 +1,7 @@
-use insta::assert_snapshot;
+use expect::expect;
 use test_utils::mark;
-use super::{check_types, infer, infer_with_mismatches};
+use super::{check_infer, check_infer_with_mismatches, check_types};
 #[test]
 fn infer_await() {
@@ -38,7 +38,7 @@ fn infer_async() {
        r#"
 //- /main.rs crate:main deps:core
 async fn foo() -> u64 {
-    128
+            128
 }
 fn test() {
@@ -65,7 +65,7 @@ fn infer_desugar_async() {
        r#"
 //- /main.rs crate:main deps:core
 async fn foo() -> u64 {
-    128
+            128
 }
 fn test() {
@@ -222,291 +222,291 @@ mod ops {
 #[test]
 fn infer_from_bound_1() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {}
+        trait Trait<T> {}
-struct S<T>(T);
+        struct S<T>(T);
-impl<U> Trait<U> for S<U> {}
+        impl<U> Trait<U> for S<U> {}
-fn foo<T: Trait<u32>>(t: T) {}
+        fn foo<T: Trait<u32>>(t: T) {}
-fn test() {
+        fn test() {
-    let s = S(unknown);
+            let s = S(unknown);
-    foo(s);
+            foo(s);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    85..86 't': T
+            85..86 't': T
-    91..93 '{}': ()
+            91..93 '{}': ()
-    104..143 '{     ...(s); }': ()
+            104..143 '{     ...(s); }': ()
-    114..115 's': S<u32>
+            114..115 's': S<u32>
-    118..119 'S': S<u32>(u32) -> S<u32>
+            118..119 'S': S<u32>(u32) -> S<u32>
-    118..128 'S(unknown)': S<u32>
+            118..128 'S(unknown)': S<u32>
-    120..127 'unknown': u32
+            120..127 'unknown': u32
-    134..137 'foo': fn foo<S<u32>>(S<u32>)
+            134..137 'foo': fn foo<S<u32>>(S<u32>)
-    134..140 'foo(s)': ()
+            134..140 'foo(s)': ()
-    138..139 's': S<u32>
+            138..139 's': S<u32>
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_from_bound_2() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {}
+        trait Trait<T> {}
-struct S<T>(T);
+        struct S<T>(T);
-impl<U> Trait<U> for S<U> {}
+        impl<U> Trait<U> for S<U> {}
-fn foo<U, T: Trait<U>>(t: T) -> U {}
+        fn foo<U, T: Trait<U>>(t: T) -> U {}
-fn test() {
+        fn test() {
-    let s = S(unknown);
+            let s = S(unknown);
-    let x: u32 = foo(s);
+            let x: u32 = foo(s);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    86..87 't': T
+            86..87 't': T
-    97..99 '{}': ()
+            97..99 '{}': ()
-    110..162 '{     ...(s); }': ()
+            110..162 '{     ...(s); }': ()
-    120..121 's': S<u32>
+            120..121 's': S<u32>
-    124..125 'S': S<u32>(u32) -> S<u32>
+            124..125 'S': S<u32>(u32) -> S<u32>
-    124..134 'S(unknown)': S<u32>
+            124..134 'S(unknown)': S<u32>
-    126..133 'unknown': u32
+            126..133 'unknown': u32
-    144..145 'x': u32
+            144..145 'x': u32
-    153..156 'foo': fn foo<u32, S<u32>>(S<u32>) -> u32
+            153..156 'foo': fn foo<u32, S<u32>>(S<u32>) -> u32
-    153..159 'foo(s)': u32
+            153..159 'foo(s)': u32
-    157..158 's': S<u32>
+            157..158 's': S<u32>
-    "###
+        "#]],
    );
 }
 #[test]
 fn trait_default_method_self_bound_implements_trait() {
    mark::check!(trait_self_implements_self);
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait {
+        trait Trait {
-    fn foo(&self) -> i64;
+            fn foo(&self) -> i64;
-    fn bar(&self) -> {
+            fn bar(&self) -> {
-        let x = self.foo();
+                let x = self.foo();
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    26..30 'self': &Self
+            26..30 'self': &Self
-    52..56 'self': &Self
+            52..56 'self': &Self
-    61..96 '{     ...     }': ()
+            61..96 '{     ...     }': ()
-    75..76 'x': i64
+            75..76 'x': i64
-    79..83 'self': &Self
+            79..83 'self': &Self
-    79..89 'self.foo()': i64
+            79..89 'self.foo()': i64
-    "###
+        "#]],
    );
 }
 #[test]
 fn trait_default_method_self_bound_implements_super_trait() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait SuperTrait {
+        trait SuperTrait {
-    fn foo(&self) -> i64;
+            fn foo(&self) -> i64;
-}
+        }
-trait Trait: SuperTrait {
+        trait Trait: SuperTrait {
-    fn bar(&self) -> {
+            fn bar(&self) -> {
-        let x = self.foo();
+                let x = self.foo();
-    }
+            }
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    31..35 'self': &Self
+            31..35 'self': &Self
-    85..89 'self': &Self
+            85..89 'self': &Self
-    94..129 '{     ...     }': ()
+            94..129 '{     ...     }': ()
-    108..109 'x': i64
+            108..109 'x': i64
-    112..116 'self': &Self
+            112..116 'self': &Self
-    112..122 'self.foo()': i64
+            112..122 'self.foo()': i64
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_project_associated_type() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Iterable {
+        trait Iterable {
-   type Item;
+            type Item;
-}
+        }
-struct S;
+        struct S;
-impl Iterable for S { type Item = u32; }
+        impl Iterable for S { type Item = u32; }
-fn test<T: Iterable>() {
+        fn test<T: Iterable>() {
-    let x: <S as Iterable>::Item = 1;
+            let x: <S as Iterable>::Item = 1;
-    let y: <T as Iterable>::Item = no_matter;
+            let y: <T as Iterable>::Item = no_matter;
-    let z: T::Item = no_matter;
+            let z: T::Item = no_matter;
-    let a: <T>::Item = no_matter;
+            let a: <T>::Item = no_matter;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    107..260 '{     ...ter; }': ()
+            108..261 '{     ...ter; }': ()
-    117..118 'x': u32
+            118..119 'x': u32
-    144..145 '1': u32
+            145..146 '1': u32
-    155..156 'y': Iterable::Item<T>
+            156..157 'y': Iterable::Item<T>
-    182..191 'no_matter': Iterable::Item<T>
+            183..192 'no_matter': Iterable::Item<T>
-    201..202 'z': Iterable::Item<T>
+            202..203 'z': Iterable::Item<T>
-    214..223 'no_matter': Iterable::Item<T>
+            215..224 'no_matter': Iterable::Item<T>
-    233..234 'a': Iterable::Item<T>
+            234..235 'a': Iterable::Item<T>
-    248..257 'no_matter': Iterable::Item<T>
+            249..258 'no_matter': Iterable::Item<T>
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_return_associated_type() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Iterable {
+        trait Iterable {
-   type Item;
+            type Item;
-}
+        }
-struct S;
+        struct S;
-impl Iterable for S { type Item = u32; }
+        impl Iterable for S { type Item = u32; }
-fn foo1<T: Iterable>(t: T) -> T::Item {}
+        fn foo1<T: Iterable>(t: T) -> T::Item {}
-fn foo2<T: Iterable>(t: T) -> <T as Iterable>::Item {}
+        fn foo2<T: Iterable>(t: T) -> <T as Iterable>::Item {}
-fn foo3<T: Iterable>(t: T) -> <T>::Item {}
+        fn foo3<T: Iterable>(t: T) -> <T>::Item {}
-fn test() {
+        fn test() {
-    let x = foo1(S);
+            let x = foo1(S);
-    let y = foo2(S);
+            let y = foo2(S);
-    let z = foo3(S);
+            let z = foo3(S);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    105..106 't': T
+            106..107 't': T
-    122..124 '{}': ()
+            123..125 '{}': ()
-    146..147 't': T
+            147..148 't': T
-    177..179 '{}': ()
+            178..180 '{}': ()
-    201..202 't': T
+            202..203 't': T
-    220..222 '{}': ()
+            221..223 '{}': ()
-    233..299 '{     ...(S); }': ()
+            234..300 '{     ...(S); }': ()
-    243..244 'x': u32
+            244..245 'x': u32
-    247..251 'foo1': fn foo1<S>(S) -> <S as Iterable>::Item
+            248..252 'foo1': fn foo1<S>(S) -> <S as Iterable>::Item
-    247..254 'foo1(S)': u32
+            248..255 'foo1(S)': u32
-    252..253 'S': S
+            253..254 'S': S
-    264..265 'y': u32
+            265..266 'y': u32
-    268..272 'foo2': fn foo2<S>(S) -> <S as Iterable>::Item
+            269..273 'foo2': fn foo2<S>(S) -> <S as Iterable>::Item
-    268..275 'foo2(S)': u32
+            269..276 'foo2(S)': u32
-    273..274 'S': S
+            274..275 'S': S
-    285..286 'z': u32
+            286..287 'z': u32
-    289..293 'foo3': fn foo3<S>(S) -> <S as Iterable>::Item
+            290..294 'foo3': fn foo3<S>(S) -> <S as Iterable>::Item
-    289..296 'foo3(S)': u32
+            290..297 'foo3(S)': u32
-    294..295 'S': S
+            295..296 'S': S
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_associated_type_bound() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Iterable {
+        trait Iterable {
-   type Item;
+            type Item;
-}
+        }
-fn test<T: Iterable<Item=u32>>() {
+        fn test<T: Iterable<Item=u32>>() {
-    let y: T::Item = unknown;
+            let y: T::Item = unknown;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    66..99 '{     ...own; }': ()
+            67..100 '{     ...own; }': ()
-    76..77 'y': u32
+            77..78 'y': u32
-    89..96 'unknown': u32
+            90..97 'unknown': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn infer_const_body() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-const A: u32 = 1 + 1;
+        const A: u32 = 1 + 1;
-static B: u64 = { let x = 1; x };
+        static B: u64 = { let x = 1; x };
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    15..16 '1': u32
+            15..16 '1': u32
-    15..20 '1 + 1': u32
+            15..20 '1 + 1': u32
-    19..20 '1': u32
+            19..20 '1': u32
-    38..54 '{ let ...1; x }': u64
+            38..54 '{ let ...1; x }': u64
-    44..45 'x': u64
+            44..45 'x': u64
-    48..49 '1': u64
+            48..49 '1': u64
-    51..52 'x': u64
+            51..52 'x': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn tuple_struct_fields() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct S(i32, u64);
+        struct S(i32, u64);
-fn test() -> u64 {
+        fn test() -> u64 {
-    let a = S(4, 6);
+            let a = S(4, 6);
-    let b = a.0;
+            let b = a.0;
-    a.1
+            a.1
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    37..86 '{     ... a.1 }': u64
+            37..86 '{     ... a.1 }': u64
-    47..48 'a': S
+            47..48 'a': S
-    51..52 'S': S(i32, u64) -> S
+            51..52 'S': S(i32, u64) -> S
-    51..58 'S(4, 6)': S
+            51..58 'S(4, 6)': S
-    53..54 '4': i32
+            53..54 '4': i32
-    56..57 '6': u64
+            56..57 '6': u64
-    68..69 'b': i32
+            68..69 'b': i32
-    72..73 'a': S
+            72..73 'a': S
-    72..75 'a.0': i32
+            72..75 'a.0': i32
-    81..82 'a': S
+            81..82 'a': S
-    81..84 'a.1': u64
+            81..84 'a.1': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn tuple_struct_with_fn() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-struct S(fn(u32) -> u64);
+        struct S(fn(u32) -> u64);
-fn test() -> u64 {
+        fn test() -> u64 {
-    let a = S(|i| 2*i);
+            let a = S(|i| 2*i);
-    let b = a.0(4);
+            let b = a.0(4);
-    a.0(2)
+            a.0(2)
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    43..101 '{     ...0(2) }': u64
+            43..101 '{     ...0(2) }': u64
-    53..54 'a': S
+            53..54 'a': S
-    57..58 'S': S(fn(u32) -> u64) -> S
+            57..58 'S': S(fn(u32) -> u64) -> S
-    57..67 'S(|i| 2*i)': S
+            57..67 'S(|i| 2*i)': S
-    59..66 '|i| 2*i': |u32| -> u64
+            59..66 '|i| 2*i': |u32| -> u64
-    60..61 'i': u32
+            60..61 'i': u32
-    63..64 '2': u32
+            63..64 '2': u32
-    63..66 '2*i': u32
+            63..66 '2*i': u32
-    65..66 'i': u32
+            65..66 'i': u32
-    77..78 'b': u64
+            77..78 'b': u64
-    81..82 'a': S
+            81..82 'a': S
-    81..84 'a.0': fn(u32) -> u64
+            81..84 'a.0': fn(u32) -> u64
-    81..87 'a.0(4)': u64
+            81..87 'a.0(4)': u64
-    85..86 '4': u32
+            85..86 '4': u32
-    93..94 'a': S
+            93..94 'a': S
-    93..96 'a.0': fn(u32) -> u64
+            93..96 'a.0': fn(u32) -> u64
-    93..99 'a.0(2)': u64
+            93..99 'a.0(2)': u64
-    97..98 '2': u32
+            97..98 '2': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn indexing_arrays() {
-    assert_snapshot!(
+    check_infer(
-        infer("fn main() { &mut [9][2]; }"),
+        "fn main() { &mut [9][2]; }",
-        @r###"
+        expect![[r#"
-    10..26 '{ &mut...[2]; }': ()
+            10..26 '{ &mut...[2]; }': ()
-    12..23 '&mut [9][2]': &mut {unknown}
+            12..23 '&mut [9][2]': &mut {unknown}
-    17..20 '[9]': [i32; _]
+            17..20 '[9]': [i32; _]
-    17..23 '[9][2]': {unknown}
+            17..23 '[9][2]': {unknown}
-    18..19 '9': i32
+            18..19 '9': i32
-    21..22 '2': i32
+            21..22 '2': i32
-    "###
+        "#]],
    )
 }
@@ -541,6 +541,42 @@ mod ops {
 }
 #[test]
+fn infer_ops_index_int() {
+    check_types(
+        r#"
+//- /main.rs crate:main deps:std
+struct Bar;
+struct Foo;
+impl std::ops::Index<u32> for Bar {
+    type Output = Foo;
+}
+struct Range;
+impl std::ops::Index<Range> for Bar {
+    type Output = Bar;
+}
+fn test() {
+    let a = Bar;
+    let b = a[1];
+    b;
+  //^ Foo
+}
+//- /std.rs crate:std
+#[prelude_import] use ops::*;
+mod ops {
+    #[lang = "index"]
+    pub trait Index<Idx> {
+        type Output;
+    }
+}
+"#,
+    );
+}
+#[test]
 fn infer_ops_index_autoderef() {
    check_types(
        r#"
@@ -872,476 +908,475 @@ fn test<T: ApplyL>(t: T) {
 #[test]
 fn argument_impl_trait() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn foo(&self) -> T;
+            fn foo(&self) -> T;
-    fn foo2(&self) -> i64;
+            fn foo2(&self) -> i64;
-}
+        }
-fn bar(x: impl Trait<u16>) {}
+        fn bar(x: impl Trait<u16>) {}
-struct S<T>(T);
+        struct S<T>(T);
-impl<T> Trait<T> for S<T> {}
+        impl<T> Trait<T> for S<T> {}
-fn test(x: impl Trait<u64>, y: &impl Trait<u32>) {
+        fn test(x: impl Trait<u64>, y: &impl Trait<u32>) {
-    x;
+            x;
-    y;
+            y;
-    let z = S(1);
+            let z = S(1);
-    bar(z);
+            bar(z);
-    x.foo();
+            x.foo();
-    y.foo();
+            y.foo();
-    z.foo();
+            z.foo();
-    x.foo2();
+            x.foo2();
-    y.foo2();
+            y.foo2();
-    z.foo2();
+            z.foo2();
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    29..33 'self': &Self
+            29..33 'self': &Self
-    54..58 'self': &Self
+            54..58 'self': &Self
-    77..78 'x': impl Trait<u16>
+            77..78 'x': impl Trait<u16>
-    97..99 '{}': ()
+            97..99 '{}': ()
-    154..155 'x': impl Trait<u64>
+            154..155 'x': impl Trait<u64>
-    174..175 'y': &impl Trait<u32>
+            174..175 'y': &impl Trait<u32>
-    195..323 '{     ...2(); }': ()
+            195..323 '{     ...2(); }': ()
-    201..202 'x': impl Trait<u64>
+            201..202 'x': impl Trait<u64>
-    208..209 'y': &impl Trait<u32>
+            208..209 'y': &impl Trait<u32>
-    219..220 'z': S<u16>
+            219..220 'z': S<u16>
-    223..224 'S': S<u16>(u16) -> S<u16>
+            223..224 'S': S<u16>(u16) -> S<u16>
-    223..227 'S(1)': S<u16>
+            223..227 'S(1)': S<u16>
-    225..226 '1': u16
+            225..226 '1': u16
-    233..236 'bar': fn bar(S<u16>)
+            233..236 'bar': fn bar(S<u16>)
-    233..239 'bar(z)': ()
+            233..239 'bar(z)': ()
-    237..238 'z': S<u16>
+            237..238 'z': S<u16>
-    245..246 'x': impl Trait<u64>
+            245..246 'x': impl Trait<u64>
-    245..252 'x.foo()': u64
+            245..252 'x.foo()': u64
-    258..259 'y': &impl Trait<u32>
+            258..259 'y': &impl Trait<u32>
-    258..265 'y.foo()': u32
+            258..265 'y.foo()': u32
-    271..272 'z': S<u16>
+            271..272 'z': S<u16>
-    271..278 'z.foo()': u16
+            271..278 'z.foo()': u16
-    284..285 'x': impl Trait<u64>
+            284..285 'x': impl Trait<u64>
-    284..292 'x.foo2()': i64
+            284..292 'x.foo2()': i64
-    298..299 'y': &impl Trait<u32>
+            298..299 'y': &impl Trait<u32>
-    298..306 'y.foo2()': i64
+            298..306 'y.foo2()': i64
-    312..313 'z': S<u16>
+            312..313 'z': S<u16>
-    312..320 'z.foo2()': i64
+            312..320 'z.foo2()': i64
-    "###
+        "#]],
    );
 }
 #[test]
 fn argument_impl_trait_type_args_1() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-trait Trait {}
+        trait Trait {}
-trait Foo {
+        trait Foo {
-    // this function has an implicit Self param, an explicit type param,
+            // this function has an implicit Self param, an explicit type param,
-    // and an implicit impl Trait param!
+            // and an implicit impl Trait param!
-    fn bar<T>(x: impl Trait) -> T { loop {} }
+            fn bar<T>(x: impl Trait) -> T { loop {} }
-}
+        }
-fn foo<T>(x: impl Trait) -> T { loop {} }
+        fn foo<T>(x: impl Trait) -> T { loop {} }
-struct S;
+        struct S;
-impl Trait for S {}
+        impl Trait for S {}
-struct F;
+        struct F;
-impl Foo for F {}
+        impl Foo for F {}
-fn test() {
+        fn test() {
-    Foo::bar(S);
+            Foo::bar(S);
-    <F as Foo>::bar(S);
+            <F as Foo>::bar(S);
-    F::bar(S);
+            F::bar(S);
-    Foo::bar::<u32>(S);
+            Foo::bar::<u32>(S);
-    <F as Foo>::bar::<u32>(S);
+            <F as Foo>::bar::<u32>(S);
-    foo(S);
+            foo(S);
-    foo::<u32>(S);
+            foo::<u32>(S);
-    foo::<u32, i32>(S); // we should ignore the extraneous i32
+            foo::<u32, i32>(S); // we should ignore the extraneous i32
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    155..156 'x': impl Trait
+            155..156 'x': impl Trait
-    175..186 '{ loop {} }': T
+            175..186 '{ loop {} }': T
-    177..184 'loop {}': !
+            177..184 'loop {}': !
-    182..184 '{}': ()
+            182..184 '{}': ()
-    199..200 'x': impl Trait
+            199..200 'x': impl Trait
-    219..230 '{ loop {} }': T
+            219..230 '{ loop {} }': T
-    221..228 'loop {}': !
+            221..228 'loop {}': !
-    226..228 '{}': ()
+            226..228 '{}': ()
-    300..509 '{     ... i32 }': ()
+            300..509 '{     ... i32 }': ()
-    306..314 'Foo::bar': fn bar<{unknown}, {unknown}>(S) -> {unknown}
+            306..314 'Foo::bar': fn bar<{unknown}, {unknown}>(S) -> {unknown}
-    306..317 'Foo::bar(S)': {unknown}
+            306..317 'Foo::bar(S)': {unknown}
-    315..316 'S': S
+            315..316 'S': S
-    323..338 '<F as Foo>::bar': fn bar<F, {unknown}>(S) -> {unknown}
+            323..338 '<F as Foo>::bar': fn bar<F, {unknown}>(S) -> {unknown}
-    323..341 '<F as ...bar(S)': {unknown}
+            323..341 '<F as ...bar(S)': {unknown}
-    339..340 'S': S
+            339..340 'S': S
-    347..353 'F::bar': fn bar<F, {unknown}>(S) -> {unknown}
+            347..353 'F::bar': fn bar<F, {unknown}>(S) -> {unknown}
-    347..356 'F::bar(S)': {unknown}
+            347..356 'F::bar(S)': {unknown}
-    354..355 'S': S
+            354..355 'S': S
-    362..377 'Foo::bar::<u32>': fn bar<{unknown}, u32>(S) -> u32
+            362..377 'Foo::bar::<u32>': fn bar<{unknown}, u32>(S) -> u32
-    362..380 'Foo::b...32>(S)': u32
+            362..380 'Foo::b...32>(S)': u32
-    378..379 'S': S
+            378..379 'S': S
-    386..408 '<F as ...:<u32>': fn bar<F, u32>(S) -> u32
+            386..408 '<F as ...:<u32>': fn bar<F, u32>(S) -> u32
-    386..411 '<F as ...32>(S)': u32
+            386..411 '<F as ...32>(S)': u32
-    409..410 'S': S
+            409..410 'S': S
-    418..421 'foo': fn foo<{unknown}>(S) -> {unknown}
+            418..421 'foo': fn foo<{unknown}>(S) -> {unknown}
-    418..424 'foo(S)': {unknown}
+            418..424 'foo(S)': {unknown}
-    422..423 'S': S
+            422..423 'S': S
-    430..440 'foo::<u32>': fn foo<u32>(S) -> u32
+            430..440 'foo::<u32>': fn foo<u32>(S) -> u32
-    430..443 'foo::<u32>(S)': u32
+            430..443 'foo::<u32>(S)': u32
-    441..442 'S': S
+            441..442 'S': S
-    449..464 'foo::<u32, i32>': fn foo<u32>(S) -> u32
+            449..464 'foo::<u32, i32>': fn foo<u32>(S) -> u32
-    449..467 'foo::<...32>(S)': u32
+            449..467 'foo::<...32>(S)': u32
-    465..466 'S': S
+            465..466 'S': S
-    "###
+        "#]],
    );
 }
 #[test]
 fn argument_impl_trait_type_args_2() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-trait Trait {}
+        trait Trait {}
-struct S;
+        struct S;
-impl Trait for S {}
+        impl Trait for S {}
-struct F<T>;
+        struct F<T>;
-impl<T> F<T> {
+        impl<T> F<T> {
-    fn foo<U>(self, x: impl Trait) -> (T, U) { loop {} }
+            fn foo<U>(self, x: impl Trait) -> (T, U) { loop {} }
-}
+        }
-fn test() {
+        fn test() {
-    F.foo(S);
+            F.foo(S);
-    F::<u32>.foo(S);
+            F::<u32>.foo(S);
-    F::<u32>.foo::<i32>(S);
+            F::<u32>.foo::<i32>(S);
-    F::<u32>.foo::<i32, u32>(S); // extraneous argument should be ignored
+            F::<u32>.foo::<i32, u32>(S); // extraneous argument should be ignored
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    87..91 'self': F<T>
+            87..91 'self': F<T>
-    93..94 'x': impl Trait
+            93..94 'x': impl Trait
-    118..129 '{ loop {} }': (T, U)
+            118..129 '{ loop {} }': (T, U)
-    120..127 'loop {}': !
+            120..127 'loop {}': !
-    125..127 '{}': ()
+            125..127 '{}': ()
-    143..283 '{     ...ored }': ()
+            143..283 '{     ...ored }': ()
-    149..150 'F': F<{unknown}>
+            149..150 'F': F<{unknown}>
-    149..157 'F.foo(S)': ({unknown}, {unknown})
+            149..157 'F.foo(S)': ({unknown}, {unknown})
-    155..156 'S': S
+            155..156 'S': S
-    163..171 'F::<u32>': F<u32>
+            163..171 'F::<u32>': F<u32>
-    163..178 'F::<u32>.foo(S)': (u32, {unknown})
+            163..178 'F::<u32>.foo(S)': (u32, {unknown})
-    176..177 'S': S
+            176..177 'S': S
-    184..192 'F::<u32>': F<u32>
+            184..192 'F::<u32>': F<u32>
-    184..206 'F::<u3...32>(S)': (u32, i32)
+            184..206 'F::<u3...32>(S)': (u32, i32)
-    204..205 'S': S
+            204..205 'S': S
-    212..220 'F::<u32>': F<u32>
+            212..220 'F::<u32>': F<u32>
-    212..239 'F::<u3...32>(S)': (u32, i32)
+            212..239 'F::<u3...32>(S)': (u32, i32)
-    237..238 'S': S
+            237..238 'S': S
-    "###
+        "#]],
    );
 }
 #[test]
 fn argument_impl_trait_to_fn_pointer() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-trait Trait {}
+        trait Trait {}
-fn foo(x: impl Trait) { loop {} }
+        fn foo(x: impl Trait) { loop {} }
-struct S;
+        struct S;
-impl Trait for S {}
+        impl Trait for S {}
-fn test() {
+        fn test() {
-    let f: fn(S) -> () = foo;
+            let f: fn(S) -> () = foo;
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    22..23 'x': impl Trait
+            22..23 'x': impl Trait
-    37..48 '{ loop {} }': ()
+            37..48 '{ loop {} }': ()
-    39..46 'loop {}': !
+            39..46 'loop {}': !
-    44..46 '{}': ()
+            44..46 '{}': ()
-    90..123 '{     ...foo; }': ()
+            90..123 '{     ...foo; }': ()
-    100..101 'f': fn(S)
+            100..101 'f': fn(S)
-    117..120 'foo': fn foo(S)
+            117..120 'foo': fn foo(S)
-    "###
+        "#]],
    );
 }
 #[test]
 fn impl_trait() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn foo(&self) -> T;
+            fn foo(&self) -> T;
-    fn foo2(&self) -> i64;
+            fn foo2(&self) -> i64;
-}
+        }
-fn bar() -> impl Trait<u64> {}
+        fn bar() -> impl Trait<u64> {}
-fn test(x: impl Trait<u64>, y: &impl Trait<u64>) {
+        fn test(x: impl Trait<u64>, y: &impl Trait<u64>) {
-    x;
+            x;
-    y;
+            y;
-    let z = bar();
+            let z = bar();
-    x.foo();
+            x.foo();
-    y.foo();
+            y.foo();
-    z.foo();
+            z.foo();
-    x.foo2();
+            x.foo2();
-    y.foo2();
+            y.foo2();
-    z.foo2();
+            z.foo2();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    29..33 'self': &Self
+            29..33 'self': &Self
-    54..58 'self': &Self
+            54..58 'self': &Self
-    98..100 '{}': ()
+            98..100 '{}': ()
-    110..111 'x': impl Trait<u64>
+            110..111 'x': impl Trait<u64>
-    130..131 'y': &impl Trait<u64>
+            130..131 'y': &impl Trait<u64>
-    151..268 '{     ...2(); }': ()
+            151..268 '{     ...2(); }': ()
-    157..158 'x': impl Trait<u64>
+            157..158 'x': impl Trait<u64>
-    164..165 'y': &impl Trait<u64>
+            164..165 'y': &impl Trait<u64>
-    175..176 'z': impl Trait<u64>
+            175..176 'z': impl Trait<u64>
-    179..182 'bar': fn bar() -> impl Trait<u64>
+            179..182 'bar': fn bar() -> impl Trait<u64>
-    179..184 'bar()': impl Trait<u64>
+            179..184 'bar()': impl Trait<u64>
-    190..191 'x': impl Trait<u64>
+            190..191 'x': impl Trait<u64>
-    190..197 'x.foo()': u64
+            190..197 'x.foo()': u64
-    203..204 'y': &impl Trait<u64>
+            203..204 'y': &impl Trait<u64>
-    203..210 'y.foo()': u64
+            203..210 'y.foo()': u64
-    216..217 'z': impl Trait<u64>
+            216..217 'z': impl Trait<u64>
-    216..223 'z.foo()': u64
+            216..223 'z.foo()': u64
-    229..230 'x': impl Trait<u64>
+            229..230 'x': impl Trait<u64>
-    229..237 'x.foo2()': i64
+            229..237 'x.foo2()': i64
-    243..244 'y': &impl Trait<u64>
+            243..244 'y': &impl Trait<u64>
-    243..251 'y.foo2()': i64
+            243..251 'y.foo2()': i64
-    257..258 'z': impl Trait<u64>
+            257..258 'z': impl Trait<u64>
-    257..265 'z.foo2()': i64
+            257..265 'z.foo2()': i64
-    "###
+        "#]],
    );
 }
 #[test]
 fn simple_return_pos_impl_trait() {
    mark::check!(lower_rpit);
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn foo(&self) -> T;
+            fn foo(&self) -> T;
-}
+        }
-fn bar() -> impl Trait<u64> { loop {} }
+        fn bar() -> impl Trait<u64> { loop {} }
-fn test() {
+        fn test() {
-    let a = bar();
+            let a = bar();
-    a.foo();
+            a.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    29..33 'self': &Self
+            29..33 'self': &Self
-    71..82 '{ loop {} }': !
+            71..82 '{ loop {} }': !
-    73..80 'loop {}': !
+            73..80 'loop {}': !
-    78..80 '{}': ()
+            78..80 '{}': ()
-    94..129 '{     ...o(); }': ()
+            94..129 '{     ...o(); }': ()
-    104..105 'a': impl Trait<u64>
+            104..105 'a': impl Trait<u64>
-    108..111 'bar': fn bar() -> impl Trait<u64>
+            108..111 'bar': fn bar() -> impl Trait<u64>
-    108..113 'bar()': impl Trait<u64>
+            108..113 'bar()': impl Trait<u64>
-    119..120 'a': impl Trait<u64>
+            119..120 'a': impl Trait<u64>
-    119..126 'a.foo()': u64
+            119..126 'a.foo()': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn more_return_pos_impl_trait() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Iterator {
+        trait Iterator {
-    type Item;
+            type Item;
-    fn next(&mut self) -> Self::Item;
+            fn next(&mut self) -> Self::Item;
-}
+        }
-trait Trait<T> {
+        trait Trait<T> {
-    fn foo(&self) -> T;
+            fn foo(&self) -> T;
-}
+        }
-fn bar() -> (impl Iterator<Item = impl Trait<u32>>, impl Trait<u64>) { loop {} }
+        fn bar() -> (impl Iterator<Item = impl Trait<u32>>, impl Trait<u64>) { loop {} }
-fn baz<T>(t: T) -> (impl Iterator<Item = impl Trait<T>>, impl Trait<T>) { loop {} }
+        fn baz<T>(t: T) -> (impl Iterator<Item = impl Trait<T>>, impl Trait<T>) { loop {} }
-fn test() {
+        fn test() {
-    let (a, b) = bar();
+            let (a, b) = bar();
-    a.next().foo();
+            a.next().foo();
-    b.foo();
+            b.foo();
-    let (c, d) = baz(1u128);
+            let (c, d) = baz(1u128);
-    c.next().foo();
+            c.next().foo();
-    d.foo();
+            d.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    49..53 'self': &mut Self
+            49..53 'self': &mut Self
-    101..105 'self': &Self
+            101..105 'self': &Self
-    184..195 '{ loop {} }': ({unknown}, {unknown})
+            184..195 '{ loop {} }': ({unknown}, {unknown})
-    186..193 'loop {}': !
+            186..193 'loop {}': !
-    191..193 '{}': ()
+            191..193 '{}': ()
-    206..207 't': T
+            206..207 't': T
-    268..279 '{ loop {} }': ({unknown}, {unknown})
+            268..279 '{ loop {} }': ({unknown}, {unknown})
-    270..277 'loop {}': !
+            270..277 'loop {}': !
-    275..277 '{}': ()
+            275..277 '{}': ()
-    291..413 '{     ...o(); }': ()
+            291..413 '{     ...o(); }': ()
-    301..307 '(a, b)': (impl Iterator<Item = impl Trait<u32>>, impl Trait<u64>)
+            301..307 '(a, b)': (impl Iterator<Item = impl Trait<u32>>, impl Trait<u64>)
-    302..303 'a': impl Iterator<Item = impl Trait<u32>>
+            302..303 'a': impl Iterator<Item = impl Trait<u32>>
-    305..306 'b': impl Trait<u64>
+            305..306 'b': impl Trait<u64>
-    310..313 'bar': fn bar() -> (impl Iterator<Item = impl Trait<u32>>, impl Trait<u64>)
+            310..313 'bar': fn bar() -> (impl Iterator<Item = impl Trait<u32>>, impl Trait<u64>)
-    310..315 'bar()': (impl Iterator<Item = impl Trait<u32>>, impl Trait<u64>)
+            310..315 'bar()': (impl Iterator<Item = impl Trait<u32>>, impl Trait<u64>)
-    321..322 'a': impl Iterator<Item = impl Trait<u32>>
+            321..322 'a': impl Iterator<Item = impl Trait<u32>>
-    321..329 'a.next()': impl Trait<u32>
+            321..329 'a.next()': impl Trait<u32>
-    321..335 'a.next().foo()': u32
+            321..335 'a.next().foo()': u32
-    341..342 'b': impl Trait<u64>
+            341..342 'b': impl Trait<u64>
-    341..348 'b.foo()': u64
+            341..348 'b.foo()': u64
-    358..364 '(c, d)': (impl Iterator<Item = impl Trait<u128>>, impl Trait<u128>)
+            358..364 '(c, d)': (impl Iterator<Item = impl Trait<u128>>, impl Trait<u128>)
-    359..360 'c': impl Iterator<Item = impl Trait<u128>>
+            359..360 'c': impl Iterator<Item = impl Trait<u128>>
-    362..363 'd': impl Trait<u128>
+            362..363 'd': impl Trait<u128>
-    367..370 'baz': fn baz<u128>(u128) -> (impl Iterator<Item = impl Trait<u128>>, impl Trait<u128>)
+            367..370 'baz': fn baz<u128>(u128) -> (impl Iterator<Item = impl Trait<u128>>, impl Trait<u128>)
-    367..377 'baz(1u128)': (impl Iterator<Item = impl Trait<u128>>, impl Trait<u128>)
+            367..377 'baz(1u128)': (impl Iterator<Item = impl Trait<u128>>, impl Trait<u128>)
-    371..376 '1u128': u128
+            371..376 '1u128': u128
-    383..384 'c': impl Iterator<Item = impl Trait<u128>>
+            383..384 'c': impl Iterator<Item = impl Trait<u128>>
-    383..391 'c.next()': impl Trait<u128>
+            383..391 'c.next()': impl Trait<u128>
-    383..397 'c.next().foo()': u128
+            383..397 'c.next().foo()': u128
-    403..404 'd': impl Trait<u128>
+            403..404 'd': impl Trait<u128>
-    403..410 'd.foo()': u128
+            403..410 'd.foo()': u128
-    "###
+        "#]],
    );
 }
 #[test]
 fn dyn_trait() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T> {
+        trait Trait<T> {
-    fn foo(&self) -> T;
+            fn foo(&self) -> T;
-    fn foo2(&self) -> i64;
+            fn foo2(&self) -> i64;
-}
+        }
-fn bar() -> dyn Trait<u64> {}
+        fn bar() -> dyn Trait<u64> {}
-fn test(x: dyn Trait<u64>, y: &dyn Trait<u64>) {
+        fn test(x: dyn Trait<u64>, y: &dyn Trait<u64>) {
-    x;
+            x;
-    y;
+            y;
-    let z = bar();
+            let z = bar();
-    x.foo();
+            x.foo();
-    y.foo();
+            y.foo();
-    z.foo();
+            z.foo();
-    x.foo2();
+            x.foo2();
-    y.foo2();
+            y.foo2();
-    z.foo2();
+            z.foo2();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    29..33 'self': &Self
+            29..33 'self': &Self
-    54..58 'self': &Self
+            54..58 'self': &Self
-    97..99 '{}': ()
+            97..99 '{}': ()
-    109..110 'x': dyn Trait<u64>
+            109..110 'x': dyn Trait<u64>
-    128..129 'y': &dyn Trait<u64>
+            128..129 'y': &dyn Trait<u64>
-    148..265 '{     ...2(); }': ()
+            148..265 '{     ...2(); }': ()
-    154..155 'x': dyn Trait<u64>
+            154..155 'x': dyn Trait<u64>
-    161..162 'y': &dyn Trait<u64>
+            161..162 'y': &dyn Trait<u64>
-    172..173 'z': dyn Trait<u64>
+            172..173 'z': dyn Trait<u64>
-    176..179 'bar': fn bar() -> dyn Trait<u64>
+            176..179 'bar': fn bar() -> dyn Trait<u64>
-    176..181 'bar()': dyn Trait<u64>
+            176..181 'bar()': dyn Trait<u64>
-    187..188 'x': dyn Trait<u64>
+            187..188 'x': dyn Trait<u64>
-    187..194 'x.foo()': u64
+            187..194 'x.foo()': u64
-    200..201 'y': &dyn Trait<u64>
+            200..201 'y': &dyn Trait<u64>
-    200..207 'y.foo()': u64
+            200..207 'y.foo()': u64
-    213..214 'z': dyn Trait<u64>
+            213..214 'z': dyn Trait<u64>
-    213..220 'z.foo()': u64
+            213..220 'z.foo()': u64
-    226..227 'x': dyn Trait<u64>
+            226..227 'x': dyn Trait<u64>
-    226..234 'x.foo2()': i64
+            226..234 'x.foo2()': i64
-    240..241 'y': &dyn Trait<u64>
+            240..241 'y': &dyn Trait<u64>
-    240..248 'y.foo2()': i64
+            240..248 'y.foo2()': i64
-    254..255 'z': dyn Trait<u64>
+            254..255 'z': dyn Trait<u64>
-    254..262 'z.foo2()': i64
+            254..262 'z.foo2()': i64
-    "###
+        "#]],
    );
 }
 #[test]
 fn dyn_trait_in_impl() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait<T, U> {
+        trait Trait<T, U> {
-    fn foo(&self) -> (T, U);
+            fn foo(&self) -> (T, U);
-}
+        }
-struct S<T, U> {}
+        struct S<T, U> {}
-impl<T, U> S<T, U> {
+        impl<T, U> S<T, U> {
-    fn bar(&self) -> &dyn Trait<T, U> { loop {} }
+            fn bar(&self) -> &dyn Trait<T, U> { loop {} }
-}
+        }
-trait Trait2<T, U> {
+        trait Trait2<T, U> {
-    fn baz(&self) -> (T, U);
+            fn baz(&self) -> (T, U);
-}
+        }
-impl<T, U> Trait2<T, U> for dyn Trait<T, U> { }
+        impl<T, U> Trait2<T, U> for dyn Trait<T, U> { }
-fn test(s: S<u32, i32>) {
+        fn test(s: S<u32, i32>) {
-    s.bar().baz();
+            s.bar().baz();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    32..36 'self': &Self
+            32..36 'self': &Self
-    102..106 'self': &S<T, U>
+            102..106 'self': &S<T, U>
-    128..139 '{ loop {} }': &dyn Trait<T, U>
+            128..139 '{ loop {} }': &dyn Trait<T, U>
-    130..137 'loop {}': !
+            130..137 'loop {}': !
-    135..137 '{}': ()
+            135..137 '{}': ()
-    175..179 'self': &Self
+            175..179 'self': &Self
-    251..252 's': S<u32, i32>
+            251..252 's': S<u32, i32>
-    267..289 '{     ...z(); }': ()
+            267..289 '{     ...z(); }': ()
-    273..274 's': S<u32, i32>
+            273..274 's': S<u32, i32>
-    273..280 's.bar()': &dyn Trait<u32, i32>
+            273..280 's.bar()': &dyn Trait<u32, i32>
-    273..286 's.bar().baz()': (u32, i32)
+            273..286 's.bar().baz()': (u32, i32)
-    "###
+        "#]],
    );
 }
 #[test]
 fn dyn_trait_bare() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait {
+        trait Trait {
-    fn foo(&self) -> u64;
+            fn foo(&self) -> u64;
-}
+        }
-fn bar() -> Trait {}
+        fn bar() -> Trait {}
-fn test(x: Trait, y: &Trait) -> u64 {
+        fn test(x: Trait, y: &Trait) -> u64 {
-    x;
+            x;
-    y;
+            y;
-    let z = bar();
+            let z = bar();
-    x.foo();
+            x.foo();
-    y.foo();
+            y.foo();
-    z.foo();
+            z.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    26..30 'self': &Self
+            26..30 'self': &Self
-    60..62 '{}': ()
+            60..62 '{}': ()
-    72..73 'x': dyn Trait
+            72..73 'x': dyn Trait
-    82..83 'y': &dyn Trait
+            82..83 'y': &dyn Trait
-    100..175 '{     ...o(); }': ()
+            100..175 '{     ...o(); }': ()
-    106..107 'x': dyn Trait
+            106..107 'x': dyn Trait
-    113..114 'y': &dyn Trait
+            113..114 'y': &dyn Trait
-    124..125 'z': dyn Trait
+            124..125 'z': dyn Trait
-    128..131 'bar': fn bar() -> dyn Trait
+            128..131 'bar': fn bar() -> dyn Trait
-    128..133 'bar()': dyn Trait
+            128..133 'bar()': dyn Trait
-    139..140 'x': dyn Trait
+            139..140 'x': dyn Trait
-    139..146 'x.foo()': u64
+            139..146 'x.foo()': u64
-    152..153 'y': &dyn Trait
+            152..153 'y': &dyn Trait
-    152..159 'y.foo()': u64
+            152..159 'y.foo()': u64
-    165..166 'z': dyn Trait
+            165..166 'z': dyn Trait
-    165..172 'z.foo()': u64
+            165..172 'z.foo()': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn weird_bounds() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait {}
+        trait Trait {}
-fn test(a: impl Trait + 'lifetime, b: impl 'lifetime, c: impl (Trait), d: impl ('lifetime), e: impl ?Sized, f: impl Trait + ?Sized) {
+        fn test(a: impl Trait + 'lifetime, b: impl 'lifetime, c: impl (Trait), d: impl ('lifetime), e: impl ?Sized, f: impl Trait + ?Sized) {}
-}
+        "#,
-"#),
+        expect![[r#"
-        @r###"
+            23..24 'a': impl Trait + {error}
-    23..24 'a': impl Trait + {error}
+            50..51 'b': impl {error}
-    50..51 'b': impl {error}
+            69..70 'c': impl Trait
-    69..70 'c': impl Trait
+            86..87 'd': impl {error}
-    86..87 'd': impl {error}
+            107..108 'e': impl {error}
-    107..108 'e': impl {error}
+            123..124 'f': impl Trait + {error}
-    123..124 'f': impl Trait + {error}
+            147..149 '{}': ()
-    147..150 '{ }': ()
+        "#]],
-    "###
    );
 }
@@ -1363,66 +1398,66 @@ fn test(x: (impl Trait + UnknownTrait)) {
 #[test]
 fn assoc_type_bindings() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait {
+        trait Trait {
-    type Type;
+            type Type;
-}
+        }
-fn get<T: Trait>(t: T) -> <T as Trait>::Type {}
-fn get2<U, T: Trait<Type = U>>(t: T) -> U {}
-fn set<T: Trait<Type = u64>>(t: T) -> T {t}
-struct S<T>;
+        fn get<T: Trait>(t: T) -> <T as Trait>::Type {}
-impl<T> Trait for S<T> { type Type = T; }
+        fn get2<U, T: Trait<Type = U>>(t: T) -> U {}
+        fn set<T: Trait<Type = u64>>(t: T) -> T {t}
-fn test<T: Trait<Type = u32>>(x: T, y: impl Trait<Type = i64>) {
-    get(x);
+        struct S<T>;
-    get2(x);
+        impl<T> Trait for S<T> { type Type = T; }
-    get(y);
-    get2(y);
+        fn test<T: Trait<Type = u32>>(x: T, y: impl Trait<Type = i64>) {
-    get(set(S));
+            get(x);
-    get2(set(S));
+            get2(x);
-    get2(S::<str>);
+            get(y);
-}
+            get2(y);
-"#),
+            get(set(S));
-        @r###"
+            get2(set(S));
-    49..50 't': T
+            get2(S::<str>);
-    77..79 '{}': ()
+        }
-    111..112 't': T
+        "#,
-    122..124 '{}': ()
+        expect![[r#"
-    154..155 't': T
+            49..50 't': T
-    165..168 '{t}': T
+            77..79 '{}': ()
-    166..167 't': T
+            111..112 't': T
-    256..257 'x': T
+            122..124 '{}': ()
-    262..263 'y': impl Trait<Type = i64>
+            154..155 't': T
-    289..397 '{     ...r>); }': ()
+            165..168 '{t}': T
-    295..298 'get': fn get<T>(T) -> <T as Trait>::Type
+            166..167 't': T
-    295..301 'get(x)': u32
+            256..257 'x': T
-    299..300 'x': T
+            262..263 'y': impl Trait<Type = i64>
-    307..311 'get2': fn get2<u32, T>(T) -> u32
+            289..397 '{     ...r>); }': ()
-    307..314 'get2(x)': u32
+            295..298 'get': fn get<T>(T) -> <T as Trait>::Type
-    312..313 'x': T
+            295..301 'get(x)': u32
-    320..323 'get': fn get<impl Trait<Type = i64>>(impl Trait<Type = i64>) -> <impl Trait<Type = i64> as Trait>::Type
+            299..300 'x': T
-    320..326 'get(y)': i64
+            307..311 'get2': fn get2<u32, T>(T) -> u32
-    324..325 'y': impl Trait<Type = i64>
+            307..314 'get2(x)': u32
-    332..336 'get2': fn get2<i64, impl Trait<Type = i64>>(impl Trait<Type = i64>) -> i64
+            312..313 'x': T
-    332..339 'get2(y)': i64
+            320..323 'get': fn get<impl Trait<Type = i64>>(impl Trait<Type = i64>) -> <impl Trait<Type = i64> as Trait>::Type
-    337..338 'y': impl Trait<Type = i64>
+            320..326 'get(y)': i64
-    345..348 'get': fn get<S<u64>>(S<u64>) -> <S<u64> as Trait>::Type
+            324..325 'y': impl Trait<Type = i64>
-    345..356 'get(set(S))': u64
+            332..336 'get2': fn get2<i64, impl Trait<Type = i64>>(impl Trait<Type = i64>) -> i64
-    349..352 'set': fn set<S<u64>>(S<u64>) -> S<u64>
+            332..339 'get2(y)': i64
-    349..355 'set(S)': S<u64>
+            337..338 'y': impl Trait<Type = i64>
-    353..354 'S': S<u64>
+            345..348 'get': fn get<S<u64>>(S<u64>) -> <S<u64> as Trait>::Type
-    362..366 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
+            345..356 'get(set(S))': u64
-    362..374 'get2(set(S))': u64
+            349..352 'set': fn set<S<u64>>(S<u64>) -> S<u64>
-    367..370 'set': fn set<S<u64>>(S<u64>) -> S<u64>
+            349..355 'set(S)': S<u64>
-    367..373 'set(S)': S<u64>
+            353..354 'S': S<u64>
-    371..372 'S': S<u64>
+            362..366 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
-    380..384 'get2': fn get2<str, S<str>>(S<str>) -> str
+            362..374 'get2(set(S))': u64
-    380..394 'get2(S::<str>)': str
+            367..370 'set': fn set<S<u64>>(S<u64>) -> S<u64>
-    385..393 'S::<str>': S<str>
+            367..373 'set(S)': S<u64>
-    "###
+            371..372 'S': S<u64>
+            380..384 'get2': fn get2<str, S<str>>(S<str>) -> str
+            380..394 'get2(S::<str>)': str
+            385..393 'S::<str>': S<str>
+        "#]],
    );
 }
@@ -1470,27 +1505,27 @@ mod iter {
 #[test]
 fn projection_eq_within_chalk() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait Trait1 {
+        trait Trait1 {
-    type Type;
+            type Type;
-}
+        }
-trait Trait2<T> {
+        trait Trait2<T> {
-    fn foo(self) -> T;
+            fn foo(self) -> T;
-}
+        }
-impl<T, U> Trait2<T> for U where U: Trait1<Type = T> {}
+        impl<T, U> Trait2<T> for U where U: Trait1<Type = T> {}
-fn test<T: Trait1<Type = u32>>(x: T) {
+        fn test<T: Trait1<Type = u32>>(x: T) {
-    x.foo();
+            x.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    61..65 'self': Self
+            61..65 'self': Self
-    163..164 'x': T
+            163..164 'x': T
-    169..185 '{     ...o(); }': ()
+            169..185 '{     ...o(); }': ()
-    175..176 'x': T
+            175..176 'x': T
-    175..182 'x.foo()': u32
+            175..182 'x.foo()': u32
-    "###
+        "#]],
    );
 }
@@ -1513,445 +1548,467 @@ fn test<T: foo::Trait>(x: T) {
 #[test]
 fn super_trait_method_resolution() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-mod foo {
+        mod foo {
-    trait SuperTrait {
+            trait SuperTrait {
-        fn foo(&self) -> u32 {}
+                fn foo(&self) -> u32 {}
-    }
+            }
-}
+        }
-trait Trait1: foo::SuperTrait {}
+        trait Trait1: foo::SuperTrait {}
-trait Trait2 where Self: foo::SuperTrait {}
+        trait Trait2 where Self: foo::SuperTrait {}
-fn test<T: Trait1, U: Trait2>(x: T, y: U) {
+        fn test<T: Trait1, U: Trait2>(x: T, y: U) {
-    x.foo();
+            x.foo();
-    y.foo();
+            y.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    49..53 'self': &Self
+            49..53 'self': &Self
-    62..64 '{}': ()
+            62..64 '{}': ()
-    181..182 'x': T
+            181..182 'x': T
-    187..188 'y': U
+            187..188 'y': U
-    193..222 '{     ...o(); }': ()
+            193..222 '{     ...o(); }': ()
-    199..200 'x': T
+            199..200 'x': T
-    199..206 'x.foo()': u32
+            199..206 'x.foo()': u32
-    212..213 'y': U
+            212..213 'y': U
-    212..219 'y.foo()': u32
+            212..219 'y.foo()': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn super_trait_impl_trait_method_resolution() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-mod foo {
+        mod foo {
-    trait SuperTrait {
+            trait SuperTrait {
-        fn foo(&self) -> u32 {}
+                fn foo(&self) -> u32 {}
-    }
+            }
-}
+        }
-trait Trait1: foo::SuperTrait {}
+        trait Trait1: foo::SuperTrait {}
-fn test(x: &impl Trait1) {
+        fn test(x: &impl Trait1) {
-    x.foo();
+            x.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    49..53 'self': &Self
+            49..53 'self': &Self
-    62..64 '{}': ()
+            62..64 '{}': ()
-    115..116 'x': &impl Trait1
+            115..116 'x': &impl Trait1
-    132..148 '{     ...o(); }': ()
+            132..148 '{     ...o(); }': ()
-    138..139 'x': &impl Trait1
+            138..139 'x': &impl Trait1
-    138..145 'x.foo()': u32
+            138..145 'x.foo()': u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn super_trait_cycle() {
    // This just needs to not crash
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait A: B {}
+        trait A: B {}
-trait B: A {}
+        trait B: A {}
-fn test<T: A>(x: T) {
+        fn test<T: A>(x: T) {
-    x.foo();
+            x.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    43..44 'x': T
+            43..44 'x': T
-    49..65 '{     ...o(); }': ()
+            49..65 '{     ...o(); }': ()
-    55..56 'x': T
+            55..56 'x': T
-    55..62 'x.foo()': {unknown}
+            55..62 'x.foo()': {unknown}
-    "###
+        "#]],
    );
 }
 #[test]
 fn super_trait_assoc_type_bounds() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait SuperTrait { type Type; }
+        trait SuperTrait { type Type; }
-trait Trait where Self: SuperTrait {}
+        trait Trait where Self: SuperTrait {}
-fn get2<U, T: Trait<Type = U>>(t: T) -> U {}
+        fn get2<U, T: Trait<Type = U>>(t: T) -> U {}
-fn set<T: Trait<Type = u64>>(t: T) -> T {t}
+        fn set<T: Trait<Type = u64>>(t: T) -> T {t}
-struct S<T>;
+        struct S<T>;
-impl<T> SuperTrait for S<T> { type Type = T; }
+        impl<T> SuperTrait for S<T> { type Type = T; }
-impl<T> Trait for S<T> {}
+        impl<T> Trait for S<T> {}
-fn test() {
+        fn test() {
-    get2(set(S));
+            get2(set(S));
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    102..103 't': T
+            102..103 't': T
-    113..115 '{}': ()
+            113..115 '{}': ()
-    145..146 't': T
+            145..146 't': T
-    156..159 '{t}': T
+            156..159 '{t}': T
-    157..158 't': T
+            157..158 't': T
-    258..279 '{     ...S)); }': ()
+            258..279 '{     ...S)); }': ()
-    264..268 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
+            264..268 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
-    264..276 'get2(set(S))': u64
+            264..276 'get2(set(S))': u64
-    269..272 'set': fn set<S<u64>>(S<u64>) -> S<u64>
+            269..272 'set': fn set<S<u64>>(S<u64>) -> S<u64>
-    269..275 'set(S)': S<u64>
+            269..275 'set(S)': S<u64>
-    273..274 'S': S<u64>
+            273..274 'S': S<u64>
-    "###
+        "#]],
    );
 }
 #[test]
 fn fn_trait() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait FnOnce<Args> {
+        trait FnOnce<Args> {
-    type Output;
+            type Output;
-    fn call_once(self, args: Args) -> <Self as FnOnce<Args>>::Output;
+            fn call_once(self, args: Args) -> <Self as FnOnce<Args>>::Output;
-}
+        }
-fn test<F: FnOnce(u32, u64) -> u128>(f: F) {
+        fn test<F: FnOnce(u32, u64) -> u128>(f: F) {
-    f.call_once((1, 2));
+            f.call_once((1, 2));
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    56..60 'self': Self
+            56..60 'self': Self
-    62..66 'args': Args
+            62..66 'args': Args
-    149..150 'f': F
+            149..150 'f': F
-    155..183 '{     ...2)); }': ()
+            155..183 '{     ...2)); }': ()
-    161..162 'f': F
+            161..162 'f': F
-    161..180 'f.call...1, 2))': u128
+            161..180 'f.call...1, 2))': u128
-    173..179 '(1, 2)': (u32, u64)
+            173..179 '(1, 2)': (u32, u64)
-    174..175 '1': u32
+            174..175 '1': u32
-    177..178 '2': u64
+            177..178 '2': u64
-    "###
+        "#]],
    );
 }
 #[test]
 fn fn_ptr_and_item() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang="fn_once"]
+        #[lang="fn_once"]
-trait FnOnce<Args> {
+        trait FnOnce<Args> {
-    type Output;
+            type Output;
-    fn call_once(self, args: Args) -> Self::Output;
+            fn call_once(self, args: Args) -> Self::Output;
-}
+        }
-trait Foo<T> {
+        trait Foo<T> {
-    fn foo(&self) -> T;
+            fn foo(&self) -> T;
-}
+        }
-struct Bar<T>(T);
+        struct Bar<T>(T);
-impl<A1, R, F: FnOnce(A1) -> R> Foo<(A1, R)> for Bar<F> {
+        impl<A1, R, F: FnOnce(A1) -> R> Foo<(A1, R)> for Bar<F> {
-    fn foo(&self) -> (A1, R) {}
+            fn foo(&self) -> (A1, R) {}
-}
+        }
-enum Opt<T> { None, Some(T) }
+        enum Opt<T> { None, Some(T) }
-impl<T> Opt<T> {
+        impl<T> Opt<T> {
-    fn map<U, F: FnOnce(T) -> U>(self, f: F) -> Opt<U> {}
+            fn map<U, F: FnOnce(T) -> U>(self, f: F) -> Opt<U> {}
-}
+        }
-fn test() {
+        fn test() {
-    let bar: Bar<fn(u8) -> u32>;
+            let bar: Bar<fn(u8) -> u32>;
-    bar.foo();
+            bar.foo();
-    let opt: Opt<u8>;
+            let opt: Opt<u8>;
-    let f: fn(u8) -> u32;
+            let f: fn(u8) -> u32;
-    opt.map(f);
+            opt.map(f);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    74..78 'self': Self
+            74..78 'self': Self
-    80..84 'args': Args
+            80..84 'args': Args
-    139..143 'self': &Self
+            139..143 'self': &Self
-    243..247 'self': &Bar<F>
+            243..247 'self': &Bar<F>
-    260..262 '{}': ()
+            260..262 '{}': ()
-    346..350 'self': Opt<T>
+            346..350 'self': Opt<T>
-    352..353 'f': F
+            352..353 'f': F
-    368..370 '{}': ()
+            368..370 '{}': ()
-    384..500 '{     ...(f); }': ()
+            384..500 '{     ...(f); }': ()
-    394..397 'bar': Bar<fn(u8) -> u32>
+            394..397 'bar': Bar<fn(u8) -> u32>
-    423..426 'bar': Bar<fn(u8) -> u32>
+            423..426 'bar': Bar<fn(u8) -> u32>
-    423..432 'bar.foo()': (u8, u32)
+            423..432 'bar.foo()': (u8, u32)
-    443..446 'opt': Opt<u8>
+            443..446 'opt': Opt<u8>
-    465..466 'f': fn(u8) -> u32
+            465..466 'f': fn(u8) -> u32
-    487..490 'opt': Opt<u8>
+            487..490 'opt': Opt<u8>
-    487..497 'opt.map(f)': Opt<u32>
+            487..497 'opt.map(f)': Opt<u32>
-    495..496 'f': fn(u8) -> u32
+            495..496 'f': fn(u8) -> u32
-    "###
+        "#]],
    );
 }
 #[test]
 fn fn_trait_deref_with_ty_default() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang = "deref"]
+        #[lang = "deref"]
-trait Deref {
+        trait Deref {
-    type Target;
+            type Target;
-    fn deref(&self) -> &Self::Target;
+            fn deref(&self) -> &Self::Target;
-}
+        }
-#[lang="fn_once"]
+        #[lang="fn_once"]
-trait FnOnce<Args> {
+        trait FnOnce<Args> {
-    type Output;
+            type Output;
-    fn call_once(self, args: Args) -> Self::Output;
+            fn call_once(self, args: Args) -> Self::Output;
-}
+        }
-struct Foo;
+        struct Foo;
-impl Foo {
+        impl Foo {
-    fn foo(&self) -> usize {}
+            fn foo(&self) -> usize {}
-}
+        }
-struct Lazy<T, F = fn() -> T>(F);
+        struct Lazy<T, F = fn() -> T>(F);
-impl<T, F> Lazy<T, F> {
+        impl<T, F> Lazy<T, F> {
-    pub fn new(f: F) -> Lazy<T, F> {}
+            pub fn new(f: F) -> Lazy<T, F> {}
-}
+        }
-impl<T, F: FnOnce() -> T> Deref for Lazy<T, F> {
+        impl<T, F: FnOnce() -> T> Deref for Lazy<T, F> {
-    type Target = T;
+            type Target = T;
-}
+        }
-fn test() {
+        fn test() {
-    let lazy1: Lazy<Foo, _> = Lazy::new(|| Foo);
+            let lazy1: Lazy<Foo, _> = Lazy::new(|| Foo);
-    let r1 = lazy1.foo();
+            let r1 = lazy1.foo();
-    fn make_foo_fn() -> Foo {}
+            fn make_foo_fn() -> Foo {}
-    let make_foo_fn_ptr: fn() -> Foo = make_foo_fn;
+            let make_foo_fn_ptr: fn() -> Foo = make_foo_fn;
-    let lazy2: Lazy<Foo, _> = Lazy::new(make_foo_fn_ptr);
+            let lazy2: Lazy<Foo, _> = Lazy::new(make_foo_fn_ptr);
-    let r2 = lazy2.foo();
+            let r2 = lazy2.foo();
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    64..68 'self': &Self
+            64..68 'self': &Self
-    165..169 'self': Self
+            165..169 'self': Self
-    171..175 'args': Args
+            171..175 'args': Args
-    239..243 'self': &Foo
+            239..243 'self': &Foo
-    254..256 '{}': ()
+            254..256 '{}': ()
-    334..335 'f': F
+            334..335 'f': F
-    354..356 '{}': ()
+            354..356 '{}': ()
-    443..689 '{     ...o(); }': ()
+            443..689 '{     ...o(); }': ()
-    453..458 'lazy1': Lazy<Foo, || -> Foo>
+            453..458 'lazy1': Lazy<Foo, || -> Foo>
-    475..484 'Lazy::new': fn new<Foo, || -> Foo>(|| -> Foo) -> Lazy<Foo, || -> Foo>
+            475..484 'Lazy::new': fn new<Foo, || -> Foo>(|| -> Foo) -> Lazy<Foo, || -> Foo>
-    475..492 'Lazy::...| Foo)': Lazy<Foo, || -> Foo>
+            475..492 'Lazy::...| Foo)': Lazy<Foo, || -> Foo>
-    485..491 '|| Foo': || -> Foo
+            485..491 '|| Foo': || -> Foo
-    488..491 'Foo': Foo
+            488..491 'Foo': Foo
-    502..504 'r1': usize
+            502..504 'r1': usize
-    507..512 'lazy1': Lazy<Foo, || -> Foo>
+            507..512 'lazy1': Lazy<Foo, || -> Foo>
-    507..518 'lazy1.foo()': usize
+            507..518 'lazy1.foo()': usize
-    560..575 'make_foo_fn_ptr': fn() -> Foo
+            560..575 'make_foo_fn_ptr': fn() -> Foo
-    591..602 'make_foo_fn': fn make_foo_fn() -> Foo
+            591..602 'make_foo_fn': fn make_foo_fn() -> Foo
-    612..617 'lazy2': Lazy<Foo, fn() -> Foo>
+            612..617 'lazy2': Lazy<Foo, fn() -> Foo>
-    634..643 'Lazy::new': fn new<Foo, fn() -> Foo>(fn() -> Foo) -> Lazy<Foo, fn() -> Foo>
+            634..643 'Lazy::new': fn new<Foo, fn() -> Foo>(fn() -> Foo) -> Lazy<Foo, fn() -> Foo>
-    634..660 'Lazy::...n_ptr)': Lazy<Foo, fn() -> Foo>
+            634..660 'Lazy::...n_ptr)': Lazy<Foo, fn() -> Foo>
-    644..659 'make_foo_fn_ptr': fn() -> Foo
+            644..659 'make_foo_fn_ptr': fn() -> Foo
-    670..672 'r2': usize
+            670..672 'r2': usize
-    675..680 'lazy2': Lazy<Foo, fn() -> Foo>
+            675..680 'lazy2': Lazy<Foo, fn() -> Foo>
-    675..686 'lazy2.foo()': usize
+            675..686 'lazy2.foo()': usize
-    549..551 '{}': ()
+            549..551 '{}': ()
-    "###
+        "#]],
    );
 }
 #[test]
 fn closure_1() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-#[lang = "fn_once"]
+        #[lang = "fn_once"]
-trait FnOnce<Args> {
+        trait FnOnce<Args> {
-    type Output;
+            type Output;
-}
+        }
-enum Option<T> { Some(T), None }
+        enum Option<T> { Some(T), None }
-impl<T> Option<T> {
+        impl<T> Option<T> {
-    fn map<U, F: FnOnce(T) -> U>(self, f: F) -> Option<U> {}
+            fn map<U, F: FnOnce(T) -> U>(self, f: F) -> Option<U> {}
-}
+        }
-fn test() {
+        fn test() {
-    let x = Option::Some(1u32);
+            let x = Option::Some(1u32);
-    x.map(|v| v + 1);
+            x.map(|v| v + 1);
-    x.map(|_v| 1u64);
+            x.map(|_v| 1u64);
-    let y: Option<i64> = x.map(|_v| 1);
+            let y: Option<i64> = x.map(|_v| 1);
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    147..151 'self': Option<T>
+            147..151 'self': Option<T>
-    153..154 'f': F
+            153..154 'f': F
-    172..174 '{}': ()
+            172..174 '{}': ()
-    188..307 '{     ... 1); }': ()
+            188..307 '{     ... 1); }': ()
-    198..199 'x': Option<u32>
+            198..199 'x': Option<u32>
-    202..214 'Option::Some': Some<u32>(u32) -> Option<u32>
+            202..214 'Option::Some': Some<u32>(u32) -> Option<u32>
-    202..220 'Option...(1u32)': Option<u32>
+            202..220 'Option...(1u32)': Option<u32>
-    215..219 '1u32': u32
+            215..219 '1u32': u32
-    226..227 'x': Option<u32>
+            226..227 'x': Option<u32>
-    226..242 'x.map(...v + 1)': Option<u32>
+            226..242 'x.map(...v + 1)': Option<u32>
-    232..241 '|v| v + 1': |u32| -> u32
+            232..241 '|v| v + 1': |u32| -> u32
-    233..234 'v': u32
+            233..234 'v': u32
-    236..237 'v': u32
+            236..237 'v': u32
-    236..241 'v + 1': u32
+            236..241 'v + 1': u32
-    240..241 '1': u32
+            240..241 '1': u32
-    248..249 'x': Option<u32>
+            248..249 'x': Option<u32>
-    248..264 'x.map(... 1u64)': Option<u64>
+            248..264 'x.map(... 1u64)': Option<u64>
-    254..263 '|_v| 1u64': |u32| -> u64
+            254..263 '|_v| 1u64': |u32| -> u64
-    255..257 '_v': u32
+            255..257 '_v': u32
-    259..263 '1u64': u64
+            259..263 '1u64': u64
-    274..275 'y': Option<i64>
+            274..275 'y': Option<i64>
-    291..292 'x': Option<u32>
+            291..292 'x': Option<u32>
-    291..304 'x.map(|_v| 1)': Option<i64>
+            291..304 'x.map(|_v| 1)': Option<i64>
-    297..303 '|_v| 1': |u32| -> i64
+            297..303 '|_v| 1': |u32| -> i64
-    298..300 '_v': u32
+            298..300 '_v': u32
-    302..303 '1': i64
+            302..303 '1': i64
-    "###
+        "#]],
    );
 }
 #[test]
 fn closure_2() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-trait FnOnce<Args> {
+        trait FnOnce<Args> {
-    type Output;
+            type Output;
-}
+        }
-fn test<F: FnOnce(u32) -> u64>(f: F) {
+        fn test<F: FnOnce(u32) -> u64>(f: F) {
-    f(1);
+            f(1);
-    let g = |v| v + 1;
+            let g = |v| v + 1;
-    g(1u64);
+            g(1u64);
-    let h = |v| 1u128 + v;
+            let h = |v| 1u128 + v;
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    72..73 'f': F
+            72..73 'f': F
-    78..154 '{     ...+ v; }': ()
+            78..154 '{     ...+ v; }': ()
-    84..85 'f': F
+            84..85 'f': F
-    84..88 'f(1)': {unknown}
+            84..88 'f(1)': {unknown}
-    86..87 '1': i32
+            86..87 '1': i32
-    98..99 'g': |u64| -> i32
+            98..99 'g': |u64| -> i32
-    102..111 '|v| v + 1': |u64| -> i32
+            102..111 '|v| v + 1': |u64| -> i32
-    103..104 'v': u64
+            103..104 'v': u64
-    106..107 'v': u64
+            106..107 'v': u64
-    106..111 'v + 1': i32
+            106..111 'v + 1': i32
-    110..111 '1': i32
+            110..111 '1': i32
-    117..118 'g': |u64| -> i32
+            117..118 'g': |u64| -> i32
-    117..124 'g(1u64)': i32
+            117..124 'g(1u64)': i32
-    119..123 '1u64': u64
+            119..123 '1u64': u64
-    134..135 'h': |u128| -> u128
+            134..135 'h': |u128| -> u128
-    138..151 '|v| 1u128 + v': |u128| -> u128
+            138..151 '|v| 1u128 + v': |u128| -> u128
-    139..140 'v': u128
+            139..140 'v': u128
-    142..147 '1u128': u128
+            142..147 '1u128': u128
-    142..151 '1u128 + v': u128
+            142..151 '1u128 + v': u128
-    150..151 'v': u128
+            150..151 'v': u128
-    "###
+        "#]],
    );
 }
 #[test]
 fn closure_as_argument_inference_order() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
+        #[lang = "fn_once"]
+        trait FnOnce<Args> {
+            type Output;
+        }
+        fn foo1<T, U, F: FnOnce(T) -> U>(x: T, f: F) -> U {}
+        fn foo2<T, U, F: FnOnce(T) -> U>(f: F, x: T) -> U {}
+        struct S;
+        impl S {
+            fn method(self) -> u64;
+            fn foo1<T, U, F: FnOnce(T) -> U>(self, x: T, f: F) -> U {}
+            fn foo2<T, U, F: FnOnce(T) -> U>(self, f: F, x: T) -> U {}
+        }
+        fn test() {
+            let x1 = foo1(S, |s| s.method());
+            let x2 = foo2(|s| s.method(), S);
+            let x3 = S.foo1(S, |s| s.method());
+            let x4 = S.foo2(|s| s.method(), S);
+        }
+        "#,
+        expect![[r#"
+            94..95 'x': T
+            100..101 'f': F
+            111..113 '{}': ()
+            147..148 'f': F
+            153..154 'x': T
+            164..166 '{}': ()
+            201..205 'self': S
+            253..257 'self': S
+            259..260 'x': T
+            265..266 'f': F
+            276..278 '{}': ()
+            316..320 'self': S
+            322..323 'f': F
+            328..329 'x': T
+            339..341 '{}': ()
+            355..514 '{     ... S); }': ()
+            365..367 'x1': u64
+            370..374 'foo1': fn foo1<S, u64, |S| -> u64>(S, |S| -> u64) -> u64
+            370..393 'foo1(S...hod())': u64
+            375..376 'S': S
+            378..392 '|s| s.method()': |S| -> u64
+            379..380 's': S
+            382..383 's': S
+            382..392 's.method()': u64
+            403..405 'x2': u64
+            408..412 'foo2': fn foo2<S, u64, |S| -> u64>(|S| -> u64, S) -> u64
+            408..431 'foo2(|...(), S)': u64
+            413..427 '|s| s.method()': |S| -> u64
+            414..415 's': S
+            417..418 's': S
+            417..427 's.method()': u64
+            429..430 'S': S
+            441..443 'x3': u64
+            446..447 'S': S
+            446..471 'S.foo1...hod())': u64
+            453..454 'S': S
+            456..470 '|s| s.method()': |S| -> u64
+            457..458 's': S
+            460..461 's': S
+            460..470 's.method()': u64
+            481..483 'x4': u64
+            486..487 'S': S
+            486..511 'S.foo2...(), S)': u64
+            493..507 '|s| s.method()': |S| -> u64
+            494..495 's': S
+            497..498 's': S
+            497..507 's.method()': u64
+            509..510 'S': S
+        "#]],
+    );
+}
+#[test]
+fn fn_item_fn_trait() {
+    check_types(
+        r#"
 #[lang = "fn_once"]
 trait FnOnce<Args> {
    type Output;
 }
-fn foo1<T, U, F: FnOnce(T) -> U>(x: T, f: F) -> U {}
-fn foo2<T, U, F: FnOnce(T) -> U>(f: F, x: T) -> U {}
 struct S;
-impl S {
-    fn method(self) -> u64;
-    fn foo1<T, U, F: FnOnce(T) -> U>(self, x: T, f: F) -> U {}
+fn foo() -> S {}
-    fn foo2<T, U, F: FnOnce(T) -> U>(self, f: F, x: T) -> U {}
-}
+fn takes_closure<U, F: FnOnce() -> U>(f: F) -> U { f() }
 fn test() {
-    let x1 = foo1(S, |s| s.method());
+    takes_closure(foo);
-    let x2 = foo2(|s| s.method(), S);
+} //^^^^^^^^^^^^^^^^^^ S
-    let x3 = S.foo1(S, |s| s.method());
+"#,
-    let x4 = S.foo2(|s| s.method(), S);
-}
-"#),
-        @r###"
-    94..95 'x': T
-    100..101 'f': F
-    111..113 '{}': ()
-    147..148 'f': F
-    153..154 'x': T
-    164..166 '{}': ()
-    201..205 'self': S
-    253..257 'self': S
-    259..260 'x': T
-    265..266 'f': F
-    276..278 '{}': ()
-    316..320 'self': S
-    322..323 'f': F
-    328..329 'x': T
-    339..341 '{}': ()
-    355..514 '{     ... S); }': ()
-    365..367 'x1': u64
-    370..374 'foo1': fn foo1<S, u64, |S| -> u64>(S, |S| -> u64) -> u64
-    370..393 'foo1(S...hod())': u64
-    375..376 'S': S
-    378..392 '|s| s.method()': |S| -> u64
-    379..380 's': S
-    382..383 's': S
-    382..392 's.method()': u64
-    403..405 'x2': u64
-    408..412 'foo2': fn foo2<S, u64, |S| -> u64>(|S| -> u64, S) -> u64
-    408..431 'foo2(|...(), S)': u64
-    413..427 '|s| s.method()': |S| -> u64
-    414..415 's': S
-    417..418 's': S
-    417..427 's.method()': u64
-    429..430 'S': S
-    441..443 'x3': u64
-    446..447 'S': S
-    446..471 'S.foo1...hod())': u64
-    453..454 'S': S
-    456..470 '|s| s.method()': |S| -> u64
-    457..458 's': S
-    460..461 's': S
-    460..470 's.method()': u64
-    481..483 'x4': u64
-    486..487 'S': S
-    486..511 'S.foo2...(), S)': u64
-    493..507 '|s| s.method()': |S| -> u64
-    494..495 's': S
-    497..498 's': S
-    497..507 's.method()': u64
-    509..510 'S': S
-    "###
    );
 }
@@ -1998,43 +2055,44 @@ fn test<T, U>() where T::Item: Trait2, T: Trait<U::Item>, U: Trait<()> {
 #[test]
 fn unselected_projection_on_impl_self() {
-    assert_snapshot!(infer(
+    check_infer(
        r#"
-//- /main.rs
+        //- /main.rs
-trait Trait {
+        trait Trait {
-    type Item;
+            type Item;
-    fn f(&self, x: Self::Item);
+            fn f(&self, x: Self::Item);
-}
+        }
-struct S;
+        struct S;
-impl Trait for S {
+        impl Trait for S {
-    type Item = u32;
+            type Item = u32;
-    fn f(&self, x: Self::Item) { let y = x; }
+            fn f(&self, x: Self::Item) { let y = x; }
-}
+        }
-struct S2;
+        struct S2;
-impl Trait for S2 {
+        impl Trait for S2 {
-    type Item = i32;
+            type Item = i32;
-    fn f(&self, x: <Self>::Item) { let y = x; }
+            fn f(&self, x: <Self>::Item) { let y = x; }
-}
+        }
-"#,
+        "#,
-    ), @r###"
+        expect![[r#"
-    40..44 'self': &Self
+            40..44 'self': &Self
-    46..47 'x': Trait::Item<Self>
+            46..47 'x': Trait::Item<Self>
-    126..130 'self': &S
+            126..130 'self': &S
-    132..133 'x': u32
+            132..133 'x': u32
-    147..161 '{ let y = x; }': ()
+            147..161 '{ let y = x; }': ()
-    153..154 'y': u32
+            153..154 'y': u32
-    157..158 'x': u32
+            157..158 'x': u32
-    228..232 'self': &S2
+            228..232 'self': &S2
-    234..235 'x': i32
+            234..235 'x': i32
-    251..265 '{ let y = x; }': ()
+            251..265 '{ let y = x; }': ()
-    257..258 'y': i32
+            257..258 'y': i32
-    261..262 'x': i32
+            261..262 'x': i32
-    "###);
+        "#]],
+    );
 }
 #[test]
@@ -2203,170 +2261,170 @@ fn test<I: Iterator<Item: Iterator<Item = u32>>>() {
 #[test]
 fn proc_macro_server_types() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-macro_rules! with_api {
+        macro_rules! with_api {
-    ($S:ident, $self:ident, $m:ident) => {
+            ($S:ident, $self:ident, $m:ident) => {
-        $m! {
+                $m! {
-            TokenStream {
+                    TokenStream {
-                fn new() -> $S::TokenStream;
+                        fn new() -> $S::TokenStream;
-            },
+                    },
-            Group {
+                    Group {
-            },
+                    },
-        }
+                }
-    };
+            };
-}
+        }
-macro_rules! associated_item {
+        macro_rules! associated_item {
-    (type TokenStream) =>
+            (type TokenStream) =>
-        (type TokenStream: 'static;);
+                (type TokenStream: 'static;);
-    (type Group) =>
+            (type Group) =>
-        (type Group: 'static;);
+                (type Group: 'static;);
-    ($($item:tt)*) => ($($item)*;)
+            ($($item:tt)*) => ($($item)*;)
-}
+        }
-macro_rules! declare_server_traits {
+        macro_rules! declare_server_traits {
-    ($($name:ident {
+            ($($name:ident {
-        $(fn $method:ident($($arg:ident: $arg_ty:ty),* $(,)?) $(-> $ret_ty:ty)?;)*
+                $(fn $method:ident($($arg:ident: $arg_ty:ty),* $(,)?) $(-> $ret_ty:ty)?;)*
-    }),* $(,)?) => {
+            }),* $(,)?) => {
-        pub trait Types {
+                pub trait Types {
-            $(associated_item!(type $name);)*
+                    $(associated_item!(type $name);)*
-        }
+                }
-        $(pub trait $name: Types {
-            $(associated_item!(fn $method($($arg: $arg_ty),*) $(-> $ret_ty)?);)*
-        })*
-        pub trait Server: Types $(+ $name)* {}
-        impl<S: Types $(+ $name)*> Server for S {}
-    }
-}
-with_api!(Self, self_, declare_server_traits);
+                $(pub trait $name: Types {
-struct G {}
+                    $(associated_item!(fn $method($($arg: $arg_ty),*) $(-> $ret_ty)?);)*
-struct T {}
+                })*
-struct Rustc;
-impl Types for Rustc {
-    type TokenStream = T;
-    type Group = G;
-}
-fn make<T>() -> T { loop {} }
+                pub trait Server: Types $(+ $name)* {}
-impl TokenStream for Rustc {
+                impl<S: Types $(+ $name)*> Server for S {}
-    fn new() -> Self::TokenStream {
+            }
-        let group: Self::Group = make();
+        }
-        make()
-    }
+        with_api!(Self, self_, declare_server_traits);
-}
+        struct G {}
-"#),
+        struct T {}
-        @r###"
+        struct Rustc;
-    1061..1072 '{ loop {} }': T
+        impl Types for Rustc {
-    1063..1070 'loop {}': !
+            type TokenStream = T;
-    1068..1070 '{}': ()
+            type Group = G;
-    1136..1199 '{     ...     }': T
+        }
-    1150..1155 'group': G
-    1171..1175 'make': fn make<G>() -> G
+        fn make<T>() -> T { loop {} }
-    1171..1177 'make()': G
+        impl TokenStream for Rustc {
-    1187..1191 'make': fn make<T>() -> T
+            fn new() -> Self::TokenStream {
-    1187..1193 'make()': T
+                let group: Self::Group = make();
-    "###
+                make()
+            }
+        }
+        "#,
+        expect![[r#"
+            1061..1072 '{ loop {} }': T
+            1063..1070 'loop {}': !
+            1068..1070 '{}': ()
+            1136..1199 '{     ...     }': T
+            1150..1155 'group': G
+            1171..1175 'make': fn make<G>() -> G
+            1171..1177 'make()': G
+            1187..1191 'make': fn make<T>() -> T
+            1187..1193 'make()': T
+        "#]],
    );
 }
 #[test]
 fn unify_impl_trait() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-trait Trait<T> {}
+        trait Trait<T> {}
-fn foo(x: impl Trait<u32>) { loop {} }
+        fn foo(x: impl Trait<u32>) { loop {} }
-fn bar<T>(x: impl Trait<T>) -> T { loop {} }
+        fn bar<T>(x: impl Trait<T>) -> T { loop {} }
-struct S<T>(T);
+        struct S<T>(T);
-impl<T> Trait<T> for S<T> {}
+        impl<T> Trait<T> for S<T> {}
-fn default<T>() -> T { loop {} }
+        fn default<T>() -> T { loop {} }
-fn test() -> impl Trait<i32> {
+        fn test() -> impl Trait<i32> {
-    let s1 = S(default());
+            let s1 = S(default());
-    foo(s1);
+            foo(s1);
-    let x: i32 = bar(S(default()));
+            let x: i32 = bar(S(default()));
-    S(default())
+            S(default())
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    26..27 'x': impl Trait<u32>
+            26..27 'x': impl Trait<u32>
-    46..57 '{ loop {} }': ()
+            46..57 '{ loop {} }': ()
-    48..55 'loop {}': !
+            48..55 'loop {}': !
-    53..55 '{}': ()
+            53..55 '{}': ()
-    68..69 'x': impl Trait<T>
+            68..69 'x': impl Trait<T>
-    91..102 '{ loop {} }': T
+            91..102 '{ loop {} }': T
-    93..100 'loop {}': !
+            93..100 'loop {}': !
-    98..100 '{}': ()
+            98..100 '{}': ()
-    171..182 '{ loop {} }': T
+            171..182 '{ loop {} }': T
-    173..180 'loop {}': !
+            173..180 'loop {}': !
-    178..180 '{}': ()
+            178..180 '{}': ()
-    213..309 '{     ...t()) }': S<{unknown}>
+            213..309 '{     ...t()) }': S<{unknown}>
-    223..225 's1': S<u32>
+            223..225 's1': S<u32>
-    228..229 'S': S<u32>(u32) -> S<u32>
+            228..229 'S': S<u32>(u32) -> S<u32>
-    228..240 'S(default())': S<u32>
+            228..240 'S(default())': S<u32>
-    230..237 'default': fn default<u32>() -> u32
+            230..237 'default': fn default<u32>() -> u32
-    230..239 'default()': u32
+            230..239 'default()': u32
-    246..249 'foo': fn foo(S<u32>)
+            246..249 'foo': fn foo(S<u32>)
-    246..253 'foo(s1)': ()
+            246..253 'foo(s1)': ()
-    250..252 's1': S<u32>
+            250..252 's1': S<u32>
-    263..264 'x': i32
+            263..264 'x': i32
-    272..275 'bar': fn bar<i32>(S<i32>) -> i32
+            272..275 'bar': fn bar<i32>(S<i32>) -> i32
-    272..289 'bar(S(...lt()))': i32
+            272..289 'bar(S(...lt()))': i32
-    276..277 'S': S<i32>(i32) -> S<i32>
+            276..277 'S': S<i32>(i32) -> S<i32>
-    276..288 'S(default())': S<i32>
+            276..288 'S(default())': S<i32>
-    278..285 'default': fn default<i32>() -> i32
+            278..285 'default': fn default<i32>() -> i32
-    278..287 'default()': i32
+            278..287 'default()': i32
-    295..296 'S': S<{unknown}>({unknown}) -> S<{unknown}>
+            295..296 'S': S<{unknown}>({unknown}) -> S<{unknown}>
-    295..307 'S(default())': S<{unknown}>
+            295..307 'S(default())': S<{unknown}>
-    297..304 'default': fn default<{unknown}>() -> {unknown}
+            297..304 'default': fn default<{unknown}>() -> {unknown}
-    297..306 'default()': {unknown}
+            297..306 'default()': {unknown}
-    "###
+        "#]],
    );
 }
 #[test]
 fn assoc_types_from_bounds() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-//- /main.rs
+        //- /main.rs
-#[lang = "fn_once"]
+        #[lang = "fn_once"]
-trait FnOnce<Args> {
+        trait FnOnce<Args> {
-    type Output;
+            type Output;
-}
+        }
-trait T {
+        trait T {
-    type O;
+            type O;
-}
+        }
-impl T for () {
+        impl T for () {
-    type O = ();
+            type O = ();
-}
+        }
-fn f<X, F>(_v: F)
+        fn f<X, F>(_v: F)
-where
+        where
-    X: T,
+            X: T,
-    F: FnOnce(&X::O),
+            F: FnOnce(&X::O),
-{ }
+        { }
-fn main() {
+        fn main() {
-    f::<(), _>(|z| { z; });
+            f::<(), _>(|z| { z; });
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    133..135 '_v': F
+            133..135 '_v': F
-    178..181 '{ }': ()
+            178..181 '{ }': ()
-    193..224 '{     ... }); }': ()
+            193..224 '{     ... }); }': ()
-    199..209 'f::<(), _>': fn f<(), |&()| -> ()>(|&()| -> ())
+            199..209 'f::<(), _>': fn f<(), |&()| -> ()>(|&()| -> ())
-    199..221 'f::<()... z; })': ()
+            199..221 'f::<()... z; })': ()
-    210..220 '|z| { z; }': |&()| -> ()
+            210..220 '|z| { z; }': |&()| -> ()
-    211..212 'z': &()
+            211..212 'z': &()
-    214..220 '{ z; }': ()
+            214..220 '{ z; }': ()
-    216..217 'z': &()
+            216..217 'z': &()
-    "###
+        "#]],
    );
 }
@@ -2439,120 +2497,120 @@ fn test() {
 #[test]
 fn iterator_chain() {
-    assert_snapshot!(
+    check_infer(
-        infer(r#"
+        r#"
-//- /main.rs
+        //- /main.rs
-#[lang = "fn_once"]
+        #[lang = "fn_once"]
-trait FnOnce<Args> {
+        trait FnOnce<Args> {
-    type Output;
+            type Output;
-}
+        }
-#[lang = "fn_mut"]
+        #[lang = "fn_mut"]
-trait FnMut<Args>: FnOnce<Args> { }
+        trait FnMut<Args>: FnOnce<Args> { }
-enum Option<T> { Some(T), None }
+        enum Option<T> { Some(T), None }
-use Option::*;
+        use Option::*;
-pub trait Iterator {
+        pub trait Iterator {
-    type Item;
+            type Item;
-    fn filter_map<B, F>(self, f: F) -> FilterMap<Self, F>
+            fn filter_map<B, F>(self, f: F) -> FilterMap<Self, F>
-    where
+            where
-        F: FnMut(Self::Item) -> Option<B>,
+                F: FnMut(Self::Item) -> Option<B>,
-    { loop {} }
+            { loop {} }
-    fn for_each<F>(self, f: F)
+            fn for_each<F>(self, f: F)
-    where
+            where
-        F: FnMut(Self::Item),
+                F: FnMut(Self::Item),
-    { loop {} }
+            { loop {} }
-}
+        }
-pub trait IntoIterator {
+        pub trait IntoIterator {
-    type Item;
+            type Item;
-    type IntoIter: Iterator<Item = Self::Item>;
+            type IntoIter: Iterator<Item = Self::Item>;
-    fn into_iter(self) -> Self::IntoIter;
+            fn into_iter(self) -> Self::IntoIter;
-}
+        }
-pub struct FilterMap<I, F> { }
+        pub struct FilterMap<I, F> { }
-impl<B, I: Iterator, F> Iterator for FilterMap<I, F>
+        impl<B, I: Iterator, F> Iterator for FilterMap<I, F>
-where
+        where
-    F: FnMut(I::Item) -> Option<B>,
+            F: FnMut(I::Item) -> Option<B>,
-{
+        {
-    type Item = B;
+            type Item = B;
-}
+        }
-#[stable(feature = "rust1", since = "1.0.0")]
+        #[stable(feature = "rust1", since = "1.0.0")]
-impl<I: Iterator> IntoIterator for I {
+        impl<I: Iterator> IntoIterator for I {
-    type Item = I::Item;
+            type Item = I::Item;
-    type IntoIter = I;
+            type IntoIter = I;
-    fn into_iter(self) -> I {
+            fn into_iter(self) -> I {
-        self
+                self
-    }
+            }
-}
+        }
-struct Vec<T> {}
+        struct Vec<T> {}
-impl<T> Vec<T> {
+        impl<T> Vec<T> {
-    fn new() -> Self { loop {} }
+            fn new() -> Self { loop {} }
-}
+        }
-impl<T> IntoIterator for Vec<T> {
+        impl<T> IntoIterator for Vec<T> {
-    type Item = T;
+            type Item = T;
-    type IntoIter = IntoIter<T>;
+            type IntoIter = IntoIter<T>;
-}
+        }
-pub struct IntoIter<T> { }
+        pub struct IntoIter<T> { }
-impl<T> Iterator for IntoIter<T> {
+        impl<T> Iterator for IntoIter<T> {
-    type Item = T;
+            type Item = T;
-}
+        }
-fn main() {
+        fn main() {
-    Vec::<i32>::new().into_iter()
+            Vec::<i32>::new().into_iter()
-      .filter_map(|x| if x > 0 { Some(x as u32) } else { None })
+            .filter_map(|x| if x > 0 { Some(x as u32) } else { None })
-      .for_each(|y| { y; });
+            .for_each(|y| { y; });
-}
+        }
-"#),
+        "#,
-        @r###"
+        expect![[r#"
-    226..230 'self': Self
+            226..230 'self': Self
-    232..233 'f': F
+            232..233 'f': F
-    317..328 '{ loop {} }': FilterMap<Self, F>
+            317..328 '{ loop {} }': FilterMap<Self, F>
-    319..326 'loop {}': !
+            319..326 'loop {}': !
-    324..326 '{}': ()
+            324..326 '{}': ()
-    349..353 'self': Self
+            349..353 'self': Self
-    355..356 'f': F
+            355..356 'f': F
-    405..416 '{ loop {} }': ()
+            405..416 '{ loop {} }': ()
-    407..414 'loop {}': !
+            407..414 'loop {}': !
-    412..414 '{}': ()
+            412..414 '{}': ()
-    525..529 'self': Self
+            525..529 'self': Self
-    854..858 'self': I
+            854..858 'self': I
-    865..885 '{     ...     }': I
+            865..885 '{     ...     }': I
-    875..879 'self': I
+            875..879 'self': I
-    944..955 '{ loop {} }': Vec<T>
+            944..955 '{ loop {} }': Vec<T>
-    946..953 'loop {}': !
+            946..953 'loop {}': !
-    951..953 '{}': ()
+            951..953 '{}': ()
-    1142..1273 '{     ... }); }': ()
+            1142..1269 '{     ... }); }': ()
-    1148..1163 'Vec::<i32>::new': fn new<i32>() -> Vec<i32>
+            1148..1163 'Vec::<i32>::new': fn new<i32>() -> Vec<i32>
-    1148..1165 'Vec::<...:new()': Vec<i32>
+            1148..1165 'Vec::<...:new()': Vec<i32>
-    1148..1177 'Vec::<...iter()': IntoIter<i32>
+            1148..1177 'Vec::<...iter()': IntoIter<i32>
-    1148..1242 'Vec::<...one })': FilterMap<IntoIter<i32>, |i32| -> Option<u32>>
+            1148..1240 'Vec::<...one })': FilterMap<IntoIter<i32>, |i32| -> Option<u32>>
-    1148..1270 'Vec::<... y; })': ()
+            1148..1266 'Vec::<... y; })': ()
-    1196..1241 '|x| if...None }': |i32| -> Option<u32>
+            1194..1239 '|x| if...None }': |i32| -> Option<u32>
-    1197..1198 'x': i32
+            1195..1196 'x': i32
-    1200..1241 'if x >...None }': Option<u32>
+            1198..1239 'if x >...None }': Option<u32>
-    1203..1204 'x': i32
+            1201..1202 'x': i32
-    1203..1208 'x > 0': bool
+            1201..1206 'x > 0': bool
-    1207..1208 '0': i32
+            1205..1206 '0': i32
-    1209..1227 '{ Some...u32) }': Option<u32>
+            1207..1225 '{ Some...u32) }': Option<u32>
-    1211..1215 'Some': Some<u32>(u32) -> Option<u32>
+            1209..1213 'Some': Some<u32>(u32) -> Option<u32>
-    1211..1225 'Some(x as u32)': Option<u32>
+            1209..1223 'Some(x as u32)': Option<u32>
-    1216..1217 'x': i32
+            1214..1215 'x': i32
-    1216..1224 'x as u32': u32
+            1214..1222 'x as u32': u32
-    1233..1241 '{ None }': Option<u32>
+            1231..1239 '{ None }': Option<u32>
-    1235..1239 'None': Option<u32>
+            1233..1237 'None': Option<u32>
-    1259..1269 '|y| { y; }': |u32| -> ()
+            1255..1265 '|y| { y; }': |u32| -> ()
-    1260..1261 'y': u32
+            1256..1257 'y': u32
-    1263..1269 '{ y; }': ()
+            1259..1265 '{ y; }': ()
-    1265..1266 'y': u32
+            1261..1262 'y': u32
-    "###
+        "#]],
    );
 }
@@ -2590,176 +2648,176 @@ fn main() {
 #[test]
 fn trait_object_no_coercion() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-trait Foo {}
+        trait Foo {}
-fn foo(x: &dyn Foo) {}
+        fn foo(x: &dyn Foo) {}
-fn test(x: &dyn Foo) {
+        fn test(x: &dyn Foo) {
-    foo(x);
+            foo(x);
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    21..22 'x': &dyn Foo
+            21..22 'x': &dyn Foo
-    34..36 '{}': ()
+            34..36 '{}': ()
-    46..47 'x': &dyn Foo
+            46..47 'x': &dyn Foo
-    59..74 '{     foo(x); }': ()
+            59..74 '{     foo(x); }': ()
-    65..68 'foo': fn foo(&dyn Foo)
+            65..68 'foo': fn foo(&dyn Foo)
-    65..71 'foo(x)': ()
+            65..71 'foo(x)': ()
-    69..70 'x': &dyn Foo
+            69..70 'x': &dyn Foo
-    "###
+        "#]],
    );
 }
 #[test]
 fn builtin_copy() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-#[lang = "copy"]
+        #[lang = "copy"]
-trait Copy {}
+        trait Copy {}
-struct IsCopy;
+        struct IsCopy;
-impl Copy for IsCopy {}
+        impl Copy for IsCopy {}
-struct NotCopy;
+        struct NotCopy;
-trait Test { fn test(&self) -> bool; }
+        trait Test { fn test(&self) -> bool; }
-impl<T: Copy> Test for T {}
+        impl<T: Copy> Test for T {}
-fn test() {
+        fn test() {
-    IsCopy.test();
+            IsCopy.test();
-    NotCopy.test();
+            NotCopy.test();
-    (IsCopy, IsCopy).test();
+            (IsCopy, IsCopy).test();
-    (IsCopy, NotCopy).test();
+            (IsCopy, NotCopy).test();
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    110..114 'self': &Self
+            110..114 'self': &Self
-    166..267 '{     ...t(); }': ()
+            166..267 '{     ...t(); }': ()
-    172..178 'IsCopy': IsCopy
+            172..178 'IsCopy': IsCopy
-    172..185 'IsCopy.test()': bool
+            172..185 'IsCopy.test()': bool
-    191..198 'NotCopy': NotCopy
+            191..198 'NotCopy': NotCopy
-    191..205 'NotCopy.test()': {unknown}
+            191..205 'NotCopy.test()': {unknown}
-    211..227 '(IsCop...sCopy)': (IsCopy, IsCopy)
+            211..227 '(IsCop...sCopy)': (IsCopy, IsCopy)
-    211..234 '(IsCop...test()': bool
+            211..234 '(IsCop...test()': bool
-    212..218 'IsCopy': IsCopy
+            212..218 'IsCopy': IsCopy
-    220..226 'IsCopy': IsCopy
+            220..226 'IsCopy': IsCopy
-    240..257 '(IsCop...tCopy)': (IsCopy, NotCopy)
+            240..257 '(IsCop...tCopy)': (IsCopy, NotCopy)
-    240..264 '(IsCop...test()': {unknown}
+            240..264 '(IsCop...test()': {unknown}
-    241..247 'IsCopy': IsCopy
+            241..247 'IsCopy': IsCopy
-    249..256 'NotCopy': NotCopy
+            249..256 'NotCopy': NotCopy
-    "###
+        "#]],
    );
 }
 #[test]
 fn builtin_fn_def_copy() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-#[lang = "copy"]
+        #[lang = "copy"]
-trait Copy {}
+        trait Copy {}
-fn foo() {}
+        fn foo() {}
-fn bar<T: Copy>(T) -> T {}
+        fn bar<T: Copy>(T) -> T {}
-struct Struct(usize);
+        struct Struct(usize);
-enum Enum { Variant(usize) }
+        enum Enum { Variant(usize) }
-trait Test { fn test(&self) -> bool; }
+        trait Test { fn test(&self) -> bool; }
-impl<T: Copy> Test for T {}
+        impl<T: Copy> Test for T {}
-fn test() {
+        fn test() {
-    foo.test();
+            foo.test();
-    bar.test();
+            bar.test();
-    Struct.test();
+            Struct.test();
-    Enum::Variant.test();
+            Enum::Variant.test();
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    41..43 '{}': ()
+            41..43 '{}': ()
-    60..61 'T': {unknown}
+            60..61 'T': {unknown}
-    68..70 '{}': ()
+            68..70 '{}': ()
-    68..70: expected T, got ()
+            68..70: expected T, got ()
-    145..149 'self': &Self
+            145..149 'self': &Self
-    201..281 '{     ...t(); }': ()
+            201..281 '{     ...t(); }': ()
-    207..210 'foo': fn foo()
+            207..210 'foo': fn foo()
-    207..217 'foo.test()': bool
+            207..217 'foo.test()': bool
-    223..226 'bar': fn bar<{unknown}>({unknown}) -> {unknown}
+            223..226 'bar': fn bar<{unknown}>({unknown}) -> {unknown}
-    223..233 'bar.test()': bool
+            223..233 'bar.test()': bool
-    239..245 'Struct': Struct(usize) -> Struct
+            239..245 'Struct': Struct(usize) -> Struct
-    239..252 'Struct.test()': bool
+            239..252 'Struct.test()': bool
-    258..271 'Enum::Variant': Variant(usize) -> Enum
+            258..271 'Enum::Variant': Variant(usize) -> Enum
-    258..278 'Enum::...test()': bool
+            258..278 'Enum::...test()': bool
-    "###
+        "#]],
    );
 }
 #[test]
 fn builtin_fn_ptr_copy() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-#[lang = "copy"]
+        #[lang = "copy"]
-trait Copy {}
+        trait Copy {}
-trait Test { fn test(&self) -> bool; }
+        trait Test { fn test(&self) -> bool; }
-impl<T: Copy> Test for T {}
+        impl<T: Copy> Test for T {}
-fn test(f1: fn(), f2: fn(usize) -> u8, f3: fn(u8, u8) -> &u8) {
+        fn test(f1: fn(), f2: fn(usize) -> u8, f3: fn(u8, u8) -> &u8) {
-    f1.test();
+            f1.test();
-    f2.test();
+            f2.test();
-    f3.test();
+            f3.test();
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    54..58 'self': &Self
+            54..58 'self': &Self
-    108..110 'f1': fn()
+            108..110 'f1': fn()
-    118..120 'f2': fn(usize) -> u8
+            118..120 'f2': fn(usize) -> u8
-    139..141 'f3': fn(u8, u8) -> &u8
+            139..141 'f3': fn(u8, u8) -> &u8
-    162..210 '{     ...t(); }': ()
+            162..210 '{     ...t(); }': ()
-    168..170 'f1': fn()
+            168..170 'f1': fn()
-    168..177 'f1.test()': bool
+            168..177 'f1.test()': bool
-    183..185 'f2': fn(usize) -> u8
+            183..185 'f2': fn(usize) -> u8
-    183..192 'f2.test()': bool
+            183..192 'f2.test()': bool
-    198..200 'f3': fn(u8, u8) -> &u8
+            198..200 'f3': fn(u8, u8) -> &u8
-    198..207 'f3.test()': bool
+            198..207 'f3.test()': bool
-    "###
+        "#]],
    );
 }
 #[test]
 fn builtin_sized() {
-    assert_snapshot!(
+    check_infer_with_mismatches(
-        infer_with_mismatches(r#"
+        r#"
-#[lang = "sized"]
+        #[lang = "sized"]
-trait Sized {}
+        trait Sized {}
-trait Test { fn test(&self) -> bool; }
+        trait Test { fn test(&self) -> bool; }
-impl<T: Sized> Test for T {}
+        impl<T: Sized> Test for T {}
-fn test() {
+        fn test() {
-    1u8.test();
+            1u8.test();
-    (*"foo").test(); // not Sized
+            (*"foo").test(); // not Sized
-    (1u8, 1u8).test();
+            (1u8, 1u8).test();
-    (1u8, *"foo").test(); // not Sized
+            (1u8, *"foo").test(); // not Sized
-}
+        }
-"#, true),
+        "#,
-        @r###"
+        expect![[r#"
-    56..60 'self': &Self
+            56..60 'self': &Self
-    113..228 '{     ...ized }': ()
+            113..228 '{     ...ized }': ()
-    119..122 '1u8': u8
+            119..122 '1u8': u8
-    119..129 '1u8.test()': bool
+            119..129 '1u8.test()': bool
-    135..150 '(*"foo").test()': {unknown}
+            135..150 '(*"foo").test()': {unknown}
-    136..142 '*"foo"': str
+            136..142 '*"foo"': str
-    137..142 '"foo"': &str
+            137..142 '"foo"': &str
-    169..179 '(1u8, 1u8)': (u8, u8)
+            169..179 '(1u8, 1u8)': (u8, u8)
-    169..186 '(1u8, ...test()': bool
+            169..186 '(1u8, ...test()': bool
-    170..173 '1u8': u8
+            170..173 '1u8': u8
-    175..178 '1u8': u8
+            175..178 '1u8': u8
-    192..205 '(1u8, *"foo")': (u8, str)
+            192..205 '(1u8, *"foo")': (u8, str)
-    192..212 '(1u8, ...test()': {unknown}
+            192..212 '(1u8, ...test()': {unknown}
-    193..196 '1u8': u8
+            193..196 '1u8': u8
-    198..204 '*"foo"': str
+            198..204 '*"foo"': str
-    199..204 '"foo"': &str
+            199..204 '"foo"': &str
-    "###
+        "#]],
    );
 }
@@ -2809,223 +2867,247 @@ impl<A: Step> iter::Iterator for ops::Range<A> {
 #[test]
 fn infer_closure_arg() {
-    assert_snapshot!(
+    check_infer(
-        infer(
+        r#"
-            r#"
+        //- /lib.rs
-            //- /lib.rs
-            enum Option<T> {
-                None,
-                Some(T)
-            }
-            fn foo() {
+        enum Option<T> {
-                let s = Option::None;
+            None,
-                let f = |x: Option<i32>| {};
+            Some(T)
-                (&f)(s)
+        }
-            }
-        "#
+        fn foo() {
-        ),
+            let s = Option::None;
-        @r###"
+            let f = |x: Option<i32>| {};
-    52..126 '{     ...)(s) }': ()
+            (&f)(s)
-    62..63 's': Option<i32>
+        }
-    66..78 'Option::None': Option<i32>
+        "#,
-    88..89 'f': |Option<i32>| -> ()
+        expect![[r#"
-    92..111 '|x: Op...2>| {}': |Option<i32>| -> ()
+            52..126 '{     ...)(s) }': ()
-    93..94 'x': Option<i32>
+            62..63 's': Option<i32>
-    109..111 '{}': ()
+            66..78 'Option::None': Option<i32>
-    117..124 '(&f)(s)': ()
+            88..89 'f': |Option<i32>| -> ()
-    118..120 '&f': &|Option<i32>| -> ()
+            92..111 '|x: Op...2>| {}': |Option<i32>| -> ()
-    119..120 'f': |Option<i32>| -> ()
+            93..94 'x': Option<i32>
-    122..123 's': Option<i32>
+            109..111 '{}': ()
-    "###
+            117..124 '(&f)(s)': ()
+            118..120 '&f': &|Option<i32>| -> ()
+            119..120 'f': |Option<i32>| -> ()
+            122..123 's': Option<i32>
+        "#]],
    );
 }
 #[test]
 fn infer_fn_trait_arg() {
-    assert_snapshot!(
+    check_infer(
-        infer(
+        r#"
-            r#"
+        //- /lib.rs deps:std
-            //- /lib.rs deps:std
-            #[lang = "fn_once"]
+        #[lang = "fn_once"]
-            pub trait FnOnce<Args> {
+        pub trait FnOnce<Args> {
-                type Output;
+            type Output;
-                extern "rust-call" fn call_once(&self, args: Args) -> Self::Output;
+            extern "rust-call" fn call_once(&self, args: Args) -> Self::Output;
-            }
+        }
-            #[lang = "fn"]
+        #[lang = "fn"]
-            pub trait Fn<Args>:FnOnce<Args> {
+        pub trait Fn<Args>:FnOnce<Args> {
-                extern "rust-call" fn call(&self, args: Args) -> Self::Output;
+            extern "rust-call" fn call(&self, args: Args) -> Self::Output;
-            }
+        }
-            enum Option<T> {
+        enum Option<T> {
-                None,
+            None,
-                Some(T)
+            Some(T)
-            }
+        }
-            fn foo<F, T>(f: F) -> T
+        fn foo<F, T>(f: F) -> T
-            where
+        where
-                F: Fn(Option<i32>) -> T,
+            F: Fn(Option<i32>) -> T,
-            {
+        {
-                let s = None;
+            let s = None;
-                f(s)
+            f(s)
-            }
+        }
-        "#
+        "#,
-        ),
+        expect![[r#"
-        @r###"
+            101..105 'self': &Self
-    101..105 'self': &Self
+            107..111 'args': Args
-    107..111 'args': Args
+            220..224 'self': &Self
-    220..224 'self': &Self
+            226..230 'args': Args
-    226..230 'args': Args
+            313..314 'f': F
-    313..314 'f': F
+            359..389 '{     ...f(s) }': T
-    359..389 '{     ...f(s) }': T
+            369..370 's': Option<i32>
-    369..370 's': Option<i32>
+            373..377 'None': Option<i32>
-    373..377 'None': Option<i32>
+            383..384 'f': F
-    383..384 'f': F
+            383..387 'f(s)': T
-    383..387 'f(s)': T
+            385..386 's': Option<i32>
-    385..386 's': Option<i32>
+        "#]],
-    "###
    );
 }
 #[test]
 fn infer_box_fn_arg() {
-    assert_snapshot!(
+    check_infer(
-        infer(
+        r#"
-            r#"
+        //- /lib.rs deps:std
-            //- /lib.rs deps:std
-            #[lang = "fn_once"]
+        #[lang = "fn_once"]
-            pub trait FnOnce<Args> {
+        pub trait FnOnce<Args> {
-                type Output;
+            type Output;
-                extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+            extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
-            }
+        }
-            #[lang = "deref"]
+        #[lang = "deref"]
-            pub trait Deref {
+        pub trait Deref {
-                type Target: ?Sized;
+            type Target: ?Sized;
-                fn deref(&self) -> &Self::Target;
+            fn deref(&self) -> &Self::Target;
-            }
+        }
-            #[lang = "owned_box"]
+        #[lang = "owned_box"]
-            pub struct Box<T: ?Sized> {
+        pub struct Box<T: ?Sized> {
-                inner: *mut T,
+            inner: *mut T,
-            }
+        }
-            impl<T: ?Sized> Deref for Box<T> {
+        impl<T: ?Sized> Deref for Box<T> {
-                type Target = T;
+            type Target = T;
-                fn deref(&self) -> &T {
+            fn deref(&self) -> &T {
-                    &self.inner
+                &self.inner
-                }
            }
+        }
-            enum Option<T> {
+        enum Option<T> {
-                None,
+            None,
-                Some(T)
+            Some(T)
-            }
+        }
-            fn foo() {
+        fn foo() {
-                let s = Option::None;
+            let s = Option::None;
-                let f: Box<dyn FnOnce(&Option<i32>)> = box (|ps| {});
+            let f: Box<dyn FnOnce(&Option<i32>)> = box (|ps| {});
-                f(&s)
+            f(&s)
-            }
+        }
-        "#
+        "#,
-        ),
+        expect![[r#"
-        @r###"
+            100..104 'self': Self
-    100..104 'self': Self
+            106..110 'args': Args
-    106..110 'args': Args
+            214..218 'self': &Self
-    214..218 'self': &Self
+            384..388 'self': &Box<T>
-    384..388 'self': &Box<T>
+            396..423 '{     ...     }': &T
-    396..423 '{     ...     }': &T
+            406..417 '&self.inner': &*mut T
-    406..417 '&self.inner': &*mut T
+            407..411 'self': &Box<T>
-    407..411 'self': &Box<T>
+            407..417 'self.inner': *mut T
-    407..417 'self.inner': *mut T
+            478..575 '{     ...(&s) }': FnOnce::Output<dyn FnOnce<(&Option<i32>,)>, (&Option<i32>,)>
-    478..575 '{     ...(&s) }': FnOnce::Output<dyn FnOnce<(&Option<i32>,)>, (&Option<i32>,)>
+            488..489 's': Option<i32>
-    488..489 's': Option<i32>
+            492..504 'Option::None': Option<i32>
-    492..504 'Option::None': Option<i32>
+            514..515 'f': Box<dyn FnOnce<(&Option<i32>,)>>
-    514..515 'f': Box<dyn FnOnce<(&Option<i32>,)>>
+            549..562 'box (|ps| {})': Box<|{unknown}| -> ()>
-    549..562 'box (|ps| {})': Box<|{unknown}| -> ()>
+            554..561 '|ps| {}': |{unknown}| -> ()
-    554..561 '|ps| {}': |{unknown}| -> ()
+            555..557 'ps': {unknown}
-    555..557 'ps': {unknown}
+            559..561 '{}': ()
-    559..561 '{}': ()
+            568..569 'f': Box<dyn FnOnce<(&Option<i32>,)>>
-    568..569 'f': Box<dyn FnOnce<(&Option<i32>,)>>
+            568..573 'f(&s)': FnOnce::Output<dyn FnOnce<(&Option<i32>,)>, (&Option<i32>,)>
-    568..573 'f(&s)': FnOnce::Output<dyn FnOnce<(&Option<i32>,)>, (&Option<i32>,)>
+            570..572 '&s': &Option<i32>
-    570..572 '&s': &Option<i32>
+            571..572 's': Option<i32>
-    571..572 's': Option<i32>
+        "#]],
-    "###
    );
 }
 #[test]
 fn infer_dyn_fn_output() {
-    assert_snapshot!(
+    check_types(
-        infer(
+        r#"
-            r#"
+#[lang = "fn_once"]
-            //- /lib.rs deps:std
+pub trait FnOnce<Args> {
+    type Output;
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
-            #[lang = "fn_once"]
+#[lang = "fn"]
-            pub trait FnOnce<Args> {
+pub trait Fn<Args>: FnOnce<Args> {
-                type Output;
+    extern "rust-call" fn call(&self, args: Args) -> Self::Output;
+}
-                extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+fn foo() {
-            }
+    let f: &dyn Fn() -> i32;
+    f();
+  //^^^ i32
+}"#,
+    );
+}
-            #[lang = "fn"]
+#[test]
-            pub trait Fn<Args>:FnOnce<Args> {
+fn infer_dyn_fn_once_output() {
-                extern "rust-call" fn call(&self, args: Args) -> Self::Output;
+    check_types(
-            }
+        r#"
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    type Output;
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
-            #[lang = "deref"]
+fn foo() {
-            pub trait Deref {
+    let f: dyn FnOnce() -> i32;
-                type Target: ?Sized;
+    f();
+  //^^^ i32
+}"#,
+    );
+}
-                fn deref(&self) -> &Self::Target;
+#[test]
-            }
+fn variable_kinds_1() {
+    check_types(
+        r#"
+trait Trait<T> { fn get(self, t: T) -> T; }
+struct S;
+impl Trait<u128> for S {}
+impl Trait<f32> for S {}
+fn test() {
+    S.get(1);
+  //^^^^^^^^ u128
+    S.get(1.);
+  //^^^^^^^^ f32
+}
+        "#,
+    );
+}
-            #[lang = "owned_box"]
+#[test]
-            pub struct Box<T: ?Sized> {
+fn variable_kinds_2() {
-                inner: *mut T,
+    check_types(
-            }
+        r#"
+trait Trait { fn get(self) -> Self; }
+impl Trait for u128 {}
+impl Trait for f32 {}
+fn test() {
+    1.get();
+  //^^^^^^^ u128
+    (1.).get();
+  //^^^^^^^^^^ f32
+}
+        "#,
+    );
+}
-            impl<T: ?Sized> Deref for Box<T> {
+#[test]
-                type Target = T;
+fn underscore_import() {
+    check_types(
+        r#"
+mod tr {
+    pub trait Tr {
+        fn method(&self) -> u8 { 0 }
+    }
+}
-                fn deref(&self) -> &T {
+struct Tr;
-                    &self.inner
+impl crate::tr::Tr for Tr {}
-                }
-            }
-            fn foo() {
+use crate::tr::Tr as _;
-                let f: Box<dyn Fn() -> i32> = box(|| 5);
+fn test() {
-                let x = f();
+    Tr.method();
-            }
+  //^^^^^^^^^^^ u8
-        "#
+}
-        ),
+    "#,
-        @r###"
-    100..104 'self': Self
-    106..110 'args': Args
-    219..223 'self': &Self
-    225..229 'args': Args
-    333..337 'self': &Self
-    503..507 'self': &Box<T>
-    515..542 '{     ...     }': &T
-    525..536 '&self.inner': &*mut T
-    526..530 'self': &Box<T>
-    526..536 'self.inner': *mut T
-    555..620 '{     ...f(); }': ()
-    565..566 'f': Box<dyn Fn<(), Output = i32>>
-    591..600 'box(|| 5)': Box<|| -> i32>
-    595..599 '|| 5': || -> i32
-    598..599 '5': i32
-    610..611 'x': FnOnce::Output<dyn Fn<(), Output = i32>, ()>
-    614..615 'f': Box<dyn Fn<(), Output = i32>>
-    614..617 'f()': FnOnce::Output<dyn Fn<(), Output = i32>, ()>
-    "###
    );
 }
diff --git a/crates/ra_hir_ty/src/traits.rs b/crates/ra_hir_ty/src/traits.rs
index 6f43c3a22..3f6d2cf35 100644
--- a/crates/ra_hir_ty/src/traits.rs
+++ b/crates/ra_hir_ty/src/traits.rs
@@ -1,21 +1,19 @@
 //! Trait solving using Chalk.
-use std::{panic, sync::Arc};
+use std::sync::Arc;
 use chalk_ir::cast::Cast;
-use hir_def::{
+use chalk_solve::Solver;
-    expr::ExprId, lang_item::LangItemTarget, DefWithBodyId, ImplId, TraitId, TypeAliasId,
+use hir_def::{lang_item::LangItemTarget, TraitId};
-};
+use ra_db::CrateId;
-use ra_db::{impl_intern_key, salsa, CrateId};
 use ra_prof::profile;
-use crate::{db::HirDatabase, DebruijnIndex};
+use crate::{db::HirDatabase, DebruijnIndex, Substs};
 use super::{Canonical, GenericPredicate, HirDisplay, ProjectionTy, TraitRef, Ty, TypeWalk};
 use self::chalk::{from_chalk, Interner, ToChalk};
 pub(crate) mod chalk;
-mod builtin;
 // This controls the maximum size of types Chalk considers. If we set this too
 // high, we can run into slow edge cases; if we set it too low, Chalk won't
@@ -32,9 +30,10 @@ struct ChalkContext<'a> {
    krate: CrateId,
 }
-fn create_chalk_solver() -> chalk_solve::Solver<Interner> {
+fn create_chalk_solver() -> chalk_recursive::RecursiveSolver<Interner> {
-    let solver_choice = chalk_solve::SolverChoice::recursive();
+    let overflow_depth = 100;
-    solver_choice.into_solver()
+    let caching_enabled = true;
+    chalk_recursive::RecursiveSolver::new(overflow_depth, caching_enabled)
 }
 /// A set of clauses that we assume to be true. E.g. if we are inside this function:
@@ -190,15 +189,7 @@ fn solution_from_chalk(
    solution: chalk_solve::Solution<Interner>,
 ) -> Solution {
    let convert_subst = |subst: chalk_ir::Canonical<chalk_ir::Substitution<Interner>>| {
-        let value = subst
+        let result = from_chalk(db, subst);
-            .value
-            .iter(&Interner)
-            .map(|p| match p.ty(&Interner) {
-                Some(ty) => from_chalk(db, ty.clone()),
-                None => unimplemented!(),
-            })
-            .collect();
-        let result = Canonical { value, num_vars: subst.binders.len(&Interner) };
        SolutionVariables(result)
    };
    match solution {
@@ -222,7 +213,7 @@ fn solution_from_chalk(
 }
 #[derive(Clone, Debug, PartialEq, Eq)]
-pub struct SolutionVariables(pub Canonical<Vec<Ty>>);
+pub struct SolutionVariables(pub Canonical<Substs>);
 #[derive(Clone, Debug, PartialEq, Eq)]
 /// A (possible) solution for a proposed goal.
@@ -280,52 +271,3 @@ impl FnTrait {
        }
    }
 }
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct ClosureFnTraitImplData {
-    def: DefWithBodyId,
-    expr: ExprId,
-    fn_trait: FnTrait,
-}
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct UnsizeToSuperTraitObjectData {
-    trait_: TraitId,
-    super_trait: TraitId,
-}
-/// An impl. Usually this comes from an impl block, but some built-in types get
-/// synthetic impls.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum Impl {
-    /// A normal impl from an impl block.
-    ImplDef(ImplId),
-    /// Closure types implement the Fn traits synthetically.
-    ClosureFnTraitImpl(ClosureFnTraitImplData),
-    /// [T; n]: Unsize<[T]>
-    UnsizeArray,
-    /// T: Unsize<dyn Trait> where T: Trait
-    UnsizeToTraitObject(TraitId),
-    /// dyn Trait: Unsize<dyn SuperTrait> if Trait: SuperTrait
-    UnsizeToSuperTraitObject(UnsizeToSuperTraitObjectData),
-}
-/// This exists just for Chalk, because our ImplIds are only unique per module.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct GlobalImplId(salsa::InternId);
-impl_intern_key!(GlobalImplId);
-/// An associated type value. Usually this comes from a `type` declaration
-/// inside an impl block, but for built-in impls we have to synthesize it.
-/// (We only need this because Chalk wants a unique ID for each of these.)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum AssocTyValue {
-    /// A normal assoc type value from an impl block.
-    TypeAlias(TypeAliasId),
-    /// The output type of the Fn trait implementation.
-    ClosureFnTraitImplOutput(ClosureFnTraitImplData),
-}
-/// This exists just for Chalk, because it needs a unique ID for each associated
-/// type value in an impl (even synthetic ones).
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct AssocTyValueId(salsa::InternId);
-impl_intern_key!(AssocTyValueId);
diff --git a/crates/ra_hir_ty/src/traits/builtin.rs b/crates/ra_hir_ty/src/traits/builtin.rs
deleted file mode 100644
index 6d5f2d46a..000000000
--- a/crates/ra_hir_ty/src/traits/builtin.rs
+++ /dev/null
@@ -1,371 +0,0 @@
-//! This module provides the built-in trait implementations, e.g. to make
-//! closures implement `Fn`.
-use hir_def::{expr::Expr, lang_item::LangItemTarget, TraitId, TypeAliasId};
-use hir_expand::name::name;
-use ra_db::CrateId;
-use super::{AssocTyValue, Impl, UnsizeToSuperTraitObjectData};
-use crate::{
-    db::HirDatabase,
-    utils::{all_super_traits, generics},
-    ApplicationTy, Binders, BoundVar, DebruijnIndex, GenericPredicate, Substs, TraitRef, Ty,
-    TypeCtor, TypeWalk,
-};
-pub(super) struct BuiltinImplData {
-    pub num_vars: usize,
-    pub trait_ref: TraitRef,
-    pub where_clauses: Vec<super::GenericPredicate>,
-    pub assoc_ty_values: Vec<AssocTyValue>,
-}
-pub(super) struct BuiltinImplAssocTyValueData {
-    pub impl_: Impl,
-    pub assoc_ty_id: TypeAliasId,
-    pub num_vars: usize,
-    pub value: Ty,
-}
-pub(super) fn get_builtin_impls(
-    db: &dyn HirDatabase,
-    krate: CrateId,
-    ty: &Ty,
-    // The first argument for the trait, if present
-    arg: &Option<Ty>,
-    trait_: TraitId,
-    mut callback: impl FnMut(Impl),
-) {
-    // Note: since impl_datum needs to be infallible, we need to make sure here
-    // that we have all prerequisites to build the respective impls.
-    if let Ty::Apply(ApplicationTy { ctor: TypeCtor::Closure { def, expr }, .. }) = ty {
-        for &fn_trait in [super::FnTrait::FnOnce, super::FnTrait::FnMut, super::FnTrait::Fn].iter()
-        {
-            if let Some(actual_trait) = fn_trait.get_id(db, krate) {
-                if trait_ == actual_trait {
-                    let impl_ = super::ClosureFnTraitImplData { def: *def, expr: *expr, fn_trait };
-                    if check_closure_fn_trait_impl_prerequisites(db, krate, impl_) {
-                        callback(Impl::ClosureFnTraitImpl(impl_));
-                    }
-                }
-            }
-        }
-    }
-    let unsize_trait = get_unsize_trait(db, krate);
-    if let Some(actual_trait) = unsize_trait {
-        if trait_ == actual_trait {
-            get_builtin_unsize_impls(db, krate, ty, arg, callback);
-        }
-    }
-}
-fn get_builtin_unsize_impls(
-    db: &dyn HirDatabase,
-    krate: CrateId,
-    ty: &Ty,
-    // The first argument for the trait, if present
-    arg: &Option<Ty>,
-    mut callback: impl FnMut(Impl),
-) {
-    if !check_unsize_impl_prerequisites(db, krate) {
-        return;
-    }
-    if let Ty::Apply(ApplicationTy { ctor: TypeCtor::Array, .. }) = ty {
-        callback(Impl::UnsizeArray);
-        return; // array is unsized, the rest of the impls shouldn't apply
-    }
-    if let Some(target_trait) = arg.as_ref().and_then(|t| t.dyn_trait_ref()) {
-        // FIXME what about more complicated dyn tys with marker traits?
-        if let Some(trait_ref) = ty.dyn_trait_ref() {
-            if trait_ref.trait_ != target_trait.trait_ {
-                let super_traits = all_super_traits(db.upcast(), trait_ref.trait_);
-                if super_traits.contains(&target_trait.trait_) {
-                    callback(Impl::UnsizeToSuperTraitObject(UnsizeToSuperTraitObjectData {
-                        trait_: trait_ref.trait_,
-                        super_trait: target_trait.trait_,
-                    }));
-                }
-            }
-        } else {
-            // FIXME only for sized types
-            callback(Impl::UnsizeToTraitObject(target_trait.trait_));
-        }
-    }
-}
-pub(super) fn impl_datum(db: &dyn HirDatabase, krate: CrateId, impl_: Impl) -> BuiltinImplData {
-    match impl_ {
-        Impl::ImplDef(_) => unreachable!(),
-        Impl::ClosureFnTraitImpl(data) => closure_fn_trait_impl_datum(db, krate, data),
-        Impl::UnsizeArray => array_unsize_impl_datum(db, krate),
-        Impl::UnsizeToTraitObject(trait_) => trait_object_unsize_impl_datum(db, krate, trait_),
-        Impl::UnsizeToSuperTraitObject(data) => {
-            super_trait_object_unsize_impl_datum(db, krate, data)
-        }
-    }
-}
-pub(super) fn associated_ty_value(
-    db: &dyn HirDatabase,
-    krate: CrateId,
-    data: AssocTyValue,
-) -> BuiltinImplAssocTyValueData {
-    match data {
-        AssocTyValue::TypeAlias(_) => unreachable!(),
-        AssocTyValue::ClosureFnTraitImplOutput(data) => {
-            closure_fn_trait_output_assoc_ty_value(db, krate, data)
-        }
-    }
-}
-// Closure Fn trait impls
-fn check_closure_fn_trait_impl_prerequisites(
-    db: &dyn HirDatabase,
-    krate: CrateId,
-    data: super::ClosureFnTraitImplData,
-) -> bool {
-    // the respective Fn/FnOnce/FnMut trait needs to exist
-    if data.fn_trait.get_id(db, krate).is_none() {
-        return false;
-    }
-    // FIXME: there are more assumptions that we should probably check here:
-    // the traits having no type params, FnOnce being a supertrait
-    // the FnOnce trait needs to exist and have an assoc type named Output
-    let fn_once_trait = match (super::FnTrait::FnOnce).get_id(db, krate) {
-        Some(t) => t,
-        None => return false,
-    };
-    db.trait_data(fn_once_trait).associated_type_by_name(&name![Output]).is_some()
-}
-fn closure_fn_trait_impl_datum(
-    db: &dyn HirDatabase,
-    krate: CrateId,
-    data: super::ClosureFnTraitImplData,
-) -> BuiltinImplData {
-    // for some closure |X, Y| -> Z:
-    // impl<T, U, V> Fn<(T, U)> for closure<fn(T, U) -> V> { Output = V }
-    let trait_ = data
-        .fn_trait
-        .get_id(db, krate) // get corresponding fn trait
-        // the existence of the Fn trait has been checked before
-        .expect("fn trait for closure impl missing");
-    let num_args: u16 = match &db.body(data.def)[data.expr] {
-        Expr::Lambda { args, .. } => args.len() as u16,
-        _ => {
-            log::warn!("closure for closure type {:?} not found", data);
-            0
-        }
-    };
-    let arg_ty = Ty::apply(
-        TypeCtor::Tuple { cardinality: num_args },
-        Substs::builder(num_args as usize)
-            .fill_with_bound_vars(DebruijnIndex::INNERMOST, 0)
-            .build(),
-    );
-    let sig_ty = Ty::apply(
-        TypeCtor::FnPtr { num_args },
-        Substs::builder(num_args as usize + 1)
-            .fill_with_bound_vars(DebruijnIndex::INNERMOST, 0)
-            .build(),
-    );
-    let self_ty = Ty::apply_one(TypeCtor::Closure { def: data.def, expr: data.expr }, sig_ty);
-    let trait_ref = TraitRef {
-        trait_,
-        substs: Substs::build_for_def(db, trait_).push(self_ty).push(arg_ty).build(),
-    };
-    let output_ty_id = AssocTyValue::ClosureFnTraitImplOutput(data);
-    BuiltinImplData {
-        num_vars: num_args as usize + 1,
-        trait_ref,
-        where_clauses: Vec::new(),
-        assoc_ty_values: vec![output_ty_id],
-    }
-}
-fn closure_fn_trait_output_assoc_ty_value(
-    db: &dyn HirDatabase,
-    krate: CrateId,
-    data: super::ClosureFnTraitImplData,
-) -> BuiltinImplAssocTyValueData {
-    let impl_ = Impl::ClosureFnTraitImpl(data);
-    let num_args: u16 = match &db.body(data.def)[data.expr] {
-        Expr::Lambda { args, .. } => args.len() as u16,
-        _ => {
-            log::warn!("closure for closure type {:?} not found", data);
-            0
-        }
-    };
-    let output_ty = Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, num_args.into()));
-    let fn_once_trait =
-        (super::FnTrait::FnOnce).get_id(db, krate).expect("assoc ty value should not exist");
-    let output_ty_id = db
-        .trait_data(fn_once_trait)
-        .associated_type_by_name(&name![Output])
-        .expect("assoc ty value should not exist");
-    BuiltinImplAssocTyValueData {
-        impl_,
-        assoc_ty_id: output_ty_id,
-        num_vars: num_args as usize + 1,
-        value: output_ty,
-    }
-}
-// Array unsizing
-fn check_unsize_impl_prerequisites(db: &dyn HirDatabase, krate: CrateId) -> bool {
-    // the Unsize trait needs to exist and have two type parameters (Self and T)
-    let unsize_trait = match get_unsize_trait(db, krate) {
-        Some(t) => t,
-        None => return false,
-    };
-    let generic_params = generics(db.upcast(), unsize_trait.into());
-    generic_params.len() == 2
-}
-fn array_unsize_impl_datum(db: &dyn HirDatabase, krate: CrateId) -> BuiltinImplData {
-    // impl<T> Unsize<[T]> for [T; _]
-    // (this can be a single impl because we don't distinguish array sizes currently)
-    let trait_ = get_unsize_trait(db, krate) // get unsize trait
-        // the existence of the Unsize trait has been checked before
-        .expect("Unsize trait missing");
-    let var = Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, 0));
-    let substs = Substs::builder(2)
-        .push(Ty::apply_one(TypeCtor::Array, var.clone()))
-        .push(Ty::apply_one(TypeCtor::Slice, var))
-        .build();
-    let trait_ref = TraitRef { trait_, substs };
-    BuiltinImplData {
-        num_vars: 1,
-        trait_ref,
-        where_clauses: Vec::new(),
-        assoc_ty_values: Vec::new(),
-    }
-}
-// Trait object unsizing
-fn trait_object_unsize_impl_datum(
-    db: &dyn HirDatabase,
-    krate: CrateId,
-    trait_: TraitId,
-) -> BuiltinImplData {
-    // impl<T, T1, ...> Unsize<dyn Trait<T1, ...>> for T where T: Trait<T1, ...>
-    let unsize_trait = get_unsize_trait(db, krate) // get unsize trait
-        // the existence of the Unsize trait has been checked before
-        .expect("Unsize trait missing");
-    let self_ty = Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, 0));
-    let target_substs = Substs::build_for_def(db, trait_)
-        .push(Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, 0)))
-        .fill_with_bound_vars(DebruijnIndex::ONE, 1)
-        .build();
-    let num_vars = target_substs.len();
-    let target_trait_ref = TraitRef { trait_, substs: target_substs };
-    let target_bounds = vec![GenericPredicate::Implemented(target_trait_ref)];
-    let self_substs =
-        Substs::build_for_def(db, trait_).fill_with_bound_vars(DebruijnIndex::INNERMOST, 0).build();
-    let self_trait_ref = TraitRef { trait_, substs: self_substs };
-    let where_clauses = vec![GenericPredicate::Implemented(self_trait_ref)];
-    let impl_substs = Substs::builder(2).push(self_ty).push(Ty::Dyn(target_bounds.into())).build();
-    let trait_ref = TraitRef { trait_: unsize_trait, substs: impl_substs };
-    BuiltinImplData { num_vars, trait_ref, where_clauses, assoc_ty_values: Vec::new() }
-}
-fn super_trait_object_unsize_impl_datum(
-    db: &dyn HirDatabase,
-    krate: CrateId,
-    data: UnsizeToSuperTraitObjectData,
-) -> BuiltinImplData {
-    // impl<T1, ...> Unsize<dyn SuperTrait> for dyn Trait<T1, ...>
-    let unsize_trait = get_unsize_trait(db, krate) // get unsize trait
-        // the existence of the Unsize trait has been checked before
-        .expect("Unsize trait missing");
-    let self_substs = Substs::build_for_def(db, data.trait_)
-        .fill_with_bound_vars(DebruijnIndex::INNERMOST, 0)
-        .build();
-    let self_trait_ref = TraitRef { trait_: data.trait_, substs: self_substs.clone() };
-    let num_vars = self_substs.len() - 1;
-    // we need to go from our trait to the super trait, substituting type parameters
-    let path = crate::utils::find_super_trait_path(db.upcast(), data.trait_, data.super_trait);
-    let mut current_trait_ref = self_trait_ref.clone();
-    for t in path.into_iter().skip(1) {
-        let bounds = db.generic_predicates(current_trait_ref.trait_.into());
-        let super_trait_ref = bounds
-            .iter()
-            .find_map(|b| match &b.value {
-                GenericPredicate::Implemented(tr)
-                    if tr.trait_ == t
-                        && tr.substs[0]
-                            == Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, 0)) =>
-                {
-                    Some(Binders { value: tr, num_binders: b.num_binders })
-                }
-                _ => None,
-            })
-            .expect("trait bound for known super trait not found");
-        current_trait_ref = super_trait_ref.cloned().subst(&current_trait_ref.substs);
-    }
-    // We need to renumber the variables a bit now: from ^0.0, ^0.1, ^0.2, ...
-    // to ^0.0, ^1.0, ^1.1. The reason for this is that the first variable comes
-    // from the dyn Trait binder, while the other variables come from the impl.
-    let new_substs = Substs::builder(num_vars + 1)
-        .push(Ty::Bound(BoundVar::new(DebruijnIndex::INNERMOST, 0)))
-        .fill_with_bound_vars(DebruijnIndex::ONE, 0)
-        .build();
-    let self_bounds =
-        vec![GenericPredicate::Implemented(self_trait_ref.subst_bound_vars(&new_substs))];
-    let super_bounds =
-        vec![GenericPredicate::Implemented(current_trait_ref.subst_bound_vars(&new_substs))];
-    let substs = Substs::builder(2)
-        .push(Ty::Dyn(self_bounds.into()))
-        .push(Ty::Dyn(super_bounds.into()))
-        .build();
-    let trait_ref = TraitRef { trait_: unsize_trait, substs };
-    BuiltinImplData { num_vars, trait_ref, where_clauses: Vec::new(), assoc_ty_values: Vec::new() }
-}
-fn get_unsize_trait(db: &dyn HirDatabase, krate: CrateId) -> Option<TraitId> {
-    let target = db.lang_item(krate, "unsize".into())?;
-    match target {
-        LangItemTarget::TraitId(t) => Some(t),
-        _ => None,
-    }
-}
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs
index 8ef4941c0..1c7065364 100644
--- a/crates/ra_hir_ty/src/traits/chalk.rs
+++ b/crates/ra_hir_ty/src/traits/chalk.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use log::debug;
-use chalk_ir::{fold::shift::Shift, GenericArg, TypeName};
+use chalk_ir::{fold::shift::Shift, CanonicalVarKinds, GenericArg, TypeName};
 use chalk_solve::rust_ir::{self, OpaqueTyDatumBound, WellKnownTrait};
 use hir_def::{
@@ -12,12 +12,17 @@ use hir_def::{
 };
 use ra_db::{salsa::InternKey, CrateId};
-use super::{builtin, AssocTyValue, ChalkContext, Impl};
+use super::ChalkContext;
 use crate::{
-    db::HirDatabase, display::HirDisplay, method_resolution::TyFingerprint, utils::generics,
+    db::HirDatabase,
-    CallableDef, DebruijnIndex, GenericPredicate, Substs, Ty, TypeCtor,
+    display::HirDisplay,
+    method_resolution::{TyFingerprint, ALL_FLOAT_FPS, ALL_INT_FPS},
+    utils::generics,
+    CallableDefId, DebruijnIndex, FnSig, GenericPredicate, Substs, Ty, TypeCtor,
+};
+use mapping::{
+    convert_where_clauses, generic_predicate_to_inline_bound, make_binders, TypeAliasAsValue,
 };
-use mapping::{convert_where_clauses, generic_predicate_to_inline_bound, make_binders};
 pub use self::interner::*;
@@ -49,7 +54,7 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
        self.db.struct_datum(self.krate, struct_id)
    }
    fn adt_repr(&self, _struct_id: AdtId) -> rust_ir::AdtRepr {
-        unreachable!()
+        rust_ir::AdtRepr { repr_c: false, repr_packed: false }
    }
    fn impl_datum(&self, impl_id: ImplId) -> Arc<ImplDatum> {
        self.db.impl_datum(self.krate, impl_id)
@@ -66,45 +71,58 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
        &self,
        trait_id: TraitId,
        parameters: &[GenericArg<Interner>],
+        binders: &CanonicalVarKinds<Interner>,
    ) -> Vec<ImplId> {
        debug!("impls_for_trait {:?}", trait_id);
        let trait_: hir_def::TraitId = from_chalk(self.db, trait_id);
        let ty: Ty = from_chalk(self.db, parameters[0].assert_ty_ref(&Interner).clone());
+        fn binder_kind(ty: &Ty, binders: &CanonicalVarKinds<Interner>) -> Option<chalk_ir::TyKind> {
+            if let Ty::Bound(bv) = ty {
+                let binders = binders.as_slice(&Interner);
+                if bv.debruijn == DebruijnIndex::INNERMOST {
+                    if let chalk_ir::VariableKind::Ty(tk) = binders[bv.index].kind {
+                        return Some(tk);
+                    }
+                }
+            }
+            None
+        }
        let self_ty_fp = TyFingerprint::for_impl(&ty);
+        let fps: &[TyFingerprint] = match binder_kind(&ty, binders) {
+            Some(chalk_ir::TyKind::Integer) => &ALL_INT_FPS,
+            Some(chalk_ir::TyKind::Float) => &ALL_FLOAT_FPS,
+            _ => self_ty_fp.as_ref().map(std::slice::from_ref).unwrap_or(&[]),
+        };
        // Note: Since we're using impls_for_trait, only impls where the trait
        // can be resolved should ever reach Chalk. `impl_datum` relies on that
        // and will panic if the trait can't be resolved.
-        let in_deps = self.db.impls_from_deps(self.krate);
+        let in_deps = self.db.trait_impls_in_deps(self.krate);
-        let in_self = self.db.impls_in_crate(self.krate);
+        let in_self = self.db.trait_impls_in_crate(self.krate);
        let impl_maps = [in_deps, in_self];
-        let id_to_chalk = |id: hir_def::ImplId| Impl::ImplDef(id).to_chalk(self.db);
+        let id_to_chalk = |id: hir_def::ImplId| id.to_chalk(self.db);
-        let mut result: Vec<_> = match self_ty_fp {
+        let result: Vec<_> = if fps.is_empty() {
-            Some(fp) => impl_maps
+            debug!("Unrestricted search for {:?} impls...", trait_);
+            impl_maps
                .iter()
-                .flat_map(|crate_impl_defs| {
+                .flat_map(|crate_impl_defs| crate_impl_defs.for_trait(trait_).map(id_to_chalk))
-                    crate_impl_defs.lookup_impl_defs_for_trait_and_ty(trait_, fp).map(id_to_chalk)
+                .collect()
-                })
+        } else {
-                .collect(),
+            impl_maps
-            None => impl_maps
                .iter()
                .flat_map(|crate_impl_defs| {
-                    crate_impl_defs.lookup_impl_defs_for_trait(trait_).map(id_to_chalk)
+                    fps.iter().flat_map(move |fp| {
+                        crate_impl_defs.for_trait_and_self_ty(trait_, *fp).map(id_to_chalk)
+                    })
                })
-                .collect(),
+                .collect()
        };
-        let arg: Option<Ty> =
-            parameters.get(1).map(|p| from_chalk(self.db, p.assert_ty_ref(&Interner).clone()));
-        builtin::get_builtin_impls(self.db, self.krate, &ty, &arg, trait_, |i| {
-            result.push(i.to_chalk(self.db))
-        });
        debug!("impls_for_trait returned {} impls", result.len());
        result
    }
@@ -165,6 +183,7 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
                    .collect(),
                1,
            ),
+            where_clauses: make_binders(vec![], 0),
        };
        let num_vars = datas.num_binders;
        Arc::new(OpaqueTyDatum { opaque_ty_id: id, bound: make_binders(bound, num_vars) })
@@ -175,15 +194,6 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
        Ty::Unknown.to_chalk(self.db)
    }
-    fn force_impl_for(
-        &self,
-        _well_known: rust_ir::WellKnownTrait,
-        _ty: &chalk_ir::TyData<Interner>,
-    ) -> Option<bool> {
-        // this method is mostly for rustc
-        None
-    }
    fn is_object_safe(&self, _trait_id: chalk_ir::TraitId<Interner>) -> bool {
        // FIXME: implement actual object safety
        true
@@ -194,31 +204,55 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
        _closure_id: chalk_ir::ClosureId<Interner>,
        _substs: &chalk_ir::Substitution<Interner>,
    ) -> rust_ir::ClosureKind {
-        // FIXME: implement closure support
+        // Fn is the closure kind that implements all three traits
-        unimplemented!()
+        rust_ir::ClosureKind::Fn
    }
    fn closure_inputs_and_output(
        &self,
        _closure_id: chalk_ir::ClosureId<Interner>,
-        _substs: &chalk_ir::Substitution<Interner>,
+        substs: &chalk_ir::Substitution<Interner>,
    ) -> chalk_ir::Binders<rust_ir::FnDefInputsAndOutputDatum<Interner>> {
-        // FIXME: implement closure support
+        let sig_ty: Ty =
-        unimplemented!()
+            from_chalk(self.db, substs.at(&Interner, 0).assert_ty_ref(&Interner).clone());
+        let sig = FnSig::from_fn_ptr_substs(
+            &sig_ty.substs().expect("first closure param should be fn ptr"),
+            false,
+        );
+        let io = rust_ir::FnDefInputsAndOutputDatum {
+            argument_types: sig.params().iter().map(|ty| ty.clone().to_chalk(self.db)).collect(),
+            return_type: sig.ret().clone().to_chalk(self.db),
+        };
+        make_binders(io.shifted_in(&Interner), 0)
    }
    fn closure_upvars(
        &self,
        _closure_id: chalk_ir::ClosureId<Interner>,
        _substs: &chalk_ir::Substitution<Interner>,
    ) -> chalk_ir::Binders<chalk_ir::Ty<Interner>> {
-        // FIXME: implement closure support
+        let ty = Ty::unit().to_chalk(self.db);
-        unimplemented!()
+        make_binders(ty, 0)
    }
    fn closure_fn_substitution(
        &self,
        _closure_id: chalk_ir::ClosureId<Interner>,
        _substs: &chalk_ir::Substitution<Interner>,
    ) -> chalk_ir::Substitution<Interner> {
-        // FIXME: implement closure support
+        Substs::empty().to_chalk(self.db)
+    }
+    fn trait_name(&self, _trait_id: chalk_ir::TraitId<Interner>) -> String {
+        unimplemented!()
+    }
+    fn adt_name(&self, _struct_id: chalk_ir::AdtId<Interner>) -> String {
+        unimplemented!()
+    }
+    fn assoc_type_name(&self, _assoc_ty_id: chalk_ir::AssocTypeId<Interner>) -> String {
+        unimplemented!()
+    }
+    fn opaque_type_name(&self, _opaque_ty_id: chalk_ir::OpaqueTyId<Interner>) -> String {
+        unimplemented!()
+    }
+    fn fn_def_name(&self, _fn_def_id: chalk_ir::FnDefId<Interner>) -> String {
        unimplemented!()
    }
 }
@@ -356,12 +390,18 @@ pub(crate) fn struct_datum_query(
        fundamental: false,
        phantom_data: false,
    };
-    let struct_datum_bound = rust_ir::AdtDatumBound {
+    // FIXME provide enum variants properly (for auto traits)
-        fields: Vec::new(), // FIXME add fields (only relevant for auto traits)
+    let variant = rust_ir::AdtVariantDatum {
-        where_clauses,
+        fields: Vec::new(), // FIXME add fields (only relevant for auto traits),
+    };
+    let struct_datum_bound = rust_ir::AdtDatumBound { variants: vec![variant], where_clauses };
+    let struct_datum = StructDatum {
+        // FIXME set ADT kind
+        kind: rust_ir::AdtKind::Struct,
+        id: struct_id,
+        binders: make_binders(struct_datum_bound, num_params),
+        flags,
    };
-    let struct_datum =
-        StructDatum { id: struct_id, binders: make_binders(struct_datum_bound, num_params), flags };
    Arc::new(struct_datum)
 }
@@ -372,11 +412,8 @@ pub(crate) fn impl_datum_query(
 ) -> Arc<ImplDatum> {
    let _p = ra_prof::profile("impl_datum");
    debug!("impl_datum {:?}", impl_id);
-    let impl_: Impl = from_chalk(db, impl_id);
+    let impl_: hir_def::ImplId = from_chalk(db, impl_id);
-    match impl_ {
+    impl_def_datum(db, krate, impl_id, impl_)
-        Impl::ImplDef(impl_def) => impl_def_datum(db, krate, impl_id, impl_def),
-        _ => Arc::new(builtin::impl_datum(db, krate, impl_).to_chalk(db)),
-    }
 }
 fn impl_def_datum(
@@ -427,7 +464,7 @@ fn impl_def_datum(
            let name = &db.type_alias_data(type_alias).name;
            trait_data.associated_type_by_name(name).is_some()
        })
-        .map(|type_alias| AssocTyValue::TypeAlias(type_alias).to_chalk(db))
+        .map(|type_alias| TypeAliasAsValue(type_alias).to_chalk(db))
        .collect();
    debug!("impl_datum: {:?}", impl_datum_bound);
    let impl_datum = ImplDatum {
@@ -444,13 +481,8 @@ pub(crate) fn associated_ty_value_query(
    krate: CrateId,
    id: AssociatedTyValueId,
 ) -> Arc<AssociatedTyValue> {
-    let data: AssocTyValue = from_chalk(db, id);
+    let type_alias: TypeAliasAsValue = from_chalk(db, id);
-    match data {
+    type_alias_associated_ty_value(db, krate, type_alias.0)
-        AssocTyValue::TypeAlias(type_alias) => {
-            type_alias_associated_ty_value(db, krate, type_alias)
-        }
-        _ => Arc::new(builtin::associated_ty_value(db, krate, data).to_chalk(db)),
-    }
 }
 fn type_alias_associated_ty_value(
@@ -473,7 +505,7 @@ fn type_alias_associated_ty_value(
    let ty = db.ty(type_alias.into());
    let value_bound = rust_ir::AssociatedTyValueBound { ty: ty.value.to_chalk(db) };
    let value = rust_ir::AssociatedTyValue {
-        impl_id: Impl::ImplDef(impl_id).to_chalk(db),
+        impl_id: impl_id.to_chalk(db),
        associated_ty_id: assoc_ty.to_chalk(db),
        value: make_binders(value_bound, ty.num_binders),
    };
@@ -485,7 +517,7 @@ pub(crate) fn fn_def_datum_query(
    _krate: CrateId,
    fn_def_id: FnDefId,
 ) -> Arc<FnDefDatum> {
-    let callable_def: CallableDef = from_chalk(db, fn_def_id);
+    let callable_def: CallableDefId = from_chalk(db, fn_def_id);
    let generic_params = generics(db.upcast(), callable_def.into());
    let sig = db.callable_item_signature(callable_def);
    let bound_vars = Substs::bound_vars(&generic_params, DebruijnIndex::INNERMOST);
@@ -507,47 +539,28 @@ pub(crate) fn fn_def_datum_query(
        ),
        where_clauses,
    };
-    let datum =
+    let datum = FnDefDatum {
-        FnDefDatum { id: fn_def_id, binders: make_binders(bound, sig.num_binders), abi: () };
+        id: fn_def_id,
+        abi: (),
+        safety: chalk_ir::Safety::Safe,
+        variadic: sig.value.is_varargs,
+        binders: make_binders(bound, sig.num_binders),
+    };
    Arc::new(datum)
 }
-impl From<AdtId> for crate::TypeCtorId {
+impl From<FnDefId> for crate::db::InternedCallableDefId {
-    fn from(struct_id: AdtId) -> Self {
-        struct_id.0
-    }
-}
-impl From<crate::TypeCtorId> for AdtId {
-    fn from(type_ctor_id: crate::TypeCtorId) -> Self {
-        chalk_ir::AdtId(type_ctor_id)
-    }
-}
-impl From<FnDefId> for crate::CallableDefId {
    fn from(fn_def_id: FnDefId) -> Self {
        InternKey::from_intern_id(fn_def_id.0)
    }
 }
-impl From<crate::CallableDefId> for FnDefId {
+impl From<crate::db::InternedCallableDefId> for FnDefId {
-    fn from(callable_def_id: crate::CallableDefId) -> Self {
+    fn from(callable_def_id: crate::db::InternedCallableDefId) -> Self {
        chalk_ir::FnDefId(callable_def_id.as_intern_id())
    }
 }
-impl From<ImplId> for crate::traits::GlobalImplId {
-    fn from(impl_id: ImplId) -> Self {
-        InternKey::from_intern_id(impl_id.0)
-    }
-}
-impl From<crate::traits::GlobalImplId> for ImplId {
-    fn from(impl_id: crate::traits::GlobalImplId) -> Self {
-        chalk_ir::ImplId(impl_id.as_intern_id())
-    }
-}
 impl From<OpaqueTyId> for crate::db::InternedOpaqueTyId {
    fn from(id: OpaqueTyId) -> Self {
        InternKey::from_intern_id(id.0)
@@ -560,14 +573,14 @@ impl From<crate::db::InternedOpaqueTyId> for OpaqueTyId {
    }
 }
-impl From<rust_ir::AssociatedTyValueId<Interner>> for crate::traits::AssocTyValueId {
+impl From<chalk_ir::ClosureId<Interner>> for crate::db::ClosureId {
-    fn from(id: rust_ir::AssociatedTyValueId<Interner>) -> Self {
+    fn from(id: chalk_ir::ClosureId<Interner>) -> Self {
        Self::from_intern_id(id.0)
    }
 }
-impl From<crate::traits::AssocTyValueId> for rust_ir::AssociatedTyValueId<Interner> {
+impl From<crate::db::ClosureId> for chalk_ir::ClosureId<Interner> {
-    fn from(assoc_ty_value_id: crate::traits::AssocTyValueId) -> Self {
+    fn from(id: crate::db::ClosureId) -> Self {
-        rust_ir::AssociatedTyValueId(assoc_ty_value_id.as_intern_id())
+        chalk_ir::ClosureId(id.as_intern_id())
    }
 }
diff --git a/crates/ra_hir_ty/src/traits/chalk/interner.rs b/crates/ra_hir_ty/src/traits/chalk/interner.rs
index 15426b022..8d4c51a8f 100644
--- a/crates/ra_hir_ty/src/traits/chalk/interner.rs
+++ b/crates/ra_hir_ty/src/traits/chalk/interner.rs
@@ -39,8 +39,9 @@ impl chalk_ir::interner::Interner for Interner {
    type InternedQuantifiedWhereClauses = Vec<chalk_ir::QuantifiedWhereClause<Self>>;
    type InternedVariableKinds = Vec<chalk_ir::VariableKind<Self>>;
    type InternedCanonicalVarKinds = Vec<chalk_ir::CanonicalVarKind<Self>>;
+    type InternedConstraints = Vec<chalk_ir::InEnvironment<chalk_ir::Constraint<Self>>>;
    type DefId = InternId;
-    type InternedAdtId = crate::TypeCtorId;
+    type InternedAdtId = hir_def::AdtId;
    type Identifier = TypeAliasId;
    type FnAbi = ();
@@ -349,6 +350,32 @@ impl chalk_ir::interner::Interner for Interner {
    ) -> &'a [chalk_ir::CanonicalVarKind<Self>] {
        &canonical_var_kinds
    }
+    fn intern_constraints<E>(
+        &self,
+        data: impl IntoIterator<Item = Result<chalk_ir::InEnvironment<chalk_ir::Constraint<Self>>, E>>,
+    ) -> Result<Self::InternedConstraints, E> {
+        data.into_iter().collect()
+    }
+    fn constraints_data<'a>(
+        &self,
+        constraints: &'a Self::InternedConstraints,
+    ) -> &'a [chalk_ir::InEnvironment<chalk_ir::Constraint<Self>>] {
+        constraints
+    }
+    fn debug_closure_id(
+        _fn_def_id: chalk_ir::ClosureId<Self>,
+        _fmt: &mut fmt::Formatter<'_>,
+    ) -> Option<fmt::Result> {
+        None
+    }
+    fn debug_constraints(
+        _clauses: &chalk_ir::Constraints<Self>,
+        _fmt: &mut fmt::Formatter<'_>,
+    ) -> Option<fmt::Result> {
+        None
+    }
 }
 impl chalk_ir::interner::HasInterner for Interner {
diff --git a/crates/ra_hir_ty/src/traits/chalk/mapping.rs b/crates/ra_hir_ty/src/traits/chalk/mapping.rs
index ac82ea831..b3e92993d 100644
--- a/crates/ra_hir_ty/src/traits/chalk/mapping.rs
+++ b/crates/ra_hir_ty/src/traits/chalk/mapping.rs
@@ -15,9 +15,9 @@ use ra_db::salsa::InternKey;
 use crate::{
    db::HirDatabase,
    primitive::{FloatBitness, FloatTy, IntBitness, IntTy, Signedness},
-    traits::{builtin, AssocTyValue, Canonical, Impl, Obligation},
+    traits::{Canonical, Obligation},
-    ApplicationTy, CallableDef, GenericPredicate, InEnvironment, OpaqueTy, OpaqueTyId,
+    ApplicationTy, CallableDefId, GenericPredicate, InEnvironment, OpaqueTy, OpaqueTyId,
-    ProjectionPredicate, ProjectionTy, Substs, TraitEnvironment, TraitRef, Ty, TypeCtor,
+    ProjectionPredicate, ProjectionTy, Substs, TraitEnvironment, TraitRef, Ty, TyKind, TypeCtor,
 };
 use super::interner::*;
@@ -29,10 +29,17 @@ impl ToChalk for Ty {
        match self {
            Ty::Apply(apply_ty) => match apply_ty.ctor {
                TypeCtor::Ref(m) => ref_to_chalk(db, m, apply_ty.parameters),
-                TypeCtor::FnPtr { num_args: _ } => {
+                TypeCtor::Array => array_to_chalk(db, apply_ty.parameters),
+                TypeCtor::FnPtr { num_args: _, is_varargs } => {
                    let substitution = apply_ty.parameters.to_chalk(db).shifted_in(&Interner);
-                    chalk_ir::TyData::Function(chalk_ir::Fn { num_binders: 0, substitution })
+                    chalk_ir::TyData::Function(chalk_ir::FnPointer {
-                        .intern(&Interner)
+                        num_binders: 0,
+                        abi: (),
+                        safety: chalk_ir::Safety::Safe,
+                        variadic: is_varargs,
+                        substitution,
+                    })
+                    .intern(&Interner)
                }
                _ => {
                    let name = apply_ty.ctor.to_chalk(db);
@@ -61,13 +68,13 @@ impl ToChalk for Ty {
            Ty::Bound(idx) => chalk_ir::TyData::BoundVar(idx).intern(&Interner),
            Ty::Infer(_infer_ty) => panic!("uncanonicalized infer ty"),
            Ty::Dyn(predicates) => {
-                let where_clauses = chalk_ir::QuantifiedWhereClauses::from(
+                let where_clauses = chalk_ir::QuantifiedWhereClauses::from_iter(
                    &Interner,
                    predicates.iter().filter(|p| !p.is_error()).cloned().map(|p| p.to_chalk(db)),
                );
                let bounded_ty = chalk_ir::DynTy {
                    bounds: make_binders(where_clauses, 1),
-                    lifetime: LIFETIME_PLACEHOLDER.to_lifetime(&Interner),
+                    lifetime: FAKE_PLACEHOLDER.to_lifetime(&Interner),
                };
                chalk_ir::TyData::Dyn(bounded_ty).intern(&Interner)
            }
@@ -92,6 +99,7 @@ impl ToChalk for Ty {
            chalk_ir::TyData::Apply(apply_ty) => match apply_ty.name {
                TypeName::Error => Ty::Unknown,
                TypeName::Ref(m) => ref_from_chalk(db, m, apply_ty.substitution),
+                TypeName::Array => array_from_chalk(db, apply_ty.substitution),
                _ => {
                    let ctor = from_chalk(db, apply_ty.name);
                    let parameters = from_chalk(db, apply_ty.substitution);
@@ -115,10 +123,22 @@ impl ToChalk for Ty {
                let parameters = from_chalk(db, opaque_ty.substitution);
                Ty::Opaque(OpaqueTy { opaque_ty_id: impl_trait_id, parameters })
            }
-            chalk_ir::TyData::Function(chalk_ir::Fn { num_binders: _, substitution }) => {
+            chalk_ir::TyData::Function(chalk_ir::FnPointer {
-                let parameters: Substs = from_chalk(db, substitution);
+                num_binders,
+                variadic,
+                substitution,
+                ..
+            }) => {
+                assert_eq!(num_binders, 0);
+                let parameters: Substs = from_chalk(
+                    db,
+                    substitution.shifted_out(&Interner).expect("fn ptr should have no binders"),
+                );
                Ty::Apply(ApplicationTy {
-                    ctor: TypeCtor::FnPtr { num_args: (parameters.len() - 1) as u16 },
+                    ctor: TypeCtor::FnPtr {
+                        num_args: (parameters.len() - 1) as u16,
+                        is_varargs: variadic,
+                    },
                    parameters,
                })
            }
@@ -138,7 +158,7 @@ impl ToChalk for Ty {
    }
 }
-const LIFETIME_PLACEHOLDER: PlaceholderIndex =
+const FAKE_PLACEHOLDER: PlaceholderIndex =
    PlaceholderIndex { ui: UniverseIndex::ROOT, idx: usize::MAX };
 /// We currently don't model lifetimes, but Chalk does. So, we have to insert a
@@ -149,10 +169,10 @@ fn ref_to_chalk(
    subst: Substs,
 ) -> chalk_ir::Ty<Interner> {
    let arg = subst[0].clone().to_chalk(db);
-    let lifetime = LIFETIME_PLACEHOLDER.to_lifetime(&Interner);
+    let lifetime = FAKE_PLACEHOLDER.to_lifetime(&Interner);
    chalk_ir::ApplicationTy {
        name: TypeName::Ref(mutability.to_chalk(db)),
-        substitution: chalk_ir::Substitution::from(
+        substitution: chalk_ir::Substitution::from_iter(
            &Interner,
            vec![lifetime.cast(&Interner), arg.cast(&Interner)],
        ),
@@ -173,11 +193,40 @@ fn ref_from_chalk(
    Ty::apply(TypeCtor::Ref(from_chalk(db, mutability)), Substs(tys))
 }
+/// We currently don't model constants, but Chalk does. So, we have to insert a
+/// fake constant here, because Chalks built-in logic may expect it to be there.
+fn array_to_chalk(db: &dyn HirDatabase, subst: Substs) -> chalk_ir::Ty<Interner> {
+    let arg = subst[0].clone().to_chalk(db);
+    let usize_ty = chalk_ir::ApplicationTy {
+        name: TypeName::Scalar(Scalar::Uint(chalk_ir::UintTy::Usize)),
+        substitution: chalk_ir::Substitution::empty(&Interner),
+    }
+    .intern(&Interner);
+    let const_ = FAKE_PLACEHOLDER.to_const(&Interner, usize_ty);
+    chalk_ir::ApplicationTy {
+        name: TypeName::Array,
+        substitution: chalk_ir::Substitution::from_iter(
+            &Interner,
+            vec![arg.cast(&Interner), const_.cast(&Interner)],
+        ),
+    }
+    .intern(&Interner)
+}
+/// Here we remove the const from the type we got from Chalk.
+fn array_from_chalk(db: &dyn HirDatabase, subst: chalk_ir::Substitution<Interner>) -> Ty {
+    let tys = subst
+        .iter(&Interner)
+        .filter_map(|p| Some(from_chalk(db, p.ty(&Interner)?.clone())))
+        .collect();
+    Ty::apply(TypeCtor::Array, Substs(tys))
+}
 impl ToChalk for Substs {
    type Chalk = chalk_ir::Substitution<Interner>;
    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Substitution<Interner> {
-        chalk_ir::Substitution::from(&Interner, self.iter().map(|ty| ty.clone().to_chalk(db)))
+        chalk_ir::Substitution::from_iter(&Interner, self.iter().map(|ty| ty.clone().to_chalk(db)))
    }
    fn from_chalk(db: &dyn HirDatabase, parameters: chalk_ir::Substitution<Interner>) -> Substs {
@@ -263,6 +312,7 @@ impl ToChalk for TypeCtor {
            TypeCtor::Tuple { cardinality } => TypeName::Tuple(cardinality.into()),
            TypeCtor::RawPtr(mutability) => TypeName::Raw(mutability.to_chalk(db)),
            TypeCtor::Slice => TypeName::Slice,
+            TypeCtor::Array => TypeName::Array,
            TypeCtor::Ref(mutability) => TypeName::Ref(mutability.to_chalk(db)),
            TypeCtor::Str => TypeName::Str,
            TypeCtor::FnDef(callable_def) => {
@@ -271,20 +321,24 @@ impl ToChalk for TypeCtor {
            }
            TypeCtor::Never => TypeName::Never,
-            TypeCtor::Adt(_)
+            TypeCtor::Closure { def, expr } => {
-            | TypeCtor::Array
+                let closure_id = db.intern_closure((def, expr));
-            | TypeCtor::FnPtr { .. }
+                TypeName::Closure(closure_id.into())
-            | TypeCtor::Closure { .. } => {
+            }
-                // other TypeCtors get interned and turned into a chalk StructId
-                let struct_id = db.intern_type_ctor(self).into();
+            TypeCtor::Adt(adt_id) => TypeName::Adt(chalk_ir::AdtId(adt_id)),
-                TypeName::Adt(struct_id)
+            TypeCtor::FnPtr { .. } => {
+                // This should not be reached, since Chalk doesn't represent
+                // function pointers with TypeName
+                unreachable!()
            }
        }
    }
    fn from_chalk(db: &dyn HirDatabase, type_name: TypeName<Interner>) -> TypeCtor {
        match type_name {
-            TypeName::Adt(struct_id) => db.lookup_intern_type_ctor(struct_id.into()),
+            TypeName::Adt(struct_id) => TypeCtor::Adt(struct_id.0),
            TypeName::AssociatedType(type_id) => TypeCtor::AssociatedType(from_chalk(db, type_id)),
            TypeName::OpaqueType(opaque_type_id) => {
                TypeCtor::OpaqueType(from_chalk(db, opaque_type_id))
@@ -317,13 +371,16 @@ impl ToChalk for TypeCtor {
                let callable_def = from_chalk(db, fn_def_id);
                TypeCtor::FnDef(callable_def)
            }
+            TypeName::Array => TypeCtor::Array,
-            TypeName::Array | TypeName::Error => {
+            TypeName::Closure(id) => {
-                // this should not be reached, since we don't represent TypeName::Error with TypeCtor
+                let id: crate::db::ClosureId = id.into();
-                unreachable!()
+                let (def, expr) = db.lookup_intern_closure(id);
+                TypeCtor::Closure { def, expr }
            }
-            TypeName::Closure(_) => {
-                // FIXME: implement closure support
+            TypeName::Error => {
+                // this should not be reached, since we don't represent TypeName::Error with TypeCtor
                unreachable!()
            }
        }
@@ -395,26 +452,26 @@ impl ToChalk for Mutability {
    }
 }
-impl ToChalk for Impl {
+impl ToChalk for hir_def::ImplId {
    type Chalk = ImplId;
-    fn to_chalk(self, db: &dyn HirDatabase) -> ImplId {
+    fn to_chalk(self, _db: &dyn HirDatabase) -> ImplId {
-        db.intern_chalk_impl(self).into()
+        chalk_ir::ImplId(self.as_intern_id())
    }
-    fn from_chalk(db: &dyn HirDatabase, impl_id: ImplId) -> Impl {
+    fn from_chalk(_db: &dyn HirDatabase, impl_id: ImplId) -> hir_def::ImplId {
-        db.lookup_intern_chalk_impl(impl_id.into())
+        InternKey::from_intern_id(impl_id.0)
    }
 }
-impl ToChalk for CallableDef {
+impl ToChalk for CallableDefId {
    type Chalk = FnDefId;
    fn to_chalk(self, db: &dyn HirDatabase) -> FnDefId {
        db.intern_callable_def(self).into()
    }
-    fn from_chalk(db: &dyn HirDatabase, fn_def_id: FnDefId) -> CallableDef {
+    fn from_chalk(db: &dyn HirDatabase, fn_def_id: FnDefId) -> CallableDefId {
        db.lookup_intern_callable_def(fn_def_id.into())
    }
 }
@@ -431,15 +488,20 @@ impl ToChalk for TypeAliasId {
    }
 }
-impl ToChalk for AssocTyValue {
+pub struct TypeAliasAsValue(pub TypeAliasId);
+impl ToChalk for TypeAliasAsValue {
    type Chalk = AssociatedTyValueId;
-    fn to_chalk(self, db: &dyn HirDatabase) -> AssociatedTyValueId {
+    fn to_chalk(self, _db: &dyn HirDatabase) -> AssociatedTyValueId {
-        db.intern_assoc_ty_value(self).into()
+        rust_ir::AssociatedTyValueId(self.0.as_intern_id())
    }
-    fn from_chalk(db: &dyn HirDatabase, assoc_ty_value_id: AssociatedTyValueId) -> AssocTyValue {
+    fn from_chalk(
-        db.lookup_intern_assoc_ty_value(assoc_ty_value_id.into())
+        _db: &dyn HirDatabase,
+        assoc_ty_value_id: AssociatedTyValueId,
+    ) -> TypeAliasAsValue {
+        TypeAliasAsValue(TypeAliasId::from_intern_id(assoc_ty_value_id.0))
    }
 }
@@ -492,6 +554,11 @@ impl ToChalk for GenericPredicate {
                // we shouldn't get these from Chalk
                panic!("encountered LifetimeOutlives from Chalk")
            }
+            chalk_ir::WhereClause::TypeOutlives(_) => {
+                // we shouldn't get these from Chalk
+                panic!("encountered TypeOutlives from Chalk")
+            }
        }
    }
 }
@@ -555,22 +622,42 @@ where
    type Chalk = chalk_ir::Canonical<T::Chalk>;
    fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Canonical<T::Chalk> {
-        let parameter = chalk_ir::CanonicalVarKind::new(
+        let kinds = self
-            chalk_ir::VariableKind::Ty(chalk_ir::TyKind::General),
+            .kinds
-            chalk_ir::UniverseIndex::ROOT,
+            .iter()
-        );
+            .map(|k| match k {
+                TyKind::General => chalk_ir::TyKind::General,
+                TyKind::Integer => chalk_ir::TyKind::Integer,
+                TyKind::Float => chalk_ir::TyKind::Float,
+            })
+            .map(|tk| {
+                chalk_ir::CanonicalVarKind::new(
+                    chalk_ir::VariableKind::Ty(tk),
+                    chalk_ir::UniverseIndex::ROOT,
+                )
+            });
        let value = self.value.to_chalk(db);
        chalk_ir::Canonical {
            value,
-            binders: chalk_ir::CanonicalVarKinds::from(&Interner, vec![parameter; self.num_vars]),
+            binders: chalk_ir::CanonicalVarKinds::from_iter(&Interner, kinds),
        }
    }
    fn from_chalk(db: &dyn HirDatabase, canonical: chalk_ir::Canonical<T::Chalk>) -> Canonical<T> {
-        Canonical {
+        let kinds = canonical
-            num_vars: canonical.binders.len(&Interner),
+            .binders
-            value: from_chalk(db, canonical.value),
+            .iter(&Interner)
-        }
+            .map(|k| match k.kind {
+                chalk_ir::VariableKind::Ty(tk) => match tk {
+                    chalk_ir::TyKind::General => TyKind::General,
+                    chalk_ir::TyKind::Integer => TyKind::Integer,
+                    chalk_ir::TyKind::Float => TyKind::Float,
+                },
+                chalk_ir::VariableKind::Lifetime => panic!("unexpected lifetime from Chalk"),
+                chalk_ir::VariableKind::Const(_) => panic!("unexpected const from Chalk"),
+            })
+            .collect();
+        Canonical { kinds, value: from_chalk(db, canonical.value) }
    }
 }
@@ -623,58 +710,12 @@ where
    }
 }
-impl ToChalk for builtin::BuiltinImplData {
-    type Chalk = ImplDatum;
-    fn to_chalk(self, db: &dyn HirDatabase) -> ImplDatum {
-        let impl_type = rust_ir::ImplType::External;
-        let where_clauses = self.where_clauses.into_iter().map(|w| w.to_chalk(db)).collect();
-        let impl_datum_bound =
-            rust_ir::ImplDatumBound { trait_ref: self.trait_ref.to_chalk(db), where_clauses };
-        let associated_ty_value_ids =
-            self.assoc_ty_values.into_iter().map(|v| v.to_chalk(db)).collect();
-        rust_ir::ImplDatum {
-            binders: make_binders(impl_datum_bound, self.num_vars),
-            impl_type,
-            polarity: rust_ir::Polarity::Positive,
-            associated_ty_value_ids,
-        }
-    }
-    fn from_chalk(_db: &dyn HirDatabase, _data: ImplDatum) -> Self {
-        unimplemented!()
-    }
-}
-impl ToChalk for builtin::BuiltinImplAssocTyValueData {
-    type Chalk = AssociatedTyValue;
-    fn to_chalk(self, db: &dyn HirDatabase) -> AssociatedTyValue {
-        let ty = self.value.to_chalk(db);
-        let value_bound = rust_ir::AssociatedTyValueBound { ty };
-        rust_ir::AssociatedTyValue {
-            associated_ty_id: self.assoc_ty_id.to_chalk(db),
-            impl_id: self.impl_.to_chalk(db),
-            value: make_binders(value_bound, self.num_vars),
-        }
-    }
-    fn from_chalk(
-        _db: &dyn HirDatabase,
-        _data: AssociatedTyValue,
-    ) -> builtin::BuiltinImplAssocTyValueData {
-        unimplemented!()
-    }
-}
 pub(super) fn make_binders<T>(value: T, num_vars: usize) -> chalk_ir::Binders<T>
 where
    T: HasInterner<Interner = Interner>,
 {
    chalk_ir::Binders::new(
-        chalk_ir::VariableKinds::from(
+        chalk_ir::VariableKinds::from_iter(
            &Interner,
            std::iter::repeat(chalk_ir::VariableKind::Ty(chalk_ir::TyKind::General)).take(num_vars),
        ),
diff --git a/crates/ra_hir_ty/src/traits/chalk/tls.rs b/crates/ra_hir_ty/src/traits/chalk/tls.rs
index 556af7098..db915625c 100644
--- a/crates/ra_hir_ty/src/traits/chalk/tls.rs
+++ b/crates/ra_hir_ty/src/traits/chalk/tls.rs
@@ -5,12 +5,12 @@ use chalk_ir::{AliasTy, GenericArg, Goal, Goals, Lifetime, ProgramClauseImplicat
 use itertools::Itertools;
 use super::{from_chalk, Interner};
-use crate::{db::HirDatabase, CallableDef, TypeCtor};
+use crate::{db::HirDatabase, CallableDefId, TypeCtor};
 use hir_def::{AdtId, AssocContainerId, DefWithBodyId, Lookup, TypeAliasId};
 pub use unsafe_tls::{set_current_program, with_current_program};
-pub struct DebugContext<'a>(&'a (dyn HirDatabase + 'a));
+pub struct DebugContext<'a>(&'a dyn HirDatabase);
 impl DebugContext<'_> {
    pub fn debug_struct_id(
@@ -38,16 +38,16 @@ impl DebugContext<'_> {
            }
            TypeCtor::FnDef(def) => {
                let name = match def {
-                    CallableDef::FunctionId(ff) => self.0.function_data(ff).name.clone(),
+                    CallableDefId::FunctionId(ff) => self.0.function_data(ff).name.clone(),
-                    CallableDef::StructId(s) => self.0.struct_data(s).name.clone(),
+                    CallableDefId::StructId(s) => self.0.struct_data(s).name.clone(),
-                    CallableDef::EnumVariantId(e) => {
+                    CallableDefId::EnumVariantId(e) => {
                        let enum_data = self.0.enum_data(e.parent);
                        enum_data.variants[e.local_id].name.clone()
                    }
                };
                match def {
-                    CallableDef::FunctionId(_) => write!(f, "{{fn {}}}", name)?,
+                    CallableDefId::FunctionId(_) => write!(f, "{{fn {}}}", name)?,
-                    CallableDef::StructId(_) | CallableDef::EnumVariantId(_) => {
+                    CallableDefId::StructId(_) | CallableDefId::EnumVariantId(_) => {
                        write!(f, "{{ctor {}}}", name)?
                    }
                }
@@ -157,7 +157,7 @@ impl DebugContext<'_> {
            _ => panic!("associated type not in trait"),
        };
        let trait_data = self.0.trait_data(trait_);
-        let params = projection_ty.substitution.parameters(&Interner);
+        let params = projection_ty.substitution.as_slice(&Interner);
        write!(fmt, "<{:?} as {}", &params[0], trait_data.name,)?;
        if params.len() > 1 {
            write!(
@@ -255,18 +255,18 @@ impl DebugContext<'_> {
        fn_def_id: chalk_ir::FnDefId<Interner>,
        fmt: &mut fmt::Formatter<'_>,
    ) -> Result<(), fmt::Error> {
-        let def: CallableDef = from_chalk(self.0, fn_def_id);
+        let def: CallableDefId = from_chalk(self.0, fn_def_id);
        let name = match def {
-            CallableDef::FunctionId(ff) => self.0.function_data(ff).name.clone(),
+            CallableDefId::FunctionId(ff) => self.0.function_data(ff).name.clone(),
-            CallableDef::StructId(s) => self.0.struct_data(s).name.clone(),
+            CallableDefId::StructId(s) => self.0.struct_data(s).name.clone(),
-            CallableDef::EnumVariantId(e) => {
+            CallableDefId::EnumVariantId(e) => {
                let enum_data = self.0.enum_data(e.parent);
                enum_data.variants[e.local_id].name.clone()
            }
        };
        match def {
-            CallableDef::FunctionId(_) => write!(fmt, "{{fn {}}}", name),
+            CallableDefId::FunctionId(_) => write!(fmt, "{{fn {}}}", name),
-            CallableDef::StructId(_) | CallableDef::EnumVariantId(_) => {
+            CallableDefId::StructId(_) | CallableDefId::EnumVariantId(_) => {
                write!(fmt, "{{ctor {}}}", name)
            }
        }
diff --git a/crates/ra_hir_ty/src/utils.rs b/crates/ra_hir_ty/src/utils.rs
index c45820ff0..e3e244268 100644
--- a/crates/ra_hir_ty/src/utils.rs
+++ b/crates/ra_hir_ty/src/utils.rs
@@ -110,38 +110,6 @@ pub(super) fn all_super_trait_refs(db: &dyn HirDatabase, trait_ref: TraitRef) ->
    result
 }
-/// Finds a path from a trait to one of its super traits. Returns an empty
-/// vector if there is no path.
-pub(super) fn find_super_trait_path(
-    db: &dyn DefDatabase,
-    trait_: TraitId,
-    super_trait: TraitId,
-) -> Vec<TraitId> {
-    let mut result = Vec::with_capacity(2);
-    result.push(trait_);
-    return if go(db, super_trait, &mut result) { result } else { Vec::new() };
-    fn go(db: &dyn DefDatabase, super_trait: TraitId, path: &mut Vec<TraitId>) -> bool {
-        let trait_ = *path.last().unwrap();
-        if trait_ == super_trait {
-            return true;
-        }
-        for tt in direct_super_traits(db, trait_) {
-            if path.contains(&tt) {
-                continue;
-            }
-            path.push(tt);
-            if go(db, super_trait, path) {
-                return true;
-            } else {
-                path.pop();
-            }
-        }
-        false
-    }
-}
 pub(super) fn associated_type_by_name_including_super_traits(
    db: &dyn HirDatabase,
    trait_ref: TraitRef,
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index d0eb018d5..4e2ba6d61 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_ide"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -22,6 +23,7 @@ maplit = "*"
 lazy_static = "*"
 pulldown-cmark-to-cmark = "4.0.2"
 pulldown-cmark = "0.7.0"
+oorandom = "11.1.2"
 stdx = { path = "../stdx" }
@@ -44,4 +46,4 @@ ra_parser = { path = "../ra_parser" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 [dev-dependencies]
-insta = "0.16.0"
+expect = { path = "../expect" }
diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs
index 1e3a31602..1fcaf4a32 100644
--- a/crates/ra_ide/src/call_hierarchy.rs
+++ b/crates/ra_ide/src/call_hierarchy.rs
@@ -39,10 +39,11 @@ pub(crate) fn call_hierarchy(
 pub(crate) fn incoming_calls(db: &RootDatabase, position: FilePosition) -> Option<Vec<CallItem>> {
    let sema = Semantics::new(db);
    // 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 refs = references::find_all_refs(&sema, position, None)?;
    let mut calls = CallLocations::default();
@@ -58,7 +59,7 @@ pub(crate) fn incoming_calls(db: &RootDatabase, position: FilePosition) -> Optio
        if let Some(nav) = syntax.ancestors().find_map(|node| {
            match_ast! {
                match node {
-                    ast::FnDef(it) => {
+                    ast::Fn(it) => {
                        let def = sema.to_def(&it)?;
                        Some(def.to_nav(sema.db))
                    },
@@ -94,9 +95,9 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio
            if let Some(func_target) = match &call_node {
                FnCallNode::CallExpr(expr) => {
                    //FIXME: Type::as_callable is broken
-                    let callable_def = sema.type_of_expr(&expr.expr()?)?.as_callable()?;
+                    let callable = sema.type_of_expr(&expr.expr()?)?.as_callable(db)?;
-                    match callable_def {
+                    match callable.kind() {
-                        hir::CallableDef::FunctionId(it) => {
+                        hir::CallableKind::Function(it) => {
                            let fn_def: hir::Function = it.into();
                            let nav = fn_def.to_nav(db);
                            Some(nav)
@@ -108,10 +109,6 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio
                    let function = sema.resolve_method_call(&expr)?;
                    Some(function.to_nav(db))
                }
-                FnCallNode::MacroCallExpr(macro_call) => {
-                    let macro_def = sema.resolve_macro_call(&macro_call)?;
-                    Some(macro_def.to_nav(db))
-                }
            } {
                Some((func_target, name_ref.syntax().text_range()))
            } else {
@@ -157,7 +154,8 @@ mod tests {
        let nav = navs.pop().unwrap();
        nav.assert_match(expected);
-        let item_pos = FilePosition { file_id: nav.file_id(), offset: nav.range().start() };
+        let item_pos =
+            FilePosition { file_id: nav.file_id, offset: nav.focus_or_full_range().start() };
        let incoming_calls = analysis.incoming_calls(item_pos).unwrap().unwrap();
        assert_eq!(incoming_calls.len(), expected_incoming.len());
@@ -183,8 +181,8 @@ fn caller() {
    call<|>ee();
 }
 "#,
-            "callee FN_DEF FileId(1) 0..14 3..9",
+            "callee FN FileId(1) 0..14 3..9",
-            &["caller FN_DEF FileId(1) 15..44 18..24 : [33..39]"],
+            &["caller FN FileId(1) 15..44 18..24 : [33..39]"],
            &[],
        );
    }
@@ -199,8 +197,8 @@ fn caller() {
    callee();
 }
 "#,
-            "callee FN_DEF FileId(1) 0..14 3..9",
+            "callee FN FileId(1) 0..14 3..9",
-            &["caller FN_DEF FileId(1) 15..44 18..24 : [33..39]"],
+            &["caller FN FileId(1) 15..44 18..24 : [33..39]"],
            &[],
        );
    }
@@ -216,8 +214,8 @@ fn caller() {
    callee();
 }
 "#,
-            "callee FN_DEF FileId(1) 0..14 3..9",
+            "callee FN FileId(1) 0..14 3..9",
-            &["caller FN_DEF FileId(1) 15..58 18..24 : [33..39, 47..53]"],
+            &["caller FN FileId(1) 15..58 18..24 : [33..39, 47..53]"],
            &[],
        );
    }
@@ -236,10 +234,10 @@ fn caller2() {
    callee();
 }
 "#,
-            "callee FN_DEF FileId(1) 0..14 3..9",
+            "callee FN FileId(1) 0..14 3..9",
            &[
-                "caller1 FN_DEF FileId(1) 15..45 18..25 : [34..40]",
+                "caller1 FN FileId(1) 15..45 18..25 : [34..40]",
-                "caller2 FN_DEF FileId(1) 47..77 50..57 : [66..72]",
+                "caller2 FN FileId(1) 47..77 50..57 : [66..72]",
            ],
            &[],
        );
@@ -265,10 +263,10 @@ mod tests {
    }
 }
 "#,
-            "callee FN_DEF FileId(1) 0..14 3..9",
+            "callee FN FileId(1) 0..14 3..9",
            &[
-                "caller1 FN_DEF FileId(1) 15..45 18..25 : [34..40]",
+                "caller1 FN FileId(1) 15..45 18..25 : [34..40]",
-                "test_caller FN_DEF FileId(1) 95..149 110..121 : [134..140]",
+                "test_caller FN FileId(1) 95..149 110..121 : [134..140]",
            ],
            &[],
        );
@@ -289,8 +287,8 @@ fn caller() {
 //- /foo/mod.rs
 pub fn callee() {}
 "#,
-            "callee FN_DEF FileId(2) 0..18 7..13",
+            "callee FN FileId(2) 0..18 7..13",
-            &["caller FN_DEF FileId(1) 27..56 30..36 : [45..51]"],
+            &["caller FN FileId(1) 27..56 30..36 : [45..51]"],
            &[],
        );
    }
@@ -306,9 +304,9 @@ fn call<|>er() {
    callee();
 }
 "#,
-            "caller FN_DEF FileId(1) 15..58 18..24",
+            "caller FN FileId(1) 15..58 18..24",
            &[],
-            &["callee FN_DEF FileId(1) 0..14 3..9 : [33..39, 47..53]"],
+            &["callee FN FileId(1) 0..14 3..9 : [33..39, 47..53]"],
        );
    }
@@ -327,9 +325,9 @@ fn call<|>er() {
 //- /foo/mod.rs
 pub fn callee() {}
 "#,
-            "caller FN_DEF FileId(1) 27..56 30..36",
+            "caller FN FileId(1) 27..56 30..36",
            &[],
-            &["callee FN_DEF FileId(2) 0..18 7..13 : [45..51]"],
+            &["callee FN FileId(2) 0..18 7..13 : [45..51]"],
        );
    }
@@ -350,9 +348,46 @@ fn caller3() {
 }
 "#,
-            "caller2 FN_DEF FileId(1) 33..64 36..43",
+            "caller2 FN FileId(1) 33..64 36..43",
-            &["caller1 FN_DEF FileId(1) 0..31 3..10 : [19..26]"],
+            &["caller1 FN FileId(1) 0..31 3..10 : [19..26]"],
-            &["caller3 FN_DEF FileId(1) 66..83 69..76 : [52..59]"],
+            &["caller3 FN FileId(1) 66..83 69..76 : [52..59]"],
+        );
+    }
+    #[test]
+    fn test_call_hierarchy_issue_5103() {
+        check_hierarchy(
+            r#"
+fn a() {
+    b()
+}
+fn b() {}
+fn main() {
+    a<|>()
+}
+"#,
+            "a FN FileId(1) 0..18 3..4",
+            &["main FN FileId(1) 31..52 34..38 : [47..48]"],
+            &["b FN FileId(1) 20..29 23..24 : [13..14]"],
+        );
+        check_hierarchy(
+            r#"
+fn a() {
+    b<|>()
+}
+fn b() {}
+fn main() {
+    a()
+}
+"#,
+            "b FN FileId(1) 20..29 23..24",
+            &["a FN FileId(1) 0..18 3..4 : [13..14]"],
+            &[],
        );
    }
 }
diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs
index a6bdf1c9d..ff602202f 100644
--- a/crates/ra_ide/src/call_info.rs
+++ b/crates/ra_ide/src/call_info.rs
@@ -1,13 +1,43 @@
 //! FIXME: write short doc here
-use hir::Semantics;
+use either::Either;
+use hir::{Docs, HirDisplay, Semantics, Type};
 use ra_ide_db::RootDatabase;
 use ra_syntax::{
    ast::{self, ArgListOwner},
-    match_ast, AstNode, SyntaxNode, SyntaxToken,
+    match_ast, AstNode, SyntaxNode, SyntaxToken, TextRange, TextSize,
 };
+use stdx::format_to;
 use test_utils::mark;
-use crate::{CallInfo, FilePosition, FunctionSignature};
+use crate::FilePosition;
+/// Contains information about a call site. Specifically the
+/// `FunctionSignature`and current parameter.
+#[derive(Debug)]
+pub struct CallInfo {
+    pub doc: Option<String>,
+    pub signature: String,
+    pub active_parameter: Option<usize>,
+    parameters: Vec<TextRange>,
+}
+impl CallInfo {
+    pub fn parameter_labels(&self) -> impl Iterator<Item = &str> + '_ {
+        self.parameters.iter().map(move |&it| &self.signature[it])
+    }
+    pub fn parameter_ranges(&self) -> &[TextRange] {
+        &self.parameters
+    }
+    fn push_param(&mut self, param: &str) {
+        if !self.signature.ends_with('(') {
+            self.signature.push_str(", ");
+        }
+        let start = TextSize::of(&self.signature);
+        self.signature.push_str(param);
+        let end = TextSize::of(&self.signature);
+        self.parameters.push(TextRange::new(start, end))
+    }
+}
 /// Computes parameter information for the given call expression.
 pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<CallInfo> {
@@ -16,106 +46,135 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
    let file = file.syntax();
    let token = file.token_at_offset(position.offset).next()?;
    let token = sema.descend_into_macros(token);
-    call_info_for_token(&sema, token)
-}
-#[derive(Debug)]
+    let (callable, active_parameter) = call_info_impl(&sema, token)?;
-pub(crate) struct ActiveParameter {
-    /// FIXME: should be `Type` and `Name
-    pub(crate) ty: String,
-    pub(crate) name: String,
-}
-impl ActiveParameter {
+    let mut res =
-    pub(crate) fn at(db: &RootDatabase, position: FilePosition) -> Option<Self> {
+        CallInfo { doc: None, signature: String::new(), parameters: vec![], active_parameter };
-        call_info(db, position)?.into_active_parameter()
+    match callable.kind() {
+        hir::CallableKind::Function(func) => {
+            res.doc = func.docs(db).map(|it| it.as_str().to_string());
+            format_to!(res.signature, "fn {}", func.name(db));
+        }
+        hir::CallableKind::TupleStruct(strukt) => {
+            res.doc = strukt.docs(db).map(|it| it.as_str().to_string());
+            format_to!(res.signature, "struct {}", strukt.name(db));
+        }
+        hir::CallableKind::TupleEnumVariant(variant) => {
+            res.doc = variant.docs(db).map(|it| it.as_str().to_string());
+            format_to!(
+                res.signature,
+                "enum {}::{}",
+                variant.parent_enum(db).name(db),
+                variant.name(db)
+            );
+        }
+        hir::CallableKind::Closure => (),
    }
-    pub(crate) fn at_token(sema: &Semantics<RootDatabase>, token: SyntaxToken) -> Option<Self> {
+    res.signature.push('(');
-        call_info_for_token(sema, token)?.into_active_parameter()
+    {
+        if let Some(self_param) = callable.receiver_param(db) {
+            format_to!(res.signature, "{}", self_param)
+        }
+        let mut buf = String::new();
+        for (pat, ty) in callable.params(db) {
+            buf.clear();
+            if let Some(pat) = pat {
+                match pat {
+                    Either::Left(_self) => format_to!(buf, "self: "),
+                    Either::Right(pat) => format_to!(buf, "{}: ", pat),
+                }
+            }
+            format_to!(buf, "{}", ty.display(db));
+            res.push_param(&buf);
+        }
    }
+    res.signature.push(')');
+    match callable.kind() {
+        hir::CallableKind::Function(_) | hir::CallableKind::Closure => {
+            let ret_type = callable.return_type();
+            if !ret_type.is_unit() {
+                format_to!(res.signature, " -> {}", ret_type.display(db));
+            }
+        }
+        hir::CallableKind::TupleStruct(_) | hir::CallableKind::TupleEnumVariant(_) => {}
+    }
+    Some(res)
 }
-fn call_info_for_token(sema: &Semantics<RootDatabase>, token: SyntaxToken) -> Option<CallInfo> {
+fn call_info_impl(
+    sema: &Semantics<RootDatabase>,
+    token: SyntaxToken,
+) -> Option<(hir::Callable, Option<usize>)> {
    // Find the calling expression and it's NameRef
    let calling_node = FnCallNode::with_node(&token.parent())?;
-    let (mut call_info, has_self) = match &calling_node {
+    let callable = match &calling_node {
-        FnCallNode::CallExpr(call) => {
+        FnCallNode::CallExpr(call) => sema.type_of_expr(&call.expr()?)?.as_callable(sema.db)?,
-            //FIXME: Type::as_callable is broken
+        FnCallNode::MethodCallExpr(call) => sema.resolve_method_call_as_callable(call)?,
-            let callable_def = sema.type_of_expr(&call.expr()?)?.as_callable()?;
+    };
-            match callable_def {
+    let active_param = if let Some(arg_list) = calling_node.arg_list() {
-                hir::CallableDef::FunctionId(it) => {
+        // Number of arguments specified at the call site
-                    let fn_def = it.into();
+        let num_args_at_callsite = arg_list.args().count();
-                    (CallInfo::with_fn(sema.db, fn_def), fn_def.has_self_param(sema.db))
-                }
+        let arg_list_range = arg_list.syntax().text_range();
-                hir::CallableDef::StructId(it) => {
+        if !arg_list_range.contains_inclusive(token.text_range().start()) {
-                    (CallInfo::with_struct(sema.db, it.into())?, false)
+            mark::hit!(call_info_bad_offset);
-                }
+            return None;
-                hir::CallableDef::EnumVariantId(it) => {
-                    (CallInfo::with_enum_variant(sema.db, it.into())?, false)
-                }
-            }
-        }
-        FnCallNode::MethodCallExpr(method_call) => {
-            let function = sema.resolve_method_call(&method_call)?;
-            (CallInfo::with_fn(sema.db, function), function.has_self_param(sema.db))
-        }
-        FnCallNode::MacroCallExpr(macro_call) => {
-            let macro_def = sema.resolve_macro_call(&macro_call)?;
-            (CallInfo::with_macro(sema.db, macro_def)?, false)
        }
+        let param = std::cmp::min(
+            num_args_at_callsite,
+            arg_list
+                .args()
+                .take_while(|arg| arg.syntax().text_range().end() <= token.text_range().start())
+                .count(),
+        );
+        Some(param)
+    } else {
+        None
    };
+    Some((callable, active_param))
+}
-    // If we have a calling expression let's find which argument we are on
+#[derive(Debug)]
-    let num_params = call_info.parameters().len();
+pub(crate) struct ActiveParameter {
+    pub(crate) ty: Type,
+    pub(crate) name: String,
+}
-    match num_params {
+impl ActiveParameter {
-        0 => (),
+    pub(crate) fn at(db: &RootDatabase, position: FilePosition) -> Option<Self> {
-        1 => {
+        let sema = Semantics::new(db);
-            if !has_self {
+        let file = sema.parse(position.file_id);
-                call_info.active_parameter = Some(0);
+        let file = file.syntax();
-            }
+        let token = file.token_at_offset(position.offset).next()?;
-        }
+        let token = sema.descend_into_macros(token);
-        _ => {
+        Self::at_token(&sema, token)
-            if let Some(arg_list) = calling_node.arg_list() {
+    }
-                // Number of arguments specified at the call site
-                let num_args_at_callsite = arg_list.args().count();
-                let arg_list_range = arg_list.syntax().text_range();
-                if !arg_list_range.contains_inclusive(token.text_range().start()) {
-                    mark::hit!(call_info_bad_offset);
-                    return None;
-                }
-                let mut param = std::cmp::min(
+    pub(crate) fn at_token(sema: &Semantics<RootDatabase>, token: SyntaxToken) -> Option<Self> {
-                    num_args_at_callsite,
+        let (signature, active_parameter) = call_info_impl(&sema, token)?;
-                    arg_list
-                        .args()
-                        .take_while(|arg| {
-                            arg.syntax().text_range().end() < token.text_range().start()
-                        })
-                        .count(),
-                );
-                // If we are in a method account for `self`
-                if has_self {
-                    param += 1;
-                }
-                call_info.active_parameter = Some(param);
+        let idx = active_parameter?;
-            }
+        let mut params = signature.params(sema.db);
+        if !(idx < params.len()) {
+            mark::hit!(too_many_arguments);
+            return None;
        }
+        let (pat, ty) = params.swap_remove(idx);
+        let name = pat?.to_string();
+        Some(ActiveParameter { ty, name })
    }
-    Some(call_info)
 }
 #[derive(Debug)]
 pub(crate) enum FnCallNode {
    CallExpr(ast::CallExpr),
    MethodCallExpr(ast::MethodCallExpr),
-    MacroCallExpr(ast::MacroCall),
 }
 impl FnCallNode {
@@ -131,7 +190,6 @@ impl FnCallNode {
                        }
                        Some(FnCallNode::MethodCallExpr(it))
                    },
-                    ast::MacroCall(it) => Some(FnCallNode::MacroCallExpr(it)),
                    _ => None,
                }
            }
@@ -143,7 +201,6 @@ impl FnCallNode {
            match node {
                ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)),
                ast::MethodCallExpr(it) => Some(FnCallNode::MethodCallExpr(it)),
-                ast::MacroCall(it) => Some(FnCallNode::MacroCallExpr(it)),
                _ => None,
            }
        }
@@ -159,8 +216,6 @@ impl FnCallNode {
            FnCallNode::MethodCallExpr(call_expr) => {
                call_expr.syntax().children().filter_map(ast::NameRef::cast).next()
            }
-            FnCallNode::MacroCallExpr(call_expr) => call_expr.path()?.segment()?.name_ref(),
        }
    }
@@ -168,214 +223,209 @@ impl FnCallNode {
        match self {
            FnCallNode::CallExpr(expr) => expr.arg_list(),
            FnCallNode::MethodCallExpr(expr) => expr.arg_list(),
-            FnCallNode::MacroCallExpr(_) => None,
        }
    }
 }
-impl CallInfo {
-    fn into_active_parameter(self) -> Option<ActiveParameter> {
-        let idx = self.active_parameter?;
-        let ty = self.signature.parameter_types.get(idx)?.clone();
-        let name = self.signature.parameter_names.get(idx)?.clone();
-        let res = ActiveParameter { ty, name };
-        Some(res)
-    }
-    fn with_fn(db: &RootDatabase, function: hir::Function) -> Self {
-        let signature = FunctionSignature::from_hir(db, function);
-        CallInfo { signature, active_parameter: None }
-    }
-    fn with_struct(db: &RootDatabase, st: hir::Struct) -> Option<Self> {
-        let signature = FunctionSignature::from_struct(db, st)?;
-        Some(CallInfo { signature, active_parameter: None })
-    }
-    fn with_enum_variant(db: &RootDatabase, variant: hir::EnumVariant) -> Option<Self> {
-        let signature = FunctionSignature::from_enum_variant(db, variant)?;
-        Some(CallInfo { signature, active_parameter: None })
-    }
-    fn with_macro(db: &RootDatabase, macro_def: hir::MacroDef) -> Option<Self> {
-        let signature = FunctionSignature::from_macro(db, macro_def)?;
-        Some(CallInfo { signature, active_parameter: None })
-    }
-    fn parameters(&self) -> &[String] {
-        &self.signature.parameters
-    }
-}
 #[cfg(test)]
 mod tests {
+    use expect::{expect, Expect};
    use test_utils::mark;
    use crate::mock_analysis::analysis_and_position;
-    use super::*;
+    fn check(ra_fixture: &str, expect: Expect) {
+        let (analysis, position) = analysis_and_position(ra_fixture);
-    // These are only used when testing
+        let call_info = analysis.call_info(position).unwrap();
-    impl CallInfo {
+        let actual = match call_info {
-        fn doc(&self) -> Option<hir::Documentation> {
+            Some(call_info) => {
-            self.signature.doc.clone()
+                let docs = match &call_info.doc {
-        }
+                    None => "".to_string(),
+                    Some(docs) => format!("{}\n------\n", docs.as_str()),
-        fn label(&self) -> String {
+                };
-            self.signature.to_string()
+                let params = call_info
-        }
+                    .parameter_labels()
-    }
+                    .enumerate()
+                    .map(|(i, param)| {
-    fn call_info_helper(text: &str) -> Option<CallInfo> {
+                        if Some(i) == call_info.active_parameter {
-        let (analysis, position) = analysis_and_position(text);
+                            format!("<{}>", param)
-        analysis.call_info(position).unwrap()
+                        } else {
-    }
+                            param.to_string()
+                        }
-    fn call_info(text: &str) -> CallInfo {
+                    })
-        let info = call_info_helper(text);
+                    .collect::<Vec<_>>()
-        assert!(info.is_some());
+                    .join(", ");
-        info.unwrap()
+                format!("{}{}\n({})\n", docs, call_info.signature, params)
-    }
+            }
+            None => String::new(),
-    fn no_call_info(text: &str) {
+        };
-        let info = call_info_helper(text);
+        expect.assert_eq(&actual);
-        assert!(info.is_none());
    }
    #[test]
-    fn test_fn_signature_two_args_firstx() {
+    fn test_fn_signature_two_args() {
-        let info = call_info(
+        check(
-            r#"fn foo(x: u32, y: u32) -> u32 {x + y}
+            r#"
-fn bar() { foo(<|>3, ); }"#,
+fn foo(x: u32, y: u32) -> u32 {x + y}
+fn bar() { foo(<|>3, ); }
+"#,
+            expect![[r#"
+                fn foo(x: u32, y: u32) -> u32
+                (<x: u32>, y: u32)
+            "#]],
        );
+        check(
-        assert_eq!(info.parameters(), ["x: u32", "y: u32"]);
+            r#"
-        assert_eq!(info.active_parameter, Some(0));
+fn foo(x: u32, y: u32) -> u32 {x + y}
-    }
+fn bar() { foo(3<|>, ); }
+"#,
-    #[test]
+            expect![[r#"
-    fn test_fn_signature_two_args_second() {
+                fn foo(x: u32, y: u32) -> u32
-        let info = call_info(
+                (<x: u32>, y: u32)
-            r#"fn foo(x: u32, y: u32) -> u32 {x + y}
+            "#]],
-fn bar() { foo(3, <|>); }"#,
+        );
+        check(
+            r#"
+fn foo(x: u32, y: u32) -> u32 {x + y}
+fn bar() { foo(3,<|> ); }
+"#,
+            expect![[r#"
+                fn foo(x: u32, y: u32) -> u32
+                (x: u32, <y: u32>)
+            "#]],
+        );
+        check(
+            r#"
+fn foo(x: u32, y: u32) -> u32 {x + y}
+fn bar() { foo(3, <|>); }
+"#,
+            expect![[r#"
+                fn foo(x: u32, y: u32) -> u32
+                (x: u32, <y: u32>)
+            "#]],
        );
-        assert_eq!(info.parameters(), ["x: u32", "y: u32"]);
-        assert_eq!(info.active_parameter, Some(1));
    }
    #[test]
    fn test_fn_signature_two_args_empty() {
-        let info = call_info(
+        check(
-            r#"fn foo(x: u32, y: u32) -> u32 {x + y}
+            r#"
-fn bar() { foo(<|>); }"#,
+fn foo(x: u32, y: u32) -> u32 {x + y}
+fn bar() { foo(<|>); }
+"#,
+            expect![[r#"
+                fn foo(x: u32, y: u32) -> u32
+                (<x: u32>, y: u32)
+            "#]],
        );
-        assert_eq!(info.parameters(), ["x: u32", "y: u32"]);
-        assert_eq!(info.active_parameter, Some(0));
    }
    #[test]
    fn test_fn_signature_two_args_first_generics() {
-        let info = call_info(
+        check(
-            r#"fn foo<T, U: Copy + Display>(x: T, y: U) -> u32 where T: Copy + Display, U: Debug {x + y}
-fn bar() { foo(<|>3, ); }"#,
-        );
-        assert_eq!(info.parameters(), ["x: T", "y: U"]);
-        assert_eq!(
-            info.label(),
            r#"
 fn foo<T, U: Copy + Display>(x: T, y: U) -> u32
-where T: Copy + Display,
+    where T: Copy + Display, U: Debug
-      U: Debug
+{ x + y }
-    "#
-            .trim()
+fn bar() { foo(<|>3, ); }
+"#,
+            expect![[r#"
+                fn foo(x: i32, y: {unknown}) -> u32
+                (<x: i32>, y: {unknown})
+            "#]],
        );
-        assert_eq!(info.active_parameter, Some(0));
    }
    #[test]
    fn test_fn_signature_no_params() {
-        let info = call_info(
+        check(
-            r#"fn foo<T>() -> T where T: Copy + Display {}
-fn bar() { foo(<|>); }"#,
-        );
-        assert!(info.parameters().is_empty());
-        assert_eq!(
-            info.label(),
            r#"
-fn foo<T>() -> T
+fn foo<T>() -> T where T: Copy + Display {}
-where T: Copy + Display
+fn bar() { foo(<|>); }
-    "#
+"#,
-            .trim()
+            expect![[r#"
+                fn foo() -> {unknown}
+                ()
+            "#]],
        );
-        assert!(info.active_parameter.is_none());
    }
    #[test]
    fn test_fn_signature_for_impl() {
-        let info = call_info(
+        check(
-            r#"struct F; impl F { pub fn new() { F{}} }
+            r#"
-fn bar() {let _ : F = F::new(<|>);}"#,
+struct F;
+impl F { pub fn new() { } }
+fn bar() {
+    let _ : F = F::new(<|>);
+}
+"#,
+            expect![[r#"
+                fn new()
+                ()
+            "#]],
        );
-        assert!(info.parameters().is_empty());
-        assert_eq!(info.active_parameter, None);
    }
    #[test]
    fn test_fn_signature_for_method_self() {
-        let info = call_info(
+        check(
-            r#"struct F;
+            r#"
-impl F {
+struct S;
-    pub fn new() -> F{
+impl S { pub fn do_it(&self) {} }
-        F{}
-    }
-    pub fn do_it(&self) {}
-}
 fn bar() {
-    let f : F = F::new();
+    let s: S = S;
-    f.do_it(<|>);
+    s.do_it(<|>);
-}"#,
+}
+"#,
+            expect![[r#"
+                fn do_it(&self)
+                ()
+            "#]],
        );
-        assert_eq!(info.parameters(), ["&self"]);
-        assert_eq!(info.active_parameter, None);
    }
    #[test]
    fn test_fn_signature_for_method_with_arg() {
-        let info = call_info(
+        check(
-            r#"struct F;
+            r#"
-impl F {
+struct S;
-    pub fn new() -> F{
+impl S {
-        F{}
+    fn foo(&self, x: i32) {}
+}
+fn main() { S.foo(<|>); }
+"#,
+            expect![[r#"
+                fn foo(&self, x: i32)
+                (<x: i32>)
+            "#]],
+        );
    }
-    pub fn do_it(&self, x: i32) {}
+    #[test]
+    fn test_fn_signature_for_method_with_arg_as_assoc_fn() {
+        check(
+            r#"
+struct S;
+impl S {
+    fn foo(&self, x: i32) {}
 }
-fn bar() {
+fn main() { S::foo(<|>); }
-    let f : F = F::new();
+"#,
-    f.do_it(<|>);
+            expect![[r#"
-}"#,
+                fn foo(self: &S, x: i32)
+                (<self: &S>, x: i32)
+            "#]],
        );
-        assert_eq!(info.parameters(), ["&self", "x: i32"]);
-        assert_eq!(info.active_parameter, Some(1));
    }
    #[test]
    fn test_fn_signature_with_docs_simple() {
-        let info = call_info(
+        check(
            r#"
 /// test
 // non-doc-comment
@@ -387,17 +437,18 @@ fn bar() {
    let _ = foo(<|>);
 }
 "#,
+            expect![[r#"
+                test
+                ------
+                fn foo(j: u32) -> u32
+                (<j: u32>)
+            "#]],
        );
-        assert_eq!(info.parameters(), ["j: u32"]);
-        assert_eq!(info.active_parameter, Some(0));
-        assert_eq!(info.label(), "fn foo(j: u32) -> u32");
-        assert_eq!(info.doc().map(|it| it.into()), Some("test".to_string()));
    }
    #[test]
    fn test_fn_signature_with_docs() {
-        let info = call_info(
+        check(
            r#"
 /// Adds one to the number given.
 ///
@@ -415,31 +466,26 @@ pub fn add_one(x: i32) -> i32 {
 pub fn do() {
    add_one(<|>
 }"#,
-        );
+            expect![[r##"
+                Adds one to the number given.
-        assert_eq!(info.parameters(), ["x: i32"]);
-        assert_eq!(info.active_parameter, Some(0));
-        assert_eq!(info.label(), "pub fn add_one(x: i32) -> i32");
-        assert_eq!(
-            info.doc().map(|it| it.into()),
-            Some(
-                r#"Adds one to the number given.
-# Examples
+                # Examples
-```
+                ```
-let five = 5;
+                let five = 5;
-assert_eq!(6, my_crate::add_one(5));
+                assert_eq!(6, my_crate::add_one(5));
-```"#
+                ```
-                    .to_string()
+                ------
-            )
+                fn add_one(x: i32) -> i32
+                (<x: i32>)
+            "##]],
        );
    }
    #[test]
    fn test_fn_signature_with_docs_impl() {
-        let info = call_info(
+        check(
            r#"
 struct addr;
 impl addr {
@@ -460,32 +506,28 @@ impl addr {
 pub fn do_it() {
    addr {};
    addr::add_one(<|>);
-}"#,
+}
-        );
+"#,
+            expect![[r##"
-        assert_eq!(info.parameters(), ["x: i32"]);
+                Adds one to the number given.
-        assert_eq!(info.active_parameter, Some(0));
-        assert_eq!(info.label(), "pub fn add_one(x: i32) -> i32");
-        assert_eq!(
-            info.doc().map(|it| it.into()),
-            Some(
-                r#"Adds one to the number given.
-# Examples
+                # Examples
-```
+                ```
-let five = 5;
+                let five = 5;
-assert_eq!(6, my_crate::add_one(5));
+                assert_eq!(6, my_crate::add_one(5));
-```"#
+                ```
-                    .to_string()
+                ------
-            )
+                fn add_one(x: i32) -> i32
+                (<x: i32>)
+            "##]],
        );
    }
    #[test]
    fn test_fn_signature_with_docs_from_actix() {
-        let info = call_info(
+        check(
            r#"
 struct WriteHandler<E>;
@@ -509,101 +551,89 @@ impl<E> WriteHandler<E> {
 pub fn foo(mut r: WriteHandler<()>) {
    r.finished(<|>);
 }
 "#,
-        );
+            expect![[r#"
+                Method is called when writer finishes.
-        assert_eq!(info.label(), "fn finished(&mut self, ctx: &mut Self::Context)".to_string());
-        assert_eq!(info.parameters(), ["&mut self", "ctx: &mut Self::Context"]);
+                By default this method stops actor's `Context`.
-        assert_eq!(info.active_parameter, Some(1));
+                ------
-        assert_eq!(
+                fn finished(&mut self, ctx: &mut {unknown})
-            info.doc().map(|it| it.into()),
+                (<ctx: &mut {unknown}>)
-            Some(
+            "#]],
-                r#"Method is called when writer finishes.
-By default this method stops actor's `Context`."#
-                    .to_string()
-            )
        );
    }
    #[test]
    fn call_info_bad_offset() {
        mark::check!(call_info_bad_offset);
-        let (analysis, position) = analysis_and_position(
+        check(
-            r#"fn foo(x: u32, y: u32) -> u32 {x + y}
+            r#"
-               fn bar() { foo <|> (3, ); }"#,
+fn foo(x: u32, y: u32) -> u32 {x + y}
+fn bar() { foo <|> (3, ); }
+"#,
+            expect![[""]],
        );
-        let call_info = analysis.call_info(position).unwrap();
-        assert!(call_info.is_none());
    }
    #[test]
-    fn test_nested_method_in_lamba() {
+    fn test_nested_method_in_lambda() {
-        let info = call_info(
+        check(
-            r#"struct Foo;
+            r#"
+struct Foo;
-impl Foo {
+impl Foo { fn bar(&self, _: u32) { } }
-    fn bar(&self, _: u32) { }
-}
 fn bar(_: u32) { }
 fn main() {
    let foo = Foo;
    std::thread::spawn(move || foo.bar(<|>));
-}"#,
+}
+"#,
+            expect![[r#"
+                fn bar(&self, _: u32)
+                (<_: u32>)
+            "#]],
        );
-        assert_eq!(info.parameters(), ["&self", "_: u32"]);
-        assert_eq!(info.active_parameter, Some(1));
-        assert_eq!(info.label(), "fn bar(&self, _: u32)");
    }
    #[test]
    fn works_for_tuple_structs() {
-        let info = call_info(
+        check(
            r#"
 /// A cool tuple struct
-struct TS(u32, i32);
+struct S(u32, i32);
 fn main() {
-    let s = TS(0, <|>);
+    let s = S(0, <|>);
-}"#,
+}
+"#,
+            expect![[r#"
+                A cool tuple struct
+                ------
+                struct S(u32, i32)
+                (u32, <i32>)
+            "#]],
        );
-        assert_eq!(info.label(), "struct TS(u32, i32) -> TS");
-        assert_eq!(info.doc().map(|it| it.into()), Some("A cool tuple struct".to_string()));
-        assert_eq!(info.active_parameter, Some(1));
    }
    #[test]
    fn generic_struct() {
-        let info = call_info(
+        check(
            r#"
-struct TS<T>(T);
+struct S<T>(T);
 fn main() {
-    let s = TS(<|>);
+    let s = S(<|>);
-}"#,
+}
-        );
+"#,
+            expect![[r#"
-        assert_eq!(info.label(), "struct TS<T>(T) -> TS");
+                struct S({unknown})
-        assert_eq!(info.active_parameter, Some(0));
+                (<{unknown}>)
-    }
+            "#]],
-    #[test]
-    fn cant_call_named_structs() {
-        no_call_info(
-            r#"
-struct TS { x: u32, y: i32 }
-fn main() {
-    let s = TS(<|>);
-}"#,
        );
    }
    #[test]
    fn works_for_enum_variants() {
-        let info = call_info(
+        check(
            r#"
 enum E {
    /// A Variant
@@ -617,17 +647,32 @@ enum E {
 fn main() {
    let a = E::A(<|>);
 }
-            "#,
+"#,
+            expect![[r#"
+                A Variant
+                ------
+                enum E::A(i32)
+                (<i32>)
+            "#]],
        );
+    }
-        assert_eq!(info.label(), "E::A(0: i32)");
+    #[test]
-        assert_eq!(info.doc().map(|it| it.into()), Some("A Variant".to_string()));
+    fn cant_call_struct_record() {
-        assert_eq!(info.active_parameter, Some(0));
+        check(
+            r#"
+struct S { x: u32, y: i32 }
+fn main() {
+    let s = S(<|>);
+}
+"#,
+            expect![[""]],
+        );
    }
    #[test]
-    fn cant_call_enum_records() {
+    fn cant_call_enum_record() {
-        no_call_info(
+        check(
            r#"
 enum E {
    /// A Variant
@@ -641,47 +686,57 @@ enum E {
 fn main() {
    let a = E::C(<|>);
 }
-            "#,
+"#,
+            expect![[""]],
        );
    }
    #[test]
-    fn fn_signature_for_macro() {
+    fn fn_signature_for_call_in_macro() {
-        let info = call_info(
+        check(
            r#"
-/// empty macro
+macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
-macro_rules! foo {
+fn foo() { }
-    () => {}
+id! {
+    fn bar() { foo(<|>); }
 }
+"#,
+            expect![[r#"
+                fn foo()
+                ()
+            "#]],
+        );
+    }
-fn f() {
+    #[test]
-    foo!(<|>);
+    fn call_info_for_lambdas() {
+        check(
+            r#"
+struct S;
+fn foo(s: S) -> i32 { 92 }
+fn main() {
+    (|s| foo(s))(<|>)
 }
        "#,
-        );
+            expect![[r#"
+                (S) -> i32
-        assert_eq!(info.label(), "foo!()");
+                (<S>)
-        assert_eq!(info.doc().map(|it| it.into()), Some("empty macro".to_string()));
+            "#]],
+        )
    }
    #[test]
-    fn fn_signature_for_call_in_macro() {
+    fn call_info_for_fn_ptr() {
-        let info = call_info(
+        check(
            r#"
-            macro_rules! id {
+fn main(f: fn(i32, f64) -> char) {
-                ($($tt:tt)*) => { $($tt)* }
+    f(0, <|>)
-            }
+}
-            fn foo() {
+        "#,
+            expect![[r#"
-            }
+                (i32, f64) -> char
-            id! {
+                (i32, <f64>)
-                fn bar() {
+            "#]],
-                    foo(<|>);
+        )
-                }
-            }
-            "#,
-        );
-        assert_eq!(info.label(), "fn foo()");
    }
 }
diff --git a/crates/ra_ide/src/completion.rs b/crates/ra_ide/src/completion.rs
index e1fcf379d..68ac05e4c 100644
--- a/crates/ra_ide/src/completion.rs
+++ b/crates/ra_ide/src/completion.rs
@@ -2,6 +2,9 @@ mod completion_config;
 mod completion_item;
 mod completion_context;
 mod presentation;
+mod patterns;
+#[cfg(test)]
+mod test_utils;
 mod complete_attribute;
 mod complete_dot;
@@ -15,9 +18,6 @@ mod complete_unqualified_path;
 mod complete_postfix;
 mod complete_macro_in_item_position;
 mod complete_trait_impl;
-mod patterns;
-#[cfg(test)]
-mod test_utils;
 use ra_ide_db::RootDatabase;
@@ -63,11 +63,11 @@ pub use crate::completion::{
 // There also snippet completions:
 //
 // .Expressions
-// - `pd` -> `println!("{:?}")`
+// - `pd` -> `eprintln!(" = {:?}", );`
-// - `ppd` -> `println!("{:#?}")`
+// - `ppd` -> `eprintln!(" = {:#?}", );`
 //
 // .Items
-// - `tfn` -> `#[test] fn f(){}`
+// - `tfn` -> `#[test] fn feature(){}`
 // - `tmod` ->
 // ```rust
 // #[cfg(test)]
@@ -75,7 +75,7 @@ pub use crate::completion::{
 //     use super::*;
 //
 //     #[test]
-//     fn test_fn() {}
+//     fn test_name() {}
 // }
 // ```
@@ -137,8 +137,8 @@ mod tests {
        documentation: &'a str,
    }
-    fn check_detail_and_documentation(fixture: &str, expected: DetailAndDocumentation) {
+    fn check_detail_and_documentation(ra_fixture: &str, expected: DetailAndDocumentation) {
-        let (analysis, position) = analysis_and_position(fixture);
+        let (analysis, position) = analysis_and_position(ra_fixture);
        let config = CompletionConfig::default();
        let completions = analysis.completions(&config, position).unwrap().unwrap();
        for item in completions {
diff --git a/crates/ra_ide/src/completion/complete_attribute.rs b/crates/ra_ide/src/completion/complete_attribute.rs
index 6beeca457..2faaae974 100644
--- a/crates/ra_ide/src/completion/complete_attribute.rs
+++ b/crates/ra_ide/src/completion/complete_attribute.rs
@@ -13,14 +13,18 @@ use crate::completion::{
 pub(super) fn complete_attribute(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> {
    let attribute = ctx.attribute_under_caret.as_ref()?;
+    match (attribute.path(), attribute.token_tree()) {
-    match (attribute.path(), attribute.input()) {
+        (Some(path), Some(token_tree)) if path.to_string() == "derive" => {
-        (Some(path), Some(ast::AttrInput::TokenTree(token_tree)))
-            if path.to_string() == "derive" =>
-        {
            complete_derive(acc, ctx, token_tree)
        }
-        (_, Some(ast::AttrInput::TokenTree(_token_tree))) => {}
+        (Some(path), Some(token_tree))
+            if ["allow", "warn", "deny", "forbid"]
+                .iter()
+                .any(|lint_level| lint_level == &path.to_string()) =>
+        {
+            complete_lint(acc, ctx, token_tree)
+        }
+        (_, Some(_token_tree)) => {}
        _ => complete_attribute_start(acc, ctx, attribute),
    }
    Some(())
@@ -46,7 +50,7 @@ fn complete_attribute_start(acc: &mut Completions, ctx: &CompletionContext, attr
            _ => {}
        }
-        if attribute.kind() == ast::AttrKind::Inner || !attr_completion.should_be_inner {
+        if attribute.kind() == ast::AttrKind::Inner || !attr_completion.prefer_inner {
            acc.add(item);
        }
    }
@@ -56,163 +60,76 @@ struct AttrCompletion {
    label: &'static str,
    lookup: Option<&'static str>,
    snippet: Option<&'static str>,
-    should_be_inner: bool,
+    prefer_inner: bool,
+}
+impl AttrCompletion {
+    const fn prefer_inner(self) -> AttrCompletion {
+        AttrCompletion { prefer_inner: true, ..self }
+    }
+}
+const fn attr(
+    label: &'static str,
+    lookup: Option<&'static str>,
+    snippet: Option<&'static str>,
+) -> AttrCompletion {
+    AttrCompletion { label, lookup, snippet, prefer_inner: false }
 }
 const ATTRIBUTES: &[AttrCompletion] = &[
-    AttrCompletion {
+    attr("allow(…)", Some("allow"), Some("allow(${0:lint})")),
-        label: "allow(…)",
+    attr("cfg_attr(…)", Some("cfg_attr"), Some("cfg_attr(${1:predicate}, ${0:attr})")),
-        snippet: Some("allow(${0:lint})"),
+    attr("cfg(…)", Some("cfg"), Some("cfg(${0:predicate})")),
-        should_be_inner: false,
+    attr("deny(…)", Some("deny"), Some("deny(${0:lint})")),
-        lookup: Some("allow"),
+    attr(r#"deprecated = "…""#, Some("deprecated"), Some(r#"deprecated = "${0:reason}""#)),
-    },
+    attr("derive(…)", Some("derive"), Some(r#"derive(${0:Debug})"#)),
-    AttrCompletion {
+    attr(r#"doc = "…""#, Some("doc"), Some(r#"doc = "${0:docs}""#)),
-        label: "cfg_attr(…)",
+    attr("feature(…)", Some("feature"), Some("feature(${0:flag})")).prefer_inner(),
-        snippet: Some("cfg_attr(${1:predicate}, ${0:attr})"),
+    attr("forbid(…)", Some("forbid"), Some("forbid(${0:lint})")),
-        should_be_inner: false,
-        lookup: Some("cfg_attr"),
-    },
-    AttrCompletion {
-        label: "cfg(…)",
-        snippet: Some("cfg(${0:predicate})"),
-        should_be_inner: false,
-        lookup: Some("cfg"),
-    },
-    AttrCompletion {
-        label: "deny(…)",
-        snippet: Some("deny(${0:lint})"),
-        should_be_inner: false,
-        lookup: Some("deny"),
-    },
-    AttrCompletion {
-        label: r#"deprecated = "…""#,
-        snippet: Some(r#"deprecated = "${0:reason}""#),
-        should_be_inner: false,
-        lookup: Some("deprecated"),
-    },
-    AttrCompletion {
-        label: "derive(…)",
-        snippet: Some(r#"derive(${0:Debug})"#),
-        should_be_inner: false,
-        lookup: Some("derive"),
-    },
-    AttrCompletion {
-        label: r#"doc = "…""#,
-        snippet: Some(r#"doc = "${0:docs}""#),
-        should_be_inner: false,
-        lookup: Some("doc"),
-    },
-    AttrCompletion {
-        label: "feature(…)",
-        snippet: Some("feature(${0:flag})"),
-        should_be_inner: true,
-        lookup: Some("feature"),
-    },
-    AttrCompletion {
-        label: "forbid(…)",
-        snippet: Some("forbid(${0:lint})"),
-        should_be_inner: false,
-        lookup: Some("forbid"),
-    },
    // FIXME: resolve through macro resolution?
-    AttrCompletion {
+    attr("global_allocator", None, None).prefer_inner(),
-        label: "global_allocator",
+    attr(r#"ignore = "…""#, Some("ignore"), Some(r#"ignore = "${0:reason}""#)),
-        snippet: None,
+    attr("inline(…)", Some("inline"), Some("inline(${0:lint})")),
-        should_be_inner: true,
+    attr(r#"link_name = "…""#, Some("link_name"), Some(r#"link_name = "${0:symbol_name}""#)),
-        lookup: None,
+    attr("link", None, None),
-    },
+    attr("macro_export", None, None),
-    AttrCompletion {
+    attr("macro_use", None, None),
-        label: "ignore(…)",
+    attr(r#"must_use = "…""#, Some("must_use"), Some(r#"must_use = "${0:reason}""#)),
-        snippet: Some("ignore(${0:lint})"),
+    attr("no_mangle", None, None),
-        should_be_inner: false,
+    attr("no_std", None, None).prefer_inner(),
-        lookup: Some("ignore"),
+    attr("non_exhaustive", None, None),
-    },
+    attr("panic_handler", None, None).prefer_inner(),
-    AttrCompletion {
+    attr("path = \"…\"", Some("path"), Some("path =\"${0:path}\"")),
-        label: "inline(…)",
+    attr("proc_macro", None, None),
-        snippet: Some("inline(${0:lint})"),
+    attr("proc_macro_attribute", None, None),
-        should_be_inner: false,
+    attr("proc_macro_derive(…)", Some("proc_macro_derive"), Some("proc_macro_derive(${0:Trait})")),
-        lookup: Some("inline"),
+    attr("recursion_limit = …", Some("recursion_limit"), Some("recursion_limit = ${0:128}"))
-    },
+        .prefer_inner(),
-    AttrCompletion {
+    attr("repr(…)", Some("repr"), Some("repr(${0:C})")),
-        label: r#"link_name = "…""#,
+    attr(
-        snippet: Some(r#"link_name = "${0:symbol_name}""#),
+        "should_panic(…)",
-        should_be_inner: false,
+        Some("should_panic"),
-        lookup: Some("link_name"),
+        Some(r#"should_panic(expected = "${0:reason}")"#),
-    },
+    ),
-    AttrCompletion { label: "link", snippet: None, should_be_inner: false, lookup: None },
+    attr(
-    AttrCompletion { label: "macro_export", snippet: None, should_be_inner: false, lookup: None },
+        r#"target_feature = "…""#,
-    AttrCompletion { label: "macro_use", snippet: None, should_be_inner: false, lookup: None },
+        Some("target_feature"),
-    AttrCompletion {
+        Some("target_feature = \"${0:feature}\""),
-        label: r#"must_use = "…""#,
+    ),
-        snippet: Some(r#"must_use = "${0:reason}""#),
+    attr("test", None, None),
-        should_be_inner: false,
+    attr("used", None, None),
-        lookup: Some("must_use"),
+    attr("warn(…)", Some("warn"), Some("warn(${0:lint})")),
-    },
+    attr(
-    AttrCompletion { label: "no_mangle", snippet: None, should_be_inner: false, lookup: None },
+        r#"windows_subsystem = "…""#,
-    AttrCompletion { label: "no_std", snippet: None, should_be_inner: true, lookup: None },
+        Some("windows_subsystem"),
-    AttrCompletion { label: "non_exhaustive", snippet: None, should_be_inner: false, lookup: None },
+        Some(r#"windows_subsystem = "${0:subsystem}""#),
-    AttrCompletion { label: "panic_handler", snippet: None, should_be_inner: true, lookup: None },
+    )
-    AttrCompletion {
+    .prefer_inner(),
-        label: "path = \"…\"",
-        snippet: Some("path =\"${0:path}\""),
-        should_be_inner: false,
-        lookup: Some("path"),
-    },
-    AttrCompletion { label: "proc_macro", snippet: None, should_be_inner: false, lookup: None },
-    AttrCompletion {
-        label: "proc_macro_attribute",
-        snippet: None,
-        should_be_inner: false,
-        lookup: None,
-    },
-    AttrCompletion {
-        label: "proc_macro_derive(…)",
-        snippet: Some("proc_macro_derive(${0:Trait})"),
-        should_be_inner: false,
-        lookup: Some("proc_macro_derive"),
-    },
-    AttrCompletion {
-        label: "recursion_limit = …",
-        snippet: Some("recursion_limit = ${0:128}"),
-        should_be_inner: true,
-        lookup: Some("recursion_limit"),
-    },
-    AttrCompletion {
-        label: "repr(…)",
-        snippet: Some("repr(${0:C})"),
-        should_be_inner: false,
-        lookup: Some("repr"),
-    },
-    AttrCompletion {
-        label: "should_panic(…)",
-        snippet: Some(r#"should_panic(expected = "${0:reason}")"#),
-        should_be_inner: false,
-        lookup: Some("should_panic"),
-    },
-    AttrCompletion {
-        label: r#"target_feature = "…""#,
-        snippet: Some("target_feature = \"${0:feature}\""),
-        should_be_inner: false,
-        lookup: Some("target_feature"),
-    },
-    AttrCompletion { label: "test", snippet: None, should_be_inner: false, lookup: None },
-    AttrCompletion { label: "used", snippet: None, should_be_inner: false, lookup: None },
-    AttrCompletion {
-        label: "warn(…)",
-        snippet: Some("warn(${0:lint})"),
-        should_be_inner: false,
-        lookup: Some("warn"),
-    },
-    AttrCompletion {
-        label: r#"windows_subsystem = "…""#,
-        snippet: Some(r#"windows_subsystem = "${0:subsystem}""#),
-        should_be_inner: true,
-        lookup: Some("windows_subsystem"),
-    },
 ];
 fn complete_derive(acc: &mut Completions, ctx: &CompletionContext, derive_input: ast::TokenTree) {
-    if let Ok(existing_derives) = parse_derive_input(derive_input) {
+    if let Ok(existing_derives) = parse_comma_sep_input(derive_input) {
        for derive_completion in DEFAULT_DERIVE_COMPLETIONS
            .into_iter()
            .filter(|completion| !existing_derives.contains(completion.label))
@@ -245,7 +162,26 @@ fn complete_derive(acc: &mut Completions, ctx: &CompletionContext, derive_input:
    }
 }
-fn parse_derive_input(derive_input: ast::TokenTree) -> Result<FxHashSet<String>, ()> {
+fn complete_lint(acc: &mut Completions, ctx: &CompletionContext, derive_input: ast::TokenTree) {
+    if let Ok(existing_lints) = parse_comma_sep_input(derive_input) {
+        for lint_completion in DEFAULT_LINT_COMPLETIONS
+            .into_iter()
+            .filter(|completion| !existing_lints.contains(completion.label))
+        {
+            acc.add(
+                CompletionItem::new(
+                    CompletionKind::Attribute,
+                    ctx.source_range(),
+                    lint_completion.label,
+                )
+                .kind(CompletionItemKind::Attribute)
+                .detail(lint_completion.description),
+            );
+        }
+    }
+}
+fn parse_comma_sep_input(derive_input: ast::TokenTree) -> Result<FxHashSet<String>, ()> {
    match (derive_input.left_delimiter_token(), derive_input.right_delimiter_token()) {
        (Some(left_paren), Some(right_paren))
            if left_paren.kind() == SyntaxKind::L_PAREN
@@ -282,7 +218,7 @@ fn parse_derive_input(derive_input: ast::TokenTree) -> Result<FxHashSet<String>,
 fn get_derive_names_in_scope(ctx: &CompletionContext) -> FxHashSet<String> {
    let mut result = FxHashSet::default();
-    ctx.scope().process_all_names(&mut |name, scope_def| {
+    ctx.scope.process_all_names(&mut |name, scope_def| {
        if let hir::ScopeDef::MacroDef(mac) = scope_def {
            if mac.is_derive_macro() {
                result.insert(name.to_string());
@@ -299,6 +235,7 @@ struct DeriveCompletion {
 /// Standard Rust derives and the information about their dependencies
 /// (the dependencies are needed so that the main derive don't break the compilation when added)
+#[rustfmt::skip]
 const DEFAULT_DERIVE_COMPLETIONS: &[DeriveCompletion] = &[
    DeriveCompletion { label: "Clone", dependencies: &[] },
    DeriveCompletion { label: "Copy", dependencies: &["Clone"] },
@@ -311,679 +248,397 @@ const DEFAULT_DERIVE_COMPLETIONS: &[DeriveCompletion] = &[
    DeriveCompletion { label: "Ord", dependencies: &["PartialOrd", "Eq", "PartialEq"] },
 ];
+struct LintCompletion {
+    label: &'static str,
+    description: &'static str,
+}
+#[rustfmt::skip]
+const DEFAULT_LINT_COMPLETIONS: &[LintCompletion] = &[
+    LintCompletion { label: "absolute_paths_not_starting_with_crate", description: r#"fully qualified paths that start with a module name instead of `crate`, `self`, or an extern crate name"# },
+    LintCompletion { label: "anonymous_parameters", description: r#"detects anonymous parameters"# },
+    LintCompletion { label: "box_pointers", description: r#"use of owned (Box type) heap memory"# },
+    LintCompletion { label: "deprecated_in_future", description: r#"detects use of items that will be deprecated in a future version"# },
+    LintCompletion { label: "elided_lifetimes_in_paths", description: r#"hidden lifetime parameters in types are deprecated"# },
+    LintCompletion { label: "explicit_outlives_requirements", description: r#"outlives requirements can be inferred"# },
+    LintCompletion { label: "indirect_structural_match", description: r#"pattern with const indirectly referencing non-structural-match type"# },
+    LintCompletion { label: "keyword_idents", description: r#"detects edition keywords being used as an identifier"# },
+    LintCompletion { label: "macro_use_extern_crate", description: r#"the `#[macro_use]` attribute is now deprecated in favor of using macros via the module system"# },
+    LintCompletion { label: "meta_variable_misuse", description: r#"possible meta-variable misuse at macro definition"# },
+    LintCompletion { label: "missing_copy_implementations", description: r#"detects potentially-forgotten implementations of `Copy`"# },
+    LintCompletion { label: "missing_crate_level_docs", description: r#"detects crates with no crate-level documentation"# },
+    LintCompletion { label: "missing_debug_implementations", description: r#"detects missing implementations of Debug"# },
+    LintCompletion { label: "missing_docs", description: r#"detects missing documentation for public members"# },
+    LintCompletion { label: "missing_doc_code_examples", description: r#"detects publicly-exported items without code samples in their documentation"# },
+    LintCompletion { label: "non_ascii_idents", description: r#"detects non-ASCII identifiers"# },
+    LintCompletion { label: "private_doc_tests", description: r#"detects code samples in docs of private items not documented by rustdoc"# },
+    LintCompletion { label: "single_use_lifetimes", description: r#"detects lifetime parameters that are only used once"# },
+    LintCompletion { label: "trivial_casts", description: r#"detects trivial casts which could be removed"# },
+    LintCompletion { label: "trivial_numeric_casts", description: r#"detects trivial casts of numeric types which could be removed"# },
+    LintCompletion { label: "unaligned_references", description: r#"detects unaligned references to fields of packed structs"# },
+    LintCompletion { label: "unreachable_pub", description: r#"`pub` items not reachable from crate root"# },
+    LintCompletion { label: "unsafe_code", description: r#"usage of `unsafe` code"# },
+    LintCompletion { label: "unsafe_op_in_unsafe_fn", description: r#"unsafe operations in unsafe functions without an explicit unsafe block are deprecated"# },
+    LintCompletion { label: "unstable_features", description: r#"enabling unstable features (deprecated. do not use)"# },
+    LintCompletion { label: "unused_crate_dependencies", description: r#"crate dependencies that are never used"# },
+    LintCompletion { label: "unused_extern_crates", description: r#"extern crates that are never used"# },
+    LintCompletion { label: "unused_import_braces", description: r#"unnecessary braces around an imported item"# },
+    LintCompletion { label: "unused_lifetimes", description: r#"detects lifetime parameters that are never used"# },
+    LintCompletion { label: "unused_qualifications", description: r#"detects unnecessarily qualified names"# },
+    LintCompletion { label: "unused_results", description: r#"unused result of an expression in a statement"# },
+    LintCompletion { label: "variant_size_differences", description: r#"detects enums with widely varying variant sizes"# },
+    LintCompletion { label: "array_into_iter", description: r#"detects calling `into_iter` on arrays"# },
+    LintCompletion { label: "asm_sub_register", description: r#"using only a subset of a register for inline asm inputs"# },
+    LintCompletion { label: "bare_trait_objects", description: r#"suggest using `dyn Trait` for trait objects"# },
+    LintCompletion { label: "bindings_with_variant_name", description: r#"detects pattern bindings with the same name as one of the matched variants"# },
+    LintCompletion { label: "cenum_impl_drop_cast", description: r#"a C-like enum implementing Drop is cast"# },
+    LintCompletion { label: "clashing_extern_declarations", description: r#"detects when an extern fn has been declared with the same name but different types"# },
+    LintCompletion { label: "coherence_leak_check", description: r#"distinct impls distinguished only by the leak-check code"# },
+    LintCompletion { label: "confusable_idents", description: r#"detects visually confusable pairs between identifiers"# },
+    LintCompletion { label: "dead_code", description: r#"detect unused, unexported items"# },
+    LintCompletion { label: "deprecated", description: r#"detects use of deprecated items"# },
+    LintCompletion { label: "ellipsis_inclusive_range_patterns", description: r#"`...` range patterns are deprecated"# },
+    LintCompletion { label: "exported_private_dependencies", description: r#"public interface leaks type from a private dependency"# },
+    LintCompletion { label: "illegal_floating_point_literal_pattern", description: r#"floating-point literals cannot be used in patterns"# },
+    LintCompletion { label: "improper_ctypes", description: r#"proper use of libc types in foreign modules"# },
+    LintCompletion { label: "improper_ctypes_definitions", description: r#"proper use of libc types in foreign item definitions"# },
+    LintCompletion { label: "incomplete_features", description: r#"incomplete features that may function improperly in some or all cases"# },
+    LintCompletion { label: "inline_no_sanitize", description: r#"detects incompatible use of `#[inline(always)]` and `#[no_sanitize(...)]`"# },
+    LintCompletion { label: "intra_doc_link_resolution_failure", description: r#"failures in resolving intra-doc link targets"# },
+    LintCompletion { label: "invalid_codeblock_attributes", description: r#"codeblock attribute looks a lot like a known one"# },
+    LintCompletion { label: "invalid_value", description: r#"an invalid value is being created (such as a NULL reference)"# },
+    LintCompletion { label: "irrefutable_let_patterns", description: r#"detects irrefutable patterns in if-let and while-let statements"# },
+    LintCompletion { label: "late_bound_lifetime_arguments", description: r#"detects generic lifetime arguments in path segments with late bound lifetime parameters"# },
+    LintCompletion { label: "mixed_script_confusables", description: r#"detects Unicode scripts whose mixed script confusables codepoints are solely used"# },
+    LintCompletion { label: "mutable_borrow_reservation_conflict", description: r#"reservation of a two-phased borrow conflicts with other shared borrows"# },
+    LintCompletion { label: "non_camel_case_types", description: r#"types, variants, traits and type parameters should have camel case names"# },
+    LintCompletion { label: "non_shorthand_field_patterns", description: r#"using `Struct { x: x }` instead of `Struct { x }` in a pattern"# },
+    LintCompletion { label: "non_snake_case", description: r#"variables, methods, functions, lifetime parameters and modules should have snake case names"# },
+    LintCompletion { label: "non_upper_case_globals", description: r#"static constants should have uppercase identifiers"# },
+    LintCompletion { label: "no_mangle_generic_items", description: r#"generic items must be mangled"# },
+    LintCompletion { label: "overlapping_patterns", description: r#"detects overlapping patterns"# },
+    LintCompletion { label: "path_statements", description: r#"path statements with no effect"# },
+    LintCompletion { label: "private_in_public", description: r#"detect private items in public interfaces not caught by the old implementation"# },
+    LintCompletion { label: "proc_macro_derive_resolution_fallback", description: r#"detects proc macro derives using inaccessible names from parent modules"# },
+    LintCompletion { label: "redundant_semicolons", description: r#"detects unnecessary trailing semicolons"# },
+    LintCompletion { label: "renamed_and_removed_lints", description: r#"lints that have been renamed or removed"# },
+    LintCompletion { label: "safe_packed_borrows", description: r#"safe borrows of fields of packed structs were erroneously allowed"# },
+    LintCompletion { label: "stable_features", description: r#"stable features found in `#[feature]` directive"# },
+    LintCompletion { label: "trivial_bounds", description: r#"these bounds don't depend on an type parameters"# },
+    LintCompletion { label: "type_alias_bounds", description: r#"bounds in type aliases are not enforced"# },
+    LintCompletion { label: "tyvar_behind_raw_pointer", description: r#"raw pointer to an inference variable"# },
+    LintCompletion { label: "uncommon_codepoints", description: r#"detects uncommon Unicode codepoints in identifiers"# },
+    LintCompletion { label: "unconditional_recursion", description: r#"functions that cannot return without calling themselves"# },
+    LintCompletion { label: "unknown_lints", description: r#"unrecognized lint attribute"# },
+    LintCompletion { label: "unnameable_test_items", description: r#"detects an item that cannot be named being marked as `#[test_case]`"# },
+    LintCompletion { label: "unreachable_code", description: r#"detects unreachable code paths"# },
+    LintCompletion { label: "unreachable_patterns", description: r#"detects unreachable patterns"# },
+    LintCompletion { label: "unstable_name_collisions", description: r#"detects name collision with an existing but unstable method"# },
+    LintCompletion { label: "unused_allocation", description: r#"detects unnecessary allocations that can be eliminated"# },
+    LintCompletion { label: "unused_assignments", description: r#"detect assignments that will never be read"# },
+    LintCompletion { label: "unused_attributes", description: r#"detects attributes that were not used by the compiler"# },
+    LintCompletion { label: "unused_braces", description: r#"unnecessary braces around an expression"# },
+    LintCompletion { label: "unused_comparisons", description: r#"comparisons made useless by limits of the types involved"# },
+    LintCompletion { label: "unused_doc_comments", description: r#"detects doc comments that aren't used by rustdoc"# },
+    LintCompletion { label: "unused_features", description: r#"unused features found in crate-level `#[feature]` directives"# },
+    LintCompletion { label: "unused_imports", description: r#"imports that are never used"# },
+    LintCompletion { label: "unused_labels", description: r#"detects labels that are never used"# },
+    LintCompletion { label: "unused_macros", description: r#"detects macros that were not used"# },
+    LintCompletion { label: "unused_must_use", description: r#"unused result of a type flagged as `#[must_use]`"# },
+    LintCompletion { label: "unused_mut", description: r#"detect mut variables which don't need to be mutable"# },
+    LintCompletion { label: "unused_parens", description: r#"`if`, `match`, `while` and `return` do not need parentheses"# },
+    LintCompletion { label: "unused_unsafe", description: r#"unnecessary use of an `unsafe` block"# },
+    LintCompletion { label: "unused_variables", description: r#"detect variables which are not used in any way"# },
+    LintCompletion { label: "warnings", description: r#"mass-change the level for lints which produce warnings"# },
+    LintCompletion { label: "where_clauses_object_safety", description: r#"checks the object safety of where clauses"# },
+    LintCompletion { label: "while_true", description: r#"suggest using `loop { }` instead of `while true { }`"# },
+    LintCompletion { label: "ambiguous_associated_items", description: r#"ambiguous associated items"# },
+    LintCompletion { label: "arithmetic_overflow", description: r#"arithmetic operation overflows"# },
+    LintCompletion { label: "conflicting_repr_hints", description: r#"conflicts between `#[repr(..)]` hints that were previously accepted and used in practice"# },
+    LintCompletion { label: "const_err", description: r#"constant evaluation detected erroneous expression"# },
+    LintCompletion { label: "ill_formed_attribute_input", description: r#"ill-formed attribute inputs that were previously accepted and used in practice"# },
+    LintCompletion { label: "incomplete_include", description: r#"trailing content in included file"# },
+    LintCompletion { label: "invalid_type_param_default", description: r#"type parameter default erroneously allowed in invalid location"# },
+    LintCompletion { label: "macro_expanded_macro_exports_accessed_by_absolute_paths", description: r#"macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths"# },
+    LintCompletion { label: "missing_fragment_specifier", description: r#"detects missing fragment specifiers in unused `macro_rules!` patterns"# },
+    LintCompletion { label: "mutable_transmutes", description: r#"mutating transmuted &mut T from &T may cause undefined behavior"# },
+    LintCompletion { label: "no_mangle_const_items", description: r#"const items will not have their symbols exported"# },
+    LintCompletion { label: "order_dependent_trait_objects", description: r#"trait-object types were treated as different depending on marker-trait order"# },
+    LintCompletion { label: "overflowing_literals", description: r#"literal out of range for its type"# },
+    LintCompletion { label: "patterns_in_fns_without_body", description: r#"patterns in functions without body were erroneously allowed"# },
+    LintCompletion { label: "pub_use_of_private_extern_crate", description: r#"detect public re-exports of private extern crates"# },
+    LintCompletion { label: "soft_unstable", description: r#"a feature gate that doesn't break dependent crates"# },
+    LintCompletion { label: "unconditional_panic", description: r#"operation will cause a panic at runtime"# },
+    LintCompletion { label: "unknown_crate_types", description: r#"unknown crate type found in `#[crate_type]` directive"# },
+];
 #[cfg(test)]
 mod tests {
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use expect::{expect, Expect};
-    use insta::assert_debug_snapshot;
-    fn do_attr_completion(code: &str) -> Vec<CompletionItem> {
+    use crate::completion::{test_utils::completion_list, CompletionKind};
-        do_completion(code, CompletionKind::Attribute)
+    fn check(ra_fixture: &str, expect: Expect) {
+        let actual = completion_list(ra_fixture, CompletionKind::Attribute);
+        expect.assert_eq(&actual);
    }
    #[test]
    fn empty_derive_completion() {
-        assert_debug_snapshot!(
+        check(
-            do_attr_completion(
+            r#"
-                    r"
+#[derive(<|>)]
-                    #[derive(<|>)]
+struct Test {}
-                    struct Test {}
+        "#,
-                    ",
+            expect![[r#"
-            ),
+                at Clone
-            @r###"
+                at Copy, Clone
-        [
+                at Debug
-            CompletionItem {
+                at Default
-                label: "Clone",
+                at Eq, PartialEq
-                source_range: 9..9,
+                at Hash
-                delete: 9..9,
+                at Ord, PartialOrd, Eq, PartialEq
-                insert: "Clone",
+                at PartialEq
-                kind: Attribute,
+                at PartialOrd, PartialEq
-            },
+            "#]],
-            CompletionItem {
-                label: "Copy, Clone",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "Copy, Clone",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Debug",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "Debug",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Default",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "Default",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Eq, PartialEq",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "Eq, PartialEq",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Hash",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "Hash",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Ord, PartialOrd, Eq, PartialEq",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "Ord, PartialOrd, Eq, PartialEq",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "PartialEq",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "PartialEq",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "PartialOrd, PartialEq",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "PartialOrd, PartialEq",
-                kind: Attribute,
-            },
-        ]
-        "###
        );
    }
    #[test]
+    fn empty_lint_completion() {
+        check(
+            r#"#[allow(<|>)]"#,
+            expect![[r#"
+                at absolute_paths_not_starting_with_crate fully qualified paths that start with a module name instead of `crate`, `self`, or an extern crate name
+                at ambiguous_associated_items ambiguous associated items
+                at anonymous_parameters detects anonymous parameters
+                at arithmetic_overflow arithmetic operation overflows
+                at array_into_iter  detects calling `into_iter` on arrays
+                at asm_sub_register using only a subset of a register for inline asm inputs
+                at bare_trait_objects suggest using `dyn Trait` for trait objects
+                at bindings_with_variant_name detects pattern bindings with the same name as one of the matched variants
+                at box_pointers     use of owned (Box type) heap memory
+                at cenum_impl_drop_cast a C-like enum implementing Drop is cast
+                at clashing_extern_declarations detects when an extern fn has been declared with the same name but different types
+                at coherence_leak_check distinct impls distinguished only by the leak-check code
+                at conflicting_repr_hints conflicts between `#[repr(..)]` hints that were previously accepted and used in practice
+                at confusable_idents detects visually confusable pairs between identifiers
+                at const_err        constant evaluation detected erroneous expression
+                at dead_code        detect unused, unexported items
+                at deprecated       detects use of deprecated items
+                at deprecated_in_future detects use of items that will be deprecated in a future version
+                at elided_lifetimes_in_paths hidden lifetime parameters in types are deprecated
+                at ellipsis_inclusive_range_patterns `...` range patterns are deprecated
+                at explicit_outlives_requirements outlives requirements can be inferred
+                at exported_private_dependencies public interface leaks type from a private dependency
+                at ill_formed_attribute_input ill-formed attribute inputs that were previously accepted and used in practice
+                at illegal_floating_point_literal_pattern floating-point literals cannot be used in patterns
+                at improper_ctypes  proper use of libc types in foreign modules
+                at improper_ctypes_definitions proper use of libc types in foreign item definitions
+                at incomplete_features incomplete features that may function improperly in some or all cases
+                at incomplete_include trailing content in included file
+                at indirect_structural_match pattern with const indirectly referencing non-structural-match type
+                at inline_no_sanitize detects incompatible use of `#[inline(always)]` and `#[no_sanitize(...)]`
+                at intra_doc_link_resolution_failure failures in resolving intra-doc link targets
+                at invalid_codeblock_attributes codeblock attribute looks a lot like a known one
+                at invalid_type_param_default type parameter default erroneously allowed in invalid location
+                at invalid_value    an invalid value is being created (such as a NULL reference)
+                at irrefutable_let_patterns detects irrefutable patterns in if-let and while-let statements
+                at keyword_idents   detects edition keywords being used as an identifier
+                at late_bound_lifetime_arguments detects generic lifetime arguments in path segments with late bound lifetime parameters
+                at macro_expanded_macro_exports_accessed_by_absolute_paths macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths
+                at macro_use_extern_crate the `#[macro_use]` attribute is now deprecated in favor of using macros via the module system
+                at meta_variable_misuse possible meta-variable misuse at macro definition
+                at missing_copy_implementations detects potentially-forgotten implementations of `Copy`
+                at missing_crate_level_docs detects crates with no crate-level documentation
+                at missing_debug_implementations detects missing implementations of Debug
+                at missing_doc_code_examples detects publicly-exported items without code samples in their documentation
+                at missing_docs     detects missing documentation for public members
+                at missing_fragment_specifier detects missing fragment specifiers in unused `macro_rules!` patterns
+                at mixed_script_confusables detects Unicode scripts whose mixed script confusables codepoints are solely used
+                at mutable_borrow_reservation_conflict reservation of a two-phased borrow conflicts with other shared borrows
+                at mutable_transmutes mutating transmuted &mut T from &T may cause undefined behavior
+                at no_mangle_const_items const items will not have their symbols exported
+                at no_mangle_generic_items generic items must be mangled
+                at non_ascii_idents detects non-ASCII identifiers
+                at non_camel_case_types types, variants, traits and type parameters should have camel case names
+                at non_shorthand_field_patterns using `Struct { x: x }` instead of `Struct { x }` in a pattern
+                at non_snake_case   variables, methods, functions, lifetime parameters and modules should have snake case names
+                at non_upper_case_globals static constants should have uppercase identifiers
+                at order_dependent_trait_objects trait-object types were treated as different depending on marker-trait order
+                at overflowing_literals literal out of range for its type
+                at overlapping_patterns detects overlapping patterns
+                at path_statements  path statements with no effect
+                at patterns_in_fns_without_body patterns in functions without body were erroneously allowed
+                at private_doc_tests detects code samples in docs of private items not documented by rustdoc
+                at private_in_public detect private items in public interfaces not caught by the old implementation
+                at proc_macro_derive_resolution_fallback detects proc macro derives using inaccessible names from parent modules
+                at pub_use_of_private_extern_crate detect public re-exports of private extern crates
+                at redundant_semicolons detects unnecessary trailing semicolons
+                at renamed_and_removed_lints lints that have been renamed or removed
+                at safe_packed_borrows safe borrows of fields of packed structs were erroneously allowed
+                at single_use_lifetimes detects lifetime parameters that are only used once
+                at soft_unstable    a feature gate that doesn't break dependent crates
+                at stable_features  stable features found in `#[feature]` directive
+                at trivial_bounds   these bounds don't depend on an type parameters
+                at trivial_casts    detects trivial casts which could be removed
+                at trivial_numeric_casts detects trivial casts of numeric types which could be removed
+                at type_alias_bounds bounds in type aliases are not enforced
+                at tyvar_behind_raw_pointer raw pointer to an inference variable
+                at unaligned_references detects unaligned references to fields of packed structs
+                at uncommon_codepoints detects uncommon Unicode codepoints in identifiers
+                at unconditional_panic operation will cause a panic at runtime
+                at unconditional_recursion functions that cannot return without calling themselves
+                at unknown_crate_types unknown crate type found in `#[crate_type]` directive
+                at unknown_lints    unrecognized lint attribute
+                at unnameable_test_items detects an item that cannot be named being marked as `#[test_case]`
+                at unreachable_code detects unreachable code paths
+                at unreachable_patterns detects unreachable patterns
+                at unreachable_pub  `pub` items not reachable from crate root
+                at unsafe_code      usage of `unsafe` code
+                at unsafe_op_in_unsafe_fn unsafe operations in unsafe functions without an explicit unsafe block are deprecated
+                at unstable_features enabling unstable features (deprecated. do not use)
+                at unstable_name_collisions detects name collision with an existing but unstable method
+                at unused_allocation detects unnecessary allocations that can be eliminated
+                at unused_assignments detect assignments that will never be read
+                at unused_attributes detects attributes that were not used by the compiler
+                at unused_braces    unnecessary braces around an expression
+                at unused_comparisons comparisons made useless by limits of the types involved
+                at unused_crate_dependencies crate dependencies that are never used
+                at unused_doc_comments detects doc comments that aren't used by rustdoc
+                at unused_extern_crates extern crates that are never used
+                at unused_features  unused features found in crate-level `#[feature]` directives
+                at unused_import_braces unnecessary braces around an imported item
+                at unused_imports   imports that are never used
+                at unused_labels    detects labels that are never used
+                at unused_lifetimes detects lifetime parameters that are never used
+                at unused_macros    detects macros that were not used
+                at unused_must_use  unused result of a type flagged as `#[must_use]`
+                at unused_mut       detect mut variables which don't need to be mutable
+                at unused_parens    `if`, `match`, `while` and `return` do not need parentheses
+                at unused_qualifications detects unnecessarily qualified names
+                at unused_results   unused result of an expression in a statement
+                at unused_unsafe    unnecessary use of an `unsafe` block
+                at unused_variables detect variables which are not used in any way
+                at variant_size_differences detects enums with widely varying variant sizes
+                at warnings         mass-change the level for lints which produce warnings
+                at where_clauses_object_safety checks the object safety of where clauses
+                at while_true       suggest using `loop { }` instead of `while true { }`
+        "#]],
+        )
+    }
+    #[test]
    fn no_completion_for_incorrect_derive() {
-        assert_debug_snapshot!(
+        check(
-            do_attr_completion(
+            r#"
-                r"
+#[derive{<|>)]
-                    #[derive{<|>)]
+struct Test {}
-                    struct Test {}
+"#,
-                    ",
+            expect![[r#""#]],
-            ),
+        )
-            @"[]"
-        );
    }
    #[test]
    fn derive_with_input_completion() {
-        assert_debug_snapshot!(
+        check(
-            do_attr_completion(
+            r#"
-                    r"
+#[derive(serde::Serialize, PartialEq, <|>)]
-                    #[derive(serde::Serialize, PartialEq, <|>)]
+struct Test {}
-                    struct Test {}
+"#,
-                    ",
+            expect![[r#"
-            ),
+                at Clone
-            @r###"
+                at Copy, Clone
-        [
+                at Debug
-            CompletionItem {
+                at Default
-                label: "Clone",
+                at Eq
-                source_range: 38..38,
+                at Hash
-                delete: 38..38,
+                at Ord, PartialOrd, Eq
-                insert: "Clone",
+                at PartialOrd
-                kind: Attribute,
+            "#]],
-            },
+        )
-            CompletionItem {
-                label: "Copy, Clone",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "Copy, Clone",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Debug",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "Debug",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Default",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "Default",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Eq",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "Eq",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Hash",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "Hash",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "Ord, PartialOrd, Eq",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "Ord, PartialOrd, Eq",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "PartialOrd",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "PartialOrd",
-                kind: Attribute,
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn test_attribute_completion() {
-        assert_debug_snapshot!(
+        check(
-        do_attr_completion(
+            r#"#[<|>]"#,
-                r"
+            expect![[r#"
-                #[<|>]
+                at allow(…)
-                ",
+                at cfg(…)
-        ),
+                at cfg_attr(…)
-            @r###"
+                at deny(…)
-        [
+                at deprecated = "…"
-            CompletionItem {
+                at derive(…)
-                label: "allow(…)",
+                at doc = "…"
-                source_range: 2..2,
+                at forbid(…)
-                delete: 2..2,
+                at ignore = "…"
-                insert: "allow(${0:lint})",
+                at inline(…)
-                kind: Attribute,
+                at link
-                lookup: "allow",
+                at link_name = "…"
-            },
+                at macro_export
-            CompletionItem {
+                at macro_use
-                label: "cfg(…)",
+                at must_use = "…"
-                source_range: 2..2,
+                at no_mangle
-                delete: 2..2,
+                at non_exhaustive
-                insert: "cfg(${0:predicate})",
+                at path = "…"
-                kind: Attribute,
+                at proc_macro
-                lookup: "cfg",
+                at proc_macro_attribute
-            },
+                at proc_macro_derive(…)
-            CompletionItem {
+                at repr(…)
-                label: "cfg_attr(…)",
+                at should_panic(…)
-                source_range: 2..2,
+                at target_feature = "…"
-                delete: 2..2,
+                at test
-                insert: "cfg_attr(${1:predicate}, ${0:attr})",
+                at used
-                kind: Attribute,
+                at warn(…)
-                lookup: "cfg_attr",
+            "#]],
-            },
+        )
-            CompletionItem {
-                label: "deny(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "deny(${0:lint})",
-                kind: Attribute,
-                lookup: "deny",
-            },
-            CompletionItem {
-                label: "deprecated = \"…\"",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "deprecated = \"${0:reason}\"",
-                kind: Attribute,
-                lookup: "deprecated",
-            },
-            CompletionItem {
-                label: "derive(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "derive(${0:Debug})",
-                kind: Attribute,
-                lookup: "derive",
-            },
-            CompletionItem {
-                label: "doc = \"…\"",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "doc = \"${0:docs}\"",
-                kind: Attribute,
-                lookup: "doc",
-            },
-            CompletionItem {
-                label: "forbid(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "forbid(${0:lint})",
-                kind: Attribute,
-                lookup: "forbid",
-            },
-            CompletionItem {
-                label: "ignore(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "ignore(${0:lint})",
-                kind: Attribute,
-                lookup: "ignore",
-            },
-            CompletionItem {
-                label: "inline(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "inline(${0:lint})",
-                kind: Attribute,
-                lookup: "inline",
-            },
-            CompletionItem {
-                label: "link",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "link",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "link_name = \"…\"",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "link_name = \"${0:symbol_name}\"",
-                kind: Attribute,
-                lookup: "link_name",
-            },
-            CompletionItem {
-                label: "macro_export",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "macro_export",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "macro_use",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "macro_use",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "must_use = \"…\"",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "must_use = \"${0:reason}\"",
-                kind: Attribute,
-                lookup: "must_use",
-            },
-            CompletionItem {
-                label: "no_mangle",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "no_mangle",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "non_exhaustive",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "non_exhaustive",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "path = \"…\"",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "path =\"${0:path}\"",
-                kind: Attribute,
-                lookup: "path",
-            },
-            CompletionItem {
-                label: "proc_macro",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "proc_macro",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "proc_macro_attribute",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "proc_macro_attribute",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "proc_macro_derive(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "proc_macro_derive(${0:Trait})",
-                kind: Attribute,
-                lookup: "proc_macro_derive",
-            },
-            CompletionItem {
-                label: "repr(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "repr(${0:C})",
-                kind: Attribute,
-                lookup: "repr",
-            },
-            CompletionItem {
-                label: "should_panic(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "should_panic(expected = \"${0:reason}\")",
-                kind: Attribute,
-                lookup: "should_panic",
-            },
-            CompletionItem {
-                label: "target_feature = \"…\"",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "target_feature = \"${0:feature}\"",
-                kind: Attribute,
-                lookup: "target_feature",
-            },
-            CompletionItem {
-                label: "test",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "test",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "used",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "used",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "warn(…)",
-                source_range: 2..2,
-                delete: 2..2,
-                insert: "warn(${0:lint})",
-                kind: Attribute,
-                lookup: "warn",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn test_attribute_completion_inside_nested_attr() {
-        assert_debug_snapshot!(
+        check(r#"#[cfg(<|>)]"#, expect![[]])
-        do_attr_completion(
-                r"
-                #[allow(<|>)]
-                ",
-        ),
-            @r###"
-        []
-        "###
-        );
    }
    #[test]
    fn test_inner_attribute_completion() {
-        assert_debug_snapshot!(
+        check(
-        do_attr_completion(
+            r"#![<|>]",
-                r"
+            expect![[r#"
-                #![<|>]
+                at allow(…)
-                ",
+                at cfg(…)
-        ),
+                at cfg_attr(…)
-            @r###"
+                at deny(…)
-        [
+                at deprecated = "…"
-            CompletionItem {
+                at derive(…)
-                label: "allow(…)",
+                at doc = "…"
-                source_range: 3..3,
+                at feature(…)
-                delete: 3..3,
+                at forbid(…)
-                insert: "allow(${0:lint})",
+                at global_allocator
-                kind: Attribute,
+                at ignore = "…"
-                lookup: "allow",
+                at inline(…)
-            },
+                at link
-            CompletionItem {
+                at link_name = "…"
-                label: "cfg(…)",
+                at macro_export
-                source_range: 3..3,
+                at macro_use
-                delete: 3..3,
+                at must_use = "…"
-                insert: "cfg(${0:predicate})",
+                at no_mangle
-                kind: Attribute,
+                at no_std
-                lookup: "cfg",
+                at non_exhaustive
-            },
+                at panic_handler
-            CompletionItem {
+                at path = "…"
-                label: "cfg_attr(…)",
+                at proc_macro
-                source_range: 3..3,
+                at proc_macro_attribute
-                delete: 3..3,
+                at proc_macro_derive(…)
-                insert: "cfg_attr(${1:predicate}, ${0:attr})",
+                at recursion_limit = …
-                kind: Attribute,
+                at repr(…)
-                lookup: "cfg_attr",
+                at should_panic(…)
-            },
+                at target_feature = "…"
-            CompletionItem {
+                at test
-                label: "deny(…)",
+                at used
-                source_range: 3..3,
+                at warn(…)
-                delete: 3..3,
+                at windows_subsystem = "…"
-                insert: "deny(${0:lint})",
+            "#]],
-                kind: Attribute,
-                lookup: "deny",
-            },
-            CompletionItem {
-                label: "deprecated = \"…\"",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "deprecated = \"${0:reason}\"",
-                kind: Attribute,
-                lookup: "deprecated",
-            },
-            CompletionItem {
-                label: "derive(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "derive(${0:Debug})",
-                kind: Attribute,
-                lookup: "derive",
-            },
-            CompletionItem {
-                label: "doc = \"…\"",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "doc = \"${0:docs}\"",
-                kind: Attribute,
-                lookup: "doc",
-            },
-            CompletionItem {
-                label: "feature(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "feature(${0:flag})",
-                kind: Attribute,
-                lookup: "feature",
-            },
-            CompletionItem {
-                label: "forbid(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "forbid(${0:lint})",
-                kind: Attribute,
-                lookup: "forbid",
-            },
-            CompletionItem {
-                label: "global_allocator",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "global_allocator",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "ignore(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "ignore(${0:lint})",
-                kind: Attribute,
-                lookup: "ignore",
-            },
-            CompletionItem {
-                label: "inline(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "inline(${0:lint})",
-                kind: Attribute,
-                lookup: "inline",
-            },
-            CompletionItem {
-                label: "link",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "link",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "link_name = \"…\"",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "link_name = \"${0:symbol_name}\"",
-                kind: Attribute,
-                lookup: "link_name",
-            },
-            CompletionItem {
-                label: "macro_export",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "macro_export",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "macro_use",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "macro_use",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "must_use = \"…\"",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "must_use = \"${0:reason}\"",
-                kind: Attribute,
-                lookup: "must_use",
-            },
-            CompletionItem {
-                label: "no_mangle",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "no_mangle",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "no_std",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "no_std",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "non_exhaustive",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "non_exhaustive",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "panic_handler",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "panic_handler",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "path = \"…\"",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "path =\"${0:path}\"",
-                kind: Attribute,
-                lookup: "path",
-            },
-            CompletionItem {
-                label: "proc_macro",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "proc_macro",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "proc_macro_attribute",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "proc_macro_attribute",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "proc_macro_derive(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "proc_macro_derive(${0:Trait})",
-                kind: Attribute,
-                lookup: "proc_macro_derive",
-            },
-            CompletionItem {
-                label: "recursion_limit = …",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "recursion_limit = ${0:128}",
-                kind: Attribute,
-                lookup: "recursion_limit",
-            },
-            CompletionItem {
-                label: "repr(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "repr(${0:C})",
-                kind: Attribute,
-                lookup: "repr",
-            },
-            CompletionItem {
-                label: "should_panic(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "should_panic(expected = \"${0:reason}\")",
-                kind: Attribute,
-                lookup: "should_panic",
-            },
-            CompletionItem {
-                label: "target_feature = \"…\"",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "target_feature = \"${0:feature}\"",
-                kind: Attribute,
-                lookup: "target_feature",
-            },
-            CompletionItem {
-                label: "test",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "test",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "used",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "used",
-                kind: Attribute,
-            },
-            CompletionItem {
-                label: "warn(…)",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "warn(${0:lint})",
-                kind: Attribute,
-                lookup: "warn",
-            },
-            CompletionItem {
-                label: "windows_subsystem = \"…\"",
-                source_range: 3..3,
-                delete: 3..3,
-                insert: "windows_subsystem = \"${0:subsystem}\"",
-                kind: Attribute,
-                lookup: "windows_subsystem",
-            },
-        ]
-        "###
        );
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_dot.rs b/crates/ra_ide/src/completion/complete_dot.rs
index ee4e24fca..532665285 100644
--- a/crates/ra_ide/src/completion/complete_dot.rs
+++ b/crates/ra_ide/src/completion/complete_dot.rs
@@ -1,17 +1,12 @@
-//! FIXME: write short doc here
+//! Completes references after dot (fields and method calls).
 use hir::{HasVisibility, Type};
-use crate::{
-    completion::{
-        completion_context::CompletionContext,
-        completion_item::{CompletionKind, Completions},
-    },
-    CompletionItem,
-};
 use rustc_hash::FxHashSet;
+use test_utils::mark;
-/// Complete dot accesses, i.e. fields or methods (and .await syntax).
+use crate::completion::{completion_context::CompletionContext, completion_item::Completions};
+/// Complete dot accesses, i.e. fields or methods.
 pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
    let dot_receiver = match &ctx.dot_receiver {
        Some(expr) => expr,
@@ -23,24 +18,18 @@ pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
        _ => return,
    };
-    if !ctx.is_call {
+    if ctx.is_call {
+        mark::hit!(test_no_struct_field_completion_for_method_call);
+    } else {
        complete_fields(acc, ctx, &receiver_ty);
    }
    complete_methods(acc, ctx, &receiver_ty);
-    // Suggest .await syntax for types that implement Future trait
-    if receiver_ty.impls_future(ctx.db) {
-        CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await")
-            .detail("expr.await")
-            .insert_text("await")
-            .add_to(acc);
-    }
 }
 fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: &Type) {
    for receiver in receiver.autoderef(ctx.db) {
        for (field, ty) in receiver.fields(ctx.db) {
-            if ctx.scope().module().map_or(false, |m| !field.is_visible_from(ctx.db, m)) {
+            if ctx.scope.module().map_or(false, |m| !field.is_visible_from(ctx.db, m)) {
                // Skip private field. FIXME: If the definition location of the
                // field is editable, we should show the completion
                continue;
@@ -57,10 +46,10 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: &Ty
 fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: &Type) {
    if let Some(krate) = ctx.krate {
        let mut seen_methods = FxHashSet::default();
-        let traits_in_scope = ctx.scope().traits_in_scope();
+        let traits_in_scope = ctx.scope.traits_in_scope();
        receiver.iterate_method_candidates(ctx.db, krate, &traits_in_scope, None, |_ty, func| {
            if func.has_self_param(ctx.db)
-                && ctx.scope().module().map_or(true, |m| func.is_visible_from(ctx.db, m))
+                && ctx.scope.module().map_or(true, |m| func.is_visible_from(ctx.db, m))
                && seen_methods.insert(func.name(ctx.db))
            {
                acc.add_function(ctx, func, None);
@@ -72,801 +61,356 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: &T
 #[cfg(test)]
 mod tests {
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use expect::{expect, Expect};
-    use insta::assert_debug_snapshot;
+    use test_utils::mark;
+    use crate::completion::{test_utils::completion_list, CompletionKind};
-    fn do_ref_completion(code: &str) -> Vec<CompletionItem> {
+    fn check(ra_fixture: &str, expect: Expect) {
-        do_completion(code, CompletionKind::Reference)
+        let actual = completion_list(ra_fixture, CompletionKind::Reference);
+        expect.assert_eq(&actual);
    }
    #[test]
-    fn test_struct_field_completion() {
+    fn test_struct_field_and_method_completion() {
-        assert_debug_snapshot!(
+        check(
-        do_ref_completion(
+            r#"
-                r"
+struct S { foo: u32 }
-                struct A { the_field: u32 }
+impl S {
-                fn foo(a: A) {
+    fn bar(&self) {}
-                a.<|>
+}
-                }
+fn foo(s: S) { s.<|> }
-                ",
+"#,
-        ),
+            expect![[r#"
-            @r###"
+                me bar() fn bar(&self)
-        [
+                fd foo   u32
-            CompletionItem {
+            "#]],
-                label: "the_field",
-                source_range: 45..45,
-                delete: 45..45,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn test_struct_field_completion_self() {
-        assert_debug_snapshot!(
+        check(
-        do_ref_completion(
+            r#"
-            r"
+struct S { the_field: (u32,) }
-            struct A {
+impl S {
-                /// This is the_field
+    fn foo(self) { self.<|> }
-                the_field: (u32,)
+}
-            }
+"#,
-            impl A {
+            expect![[r#"
-                fn foo(self) {
+                me foo()     fn foo(self)
-                    self.<|>
+                fd the_field (u32,)
-                }
+            "#]],
-            }
+        )
-            ",
-        ),
-        @r###"
-        [
-            CompletionItem {
-                label: "foo()",
-                source_range: 102..102,
-                delete: 102..102,
-                insert: "foo()$0",
-                kind: Method,
-                lookup: "foo",
-                detail: "fn foo(self)",
-            },
-            CompletionItem {
-                label: "the_field",
-                source_range: 102..102,
-                delete: 102..102,
-                insert: "the_field",
-                kind: Field,
-                detail: "(u32,)",
-                documentation: Documentation(
-                    "This is the_field",
-                ),
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn test_struct_field_completion_autoderef() {
-        assert_debug_snapshot!(
+        check(
-        do_ref_completion(
+            r#"
-            r"
+struct A { the_field: (u32, i32) }
-            struct A { the_field: (u32, i32) }
+impl A {
-            impl A {
+    fn foo(&self) { self.<|> }
-                fn foo(&self) {
+}
-                    self.<|>
+"#,
-                }
+            expect![[r#"
-            }
+                me foo()     fn foo(&self)
-            ",
+                fd the_field (u32, i32)
-        ),
+            "#]],
-        @r###"
+        )
-        [
-            CompletionItem {
-                label: "foo()",
-                source_range: 77..77,
-                delete: 77..77,
-                insert: "foo()$0",
-                kind: Method,
-                lookup: "foo",
-                detail: "fn foo(&self)",
-            },
-            CompletionItem {
-                label: "the_field",
-                source_range: 77..77,
-                delete: 77..77,
-                insert: "the_field",
-                kind: Field,
-                detail: "(u32, i32)",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn test_no_struct_field_completion_for_method_call() {
-        assert_debug_snapshot!(
+        mark::check!(test_no_struct_field_completion_for_method_call);
-        do_ref_completion(
+        check(
-            r"
+            r#"
-            struct A { the_field: u32 }
+struct A { the_field: u32 }
-            fn foo(a: A) {
+fn foo(a: A) { a.<|>() }
-               a.<|>()
+"#,
-            }
+            expect![[""]],
-            ",
-        ),
-        @"[]"
        );
    }
    #[test]
-    fn test_struct_field_visibility_private() {
+    fn test_visibility_filtering() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+mod inner {
-            mod inner {
+    pub struct A {
-                struct A {
+        private_field: u32,
-                    private_field: u32,
+        pub pub_field: u32,
-                    pub pub_field: u32,
+        pub(crate) crate_field: u32,
-                    pub(crate) crate_field: u32,
+        pub(super) super_field: u32,
-                    pub(super) super_field: u32,
-                }
-            }
-            fn foo(a: inner::A) {
-               a.<|>
-            }
-            ",
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "crate_field",
-                source_range: 192..192,
-                delete: 192..192,
-                insert: "crate_field",
-                kind: Field,
-                detail: "u32",
-            },
-            CompletionItem {
-                label: "pub_field",
-                source_range: 192..192,
-                delete: 192..192,
-                insert: "pub_field",
-                kind: Field,
-                detail: "u32",
-            },
-            CompletionItem {
-                label: "super_field",
-                source_range: 192..192,
-                delete: 192..192,
-                insert: "super_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
-        );
    }
+}
-    #[test]
+fn foo(a: inner::A) { a.<|> }
-    fn test_union_field_completion() {
+"#,
-        assert_debug_snapshot!(
+            expect![[r#"
-            do_ref_completion(
+                fd crate_field u32
-                r"
+                fd pub_field   u32
-            union Un {
+                fd super_field u32
-                field: u8,
+            "#]],
-                other: u16,
-            }
-            fn foo(u: Un) {
-                u.<|>
-            }
-            ",
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "field",
-                source_range: 67..67,
-                delete: 67..67,
-                insert: "field",
-                kind: Field,
-                detail: "u8",
-            },
-            CompletionItem {
-                label: "other",
-                source_range: 67..67,
-                delete: 67..67,
-                insert: "other",
-                kind: Field,
-                detail: "u16",
-            },
-        ]
-        "###
        );
-    }
-    #[test]
+        check(
-    fn test_method_completion() {
+            r#"
-        assert_debug_snapshot!(
+struct A {}
-        do_ref_completion(
+mod m {
-            r"
+    impl super::A {
-            struct A {}
+        fn private_method(&self) {}
-            impl A {
+        pub(super) fn the_method(&self) {}
-                fn the_method(&self) {}
+    }
-            }
+}
-            fn foo(a: A) {
+fn foo(a: A) { a.<|> }
-               a.<|>
+"#,
-            }
+            expect![[r#"
-            ",
+                me the_method() pub(super) fn the_method(&self)
-        ),
+            "#]],
-        @r###"
-        [
-            CompletionItem {
-                label: "the_method()",
-                source_range: 71..71,
-                delete: 71..71,
-                insert: "the_method()$0",
-                kind: Method,
-                lookup: "the_method",
-                detail: "fn the_method(&self)",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn test_method_completion_only_fitting_impls() {
+    fn test_union_field_completion() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+union U { field: u8, other: u16 }
-            struct A<T> {}
+fn foo(u: U) { u.<|> }
-            impl A<u32> {
+"#,
-                fn the_method(&self) {}
+            expect![[r#"
-            }
+                fd field u8
-            impl A<i32> {
+                fd other u16
-                fn the_other_method(&self) {}
+            "#]],
-            }
-            fn foo(a: A<u32>) {
-               a.<|>
-            }
-            ",
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "the_method()",
-                source_range: 134..134,
-                delete: 134..134,
-                insert: "the_method()$0",
-                kind: Method,
-                lookup: "the_method",
-                detail: "fn the_method(&self)",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn test_method_completion_private() {
+    fn test_method_completion_only_fitting_impls() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+struct A<T> {}
-            struct A {}
+impl A<u32> {
-            mod m {
+    fn the_method(&self) {}
-                impl super::A {
+}
-                    fn private_method(&self) {}
+impl A<i32> {
-                    pub(super) fn the_method(&self) {}
+    fn the_other_method(&self) {}
-                }
+}
-            }
+fn foo(a: A<u32>) { a.<|> }
-            fn foo(a: A) {
+"#,
-               a.<|>
+            expect![[r#"
-            }
+                me the_method() fn the_method(&self)
-            ",
+            "#]],
-            ),
+        )
-            @r###"
-        [
-            CompletionItem {
-                label: "the_method()",
-                source_range: 147..147,
-                delete: 147..147,
-                insert: "the_method()$0",
-                kind: Method,
-                lookup: "the_method",
-                detail: "pub(super) fn the_method(&self)",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn test_trait_method_completion() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+struct A {}
-            struct A {}
+trait Trait { fn the_method(&self); }
-            trait Trait { fn the_method(&self); }
+impl Trait for A {}
-            impl Trait for A {}
+fn foo(a: A) { a.<|> }
-            fn foo(a: A) {
+"#,
-               a.<|>
+            expect![[r#"
-            }
+                me the_method() fn the_method(&self)
-            ",
+            "#]],
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "the_method()",
-                source_range: 90..90,
-                delete: 90..90,
-                insert: "the_method()$0",
-                kind: Method,
-                lookup: "the_method",
-                detail: "fn the_method(&self)",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn test_trait_method_completion_deduplicated() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r"
-                r"
+struct A {}
-            struct A {}
+trait Trait { fn the_method(&self); }
-            trait Trait { fn the_method(&self); }
+impl<T> Trait for T {}
-            impl<T> Trait for T {}
+fn foo(a: &A) { a.<|> }
-            fn foo(a: &A) {
+",
-               a.<|>
+            expect![[r#"
-            }
+                me the_method() fn the_method(&self)
-            ",
+            "#]],
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "the_method()",
-                source_range: 94..94,
-                delete: 94..94,
-                insert: "the_method()$0",
-                kind: Method,
-                lookup: "the_method",
-                detail: "fn the_method(&self)",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_trait_method_from_other_module() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
-                r"
-            struct A {}
-            mod m {
-                pub trait Trait { fn the_method(&self); }
-            }
-            use m::Trait;
-            impl Trait for A {}
-            fn foo(a: A) {
-               a.<|>
-            }
-            ",
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "the_method()",
-                source_range: 122..122,
-                delete: 122..122,
-                insert: "the_method()$0",
-                kind: Method,
-                lookup: "the_method",
-                detail: "fn the_method(&self)",
-            },
-        ]
-        "###
-        );
-    }
-    #[test]
-    fn test_no_non_self_method() {
-        assert_debug_snapshot!(
-        do_ref_completion(
            r"
-            struct A {}
+struct A {}
-            impl A {
+mod m {
-                fn the_method() {}
+    pub trait Trait { fn the_method(&self); }
-            }
+}
-            fn foo(a: A) {
+use m::Trait;
-               a.<|>
+impl Trait for A {}
-            }
+fn foo(a: A) { a.<|> }
-            ",
+",
-        ),
+            expect![[r#"
-        @"[]"
+                me the_method() fn the_method(&self)
+            "#]],
        );
    }
    #[test]
-    fn test_method_attr_filtering() {
+    fn test_no_non_self_method() {
-        assert_debug_snapshot!(
+        check(
-        do_ref_completion(
+            r#"
-            r"
+struct A {}
-            struct A {}
+impl A {
-            impl A {
+    fn the_method() {}
-                #[inline]
+}
-                fn the_method(&self) {
+fn foo(a: A) {
-                    let x = 1;
+   a.<|>
-                    let y = 2;
+}
-                }
+"#,
-            }
+            expect![[""]],
-            fn foo(a: A) {
-               a.<|>
-            }
-            ",
-        ),
-        @r###"
-        [
-            CompletionItem {
-                label: "the_method()",
-                source_range: 128..128,
-                delete: 128..128,
-                insert: "the_method()$0",
-                kind: Method,
-                lookup: "the_method",
-                detail: "fn the_method(&self)",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn test_tuple_field_completion() {
-        assert_debug_snapshot!(
+        check(
-        do_ref_completion(
+            r#"
-            r"
+fn foo() {
-            fn foo() {
+   let b = (0, 3.14);
-               let b = (0, 3.14);
+   b.<|>
-               b.<|>
+}
-            }
+"#,
-            ",
+            expect![[r#"
-        ),
+                fd 0 i32
-        @r###"
+                fd 1 f64
-        [
+            "#]],
-            CompletionItem {
+        )
-                label: "0",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "0",
-                kind: Field,
-                detail: "i32",
-            },
-            CompletionItem {
-                label: "1",
-                source_range: 38..38,
-                delete: 38..38,
-                insert: "1",
-                kind: Field,
-                detail: "f64",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn test_tuple_field_inference() {
-        assert_debug_snapshot!(
+        check(
-        do_ref_completion(
+            r#"
-            r"
+pub struct S;
-            pub struct S;
+impl S { pub fn blah(&self) {} }
-            impl S {
-                pub fn blah(&self) {}
-            }
-            struct T(S);
+struct T(S);
-            impl T {
+impl T {
-                fn foo(&self) {
+    fn foo(&self) {
-                    // FIXME: This doesn't work without the trailing `a` as `0.` is a float
+        // FIXME: This doesn't work without the trailing `a` as `0.` is a float
-                    self.0.a<|>
+        self.0.a<|>
-                }
-            }
-            ",
-        ),
-        @r###"
-        [
-            CompletionItem {
-                label: "blah()",
-                source_range: 190..191,
-                delete: 190..191,
-                insert: "blah()$0",
-                kind: Method,
-                lookup: "blah",
-                detail: "pub fn blah(&self)",
-            },
-        ]
-        "###
-        );
    }
+}
-    #[test]
+"#,
-    fn test_completion_works_in_consts() {
+            expect![[r#"
-        assert_debug_snapshot!(
+                me blah() pub fn blah(&self)
-        do_ref_completion(
+            "#]],
-            r"
-            struct A { the_field: u32 }
-            const X: u32 = {
-                A { the_field: 92 }.<|>
-            };
-            ",
-        ),
-        @r###"
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 69..69,
-                delete: 69..69,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn test_completion_await_impls_future() {
+    fn test_completion_works_in_consts() {
-        assert_debug_snapshot!(
+        check(
-        do_completion(
+            r#"
-            r###"
+struct A { the_field: u32 }
-            //- /main.rs
+const X: u32 = {
-            use std::future::*;
+    A { the_field: 92 }.<|>
-            struct A {}
+};
-            impl Future for A {}
+"#,
-            fn foo(a: A) {
+            expect![[r#"
-                a.<|>
+                fd the_field u32
-            }
+            "#]],
-            //- /std/lib.rs
-            pub mod future {
-                #[lang = "future_trait"]
-                pub trait Future {}
-            }
-            "###, CompletionKind::Keyword),
-        @r###"
-        [
-            CompletionItem {
-                label: "await",
-                source_range: 74..74,
-                delete: 74..74,
-                insert: "await",
-                detail: "expr.await",
-            },
-        ]
-        "###
-        )
-    }
-    #[test]
-    fn test_super_super_completion() {
-        assert_debug_snapshot!(
-        do_ref_completion(
-                r"
-                mod a {
-                    const A: usize = 0;
-                    mod b {
-                        const B: usize = 0;
-                        mod c {
-                            use super::super::<|>
-                        }
-                    }
-                }
-                ",
-        ),
-            @r###"
-        [
-            CompletionItem {
-                label: "A",
-                source_range: 120..120,
-                delete: 120..120,
-                insert: "A",
-                kind: Const,
-            },
-            CompletionItem {
-                label: "b",
-                source_range: 120..120,
-                delete: 120..120,
-                insert: "b",
-                kind: Module,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn works_in_simple_macro_1() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+macro_rules! m { ($e:expr) => { $e } }
-                macro_rules! m { ($e:expr) => { $e } }
+struct A { the_field: u32 }
-                struct A { the_field: u32 }
+fn foo(a: A) {
-                fn foo(a: A) {
+    m!(a.x<|>)
-                    m!(a.x<|>)
+}
-                }
+"#,
-                ",
+            expect![[r#"
-            ),
+                fd the_field u32
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 91..92,
-                delete: 91..92,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
-        );
-    }
-    #[test]
-    fn works_in_simple_macro_recursive() {
-        assert_debug_snapshot!(
-            do_ref_completion(
-                r"
-                macro_rules! m { ($e:expr) => { $e } }
-                struct A { the_field: u32 }
-                fn foo(a: A) {
-                    m!(a.x<|>)
-                }
-                ",
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 91..92,
-                delete: 91..92,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn works_in_simple_macro_2() {
        // this doesn't work yet because the macro doesn't expand without the token -- maybe it can be fixed with better recovery
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+macro_rules! m { ($e:expr) => { $e } }
-                macro_rules! m { ($e:expr) => { $e } }
+struct A { the_field: u32 }
-                struct A { the_field: u32 }
+fn foo(a: A) {
-                fn foo(a: A) {
+    m!(a.<|>)
-                    m!(a.<|>)
+}
-                }
+"#,
-                ",
+            expect![[r#"
-            ),
+                fd the_field u32
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 91..91,
-                delete: 91..91,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn works_in_simple_macro_recursive_1() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+macro_rules! m { ($e:expr) => { $e } }
-                macro_rules! m { ($e:expr) => { $e } }
+struct A { the_field: u32 }
-                struct A { the_field: u32 }
+fn foo(a: A) {
-                fn foo(a: A) {
+    m!(m!(m!(a.x<|>)))
-                    m!(m!(m!(a.x<|>)))
+}
-                }
+"#,
-                ",
+            expect![[r#"
-            ),
+                fd the_field u32
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 97..98,
-                delete: 97..98,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn macro_expansion_resilient() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+macro_rules! dbg {
-                macro_rules! dbg {
+    () => {};
-                    () => {};
+    ($val:expr) => {
-                    ($val:expr) => {
+        match $val { tmp => { tmp } }
-                        match $val { tmp => { tmp } }
+    };
-                    };
+    // Trailing comma with single argument is ignored
-                    // Trailing comma with single argument is ignored
+    ($val:expr,) => { $crate::dbg!($val) };
-                    ($val:expr,) => { $crate::dbg!($val) };
+    ($($val:expr),+ $(,)?) => {
-                    ($($val:expr),+ $(,)?) => {
+        ($($crate::dbg!($val)),+,)
-                        ($($crate::dbg!($val)),+,)
+    };
-                    };
+}
-                }
+struct A { the_field: u32 }
-                struct A { the_field: u32 }
+fn foo(a: A) {
-                fn foo(a: A) {
+    dbg!(a.<|>)
-                    dbg!(a.<|>)
+}
-                }
+"#,
-                ",
+            expect![[r#"
-            ),
+                fd the_field u32
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "the_field",
-                source_range: 327..327,
-                delete: 327..327,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn test_method_completion_3547() {
+    fn test_method_completion_issue_3547() {
-        assert_debug_snapshot!(
+        check(
-            do_ref_completion(
+            r#"
-                r"
+struct HashSet<T> {}
-            struct HashSet<T> {}
+impl<T> HashSet<T> {
-            impl<T> HashSet<T> {
+    pub fn the_method(&self) {}
-                pub fn the_method(&self) {}
+}
-            }
+fn foo() {
-            fn foo() {
+    let s: HashSet<_>;
-                let s: HashSet<_>;
+    s.<|>
-                s.<|>
+}
-            }
+"#,
-            ",
+            expect![[r#"
-            ),
+                me the_method() pub fn the_method(&self)
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "the_method()",
-                source_range: 116..116,
-                delete: 116..116,
-                insert: "the_method()$0",
-                kind: Method,
-                lookup: "the_method",
-                detail: "pub fn the_method(&self)",
-            },
-        ]
-        "###
        );
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_fn_param.rs b/crates/ra_ide/src/completion/complete_fn_param.rs
index f5573ddf7..406334257 100644
--- a/crates/ra_ide/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide/src/completion/complete_fn_param.rs
@@ -1,4 +1,4 @@
-//! FIXME: write short doc here
+//! See `complete_fn_param`.
 use ra_syntax::{
    ast::{self, ModuleItemOwner},
@@ -18,35 +18,47 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
    }
    let mut params = FxHashMap::default();
+    let me = ctx.token.ancestors().find_map(ast::Fn::cast);
+    let mut process_fn = |func: ast::Fn| {
+        if Some(&func) == me.as_ref() {
+            return;
+        }
+        func.param_list().into_iter().flat_map(|it| it.params()).for_each(|param| {
+            let text = param.syntax().text().to_string();
+            params.entry(text).or_insert(param);
+        })
+    };
    for node in ctx.token.parent().ancestors() {
-        let items = match_ast! {
+        match_ast! {
            match node {
-                ast::SourceFile(it) => it.items(),
+                ast::SourceFile(it) => it.items().filter_map(|item| match item {
-                ast::ItemList(it) => it.items(),
+                    ast::Item::Fn(it) => Some(it),
+                    _ => None,
+                }).for_each(&mut process_fn),
+                ast::ItemList(it) => it.items().filter_map(|item| match item {
+                    ast::Item::Fn(it) => Some(it),
+                    _ => None,
+                }).for_each(&mut process_fn),
+                ast::AssocItemList(it) => it.assoc_items().filter_map(|item| match item {
+                    ast::AssocItem::Fn(it) => Some(it),
+                    _ => None,
+                }).for_each(&mut process_fn),
                _ => continue,
            }
        };
-        for item in items {
-            if let ast::ModuleItem::FnDef(func) = item {
-                func.param_list().into_iter().flat_map(|it| it.params()).for_each(|param| {
-                    let text = param.syntax().text().to_string();
-                    params.entry(text).or_insert((0, param)).0 += 1;
-                })
-            }
-        }
    }
    params
        .into_iter()
-        .filter_map(|(label, (count, param))| {
+        .filter_map(|(label, param)| {
            let lookup = param.pat()?.syntax().text().to_string();
-            if count < 2 {
+            Some((label, lookup))
-                None
-            } else {
-                Some((label, lookup))
-            }
        })
        .for_each(|(label, lookup)| {
            CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label)
+                .kind(crate::CompletionItemKind::Binding)
                .lookup_by(lookup)
                .add_to(acc)
        });
@@ -54,85 +66,70 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
 #[cfg(test)]
 mod tests {
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use expect::{expect, Expect};
-    use insta::assert_debug_snapshot;
+    use crate::completion::{test_utils::completion_list, CompletionKind};
-    fn do_magic_completion(code: &str) -> Vec<CompletionItem> {
+    fn check(ra_fixture: &str, expect: Expect) {
-        do_completion(code, CompletionKind::Magic)
+        let actual = completion_list(ra_fixture, CompletionKind::Magic);
+        expect.assert_eq(&actual);
    }
    #[test]
    fn test_param_completion_last_param() {
-        assert_debug_snapshot!(
+        check(
-        do_magic_completion(
+            r#"
-                r"
+fn foo(file_id: FileId) {}
-                fn foo(file_id: FileId) {}
+fn bar(file_id: FileId) {}
-                fn bar(file_id: FileId) {}
+fn baz(file<|>) {}
-                fn baz(file<|>) {}
+"#,
-                ",
+            expect![[r#"
-        ),
+                bn file_id: FileId
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "file_id: FileId",
-                source_range: 61..65,
-                delete: 61..65,
-                insert: "file_id: FileId",
-                lookup: "file_id",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn test_param_completion_nth_param() {
-        assert_debug_snapshot!(
+        check(
-        do_magic_completion(
+            r#"
-                r"
+fn foo(file_id: FileId) {}
-                fn foo(file_id: FileId) {}
+fn baz(file<|>, x: i32) {}
-                fn bar(file_id: FileId) {}
+"#,
-                fn baz(file<|>, x: i32) {}
+            expect![[r#"
-                ",
+                bn file_id: FileId
-        ),
+            "#]],
-            @r###"
-        [
-            CompletionItem {
-                label: "file_id: FileId",
-                source_range: 61..65,
-                delete: 61..65,
-                insert: "file_id: FileId",
-                lookup: "file_id",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn test_param_completion_trait_param() {
-        assert_debug_snapshot!(
+        check(
-        do_magic_completion(
+            r#"
-                r"
+pub(crate) trait SourceRoot {
-                pub(crate) trait SourceRoot {
+    pub fn contains(&self, file_id: FileId) -> bool;
-                    pub fn contains(&self, file_id: FileId) -> bool;
+    pub fn module_map(&self) -> &ModuleMap;
-                    pub fn module_map(&self) -> &ModuleMap;
+    pub fn lines(&self, file_id: FileId) -> &LineIndex;
-                    pub fn lines(&self, file_id: FileId) -> &LineIndex;
+    pub fn syntax(&self, file<|>)
-                    pub fn syntax(&self, file<|>)
+}
-                }
+"#,
-                ",
+            expect![[r#"
-        ),
+                bn file_id: FileId
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "file_id: FileId",
-                source_range: 208..212,
-                delete: 208..212,
-                insert: "file_id: FileId",
-                lookup: "file_id",
-            },
-        ]
-        "###
        );
    }
+    #[test]
+    fn completes_param_in_inner_function() {
+        check(
+            r#"
+fn outer(text: String) {
+    fn inner(<|>)
+}
+"#,
+            expect![[r#"
+                bn text: String
+            "#]],
+        )
+    }
 }
diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs
index 3b174f916..b62064797 100644
--- a/crates/ra_ide/src/completion/complete_keyword.rs
+++ b/crates/ra_ide/src/completion/complete_keyword.rs
@@ -1,6 +1,7 @@
 //! FIXME: write short doc here
-use ra_syntax::ast;
+use ra_syntax::{ast, SyntaxKind};
+use test_utils::mark;
 use crate::completion::{
    CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions,
@@ -34,9 +35,27 @@ pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
        }
        _ => {}
    }
+    // Suggest .await syntax for types that implement Future trait
+    if let Some(receiver) = &ctx.dot_receiver {
+        if let Some(ty) = ctx.sema.type_of_expr(receiver) {
+            if ty.impls_future(ctx.db) {
+                CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await")
+                    .kind(CompletionItemKind::Keyword)
+                    .detail("expr.await")
+                    .insert_text("await")
+                    .add_to(acc);
+            }
+        };
+    }
 }
 pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionContext) {
+    if ctx.token.kind() == SyntaxKind::COMMENT {
+        mark::hit!(no_keyword_completion_in_comments);
+        return;
+    }
    let has_trait_or_impl_parent = ctx.has_impl_parent || ctx.has_trait_parent;
    if ctx.trait_as_prev_sibling || ctx.impl_as_prev_sibling {
        add_keyword(ctx, acc, "where", "where ");
@@ -47,73 +66,67 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
            add_keyword(ctx, acc, "fn", "fn $0() {}")
        }
-        if (ctx.has_item_list_or_source_file_parent && !has_trait_or_impl_parent)
+        if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent {
-            || ctx.block_expr_parent
-        {
            add_keyword(ctx, acc, "trait", "trait $0 {}");
            add_keyword(ctx, acc, "impl", "impl $0 {}");
        }
        return;
    }
-    if ctx.has_item_list_or_source_file_parent || ctx.block_expr_parent {
+    if ctx.has_item_list_or_source_file_parent || has_trait_or_impl_parent || ctx.block_expr_parent
+    {
        add_keyword(ctx, acc, "fn", "fn $0() {}");
    }
-    if (ctx.has_item_list_or_source_file_parent && !has_trait_or_impl_parent)
+    if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent {
-        || ctx.block_expr_parent
-    {
        add_keyword(ctx, acc, "use", "use ");
        add_keyword(ctx, acc, "impl", "impl $0 {}");
        add_keyword(ctx, acc, "trait", "trait $0 {}");
    }
-    if ctx.has_item_list_or_source_file_parent && !has_trait_or_impl_parent {
+    if ctx.has_item_list_or_source_file_parent {
        add_keyword(ctx, acc, "enum", "enum $0 {}");
-        add_keyword(ctx, acc, "struct", "struct $0 {}");
+        add_keyword(ctx, acc, "struct", "struct $0");
        add_keyword(ctx, acc, "union", "union $0 {}");
    }
-    if ctx.block_expr_parent || ctx.is_match_arm {
+    if ctx.is_expr {
        add_keyword(ctx, acc, "match", "match $0 {}");
-        add_keyword(ctx, acc, "loop", "loop {$0}");
-    }
-    if ctx.block_expr_parent {
        add_keyword(ctx, acc, "while", "while $0 {}");
+        add_keyword(ctx, acc, "loop", "loop {$0}");
+        add_keyword(ctx, acc, "if", "if ");
+        add_keyword(ctx, acc, "if let", "if let ");
    }
    if ctx.if_is_prev || ctx.block_expr_parent {
        add_keyword(ctx, acc, "let", "let ");
    }
-    if ctx.if_is_prev || ctx.block_expr_parent || ctx.is_match_arm {
-        add_keyword(ctx, acc, "if", "if ");
-        add_keyword(ctx, acc, "if let", "if let ");
-    }
    if ctx.after_if {
        add_keyword(ctx, acc, "else", "else {$0}");
        add_keyword(ctx, acc, "else if", "else if $0 {}");
    }
-    if (ctx.has_item_list_or_source_file_parent && !has_trait_or_impl_parent)
+    if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent {
-        || ctx.block_expr_parent
-    {
        add_keyword(ctx, acc, "mod", "mod $0 {}");
    }
    if ctx.bind_pat_parent || ctx.ref_pat_parent {
        add_keyword(ctx, acc, "mut", "mut ");
    }
-    if ctx.has_item_list_or_source_file_parent || ctx.block_expr_parent {
+    if ctx.has_item_list_or_source_file_parent || has_trait_or_impl_parent || ctx.block_expr_parent
+    {
        add_keyword(ctx, acc, "const", "const ");
        add_keyword(ctx, acc, "type", "type ");
    }
-    if (ctx.has_item_list_or_source_file_parent && !has_trait_or_impl_parent)
+    if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent {
-        || ctx.block_expr_parent
-    {
        add_keyword(ctx, acc, "static", "static ");
    };
-    if (ctx.has_item_list_or_source_file_parent && !has_trait_or_impl_parent)
+    if (ctx.has_item_list_or_source_file_parent) || ctx.block_expr_parent {
-        || ctx.block_expr_parent
-    {
        add_keyword(ctx, acc, "extern", "extern ");
    }
-    if ctx.has_item_list_or_source_file_parent || ctx.block_expr_parent || ctx.is_match_arm {
+    if ctx.has_item_list_or_source_file_parent
+        || has_trait_or_impl_parent
+        || ctx.block_expr_parent
+        || ctx.is_match_arm
+    {
        add_keyword(ctx, acc, "unsafe", "unsafe ");
    }
    if ctx.in_loop_body {
@@ -125,7 +138,7 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
            add_keyword(ctx, acc, "break", "break");
        }
    }
-    if ctx.has_item_list_or_source_file_parent && !ctx.has_trait_parent {
+    if ctx.has_item_list_or_source_file_parent || ctx.has_impl_parent {
        add_keyword(ctx, acc, "pub", "pub ")
    }
@@ -156,7 +169,7 @@ fn add_keyword(ctx: &CompletionContext, acc: &mut Completions, kw: &str, snippet
 fn complete_return(
    ctx: &CompletionContext,
-    fn_def: &ast::FnDef,
+    fn_def: &ast::Fn,
    can_be_stmt: bool,
 ) -> Option<CompletionItem> {
    let snip = match (can_be_stmt, fn_def.ret_type().is_some()) {
@@ -170,289 +183,354 @@ fn complete_return(
 #[cfg(test)]
 mod tests {
-    use crate::completion::{test_utils::completion_list, CompletionKind};
+    use expect::{expect, Expect};
-    use insta::assert_snapshot;
+    use crate::completion::{
+        test_utils::{check_edit, completion_list},
+        CompletionKind,
+    };
+    use test_utils::mark;
-    fn get_keyword_completions(code: &str) -> String {
+    fn check(ra_fixture: &str, expect: Expect) {
-        completion_list(code, CompletionKind::Keyword)
+        let actual = completion_list(ra_fixture, CompletionKind::Keyword);
+        expect.assert_eq(&actual)
    }
    #[test]
    fn test_keywords_in_use_stmt() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"use <|>"),
+            r"use <|>",
-            @r###"
+            expect![[r#"
-            kw crate::
+                kw crate::
-            kw self
+                kw self
-            kw super::
+                kw super::
-        "###
+            "#]],
        );
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"use a::<|>"),
+            r"use a::<|>",
-            @r###"
+            expect![[r#"
-            kw self
+                kw self
-            kw super::
+                kw super::
-        "###
+            "#]],
        );
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"use a::{b, <|>}"),
+            r"use a::{b, <|>}",
-            @r###"
+            expect![[r#"
-            kw self
+                kw self
-            kw super::
+                kw super::
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_keywords_at_source_file_level() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"m<|>"),
+            r"m<|>",
-            @r###"
+            expect![[r#"
-            kw const
+                kw const
-            kw enum
+                kw enum
-            kw extern
+                kw extern
-            kw fn
+                kw fn
-            kw impl
+                kw impl
-            kw mod
+                kw mod
-            kw pub
+                kw pub
-            kw static
+                kw static
-            kw struct
+                kw struct
-            kw trait
+                kw trait
-            kw type
+                kw type
-            kw union
+                kw union
-            kw unsafe
+                kw unsafe
-            kw use
+                kw use
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_keywords_in_function() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"fn quux() { <|> }"),
+            r"fn quux() { <|> }",
-            @r###"
+            expect![[r#"
-            kw const
+                kw const
-            kw extern
+                kw extern
-            kw fn
+                kw fn
-            kw if
+                kw if
-            kw if let
+                kw if let
-            kw impl
+                kw impl
-            kw let
+                kw let
-            kw loop
+                kw loop
-            kw match
+                kw match
-            kw mod
+                kw mod
-            kw return
+                kw return
-            kw static
+                kw static
-            kw trait
+                kw trait
-            kw type
+                kw type
-            kw unsafe
+                kw unsafe
-            kw use
+                kw use
-            kw while
+                kw while
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_keywords_inside_block() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"fn quux() { if true { <|> } }"),
+            r"fn quux() { if true { <|> } }",
-            @r###"
+            expect![[r#"
-            kw const
+                kw const
-            kw extern
+                kw extern
-            kw fn
+                kw fn
-            kw if
+                kw if
-            kw if let
+                kw if let
-            kw impl
+                kw impl
-            kw let
+                kw let
-            kw loop
+                kw loop
-            kw match
+                kw match
-            kw mod
+                kw mod
-            kw return
+                kw return
-            kw static
+                kw static
-            kw trait
+                kw trait
-            kw type
+                kw type
-            kw unsafe
+                kw unsafe
-            kw use
+                kw use
-            kw while
+                kw while
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_keywords_after_if() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(
+            r#"fn quux() { if true { () } <|> }"#,
-                r"
+            expect![[r#"
-                fn quux() {
+                kw const
-                    if true {
+                kw else
-                        ()
+                kw else if
-                    } <|>
+                kw extern
-                }
+                kw fn
-                ",
+                kw if
-            ),
+                kw if let
-            @r###"
+                kw impl
-            kw const
+                kw let
-            kw else
+                kw loop
-            kw else if
+                kw match
-            kw extern
+                kw mod
-            kw fn
+                kw return
-            kw if
+                kw static
-            kw if let
+                kw trait
-            kw impl
+                kw type
-            kw let
+                kw unsafe
-            kw loop
+                kw use
-            kw match
+                kw while
-            kw mod
+            "#]],
-            kw return
+        );
-            kw static
+        check_edit(
-            kw trait
+            "else",
-            kw type
+            r#"fn quux() { if true { () } <|> }"#,
-            kw unsafe
+            r#"fn quux() { if true { () } else {$0} }"#,
-            kw use
-            kw while
-        "###
        );
    }
    #[test]
    fn test_keywords_in_match_arm() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(
+            r#"
-                r"
+fn quux() -> i32 {
-                fn quux() -> i32 {
+    match () { () => <|> }
-                    match () {
+}
-                        () => <|>
+"#,
-                    }
+            expect![[r#"
-                }
+                kw if
-                ",
+                kw if let
-            ),
+                kw loop
-            @r###"
+                kw match
-            kw if
+                kw return
-            kw if let
+                kw unsafe
-            kw loop
+                kw while
-            kw match
+            "#]],
-            kw return
-            kw unsafe
-        "###
        );
    }
    #[test]
    fn test_keywords_in_trait_def() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"trait My { <|> }"),
+            r"trait My { <|> }",
-            @r###"
+            expect![[r#"
-            kw const
+                kw const
-            kw fn
+                kw fn
-            kw type
+                kw type
-            kw unsafe
+                kw unsafe
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_keywords_in_impl_def() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"impl My { <|> }"),
+            r"impl My { <|> }",
-            @r###"
+            expect![[r#"
-            kw const
+                kw const
-            kw fn
+                kw fn
-            kw pub
+                kw pub
-            kw type
+                kw type
-            kw unsafe
+                kw unsafe
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_keywords_in_loop() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"fn my() { loop { <|> } }"),
+            r"fn my() { loop { <|> } }",
-            @r###"
+            expect![[r#"
-            kw break
+                kw break
-            kw const
+                kw const
-            kw continue
+                kw continue
-            kw extern
+                kw extern
-            kw fn
+                kw fn
-            kw if
+                kw if
-            kw if let
+                kw if let
-            kw impl
+                kw impl
-            kw let
+                kw let
-            kw loop
+                kw loop
-            kw match
+                kw match
-            kw mod
+                kw mod
-            kw return
+                kw return
-            kw static
+                kw static
-            kw trait
+                kw trait
-            kw type
+                kw type
-            kw unsafe
+                kw unsafe
-            kw use
+                kw use
-            kw while
+                kw while
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_keywords_after_unsafe_in_item_list() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"unsafe <|>"),
+            r"unsafe <|>",
-            @r###"
+            expect![[r#"
-            kw fn
+                kw fn
-            kw impl
+                kw impl
-            kw trait
+                kw trait
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_keywords_after_unsafe_in_block_expr() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"fn my_fn() { unsafe <|> }"),
+            r"fn my_fn() { unsafe <|> }",
-            @r###"
+            expect![[r#"
-            kw fn
+                kw fn
-            kw impl
+                kw impl
-            kw trait
+                kw trait
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_mut_in_ref_and_in_fn_parameters_list() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"fn my_fn(&<|>) {}"),
+            r"fn my_fn(&<|>) {}",
-            @r###"
+            expect![[r#"
-            kw mut
+                kw mut
-        "###
+            "#]],
        );
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"fn my_fn(<|>) {}"),
+            r"fn my_fn(<|>) {}",
-            @r###"
+            expect![[r#"
-            kw mut
+                kw mut
-        "###
+            "#]],
        );
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"fn my_fn() { let &<|> }"),
+            r"fn my_fn() { let &<|> }",
-            @r###"
+            expect![[r#"
-            kw mut
+                kw mut
-        "###
+            "#]],
        );
    }
    #[test]
    fn test_where_keyword() {
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"trait A <|>"),
+            r"trait A <|>",
-            @r###"
+            expect![[r#"
-            kw where
+                kw where
-        "###
+            "#]],
        );
-        assert_snapshot!(
+        check(
-            get_keyword_completions(r"impl A <|>"),
+            r"impl A <|>",
-            @r###"
+            expect![[r#"
-            kw where
+                kw where
-        "###
+            "#]],
        );
    }
+    #[test]
+    fn no_keyword_completion_in_comments() {
+        mark::check!(no_keyword_completion_in_comments);
+        check(
+            r#"
+fn test() {
+    let x = 2; // A comment<|>
+}
+"#,
+            expect![[""]],
+        );
+        check(
+            r#"
+/*
+Some multi-line comment<|>
+*/
+"#,
+            expect![[""]],
+        );
+        check(
+            r#"
+/// Some doc comment
+/// let test<|> = 1
+"#,
+            expect![[""]],
+        );
+    }
+    #[test]
+    fn test_completion_await_impls_future() {
+        check(
+            r#"
+//- /main.rs
+use std::future::*;
+struct A {}
+impl Future for A {}
+fn foo(a: A) { a.<|> }
+//- /std/lib.rs
+pub mod future {
+    #[lang = "future_trait"]
+    pub trait Future {}
+}
+"#,
+            expect![[r#"
+                kw await expr.await
+            "#]],
+        )
+    }
+    #[test]
+    fn after_let() {
+        check(
+            r#"fn main() { let _ = <|> }"#,
+            expect![[r#"
+                kw if
+                kw if let
+                kw loop
+                kw match
+                kw return
+                kw while
+            "#]],
+        )
+    }
 }
diff --git a/crates/ra_ide/src/completion/complete_macro_in_item_position.rs b/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
index 4c33f41d4..0447f0511 100644
--- a/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
+++ b/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
@@ -5,7 +5,7 @@ use crate::completion::{CompletionContext, Completions};
 pub(super) fn complete_macro_in_item_position(acc: &mut Completions, ctx: &CompletionContext) {
    // Show only macros in top level.
    if ctx.is_new_item {
-        ctx.scope().process_all_names(&mut |name, res| {
+        ctx.scope.process_all_names(&mut |name, res| {
            if let hir::ScopeDef::MacroDef(mac) = res {
                acc.add_macro(ctx, Some(name.to_string()), mac);
            }
@@ -15,130 +15,27 @@ pub(super) fn complete_macro_in_item_position(acc: &mut Completions, ctx: &Compl
 #[cfg(test)]
 mod tests {
-    use insta::assert_debug_snapshot;
+    use expect::{expect, Expect};
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use crate::completion::{test_utils::completion_list, CompletionKind};
-    fn do_reference_completion(code: &str) -> Vec<CompletionItem> {
+    fn check(ra_fixture: &str, expect: Expect) {
-        do_completion(code, CompletionKind::Reference)
+        let actual = completion_list(ra_fixture, CompletionKind::Reference);
+        expect.assert_eq(&actual)
    }
    #[test]
    fn completes_macros_as_item() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+macro_rules! foo { () => {} }
-                //- /main.rs
+fn foo() {}
-                macro_rules! foo {
-                    () => {}
+<|>
-                }
+"#,
+            expect![[r#"
-                fn foo() {}
+                ma foo!(…) macro_rules! foo
+            "#]],
-                <|>
+        )
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "foo!(…)",
-                source_range: 48..48,
-                delete: 48..48,
-                insert: "foo!($0)",
-                kind: Macro,
-                detail: "macro_rules! foo",
-            },
-        ]
-        "###
-        );
-    }
-    #[test]
-    fn completes_vec_macros_with_square_brackets() {
-        assert_debug_snapshot!(
-            do_reference_completion(
-                "
-                //- /main.rs
-                /// Creates a [`Vec`] containing the arguments.
-                ///
-                /// - Create a [`Vec`] containing a given list of elements:
-                ///
-                /// ```
-                /// let v = vec![1, 2, 3];
-                /// assert_eq!(v[0], 1);
-                /// assert_eq!(v[1], 2);
-                /// assert_eq!(v[2], 3);
-                /// ```
-                macro_rules! vec {
-                    () => {}
-                }
-                fn foo() {}
-                <|>
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "vec![…]",
-                source_range: 282..282,
-                delete: 282..282,
-                insert: "vec![$0]",
-                kind: Macro,
-                detail: "macro_rules! vec",
-                documentation: Documentation(
-                    "Creates a [`Vec`] containing the arguments.\n\n- Create a [`Vec`] containing a given list of elements:\n\n```\nlet v = vec![1, 2, 3];\nassert_eq!(v[0], 1);\nassert_eq!(v[1], 2);\nassert_eq!(v[2], 3);\n```",
-                ),
-            },
-        ]
-        "###
-        );
-    }
-    #[test]
-    fn completes_macros_braces_guessing() {
-        assert_debug_snapshot!(
-            do_reference_completion(
-                "
-                //- /main.rs
-                /// Foo
-                ///
-                /// Not call `fooo!()` `fooo!()`, or `_foo![]` `_foo![]`.
-                /// Call as `let _=foo!  { hello world };`
-                macro_rules! foo {
-                    () => {}
-                }
-                fn main() {
-                    <|>
-                }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "foo! {…}",
-                source_range: 164..164,
-                delete: 164..164,
-                insert: "foo! {$0}",
-                kind: Macro,
-                detail: "macro_rules! foo",
-                documentation: Documentation(
-                    "Foo\n\nNot call `fooo!()` `fooo!()`, or `_foo![]` `_foo![]`.\nCall as `let _=foo!  { hello world };`",
-                ),
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 164..164,
-                delete: 164..164,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
-        );
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_pattern.rs b/crates/ra_ide/src/completion/complete_pattern.rs
index 367e2bbce..aceb77cb5 100644
--- a/crates/ra_ide/src/completion/complete_pattern.rs
+++ b/crates/ra_ide/src/completion/complete_pattern.rs
@@ -13,7 +13,7 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
    // FIXME: ideally, we should look at the type we are matching against and
    // suggest variants + auto-imports
-    ctx.scope().process_all_names(&mut |name, res| {
+    ctx.scope.process_all_names(&mut |name, res| {
        match &res {
            hir::ScopeDef::ModuleDef(def) => match def {
                hir::ModuleDef::Adt(hir::Adt::Enum(..))
@@ -33,106 +33,56 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
 #[cfg(test)]
 mod tests {
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use expect::{expect, Expect};
-    use insta::assert_debug_snapshot;
-    fn complete(code: &str) -> Vec<CompletionItem> {
+    use crate::completion::{test_utils::completion_list, CompletionKind};
-        do_completion(code, CompletionKind::Reference)
+    fn check(ra_fixture: &str, expect: Expect) {
+        let actual = completion_list(ra_fixture, CompletionKind::Reference);
+        expect.assert_eq(&actual)
    }
    #[test]
    fn completes_enum_variants_and_modules() {
-        let completions = complete(
+        check(
-            r"
+            r#"
-            enum E { X }
+enum E { X }
-            use self::E::X;
+use self::E::X;
-            const Z: E = E::X;
+const Z: E = E::X;
-            mod m {}
+mod m {}
-            static FOO: E = E::X;
+static FOO: E = E::X;
-            struct Bar { f: u32 }
+struct Bar { f: u32 }
-            fn foo() {
+fn foo() {
-               match E::X {
+   match E::X { <|> }
-                   <|>
+}
-               }
+"#,
-            }
+            expect![[r#"
-            ",
+                st Bar
+                en E
+                ev X   ()
+                ct Z
+                md m
+            "#]],
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "Bar",
-                source_range: 137..137,
-                delete: 137..137,
-                insert: "Bar",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "E",
-                source_range: 137..137,
-                delete: 137..137,
-                insert: "E",
-                kind: Enum,
-            },
-            CompletionItem {
-                label: "X",
-                source_range: 137..137,
-                delete: 137..137,
-                insert: "X",
-                kind: EnumVariant,
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Z",
-                source_range: 137..137,
-                delete: 137..137,
-                insert: "Z",
-                kind: Const,
-            },
-            CompletionItem {
-                label: "m",
-                source_range: 137..137,
-                delete: 137..137,
-                insert: "m",
-                kind: Module,
-            },
-        ]
-        "###);
    }
    #[test]
    fn completes_in_simple_macro_call() {
-        let completions = complete(
+        check(
-            r"
+            r#"
-            macro_rules! m { ($e:expr) => { $e } }
+macro_rules! m { ($e:expr) => { $e } }
-            enum E { X }
+enum E { X }
-            fn foo() {
+fn foo() {
-               m!(match E::X {
+   m!(match E::X { <|> })
-                   <|>
+}
-               })
+"#,
-            }
+            expect![[r#"
-            ",
+                en E
+                ma m!(…) macro_rules! m
+            "#]],
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "E",
-                source_range: 90..90,
-                delete: 90..90,
-                insert: "E",
-                kind: Enum,
-            },
-            CompletionItem {
-                label: "m!(…)",
-                source_range: 90..90,
-                delete: 90..90,
-                insert: "m!($0)",
-                kind: Macro,
-                detail: "macro_rules! m",
-            },
-        ]
-        "###);
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs
index 3bd64804f..8735b9010 100644
--- a/crates/ra_ide/src/completion/complete_postfix.rs
+++ b/crates/ra_ide/src/completion/complete_postfix.rs
@@ -8,14 +8,13 @@ use ra_text_edit::TextEdit;
 use crate::{
    completion::{
+        completion_config::SnippetCap,
        completion_context::CompletionContext,
        completion_item::{Builder, CompletionKind, Completions},
    },
-    CompletionItem,
+    CompletionItem, CompletionItemKind,
 };
-use super::completion_config::SnippetCap;
 pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
    if !ctx.config.enable_postfix_completions {
        return;
@@ -103,10 +102,9 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
            &format!("while {} {{\n    $0\n}}", receiver_text),
        )
        .add_to(acc);
+        postfix_snippet(ctx, cap, &dot_receiver, "not", "!expr", &format!("!{}", receiver_text))
+            .add_to(acc);
    }
-    // !&&&42 is a compiler error, ergo process it before considering the references
-    postfix_snippet(ctx, cap, &dot_receiver, "not", "!expr", &format!("!{}", receiver_text))
-        .add_to(acc);
    postfix_snippet(ctx, cap, &dot_receiver, "ref", "&expr", &format!("&{}", receiver_text))
        .add_to(acc);
@@ -125,33 +123,35 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
    let dot_receiver = include_references(dot_receiver);
    let receiver_text =
        get_receiver_text(&dot_receiver, ctx.dot_receiver_is_ambiguous_float_literal);
    match try_enum {
-        Some(try_enum) => {
+        Some(try_enum) => match try_enum {
-            match try_enum {
+            TryEnum::Result => {
-                TryEnum::Result => {
+                postfix_snippet(
-                    postfix_snippet(
                    ctx,
                    cap,
                    &dot_receiver,
                    "match",
                    "match expr {}",
-                    &format!("match {} {{\n    Ok(${{1:_}}) => {{$2\\}},\n    Err(${{3:_}}) => {{$0\\}},\n}}", receiver_text),
+                    &format!("match {} {{\n    Ok(${{1:_}}) => {{$2}},\n    Err(${{3:_}}) => {{$0}},\n}}", receiver_text),
                )
                .add_to(acc);
-                }
+            }
-                TryEnum::Option => {
+            TryEnum::Option => {
-                    postfix_snippet(
+                postfix_snippet(
                    ctx,
                    cap,
                    &dot_receiver,
                    "match",
                    "match expr {}",
-                    &format!("match {} {{\n    Some(${{1:_}}) => {{$2\\}},\n    None => {{$0\\}},\n}}", receiver_text),
+                    &format!(
+                        "match {} {{\n    Some(${{1:_}}) => {{$2}},\n    None => {{$0}},\n}}",
+                        receiver_text
+                    ),
                )
                .add_to(acc);
-                }
            }
-        }
+        },
        None => {
            postfix_snippet(
                ctx,
@@ -159,7 +159,7 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
                &dot_receiver,
                "match",
                "match expr {}",
-                &format!("match {} {{\n    ${{1:_}} => {{$0\\}},\n}}", receiver_text),
+                &format!("match {} {{\n    ${{1:_}} => {{$0}},\n}}", receiver_text),
            )
            .add_to(acc);
        }
@@ -232,536 +232,147 @@ fn postfix_snippet(
    };
    CompletionItem::new(CompletionKind::Postfix, ctx.source_range(), label)
        .detail(detail)
+        .kind(CompletionItemKind::Snippet)
        .snippet_edit(cap, edit)
 }
 #[cfg(test)]
 mod tests {
-    use insta::assert_debug_snapshot;
+    use expect::{expect, Expect};
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use crate::completion::{
+        test_utils::{check_edit, completion_list},
+        CompletionKind,
+    };
-    fn do_postfix_completion(code: &str) -> Vec<CompletionItem> {
+    fn check(ra_fixture: &str, expect: Expect) {
-        do_completion(code, CompletionKind::Postfix)
+        let actual = completion_list(ra_fixture, CompletionKind::Postfix);
+        expect.assert_eq(&actual)
    }
    #[test]
    fn postfix_completion_works_for_trivial_path_expression() {
-        assert_debug_snapshot!(
+        check(
-            do_postfix_completion(
+            r#"
-                r#"
+fn main() {
-                fn main() {
+    let bar = true;
-                    let bar = true;
+    bar.<|>
-                    bar.<|>
+}
-                }
+"#,
-                "#,
+            expect![[r#"
-            ),
+                sn box   Box::new(expr)
-            @r###"
+                sn call  function(expr)
-        [
+                sn dbg   dbg!(expr)
-            CompletionItem {
+                sn if    if expr {}
-                label: "box",
+                sn match match expr {}
-                source_range: 40..40,
+                sn not   !expr
-                delete: 36..40,
+                sn ref   &expr
-                insert: "Box::new(bar)",
+                sn refm  &mut expr
-                detail: "Box::new(expr)",
+                sn while while expr {}
-            },
+            "#]],
-            CompletionItem {
-                label: "call",
-                source_range: 40..40,
-                delete: 36..40,
-                insert: "${1}(bar)",
-                detail: "function(expr)",
-            },
-            CompletionItem {
-                label: "dbg",
-                source_range: 40..40,
-                delete: 36..40,
-                insert: "dbg!(bar)",
-                detail: "dbg!(expr)",
-            },
-            CompletionItem {
-                label: "if",
-                source_range: 40..40,
-                delete: 36..40,
-                insert: "if bar {\n    $0\n}",
-                detail: "if expr {}",
-            },
-            CompletionItem {
-                label: "match",
-                source_range: 40..40,
-                delete: 36..40,
-                insert: "match bar {\n    ${1:_} => {$0\\},\n}",
-                detail: "match expr {}",
-            },
-            CompletionItem {
-                label: "not",
-                source_range: 40..40,
-                delete: 36..40,
-                insert: "!bar",
-                detail: "!expr",
-            },
-            CompletionItem {
-                label: "ref",
-                source_range: 40..40,
-                delete: 36..40,
-                insert: "&bar",
-                detail: "&expr",
-            },
-            CompletionItem {
-                label: "refm",
-                source_range: 40..40,
-                delete: 36..40,
-                insert: "&mut bar",
-                detail: "&mut expr",
-            },
-            CompletionItem {
-                label: "while",
-                source_range: 40..40,
-                delete: 36..40,
-                insert: "while bar {\n    $0\n}",
-                detail: "while expr {}",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn postfix_completion_works_for_option() {
+    fn postfix_type_filtering() {
-        assert_debug_snapshot!(
+        check(
-            do_postfix_completion(
+            r#"
-                r#"
+fn main() {
-                enum Option<T> {
+    let bar: u8 = 12;
-                    Some(T),
+    bar.<|>
-                    None,
+}
-                }
+"#,
+            expect![[r#"
-                fn main() {
+                sn box   Box::new(expr)
-                    let bar = Option::Some(true);
+                sn call  function(expr)
-                    bar.<|>
+                sn dbg   dbg!(expr)
-                }
+                sn match match expr {}
-                "#,
+                sn ref   &expr
-            ),
+                sn refm  &mut expr
-            @r###"
+            "#]],
-        [
+        )
-            CompletionItem {
-                label: "box",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "Box::new(bar)",
-                detail: "Box::new(expr)",
-            },
-            CompletionItem {
-                label: "call",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "${1}(bar)",
-                detail: "function(expr)",
-            },
-            CompletionItem {
-                label: "dbg",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "dbg!(bar)",
-                detail: "dbg!(expr)",
-            },
-            CompletionItem {
-                label: "ifl",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "if let Some($1) = bar {\n    $0\n}",
-                detail: "if let Some {}",
-            },
-            CompletionItem {
-                label: "match",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "match bar {\n    Some(${1:_}) => {$2\\},\n    None => {$0\\},\n}",
-                detail: "match expr {}",
-            },
-            CompletionItem {
-                label: "not",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "!bar",
-                detail: "!expr",
-            },
-            CompletionItem {
-                label: "ref",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "&bar",
-                detail: "&expr",
-            },
-            CompletionItem {
-                label: "refm",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "&mut bar",
-                detail: "&mut expr",
-            },
-            CompletionItem {
-                label: "while",
-                source_range: 97..97,
-                delete: 93..97,
-                insert: "while let Some($1) = bar {\n    $0\n}",
-                detail: "while let Some {}",
-            },
-        ]
-        "###
-        );
    }
    #[test]
-    fn postfix_completion_works_for_result() {
+    fn option_iflet() {
-        assert_debug_snapshot!(
+        check_edit(
-            do_postfix_completion(
+            "ifl",
-                r#"
+            r#"
-                enum Result<T, E> {
+enum Option<T> { Some(T), None }
-                    Ok(T),
-                    Err(E),
+fn main() {
-                }
+    let bar = Option::Some(true);
+    bar.<|>
+}
+"#,
+            r#"
+enum Option<T> { Some(T), None }
-                fn main() {
+fn main() {
-                    let bar = Result::Ok(true);
+    let bar = Option::Some(true);
-                    bar.<|>
+    if let Some($1) = bar {
-                }
+    $0
-                "#,
+}
-            ),
+}
-            @r###"
+"#,
-        [
-            CompletionItem {
-                label: "box",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "Box::new(bar)",
-                detail: "Box::new(expr)",
-            },
-            CompletionItem {
-                label: "call",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "${1}(bar)",
-                detail: "function(expr)",
-            },
-            CompletionItem {
-                label: "dbg",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "dbg!(bar)",
-                detail: "dbg!(expr)",
-            },
-            CompletionItem {
-                label: "ifl",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "if let Ok($1) = bar {\n    $0\n}",
-                detail: "if let Ok {}",
-            },
-            CompletionItem {
-                label: "match",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "match bar {\n    Ok(${1:_}) => {$2\\},\n    Err(${3:_}) => {$0\\},\n}",
-                detail: "match expr {}",
-            },
-            CompletionItem {
-                label: "not",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "!bar",
-                detail: "!expr",
-            },
-            CompletionItem {
-                label: "ref",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "&bar",
-                detail: "&expr",
-            },
-            CompletionItem {
-                label: "refm",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "&mut bar",
-                detail: "&mut expr",
-            },
-            CompletionItem {
-                label: "while",
-                source_range: 98..98,
-                delete: 94..98,
-                insert: "while let Ok($1) = bar {\n    $0\n}",
-                detail: "while let Ok {}",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn some_postfix_completions_ignored() {
+    fn result_match() {
-        assert_debug_snapshot!(
+        check_edit(
-            do_postfix_completion(
+            "match",
-                r#"
+            r#"
-                fn main() {
+enum Result<T, E> { Ok(T), Err(E) }
-                    let bar: u8 = 12;
-                    bar.<|>
+fn main() {
-                }
+    let bar = Result::Ok(true);
-                "#,
+    bar.<|>
-            ),
+}
-            @r###"
+"#,
-        [
+            r#"
-            CompletionItem {
+enum Result<T, E> { Ok(T), Err(E) }
-                label: "box",
-                source_range: 42..42,
+fn main() {
-                delete: 38..42,
+    let bar = Result::Ok(true);
-                insert: "Box::new(bar)",
+    match bar {
-                detail: "Box::new(expr)",
+    Ok(${1:_}) => {$2},
-            },
+    Err(${3:_}) => {$0},
-            CompletionItem {
+}
-                label: "call",
+}
-                source_range: 42..42,
+"#,
-                delete: 38..42,
-                insert: "${1}(bar)",
-                detail: "function(expr)",
-            },
-            CompletionItem {
-                label: "dbg",
-                source_range: 42..42,
-                delete: 38..42,
-                insert: "dbg!(bar)",
-                detail: "dbg!(expr)",
-            },
-            CompletionItem {
-                label: "match",
-                source_range: 42..42,
-                delete: 38..42,
-                insert: "match bar {\n    ${1:_} => {$0\\},\n}",
-                detail: "match expr {}",
-            },
-            CompletionItem {
-                label: "not",
-                source_range: 42..42,
-                delete: 38..42,
-                insert: "!bar",
-                detail: "!expr",
-            },
-            CompletionItem {
-                label: "ref",
-                source_range: 42..42,
-                delete: 38..42,
-                insert: "&bar",
-                detail: "&expr",
-            },
-            CompletionItem {
-                label: "refm",
-                source_range: 42..42,
-                delete: 38..42,
-                insert: "&mut bar",
-                detail: "&mut expr",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn postfix_completion_works_for_ambiguous_float_literal() {
-        assert_debug_snapshot!(
+        check_edit("refm", r#"fn main() { 42.<|> }"#, r#"fn main() { &mut 42 }"#)
-            do_postfix_completion(
-                r#"
-                fn main() {
-                    42.<|>
-                }
-                "#,
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "box",
-                source_range: 19..19,
-                delete: 16..19,
-                insert: "Box::new(42)",
-                detail: "Box::new(expr)",
-            },
-            CompletionItem {
-                label: "call",
-                source_range: 19..19,
-                delete: 16..19,
-                insert: "${1}(42)",
-                detail: "function(expr)",
-            },
-            CompletionItem {
-                label: "dbg",
-                source_range: 19..19,
-                delete: 16..19,
-                insert: "dbg!(42)",
-                detail: "dbg!(expr)",
-            },
-            CompletionItem {
-                label: "match",
-                source_range: 19..19,
-                delete: 16..19,
-                insert: "match 42 {\n    ${1:_} => {$0\\},\n}",
-                detail: "match expr {}",
-            },
-            CompletionItem {
-                label: "not",
-                source_range: 19..19,
-                delete: 16..19,
-                insert: "!42",
-                detail: "!expr",
-            },
-            CompletionItem {
-                label: "ref",
-                source_range: 19..19,
-                delete: 16..19,
-                insert: "&42",
-                detail: "&expr",
-            },
-            CompletionItem {
-                label: "refm",
-                source_range: 19..19,
-                delete: 16..19,
-                insert: "&mut 42",
-                detail: "&mut expr",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn works_in_simple_macro() {
-        assert_debug_snapshot!(
+        check_edit(
-            do_postfix_completion(
+            "dbg",
-                r#"
+            r#"
-                macro_rules! m { ($e:expr) => { $e } }
+macro_rules! m { ($e:expr) => { $e } }
-                fn main() {
+fn main() {
-                    let bar: u8 = 12;
+    let bar: u8 = 12;
-                    m!(bar.b<|>)
+    m!(bar.d<|>)
-                }
+}
-                "#,
+"#,
-            ),
+            r#"
-            @r###"
+macro_rules! m { ($e:expr) => { $e } }
-        [
+fn main() {
-            CompletionItem {
+    let bar: u8 = 12;
-                label: "box",
+    m!(dbg!(bar))
-                source_range: 84..85,
+}
-                delete: 80..85,
+"#,
-                insert: "Box::new(bar)",
-                detail: "Box::new(expr)",
-            },
-            CompletionItem {
-                label: "call",
-                source_range: 84..85,
-                delete: 80..85,
-                insert: "${1}(bar)",
-                detail: "function(expr)",
-            },
-            CompletionItem {
-                label: "dbg",
-                source_range: 84..85,
-                delete: 80..85,
-                insert: "dbg!(bar)",
-                detail: "dbg!(expr)",
-            },
-            CompletionItem {
-                label: "match",
-                source_range: 84..85,
-                delete: 80..85,
-                insert: "match bar {\n    ${1:_} => {$0\\},\n}",
-                detail: "match expr {}",
-            },
-            CompletionItem {
-                label: "not",
-                source_range: 84..85,
-                delete: 80..85,
-                insert: "!bar",
-                detail: "!expr",
-            },
-            CompletionItem {
-                label: "ref",
-                source_range: 84..85,
-                delete: 80..85,
-                insert: "&bar",
-                detail: "&expr",
-            },
-            CompletionItem {
-                label: "refm",
-                source_range: 84..85,
-                delete: 80..85,
-                insert: "&mut bar",
-                detail: "&mut expr",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn postfix_completion_for_references() {
-        assert_debug_snapshot!(
+        check_edit("dbg", r#"fn main() { &&42.<|> }"#, r#"fn main() { dbg!(&&42) }"#);
-            do_postfix_completion(
+        check_edit("refm", r#"fn main() { &&42.<|> }"#, r#"fn main() { &&&mut 42 }"#);
-                r#"
-                fn main() {
-                    &&&&42.<|>
-                }
-                "#,
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "box",
-                source_range: 23..23,
-                delete: 16..23,
-                insert: "Box::new(&&&&42)",
-                detail: "Box::new(expr)",
-            },
-            CompletionItem {
-                label: "call",
-                source_range: 23..23,
-                delete: 16..23,
-                insert: "${1}(&&&&42)",
-                detail: "function(expr)",
-            },
-            CompletionItem {
-                label: "dbg",
-                source_range: 23..23,
-                delete: 16..23,
-                insert: "dbg!(&&&&42)",
-                detail: "dbg!(expr)",
-            },
-            CompletionItem {
-                label: "match",
-                source_range: 23..23,
-                delete: 16..23,
-                insert: "match &&&&42 {\n    ${1:_} => {$0\\},\n}",
-                detail: "match expr {}",
-            },
-            CompletionItem {
-                label: "not",
-                source_range: 23..23,
-                delete: 20..23,
-                insert: "!42",
-                detail: "!expr",
-            },
-            CompletionItem {
-                label: "ref",
-                source_range: 23..23,
-                delete: 20..23,
-                insert: "&42",
-                detail: "&expr",
-            },
-            CompletionItem {
-                label: "refm",
-                source_range: 23..23,
-                delete: 20..23,
-                insert: "&mut 42",
-                detail: "&mut expr",
-            },
-        ]
-        "###
-        );
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_qualified_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs
index f133ce3ce..b08f5b9b4 100644
--- a/crates/ra_ide/src/completion/complete_qualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_qualified_path.rs
@@ -17,21 +17,20 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
        return;
    }
-    let scope = ctx.scope();
+    let context_module = ctx.scope.module();
-    let context_module = scope.module();
-    let res = match scope.resolve_hir_path_qualifier(&path) {
+    let resolution = match ctx.scope.resolve_hir_path_qualifier(&path) {
        Some(res) => res,
        None => return,
    };
    // Add associated types on type parameters and `Self`.
-    res.assoc_type_shorthand_candidates(ctx.db, |alias| {
+    resolution.assoc_type_shorthand_candidates(ctx.db, |alias| {
        acc.add_type_alias(ctx, alias);
        None::<()>
    });
-    match res {
+    match resolution {
        PathResolution::Def(hir::ModuleDef::Module(module)) => {
            let module_scope = module.scope(ctx.db, context_module);
            for (name, def) in module_scope {
@@ -68,7 +67,7 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
            let krate = ctx.krate;
            if let Some(krate) = krate {
-                let traits_in_scope = ctx.scope().traits_in_scope();
+                let traits_in_scope = ctx.scope.traits_in_scope();
                ty.iterate_path_candidates(ctx.db, krate, &traits_in_scope, None, |_ty, item| {
                    if context_module.map_or(false, |m| !item.is_visible_from(ctx.db, m)) {
                        return None;
@@ -113,13 +112,13 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
        }
        PathResolution::TypeParam(_) | PathResolution::SelfType(_) => {
            if let Some(krate) = ctx.krate {
-                let ty = match res {
+                let ty = match resolution {
                    PathResolution::TypeParam(param) => param.ty(ctx.db),
                    PathResolution::SelfType(impl_def) => impl_def.target_ty(ctx.db),
                    _ => return,
                };
-                let traits_in_scope = ctx.scope().traits_in_scope();
+                let traits_in_scope = ctx.scope.traits_in_scope();
                let mut seen = FxHashSet::default();
                ty.iterate_path_candidates(ctx.db, krate, &traits_in_scope, None, |_ty, item| {
                    if context_module.map_or(false, |m| !item.is_visible_from(ctx.db, m)) {
@@ -147,1229 +146,588 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
 #[cfg(test)]
 mod tests {
+    use expect::{expect, Expect};
    use test_utils::mark;
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use crate::completion::{
-    use insta::assert_debug_snapshot;
+        test_utils::{check_edit, completion_list},
+        CompletionKind,
+    };
+    fn check(ra_fixture: &str, expect: Expect) {
+        let actual = completion_list(ra_fixture, CompletionKind::Reference);
+        expect.assert_eq(&actual);
+    }
-    fn do_reference_completion(code: &str) -> Vec<CompletionItem> {
+    fn check_builtin(ra_fixture: &str, expect: Expect) {
-        do_completion(code, CompletionKind::Reference)
+        let actual = completion_list(ra_fixture, CompletionKind::BuiltinType);
+        expect.assert_eq(&actual);
    }
    #[test]
    fn dont_complete_current_use() {
        mark::check!(dont_complete_current_use);
-        let completions = do_completion(r"use self::foo<|>;", CompletionKind::Reference);
+        check(r#"use self::foo<|>;"#, expect![[""]]);
-        assert!(completions.is_empty());
    }
    #[test]
    fn dont_complete_current_use_in_braces_with_glob() {
-        let completions = do_completion(
+        check(
-            r"
+            r#"
-            mod foo { pub struct S; }
+mod foo { pub struct S; }
-            use self::{foo::*, bar<|>};
+use self::{foo::*, bar<|>};
-            ",
+"#,
-            CompletionKind::Reference,
+            expect![[r#"
+                st S
+                md foo
+            "#]],
        );
-        assert_eq!(completions.len(), 2);
    }
    #[test]
    fn dont_complete_primitive_in_use() {
-        let completions = do_completion(r"use self::<|>;", CompletionKind::BuiltinType);
+        check_builtin(r#"use self::<|>;"#, expect![[""]]);
-        assert!(completions.is_empty());
    }
    #[test]
    fn dont_complete_primitive_in_module_scope() {
-        let completions = do_completion(r"fn foo() { self::<|> }", CompletionKind::BuiltinType);
+        check_builtin(r#"fn foo() { self::<|> }"#, expect![[""]]);
-        assert!(completions.is_empty());
    }
    #[test]
    fn completes_primitives() {
-        let completions =
+        check_builtin(
-            do_completion(r"fn main() { let _: <|> = 92; }", CompletionKind::BuiltinType);
+            r#"fn main() { let _: <|> = 92; }"#,
-        assert_eq!(completions.len(), 17);
+            expect![[r#"
-    }
+                bt bool
+                bt char
-    #[test]
+                bt f32
-    fn completes_mod_with_docs() {
+                bt f64
-        assert_debug_snapshot!(
+                bt i128
-            do_reference_completion(
+                bt i16
-                r"
+                bt i32
-                use self::my<|>;
+                bt i64
+                bt i8
-                /// Some simple
+                bt isize
-                /// docs describing `mod my`.
+                bt str
-                mod my {
+                bt u128
-                    struct Bar;
+                bt u16
-                }
+                bt u32
-                "
+                bt u64
-            ),
+                bt u8
-            @r###"
+                bt usize
-        [
+            "#]],
-            CompletionItem {
-                label: "my",
-                source_range: 10..12,
-                delete: 10..12,
-                insert: "my",
-                kind: Module,
-                documentation: Documentation(
-                    "Some simple\ndocs describing `mod my`.",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_mod_with_same_name_as_function() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+use self::my::<|>;
-                use self::my::<|>;
+mod my { pub struct Bar; }
-                mod my {
+fn my() {}
-                    pub struct Bar;
+"#,
-                }
+            expect![[r#"
+                st Bar
-                fn my() {}
+            "#]],
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "Bar",
-                source_range: 14..14,
-                delete: 14..14,
-                insert: "Bar",
-                kind: Struct,
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn path_visibility() {
+    fn filters_visibility() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+use self::my::<|>;
-                use self::my::<|>;
+mod my {
-                mod my {
+    struct Bar;
-                    struct Bar;
+    pub struct Foo;
-                    pub struct Foo;
+    pub use Bar as PublicBar;
-                    pub use Bar as PublicBar;
+}
-                }
+"#,
-                "
+            expect![[r#"
-            ),
+                st Foo
-            @r###"
+                st PublicBar
-        [
+            "#]],
-            CompletionItem {
-                label: "Foo",
-                source_range: 14..14,
-                delete: 14..14,
-                insert: "Foo",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "PublicBar",
-                source_range: 14..14,
-                delete: 14..14,
-                insert: "PublicBar",
-                kind: Struct,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_use_item_starting_with_self() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+use self::m::<|>;
-                use self::m::<|>;
-                mod m {
+mod m { pub struct Bar; }
-                    pub struct Bar;
+"#,
-                }
+            expect![[r#"
-                "
+                st Bar
-            ),
+            "#]],
-            @r###"
-        [
-            CompletionItem {
-                label: "Bar",
-                source_range: 13..13,
-                delete: 13..13,
-                insert: "Bar",
-                kind: Struct,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_use_item_starting_with_crate() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+//- /lib.rs
-                //- /lib.rs
+mod foo;
-                mod foo;
+struct Spam;
-                struct Spam;
+//- /foo.rs
-                //- /foo.rs
+use crate::Sp<|>
-                use crate::Sp<|>
+"#,
-                "
+            expect![[r#"
-            ),
+                st Spam
-            @r###"
+                md foo
-        [
+            "#]],
-            CompletionItem {
-                label: "Spam",
-                source_range: 11..13,
-                delete: 11..13,
-                insert: "Spam",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "foo",
-                source_range: 11..13,
-                delete: 11..13,
-                insert: "foo",
-                kind: Module,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_nested_use_tree() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+//- /lib.rs
-                //- /lib.rs
+mod foo;
-                mod foo;
+struct Spam;
-                struct Spam;
+//- /foo.rs
-                //- /foo.rs
+use crate::{Sp<|>};
-                use crate::{Sp<|>};
+"#,
-                "
+            expect![[r#"
-            ),
+                st Spam
-            @r###"
+                md foo
-        [
+            "#]],
-            CompletionItem {
-                label: "Spam",
-                source_range: 12..14,
-                delete: 12..14,
-                insert: "Spam",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "foo",
-                source_range: 12..14,
-                delete: 12..14,
-                insert: "foo",
-                kind: Module,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_deeply_nested_use_tree() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+//- /lib.rs
-                //- /lib.rs
+mod foo;
-                mod foo;
+pub mod bar {
-                pub mod bar {
+    pub mod baz {
-                    pub mod baz {
+        pub struct Spam;
-                        pub struct Spam;
-                    }
-                }
-                //- /foo.rs
-                use crate::{bar::{baz::Sp<|>}};
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "Spam",
-                source_range: 23..25,
-                delete: 23..25,
-                insert: "Spam",
-                kind: Struct,
-            },
-        ]
-        "###
-        );
-    }
-    #[test]
-    fn completes_enum_variant() {
-        assert_debug_snapshot!(
-            do_reference_completion(
-                "
-                //- /lib.rs
-                /// An enum
-                enum E {
-                    /// Foo Variant
-                    Foo,
-                    /// Bar Variant with i32
-                    Bar(i32)
-                }
-                fn foo() { let _ = E::<|> }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "Bar(…)",
-                source_range: 116..116,
-                delete: 116..116,
-                insert: "Bar($0)",
-                kind: EnumVariant,
-                lookup: "Bar",
-                detail: "(i32)",
-                documentation: Documentation(
-                    "Bar Variant with i32",
-                ),
-                trigger_call_info: true,
-            },
-            CompletionItem {
-                label: "Foo",
-                source_range: 116..116,
-                delete: 116..116,
-                insert: "Foo",
-                kind: EnumVariant,
-                detail: "()",
-                documentation: Documentation(
-                    "Foo Variant",
-                ),
-            },
-        ]
-        "###
-        );
-    }
-    #[test]
-    fn completes_enum_variant_with_details() {
-        assert_debug_snapshot!(
-            do_reference_completion(
-                "
-                //- /lib.rs
-                struct S { field: u32 }
-                /// An enum
-                enum E {
-                    /// Foo Variant (empty)
-                    Foo,
-                    /// Bar Variant with i32 and u32
-                    Bar(i32, u32),
-                    ///
-                    S(S),
-                }
-                fn foo() { let _ = E::<|> }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "Bar(…)",
-                source_range: 180..180,
-                delete: 180..180,
-                insert: "Bar($0)",
-                kind: EnumVariant,
-                lookup: "Bar",
-                detail: "(i32, u32)",
-                documentation: Documentation(
-                    "Bar Variant with i32 and u32",
-                ),
-                trigger_call_info: true,
-            },
-            CompletionItem {
-                label: "Foo",
-                source_range: 180..180,
-                delete: 180..180,
-                insert: "Foo",
-                kind: EnumVariant,
-                detail: "()",
-                documentation: Documentation(
-                    "Foo Variant (empty)",
-                ),
-            },
-            CompletionItem {
-                label: "S(…)",
-                source_range: 180..180,
-                delete: 180..180,
-                insert: "S($0)",
-                kind: EnumVariant,
-                lookup: "S",
-                detail: "(S)",
-                documentation: Documentation(
-                    "",
-                ),
-                trigger_call_info: true,
-            },
-        ]
-        "###
-        );
    }
+}
-    #[test]
+//- /foo.rs
-    fn completes_struct_associated_method() {
+use crate::{bar::{baz::Sp<|>}};
-        assert_debug_snapshot!(
+"#,
-            do_reference_completion(
+            expect![[r#"
-                "
+                st Spam
-                //- /lib.rs
+            "#]],
-                /// A Struct
-                struct S;
-                impl S {
-                    /// An associated method
-                    fn m() { }
-                }
-                fn foo() { let _ = S::<|> }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "m()",
-                source_range: 102..102,
-                delete: 102..102,
-                insert: "m()$0",
-                kind: Function,
-                lookup: "m",
-                detail: "fn m()",
-                documentation: Documentation(
-                    "An associated method",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn completes_struct_associated_method_with_self() {
+    fn completes_enum_variant() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+enum E { Foo, Bar(i32) }
-                //- /lib.rs
+fn foo() { let _ = E::<|> }
-                /// A Struct
+"#,
-                struct S;
+            expect![[r#"
+                ev Bar(…) (i32)
-                impl S {
+                ev Foo    ()
-                    /// An associated method
+            "#]],
-                    fn m(&self) { }
-                }
-                fn foo() { let _ = S::<|> }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "m()",
-                source_range: 107..107,
-                delete: 107..107,
-                insert: "m()$0",
-                kind: Method,
-                lookup: "m",
-                detail: "fn m(&self)",
-                documentation: Documentation(
-                    "An associated method",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn completes_struct_associated_const() {
+    fn completes_struct_associated_items() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+//- /lib.rs
-                //- /lib.rs
+struct S;
-                /// A Struct
-                struct S;
+impl S {
+    fn a() {}
-                impl S {
+    fn b(&self) {}
-                    /// An associated const
+    const C: i32 = 42;
-                    const C: i32 = 42;
+    type T = i32;
-                }
+}
-                fn foo() { let _ = S::<|> }
+fn foo() { let _ = S::<|> }
-                "
+"#,
-            ),
+            expect![[r#"
-            @r###"
+                ct C   const C: i32 = 42;
-        [
+                ta T   type T = i32;
-            CompletionItem {
+                fn a() fn a()
-                label: "C",
+                me b() fn b(&self)
-                source_range: 109..109,
+            "#]],
-                delete: 109..109,
-                insert: "C",
-                kind: Const,
-                detail: "const C: i32 = 42;",
-                documentation: Documentation(
-                    "An associated const",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn completes_struct_associated_type() {
+    fn associated_item_visibility() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+struct S;
-                //- /lib.rs
-                /// A Struct
-                struct S;
-                impl S {
-                    /// An associated type
-                    type T = i32;
-                }
-                fn foo() { let _ = S::<|> }
+mod m {
-                "
+    impl super::S {
-            ),
+        pub(super) fn public_method() { }
-            @r###"
+        fn private_method() { }
-        [
+        pub(super) type PublicType = u32;
-            CompletionItem {
+        type PrivateType = u32;
-                label: "T",
+        pub(super) const PUBLIC_CONST: u32 = 1;
-                source_range: 103..103,
+        const PRIVATE_CONST: u32 = 1;
-                delete: 103..103,
-                insert: "T",
-                kind: TypeAlias,
-                detail: "type T = i32;",
-                documentation: Documentation(
-                    "An associated type",
-                ),
-            },
-        ]
-        "###
-        );
    }
+}
-    #[test]
+fn foo() { let _ = S::<|> }
-    fn associated_item_visibility() {
+"#,
-        assert_debug_snapshot!(
+            expect![[r#"
-            do_reference_completion(
+                ct PUBLIC_CONST    pub(super) const PUBLIC_CONST: u32 = 1;
-                "
+                ta PublicType      pub(super) type PublicType = u32;
-                //- /lib.rs
+                fn public_method() pub(super) fn public_method()
-                struct S;
+            "#]],
-                mod m {
-                    impl super::S {
-                        pub(super) fn public_method() { }
-                        fn private_method() { }
-                        pub(super) type PublicType = u32;
-                        type PrivateType = u32;
-                        pub(super) const PUBLIC_CONST: u32 = 1;
-                        const PRIVATE_CONST: u32 = 1;
-                    }
-                }
-                fn foo() { let _ = S::<|> }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "PUBLIC_CONST",
-                source_range: 304..304,
-                delete: 304..304,
-                insert: "PUBLIC_CONST",
-                kind: Const,
-                detail: "pub(super) const PUBLIC_CONST: u32 = 1;",
-            },
-            CompletionItem {
-                label: "PublicType",
-                source_range: 304..304,
-                delete: 304..304,
-                insert: "PublicType",
-                kind: TypeAlias,
-                detail: "pub(super) type PublicType = u32;",
-            },
-            CompletionItem {
-                label: "public_method()",
-                source_range: 304..304,
-                delete: 304..304,
-                insert: "public_method()$0",
-                kind: Function,
-                lookup: "public_method",
-                detail: "pub(super) fn public_method()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_enum_associated_method() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+enum E {};
-                //- /lib.rs
+impl E { fn m() { } }
-                /// An enum
-                enum S {};
+fn foo() { let _ = E::<|> }
+        "#,
-                impl S {
+            expect![[r#"
-                    /// An associated method
+                fn m() fn m()
-                    fn m() { }
+            "#]],
-                }
-                fn foo() { let _ = S::<|> }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "m()",
-                source_range: 102..102,
-                delete: 102..102,
-                insert: "m()$0",
-                kind: Function,
-                lookup: "m",
-                detail: "fn m()",
-                documentation: Documentation(
-                    "An associated method",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_union_associated_method() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+union U {};
-                //- /lib.rs
+impl U { fn m() { } }
-                /// A union
-                union U {};
+fn foo() { let _ = U::<|> }
+"#,
-                impl U {
+            expect![[r#"
-                    /// An associated method
+                fn m() fn m()
-                    fn m() { }
+            "#]],
-                }
-                fn foo() { let _ = U::<|> }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "m()",
-                source_range: 103..103,
-                delete: 103..103,
-                insert: "m()$0",
-                kind: Function,
-                lookup: "m",
-                detail: "fn m()",
-                documentation: Documentation(
-                    "An associated method",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_use_paths_across_crates() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+//- /main.rs
-                //- /main.rs
+use foo::<|>;
-                use foo::<|>;
+//- /foo/lib.rs
-                //- /foo/lib.rs
+pub mod bar { pub struct S; }
-                pub mod bar {
+"#,
-                    pub struct S;
+            expect![[r#"
-                }
+                md bar
-                "
+            "#]],
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "bar",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "bar",
-                kind: Module,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_trait_associated_method_1() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+trait Trait { fn m(); }
-                //- /lib.rs
-                trait Trait {
-                  /// A trait method
-                  fn m();
-                }
-                fn foo() { let _ = Trait::<|> }
+fn foo() { let _ = Trait::<|> }
-                "
+"#,
-            ),
+            expect![[r#"
-            @r###"
+                fn m() fn m()
-        [
+            "#]],
-            CompletionItem {
-                label: "m()",
-                source_range: 74..74,
-                delete: 74..74,
-                insert: "m()$0",
-                kind: Function,
-                lookup: "m",
-                detail: "fn m()",
-                documentation: Documentation(
-                    "A trait method",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_trait_associated_method_2() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+trait Trait { fn m(); }
-                //- /lib.rs
-                trait Trait {
+struct S;
-                  /// A trait method
+impl Trait for S {}
-                  fn m();
-                }
-                struct S;
+fn foo() { let _ = S::<|> }
-                impl Trait for S {}
+"#,
+            expect![[r#"
-                fn foo() { let _ = S::<|> }
+                fn m() fn m()
-                "
+            "#]],
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "m()",
-                source_range: 101..101,
-                delete: 101..101,
-                insert: "m()$0",
-                kind: Function,
-                lookup: "m",
-                detail: "fn m()",
-                documentation: Documentation(
-                    "A trait method",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_trait_associated_method_3() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+trait Trait { fn m(); }
-                //- /lib.rs
-                trait Trait {
-                  /// A trait method
-                  fn m();
-                }
-                struct S;
+struct S;
-                impl Trait for S {}
+impl Trait for S {}
-                fn foo() { let _ = <S as Trait>::<|> }
+fn foo() { let _ = <S as Trait>::<|> }
-                "
+"#,
-            ),
+            expect![[r#"
-            @r###"
+                fn m() fn m()
-        [
+            "#]],
-            CompletionItem {
-                label: "m()",
-                source_range: 112..112,
-                delete: 112..112,
-                insert: "m()$0",
-                kind: Function,
-                lookup: "m",
-                detail: "fn m()",
-                documentation: Documentation(
-                    "A trait method",
-                ),
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_ty_param_assoc_ty() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+trait Super {
-                //- /lib.rs
+    type Ty;
-                trait Super {
+    const CONST: u8;
-                    type Ty;
+    fn func() {}
-                    const CONST: u8;
+    fn method(&self) {}
-                    fn func() {}
+}
-                    fn method(&self) {}
-                }
-                trait Sub: Super {
+trait Sub: Super {
-                    type SubTy;
+    type SubTy;
-                    const C2: ();
+    const C2: ();
-                    fn subfunc() {}
+    fn subfunc() {}
-                    fn submethod(&self) {}
+    fn submethod(&self) {}
-                }
+}
-                fn foo<T: Sub>() {
+fn foo<T: Sub>() { T::<|> }
-                    T::<|>
+"#,
-                }
+            expect![[r#"
-                "
+                ct C2          const C2: ();
-            ),
+                ct CONST       const CONST: u8;
-            @r###"
+                ta SubTy       type SubTy;
-        [
+                ta Ty          type Ty;
-            CompletionItem {
+                fn func()      fn func()
-                label: "C2",
+                me method()    fn method(&self)
-                source_range: 221..221,
+                fn subfunc()   fn subfunc()
-                delete: 221..221,
+                me submethod() fn submethod(&self)
-                insert: "C2",
+            "#]],
-                kind: Const,
-                detail: "const C2: ();",
-            },
-            CompletionItem {
-                label: "CONST",
-                source_range: 221..221,
-                delete: 221..221,
-                insert: "CONST",
-                kind: Const,
-                detail: "const CONST: u8;",
-            },
-            CompletionItem {
-                label: "SubTy",
-                source_range: 221..221,
-                delete: 221..221,
-                insert: "SubTy",
-                kind: TypeAlias,
-                detail: "type SubTy;",
-            },
-            CompletionItem {
-                label: "Ty",
-                source_range: 221..221,
-                delete: 221..221,
-                insert: "Ty",
-                kind: TypeAlias,
-                detail: "type Ty;",
-            },
-            CompletionItem {
-                label: "func()",
-                source_range: 221..221,
-                delete: 221..221,
-                insert: "func()$0",
-                kind: Function,
-                lookup: "func",
-                detail: "fn func()",
-            },
-            CompletionItem {
-                label: "method()",
-                source_range: 221..221,
-                delete: 221..221,
-                insert: "method()$0",
-                kind: Method,
-                lookup: "method",
-                detail: "fn method(&self)",
-            },
-            CompletionItem {
-                label: "subfunc()",
-                source_range: 221..221,
-                delete: 221..221,
-                insert: "subfunc()$0",
-                kind: Function,
-                lookup: "subfunc",
-                detail: "fn subfunc()",
-            },
-            CompletionItem {
-                label: "submethod()",
-                source_range: 221..221,
-                delete: 221..221,
-                insert: "submethod()$0",
-                kind: Method,
-                lookup: "submethod",
-                detail: "fn submethod(&self)",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_self_param_assoc_ty() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+trait Super {
-                //- /lib.rs
+    type Ty;
-                trait Super {
+    const CONST: u8 = 0;
-                    type Ty;
+    fn func() {}
-                    const CONST: u8 = 0;
+    fn method(&self) {}
-                    fn func() {}
+}
-                    fn method(&self) {}
-                }
-                trait Sub: Super {
+trait Sub: Super {
-                    type SubTy;
+    type SubTy;
-                    const C2: () = ();
+    const C2: () = ();
-                    fn subfunc() {}
+    fn subfunc() {}
-                    fn submethod(&self) {}
+    fn submethod(&self) {}
-                }
+}
-                struct Wrap<T>(T);
+struct Wrap<T>(T);
-                impl<T> Super for Wrap<T> {}
+impl<T> Super for Wrap<T> {}
-                impl<T> Sub for Wrap<T> {
+impl<T> Sub for Wrap<T> {
-                    fn subfunc() {
+    fn subfunc() {
-                        // Should be able to assume `Self: Sub + Super`
+        // Should be able to assume `Self: Sub + Super`
-                        Self::<|>
+        Self::<|>
-                    }
+    }
-                }
+}
-                "
+"#,
-            ),
+            expect![[r#"
-            @r###"
+                ct C2          const C2: () = ();
-        [
+                ct CONST       const CONST: u8 = 0;
-            CompletionItem {
+                ta SubTy       type SubTy;
-                label: "C2",
+                ta Ty          type Ty;
-                source_range: 367..367,
+                fn func()      fn func()
-                delete: 367..367,
+                me method()    fn method(&self)
-                insert: "C2",
+                fn subfunc()   fn subfunc()
-                kind: Const,
+                me submethod() fn submethod(&self)
-                detail: "const C2: () = ();",
+            "#]],
-            },
-            CompletionItem {
-                label: "CONST",
-                source_range: 367..367,
-                delete: 367..367,
-                insert: "CONST",
-                kind: Const,
-                detail: "const CONST: u8 = 0;",
-            },
-            CompletionItem {
-                label: "SubTy",
-                source_range: 367..367,
-                delete: 367..367,
-                insert: "SubTy",
-                kind: TypeAlias,
-                detail: "type SubTy;",
-            },
-            CompletionItem {
-                label: "Ty",
-                source_range: 367..367,
-                delete: 367..367,
-                insert: "Ty",
-                kind: TypeAlias,
-                detail: "type Ty;",
-            },
-            CompletionItem {
-                label: "func()",
-                source_range: 367..367,
-                delete: 367..367,
-                insert: "func()$0",
-                kind: Function,
-                lookup: "func",
-                detail: "fn func()",
-            },
-            CompletionItem {
-                label: "method()",
-                source_range: 367..367,
-                delete: 367..367,
-                insert: "method()$0",
-                kind: Method,
-                lookup: "method",
-                detail: "fn method(&self)",
-            },
-            CompletionItem {
-                label: "subfunc()",
-                source_range: 367..367,
-                delete: 367..367,
-                insert: "subfunc()$0",
-                kind: Function,
-                lookup: "subfunc",
-                detail: "fn subfunc()",
-            },
-            CompletionItem {
-                label: "submethod()",
-                source_range: 367..367,
-                delete: 367..367,
-                insert: "submethod()$0",
-                kind: Method,
-                lookup: "submethod",
-                detail: "fn submethod(&self)",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_type_alias() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+struct S;
-                struct S;
+impl S { fn foo() {} }
-                impl S { fn foo() {} }
+type T = S;
-                type T = S;
+impl T { fn bar() {} }
-                impl T { fn bar() {} }
+fn main() { T::<|>; }
-                fn main() {
+"#,
-                    T::<|>;
+            expect![[r#"
-                }
+                fn bar() fn bar()
-                "
+                fn foo() fn foo()
-            ),
+            "#]],
-            @r###"
-        [
-            CompletionItem {
-                label: "bar()",
-                source_range: 88..88,
-                delete: 88..88,
-                insert: "bar()$0",
-                kind: Function,
-                lookup: "bar",
-                detail: "fn bar()",
-            },
-            CompletionItem {
-                label: "foo()",
-                source_range: 88..88,
-                delete: 88..88,
-                insert: "foo()$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_qualified_macros() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+#[macro_export]
-                #[macro_export]
+macro_rules! foo { () => {} }
-                macro_rules! foo {
-                    () => {}
+fn main() { let _ = crate::<|> }
-                }
+        "#,
+            expect![[r##"
+                ma foo!(…) #[macro_export]
+                macro_rules! foo
+                fn main()  fn main()
+            "##]],
+        );
+    }
-                fn main() {
+    #[test]
-                    let _ = crate::<|>
+    fn test_super_super_completion() {
-                }
+        check(
-                "
+            r#"
-            ),
+mod a {
-            @r###"
+    const A: usize = 0;
-        [
+    mod b {
-            CompletionItem {
+        const B: usize = 0;
-                label: "foo!(…)",
+        mod c { use super::super::<|> }
-                source_range: 82..82,
+    }
-                delete: 82..82,
+}
-                insert: "foo!($0)",
+"#,
-                kind: Macro,
+            expect![[r#"
-                detail: "#[macro_export]\nmacro_rules! foo",
+                ct A
-            },
+                md b
-            CompletionItem {
+            "#]],
-                label: "main()",
-                source_range: 82..82,
-                delete: 82..82,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_reexported_items_under_correct_name() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+fn foo() { self::m::<|> }
-                fn foo() {
-                    self::m::<|>
-                }
-                mod m {
+mod m {
-                    pub use super::p::wrong_fn as right_fn;
+    pub use super::p::wrong_fn as right_fn;
-                    pub use super::p::WRONG_CONST as RIGHT_CONST;
+    pub use super::p::WRONG_CONST as RIGHT_CONST;
-                    pub use super::p::WrongType as RightType;
+    pub use super::p::WrongType as RightType;
-                }
+}
-                mod p {
+mod p {
-                    fn wrong_fn() {}
+    fn wrong_fn() {}
-                    const WRONG_CONST: u32 = 1;
+    const WRONG_CONST: u32 = 1;
-                    struct WrongType {};
+    struct WrongType {};
-                }
+}
-                "
+"#,
-            ),
+            expect![[r#"
-            @r###"
+                ct RIGHT_CONST
-        [
+                st RightType
-            CompletionItem {
+                fn right_fn()  fn wrong_fn()
-                label: "RIGHT_CONST",
+            "#]],
-                source_range: 24..24,
+        );
-                delete: 24..24,
-                insert: "RIGHT_CONST",
+        check_edit(
-                kind: Const,
+            "RightType",
-            },
+            r#"
-            CompletionItem {
+fn foo() { self::m::<|> }
-                label: "RightType",
-                source_range: 24..24,
+mod m {
-                delete: 24..24,
+    pub use super::p::wrong_fn as right_fn;
-                insert: "RightType",
+    pub use super::p::WRONG_CONST as RIGHT_CONST;
-                kind: Struct,
+    pub use super::p::WrongType as RightType;
-            },
+}
-            CompletionItem {
+mod p {
-                label: "right_fn()",
+    fn wrong_fn() {}
-                source_range: 24..24,
+    const WRONG_CONST: u32 = 1;
-                delete: 24..24,
+    struct WrongType {};
-                insert: "right_fn()$0",
+}
-                kind: Function,
+"#,
-                lookup: "right_fn",
+            r#"
-                detail: "fn wrong_fn()",
+fn foo() { self::m::RightType }
-            },
-        ]
+mod m {
-        "###
+    pub use super::p::wrong_fn as right_fn;
+    pub use super::p::WRONG_CONST as RIGHT_CONST;
+    pub use super::p::WrongType as RightType;
+}
+mod p {
+    fn wrong_fn() {}
+    const WRONG_CONST: u32 = 1;
+    struct WrongType {};
+}
+"#,
        );
    }
    #[test]
    fn completes_in_simple_macro_call() {
-        let completions = do_reference_completion(
+        check(
            r#"
-                macro_rules! m { ($e:expr) => { $e } }
+macro_rules! m { ($e:expr) => { $e } }
-                fn main() { m!(self::f<|>); }
+fn main() { m!(self::f<|>); }
-                fn foo() {}
+fn foo() {}
-            "#,
+"#,
+            expect![[r#"
+                fn foo()  fn foo()
+                fn main() fn main()
+            "#]],
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "foo()",
-                source_range: 60..61,
-                delete: 60..61,
-                insert: "foo()$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo()",
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 60..61,
-                delete: 60..61,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###);
    }
    #[test]
    fn function_mod_share_name() {
-        assert_debug_snapshot!(
+        check(
-        do_reference_completion(
+            r#"
-                r"
+fn foo() { self::m::<|> }
-                fn foo() {
-                    self::m::<|>
-                }
-                mod m {
+mod m {
-                    pub mod z {}
+    pub mod z {}
-                    pub fn z() {}
+    pub fn z() {}
-                }
+}
-                ",
+"#,
-        ),
+            expect![[r#"
-            @r###"
+                md z
-        [
+                fn z() pub fn z()
-            CompletionItem {
+            "#]],
-                label: "z",
-                source_range: 24..24,
-                delete: 24..24,
-                insert: "z",
-                kind: Module,
-            },
-            CompletionItem {
-                label: "z()",
-                source_range: 24..24,
-                delete: 24..24,
-                insert: "z()$0",
-                kind: Function,
-                lookup: "z",
-                detail: "pub fn z()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_hashmap_new() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+struct RandomState;
-                struct RandomState;
+struct HashMap<K, V, S = RandomState> {}
-                struct HashMap<K, V, S = RandomState> {}
+impl<K, V> HashMap<K, V, RandomState> {
-                impl<K, V> HashMap<K, V, RandomState> {
+    pub fn new() -> HashMap<K, V, RandomState> { }
-                    pub fn new() -> HashMap<K, V, RandomState> { }
+}
-                }
+fn foo() {
-                fn foo() {
+    HashMap::<|>
-                    HashMap::<|>
+}
-                }
+"#,
-                "
+            expect![[r#"
-            ),
+                fn new() pub fn new() -> HashMap<K, V, RandomState>
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "new()",
-                source_range: 179..179,
-                delete: 179..179,
-                insert: "new()$0",
-                kind: Function,
-                lookup: "new",
-                detail: "pub fn new() -> HashMap<K, V, RandomState>",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn dont_complete_attr() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+mod foo { pub struct Foo; }
-                mod foo { pub struct Foo; }
+#[foo::<|>]
-                #[foo::<|>]
+fn f() {}
-                fn f() {}
+"#,
-                "
+            expect![[""]],
-            ),
+        );
-            @r###"[]"###
-        )
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_record.rs b/crates/ra_ide/src/completion/complete_record.rs
index 13eb2f79f..74b94594d 100644
--- a/crates/ra_ide/src/completion/complete_record.rs
+++ b/crates/ra_ide/src/completion/complete_record.rs
@@ -18,389 +18,209 @@ pub(super) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
 #[cfg(test)]
 mod tests {
-    mod record_pat_tests {
+    use expect::{expect, Expect};
-        use insta::assert_debug_snapshot;
-        use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use crate::completion::{test_utils::completion_list, CompletionKind};
-        fn complete(code: &str) -> Vec<CompletionItem> {
+    fn check(ra_fixture: &str, expect: Expect) {
-            do_completion(code, CompletionKind::Reference)
+        let actual = completion_list(ra_fixture, CompletionKind::Reference);
-        }
+        expect.assert_eq(&actual);
+    }
-        #[test]
-        fn test_record_pattern_field() {
-            let completions = complete(
-                r"
-            struct S { foo: u32 }
-            fn process(f: S) {
-                match f {
-                    S { f<|>: 92 } => (),
-                }
-            }
-            ",
-            );
-            assert_debug_snapshot!(completions, @r###"
-            [
-                CompletionItem {
-                    label: "foo",
-                    source_range: 68..69,
-                    delete: 68..69,
-                    insert: "foo",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
-        fn test_record_pattern_enum_variant() {
-            let completions = complete(
-                r"
-            enum E {
-                S { foo: u32, bar: () }
-            }
-            fn process(e: E) {
-                match e {
-                    E::S { <|> } => (),
-                }
-            }
-            ",
-            );
-            assert_debug_snapshot!(completions, @r###"
-            [
-                CompletionItem {
-                    label: "bar",
-                    source_range: 88..88,
-                    delete: 88..88,
-                    insert: "bar",
-                    kind: Field,
-                    detail: "()",
-                },
-                CompletionItem {
-                    label: "foo",
-                    source_range: 88..88,
-                    delete: 88..88,
-                    insert: "foo",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn test_record_pattern_field_in_simple_macro() {
+    fn test_record_pattern_field() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            macro_rules! m { ($e:expr) => { $e } }
+struct S { foo: u32 }
-            struct S { foo: u32 }
-            fn process(f: S) {
+fn process(f: S) {
-                m!(match f {
+    match f {
-                    S { f<|>: 92 } => (),
+        S { f<|>: 92 } => (),
-                })
+    }
-            }
+}
-            ",
+"#,
-            );
+            expect![[r#"
-            assert_debug_snapshot!(completions, @r###"
+                fd foo u32
-            [
+            "#]],
-                CompletionItem {
+        );
-                    label: "foo",
+    }
-                    source_range: 110..111,
-                    delete: 110..111,
-                    insert: "foo",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn only_missing_fields_are_completed_in_destruct_pats() {
+    fn test_record_pattern_enum_variant() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            struct S {
+enum E { S { foo: u32, bar: () } }
-                foo1: u32,
-                foo2: u32,
-                bar: u32,
-                baz: u32,
-            }
-            fn main() {
+fn process(e: E) {
-                let s = S {
+    match e {
-                    foo1: 1,
+        E::S { <|> } => (),
-                    foo2: 2,
+    }
-                    bar: 3,
+}
-                    baz: 4,
+"#,
-                };
+            expect![[r#"
-                if let S { foo1, foo2: a, <|> } = s {}
+                fd bar ()
-            }
+                fd foo u32
-            ",
+            "#]],
-            );
+        );
-            assert_debug_snapshot!(completions, @r###"
-            [
-                CompletionItem {
-                    label: "bar",
-                    source_range: 203..203,
-                    delete: 203..203,
-                    insert: "bar",
-                    kind: Field,
-                    detail: "u32",
-                },
-                CompletionItem {
-                    label: "baz",
-                    source_range: 203..203,
-                    delete: 203..203,
-                    insert: "baz",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
    }
-    mod record_lit_tests {
+    #[test]
-        use insta::assert_debug_snapshot;
+    fn test_record_pattern_field_in_simple_macro() {
+        check(
-        use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+            r"
+macro_rules! m { ($e:expr) => { $e } }
+struct S { foo: u32 }
+fn process(f: S) {
+    m!(match f {
+        S { f<|>: 92 } => (),
+    })
+}
+",
+            expect![[r#"
+                fd foo u32
+            "#]],
+        );
+    }
-        fn complete(code: &str) -> Vec<CompletionItem> {
+    #[test]
-            do_completion(code, CompletionKind::Reference)
+    fn only_missing_fields_are_completed_in_destruct_pats() {
-        }
+        check(
+            r#"
+struct S {
+    foo1: u32, foo2: u32,
+    bar: u32, baz: u32,
+}
-        #[test]
+fn main() {
-        fn test_record_literal_deprecated_field() {
+    let s = S {
-            let completions = complete(
+        foo1: 1, foo2: 2,
-                r"
+        bar: 3, baz: 4,
-            struct A {
+    };
-                #[deprecated]
+    if let S { foo1, foo2: a, <|> } = s {}
-                the_field: u32,
+}
-            }
+"#,
-            fn foo() {
+            expect![[r#"
-               A { the<|> }
+                fd bar u32
-            }
+                fd baz u32
-            ",
+            "#]],
-            );
+        );
-            assert_debug_snapshot!(completions, @r###"
+    }
-            [
-                CompletionItem {
-                    label: "the_field",
-                    source_range: 69..72,
-                    delete: 69..72,
-                    insert: "the_field",
-                    kind: Field,
-                    detail: "u32",
-                    deprecated: true,
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn test_record_literal_field() {
+    fn test_record_literal_field() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            struct A { the_field: u32 }
+struct A { the_field: u32 }
-            fn foo() {
+fn foo() {
-               A { the<|> }
+   A { the<|> }
-            }
+}
-            ",
+"#,
-            );
+            expect![[r#"
-            assert_debug_snapshot!(completions, @r###"
+                fd the_field u32
-            [
+            "#]],
-                CompletionItem {
+        );
-                    label: "the_field",
+    }
-                    source_range: 46..49,
-                    delete: 46..49,
-                    insert: "the_field",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn test_record_literal_enum_variant() {
+    fn test_record_literal_enum_variant() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            enum E {
+enum E { A { a: u32 } }
-                A { a: u32 }
+fn foo() {
-            }
+    let _ = E::A { <|> }
-            fn foo() {
+}
-                let _ = E::A { <|> }
+"#,
-            }
+            expect![[r#"
-            ",
+                fd a u32
-            );
+            "#]],
-            assert_debug_snapshot!(completions, @r###"
+        );
-            [
+    }
-                CompletionItem {
-                    label: "a",
-                    source_range: 58..58,
-                    delete: 58..58,
-                    insert: "a",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn test_record_literal_two_structs() {
+    fn test_record_literal_two_structs() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            struct A { a: u32 }
+struct A { a: u32 }
-            struct B { b: u32 }
+struct B { b: u32 }
-            fn foo() {
+fn foo() {
-               let _: A = B { <|> }
+   let _: A = B { <|> }
-            }
+}
-            ",
+"#,
-            );
+            expect![[r#"
-            assert_debug_snapshot!(completions, @r###"
+                fd b u32
-            [
+            "#]],
-                CompletionItem {
+        );
-                    label: "b",
+    }
-                    source_range: 70..70,
-                    delete: 70..70,
-                    insert: "b",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn test_record_literal_generic_struct() {
+    fn test_record_literal_generic_struct() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            struct A<T> { a: T }
+struct A<T> { a: T }
-            fn foo() {
+fn foo() {
-               let _: A<u32> = A { <|> }
+   let _: A<u32> = A { <|> }
-            }
+}
-            ",
+"#,
-            );
+            expect![[r#"
-            assert_debug_snapshot!(completions, @r###"
+                fd a u32
-            [
+            "#]],
-                CompletionItem {
+        );
-                    label: "a",
+    }
-                    source_range: 56..56,
-                    delete: 56..56,
-                    insert: "a",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn test_record_literal_field_in_simple_macro() {
+    fn test_record_literal_field_in_simple_macro() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            macro_rules! m { ($e:expr) => { $e } }
+macro_rules! m { ($e:expr) => { $e } }
-            struct A { the_field: u32 }
+struct A { the_field: u32 }
-            fn foo() {
+fn foo() {
-               m!(A { the<|> })
+   m!(A { the<|> })
-            }
+}
-            ",
+"#,
-            );
+            expect![[r#"
-            assert_debug_snapshot!(completions, @r###"
+                fd the_field u32
-            [
+            "#]],
-                CompletionItem {
+        );
-                    label: "the_field",
+    }
-                    source_range: 88..91,
-                    delete: 88..91,
-                    insert: "the_field",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn only_missing_fields_are_completed() {
+    fn only_missing_fields_are_completed() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            struct S {
+struct S {
-                foo1: u32,
+    foo1: u32, foo2: u32,
-                foo2: u32,
+    bar: u32, baz: u32,
-                bar: u32,
+}
-                baz: u32,
-            }
-            fn main() {
+fn main() {
-                let foo1 = 1;
+    let foo1 = 1;
-                let s = S {
+    let s = S { foo1, foo2: 5, <|> }
-                    foo1,
+}
-                    foo2: 5,
+"#,
-                    <|>
+            expect![[r#"
-                }
+                fd bar u32
-            }
+                fd baz u32
-            ",
+            "#]],
-            );
+        );
-            assert_debug_snapshot!(completions, @r###"
+    }
-            [
-                CompletionItem {
-                    label: "bar",
-                    source_range: 157..157,
-                    delete: 157..157,
-                    insert: "bar",
-                    kind: Field,
-                    detail: "u32",
-                },
-                CompletionItem {
-                    label: "baz",
-                    source_range: 157..157,
-                    delete: 157..157,
-                    insert: "baz",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
-        #[test]
+    #[test]
-        fn completes_functional_update() {
+    fn completes_functional_update() {
-            let completions = complete(
+        check(
-                r"
+            r#"
-            struct S {
+struct S { foo1: u32, foo2: u32 }
-                foo1: u32,
-                foo2: u32,
-            }
-            fn main() {
+fn main() {
-                let foo1 = 1;
+    let foo1 = 1;
-                let s = S {
+    let s = S { foo1, <|> .. loop {} }
-                    foo1,
+}
-                    <|>
+"#,
-                    .. loop {}
+            expect![[r#"
-                }
+                fd foo2 u32
-            }
+            "#]],
-            ",
+        );
-            );
-            assert_debug_snapshot!(completions, @r###"
-            [
-                CompletionItem {
-                    label: "foo2",
-                    source_range: 112..112,
-                    delete: 112..112,
-                    insert: "foo2",
-                    kind: Field,
-                    detail: "u32",
-                },
-            ]
-            "###);
-        }
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_snippet.rs b/crates/ra_ide/src/completion/complete_snippet.rs
index 52aaa70f0..28d8f7876 100644
--- a/crates/ra_ide/src/completion/complete_snippet.rs
+++ b/crates/ra_ide/src/completion/complete_snippet.rs
@@ -70,95 +70,47 @@ fn ${1:feature}() {
 #[cfg(test)]
 mod tests {
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use expect::{expect, Expect};
-    use insta::assert_debug_snapshot;
-    fn do_snippet_completion(code: &str) -> Vec<CompletionItem> {
+    use crate::completion::{test_utils::completion_list, CompletionKind};
-        do_completion(code, CompletionKind::Snippet)
+    fn check(ra_fixture: &str, expect: Expect) {
+        let actual = completion_list(ra_fixture, CompletionKind::Snippet);
+        expect.assert_eq(&actual)
    }
    #[test]
    fn completes_snippets_in_expressions() {
-        assert_debug_snapshot!(
+        check(
-                    do_snippet_completion(r"fn foo(x: i32) { <|> }"),
+            r#"fn foo(x: i32) { <|> }"#,
-        @r###"
+            expect![[r#"
-        [
+                sn pd
-            CompletionItem {
+                sn ppd
-                label: "pd",
+            "#]],
-                source_range: 17..17,
+        );
-                delete: 17..17,
-                insert: "eprintln!(\"$0 = {:?}\", $0);",
-                kind: Snippet,
-            },
-            CompletionItem {
-                label: "ppd",
-                source_range: 17..17,
-                delete: 17..17,
-                insert: "eprintln!(\"$0 = {:#?}\", $0);",
-                kind: Snippet,
-            },
-        ]
-        "###
-                );
    }
    #[test]
    fn should_not_complete_snippets_in_path() {
-        assert_debug_snapshot!(
+        check(r#"fn foo(x: i32) { ::foo<|> }"#, expect![[""]]);
-                    do_snippet_completion(r"fn foo(x: i32) { ::foo<|> }"),
+        check(r#"fn foo(x: i32) { ::<|> }"#, expect![[""]]);
-        @"[]"
-                );
-        assert_debug_snapshot!(
-                    do_snippet_completion(r"fn foo(x: i32) { ::<|> }"),
-        @"[]"
-                );
    }
    #[test]
    fn completes_snippets_in_items() {
-        assert_debug_snapshot!(
+        check(
-            do_snippet_completion(
+            r#"
-                r"
+#[cfg(test)]
-                #[cfg(test)]
+mod tests {
-                mod tests {
+    <|>
-                    <|>
+}
-                }
+"#,
-                "
+            expect![[r#"
-            ),
+                sn Test function
-            @r###"
+                sn Test module
-        [
+                sn macro_rules
-            CompletionItem {
+                sn pub(crate)
-                label: "Test function",
+            "#]],
-                source_range: 29..29,
+        )
-                delete: 29..29,
-                insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
-                kind: Snippet,
-                lookup: "tfn",
-            },
-            CompletionItem {
-                label: "Test module",
-                source_range: 29..29,
-                delete: 29..29,
-                insert: "#[cfg(test)]\nmod tests {\n    use super::*;\n\n    #[test]\n    fn ${1:test_name}() {\n        $0\n    }\n}",
-                kind: Snippet,
-                lookup: "tmod",
-            },
-            CompletionItem {
-                label: "macro_rules",
-                source_range: 29..29,
-                delete: 29..29,
-                insert: "macro_rules! $1 {\n\t($2) => {\n\t\t$0\n\t};\n}",
-                kind: Snippet,
-            },
-            CompletionItem {
-                label: "pub(crate)",
-                source_range: 29..29,
-                delete: 29..29,
-                insert: "pub(crate) $0",
-                kind: Snippet,
-            },
-        ]
-        "###
-        );
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index 23e42928d..d9a0ef167 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -2,8 +2,8 @@
 //!
 //! This module adds the completion items related to implementing associated
 //! items within a `impl Trait for Struct` block. The current context node
-//! must be within either a `FN_DEF`, `TYPE_ALIAS_DEF`, or `CONST_DEF` node
+//! must be within either a `FN`, `TYPE_ALIAS`, or `CONST` node
-//! and an direct child of an `IMPL_DEF`.
+//! and an direct child of an `IMPL`.
 //!
 //! # Examples
 //!
@@ -34,7 +34,7 @@
 use hir::{self, Docs, HasSource};
 use ra_assists::utils::get_missing_assoc_items;
 use ra_syntax::{
-    ast::{self, edit, ImplDef},
+    ast::{self, edit, Impl},
    AstNode, SyntaxKind, SyntaxNode, TextRange, T,
 };
 use ra_text_edit::TextEdit;
@@ -43,7 +43,7 @@ use crate::{
    completion::{
        CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions,
    },
-    display::FunctionSignature,
+    display::function_declaration,
 };
 pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext) {
@@ -63,7 +63,7 @@ pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext
                    }
                }),
-            SyntaxKind::FN_DEF => {
+            SyntaxKind::FN => {
                for missing_fn in get_missing_assoc_items(&ctx.sema, &impl_def)
                    .into_iter()
                    .filter_map(|item| match item {
@@ -75,7 +75,7 @@ pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext
                }
            }
-            SyntaxKind::TYPE_ALIAS_DEF => {
+            SyntaxKind::TYPE_ALIAS => {
                for missing_fn in get_missing_assoc_items(&ctx.sema, &impl_def)
                    .into_iter()
                    .filter_map(|item| match item {
@@ -87,7 +87,7 @@ pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext
                }
            }
-            SyntaxKind::CONST_DEF => {
+            SyntaxKind::CONST => {
                for missing_fn in get_missing_assoc_items(&ctx.sema, &impl_def)
                    .into_iter()
                    .filter_map(|item| match item {
@@ -104,18 +104,17 @@ pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext
    }
 }
-fn completion_match(ctx: &CompletionContext) -> Option<(SyntaxNode, ImplDef)> {
+fn completion_match(ctx: &CompletionContext) -> Option<(SyntaxNode, Impl)> {
    let (trigger, impl_def_offset) = ctx.token.ancestors().find_map(|p| match p.kind() {
-        SyntaxKind::FN_DEF
+        SyntaxKind::FN | SyntaxKind::TYPE_ALIAS | SyntaxKind::CONST | SyntaxKind::BLOCK_EXPR => {
-        | SyntaxKind::TYPE_ALIAS_DEF
+            Some((p, 2))
-        | SyntaxKind::CONST_DEF
+        }
-        | SyntaxKind::BLOCK_EXPR => Some((p, 2)),
        SyntaxKind::NAME_REF => Some((p, 5)),
        _ => None,
    })?;
    let impl_def = (0..impl_def_offset - 1)
        .try_fold(trigger.parent()?, |t, _| t.parent())
-        .and_then(ast::ImplDef::cast)?;
+        .and_then(ast::Impl::cast)?;
    Some((trigger, impl_def))
 }
@@ -125,8 +124,6 @@ fn add_function_impl(
    ctx: &CompletionContext,
    func: hir::Function,
 ) {
-    let signature = FunctionSignature::from_hir(ctx.db, func);
    let fn_name = func.name(ctx.db).to_string();
    let label = if !func.params(ctx.db).is_empty() {
@@ -146,13 +143,14 @@ fn add_function_impl(
    };
    let range = TextRange::new(fn_def_node.text_range().start(), ctx.source_range().end());
+    let function_decl = function_declaration(&func.source(ctx.db).value);
    match ctx.config.snippet_cap {
        Some(cap) => {
-            let snippet = format!("{} {{\n    $0\n}}", signature);
+            let snippet = format!("{} {{\n    $0\n}}", function_decl);
            builder.snippet_edit(cap, TextEdit::replace(range, snippet))
        }
        None => {
-            let header = format!("{} {{", signature);
+            let header = format!("{} {{", function_decl);
            builder.text_edit(TextEdit::replace(range, header))
        }
    }
@@ -202,7 +200,7 @@ fn add_const_impl(
    }
 }
-fn make_const_compl_syntax(const_: &ast::ConstDef) -> String {
+fn make_const_compl_syntax(const_: &ast::Const) -> String {
    let const_ = edit::remove_attrs_and_docs(const_);
    let const_start = const_.syntax().text_range().start();
@@ -227,330 +225,264 @@ fn make_const_compl_syntax(const_: &ast::ConstDef) -> String {
 #[cfg(test)]
 mod tests {
-    use insta::assert_debug_snapshot;
+    use expect::{expect, Expect};
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use crate::completion::{
+        test_utils::{check_edit, completion_list},
+        CompletionKind,
+    };
-    fn complete(code: &str) -> Vec<CompletionItem> {
+    fn check(ra_fixture: &str, expect: Expect) {
-        do_completion(code, CompletionKind::Magic)
+        let actual = completion_list(ra_fixture, CompletionKind::Magic);
+        expect.assert_eq(&actual)
    }
    #[test]
    fn name_ref_function_type_const() {
-        let completions = complete(
+        check(
-            r"
+            r#"
-            trait Test {
+trait Test {
-                type TestType;
+    type TestType;
-                const TEST_CONST: u16;
+    const TEST_CONST: u16;
-                fn test();
+    fn test();
-            }
+}
+struct T;
-            struct T1;
-            impl Test for T1 {
+impl Test for T {
-                t<|>
+    t<|>
-            }
+}
-            ",
+"#,
+            expect![["
+ct const TEST_CONST: u16 = \n\
+fn fn test()
+ta type TestType = \n\
+            "]],
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "const TEST_CONST: u16 = ",
-                source_range: 112..113,
-                delete: 112..113,
-                insert: "const TEST_CONST: u16 = ",
-                kind: Const,
-                lookup: "TEST_CONST",
-            },
-            CompletionItem {
-                label: "fn test()",
-                source_range: 112..113,
-                delete: 112..113,
-                insert: "fn test() {\n    $0\n}",
-                kind: Function,
-                lookup: "test",
-            },
-            CompletionItem {
-                label: "type TestType = ",
-                source_range: 112..113,
-                delete: 112..113,
-                insert: "type TestType = ",
-                kind: TypeAlias,
-                lookup: "TestType",
-            },
-        ]
-        "###);
    }
    #[test]
    fn no_nested_fn_completions() {
-        let completions = complete(
+        check(
            r"
-            trait Test {
+trait Test {
-                fn test();
+    fn test();
-                fn test2();
+    fn test2();
-            }
+}
+struct T;
-            struct T1;
-            impl Test for T1 {
+impl Test for T {
-                fn test() {
+    fn test() {
-                    t<|>
+        t<|>
-                }
+    }
-            }
+}
-            ",
+",
+            expect![[""]],
        );
-        assert_debug_snapshot!(completions, @r###"[]"###);
    }
    #[test]
    fn name_ref_single_function() {
-        let completions = complete(
+        check_edit(
-            r"
+            "test",
-            trait Test {
+            r#"
-                fn test();
+trait Test {
-            }
+    fn test();
+}
+struct T;
-            struct T1;
+impl Test for T {
+    t<|>
+}
+"#,
+            r#"
+trait Test {
+    fn test();
+}
+struct T;
-            impl Test for T1 {
+impl Test for T {
-                t<|>
+    fn test() {
-            }
+    $0
-            ",
+}
+}
+"#,
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "fn test()",
-                source_range: 66..67,
-                delete: 66..67,
-                insert: "fn test() {\n    $0\n}",
-                kind: Function,
-                lookup: "test",
-            },
-        ]
-        "###);
    }
    #[test]
    fn single_function() {
-        let completions = complete(
+        check_edit(
-            r"
+            "test",
-            trait Test {
+            r#"
-                fn foo();
+trait Test {
-            }
+    fn test();
+}
+struct T;
-            struct T1;
+impl Test for T {
+    fn t<|>
+}
+"#,
+            r#"
+trait Test {
+    fn test();
+}
+struct T;
-            impl Test for T1 {
+impl Test for T {
-                fn f<|>
+    fn test() {
-            }
+    $0
-            ",
+}
+}
+"#,
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "fn foo()",
-                source_range: 68..69,
-                delete: 65..69,
-                insert: "fn foo() {\n    $0\n}",
-                kind: Function,
-                lookup: "foo",
-            },
-        ]
-        "###);
    }
    #[test]
    fn hide_implemented_fn() {
-        let completions = complete(
+        check(
-            r"
+            r#"
-            trait Test {
+trait Test {
-                fn foo();
+    fn foo();
-                fn foo_bar();
+    fn foo_bar();
-            }
+}
+struct T;
-            struct T1;
-            impl Test for T1 {
-                fn foo() {}
-                fn f<|>
-            }
-            ",
-        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "fn foo_bar()",
-                source_range: 103..104,
-                delete: 100..104,
-                insert: "fn foo_bar() {\n    $0\n}",
-                kind: Function,
-                lookup: "foo_bar",
-            },
-        ]
-        "###);
-    }
-    #[test]
-    fn completes_only_on_top_level() {
-        let completions = complete(
-            r"
-            trait Test {
-                fn foo();
-                fn foo_bar();
-            }
-            struct T1;
-            impl Test for T1 {
+impl Test for T {
-                fn foo() {
+    fn foo() {}
-                    <|>
+    fn f<|>
-                }
+}
-            }
+"#,
-            ",
+            expect![[r#"
+                fn fn foo_bar()
+            "#]],
        );
-        assert_debug_snapshot!(completions, @r###"[]"###);
    }
    #[test]
    fn generic_fn() {
-        let completions = complete(
+        check_edit(
-            r"
+            "foo",
-            trait Test {
+            r#"
-                fn foo<T>();
+trait Test {
-            }
+    fn foo<T>();
+}
+struct T;
-            struct T1;
+impl Test for T {
+    fn f<|>
+}
+"#,
+            r#"
+trait Test {
+    fn foo<T>();
+}
+struct T;
-            impl Test for T1 {
+impl Test for T {
-                fn f<|>
+    fn foo<T>() {
-            }
+    $0
-            ",
+}
+}
+"#,
        );
-        assert_debug_snapshot!(completions, @r###"
+        check_edit(
-        [
+            "foo",
-            CompletionItem {
+            r#"
-                label: "fn foo()",
+trait Test {
-                source_range: 71..72,
+    fn foo<T>() where T: Into<String>;
-                delete: 68..72,
+}
-                insert: "fn foo<T>() {\n    $0\n}",
+struct T;
-                kind: Function,
-                lookup: "foo",
-            },
-        ]
-        "###);
-    }
-    #[test]
-    fn generic_constrait_fn() {
-        let completions = complete(
-            r"
-            trait Test {
-                fn foo<T>() where T: Into<String>;
-            }
-            struct T1;
+impl Test for T {
+    fn f<|>
+}
+"#,
+            r#"
+trait Test {
+    fn foo<T>() where T: Into<String>;
+}
+struct T;
-            impl Test for T1 {
+impl Test for T {
-                fn f<|>
+    fn foo<T>()
-            }
+where T: Into<String> {
-            ",
+    $0
+}
+}
+"#,
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "fn foo()",
-                source_range: 93..94,
-                delete: 90..94,
-                insert: "fn foo<T>()\nwhere T: Into<String> {\n    $0\n}",
-                kind: Function,
-                lookup: "foo",
-            },
-        ]
-        "###);
    }
    #[test]
    fn associated_type() {
-        let completions = complete(
+        check_edit(
-            r"
+            "SomeType",
-            trait Test {
+            r#"
-                type SomeType;
+trait Test {
-            }
+    type SomeType;
+}
-            impl Test for () {
+impl Test for () {
-                type S<|>
+    type S<|>
-            }
+}
-            ",
+"#,
+            "
+trait Test {
+    type SomeType;
+}
+impl Test for () {
+    type SomeType = \n\
+}
+",
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "type SomeType = ",
-                source_range: 63..64,
-                delete: 58..64,
-                insert: "type SomeType = ",
-                kind: TypeAlias,
-                lookup: "SomeType",
-            },
-        ]
-        "###);
    }
    #[test]
    fn associated_const() {
-        let completions = complete(
+        check_edit(
-            r"
+            "SOME_CONST",
-            trait Test {
+            r#"
-                const SOME_CONST: u16;
+trait Test {
-            }
+    const SOME_CONST: u16;
+}
-            impl Test for () {
+impl Test for () {
-                const S<|>
+    const S<|>
-            }
+}
-            ",
+"#,
+            "
+trait Test {
+    const SOME_CONST: u16;
+}
+impl Test for () {
+    const SOME_CONST: u16 = \n\
+}
+",
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "const SOME_CONST: u16 = ",
-                source_range: 72..73,
-                delete: 66..73,
-                insert: "const SOME_CONST: u16 = ",
-                kind: Const,
-                lookup: "SOME_CONST",
-            },
-        ]
-        "###);
-    }
-    #[test]
+        check_edit(
-    fn associated_const_with_default() {
+            "SOME_CONST",
-        let completions = complete(
+            r#"
-            r"
+trait Test {
-            trait Test {
+    const SOME_CONST: u16 = 92;
-                const SOME_CONST: u16 = 42;
+}
-            }
-            impl Test for () {
+impl Test for () {
-                const S<|>
+    const S<|>
-            }
+}
-            ",
+"#,
+            "
+trait Test {
+    const SOME_CONST: u16 = 92;
+}
+impl Test for () {
+    const SOME_CONST: u16 = \n\
+}
+",
        );
-        assert_debug_snapshot!(completions, @r###"
-        [
-            CompletionItem {
-                label: "const SOME_CONST: u16 = ",
-                source_range: 77..78,
-                delete: 71..78,
-                insert: "const SOME_CONST: u16 = ",
-                kind: Const,
-                lookup: "SOME_CONST",
-            },
-        ]
-        "###);
    }
 }
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index a0a04bb58..bd9551f35 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -1,11 +1,10 @@
 //! Completion of names from the current scope, e.g. locals and imported items.
-use hir::ScopeDef;
+use hir::{Adt, ModuleDef, ScopeDef, Type};
+use ra_syntax::AstNode;
 use test_utils::mark;
 use crate::completion::{CompletionContext, Completions};
-use hir::{Adt, ModuleDef, Type};
-use ra_syntax::AstNode;
 pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) {
    if !(ctx.is_trivial_path || ctx.is_pat_binding_or_const) {
@@ -26,7 +25,7 @@ pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC
        return;
    }
-    ctx.scope().process_all_names(&mut |name, res| {
+    ctx.scope.process_all_names(&mut |name, res| {
        if ctx.use_item_syntax.is_some() {
            if let (ScopeDef::Unknown, Some(name_ref)) = (&res, &ctx.name_ref_syntax) {
                if name_ref.syntax().text() == name.to_string().as_str() {
@@ -43,7 +42,7 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
    if let Some(Adt::Enum(enum_data)) = ty.as_adt() {
        let variants = enum_data.variants(ctx.db);
-        let module = if let Some(module) = ctx.scope().module() {
+        let module = if let Some(module) = ctx.scope.module() {
            // Compute path from the completion site if available.
            module
        } else {
@@ -65,1361 +64,595 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
 #[cfg(test)]
 mod tests {
-    use insta::assert_debug_snapshot;
+    use expect::{expect, Expect};
    use test_utils::mark;
-    use crate::completion::{test_utils::do_completion, CompletionItem, CompletionKind};
+    use crate::completion::{
+        test_utils::{check_edit, completion_list},
+        CompletionKind,
+    };
-    fn do_reference_completion(ra_fixture: &str) -> Vec<CompletionItem> {
+    fn check(ra_fixture: &str, expect: Expect) {
-        do_completion(ra_fixture, CompletionKind::Reference)
+        let actual = completion_list(ra_fixture, CompletionKind::Reference);
+        expect.assert_eq(&actual)
    }
    #[test]
    fn self_fulfilling_completion() {
        mark::check!(self_fulfilling_completion);
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r#"
+use foo<|>
-                use foo<|>
+use std::collections;
-                use std::collections;
+"#,
-                "#,
+            expect![[r#"
-            ),
+                ?? collections
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "collections",
-                source_range: 4..7,
-                delete: 4..7,
-                insert: "collections",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn bind_pat_and_path_ignore_at() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+enum Enum { A, B }
-                enum Enum {
+fn quux(x: Option<Enum>) {
-                    A,
+    match x {
-                    B,
+        None => (),
-                }
+        Some(en<|> @ Enum::A) => (),
-                fn quux(x: Option<Enum>) {
+    }
-                    match x {
+}
-                        None => (),
+"#,
-                        Some(en<|> @ Enum::A) => (),
+            expect![[""]],
-                    }
-                }
-                "
-            ),
-            @"[]"
        );
    }
    #[test]
    fn bind_pat_and_path_ignore_ref() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+enum Enum { A, B }
-                enum Enum {
+fn quux(x: Option<Enum>) {
-                    A,
+    match x {
-                    B,
+        None => (),
-                }
+        Some(ref en<|>) => (),
-                fn quux(x: Option<Enum>) {
+    }
-                    match x {
+}
-                        None => (),
+"#,
-                        Some(ref en<|>) => (),
+            expect![[""]],
-                    }
-                }
-                "
-            ),
-            @r###"[]"###
        );
    }
    #[test]
    fn bind_pat_and_path() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+enum Enum { A, B }
-                enum Enum {
+fn quux(x: Option<Enum>) {
-                    A,
+    match x {
-                    B,
+        None => (),
-                }
+        Some(En<|>) => (),
-                fn quux(x: Option<Enum>) {
+    }
-                    match x {
+}
-                        None => (),
+"#,
-                        Some(En<|>) => (),
+            expect![[r#"
-                    }
+                en Enum
-                }
+            "#]],
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "Enum",
-                source_range: 102..104,
-                delete: 102..104,
-                insert: "Enum",
-                kind: Enum,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_bindings_from_let() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+fn quux(x: i32) {
-                fn quux(x: i32) {
+    let y = 92;
-                    let y = 92;
+    1 + <|>;
-                    1 + <|>;
+    let z = ();
-                    let z = ();
+}
-                }
+"#,
-                "
+            expect![[r#"
-            ),
+                fn quux(…) fn quux(x: i32)
-            @r###"
+                bn x       i32
-        [
+                bn y       i32
-            CompletionItem {
+            "#]],
-                label: "quux(…)",
-                source_range: 42..42,
-                delete: 42..42,
-                insert: "quux(${1:x})$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux(x: i32)",
-                trigger_call_info: true,
-            },
-            CompletionItem {
-                label: "x",
-                source_range: 42..42,
-                delete: 42..42,
-                insert: "x",
-                kind: Binding,
-                detail: "i32",
-            },
-            CompletionItem {
-                label: "y",
-                source_range: 42..42,
-                delete: 42..42,
-                insert: "y",
-                kind: Binding,
-                detail: "i32",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_bindings_from_if_let() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+fn quux() {
-                fn quux() {
+    if let Some(x) = foo() {
-                    if let Some(x) = foo() {
+        let y = 92;
-                        let y = 92;
+    };
-                    };
+    if let Some(a) = bar() {
-                    if let Some(a) = bar() {
+        let b = 62;
-                        let b = 62;
+        1 + <|>
-                        1 + <|>
+    }
-                    }
+}
-                }
+"#,
-                "
+            expect![[r#"
-            ),
+                bn a
-            @r###"
+                bn b      i32
-        [
+                fn quux() fn quux()
-            CompletionItem {
+            "#]],
-                label: "a",
-                source_range: 129..129,
-                delete: 129..129,
-                insert: "a",
-                kind: Binding,
-            },
-            CompletionItem {
-                label: "b",
-                source_range: 129..129,
-                delete: 129..129,
-                insert: "b",
-                kind: Binding,
-                detail: "i32",
-            },
-            CompletionItem {
-                label: "quux()",
-                source_range: 129..129,
-                delete: 129..129,
-                insert: "quux()$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_bindings_from_for() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+fn quux() {
-                fn quux() {
+    for x in &[1, 2, 3] { <|> }
-                    for x in &[1, 2, 3] {
+}
-                        <|>
+"#,
-                    }
+            expect![[r#"
-                }
+                fn quux() fn quux()
-                "
+                bn x
-            ),
+            "#]],
-            @r###"
-        [
-            CompletionItem {
-                label: "quux()",
-                source_range: 46..46,
-                delete: 46..46,
-                insert: "quux()$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux()",
-            },
-            CompletionItem {
-                label: "x",
-                source_range: 46..46,
-                delete: 46..46,
-                insert: "x",
-                kind: Binding,
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn completes_bindings_from_for_with_in_prefix() {
+    fn completes_if_prefix_is_keyword() {
-        mark::check!(completes_bindings_from_for_with_in_prefix);
+        mark::check!(completes_if_prefix_is_keyword);
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "wherewolf",
-                r"
+            r#"
-                fn test() {
+fn main() {
-                    for index in &[1, 2, 3] {
+    let wherewolf = 92;
-                        let t = in<|>
+    drop(where<|>)
-                    }
+}
-                }
+"#,
-                "
+            r#"
-            ),
+fn main() {
-            @r###"
+    let wherewolf = 92;
-        [
+    drop(wherewolf)
-            CompletionItem {
+}
-                label: "index",
+"#,
-                source_range: 58..58,
+        )
-                delete: 58..58,
-                insert: "index",
-                kind: Binding,
-            },
-            CompletionItem {
-                label: "test()",
-                source_range: 58..58,
-                delete: 58..58,
-                insert: "test()$0",
-                kind: Function,
-                lookup: "test",
-                detail: "fn test()",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn completes_generic_params() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"fn quux<T>() { <|> }"#,
-                r"
+            expect![[r#"
-                fn quux<T>() {
+                tp T
-                    <|>
+                fn quux() fn quux<T>()
-                }
+            "#]],
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "T",
-                source_range: 19..19,
-                delete: 19..19,
-                insert: "T",
-                kind: TypeParam,
-            },
-            CompletionItem {
-                label: "quux()",
-                source_range: 19..19,
-                delete: 19..19,
-                insert: "quux()$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux<T>()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_generic_params_in_struct() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"struct S<T> { x: <|>}"#,
-                r"
+            expect![[r#"
-                struct X<T> {
+                st S<…>
-                    x: <|>
+                tp Self
-                }
+                tp T
-                "
+            "#]],
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "Self",
-                source_range: 21..21,
-                delete: 21..21,
-                insert: "Self",
-                kind: TypeParam,
-            },
-            CompletionItem {
-                label: "T",
-                source_range: 21..21,
-                delete: 21..21,
-                insert: "T",
-                kind: TypeParam,
-            },
-            CompletionItem {
-                label: "X<…>",
-                source_range: 21..21,
-                delete: 21..21,
-                insert: "X<$0>",
-                kind: Struct,
-                lookup: "X",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_self_in_enum() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"enum X { Y(<|>) }"#,
-                r"
+            expect![[r#"
-                enum X {
+                tp Self
-                    Y(<|>)
+                en X
-                }
+            "#]],
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "Self",
-                source_range: 15..15,
-                delete: 15..15,
-                insert: "Self",
-                kind: TypeParam,
-            },
-            CompletionItem {
-                label: "X",
-                source_range: 15..15,
-                delete: 15..15,
-                insert: "X",
-                kind: Enum,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_module_items() {
-        assert_debug_snapshot!(
+        check(
-        do_reference_completion(
+            r#"
-            r"
+struct S;
-                struct Foo;
+enum E {}
-                enum Baz {}
+fn quux() { <|> }
-                fn quux() {
+"#,
-                    <|>
+            expect![[r#"
-                }
+                en E
-                "
+                st S
-        ),
+                fn quux() fn quux()
-        @r###"
+            "#]],
-        [
+        );
-            CompletionItem {
-                label: "Baz",
-                source_range: 40..40,
-                delete: 40..40,
-                insert: "Baz",
-                kind: Enum,
-            },
-            CompletionItem {
-                label: "Foo",
-                source_range: 40..40,
-                delete: 40..40,
-                insert: "Foo",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "quux()",
-                source_range: 40..40,
-                delete: 40..40,
-                insert: "quux()$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux()",
-            },
-        ]
-        "###
-            );
    }
    #[test]
    fn completes_extern_prelude() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+//- /lib.rs
-                //- /lib.rs
+use <|>;
-                use <|>;
+//- /other_crate/lib.rs
-                //- /other_crate/lib.rs
+// nothing here
-                // nothing here
+"#,
-                "
+            expect![[r#"
-            ),
+                md other_crate
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "other_crate",
-                source_range: 4..4,
-                delete: 4..4,
-                insert: "other_crate",
-                kind: Module,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_module_items_in_nested_modules() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+struct Foo;
-                struct Foo;
+mod m {
-                mod m {
+    struct Bar;
-                    struct Bar;
+    fn quux() { <|> }
-                    fn quux() { <|> }
+}
-                }
+"#,
-                "
+            expect![[r#"
-            ),
+                st Bar
-            @r###"
+                fn quux() fn quux()
-        [
+            "#]],
-            CompletionItem {
-                label: "Bar",
-                source_range: 52..52,
-                delete: 52..52,
-                insert: "Bar",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "quux()",
-                source_range: 52..52,
-                delete: 52..52,
-                insert: "quux()$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_return_type() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+struct Foo;
-                struct Foo;
+fn x() -> <|>
-                fn x() -> <|>
+"#,
-                "
+            expect![[r#"
-            ),
+                st Foo
-            @r###"
+                fn x() fn x()
-        [
+            "#]],
-            CompletionItem {
-                label: "Foo",
-                source_range: 22..22,
-                delete: 22..22,
-                insert: "Foo",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "x()",
-                source_range: 22..22,
-                delete: 22..22,
-                insert: "x()$0",
-                kind: Function,
-                lookup: "x",
-                detail: "fn x()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn dont_show_both_completions_for_shadowing() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+fn foo() {
-                fn foo() {
+    let bar = 92;
-                    let bar = 92;
+    {
-                    {
+        let bar = 62;
-                        let bar = 62;
+        drop(<|>)
-                        <|>
+    }
-                    }
+}
-                }
+"#,
-                "
+            // FIXME: should be only one bar here
-            ),
+            expect![[r#"
-            @r###"
+                bn bar   i32
-        [
+                bn bar   i32
-            CompletionItem {
+                fn foo() fn foo()
-                label: "bar",
+            "#]],
-                source_range: 65..65,
-                delete: 65..65,
-                insert: "bar",
-                kind: Binding,
-                detail: "i32",
-            },
-            CompletionItem {
-                label: "foo()",
-                source_range: 65..65,
-                delete: 65..65,
-                insert: "foo()$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_self_in_methods() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(r"impl S { fn foo(&self) { <|> } }"),
+            r#"impl S { fn foo(&self) { <|> } }"#,
-            @r###"
+            expect![[r#"
-        [
+                tp Self
-            CompletionItem {
+                bn self &{unknown}
-                label: "Self",
+            "#]],
-                source_range: 25..25,
-                delete: 25..25,
-                insert: "Self",
-                kind: TypeParam,
-            },
-            CompletionItem {
-                label: "self",
-                source_range: 25..25,
-                delete: 25..25,
-                insert: "self",
-                kind: Binding,
-                detail: "&{unknown}",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_prelude() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+//- /main.rs
-                //- /main.rs
+fn foo() { let x: <|> }
-                fn foo() { let x: <|> }
+//- /std/lib.rs
-                //- /std/lib.rs
+#[prelude_import]
-                #[prelude_import]
+use prelude::*;
-                use prelude::*;
+mod prelude { struct Option; }
-                mod prelude {
+"#,
-                    struct Option;
+            expect![[r#"
-                }
+                st Option
-                "
+                fn foo()  fn foo()
-            ),
+                md std
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "Option",
-                source_range: 18..18,
-                delete: 18..18,
-                insert: "Option",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "foo()",
-                source_range: 18..18,
-                delete: 18..18,
-                insert: "foo()$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo()",
-            },
-            CompletionItem {
-                label: "std",
-                source_range: 18..18,
-                delete: 18..18,
-                insert: "std",
-                kind: Module,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_std_prelude_if_core_is_defined() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+//- /main.rs
-                //- /main.rs
+fn foo() { let x: <|> }
-                fn foo() { let x: <|> }
+//- /core/lib.rs
-                //- /core/lib.rs
+#[prelude_import]
-                #[prelude_import]
+use prelude::*;
-                use prelude::*;
+mod prelude { struct Option; }
-                mod prelude {
-                    struct Option;
+//- /std/lib.rs
-                }
+#[prelude_import]
+use prelude::*;
-                //- /std/lib.rs
-                #[prelude_import]
+mod prelude { struct String; }
-                use prelude::*;
+"#,
+            expect![[r#"
-                mod prelude {
+                st String
-                    struct String;
+                md core
-                }
+                fn foo()  fn foo()
-                "
+                md std
-            ),
+            "#]],
-            @r###"
-        [
-            CompletionItem {
-                label: "String",
-                source_range: 18..18,
-                delete: 18..18,
-                insert: "String",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "core",
-                source_range: 18..18,
-                delete: 18..18,
-                insert: "core",
-                kind: Module,
-            },
-            CompletionItem {
-                label: "foo()",
-                source_range: 18..18,
-                delete: 18..18,
-                insert: "foo()$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo()",
-            },
-            CompletionItem {
-                label: "std",
-                source_range: 18..18,
-                delete: 18..18,
-                insert: "std",
-                kind: Module,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_macros_as_value() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+macro_rules! foo { () => {} }
-                //- /main.rs
-                macro_rules! foo {
-                    () => {}
-                }
-                #[macro_use]
+#[macro_use]
-                mod m1 {
+mod m1 {
-                    macro_rules! bar {
+    macro_rules! bar { () => {} }
-                        () => {}
+}
-                    }
-                }
-                mod m2 {
+mod m2 {
-                    macro_rules! nope {
+    macro_rules! nope { () => {} }
-                        () => {}
-                    }
-                    #[macro_export]
+    #[macro_export]
-                    macro_rules! baz {
+    macro_rules! baz { () => {} }
-                        () => {}
+}
-                    }
-                }
-                fn main() {
+fn main() { let v = <|> }
-                    let v = <|>
+"#,
-                }
+            expect![[r##"
-                "
+                ma bar!(…) macro_rules! bar
-            ),
+                ma baz!(…) #[macro_export]
-            @r###"
+                macro_rules! baz
-        [
+                ma foo!(…) macro_rules! foo
-            CompletionItem {
+                md m1
-                label: "bar!(…)",
+                md m2
-                source_range: 256..256,
+                fn main()  fn main()
-                delete: 256..256,
+            "##]],
-                insert: "bar!($0)",
-                kind: Macro,
-                detail: "macro_rules! bar",
-            },
-            CompletionItem {
-                label: "baz!(…)",
-                source_range: 256..256,
-                delete: 256..256,
-                insert: "baz!($0)",
-                kind: Macro,
-                detail: "#[macro_export]\nmacro_rules! baz",
-            },
-            CompletionItem {
-                label: "foo!(…)",
-                source_range: 256..256,
-                delete: 256..256,
-                insert: "foo!($0)",
-                kind: Macro,
-                detail: "macro_rules! foo",
-            },
-            CompletionItem {
-                label: "m1",
-                source_range: 256..256,
-                delete: 256..256,
-                insert: "m1",
-                kind: Module,
-            },
-            CompletionItem {
-                label: "m2",
-                source_range: 256..256,
-                delete: 256..256,
-                insert: "m2",
-                kind: Module,
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 256..256,
-                delete: 256..256,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_both_macro_and_value() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+macro_rules! foo { () => {} }
-                //- /main.rs
+fn foo() { <|> }
-                macro_rules! foo {
+"#,
-                    () => {}
+            expect![[r#"
-                }
+                ma foo!(…) macro_rules! foo
+                fn foo()   fn foo()
-                fn foo() {
+            "#]],
-                    <|>
-                }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "foo!(…)",
-                source_range: 50..50,
-                delete: 50..50,
-                insert: "foo!($0)",
-                kind: Macro,
-                detail: "macro_rules! foo",
-            },
-            CompletionItem {
-                label: "foo()",
-                source_range: 50..50,
-                delete: 50..50,
-                insert: "foo()$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_macros_as_type() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+macro_rules! foo { () => {} }
-                //- /main.rs
+fn main() { let x: <|> }
-                macro_rules! foo {
+"#,
-                    () => {}
+            expect![[r#"
-                }
+                ma foo!(…) macro_rules! foo
+                fn main()  fn main()
-                fn main() {
+            "#]],
-                    let x: <|>
-                }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "foo!(…)",
-                source_range: 58..58,
-                delete: 58..58,
-                insert: "foo!($0)",
-                kind: Macro,
-                detail: "macro_rules! foo",
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 58..58,
-                delete: 58..58,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_macros_as_stmt() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+macro_rules! foo { () => {} }
-                //- /main.rs
+fn main() { <|> }
-                macro_rules! foo {
+"#,
-                    () => {}
+            expect![[r#"
-                }
+                ma foo!(…) macro_rules! foo
+                fn main()  fn main()
-                fn main() {
+            "#]],
-                    <|>
-                }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "foo!(…)",
-                source_range: 51..51,
-                delete: 51..51,
-                insert: "foo!($0)",
-                kind: Macro,
-                detail: "macro_rules! foo",
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 51..51,
-                delete: 51..51,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_local_item() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                "
+fn main() {
-                //- /main.rs
+    return f<|>;
-                fn main() {
+    fn frobnicate() {}
-                    return f<|>;
+}
-                    fn frobnicate() {}
+"#,
-                }
+            expect![[r#"
-                "
+                fn frobnicate() fn frobnicate()
-            ),
+                fn main()       fn main()
-            @r###"
+            "#]],
-        [
+        );
-            CompletionItem {
-                label: "frobnicate()",
-                source_range: 23..24,
-                delete: 23..24,
-                insert: "frobnicate()$0",
-                kind: Function,
-                lookup: "frobnicate",
-                detail: "fn frobnicate()",
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 23..24,
-                delete: 23..24,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
-        )
    }
    #[test]
    fn completes_in_simple_macro_1() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+macro_rules! m { ($e:expr) => { $e } }
-                macro_rules! m { ($e:expr) => { $e } }
+fn quux(x: i32) {
-                fn quux(x: i32) {
+    let y = 92;
-                    let y = 92;
+    m!(<|>);
-                    m!(<|>);
+}
-                }
+"#,
-                "
+            expect![[r#"
-            ),
+                ma m!(…)   macro_rules! m
-            @r###"
+                fn quux(…) fn quux(x: i32)
-        [
+                bn x       i32
-            CompletionItem {
+                bn y       i32
-                label: "m!(…)",
+            "#]],
-                source_range: 80..80,
-                delete: 80..80,
-                insert: "m!($0)",
-                kind: Macro,
-                detail: "macro_rules! m",
-            },
-            CompletionItem {
-                label: "quux(…)",
-                source_range: 80..80,
-                delete: 80..80,
-                insert: "quux(${1:x})$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux(x: i32)",
-                trigger_call_info: true,
-            },
-            CompletionItem {
-                label: "x",
-                source_range: 80..80,
-                delete: 80..80,
-                insert: "x",
-                kind: Binding,
-                detail: "i32",
-            },
-            CompletionItem {
-                label: "y",
-                source_range: 80..80,
-                delete: 80..80,
-                insert: "y",
-                kind: Binding,
-                detail: "i32",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_in_simple_macro_2() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r"
-                r"
+macro_rules! m { ($e:expr) => { $e } }
-                macro_rules! m { ($e:expr) => { $e } }
+fn quux(x: i32) {
-                fn quux(x: i32) {
+    let y = 92;
-                    let y = 92;
+    m!(x<|>);
-                    m!(x<|>);
+}
-                }
+",
-                "
+            expect![[r#"
-            ),
+                ma m!(…)   macro_rules! m
-            @r###"
+                fn quux(…) fn quux(x: i32)
-        [
+                bn x       i32
-            CompletionItem {
+                bn y       i32
-                label: "m!(…)",
+            "#]],
-                source_range: 80..81,
-                delete: 80..81,
-                insert: "m!($0)",
-                kind: Macro,
-                detail: "macro_rules! m",
-            },
-            CompletionItem {
-                label: "quux(…)",
-                source_range: 80..81,
-                delete: 80..81,
-                insert: "quux(${1:x})$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux(x: i32)",
-                trigger_call_info: true,
-            },
-            CompletionItem {
-                label: "x",
-                source_range: 80..81,
-                delete: 80..81,
-                insert: "x",
-                kind: Binding,
-                detail: "i32",
-            },
-            CompletionItem {
-                label: "y",
-                source_range: 80..81,
-                delete: 80..81,
-                insert: "y",
-                kind: Binding,
-                detail: "i32",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_in_simple_macro_without_closing_parens() {
-        assert_debug_snapshot!(
+        check(
-                    do_reference_completion(
+            r#"
-                        r"
+macro_rules! m { ($e:expr) => { $e } }
-                macro_rules! m { ($e:expr) => { $e } }
+fn quux(x: i32) {
-                fn quux(x: i32) {
+    let y = 92;
-                    let y = 92;
+    m!(x<|>
-                    m!(x<|>
+}
-                }
+"#,
-                "
+            expect![[r#"
-                    ),
+                ma m!(…)   macro_rules! m
-                    @r###"
+                fn quux(…) fn quux(x: i32)
-        [
+                bn x       i32
-            CompletionItem {
+                bn y       i32
-                label: "m!(…)",
+            "#]],
-                source_range: 80..81,
-                delete: 80..81,
-                insert: "m!($0)",
-                kind: Macro,
-                detail: "macro_rules! m",
-            },
-            CompletionItem {
-                label: "quux(…)",
-                source_range: 80..81,
-                delete: 80..81,
-                insert: "quux(${1:x})$0",
-                kind: Function,
-                lookup: "quux",
-                detail: "fn quux(x: i32)",
-                trigger_call_info: true,
-            },
-            CompletionItem {
-                label: "x",
-                source_range: 80..81,
-                delete: 80..81,
-                insert: "x",
-                kind: Binding,
-                detail: "i32",
-            },
-            CompletionItem {
-                label: "y",
-                source_range: 80..81,
-                delete: 80..81,
-                insert: "y",
-                kind: Binding,
-                detail: "i32",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_unresolved_uses() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+use spam::Quux;
-                use spam::Quux;
+fn main() { <|> }
-                fn main() {
+"#,
-                    <|>
+            expect![[r#"
-                }
+                ?? Quux
-                "
+                fn main() fn main()
-            ),
+            "#]],
-            @r###"
-        [
-            CompletionItem {
-                label: "Quux",
-                source_range: 33..33,
-                delete: 33..33,
-                insert: "Quux",
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 33..33,
-                delete: 33..33,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn completes_enum_variant_matcharm() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+enum Foo { Bar, Baz, Quux }
-                enum Foo {
-                    Bar,
-                    Baz,
-                    Quux
-                }
-                fn main() {
-                    let foo = Foo::Quux;
-                    match foo {
+fn main() {
-                        Qu<|>
+    let foo = Foo::Quux;
-                    }
+    match foo { Qu<|> }
-                }
+}
-                "
+"#,
-            ),
+            expect![[r#"
-            @r###"
+                en Foo
-        [
+                ev Foo::Bar  ()
-            CompletionItem {
+                ev Foo::Baz  ()
-                label: "Foo",
+                ev Foo::Quux ()
-                source_range: 103..105,
+            "#]],
-                delete: 103..105,
-                insert: "Foo",
-                kind: Enum,
-            },
-            CompletionItem {
-                label: "Foo::Bar",
-                source_range: 103..105,
-                delete: 103..105,
-                insert: "Foo::Bar",
-                kind: EnumVariant,
-                lookup: "Bar",
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Foo::Baz",
-                source_range: 103..105,
-                delete: 103..105,
-                insert: "Foo::Baz",
-                kind: EnumVariant,
-                lookup: "Baz",
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Foo::Quux",
-                source_range: 103..105,
-                delete: 103..105,
-                insert: "Foo::Quux",
-                kind: EnumVariant,
-                lookup: "Quux",
-                detail: "()",
-            },
-        ]
-        "###
        )
    }
    #[test]
    fn completes_enum_variant_iflet() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+enum Foo { Bar, Baz, Quux }
-                enum Foo {
-                    Bar,
-                    Baz,
-                    Quux
-                }
-                fn main() {
+fn main() {
-                    let foo = Foo::Quux;
+    let foo = Foo::Quux;
+    if let Qu<|> = foo { }
-                    if let Qu<|> = foo {
+}
+"#,
-                    }
+            expect![[r#"
-                }
+                en Foo
-                "
+                ev Foo::Bar  ()
-            ),
+                ev Foo::Baz  ()
-            @r###"
+                ev Foo::Quux ()
-        [
+            "#]],
-            CompletionItem {
-                label: "Foo",
-                source_range: 90..92,
-                delete: 90..92,
-                insert: "Foo",
-                kind: Enum,
-            },
-            CompletionItem {
-                label: "Foo::Bar",
-                source_range: 90..92,
-                delete: 90..92,
-                insert: "Foo::Bar",
-                kind: EnumVariant,
-                lookup: "Bar",
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Foo::Baz",
-                source_range: 90..92,
-                delete: 90..92,
-                insert: "Foo::Baz",
-                kind: EnumVariant,
-                lookup: "Baz",
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Foo::Quux",
-                source_range: 90..92,
-                delete: 90..92,
-                insert: "Foo::Quux",
-                kind: EnumVariant,
-                lookup: "Quux",
-                detail: "()",
-            },
-        ]
-        "###
        )
    }
    #[test]
    fn completes_enum_variant_basic_expr() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+enum Foo { Bar, Baz, Quux }
-                enum Foo {
+fn main() { let foo: Foo = Q<|> }
-                    Bar,
+"#,
-                    Baz,
+            expect![[r#"
-                    Quux
+                en Foo
-                }
+                ev Foo::Bar  ()
+                ev Foo::Baz  ()
-                fn main() {
+                ev Foo::Quux ()
-                    let foo: Foo = Q<|>
+                fn main()    fn main()
-                }
+            "#]],
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "Foo",
-                source_range: 72..73,
-                delete: 72..73,
-                insert: "Foo",
-                kind: Enum,
-            },
-            CompletionItem {
-                label: "Foo::Bar",
-                source_range: 72..73,
-                delete: 72..73,
-                insert: "Foo::Bar",
-                kind: EnumVariant,
-                lookup: "Bar",
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Foo::Baz",
-                source_range: 72..73,
-                delete: 72..73,
-                insert: "Foo::Baz",
-                kind: EnumVariant,
-                lookup: "Baz",
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Foo::Quux",
-                source_range: 72..73,
-                delete: 72..73,
-                insert: "Foo::Quux",
-                kind: EnumVariant,
-                lookup: "Quux",
-                detail: "()",
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 72..73,
-                delete: 72..73,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
        )
    }
    #[test]
    fn completes_enum_variant_from_module() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+mod m { pub enum E { V } }
-                mod m { pub enum E { V } }
+fn f() -> m::E { V<|> }
+"#,
-                fn f() -> m::E {
+            expect![[r#"
-                    V<|>
+                fn f()     fn f() -> m::E
-                }
+                md m
-                "
+                ev m::E::V ()
-            ),
+            "#]],
-            @r###"
-        [
-            CompletionItem {
-                label: "f()",
-                source_range: 49..50,
-                delete: 49..50,
-                insert: "f()$0",
-                kind: Function,
-                lookup: "f",
-                detail: "fn f() -> m::E",
-            },
-            CompletionItem {
-                label: "m",
-                source_range: 49..50,
-                delete: 49..50,
-                insert: "m",
-                kind: Module,
-            },
-            CompletionItem {
-                label: "m::E::V",
-                source_range: 49..50,
-                delete: 49..50,
-                insert: "m::E::V",
-                kind: EnumVariant,
-                lookup: "V",
-                detail: "()",
-            },
-        ]
-        "###
        )
    }
    #[test]
    fn dont_complete_attr() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r"
+struct Foo;
-                struct Foo;
+#[<|>]
-                #[<|>]
+fn f() {}
-                fn f() {}
+"#,
-                "
+            expect![[""]],
-            ),
+        )
-            @r###"[]"###
+    }
+    #[test]
+    fn completes_type_or_trait_in_impl_block() {
+        check(
+            r#"
+trait MyTrait {}
+struct MyStruct {}
+impl My<|>
+"#,
+            expect![[r#"
+                st MyStruct
+                tt MyTrait
+                tp Self
+            "#]],
        )
    }
 }
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 560fb19e6..2113abbb2 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -24,6 +24,7 @@ use test_utils::mark;
 #[derive(Debug)]
 pub(crate) struct CompletionContext<'a> {
    pub(super) sema: Semantics<'a, RootDatabase>,
+    pub(super) scope: SemanticsScope<'a>,
    pub(super) db: &'a RootDatabase,
    pub(super) config: &'a CompletionConfig,
    pub(super) offset: TextSize,
@@ -34,12 +35,12 @@ pub(crate) struct CompletionContext<'a> {
    pub(super) krate: Option<hir::Crate>,
    pub(super) expected_type: Option<Type>,
    pub(super) name_ref_syntax: Option<ast::NameRef>,
-    pub(super) function_syntax: Option<ast::FnDef>,
+    pub(super) function_syntax: Option<ast::Fn>,
-    pub(super) use_item_syntax: Option<ast::UseItem>,
+    pub(super) use_item_syntax: Option<ast::Use>,
-    pub(super) record_lit_syntax: Option<ast::RecordLit>,
+    pub(super) record_lit_syntax: Option<ast::RecordExpr>,
    pub(super) record_pat_syntax: Option<ast::RecordPat>,
-    pub(super) record_field_syntax: Option<ast::RecordField>,
+    pub(super) record_field_syntax: Option<ast::RecordExprField>,
-    pub(super) impl_def: Option<ast::ImplDef>,
+    pub(super) impl_def: Option<ast::Impl>,
    /// FIXME: `ActiveParameter` is string-based, which is very very wrong
    pub(super) active_parameter: Option<ActiveParameter>,
    pub(super) is_param: bool,
@@ -53,6 +54,8 @@ pub(crate) struct CompletionContext<'a> {
    pub(super) after_if: bool,
    /// `true` if we are a statement or a last expr in the block.
    pub(super) can_be_stmt: bool,
+    /// `true` if we expect an expression at the cursor position.
+    pub(super) is_expr: bool,
    /// Something is typed at the "top" level, in module or impl/trait.
    pub(super) is_new_item: bool,
    /// The receiver if this is a field or method access, i.e. writing something.<|>
@@ -60,6 +63,8 @@ pub(crate) struct CompletionContext<'a> {
    pub(super) dot_receiver_is_ambiguous_float_literal: bool,
    /// If this is a call (method or function) in particular, i.e. the () are already there.
    pub(super) is_call: bool,
+    /// Like `is_call`, but for tuple patterns.
+    pub(super) is_pattern_call: bool,
    /// If this is a macro call, i.e. the () are already there.
    pub(super) is_macro_call: bool,
    pub(super) is_path_type: bool,
@@ -104,8 +109,10 @@ impl<'a> CompletionContext<'a> {
        let original_token =
            original_file.syntax().token_at_offset(position.offset).left_biased()?;
        let token = sema.descend_into_macros(original_token.clone());
+        let scope = sema.scope_at_offset(&token.parent(), position.offset);
        let mut ctx = CompletionContext {
            sema,
+            scope,
            db,
            config,
            original_token,
@@ -127,9 +134,11 @@ impl<'a> CompletionContext<'a> {
            path_prefix: None,
            after_if: false,
            can_be_stmt: false,
+            is_expr: false,
            is_new_item: false,
            dot_receiver: None,
            is_call: false,
+            is_pattern_call: false,
            is_macro_call: false,
            is_path_type: false,
            has_type_args: false,
@@ -196,30 +205,17 @@ impl<'a> CompletionContext<'a> {
    // The range of the identifier that is being completed.
    pub(crate) fn source_range(&self) -> TextRange {
        // check kind of macro-expanded token, but use range of original token
-        match self.token.kind() {
+        if self.token.kind() == IDENT || self.token.kind().is_keyword() {
-            // workaroud when completion is triggered by trigger characters.
+            mark::hit!(completes_if_prefix_is_keyword);
-            IDENT => self.original_token.text_range(),
+            self.original_token.text_range()
-            _ => {
+        } else {
-                // If we haven't characters between keyword and our cursor we take the keyword start range to edit
+            TextRange::empty(self.offset)
-                if self.token.kind().is_keyword()
-                    && self.offset == self.original_token.text_range().end()
-                {
-                    mark::hit!(completes_bindings_from_for_with_in_prefix);
-                    TextRange::empty(self.original_token.text_range().start())
-                } else {
-                    TextRange::empty(self.offset)
-                }
-            }
        }
    }
-    pub(crate) fn scope(&self) -> SemanticsScope<'_, RootDatabase> {
-        self.sema.scope_at_offset(&self.token.parent(), self.offset)
-    }
    fn fill_keyword_patterns(&mut self, file_with_fake_ident: &SyntaxNode, offset: TextSize) {
        let fake_ident_token = file_with_fake_ident.token_at_offset(offset).right_biased().unwrap();
-        let syntax_element = NodeOrToken::Token(fake_ident_token.clone());
+        let syntax_element = NodeOrToken::Token(fake_ident_token);
        self.block_expr_parent = has_block_expr_parent(syntax_element.clone());
        self.unsafe_is_prev = unsafe_is_prev(syntax_element.clone());
        self.if_is_prev = if_is_prev(syntax_element.clone());
@@ -232,7 +228,7 @@ impl<'a> CompletionContext<'a> {
        self.trait_as_prev_sibling = has_trait_as_prev_sibling(syntax_element.clone());
        self.is_match_arm = is_match_arm(syntax_element.clone());
        self.has_item_list_or_source_file_parent =
-            has_item_list_or_source_file_parent(syntax_element.clone());
+            has_item_list_or_source_file_parent(syntax_element);
    }
    fn fill(
@@ -320,7 +316,7 @@ impl<'a> CompletionContext<'a> {
        self.name_ref_syntax =
            find_node_at_offset(&original_file, name_ref.syntax().text_range().start());
        let name_range = name_ref.syntax().text_range();
-        if ast::RecordField::for_field_name(&name_ref).is_some() {
+        if ast::RecordExprField::for_field_name(&name_ref).is_some() {
            self.record_lit_syntax =
                self.sema.find_node_at_offset_with_macros(&original_file, offset);
        }
@@ -329,7 +325,7 @@ impl<'a> CompletionContext<'a> {
            .sema
            .ancestors_with_macros(self.token.parent())
            .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE)
-            .find_map(ast::ImplDef::cast);
+            .find_map(ast::Impl::cast);
        let top_node = name_ref
            .syntax()
@@ -347,13 +343,13 @@ impl<'a> CompletionContext<'a> {
        }
        self.use_item_syntax =
-            self.sema.ancestors_with_macros(self.token.parent()).find_map(ast::UseItem::cast);
+            self.sema.ancestors_with_macros(self.token.parent()).find_map(ast::Use::cast);
        self.function_syntax = self
            .sema
            .ancestors_with_macros(self.token.parent())
            .take_while(|it| it.kind() != SOURCE_FILE && it.kind() != MODULE)
-            .find_map(ast::FnDef::cast);
+            .find_map(ast::Fn::cast);
        self.record_field_syntax = self
            .sema
@@ -361,7 +357,7 @@ impl<'a> CompletionContext<'a> {
            .take_while(|it| {
                it.kind() != SOURCE_FILE && it.kind() != MODULE && it.kind() != CALL_EXPR
            })
-            .find_map(ast::RecordField::cast);
+            .find_map(ast::RecordExprField::cast);
        let parent = match name_ref.syntax().parent() {
            Some(it) => it,
@@ -377,6 +373,8 @@ impl<'a> CompletionContext<'a> {
                .and_then(|it| it.syntax().parent().and_then(ast::CallExpr::cast))
                .is_some();
            self.is_macro_call = path.syntax().parent().and_then(ast::MacroCall::cast).is_some();
+            self.is_pattern_call =
+                path.syntax().parent().and_then(ast::TupleStructPat::cast).is_some();
            self.is_path_type = path.syntax().parent().and_then(ast::PathType::cast).is_some();
            self.has_type_args = segment.type_arg_list().is_some();
@@ -412,6 +410,7 @@ impl<'a> CompletionContext<'a> {
                        None
                    })
                    .unwrap_or(false);
+                self.is_expr = path.syntax().parent().and_then(ast::PathExpr::cast).is_some();
                if let Some(off) = name_ref.syntax().text_range().start().checked_sub(2.into()) {
                    if let Some(if_expr) =
diff --git a/crates/ra_ide/src/completion/completion_item.rs b/crates/ra_ide/src/completion/completion_item.rs
index 98348b349..7bdda316c 100644
--- a/crates/ra_ide/src/completion/completion_item.rs
+++ b/crates/ra_ide/src/completion/completion_item.rs
@@ -58,7 +58,7 @@ pub struct CompletionItem {
    score: Option<CompletionScore>,
 }
-// We use custom debug for CompletionItem to make `insta`'s diffs more readable.
+// We use custom debug for CompletionItem to make snapshot tests more readable.
 impl fmt::Debug for CompletionItem {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        let mut s = f.debug_struct("CompletionItem");
@@ -95,7 +95,7 @@ impl fmt::Debug for CompletionItem {
    }
 }
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Ord, PartialOrd, Eq, PartialEq)]
 pub enum CompletionScore {
    /// If only type match
    TypeMatch,
@@ -123,30 +123,32 @@ pub enum CompletionItemKind {
    TypeParam,
    Macro,
    Attribute,
+    UnresolvedReference,
 }
 impl CompletionItemKind {
    #[cfg(test)]
    pub(crate) fn tag(&self) -> &'static str {
        match self {
-            CompletionItemKind::Snippet => "sn",
+            CompletionItemKind::Attribute => "at",
-            CompletionItemKind::Keyword => "kw",
+            CompletionItemKind::Binding => "bn",
-            CompletionItemKind::Module => "md",
-            CompletionItemKind::Function => "fn",
            CompletionItemKind::BuiltinType => "bt",
-            CompletionItemKind::Struct => "st",
+            CompletionItemKind::Const => "ct",
            CompletionItemKind::Enum => "en",
            CompletionItemKind::EnumVariant => "ev",
-            CompletionItemKind::Binding => "bn",
            CompletionItemKind::Field => "fd",
+            CompletionItemKind::Function => "fn",
+            CompletionItemKind::Keyword => "kw",
+            CompletionItemKind::Macro => "ma",
+            CompletionItemKind::Method => "me",
+            CompletionItemKind::Module => "md",
+            CompletionItemKind::Snippet => "sn",
            CompletionItemKind::Static => "sc",
-            CompletionItemKind::Const => "ct",
+            CompletionItemKind::Struct => "st",
            CompletionItemKind::Trait => "tt",
            CompletionItemKind::TypeAlias => "ta",
-            CompletionItemKind::Method => "me",
            CompletionItemKind::TypeParam => "tp",
-            CompletionItemKind::Macro => "ma",
+            CompletionItemKind::UnresolvedReference => "??",
-            CompletionItemKind::Attribute => "at",
        }
    }
 }
diff --git a/crates/ra_ide/src/completion/patterns.rs b/crates/ra_ide/src/completion/patterns.rs
index b2fe13280..a68861e1c 100644
--- a/crates/ra_ide/src/completion/patterns.rs
+++ b/crates/ra_ide/src/completion/patterns.rs
@@ -13,9 +13,9 @@ use crate::completion::test_utils::check_pattern_is_applicable;
 pub(crate) fn has_trait_parent(element: SyntaxElement) -> bool {
    not_same_range_ancestor(element)
-        .filter(|it| it.kind() == ITEM_LIST)
+        .filter(|it| it.kind() == ASSOC_ITEM_LIST)
        .and_then(|it| it.parent())
-        .filter(|it| it.kind() == TRAIT_DEF)
+        .filter(|it| it.kind() == TRAIT)
        .is_some()
 }
 #[test]
@@ -25,9 +25,9 @@ fn test_has_trait_parent() {
 pub(crate) fn has_impl_parent(element: SyntaxElement) -> bool {
    not_same_range_ancestor(element)
-        .filter(|it| it.kind() == ITEM_LIST)
+        .filter(|it| it.kind() == ASSOC_ITEM_LIST)
        .and_then(|it| it.parent())
-        .filter(|it| it.kind() == IMPL_DEF)
+        .filter(|it| it.kind() == IMPL)
        .is_some()
 }
 #[test]
@@ -73,7 +73,7 @@ pub(crate) fn has_item_list_or_source_file_parent(element: SyntaxElement) -> boo
 #[test]
 fn test_has_item_list_or_source_file_parent() {
    check_pattern_is_applicable(r"i<|>", has_item_list_or_source_file_parent);
-    check_pattern_is_applicable(r"impl { f<|> }", has_item_list_or_source_file_parent);
+    check_pattern_is_applicable(r"mod foo { f<|> }", has_item_list_or_source_file_parent);
 }
 pub(crate) fn is_match_arm(element: SyntaxElement) -> bool {
@@ -113,7 +113,7 @@ fn test_if_is_prev() {
 }
 pub(crate) fn has_trait_as_prev_sibling(element: SyntaxElement) -> bool {
-    previous_sibling_or_ancestor_sibling(element).filter(|it| it.kind() == TRAIT_DEF).is_some()
+    previous_sibling_or_ancestor_sibling(element).filter(|it| it.kind() == TRAIT).is_some()
 }
 #[test]
 fn test_has_trait_as_prev_sibling() {
@@ -121,7 +121,7 @@ fn test_has_trait_as_prev_sibling() {
 }
 pub(crate) fn has_impl_as_prev_sibling(element: SyntaxElement) -> bool {
-    previous_sibling_or_ancestor_sibling(element).filter(|it| it.kind() == IMPL_DEF).is_some()
+    previous_sibling_or_ancestor_sibling(element).filter(|it| it.kind() == IMPL).is_some()
 }
 #[test]
 fn test_has_impl_as_prev_sibling() {
@@ -134,7 +134,7 @@ pub(crate) fn is_in_loop_body(element: SyntaxElement) -> bool {
        NodeOrToken::Token(token) => token.parent(),
    };
    for node in leaf.ancestors() {
-        if node.kind() == FN_DEF || node.kind() == LAMBDA_EXPR {
+        if node.kind() == FN || node.kind() == LAMBDA_EXPR {
            break;
        }
        let loop_body = match_ast! {
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 4fdc2f0bb..9a94ff476 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -1,4 +1,5 @@
 //! This modules takes care of rendering various definitions as completion items.
+//! It also handles scoring (sorting) completions.
 use hir::{Docs, HasAttrs, HasSource, HirDisplay, ModPath, ScopeDef, StructKind, Type};
 use ra_syntax::ast::NameOwner;
@@ -10,7 +11,7 @@ use crate::{
        completion_item::Builder, CompletionContext, CompletionItem, CompletionItemKind,
        CompletionKind, Completions,
    },
-    display::{const_label, macro_label, type_label, FunctionSignature},
+    display::{const_label, function_declaration, macro_label, type_label},
    CompletionScore, RootDatabase,
 };
@@ -78,11 +79,10 @@ impl Completions {
                return self.add_macro(ctx, Some(local_name), *mac);
            }
            ScopeDef::Unknown => {
-                return self.add(CompletionItem::new(
+                return self.add(
-                    CompletionKind::Reference,
+                    CompletionItem::new(CompletionKind::Reference, ctx.source_range(), local_name)
-                    ctx.source_range(),
+                        .kind(CompletionItemKind::UnresolvedReference),
-                    local_name,
+                );
-                ));
            }
        };
@@ -173,6 +173,7 @@ impl Completions {
                builder
                    .insert_snippet(cap, format!("{}!{}$0{}", name, bra, ket))
                    .label(format!("{}!{}…{}", name, bra, ket))
+                    .lookup_by(format!("{}!", name))
            }
            None if needs_bang => builder.insert_text(format!("{}!", name)),
            _ => {
@@ -194,7 +195,6 @@ impl Completions {
        let name = local_name.unwrap_or_else(|| func.name(ctx.db).to_string());
        let ast_node = func.source(ctx.db).value;
-        let function_signature = FunctionSignature::from(&ast_node);
        let mut builder =
            CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.clone())
@@ -205,13 +205,14 @@ impl Completions {
                })
                .set_documentation(func.docs(ctx.db))
                .set_deprecated(is_deprecated(func, ctx.db))
-                .detail(function_signature.to_string());
+                .detail(function_declaration(&ast_node));
-        let params = function_signature
+        let params = ast_node
-            .parameter_names
+            .param_list()
-            .iter()
+            .into_iter()
-            .skip(if function_signature.has_self_param { 1 } else { 0 })
+            .flat_map(|it| it.params())
-            .map(|name| name.trim_start_matches('_').into())
+            .flat_map(|it| it.pat())
+            .map(|pat| pat.to_string().trim_start_matches('_').into())
            .collect();
        builder = builder.add_call_parens(ctx, name, Params::Named(params));
@@ -314,6 +315,7 @@ impl Completions {
        }
        if variant_kind == StructKind::Tuple {
+            mark::hit!(inserts_parens_for_tuple_enums);
            let params = Params::Anonymous(variant.fields(ctx.db).len());
            res = res.add_call_parens(ctx, qualified_name, params)
        }
@@ -327,17 +329,12 @@ pub(crate) fn compute_score(
    ty: &Type,
    name: &str,
 ) -> Option<CompletionScore> {
-    // FIXME: this should not fall back to string equality.
-    let ty = &ty.display(ctx.db).to_string();
    let (active_name, active_type) = if let Some(record_field) = &ctx.record_field_syntax {
-        mark::hit!(test_struct_field_completion_in_record_lit);
+        mark::hit!(record_field_type_match);
        let (struct_field, _local) = ctx.sema.resolve_record_field(record_field)?;
-        (
+        (struct_field.name(ctx.db).to_string(), struct_field.signature_ty(ctx.db))
-            struct_field.name(ctx.db).to_string(),
-            struct_field.signature_ty(ctx.db).display(ctx.db).to_string(),
-        )
    } else if let Some(active_parameter) = &ctx.active_parameter {
-        mark::hit!(test_struct_field_completion_in_func_call);
+        mark::hit!(active_param_type_match);
        (active_parameter.name.clone(), active_parameter.ty.clone())
    } else {
        return None;
@@ -382,13 +379,22 @@ impl Builder {
        if !ctx.config.add_call_parenthesis {
            return self;
        }
-        if ctx.use_item_syntax.is_some() || ctx.is_call {
+        if ctx.use_item_syntax.is_some() {
+            mark::hit!(no_parens_in_use_item);
+            return self;
+        }
+        if ctx.is_pattern_call {
+            mark::hit!(dont_duplicate_pattern_parens);
+            return self;
+        }
+        if ctx.is_call {
            return self;
        }
        // Don't add parentheses if the expected type is some function reference.
        if let Some(ty) = &ctx.expected_type {
            if ty.is_fn() {
+                mark::hit!(no_call_parens_if_fn_ptr_needed);
                return self;
            }
        }
@@ -413,7 +419,10 @@ impl Builder {
                        .sep_by(", ");
                    format!("{}({})$0", name, function_params_snippet)
                }
-                _ => format!("{}($0)", name),
+                _ => {
+                    mark::hit!(suppress_arg_snippets);
+                    format!("{}($0)", name)
+                }
            };
            (snippet, format!("{}(…)", name))
@@ -456,1064 +465,766 @@ fn guess_macro_braces(macro_name: &str, docs: &str) -> (&'static str, &'static s
 #[cfg(test)]
 mod tests {
-    use insta::assert_debug_snapshot;
+    use std::cmp::Reverse;
+    use expect::{expect, Expect};
    use test_utils::mark;
-    use crate::completion::{
+    use crate::{
-        test_utils::{do_completion, do_completion_with_options},
+        completion::{
-        CompletionConfig, CompletionItem, CompletionKind,
+            test_utils::{
+                check_edit, check_edit_with_config, do_completion, get_all_completion_items,
+            },
+            CompletionConfig, CompletionKind,
+        },
+        CompletionScore,
    };
-    fn do_reference_completion(ra_fixture: &str) -> Vec<CompletionItem> {
+    fn check(ra_fixture: &str, expect: Expect) {
-        do_completion(ra_fixture, CompletionKind::Reference)
+        let actual = do_completion(ra_fixture, CompletionKind::Reference);
+        expect.assert_debug_eq(&actual);
    }
-    fn do_reference_completion_with_options(
+    fn check_scores(ra_fixture: &str, expect: Expect) {
-        ra_fixture: &str,
+        fn display_score(score: Option<CompletionScore>) -> &'static str {
-        options: CompletionConfig,
+            match score {
-    ) -> Vec<CompletionItem> {
+                Some(CompletionScore::TypeMatch) => "[type]",
-        do_completion_with_options(ra_fixture, CompletionKind::Reference, &options)
+                Some(CompletionScore::TypeAndNameMatch) => "[type+name]",
+                None => "[]".into(),
+            }
+        }
+        let mut completions = get_all_completion_items(CompletionConfig::default(), ra_fixture);
+        completions.sort_by_key(|it| (Reverse(it.score()), it.label().to_string()));
+        let actual = completions
+            .into_iter()
+            .filter(|it| it.completion_kind == CompletionKind::Reference)
+            .map(|it| {
+                let tag = it.kind().unwrap().tag();
+                let score = display_score(it.score());
+                format!("{} {} {}\n", tag, it.label(), score)
+            })
+            .collect::<String>();
+        expect.assert_eq(&actual);
    }
    #[test]
-    fn enum_detail_includes_names_for_record() {
+    fn enum_detail_includes_record_fields() {
-        assert_debug_snapshot!(
+        check(
-        do_reference_completion(
            r#"
-                enum Foo {
+enum Foo { Foo { x: i32, y: i32 } }
-                    Foo {x: i32, y: i32}
-                }
+fn main() { Foo::Fo<|> }
+"#,
-                fn main() { Foo::Fo<|> }
+            expect![[r#"
-                "#,
+                [
-        ),
+                    CompletionItem {
-        @r###"
+                        label: "Foo",
-        [
+                        source_range: 54..56,
-            CompletionItem {
+                        delete: 54..56,
-                label: "Foo",
+                        insert: "Foo",
-                source_range: 56..58,
+                        kind: EnumVariant,
-                delete: 56..58,
+                        detail: "{ x: i32, y: i32 }",
-                insert: "Foo",
+                    },
-                kind: EnumVariant,
+                ]
-                detail: "{ x: i32, y: i32 }",
+            "#]],
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn enum_detail_doesnt_include_names_for_tuple() {
+    fn enum_detail_doesnt_include_tuple_fields() {
-        assert_debug_snapshot!(
+        check(
-        do_reference_completion(
            r#"
-                enum Foo {
+enum Foo { Foo (i32, i32) }
-                    Foo (i32, i32)
-                }
+fn main() { Foo::Fo<|> }
+"#,
-                fn main() { Foo::Fo<|> }
+            expect![[r#"
-                "#,
+                [
-        ),
+                    CompletionItem {
-        @r###"
+                        label: "Foo(…)",
-        [
+                        source_range: 46..48,
-            CompletionItem {
+                        delete: 46..48,
-                label: "Foo(…)",
+                        insert: "Foo($0)",
-                source_range: 50..52,
+                        kind: EnumVariant,
-                delete: 50..52,
+                        lookup: "Foo",
-                insert: "Foo($0)",
+                        detail: "(i32, i32)",
-                kind: EnumVariant,
+                        trigger_call_info: true,
-                lookup: "Foo",
+                    },
-                detail: "(i32, i32)",
+                ]
-                trigger_call_info: true,
+            "#]],
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn enum_detail_just_parentheses_for_unit() {
-        assert_debug_snapshot!(
+        check(
-        do_reference_completion(
            r#"
-                enum Foo {
+enum Foo { Foo }
-                    Foo
-                }
+fn main() { Foo::Fo<|> }
+"#,
-                fn main() { Foo::Fo<|> }
+            expect![[r#"
-                "#,
+                [
-        ),
+                    CompletionItem {
-        @r###"
+                        label: "Foo",
-        [
+                        source_range: 35..37,
-            CompletionItem {
+                        delete: 35..37,
-                label: "Foo",
+                        insert: "Foo",
-                source_range: 39..41,
+                        kind: EnumVariant,
-                delete: 39..41,
+                        detail: "()",
-                insert: "Foo",
+                    },
-                kind: EnumVariant,
+                ]
-                detail: "()",
+            "#]],
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn sets_deprecated_flag_in_completion_items() {
-        assert_debug_snapshot!(
+        check(
-            do_reference_completion(
+            r#"
-                r#"
+#[deprecated]
-                #[deprecated]
+fn something_deprecated() {}
-                fn something_deprecated() {}
+#[deprecated(since = "1.0.0")]
+fn something_else_deprecated() {}
-                #[deprecated(since = "1.0.0")]
-                fn something_else_deprecated() {}
+fn main() { som<|> }
+"#,
-                fn main() { som<|> }
+            expect![[r#"
-                "#,
+                [
-            ),
+                    CompletionItem {
-            @r###"
+                        label: "main()",
-        [
+                        source_range: 121..124,
-            CompletionItem {
+                        delete: 121..124,
-                label: "main()",
+                        insert: "main()$0",
-                source_range: 122..125,
+                        kind: Function,
-                delete: 122..125,
+                        lookup: "main",
-                insert: "main()$0",
+                        detail: "fn main()",
-                kind: Function,
+                    },
-                lookup: "main",
+                    CompletionItem {
-                detail: "fn main()",
+                        label: "something_deprecated()",
-            },
+                        source_range: 121..124,
-            CompletionItem {
+                        delete: 121..124,
-                label: "something_deprecated()",
+                        insert: "something_deprecated()$0",
-                source_range: 122..125,
+                        kind: Function,
-                delete: 122..125,
+                        lookup: "something_deprecated",
-                insert: "something_deprecated()$0",
+                        detail: "fn something_deprecated()",
-                kind: Function,
+                        deprecated: true,
-                lookup: "something_deprecated",
+                    },
-                detail: "fn something_deprecated()",
+                    CompletionItem {
-                deprecated: true,
+                        label: "something_else_deprecated()",
-            },
+                        source_range: 121..124,
-            CompletionItem {
+                        delete: 121..124,
-                label: "something_else_deprecated()",
+                        insert: "something_else_deprecated()$0",
-                source_range: 122..125,
+                        kind: Function,
-                delete: 122..125,
+                        lookup: "something_else_deprecated",
-                insert: "something_else_deprecated()$0",
+                        detail: "fn something_else_deprecated()",
-                kind: Function,
+                        deprecated: true,
-                lookup: "something_else_deprecated",
+                    },
-                detail: "fn something_else_deprecated()",
+                ]
-                deprecated: true,
+            "#]],
-            },
+        );
-        ]
-        "###
+        check(
+            r#"
+struct A { #[deprecated] the_field: u32 }
+fn foo() { A { the<|> } }
+"#,
+            expect![[r#"
+                [
+                    CompletionItem {
+                        label: "the_field",
+                        source_range: 57..60,
+                        delete: 57..60,
+                        insert: "the_field",
+                        kind: Field,
+                        detail: "u32",
+                        deprecated: true,
+                    },
+                ]
+            "#]],
+        );
+    }
+    #[test]
+    fn renders_docs() {
+        check(
+            r#"
+struct S {
+    /// Field docs
+    foo:
+}
+impl S {
+    /// Method docs
+    fn bar(self) { self.<|> }
+}"#,
+            expect![[r#"
+                [
+                    CompletionItem {
+                        label: "bar()",
+                        source_range: 94..94,
+                        delete: 94..94,
+                        insert: "bar()$0",
+                        kind: Method,
+                        lookup: "bar",
+                        detail: "fn bar(self)",
+                        documentation: Documentation(
+                            "Method docs",
+                        ),
+                    },
+                    CompletionItem {
+                        label: "foo",
+                        source_range: 94..94,
+                        delete: 94..94,
+                        insert: "foo",
+                        kind: Field,
+                        detail: "{unknown}",
+                        documentation: Documentation(
+                            "Field docs",
+                        ),
+                    },
+                ]
+            "#]],
        );
+        check(
+            r#"
+use self::my<|>;
+/// mod docs
+mod my { }
+/// enum docs
+enum E {
+    /// variant docs
+    V
+}
+use self::E::*;
+"#,
+            expect![[r#"
+                [
+                    CompletionItem {
+                        label: "E",
+                        source_range: 10..12,
+                        delete: 10..12,
+                        insert: "E",
+                        kind: Enum,
+                        documentation: Documentation(
+                            "enum docs",
+                        ),
+                    },
+                    CompletionItem {
+                        label: "V",
+                        source_range: 10..12,
+                        delete: 10..12,
+                        insert: "V",
+                        kind: EnumVariant,
+                        detail: "()",
+                        documentation: Documentation(
+                            "variant docs",
+                        ),
+                    },
+                    CompletionItem {
+                        label: "my",
+                        source_range: 10..12,
+                        delete: 10..12,
+                        insert: "my",
+                        kind: Module,
+                        documentation: Documentation(
+                            "mod docs",
+                        ),
+                    },
+                ]
+            "#]],
+        )
+    }
+    #[test]
+    fn dont_render_attrs() {
+        check(
+            r#"
+struct S;
+impl S {
+    #[inline]
+    fn the_method(&self) { }
+}
+fn foo(s: S) { s.<|> }
+"#,
+            expect![[r#"
+                [
+                    CompletionItem {
+                        label: "the_method()",
+                        source_range: 81..81,
+                        delete: 81..81,
+                        insert: "the_method()$0",
+                        kind: Method,
+                        lookup: "the_method",
+                        detail: "fn the_method(&self)",
+                    },
+                ]
+            "#]],
+        )
    }
    #[test]
    fn inserts_parens_for_function_calls() {
        mark::check!(inserts_parens_for_function_calls);
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "no_args",
-                r"
+            r#"
-                fn no_args() {}
+fn no_args() {}
-                fn main() { no_<|> }
+fn main() { no_<|> }
-                "
+"#,
-            ),
+            r#"
-            @r###"
+fn no_args() {}
-        [
+fn main() { no_args()$0 }
-            CompletionItem {
+"#,
-                label: "main()",
-                source_range: 28..31,
-                delete: 28..31,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-            CompletionItem {
-                label: "no_args()",
-                source_range: 28..31,
-                delete: 28..31,
-                insert: "no_args()$0",
-                kind: Function,
-                lookup: "no_args",
-                detail: "fn no_args()",
-            },
-        ]
-        "###
-        );
-        assert_debug_snapshot!(
-            do_reference_completion(
-                r"
-                fn with_args(x: i32, y: String) {}
-                fn main() { with_<|> }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "main()",
-                source_range: 47..52,
-                delete: 47..52,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-            CompletionItem {
-                label: "with_args(…)",
-                source_range: 47..52,
-                delete: 47..52,
-                insert: "with_args(${1:x}, ${2:y})$0",
-                kind: Function,
-                lookup: "with_args",
-                detail: "fn with_args(x: i32, y: String)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
        );
-        assert_debug_snapshot!(
-            do_reference_completion(
+        check_edit(
-                r"
+            "with_args",
-                fn with_ignored_args(_foo: i32, ___bar: bool, ho_ge_: String) {}
+            r#"
-                fn main() { with_<|> }
+fn with_args(x: i32, y: String) {}
-                "
+fn main() { with_<|> }
-            ),
+"#,
-            @r###"
+            r#"
-        [
+fn with_args(x: i32, y: String) {}
-            CompletionItem {
+fn main() { with_args(${1:x}, ${2:y})$0 }
-                label: "main()",
+"#,
-                source_range: 77..82,
-                delete: 77..82,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-            CompletionItem {
-                label: "with_ignored_args(…)",
-                source_range: 77..82,
-                delete: 77..82,
-                insert: "with_ignored_args(${1:foo}, ${2:bar}, ${3:ho_ge_})$0",
-                kind: Function,
-                lookup: "with_ignored_args",
-                detail: "fn with_ignored_args(_foo: i32, ___bar: bool, ho_ge_: String)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
        );
-        assert_debug_snapshot!(
-            do_reference_completion(
+        check_edit(
-                r"
+            "foo",
-                struct S {}
+            r#"
-                impl S {
+struct S;
-                    fn foo(&self) {}
+impl S {
-                }
+    fn foo(&self) {}
-                fn bar(s: &S) {
+}
-                    s.f<|>
+fn bar(s: &S) { s.f<|> }
-                }
+"#,
-                "
+            r#"
-            ),
+struct S;
-            @r###"
+impl S {
-        [
+    fn foo(&self) {}
-            CompletionItem {
+}
-                label: "foo()",
+fn bar(s: &S) { s.foo()$0 }
-                source_range: 66..67,
+"#,
-                delete: 66..67,
-                insert: "foo()$0",
-                kind: Method,
-                lookup: "foo",
-                detail: "fn foo(&self)",
-            },
-        ]
-        "###
        );
-        assert_debug_snapshot!(
-            do_reference_completion(
+        check_edit(
-                r"
+            "foo",
-                struct S {}
+            r#"
-                impl S {
+struct S {}
-                    fn foo_ignored_args(&self, _a: bool, b: i32) {}
+impl S {
-                }
+    fn foo(&self, x: i32) {}
-                fn bar(s: &S) {
+}
-                    s.f<|>
+fn bar(s: &S) {
-                }
+    s.f<|>
-                "
+}
-            ),
+"#,
-            @r###"
+            r#"
-        [
+struct S {}
-            CompletionItem {
+impl S {
-                label: "foo_ignored_args(…)",
+    fn foo(&self, x: i32) {}
-                source_range: 97..98,
+}
-                delete: 97..98,
+fn bar(s: &S) {
-                insert: "foo_ignored_args(${1:a}, ${2:b})$0",
+    s.foo(${1:x})$0
-                kind: Method,
+}
-                lookup: "foo_ignored_args",
+"#,
-                detail: "fn foo_ignored_args(&self, _a: bool, b: i32)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn inserts_parens_for_tuple_enums() {
+    fn suppress_arg_snippets() {
-        assert_debug_snapshot!(
+        mark::check!(suppress_arg_snippets);
-            do_reference_completion(
+        check_edit_with_config(
-                r"
+            CompletionConfig { add_call_argument_snippets: false, ..CompletionConfig::default() },
-                enum Option<T> { Some(T), None }
+            "with_args",
-                use Option::*;
+            r#"
-                fn main() -> Option<i32> {
+fn with_args(x: i32, y: String) {}
-                    Som<|>
+fn main() { with_<|> }
-                }
+"#,
-                "
+            r#"
-            ),
+fn with_args(x: i32, y: String) {}
-            @r###"
+fn main() { with_args($0) }
-        [
+"#,
-            CompletionItem {
-                label: "None",
-                source_range: 79..82,
-                delete: 79..82,
-                insert: "None",
-                kind: EnumVariant,
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Option",
-                source_range: 79..82,
-                delete: 79..82,
-                insert: "Option",
-                kind: Enum,
-            },
-            CompletionItem {
-                label: "Some(…)",
-                source_range: 79..82,
-                delete: 79..82,
-                insert: "Some($0)",
-                kind: EnumVariant,
-                lookup: "Some",
-                detail: "(T)",
-                trigger_call_info: true,
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 79..82,
-                delete: 79..82,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main() -> Option<i32>",
-            },
-        ]
-        "###
-        );
-        assert_debug_snapshot!(
-            do_reference_completion(
-                r"
-                enum Option<T> { Some(T), None }
-                use Option::*;
-                fn main(value: Option<i32>) {
-                    match value {
-                        Som<|>
-                    }
-                }
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "None",
-                source_range: 104..107,
-                delete: 104..107,
-                insert: "None",
-                kind: EnumVariant,
-                detail: "()",
-            },
-            CompletionItem {
-                label: "Option",
-                source_range: 104..107,
-                delete: 104..107,
-                insert: "Option",
-                kind: Enum,
-            },
-            CompletionItem {
-                label: "Some(…)",
-                source_range: 104..107,
-                delete: 104..107,
-                insert: "Some($0)",
-                kind: EnumVariant,
-                lookup: "Some",
-                detail: "(T)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn no_call_parens_if_fn_ptr_needed() {
+    fn strips_underscores_from_args() {
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "foo",
-                r"
+            r#"
-                fn somefn(with: u8, a: u8, lot: u8, of: u8, args: u8) {}
+fn foo(_foo: i32, ___bar: bool, ho_ge_: String) {}
+fn main() { f<|> }
-                struct ManualVtable {
+"#,
-                    method: fn(u8, u8, u8, u8, u8),
+            r#"
-                }
+fn foo(_foo: i32, ___bar: bool, ho_ge_: String) {}
+fn main() { foo(${1:foo}, ${2:bar}, ${3:ho_ge_})$0 }
+"#,
+        );
+    }
-                fn main() -> ManualVtable {
+    #[test]
-                    ManualVtable {
+    fn inserts_parens_for_tuple_enums() {
-                        method: some<|>
+        mark::check!(inserts_parens_for_tuple_enums);
-                    }
+        check_edit(
-                }
+            "Some",
-                "
+            r#"
-            ),
+enum Option<T> { Some(T), None }
-            @r###"
+use Option::*;
-        [
+fn main() -> Option<i32> {
-            CompletionItem {
+    Som<|>
-                label: "ManualVtable",
+}
-                source_range: 182..186,
+"#,
-                delete: 182..186,
+            r#"
-                insert: "ManualVtable",
+enum Option<T> { Some(T), None }
-                kind: Struct,
+use Option::*;
-            },
+fn main() -> Option<i32> {
-            CompletionItem {
+    Some($0)
-                label: "main",
+}
-                source_range: 182..186,
+"#,
-                delete: 182..186,
+        );
-                insert: "main",
+        check_edit(
-                kind: Function,
+            "Some",
-                detail: "fn main() -> ManualVtable",
+            r#"
-            },
+enum Option<T> { Some(T), None }
-            CompletionItem {
+use Option::*;
-                label: "somefn",
+fn main(value: Option<i32>) {
-                source_range: 182..186,
+    match value {
-                delete: 182..186,
+        Som<|>
-                insert: "somefn",
+    }
-                kind: Function,
+}
-                detail: "fn somefn(with: u8, a: u8, lot: u8, of: u8, args: u8)",
+"#,
-            },
+            r#"
-        ]
+enum Option<T> { Some(T), None }
-        "###
+use Option::*;
+fn main(value: Option<i32>) {
+    match value {
+        Some($0)
+    }
+}
+"#,
        );
    }
    #[test]
-    fn arg_snippets_for_method_call() {
+    fn dont_duplicate_pattern_parens() {
-        assert_debug_snapshot!(
+        mark::check!(dont_duplicate_pattern_parens);
-            do_reference_completion(
+        check_edit(
-                r"
+            "Var",
-                struct S {}
+            r#"
-                impl S {
+enum E { Var(i32) }
-                    fn foo(&self, x: i32) {}
+fn main() {
-                }
+    match E::Var(92) {
-                fn bar(s: &S) {
+        E::<|>(92) => (),
-                    s.f<|>
+    }
-                }
+}
-                "
+"#,
-            ),
+            r#"
-            @r###"
+enum E { Var(i32) }
-        [
+fn main() {
-            CompletionItem {
+    match E::Var(92) {
-                label: "foo(…)",
+        E::Var(92) => (),
-                source_range: 74..75,
+    }
-                delete: 74..75,
+}
-                insert: "foo(${1:x})$0",
+"#,
-                kind: Method,
+        );
-                lookup: "foo",
-                detail: "fn foo(&self, x: i32)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
-        )
    }
    #[test]
-    fn no_arg_snippets_for_method_call() {
+    fn no_call_parens_if_fn_ptr_needed() {
-        assert_debug_snapshot!(
+        mark::check!(no_call_parens_if_fn_ptr_needed);
-            do_reference_completion_with_options(
+        check_edit(
-                r"
+            "foo",
-                struct S {}
+            r#"
-                impl S {
+fn foo(foo: u8, bar: u8) {}
-                    fn foo(&self, x: i32) {}
+struct ManualVtable { f: fn(u8, u8) }
-                }
-                fn bar(s: &S) {
+fn main() -> ManualVtable {
-                    s.f<|>
+    ManualVtable { f: f<|> }
-                }
+}
-                ",
+"#,
-                CompletionConfig {
+            r#"
-                    add_call_argument_snippets: false,
+fn foo(foo: u8, bar: u8) {}
-                    .. Default::default()
+struct ManualVtable { f: fn(u8, u8) }
-                }
-            ),
+fn main() -> ManualVtable {
-            @r###"
+    ManualVtable { f: foo }
-        [
+}
-            CompletionItem {
+"#,
-                label: "foo(…)",
+        );
-                source_range: 74..75,
-                delete: 74..75,
-                insert: "foo($0)",
-                kind: Method,
-                lookup: "foo",
-                detail: "fn foo(&self, x: i32)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
-        )
    }
    #[test]
-    fn dont_render_function_parens_in_use_item() {
+    fn no_parens_in_use_item() {
-        assert_debug_snapshot!(
+        mark::check!(no_parens_in_use_item);
-            do_reference_completion(
+        check_edit(
-                "
+            "foo",
-                //- /lib.rs
+            r#"
-                mod m { pub fn foo() {} }
+mod m { pub fn foo() {} }
-                use crate::m::f<|>;
+use crate::m::f<|>;
-                "
+"#,
-            ),
+            r#"
-            @r###"
+mod m { pub fn foo() {} }
-        [
+use crate::m::foo;
-            CompletionItem {
+"#,
-                label: "foo",
-                source_range: 40..41,
-                delete: 40..41,
-                insert: "foo",
-                kind: Function,
-                detail: "pub fn foo()",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn dont_render_function_parens_if_already_call() {
+    fn no_parens_in_call() {
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "foo",
-                "
+            r#"
-                //- /lib.rs
+fn foo(x: i32) {}
-                fn frobnicate() {}
+fn main() { f<|>(); }
-                fn main() {
+"#,
-                    frob<|>();
+            r#"
-                }
+fn foo(x: i32) {}
-                "
+fn main() { foo(); }
-            ),
+"#,
-            @r###"
-        [
-            CompletionItem {
-                label: "frobnicate",
-                source_range: 35..39,
-                delete: 35..39,
-                insert: "frobnicate",
-                kind: Function,
-                detail: "fn frobnicate()",
-            },
-            CompletionItem {
-                label: "main",
-                source_range: 35..39,
-                delete: 35..39,
-                insert: "main",
-                kind: Function,
-                detail: "fn main()",
-            },
-        ]
-        "###
        );
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "foo",
-                "
+            r#"
-                //- /lib.rs
+struct Foo;
-                struct Foo {}
+impl Foo { fn foo(&self){} }
-                impl Foo { fn new() -> Foo {} }
+fn f(foo: &Foo) { foo.f<|>(); }
-                fn main() {
+"#,
-                    Foo::ne<|>();
+            r#"
-                }
+struct Foo;
-                "
+impl Foo { fn foo(&self){} }
-            ),
+fn f(foo: &Foo) { foo.foo(); }
-            @r###"
+"#,
-        [
-            CompletionItem {
-                label: "new",
-                source_range: 67..69,
-                delete: 67..69,
-                insert: "new",
-                kind: Function,
-                detail: "fn new() -> Foo",
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn inserts_angle_brackets_for_generics() {
        mark::check!(inserts_angle_brackets_for_generics);
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "Vec",
-                r"
+            r#"
-                struct Vec<T> {}
+struct Vec<T> {}
-                fn foo(xs: Ve<|>)
+fn foo(xs: Ve<|>)
-                "
+"#,
-            ),
+            r#"
-            @r###"
+struct Vec<T> {}
-        [
+fn foo(xs: Vec<$0>)
-            CompletionItem {
+"#,
-                label: "Vec<…>",
-                source_range: 28..30,
-                delete: 28..30,
-                insert: "Vec<$0>",
-                kind: Struct,
-                lookup: "Vec",
-            },
-            CompletionItem {
-                label: "foo(…)",
-                source_range: 28..30,
-                delete: 28..30,
-                insert: "foo(${1:xs})$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo(xs: Ve)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
        );
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "Vec",
-                r"
+            r#"
-                type Vec<T> = (T,);
+type Vec<T> = (T,);
-                fn foo(xs: Ve<|>)
+fn foo(xs: Ve<|>)
-                "
+"#,
-            ),
+            r#"
-            @r###"
+type Vec<T> = (T,);
-        [
+fn foo(xs: Vec<$0>)
-            CompletionItem {
+"#,
-                label: "Vec<…>",
-                source_range: 31..33,
-                delete: 31..33,
-                insert: "Vec<$0>",
-                kind: TypeAlias,
-                lookup: "Vec",
-            },
-            CompletionItem {
-                label: "foo(…)",
-                source_range: 31..33,
-                delete: 31..33,
-                insert: "foo(${1:xs})$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo(xs: Ve)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
        );
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "Vec",
-                r"
+            r#"
-                struct Vec<T = i128> {}
+struct Vec<T = i128> {}
-                fn foo(xs: Ve<|>)
+fn foo(xs: Ve<|>)
-                "
+"#,
-            ),
+            r#"
-            @r###"
+struct Vec<T = i128> {}
-        [
+fn foo(xs: Vec)
-            CompletionItem {
+"#,
-                label: "Vec",
-                source_range: 35..37,
-                delete: 35..37,
-                insert: "Vec",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "foo(…)",
-                source_range: 35..37,
-                delete: 35..37,
-                insert: "foo(${1:xs})$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo(xs: Ve)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
        );
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "Vec",
-                r"
+            r#"
-                struct Vec<T> {}
+struct Vec<T> {}
-                fn foo(xs: Ve<|><i128>)
+fn foo(xs: Ve<|><i128>)
-                "
+"#,
-            ),
+            r#"
-            @r###"
+struct Vec<T> {}
-        [
+fn foo(xs: Vec<i128>)
-            CompletionItem {
+"#,
-                label: "Vec",
-                source_range: 28..30,
-                delete: 28..30,
-                insert: "Vec",
-                kind: Struct,
-            },
-            CompletionItem {
-                label: "foo(…)",
-                source_range: 28..30,
-                delete: 28..30,
-                insert: "foo(${1:xs})$0",
-                kind: Function,
-                lookup: "foo",
-                detail: "fn foo(xs: Ve<i128>)",
-                trigger_call_info: true,
-            },
-        ]
-        "###
        );
    }
    #[test]
    fn dont_insert_macro_call_parens_unncessary() {
        mark::check!(dont_insert_macro_call_parens_unncessary);
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "frobnicate!",
-                r"
+            r#"
-                //- /main.rs
+//- /main.rs
-                use foo::<|>;
+use foo::<|>;
+//- /foo/lib.rs
-                //- /foo/lib.rs
+#[macro_export]
-                #[macro_export]
+macro_rules frobnicate { () => () }
-                macro_rules frobnicate {
+"#,
-                    () => ()
+            r#"
-                }
+use foo::frobnicate;
-                "
+"#,
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "frobnicate!",
-                source_range: 9..9,
-                delete: 9..9,
-                insert: "frobnicate",
-                kind: Macro,
-                detail: "#[macro_export]\nmacro_rules! frobnicate",
-            },
-        ]
-        "###
        );
-        assert_debug_snapshot!(
+        check_edit(
-            do_reference_completion(
+            "frobnicate!",
-                r"
+            r#"
-                //- /main.rs
+macro_rules frobnicate { () => () }
-                macro_rules frobnicate {
+fn main() { frob<|>!(); }
-                    () => ()
+"#,
-                }
+            r#"
-                fn main() {
+macro_rules frobnicate { () => () }
-                    frob<|>!();
+fn main() { frobnicate!(); }
-                }
+"#,
-                "
-            ),
-            @r###"
-        [
-            CompletionItem {
-                label: "frobnicate!",
-                source_range: 56..60,
-                delete: 56..60,
-                insert: "frobnicate",
-                kind: Macro,
-                detail: "macro_rules! frobnicate",
-            },
-            CompletionItem {
-                label: "main()",
-                source_range: 56..60,
-                delete: 56..60,
-                insert: "main()$0",
-                kind: Function,
-                lookup: "main",
-                detail: "fn main()",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn test_struct_field_completion_in_func_call() {
+    fn active_param_score() {
-        mark::check!(test_struct_field_completion_in_func_call);
+        mark::check!(active_param_type_match);
-        assert_debug_snapshot!(
+        check_scores(
-        do_reference_completion(
+            r#"
-                r"
+struct S { foo: i64, bar: u32, baz: u32 }
-                struct A { another_field: i64, the_field: u32, my_string: String }
+fn test(bar: u32) { }
-                fn test(my_param: u32) -> u32 { my_param }
+fn foo(s: S) { test(s.<|>) }
-                fn foo(a: A) {
+"#,
-                    test(a.<|>)
+            expect![[r#"
-                }
+                fd bar [type+name]
-                ",
+                fd baz [type]
-        ),
+                fd foo []
-            @r###"
+            "#]],
-        [
-            CompletionItem {
-                label: "another_field",
-                source_range: 136..136,
-                delete: 136..136,
-                insert: "another_field",
-                kind: Field,
-                detail: "i64",
-            },
-            CompletionItem {
-                label: "my_string",
-                source_range: 136..136,
-                delete: 136..136,
-                insert: "my_string",
-                kind: Field,
-                detail: "{unknown}",
-            },
-            CompletionItem {
-                label: "the_field",
-                source_range: 136..136,
-                delete: 136..136,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-                score: TypeMatch,
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn test_struct_field_completion_in_func_call_with_type_and_name() {
+    fn record_field_scores() {
-        assert_debug_snapshot!(
+        mark::check!(record_field_type_match);
-        do_reference_completion(
+        check_scores(
-                r"
+            r#"
-                struct A { another_field: i64, another_good_type: u32, the_field: u32 }
+struct A { foo: i64, bar: u32, baz: u32 }
-                fn test(the_field: u32) -> u32 { the_field }
+struct B { x: (), y: f32, bar: u32 }
-                fn foo(a: A) {
+fn foo(a: A) { B { bar: a.<|> }; }
-                    test(a.<|>)
+"#,
-                }
+            expect![[r#"
-                ",
+                fd bar [type+name]
-        ),
+                fd baz [type]
-            @r###"
+                fd foo []
-        [
+            "#]],
-            CompletionItem {
+        )
-                label: "another_field",
-                source_range: 143..143,
-                delete: 143..143,
-                insert: "another_field",
-                kind: Field,
-                detail: "i64",
-            },
-            CompletionItem {
-                label: "another_good_type",
-                source_range: 143..143,
-                delete: 143..143,
-                insert: "another_good_type",
-                kind: Field,
-                detail: "u32",
-                score: TypeMatch,
-            },
-            CompletionItem {
-                label: "the_field",
-                source_range: 143..143,
-                delete: 143..143,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-                score: TypeAndNameMatch,
-            },
-        ]
-        "###
-        );
    }
    #[test]
-    fn test_struct_field_completion_in_record_lit() {
+    fn record_field_and_call_scores() {
-        mark::check!(test_struct_field_completion_in_record_lit);
+        check_scores(
-        assert_debug_snapshot!(
+            r#"
-        do_reference_completion(
+struct A { foo: i64, bar: u32, baz: u32 }
-                r"
+struct B { x: (), y: f32, bar: u32 }
-                struct A { another_field: i64, another_good_type: u32, the_field: u32 }
+fn f(foo: i64) {  }
-                struct B { my_string: String, my_vec: Vec<u32>, the_field: u32 }
+fn foo(a: A) { B { bar: f(a.<|>) }; }
-                fn foo(a: A) {
+"#,
-                    let b = B {
+            expect![[r#"
-                        the_field: a.<|>
+                fd foo [type+name]
-                    };
+                fd bar []
-                }
+                fd baz []
-                ",
+            "#]],
-        ),
+        );
-            @r###"
+        check_scores(
-        [
+            r#"
-            CompletionItem {
+struct A { foo: i64, bar: u32, baz: u32 }
-                label: "another_field",
+struct B { x: (), y: f32, bar: u32 }
-                source_range: 189..189,
+fn f(foo: i64) {  }
-                delete: 189..189,
+fn foo(a: A) { f(B { bar: a.<|> }); }
-                insert: "another_field",
+"#,
-                kind: Field,
+            expect![[r#"
-                detail: "i64",
+                fd bar [type+name]
-            },
+                fd baz [type]
-            CompletionItem {
+                fd foo []
-                label: "another_good_type",
+            "#]],
-                source_range: 189..189,
-                delete: 189..189,
-                insert: "another_good_type",
-                kind: Field,
-                detail: "u32",
-                score: TypeMatch,
-            },
-            CompletionItem {
-                label: "the_field",
-                source_range: 189..189,
-                delete: 189..189,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-                score: TypeAndNameMatch,
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn test_struct_field_completion_in_record_lit_and_fn_call() {
+    fn prioritize_exact_ref_match() {
-        assert_debug_snapshot!(
+        check_scores(
-        do_reference_completion(
+            r#"
-                r"
+struct WorldSnapshot { _f: () };
-                struct A { another_field: i64, another_good_type: u32, the_field: u32 }
+fn go(world: &WorldSnapshot) { go(w<|>) }
-                struct B { my_string: String, my_vec: Vec<u32>, the_field: u32 }
+"#,
-                fn test(the_field: i64) -> i64 { the_field }
+            expect![[r#"
-                fn foo(a: A) {
+                bn world [type+name]
-                    let b = B {
+                st WorldSnapshot []
-                        the_field: test(a.<|>)
+                fn go(…) []
-                    };
+            "#]],
-                }
-                ",
-        ),
-            @r###"
-        [
-            CompletionItem {
-                label: "another_field",
-                source_range: 239..239,
-                delete: 239..239,
-                insert: "another_field",
-                kind: Field,
-                detail: "i64",
-                score: TypeMatch,
-            },
-            CompletionItem {
-                label: "another_good_type",
-                source_range: 239..239,
-                delete: 239..239,
-                insert: "another_good_type",
-                kind: Field,
-                detail: "u32",
-            },
-            CompletionItem {
-                label: "the_field",
-                source_range: 239..239,
-                delete: 239..239,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn test_struct_field_completion_in_fn_call_and_record_lit() {
+    fn too_many_arguments() {
-        assert_debug_snapshot!(
+        mark::check!(too_many_arguments);
-        do_reference_completion(
+        check_scores(
-                r"
+            r#"
-                struct A { another_field: i64, another_good_type: u32, the_field: u32 }
+struct Foo;
-                struct B { my_string: String, my_vec: Vec<u32>, the_field: u32 }
+fn f(foo: &Foo) { f(foo, w<|>) }
-                fn test(the_field: i64) -> i64 { the_field }
+"#,
-                fn foo(a: A) {
+            expect![[r#"
-                    test(B {
+                st Foo []
-                        the_field: a.<|>
+                fn f(…) []
-                    });
+                bn foo []
-                }
+            "#]],
-                ",
-        ),
-            @r###"
-        [
-            CompletionItem {
-                label: "another_field",
-                source_range: 231..231,
-                delete: 231..231,
-                insert: "another_field",
-                kind: Field,
-                detail: "i64",
-            },
-            CompletionItem {
-                label: "another_good_type",
-                source_range: 231..231,
-                delete: 231..231,
-                insert: "another_good_type",
-                kind: Field,
-                detail: "u32",
-                score: TypeMatch,
-            },
-            CompletionItem {
-                label: "the_field",
-                source_range: 231..231,
-                delete: 231..231,
-                insert: "the_field",
-                kind: Field,
-                detail: "u32",
-                score: TypeAndNameMatch,
-            },
-        ]
-        "###
        );
    }
    #[test]
-    fn prioritize_exact_ref_match() {
+    fn guesses_macro_braces() {
-        assert_debug_snapshot!(
+        check_edit(
-        do_reference_completion(
+            "vec!",
-                r"
+            r#"
-                    struct WorldSnapshot { _f: () };
+/// Creates a [`Vec`] containing the arguments.
-                    fn go(world: &WorldSnapshot) {
+///
-                        go(w<|>)
+/// ```
-                    }
+/// let v = vec![1, 2, 3];
-                    ",
+/// assert_eq!(v[0], 1);
-        ),
+/// assert_eq!(v[1], 2);
-            @r###"
+/// assert_eq!(v[2], 3);
-        [
+/// ```
-            CompletionItem {
+macro_rules! vec { () => {} }
-                label: "WorldSnapshot",
-                source_range: 71..72,
+fn fn main() { v<|> }
-                delete: 71..72,
+"#,
-                insert: "WorldSnapshot",
+            r#"
-                kind: Struct,
+/// Creates a [`Vec`] containing the arguments.
-            },
+///
-            CompletionItem {
+/// ```
-                label: "go(…)",
+/// let v = vec![1, 2, 3];
-                source_range: 71..72,
+/// assert_eq!(v[0], 1);
-                delete: 71..72,
+/// assert_eq!(v[1], 2);
-                insert: "go(${1:world})$0",
+/// assert_eq!(v[2], 3);
-                kind: Function,
+/// ```
-                lookup: "go",
+macro_rules! vec { () => {} }
-                detail: "fn go(world: &WorldSnapshot)",
-                trigger_call_info: true,
+fn fn main() { vec![$0] }
-            },
+"#,
-            CompletionItem {
-                label: "world",
-                source_range: 71..72,
-                delete: 71..72,
-                insert: "world",
-                kind: Binding,
-                detail: "&WorldSnapshot",
-                score: TypeAndNameMatch,
-            },
-        ]
-        "###
        );
+        check_edit(
+            "foo!",
+            r#"
+/// Foo
+///
+/// Don't call `fooo!()` `fooo!()`, or `_foo![]` `_foo![]`,
+/// call as `let _=foo!  { hello world };`
+macro_rules! foo { () => {} }
+fn main() { <|> }
+"#,
+            r#"
+/// Foo
+///
+/// Don't call `fooo!()` `fooo!()`, or `_foo![]` `_foo![]`,
+/// call as `let _=foo!  { hello world };`
+macro_rules! foo { () => {} }
+fn main() { foo! {$0} }
+"#,
+        )
    }
 }
diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs
index 5c01654cc..919177745 100644
--- a/crates/ra_ide/src/completion/test_utils.rs
+++ b/crates/ra_ide/src/completion/test_utils.rs
@@ -1,7 +1,10 @@
 //! Runs completion for testing purposes.
 use hir::Semantics;
+use itertools::Itertools;
 use ra_syntax::{AstNode, NodeOrToken, SyntaxElement};
+use stdx::{format_to, trim_indent};
+use test_utils::assert_eq_text;
 use crate::{
    completion::{completion_item::CompletionKind, CompletionConfig},
@@ -10,15 +13,15 @@ use crate::{
 };
 pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> {
-    do_completion_with_options(code, kind, &CompletionConfig::default())
+    do_completion_with_config(CompletionConfig::default(), code, kind)
 }
-pub(crate) fn do_completion_with_options(
+pub(crate) fn do_completion_with_config(
+    config: CompletionConfig,
    code: &str,
    kind: CompletionKind,
-    options: &CompletionConfig,
 ) -> Vec<CompletionItem> {
-    let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(code, options)
+    let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(config, code)
        .into_iter()
        .filter(|c| c.completion_kind == kind)
        .collect();
@@ -27,25 +30,69 @@ pub(crate) fn do_completion_with_options(
 }
 pub(crate) fn completion_list(code: &str, kind: CompletionKind) -> String {
-    completion_list_with_options(code, kind, &CompletionConfig::default())
+    completion_list_with_config(CompletionConfig::default(), code, kind)
 }
-pub(crate) fn completion_list_with_options(
+pub(crate) fn completion_list_with_config(
+    config: CompletionConfig,
    code: &str,
    kind: CompletionKind,
-    options: &CompletionConfig,
 ) -> String {
-    let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(code, options)
+    let mut kind_completions: Vec<CompletionItem> = get_all_completion_items(config, code)
        .into_iter()
        .filter(|c| c.completion_kind == kind)
        .collect();
    kind_completions.sort_by_key(|c| c.label().to_owned());
+    let label_width = kind_completions
+        .iter()
+        .map(|it| monospace_width(it.label()))
+        .max()
+        .unwrap_or_default()
+        .min(16);
    kind_completions
        .into_iter()
-        .map(|it| format!("{} {}\n", it.kind().unwrap().tag(), it.label()))
+        .map(|it| {
+            let tag = it.kind().unwrap().tag();
+            let var_name = format!("{} {}", tag, it.label());
+            let mut buf = var_name;
+            if let Some(detail) = it.detail() {
+                let width = label_width.saturating_sub(monospace_width(it.label()));
+                format_to!(buf, "{:width$} {}", "", detail, width = width);
+            }
+            format_to!(buf, "\n");
+            buf
+        })
        .collect()
 }
+fn monospace_width(s: &str) -> usize {
+    s.chars().count()
+}
+pub(crate) fn check_edit(what: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
+    check_edit_with_config(CompletionConfig::default(), what, ra_fixture_before, ra_fixture_after)
+}
+pub(crate) fn check_edit_with_config(
+    config: CompletionConfig,
+    what: &str,
+    ra_fixture_before: &str,
+    ra_fixture_after: &str,
+) {
+    let ra_fixture_after = trim_indent(ra_fixture_after);
+    let (analysis, position) = analysis_and_position(ra_fixture_before);
+    let completions: Vec<CompletionItem> =
+        analysis.completions(&config, position).unwrap().unwrap().into();
+    let (completion,) = completions
+        .iter()
+        .filter(|it| it.lookup() == what)
+        .collect_tuple()
+        .unwrap_or_else(|| panic!("can't find {:?} completion in {:#?}", what, completions));
+    let mut actual = analysis.file_text(position.file_id).unwrap().to_string();
+    completion.text_edit().apply(&mut actual);
+    assert_eq_text!(&ra_fixture_after, &actual)
+}
 pub(crate) fn check_pattern_is_applicable(code: &str, check: fn(SyntaxElement) -> bool) {
    let (analysis, pos) = analysis_and_position(code);
    analysis
@@ -58,7 +105,10 @@ pub(crate) fn check_pattern_is_applicable(code: &str, check: fn(SyntaxElement) -
        .unwrap();
 }
-fn get_all_completion_items(code: &str, options: &CompletionConfig) -> Vec<CompletionItem> {
+pub(crate) fn get_all_completion_items(
+    config: CompletionConfig,
+    code: &str,
+) -> Vec<CompletionItem> {
    let (analysis, position) = analysis_and_position(code);
-    analysis.completions(options, position).unwrap().unwrap().into()
+    analysis.completions(&config, position).unwrap().unwrap().into()
 }
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs
index 05fb799d6..dd8a7ffd9 100644
--- a/crates/ra_ide/src/diagnostics.rs
+++ b/crates/ra_ide/src/diagnostics.rs
@@ -7,7 +7,7 @@
 use std::cell::RefCell;
 use hir::{
-    diagnostics::{AstDiagnostic, Diagnostic as _, DiagnosticSink},
+    diagnostics::{AstDiagnostic, Diagnostic as _, DiagnosticSinkBuilder},
    HasSource, HirDisplay, Semantics, VariantDef,
 };
 use itertools::Itertools;
@@ -29,13 +29,18 @@ pub enum Severity {
    WeakWarning,
 }
-pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic> {
+pub(crate) fn diagnostics(
+    db: &RootDatabase,
+    file_id: FileId,
+    enable_experimental: bool,
+) -> Vec<Diagnostic> {
    let _p = profile("diagnostics");
    let sema = Semantics::new(db);
    let parse = db.parse(file_id);
    let mut res = Vec::new();
-    res.extend(parse.errors().iter().map(|err| Diagnostic {
+    // [#34344] Only take first 128 errors to prevent slowing down editor/ide, the number 128 is chosen arbitrarily.
+    res.extend(parse.errors().iter().take(128).map(|err| Diagnostic {
        range: err.range(),
        message: format!("Syntax Error: {}", err),
        severity: Severity::Error,
@@ -47,87 +52,85 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
        check_struct_shorthand_initialization(&mut res, file_id, &node);
    }
    let res = RefCell::new(res);
-    let mut sink = DiagnosticSink::new(|d| {
+    let mut sink = DiagnosticSinkBuilder::new()
-        res.borrow_mut().push(Diagnostic {
+        .on::<hir::diagnostics::UnresolvedModule, _>(|d| {
-            message: d.message(),
+            let original_file = d.source().file_id.original_file(db);
-            range: sema.diagnostics_range(d).range,
+            let fix = Fix::new(
-            severity: Severity::Error,
+                "Create module",
-            fix: None,
+                FileSystemEdit::CreateFile { anchor: original_file, dst: d.candidate.clone() }
-        })
+                    .into(),
-    })
+            );
-    .on::<hir::diagnostics::UnresolvedModule, _>(|d| {
+            res.borrow_mut().push(Diagnostic {
-        let original_file = d.source().file_id.original_file(db);
+                range: sema.diagnostics_range(d).range,
-        let fix = Fix::new(
+                message: d.message(),
-            "Create module",
+                severity: Severity::Error,
-            FileSystemEdit::CreateFile { anchor: original_file, dst: d.candidate.clone() }.into(),
+                fix: Some(fix),
-        );
+            })
-        res.borrow_mut().push(Diagnostic {
-            range: sema.diagnostics_range(d).range,
-            message: d.message(),
-            severity: Severity::Error,
-            fix: Some(fix),
        })
-    })
+        .on::<hir::diagnostics::MissingFields, _>(|d| {
-    .on::<hir::diagnostics::MissingFields, _>(|d| {
+            // Note that although we could add a diagnostics to
-        // Note that although we could add a diagnostics to
+            // fill the missing tuple field, e.g :
-        // fill the missing tuple field, e.g :
+            // `struct A(usize);`
-        // `struct A(usize);`
+            // `let a = A { 0: () }`
-        // `let a = A { 0: () }`
+            // but it is uncommon usage and it should not be encouraged.
-        // 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 fix = if d.missed_fields.iter().any(|it| it.as_tuple_index().is_some()) {
+                None
-            None
+            } else {
-        } else {
+                let mut field_list = d.ast(db);
-            let mut field_list = d.ast(db);
+                for f in d.missed_fields.iter() {
-            for f in d.missed_fields.iter() {
+                    let field =
-                let field =
+                        make::record_field(make::name_ref(&f.to_string()), Some(make::expr_unit()));
-                    make::record_field(make::name_ref(&f.to_string()), Some(make::expr_unit()));
+                    field_list = field_list.append_field(&field);
-                field_list = field_list.append_field(&field);
+                }
-            }
-            let edit = {
+                let edit = {
-                let mut builder = TextEditBuilder::default();
+                    let mut builder = TextEditBuilder::default();
-                algo::diff(&d.ast(db).syntax(), &field_list.syntax()).into_text_edit(&mut builder);
+                    algo::diff(&d.ast(db).syntax(), &field_list.syntax())
-                builder.finish()
+                        .into_text_edit(&mut builder);
+                    builder.finish()
+                };
+                Some(Fix::new("Fill struct fields", SourceFileEdit { file_id, edit }.into()))
            };
-            Some(Fix::new("Fill struct fields", SourceFileEdit { file_id, edit }.into()))
-        };
-        res.borrow_mut().push(Diagnostic {
+            res.borrow_mut().push(Diagnostic {
-            range: sema.diagnostics_range(d).range,
+                range: sema.diagnostics_range(d).range,
-            message: d.message(),
+                message: d.message(),
-            severity: Severity::Error,
+                severity: Severity::Error,
-            fix,
+                fix,
-        })
+            })
-    })
-    .on::<hir::diagnostics::MissingMatchArms, _>(|d| {
-        res.borrow_mut().push(Diagnostic {
-            range: sema.diagnostics_range(d).range,
-            message: d.message(),
-            severity: Severity::Error,
-            fix: None,
        })
-    })
+        .on::<hir::diagnostics::MissingOkInTailExpr, _>(|d| {
-    .on::<hir::diagnostics::MissingOkInTailExpr, _>(|d| {
+            let node = d.ast(db);
-        let node = d.ast(db);
+            let replacement = format!("Ok({})", node.syntax());
-        let replacement = format!("Ok({})", node.syntax());
+            let edit = TextEdit::replace(node.syntax().text_range(), replacement);
-        let edit = TextEdit::replace(node.syntax().text_range(), replacement);
+            let source_change = SourceFileEdit { file_id, edit }.into();
-        let source_change = SourceFileEdit { file_id, edit }.into();
+            let fix = Fix::new("Wrap with ok", source_change);
-        let fix = Fix::new("Wrap with ok", source_change);
+            res.borrow_mut().push(Diagnostic {
-        res.borrow_mut().push(Diagnostic {
+                range: sema.diagnostics_range(d).range,
-            range: sema.diagnostics_range(d).range,
+                message: d.message(),
-            message: d.message(),
+                severity: Severity::Error,
-            severity: Severity::Error,
+                fix: Some(fix),
-            fix: Some(fix),
+            })
        })
-    })
+        .on::<hir::diagnostics::NoSuchField, _>(|d| {
-    .on::<hir::diagnostics::NoSuchField, _>(|d| {
+            res.borrow_mut().push(Diagnostic {
-        res.borrow_mut().push(Diagnostic {
+                range: sema.diagnostics_range(d).range,
-            range: sema.diagnostics_range(d).range,
+                message: d.message(),
-            message: d.message(),
+                severity: Severity::Error,
-            severity: Severity::Error,
+                fix: missing_struct_field_fix(&sema, file_id, d),
-            fix: missing_struct_field_fix(&sema, file_id, d),
+            })
        })
-    });
+        // Only collect experimental diagnostics when they're enabled.
+        .filter(|diag| !diag.is_experimental() || enable_experimental)
+        // Diagnostics not handled above get no fix and default treatment.
+        .build(|d| {
+            res.borrow_mut().push(Diagnostic {
+                message: d.message(),
+                range: sema.diagnostics_range(d).range,
+                severity: Severity::Error,
+                fix: None,
+            })
+        });
    if let Some(m) = sema.to_module_def(file_id) {
        m.diagnostics(db, &mut sink);
@@ -138,33 +141,38 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
 fn missing_struct_field_fix(
    sema: &Semantics<RootDatabase>,
-    file_id: FileId,
+    usage_file_id: FileId,
    d: &hir::diagnostics::NoSuchField,
 ) -> Option<Fix> {
    let record_expr = sema.ast(d);
-    let record_lit = ast::RecordLit::cast(record_expr.syntax().parent()?.parent()?)?;
+    let record_lit = ast::RecordExpr::cast(record_expr.syntax().parent()?.parent()?)?;
    let def_id = sema.resolve_variant(record_lit)?;
    let module;
+    let def_file_id;
    let record_fields = match VariantDef::from(def_id) {
        VariantDef::Struct(s) => {
            module = s.module(sema.db);
            let source = s.source(sema.db);
-            let fields = source.value.field_def_list()?;
+            def_file_id = source.file_id;
-            record_field_def_list(fields)?
+            let fields = source.value.field_list()?;
+            record_field_list(fields)?
        }
        VariantDef::Union(u) => {
            module = u.module(sema.db);
            let source = u.source(sema.db);
-            source.value.record_field_def_list()?
+            def_file_id = source.file_id;
+            source.value.record_field_list()?
        }
        VariantDef::EnumVariant(e) => {
            module = e.module(sema.db);
            let source = e.source(sema.db);
-            let fields = source.value.field_def_list()?;
+            def_file_id = source.file_id;
-            record_field_def_list(fields)?
+            let fields = source.value.field_list()?;
+            record_field_list(fields)?
        }
    };
+    let def_file_id = def_file_id.original_file(sema.db);
    let new_field_type = sema.type_of_expr(&record_expr.expr()?)?;
    if new_field_type.is_unknown() {
@@ -179,24 +187,28 @@ fn missing_struct_field_fix(
    let last_field_syntax = last_field.syntax();
    let indent = IndentLevel::from_node(last_field_syntax);
-    let mut new_field = format!("\n{}{}", indent, new_field);
+    let mut new_field = new_field.to_string();
+    if usage_file_id != def_file_id {
+        new_field = format!("pub(crate) {}", new_field);
+    }
+    new_field = format!("\n{}{}", indent, new_field);
-    let needs_comma = !last_field_syntax.to_string().ends_with(",");
+    let needs_comma = !last_field_syntax.to_string().ends_with(',');
    if needs_comma {
        new_field = format!(",{}", new_field);
    }
    let source_change = SourceFileEdit {
-        file_id,
+        file_id: def_file_id,
        edit: TextEdit::insert(last_field_syntax.text_range().end(), new_field),
    };
    let fix = Fix::new("Create field", source_change.into());
    return Some(fix);
-    fn record_field_def_list(field_def_list: ast::FieldDefList) -> Option<ast::RecordFieldDefList> {
+    fn record_field_list(field_def_list: ast::FieldList) -> Option<ast::RecordFieldList> {
        match field_def_list {
-            ast::FieldDefList::RecordFieldDefList(it) => Some(it),
+            ast::FieldList::RecordFieldList(it) => Some(it),
-            ast::FieldDefList::TupleFieldDefList(_) => None,
+            ast::FieldList::TupleFieldList(_) => None,
        }
    }
 }
@@ -251,8 +263,8 @@ fn check_struct_shorthand_initialization(
    file_id: FileId,
    node: &SyntaxNode,
 ) -> Option<()> {
-    let record_lit = ast::RecordLit::cast(node.clone())?;
+    let record_lit = ast::RecordExpr::cast(node.clone())?;
-    let record_field_list = record_lit.record_field_list()?;
+    let record_field_list = record_lit.record_expr_field_list()?;
    for record_field in record_field_list.fields() {
        if let (Some(name_ref), Some(expr)) = (record_field.name_ref(), record_field.expr()) {
            let field_name = name_ref.syntax().text().to_string();
@@ -281,54 +293,22 @@ fn check_struct_shorthand_initialization(
 #[cfg(test)]
 mod tests {
-    use insta::assert_debug_snapshot;
-    use ra_syntax::SourceFile;
    use stdx::trim_indent;
    use test_utils::assert_eq_text;
-    use crate::mock_analysis::{analysis_and_position, single_file};
+    use crate::mock_analysis::{analysis_and_position, single_file, MockAnalysis};
+    use expect::{expect, Expect};
-    use super::*;
-    type DiagnosticChecker = fn(&mut Vec<Diagnostic>, FileId, &SyntaxNode) -> Option<()>;
-    fn check_not_applicable(code: &str, func: DiagnosticChecker) {
-        let parse = SourceFile::parse(code);
-        let mut diagnostics = Vec::new();
-        for node in parse.tree().syntax().descendants() {
-            func(&mut diagnostics, FileId(0), &node);
-        }
-        assert!(diagnostics.is_empty());
-    }
-    fn check_apply(before: &str, after: &str, func: DiagnosticChecker) {
-        let parse = SourceFile::parse(before);
-        let mut diagnostics = Vec::new();
-        for node in parse.tree().syntax().descendants() {
-            func(&mut diagnostics, FileId(0), &node);
-        }
-        let diagnostic =
-            diagnostics.pop().unwrap_or_else(|| panic!("no diagnostics for:\n{}\n", before));
-        let mut fix = diagnostic.fix.unwrap();
-        let edit = fix.source_change.source_file_edits.pop().unwrap().edit;
-        let actual = {
-            let mut actual = before.to_string();
-            edit.apply(&mut actual);
-            actual
-        };
-        assert_eq_text!(after, &actual);
-    }
    /// Takes a multi-file input fixture with annotated cursor positions,
    /// and checks that:
    ///  * a diagnostic is produced
    ///  * this diagnostic touches the input cursor position
    ///  * that the contents of the file containing the cursor match `after` after the diagnostic fix is applied
-    fn check_apply_diagnostic_fix_from_position(fixture: &str, after: &str) {
+    fn check_fix(ra_fixture_before: &str, ra_fixture_after: &str) {
-        let after = trim_indent(after);
+        let after = trim_indent(ra_fixture_after);
-        let (analysis, file_position) = analysis_and_position(fixture);
+        let (analysis, file_position) = analysis_and_position(ra_fixture_before);
-        let diagnostic = analysis.diagnostics(file_position.file_id).unwrap().pop().unwrap();
+        let diagnostic = analysis.diagnostics(file_position.file_id, true).unwrap().pop().unwrap();
        let mut fix = diagnostic.fix.unwrap();
        let edit = fix.source_change.source_file_edits.pop().unwrap().edit;
        let target_file_contents = analysis.file_text(file_position.file_id).unwrap();
@@ -348,16 +328,20 @@ mod tests {
        );
    }
-    fn check_apply_diagnostic_fix(ra_fixture_before: &str, ra_fixture_after: &str) {
+    /// Checks that a diagnostic applies to the file containing the `<|>` cursor marker
+    /// which has a fix that can apply to other files.
+    fn check_apply_diagnostic_fix_in_other_file(ra_fixture_before: &str, ra_fixture_after: &str) {
        let ra_fixture_after = &trim_indent(ra_fixture_after);
-        let (analysis, file_id) = single_file(ra_fixture_before);
+        let (analysis, file_pos) = analysis_and_position(ra_fixture_before);
-        let before = analysis.file_text(file_id).unwrap();
+        let current_file_id = file_pos.file_id;
-        let diagnostic = analysis.diagnostics(file_id).unwrap().pop().unwrap();
+        let diagnostic = analysis.diagnostics(current_file_id, true).unwrap().pop().unwrap();
        let mut fix = diagnostic.fix.unwrap();
-        let edit = fix.source_change.source_file_edits.pop().unwrap().edit;
+        let edit = fix.source_change.source_file_edits.pop().unwrap();
+        let changed_file_id = edit.file_id;
+        let before = analysis.file_text(changed_file_id).unwrap();
        let actual = {
            let mut actual = before.to_string();
-            edit.apply(&mut actual);
+            edit.edit.apply(&mut actual);
            actual
        };
        assert_eq_text!(ra_fixture_after, &actual);
@@ -365,498 +349,411 @@ mod tests {
    /// Takes a multi-file input fixture with annotated cursor position and checks that no diagnostics
    /// apply to the file containing the cursor.
-    fn check_no_diagnostic_for_target_file(fixture: &str) {
+    fn check_no_diagnostics(ra_fixture: &str) {
-        let (analysis, file_position) = analysis_and_position(fixture);
+        let mock = MockAnalysis::with_files(ra_fixture);
-        let diagnostics = analysis.diagnostics(file_position.file_id).unwrap();
+        let files = mock.files().map(|(it, _)| it).collect::<Vec<_>>();
-        assert_eq!(diagnostics.len(), 0);
+        let analysis = mock.analysis();
+        let diagnostics = files
+            .into_iter()
+            .flat_map(|file_id| analysis.diagnostics(file_id, true).unwrap())
+            .collect::<Vec<_>>();
+        assert_eq!(diagnostics.len(), 0, "unexpected diagnostics:\n{:#?}", diagnostics);
    }
-    fn check_no_diagnostic(content: &str) {
+    fn check_expect(ra_fixture: &str, expect: Expect) {
-        let (analysis, file_id) = single_file(content);
+        let (analysis, file_id) = single_file(ra_fixture);
-        let diagnostics = analysis.diagnostics(file_id).unwrap();
+        let diagnostics = analysis.diagnostics(file_id, true).unwrap();
-        assert_eq!(diagnostics.len(), 0, "expected no diagnostic, found one");
+        expect.assert_debug_eq(&diagnostics)
    }
    #[test]
    fn test_wrap_return_type() {
-        let before = r#"
+        check_fix(
-            //- /main.rs
+            r#"
-            use core::result::Result::{self, Ok, Err};
+//- /main.rs
+use core::result::Result::{self, Ok, Err};
-            fn div(x: i32, y: i32) -> Result<i32, ()> {
+fn div(x: i32, y: i32) -> Result<i32, ()> {
-                if y == 0 {
+    if y == 0 {
-                    return Err(());
+        return Err(());
-                }
+    }
-                x / y<|>
+    x / y<|>
-            }
+}
-            //- /core/lib.rs
+//- /core/lib.rs
-            pub mod result {
+pub mod result {
-                pub enum Result<T, E> { Ok(T), Err(E) }
+    pub enum Result<T, E> { Ok(T), Err(E) }
-            }
+}
-        "#;
+"#,
-        let after = r#"
+            r#"
-            use core::result::Result::{self, Ok, Err};
+use core::result::Result::{self, Ok, Err};
-            fn div(x: i32, y: i32) -> Result<i32, ()> {
+fn div(x: i32, y: i32) -> Result<i32, ()> {
-                if y == 0 {
+    if y == 0 {
-                    return Err(());
+        return Err(());
-                }
+    }
-                Ok(x / y)
+    Ok(x / y)
-            }
+}
-        "#;
+"#,
-        check_apply_diagnostic_fix_from_position(before, after);
+        );
    }
    #[test]
    fn test_wrap_return_type_handles_generic_functions() {
-        let before = r#"
+        check_fix(
-            //- /main.rs
+            r#"
-            use core::result::Result::{self, Ok, Err};
+//- /main.rs
+use core::result::Result::{self, Ok, Err};
-            fn div<T>(x: T) -> Result<T, i32> {
+fn div<T>(x: T) -> Result<T, i32> {
-                if x == 0 {
+    if x == 0 {
-                    return Err(7);
+        return Err(7);
-                }
+    }
-                <|>x
+    <|>x
-            }
+}
-            //- /core/lib.rs
+//- /core/lib.rs
-            pub mod result {
+pub mod result {
-                pub enum Result<T, E> { Ok(T), Err(E) }
+    pub enum Result<T, E> { Ok(T), Err(E) }
-            }
+}
-        "#;
+"#,
-        let after = r#"
+            r#"
-            use core::result::Result::{self, Ok, Err};
+use core::result::Result::{self, Ok, Err};
-            fn div<T>(x: T) -> Result<T, i32> {
+fn div<T>(x: T) -> Result<T, i32> {
-                if x == 0 {
+    if x == 0 {
-                    return Err(7);
+        return Err(7);
-                }
+    }
-                Ok(x)
+    Ok(x)
-            }
+}
-        "#;
+"#,
-        check_apply_diagnostic_fix_from_position(before, after);
+        );
    }
    #[test]
    fn test_wrap_return_type_handles_type_aliases() {
-        let before = r#"
+        check_fix(
-            //- /main.rs
+            r#"
-            use core::result::Result::{self, Ok, Err};
+//- /main.rs
+use core::result::Result::{self, Ok, Err};
-            type MyResult<T> = Result<T, ()>;
+type MyResult<T> = Result<T, ()>;
-            fn div(x: i32, y: i32) -> MyResult<i32> {
+fn div(x: i32, y: i32) -> MyResult<i32> {
-                if y == 0 {
+    if y == 0 {
-                    return Err(());
+        return Err(());
-                }
+    }
-                x <|>/ y
+    x <|>/ y
-            }
+}
-            //- /core/lib.rs
+//- /core/lib.rs
-            pub mod result {
+pub mod result {
-                pub enum Result<T, E> { Ok(T), Err(E) }
+    pub enum Result<T, E> { Ok(T), Err(E) }
-            }
+}
-        "#;
+"#,
-        let after = r#"
+            r#"
-            use core::result::Result::{self, Ok, Err};
+use core::result::Result::{self, Ok, Err};
-            type MyResult<T> = Result<T, ()>;
+type MyResult<T> = Result<T, ()>;
-            fn div(x: i32, y: i32) -> MyResult<i32> {
+fn div(x: i32, y: i32) -> MyResult<i32> {
-                if y == 0 {
+    if y == 0 {
-                    return Err(());
+        return Err(());
-                }
+    }
-                Ok(x / y)
+    Ok(x / y)
-            }
+}
-        "#;
+"#,
-        check_apply_diagnostic_fix_from_position(before, after);
+        );
    }
    #[test]
    fn test_wrap_return_type_not_applicable_when_expr_type_does_not_match_ok_type() {
-        let content = r#"
+        check_no_diagnostics(
-            //- /main.rs
+            r#"
-            use core::result::Result::{self, Ok, Err};
+//- /main.rs
+use core::result::Result::{self, Ok, Err};
-            fn foo() -> Result<(), i32> {
+fn foo() -> Result<(), i32> { 0 }
-                0<|>
-            }
-            //- /core/lib.rs
+//- /core/lib.rs
-            pub mod result {
+pub mod result {
-                pub enum Result<T, E> { Ok(T), Err(E) }
+    pub enum Result<T, E> { Ok(T), Err(E) }
-            }
+}
-        "#;
+"#,
-        check_no_diagnostic_for_target_file(content);
+        );
    }
    #[test]
    fn test_wrap_return_type_not_applicable_when_return_type_is_not_result() {
-        let content = r#"
+        check_no_diagnostics(
-            //- /main.rs
+            r#"
-            use core::result::Result::{self, Ok, Err};
+//- /main.rs
+use core::result::Result::{self, Ok, Err};
-            enum SomeOtherEnum {
+enum SomeOtherEnum { Ok(i32), Err(String) }
-                Ok(i32),
-                Err(String),
-            }
-            fn foo() -> SomeOtherEnum {
+fn foo() -> SomeOtherEnum { 0 }
-                0<|>
-            }
-            //- /core/lib.rs
+//- /core/lib.rs
-            pub mod result {
+pub mod result {
-                pub enum Result<T, E> { Ok(T), Err(E) }
+    pub enum Result<T, E> { Ok(T), Err(E) }
-            }
+}
-        "#;
+"#,
-        check_no_diagnostic_for_target_file(content);
+        );
    }
    #[test]
    fn test_fill_struct_fields_empty() {
-        let before = r"
+        check_fix(
-            struct TestStruct {
+            r#"
-                one: i32,
+struct TestStruct { one: i32, two: i64 }
-                two: i64,
-            }
-            fn test_fn() {
+fn test_fn() {
-                let s = TestStruct{};
+    let s = TestStruct {<|>};
-            }
+}
-        ";
+"#,
-        let after = r"
+            r#"
-            struct TestStruct {
+struct TestStruct { one: i32, two: i64 }
-                one: i32,
-                two: i64,
-            }
-            fn test_fn() {
+fn test_fn() {
-                let s = TestStruct{ one: (), two: ()};
+    let s = TestStruct { one: (), two: ()};
-            }
+}
-        ";
+"#,
-        check_apply_diagnostic_fix(before, after);
+        );
    }
    #[test]
    fn test_fill_struct_fields_self() {
-        let before = r"
+        check_fix(
-            struct TestStruct {
+            r#"
-                one: i32,
+struct TestStruct { one: i32 }
-            }
-            impl TestStruct {
+impl TestStruct {
-                fn test_fn() {
+    fn test_fn() { let s = Self {<|>}; }
-                    let s = Self {};
+}
-                }
+"#,
-            }
+            r#"
-        ";
+struct TestStruct { one: i32 }
-        let after = r"
-            struct TestStruct {
-                one: i32,
-            }
-            impl TestStruct {
+impl TestStruct {
-                fn test_fn() {
+    fn test_fn() { let s = Self { one: ()}; }
-                    let s = Self { one: ()};
+}
-                }
+"#,
-            }
+        );
-        ";
-        check_apply_diagnostic_fix(before, after);
    }
    #[test]
    fn test_fill_struct_fields_enum() {
-        let before = r"
+        check_fix(
-            enum Expr {
+            r#"
-                Bin { lhs: Box<Expr>, rhs: Box<Expr> }
+enum Expr {
-            }
+    Bin { lhs: Box<Expr>, rhs: Box<Expr> }
+}
-            impl Expr {
+impl Expr {
-                fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
+    fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
-                    Expr::Bin { }
+        Expr::Bin {<|> }
-                }
+    }
-            }
+}
-        ";
+"#,
-        let after = r"
+            r#"
-            enum Expr {
+enum Expr {
-                Bin { lhs: Box<Expr>, rhs: Box<Expr> }
+    Bin { lhs: Box<Expr>, rhs: Box<Expr> }
-            }
+}
-            impl Expr {
+impl Expr {
-                fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
+    fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
-                    Expr::Bin { lhs: (), rhs: () }
+        Expr::Bin { lhs: (), rhs: () }
-                }
+    }
-            }
+}
-        ";
+"#,
-        check_apply_diagnostic_fix(before, after);
+        );
    }
    #[test]
    fn test_fill_struct_fields_partial() {
-        let before = r"
+        check_fix(
-            struct TestStruct {
+            r#"
-                one: i32,
+struct TestStruct { one: i32, two: i64 }
-                two: i64,
-            }
-            fn test_fn() {
+fn test_fn() {
-                let s = TestStruct{ two: 2 };
+    let s = TestStruct{ two: 2<|> };
-            }
+}
-        ";
+"#,
-        let after = r"
+            r"
-            struct TestStruct {
+struct TestStruct { one: i32, two: i64 }
-                one: i32,
-                two: i64,
-            }
-            fn test_fn() {
+fn test_fn() {
-                let s = TestStruct{ two: 2, one: () };
+    let s = TestStruct{ two: 2, one: () };
-            }
+}
-        ";
+",
-        check_apply_diagnostic_fix(before, after);
+        );
    }
    #[test]
    fn test_fill_struct_fields_no_diagnostic() {
-        let content = r"
+        check_no_diagnostics(
-            struct TestStruct {
+            r"
-                one: i32,
+            struct TestStruct { one: i32, two: i64 }
-                two: i64,
-            }
            fn test_fn() {
                let one = 1;
                let s = TestStruct{ one, two: 2 };
            }
-        ";
+        ",
+        );
-        check_no_diagnostic(content);
    }
    #[test]
    fn test_fill_struct_fields_no_diagnostic_on_spread() {
-        let content = r"
+        check_no_diagnostics(
-            struct TestStruct {
+            r"
-                one: i32,
+            struct TestStruct { one: i32, two: i64 }
-                two: i64,
-            }
            fn test_fn() {
                let one = 1;
                let s = TestStruct{ ..a };
            }
-        ";
+        ",
+        );
-        check_no_diagnostic(content);
    }
    #[test]
    fn test_unresolved_module_diagnostic() {
-        let (analysis, file_id) = single_file("mod foo;");
+        check_expect(
-        let diagnostics = analysis.diagnostics(file_id).unwrap();
+            r#"mod foo;"#,
-        assert_debug_snapshot!(diagnostics, @r###"
+            expect![[r#"
-        [
+                [
-            Diagnostic {
+                    Diagnostic {
-                message: "unresolved module",
+                        message: "unresolved module",
-                range: 0..8,
+                        range: 0..8,
-                severity: Error,
+                        severity: Error,
-                fix: Some(
+                        fix: Some(
-                    Fix {
+                            Fix {
-                        label: "Create module",
+                                label: "Create module",
-                        source_change: SourceChange {
+                                source_change: SourceChange {
-                            source_file_edits: [],
+                                    source_file_edits: [],
-                            file_system_edits: [
+                                    file_system_edits: [
-                                CreateFile {
+                                        CreateFile {
-                                    anchor: FileId(
+                                            anchor: FileId(
-                                        1,
+                                                1,
-                                    ),
+                                            ),
-                                    dst: "foo.rs",
+                                            dst: "foo.rs",
+                                        },
+                                    ],
+                                    is_snippet: false,
                                },
-                            ],
+                            },
-                            is_snippet: false,
+                        ),
-                        },
                    },
-                ),
+                ]
-            },
+            "#]],
-        ]
+        );
-        "###);
    }
    #[test]
    fn range_mapping_out_of_macros() {
-        let (analysis, file_id) = single_file(
+        // FIXME: this is very wrong, but somewhat tricky to fix.
-            r"
+        check_fix(
-            fn some() {}
+            r#"
-            fn items() {}
+fn some() {}
-            fn here() {}
+fn items() {}
+fn here() {}
-            macro_rules! id {
+macro_rules! id { ($($tt:tt)*) => { $($tt)*}; }
-                ($($tt:tt)*) => { $($tt)*};
-            }
-            fn main() {
+fn main() {
-                let _x = id![Foo { a: 42 }];
+    let _x = id![Foo { a: <|>42 }];
-            }
+}
-            pub struct Foo {
+pub struct Foo { pub a: i32, pub b: i32 }
-                pub a: i32,
+"#,
-                pub b: i32,
+            r#"
-            }
+fn {a:42, b: ()} {}
-        ",
+fn items() {}
+fn here() {}
+macro_rules! id { ($($tt:tt)*) => { $($tt)*}; }
+fn main() {
+    let _x = id![Foo { a: 42 }];
+}
+pub struct Foo { pub a: i32, pub b: i32 }
+"#,
        );
-        let diagnostics = analysis.diagnostics(file_id).unwrap();
-        assert_debug_snapshot!(diagnostics, @r###"
-        [
-            Diagnostic {
-                message: "Missing structure fields:\n- b\n",
-                range: 127..136,
-                severity: Error,
-                fix: Some(
-                    Fix {
-                        label: "Fill struct fields",
-                        source_change: SourceChange {
-                            source_file_edits: [
-                                SourceFileEdit {
-                                    file_id: FileId(
-                                        1,
-                                    ),
-                                    edit: TextEdit {
-                                        indels: [
-                                            Indel {
-                                                insert: "{a:42, b: ()}",
-                                                delete: 3..9,
-                                            },
-                                        ],
-                                    },
-                                },
-                            ],
-                            file_system_edits: [],
-                            is_snippet: false,
-                        },
-                    },
-                ),
-            },
-        ]
-        "###);
    }
    #[test]
    fn test_check_unnecessary_braces_in_use_statement() {
-        check_not_applicable(
+        check_no_diagnostics(
-            "
+            r#"
-            use a;
+use a;
-            use a::{c, d::e};
+use a::{c, d::e};
-        ",
+"#,
-            check_unnecessary_braces_in_use_statement,
-        );
-        check_apply("use {b};", "use b;", check_unnecessary_braces_in_use_statement);
-        check_apply("use a::{c};", "use a::c;", check_unnecessary_braces_in_use_statement);
-        check_apply("use a::{self};", "use a;", check_unnecessary_braces_in_use_statement);
-        check_apply(
-            "use a::{c, d::{e}};",
-            "use a::{c, d::e};",
-            check_unnecessary_braces_in_use_statement,
        );
+        check_fix(r#"use {<|>b};"#, r#"use b;"#);
+        check_fix(r#"use {b<|>};"#, r#"use b;"#);
+        check_fix(r#"use a::{c<|>};"#, r#"use a::c;"#);
+        check_fix(r#"use a::{self<|>};"#, r#"use a;"#);
+        check_fix(r#"use a::{c, d::{e<|>}};"#, r#"use a::{c, d::e};"#);
    }
    #[test]
    fn test_check_struct_shorthand_initialization() {
-        check_not_applicable(
+        check_no_diagnostics(
            r#"
-            struct A {
+struct A { a: &'static str }
-                a: &'static str
+fn main() { A { a: "hello" } }
-            }
+"#,
-            fn main() {
-                A {
-                    a: "hello"
-                }
-            }
-        "#,
-            check_struct_shorthand_initialization,
        );
-        check_not_applicable(
+        check_no_diagnostics(
            r#"
-            struct A(usize);
+struct A(usize);
+fn main() { A { 0: 0 } }
-            fn main() {
+"#,
-                A {
-                    0: 0
-                }
-            }
-        "#,
-            check_struct_shorthand_initialization,
        );
-        check_apply(
+        check_fix(
            r#"
-struct A {
+struct A { a: &'static str }
-    a: &'static str
-}
 fn main() {
    let a = "haha";
-    A {
+    A { a<|>: a }
-        a: a
-    }
 }
-        "#,
+"#,
            r#"
-struct A {
+struct A { a: &'static str }
-    a: &'static str
-}
 fn main() {
    let a = "haha";
-    A {
+    A { a }
-        a
-    }
 }
-        "#,
+"#,
-            check_struct_shorthand_initialization,
        );
-        check_apply(
+        check_fix(
            r#"
-struct A {
+struct A { a: &'static str, b: &'static str }
-    a: &'static str,
-    b: &'static str
-}
 fn main() {
    let a = "haha";
    let b = "bb";
-    A {
+    A { a<|>: a, b }
-        a: a,
-        b
-    }
 }
-        "#,
+"#,
            r#"
-struct A {
+struct A { a: &'static str, b: &'static str }
-    a: &'static str,
-    b: &'static str
-}
 fn main() {
    let a = "haha";
    let b = "bb";
-    A {
+    A { a, b }
-        a,
-        b
-    }
 }
-        "#,
+"#,
-            check_struct_shorthand_initialization,
        );
    }
    #[test]
    fn test_add_field_from_usage() {
-        check_apply_diagnostic_fix(
+        check_fix(
            r"
 fn main() {
-    Foo { bar: 3, baz: false};
+    Foo { bar: 3, baz<|>: false};
 }
 struct Foo {
    bar: i32
@@ -873,4 +770,28 @@ struct Foo {
 ",
        )
    }
+    #[test]
+    fn test_add_field_in_other_file_from_usage() {
+        check_apply_diagnostic_fix_in_other_file(
+            r"
+            //- /main.rs
+            mod foo;
+            fn main() {
+                <|>foo::Foo { bar: 3, baz: false};
+            }
+            //- /foo.rs
+            struct Foo {
+                bar: i32
+            }
+            ",
+            r"
+            struct Foo {
+                bar: i32,
+                pub(crate) baz: bool
+            }
+            ",
+        )
+    }
 }
diff --git a/crates/ra_ide/src/display.rs b/crates/ra_ide/src/display.rs
index 827c094e7..fd42aa435 100644
--- a/crates/ra_ide/src/display.rs
+++ b/crates/ra_ide/src/display.rs
@@ -1,31 +1,60 @@
 //! This module contains utilities for turning SyntaxNodes and HIR types
 //! into types that may be used to render in a UI.
-mod function_signature;
 mod navigation_target;
-mod structure;
 mod short_label;
-use std::fmt::Display;
 use ra_syntax::{
-    ast::{self, AstNode, AttrsOwner, NameOwner, TypeParamsOwner},
+    ast::{self, AstNode, AttrsOwner, GenericParamsOwner, NameOwner},
    SyntaxKind::{ATTR, COMMENT},
 };
+use ast::VisibilityOwner;
 use stdx::format_to;
-pub use function_signature::FunctionSignature;
 pub use navigation_target::NavigationTarget;
-pub use structure::{file_structure, StructureNode};
 pub(crate) use navigation_target::{ToNav, TryToNav};
 pub(crate) use short_label::ShortLabel;
-pub(crate) fn function_label(node: &ast::FnDef) -> String {
+pub(crate) fn function_declaration(node: &ast::Fn) -> String {
-    FunctionSignature::from(node).to_string()
+    let mut buf = String::new();
+    if let Some(vis) = node.visibility() {
+        format_to!(buf, "{} ", vis);
+    }
+    if node.async_token().is_some() {
+        format_to!(buf, "async ");
+    }
+    if node.const_token().is_some() {
+        format_to!(buf, "const ");
+    }
+    if node.unsafe_token().is_some() {
+        format_to!(buf, "unsafe ");
+    }
+    if let Some(abi) = node.abi() {
+        // Keyword `extern` is included in the string.
+        format_to!(buf, "{} ", abi);
+    }
+    if let Some(name) = node.name() {
+        format_to!(buf, "fn {}", name)
+    }
+    if let Some(type_params) = node.generic_param_list() {
+        format_to!(buf, "{}", type_params);
+    }
+    if let Some(param_list) = node.param_list() {
+        format_to!(buf, "{}", param_list);
+    }
+    if let Some(ret_type) = node.ret_type() {
+        if ret_type.ty().is_some() {
+            format_to!(buf, " {}", ret_type);
+        }
+    }
+    if let Some(where_clause) = node.where_clause() {
+        format_to!(buf, "\n{}", where_clause);
+    }
+    buf
 }
-pub(crate) fn const_label(node: &ast::ConstDef) -> String {
+pub(crate) fn const_label(node: &ast::Const) -> String {
    let label: String = node
        .syntax()
        .children_with_tokens()
@@ -36,7 +65,7 @@ pub(crate) fn const_label(node: &ast::ConstDef) -> String {
    label.trim().to_owned()
 }
-pub(crate) fn type_label(node: &ast::TypeAliasDef) -> String {
+pub(crate) fn type_label(node: &ast::TypeAlias) -> String {
    let label: String = node
        .syntax()
        .children_with_tokens()
@@ -47,51 +76,8 @@ pub(crate) fn type_label(node: &ast::TypeAliasDef) -> String {
    label.trim().to_owned()
 }
-pub(crate) fn generic_parameters<N: TypeParamsOwner>(node: &N) -> Vec<String> {
-    let mut res = vec![];
-    if let Some(type_params) = node.type_param_list() {
-        res.extend(type_params.lifetime_params().map(|p| p.syntax().text().to_string()));
-        res.extend(type_params.type_params().map(|p| p.syntax().text().to_string()));
-    }
-    res
-}
-pub(crate) fn where_predicates<N: TypeParamsOwner>(node: &N) -> Vec<String> {
-    let mut res = vec![];
-    if let Some(clause) = node.where_clause() {
-        res.extend(clause.predicates().map(|p| p.syntax().text().to_string()));
-    }
-    res
-}
 pub(crate) fn macro_label(node: &ast::MacroCall) -> String {
    let name = node.name().map(|name| name.syntax().text().to_string()).unwrap_or_default();
    let vis = if node.has_atom_attr("macro_export") { "#[macro_export]\n" } else { "" };
    format!("{}macro_rules! {}", vis, name)
 }
-pub(crate) fn rust_code_markup(code: &impl Display) -> String {
-    rust_code_markup_with_doc(code, None, None)
-}
-pub(crate) fn rust_code_markup_with_doc(
-    code: &impl Display,
-    doc: Option<&str>,
-    mod_path: Option<&str>,
-) -> String {
-    let mut buf = String::new();
-    if let Some(mod_path) = mod_path {
-        if !mod_path.is_empty() {
-            format_to!(buf, "```rust\n{}\n```\n\n", mod_path);
-        }
-    }
-    format_to!(buf, "```rust\n{}\n```", code);
-    if let Some(doc) = doc {
-        format_to!(buf, "\n___");
-        format_to!(buf, "\n\n{}", doc);
-    }
-    buf
-}
diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs
deleted file mode 100644
index a98264fb3..000000000
--- a/crates/ra_ide/src/display/function_signature.rs
+++ /dev/null
@@ -1,334 +0,0 @@
-//! FIXME: write short doc here
-// FIXME: this modules relies on strings and AST way too much, and it should be
-// rewritten (matklad 2020-05-07)
-use std::{
-    convert::From,
-    fmt::{self, Display},
-};
-use hir::{Docs, Documentation, HasSource, HirDisplay};
-use ra_ide_db::RootDatabase;
-use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
-use stdx::{split_delim, SepBy};
-use crate::display::{generic_parameters, where_predicates};
-#[derive(Debug)]
-pub enum CallableKind {
-    Function,
-    StructConstructor,
-    VariantConstructor,
-    Macro,
-}
-/// Contains information about a function signature
-#[derive(Debug)]
-pub struct FunctionSignature {
-    pub kind: CallableKind,
-    /// Optional visibility
-    pub visibility: Option<String>,
-    /// Qualifiers like `async`, `unsafe`, ...
-    pub qualifier: FunctionQualifier,
-    /// Name of the function
-    pub name: Option<String>,
-    /// Documentation for the function
-    pub doc: Option<Documentation>,
-    /// Generic parameters
-    pub generic_parameters: Vec<String>,
-    /// Parameters of the function
-    pub parameters: Vec<String>,
-    /// Parameter names of the function
-    pub parameter_names: Vec<String>,
-    /// Parameter types of the function
-    pub parameter_types: Vec<String>,
-    /// Optional return type
-    pub ret_type: Option<String>,
-    /// Where predicates
-    pub where_predicates: Vec<String>,
-    /// Self param presence
-    pub has_self_param: bool,
-}
-#[derive(Debug, Default)]
-pub struct FunctionQualifier {
-    // `async` and `const` are mutually exclusive. Do we need to enforcing it here?
-    pub is_async: bool,
-    pub is_const: bool,
-    pub is_unsafe: bool,
-    /// The string `extern ".."`
-    pub extern_abi: Option<String>,
-}
-impl FunctionSignature {
-    pub(crate) fn with_doc_opt(mut self, doc: Option<Documentation>) -> Self {
-        self.doc = doc;
-        self
-    }
-    pub(crate) fn from_hir(db: &RootDatabase, function: hir::Function) -> Self {
-        let doc = function.docs(db);
-        let ast_node = function.source(db).value;
-        FunctionSignature::from(&ast_node).with_doc_opt(doc)
-    }
-    pub(crate) fn from_struct(db: &RootDatabase, st: hir::Struct) -> Option<Self> {
-        let node: ast::StructDef = st.source(db).value;
-        if let ast::StructKind::Record(_) = node.kind() {
-            return None;
-        };
-        let mut params = vec![];
-        let mut parameter_types = vec![];
-        for field in st.fields(db).into_iter() {
-            let ty = field.signature_ty(db);
-            let raw_param = format!("{}", ty.display(db));
-            if let Some(param_type) = raw_param.split(':').nth(1).and_then(|it| it.get(1..)) {
-                parameter_types.push(param_type.to_string());
-            } else {
-                // useful when you have tuple struct
-                parameter_types.push(raw_param.clone());
-            }
-            params.push(raw_param);
-        }
-        Some(
-            FunctionSignature {
-                kind: CallableKind::StructConstructor,
-                visibility: node.visibility().map(|n| n.syntax().text().to_string()),
-                // Do we need `const`?
-                qualifier: Default::default(),
-                name: node.name().map(|n| n.text().to_string()),
-                ret_type: node.name().map(|n| n.text().to_string()),
-                parameters: params,
-                parameter_names: vec![],
-                parameter_types,
-                generic_parameters: generic_parameters(&node),
-                where_predicates: where_predicates(&node),
-                doc: None,
-                has_self_param: false,
-            }
-            .with_doc_opt(st.docs(db)),
-        )
-    }
-    pub(crate) fn from_enum_variant(db: &RootDatabase, variant: hir::EnumVariant) -> Option<Self> {
-        let node: ast::EnumVariant = variant.source(db).value;
-        match node.kind() {
-            ast::StructKind::Record(_) | ast::StructKind::Unit => return None,
-            _ => (),
-        };
-        let parent_name = variant.parent_enum(db).name(db).to_string();
-        let name = format!("{}::{}", parent_name, variant.name(db));
-        let mut params = vec![];
-        let mut parameter_types = vec![];
-        for field in variant.fields(db).into_iter() {
-            let ty = field.signature_ty(db);
-            let raw_param = format!("{}", ty.display(db));
-            if let Some(param_type) = raw_param.split(':').nth(1).and_then(|it| it.get(1..)) {
-                parameter_types.push(param_type.to_string());
-            } else {
-                // The unwrap_or_else is useful when you have tuple
-                parameter_types.push(raw_param);
-            }
-            let name = field.name(db);
-            params.push(format!("{}: {}", name, ty.display(db)));
-        }
-        Some(
-            FunctionSignature {
-                kind: CallableKind::VariantConstructor,
-                visibility: None,
-                // Do we need `const`?
-                qualifier: Default::default(),
-                name: Some(name),
-                ret_type: None,
-                parameters: params,
-                parameter_names: vec![],
-                parameter_types,
-                generic_parameters: vec![],
-                where_predicates: vec![],
-                doc: None,
-                has_self_param: false,
-            }
-            .with_doc_opt(variant.docs(db)),
-        )
-    }
-    pub(crate) fn from_macro(db: &RootDatabase, macro_def: hir::MacroDef) -> Option<Self> {
-        let node: ast::MacroCall = macro_def.source(db).value;
-        let params = vec![];
-        Some(
-            FunctionSignature {
-                kind: CallableKind::Macro,
-                visibility: None,
-                qualifier: Default::default(),
-                name: node.name().map(|n| n.text().to_string()),
-                ret_type: None,
-                parameters: params,
-                parameter_names: vec![],
-                parameter_types: vec![],
-                generic_parameters: vec![],
-                where_predicates: vec![],
-                doc: None,
-                has_self_param: false,
-            }
-            .with_doc_opt(macro_def.docs(db)),
-        )
-    }
-}
-impl From<&'_ ast::FnDef> for FunctionSignature {
-    fn from(node: &ast::FnDef) -> FunctionSignature {
-        fn param_list(node: &ast::FnDef) -> (bool, Vec<String>, Vec<String>) {
-            let mut res = vec![];
-            let mut res_types = vec![];
-            let mut has_self_param = false;
-            if let Some(param_list) = node.param_list() {
-                if let Some(self_param) = param_list.self_param() {
-                    has_self_param = true;
-                    let raw_param = self_param.syntax().text().to_string();
-                    res_types.push(
-                        raw_param
-                            .split(':')
-                            .nth(1)
-                            .and_then(|it| it.get(1..))
-                            .unwrap_or_else(|| "Self")
-                            .to_string(),
-                    );
-                    res.push(raw_param);
-                }
-                // macro-generated functions are missing whitespace
-                fn fmt_param(param: ast::Param) -> String {
-                    let text = param.syntax().text().to_string();
-                    match split_delim(&text, ':') {
-                        Some((left, right)) => format!("{}: {}", left.trim(), right.trim()),
-                        _ => text,
-                    }
-                }
-                res.extend(param_list.params().map(fmt_param));
-                res_types.extend(param_list.params().map(|param| {
-                    let param_text = param.syntax().text().to_string();
-                    match param_text.split(':').nth(1).and_then(|it| it.get(1..)) {
-                        Some(it) => it.to_string(),
-                        None => param_text,
-                    }
-                }));
-            }
-            (has_self_param, res, res_types)
-        }
-        fn param_name_list(node: &ast::FnDef) -> Vec<String> {
-            let mut res = vec![];
-            if let Some(param_list) = node.param_list() {
-                if let Some(self_param) = param_list.self_param() {
-                    res.push(self_param.syntax().text().to_string())
-                }
-                res.extend(
-                    param_list
-                        .params()
-                        .map(|param| {
-                            Some(
-                                param
-                                    .pat()?
-                                    .syntax()
-                                    .descendants()
-                                    .find_map(ast::Name::cast)?
-                                    .text()
-                                    .to_string(),
-                            )
-                        })
-                        .map(|param| param.unwrap_or_default()),
-                );
-            }
-            res
-        }
-        let (has_self_param, parameters, parameter_types) = param_list(node);
-        FunctionSignature {
-            kind: CallableKind::Function,
-            visibility: node.visibility().map(|n| n.syntax().text().to_string()),
-            qualifier: FunctionQualifier {
-                is_async: node.async_token().is_some(),
-                is_const: node.const_token().is_some(),
-                is_unsafe: node.unsafe_token().is_some(),
-                extern_abi: node.abi().map(|n| n.to_string()),
-            },
-            name: node.name().map(|n| n.text().to_string()),
-            ret_type: node
-                .ret_type()
-                .and_then(|r| r.type_ref())
-                .map(|n| n.syntax().text().to_string()),
-            parameters,
-            parameter_names: param_name_list(node),
-            parameter_types,
-            generic_parameters: generic_parameters(node),
-            where_predicates: where_predicates(node),
-            // docs are processed separately
-            doc: None,
-            has_self_param,
-        }
-    }
-}
-impl Display for FunctionSignature {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if let Some(t) = &self.visibility {
-            write!(f, "{} ", t)?;
-        }
-        if self.qualifier.is_async {
-            write!(f, "async ")?;
-        }
-        if self.qualifier.is_const {
-            write!(f, "const ")?;
-        }
-        if self.qualifier.is_unsafe {
-            write!(f, "unsafe ")?;
-        }
-        if let Some(extern_abi) = &self.qualifier.extern_abi {
-            // Keyword `extern` is included in the string.
-            write!(f, "{} ", extern_abi)?;
-        }
-        if let Some(name) = &self.name {
-            match self.kind {
-                CallableKind::Function => write!(f, "fn {}", name)?,
-                CallableKind::StructConstructor => write!(f, "struct {}", name)?,
-                CallableKind::VariantConstructor => write!(f, "{}", name)?,
-                CallableKind::Macro => write!(f, "{}!", name)?,
-            }
-        }
-        if !self.generic_parameters.is_empty() {
-            write!(f, "{}", self.generic_parameters.iter().sep_by(", ").surround_with("<", ">"))?;
-        }
-        write!(f, "{}", self.parameters.iter().sep_by(", ").surround_with("(", ")"))?;
-        if let Some(t) = &self.ret_type {
-            write!(f, " -> {}", t)?;
-        }
-        if !self.where_predicates.is_empty() {
-            write!(f, "\nwhere {}", self.where_predicates.iter().sep_by(",\n      "))?;
-        }
-        Ok(())
-    }
-}
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index 0b52b01ab..45fbc86ef 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -11,7 +11,7 @@ use ra_syntax::{
    TextRange,
 };
-use crate::{FileRange, FileSymbol};
+use crate::FileSymbol;
 use super::short_label::ShortLabel;
@@ -22,15 +22,28 @@ use super::short_label::ShortLabel;
 /// code, like a function or a struct, but this is not strictly required.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct NavigationTarget {
-    // FIXME: use FileRange?
+    pub file_id: FileId,
-    file_id: FileId,
+    /// Range which encompasses the whole element.
-    full_range: TextRange,
+    ///
-    name: SmolStr,
+    /// Should include body, doc comments, attributes, etc.
-    kind: SyntaxKind,
+    ///
-    focus_range: Option<TextRange>,
+    /// Clients should use this range to answer "is the cursor inside the
-    container_name: Option<SmolStr>,
+    /// element?" question.
-    description: Option<String>,
+    pub full_range: TextRange,
-    docs: Option<String>,
+    /// A "most interesting" range withing the `full_range`.
+    ///
+    /// Typically, `full_range` is the whole syntax node, including doc
+    /// comments, and `focus_range` is the range of the identifier. "Most
+    /// interesting" range within the full range, typically the range of
+    /// identifier.
+    ///
+    /// Clients should place the cursor on this range when navigating to this target.
+    pub focus_range: Option<TextRange>,
+    pub name: SmolStr,
+    pub kind: SyntaxKind,
+    pub container_name: Option<SmolStr>,
+    pub description: Option<String>,
+    pub docs: Option<String>,
 }
 pub(crate) trait ToNav {
@@ -42,52 +55,10 @@ pub(crate) trait TryToNav {
 }
 impl NavigationTarget {
-    /// When `focus_range` is specified, returns it. otherwise
+    pub fn focus_or_full_range(&self) -> TextRange {
-    /// returns `full_range`
-    pub fn range(&self) -> TextRange {
        self.focus_range.unwrap_or(self.full_range)
    }
-    pub fn name(&self) -> &SmolStr {
-        &self.name
-    }
-    pub fn container_name(&self) -> Option<&SmolStr> {
-        self.container_name.as_ref()
-    }
-    pub fn kind(&self) -> SyntaxKind {
-        self.kind
-    }
-    pub fn file_id(&self) -> FileId {
-        self.file_id
-    }
-    pub fn file_range(&self) -> FileRange {
-        FileRange { file_id: self.file_id, range: self.full_range }
-    }
-    pub fn full_range(&self) -> TextRange {
-        self.full_range
-    }
-    pub fn docs(&self) -> Option<&str> {
-        self.docs.as_deref()
-    }
-    pub fn description(&self) -> Option<&str> {
-        self.description.as_deref()
-    }
-    /// A "most interesting" range withing the `full_range`.
-    ///
-    /// Typically, `full_range` is the whole syntax node,
-    /// including doc comments, and `focus_range` is the range of the identifier.
-    pub fn focus_range(&self) -> Option<TextRange> {
-        self.focus_range
-    }
    pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
        let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
        if let Some(src) = module.declaration_source(db) {
@@ -114,17 +85,12 @@ impl NavigationTarget {
    #[cfg(test)]
    pub(crate) fn debug_render(&self) -> String {
-        let mut buf = format!(
+        let mut buf =
-            "{} {:?} {:?} {:?}",
+            format!("{} {:?} {:?} {:?}", self.name, self.kind, self.file_id, self.full_range);
-            self.name(),
+        if let Some(focus_range) = self.focus_range {
-            self.kind(),
-            self.file_id(),
-            self.full_range()
-        );
-        if let Some(focus_range) = self.focus_range() {
            buf.push_str(&format!(" {:?}", focus_range))
        }
-        if let Some(container_name) = self.container_name() {
+        if let Some(container_name) = &self.container_name {
            buf.push_str(&format!(" {}", container_name))
        }
        buf
@@ -278,16 +244,22 @@ impl ToNav for hir::Module {
 impl ToNav for hir::ImplDef {
    fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
        let src = self.source(db);
-        let frange = if let Some(item) = self.is_builtin_derive(db) {
+        let derive_attr = self.is_builtin_derive(db);
+        let frange = if let Some(item) = &derive_attr {
            original_range(db, item.syntax())
        } else {
            original_range(db, src.as_ref().map(|it| it.syntax()))
        };
+        let focus_range = if derive_attr.is_some() {
+            None
+        } else {
+            src.value.target_type().map(|ty| original_range(db, src.with_value(ty.syntax())).range)
+        };
        NavigationTarget::from_syntax(
            frange.file_id,
            "impl".into(),
-            None,
+            focus_range,
            frange.range,
            src.value.syntax().kind(),
        )
@@ -407,16 +379,16 @@ pub(crate) fn docs_from_symbol(db: &RootDatabase, symbol: &FileSymbol) -> Option
    match_ast! {
        match node {
-            ast::FnDef(it) => it.doc_comment_text(),
+            ast::Fn(it) => it.doc_comment_text(),
-            ast::StructDef(it) => it.doc_comment_text(),
+            ast::Struct(it) => it.doc_comment_text(),
-            ast::EnumDef(it) => it.doc_comment_text(),
+            ast::Enum(it) => it.doc_comment_text(),
-            ast::TraitDef(it) => it.doc_comment_text(),
+            ast::Trait(it) => it.doc_comment_text(),
            ast::Module(it) => it.doc_comment_text(),
-            ast::TypeAliasDef(it) => it.doc_comment_text(),
+            ast::TypeAlias(it) => it.doc_comment_text(),
-            ast::ConstDef(it) => it.doc_comment_text(),
+            ast::Const(it) => it.doc_comment_text(),
-            ast::StaticDef(it) => it.doc_comment_text(),
+            ast::Static(it) => it.doc_comment_text(),
-            ast::RecordFieldDef(it) => it.doc_comment_text(),
+            ast::RecordField(it) => it.doc_comment_text(),
-            ast::EnumVariant(it) => it.doc_comment_text(),
+            ast::Variant(it) => it.doc_comment_text(),
            ast::MacroCall(it) => it.doc_comment_text(),
            _ => None,
        }
@@ -432,17 +404,88 @@ pub(crate) fn description_from_symbol(db: &RootDatabase, symbol: &FileSymbol) ->
    match_ast! {
        match node {
-            ast::FnDef(it) => it.short_label(),
+            ast::Fn(it) => it.short_label(),
-            ast::StructDef(it) => it.short_label(),
+            ast::Struct(it) => it.short_label(),
-            ast::EnumDef(it) => it.short_label(),
+            ast::Enum(it) => it.short_label(),
-            ast::TraitDef(it) => it.short_label(),
+            ast::Trait(it) => it.short_label(),
            ast::Module(it) => it.short_label(),
-            ast::TypeAliasDef(it) => it.short_label(),
+            ast::TypeAlias(it) => it.short_label(),
-            ast::ConstDef(it) => it.short_label(),
+            ast::Const(it) => it.short_label(),
-            ast::StaticDef(it) => it.short_label(),
+            ast::Static(it) => it.short_label(),
-            ast::RecordFieldDef(it) => it.short_label(),
+            ast::RecordField(it) => it.short_label(),
-            ast::EnumVariant(it) => it.short_label(),
+            ast::Variant(it) => it.short_label(),
            _ => None,
        }
    }
 }
+#[cfg(test)]
+mod tests {
+    use expect::expect;
+    use crate::{mock_analysis::single_file, Query};
+    #[test]
+    fn test_nav_for_symbol() {
+        let (analysis, _) = single_file(
+            r#"
+enum FooInner { }
+fn foo() { enum FooInner { } }
+"#,
+        );
+        let navs = analysis.symbol_search(Query::new("FooInner".to_string())).unwrap();
+        expect![[r#"
+            [
+                NavigationTarget {
+                    file_id: FileId(
+                        1,
+                    ),
+                    full_range: 0..17,
+                    focus_range: Some(
+                        5..13,
+                    ),
+                    name: "FooInner",
+                    kind: ENUM,
+                    container_name: None,
+                    description: Some(
+                        "enum FooInner",
+                    ),
+                    docs: None,
+                },
+                NavigationTarget {
+                    file_id: FileId(
+                        1,
+                    ),
+                    full_range: 29..46,
+                    focus_range: Some(
+                        34..42,
+                    ),
+                    name: "FooInner",
+                    kind: ENUM,
+                    container_name: Some(
+                        "foo",
+                    ),
+                    description: Some(
+                        "enum FooInner",
+                    ),
+                    docs: None,
+                },
+            ]
+        "#]]
+        .assert_debug_eq(&navs);
+    }
+    #[test]
+    fn test_world_symbols_are_case_sensitive() {
+        let (analysis, _) = single_file(
+            r#"
+fn foo() {}
+struct Foo;
+"#,
+        );
+        let navs = analysis.symbol_search(Query::new("foo".to_string())).unwrap();
+        assert_eq!(navs.len(), 2)
+    }
+}
diff --git a/crates/ra_ide/src/display/short_label.rs b/crates/ra_ide/src/display/short_label.rs
index d37260e96..bddf1bd47 100644
--- a/crates/ra_ide/src/display/short_label.rs
+++ b/crates/ra_ide/src/display/short_label.rs
@@ -1,37 +1,37 @@
 //! FIXME: write short doc here
-use ra_syntax::ast::{self, AstNode, NameOwner, TypeAscriptionOwner, VisibilityOwner};
+use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
 use stdx::format_to;
 pub(crate) trait ShortLabel {
    fn short_label(&self) -> Option<String>;
 }
-impl ShortLabel for ast::FnDef {
+impl ShortLabel for ast::Fn {
    fn short_label(&self) -> Option<String> {
-        Some(crate::display::function_label(self))
+        Some(crate::display::function_declaration(self))
    }
 }
-impl ShortLabel for ast::StructDef {
+impl ShortLabel for ast::Struct {
    fn short_label(&self) -> Option<String> {
        short_label_from_node(self, "struct ")
    }
 }
-impl ShortLabel for ast::UnionDef {
+impl ShortLabel for ast::Union {
    fn short_label(&self) -> Option<String> {
        short_label_from_node(self, "union ")
    }
 }
-impl ShortLabel for ast::EnumDef {
+impl ShortLabel for ast::Enum {
    fn short_label(&self) -> Option<String> {
        short_label_from_node(self, "enum ")
    }
 }
-impl ShortLabel for ast::TraitDef {
+impl ShortLabel for ast::Trait {
    fn short_label(&self) -> Option<String> {
        if self.unsafe_token().is_some() {
            short_label_from_node(self, "unsafe trait ")
@@ -47,43 +47,43 @@ impl ShortLabel for ast::Module {
    }
 }
-impl ShortLabel for ast::TypeAliasDef {
+impl ShortLabel for ast::TypeAlias {
    fn short_label(&self) -> Option<String> {
        short_label_from_node(self, "type ")
    }
 }
-impl ShortLabel for ast::ConstDef {
+impl ShortLabel for ast::Const {
    fn short_label(&self) -> Option<String> {
-        short_label_from_ascribed_node(self, "const ")
+        short_label_from_ty(self, self.ty(), "const ")
    }
 }
-impl ShortLabel for ast::StaticDef {
+impl ShortLabel for ast::Static {
    fn short_label(&self) -> Option<String> {
-        short_label_from_ascribed_node(self, "static ")
+        short_label_from_ty(self, self.ty(), "static ")
    }
 }
-impl ShortLabel for ast::RecordFieldDef {
+impl ShortLabel for ast::RecordField {
    fn short_label(&self) -> Option<String> {
-        short_label_from_ascribed_node(self, "")
+        short_label_from_ty(self, self.ty(), "")
    }
 }
-impl ShortLabel for ast::EnumVariant {
+impl ShortLabel for ast::Variant {
    fn short_label(&self) -> Option<String> {
        Some(self.name()?.text().to_string())
    }
 }
-fn short_label_from_ascribed_node<T>(node: &T, prefix: &str) -> Option<String>
+fn short_label_from_ty<T>(node: &T, ty: Option<ast::TypeRef>, prefix: &str) -> Option<String>
 where
-    T: NameOwner + VisibilityOwner + TypeAscriptionOwner,
+    T: NameOwner + VisibilityOwner,
 {
    let mut buf = short_label_from_node(node, prefix)?;
-    if let Some(type_ref) = node.ascribed_type() {
+    if let Some(type_ref) = ty {
        format_to!(buf, ": {}", type_ref.syntax());
    }
diff --git a/crates/ra_ide/src/display/structure.rs b/crates/ra_ide/src/display/structure.rs
deleted file mode 100644
index aad5a8e4d..000000000
--- a/crates/ra_ide/src/display/structure.rs
+++ /dev/null
@@ -1,438 +0,0 @@
-use ra_syntax::{
-    ast::{self, AttrsOwner, NameOwner, TypeAscriptionOwner, TypeParamsOwner},
-    match_ast, AstNode, SourceFile, SyntaxKind, SyntaxNode, TextRange, WalkEvent,
-};
-#[derive(Debug, Clone)]
-pub struct StructureNode {
-    pub parent: Option<usize>,
-    pub label: String,
-    pub navigation_range: TextRange,
-    pub node_range: TextRange,
-    pub kind: SyntaxKind,
-    pub detail: Option<String>,
-    pub deprecated: bool,
-}
-// Feature: File Structure
-//
-// Provides a tree of the symbols defined in the file. Can be used to
-//
-// * fuzzy search symbol in a file (super useful)
-// * draw breadcrumbs to describe the context around the cursor
-// * draw outline of the file
-//
-// |===
-// | Editor  | Shortcut
-//
-// | VS Code | kbd:[Ctrl+Shift+O]
-// |===
-pub fn file_structure(file: &SourceFile) -> Vec<StructureNode> {
-    let mut res = Vec::new();
-    let mut stack = Vec::new();
-    for event in file.syntax().preorder() {
-        match event {
-            WalkEvent::Enter(node) => {
-                if let Some(mut symbol) = structure_node(&node) {
-                    symbol.parent = stack.last().copied();
-                    stack.push(res.len());
-                    res.push(symbol);
-                }
-            }
-            WalkEvent::Leave(node) => {
-                if structure_node(&node).is_some() {
-                    stack.pop().unwrap();
-                }
-            }
-        }
-    }
-    res
-}
-fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
-    fn decl<N: NameOwner + AttrsOwner>(node: N) -> Option<StructureNode> {
-        decl_with_detail(node, None)
-    }
-    fn decl_with_ascription<N: NameOwner + AttrsOwner + TypeAscriptionOwner>(
-        node: N,
-    ) -> Option<StructureNode> {
-        let ty = node.ascribed_type();
-        decl_with_type_ref(node, ty)
-    }
-    fn decl_with_type_ref<N: NameOwner + AttrsOwner>(
-        node: N,
-        type_ref: Option<ast::TypeRef>,
-    ) -> Option<StructureNode> {
-        let detail = type_ref.map(|type_ref| {
-            let mut detail = String::new();
-            collapse_ws(type_ref.syntax(), &mut detail);
-            detail
-        });
-        decl_with_detail(node, detail)
-    }
-    fn decl_with_detail<N: NameOwner + AttrsOwner>(
-        node: N,
-        detail: Option<String>,
-    ) -> Option<StructureNode> {
-        let name = node.name()?;
-        Some(StructureNode {
-            parent: None,
-            label: name.text().to_string(),
-            navigation_range: name.syntax().text_range(),
-            node_range: node.syntax().text_range(),
-            kind: node.syntax().kind(),
-            detail,
-            deprecated: node.attrs().filter_map(|x| x.simple_name()).any(|x| x == "deprecated"),
-        })
-    }
-    fn collapse_ws(node: &SyntaxNode, output: &mut String) {
-        let mut can_insert_ws = false;
-        node.text().for_each_chunk(|chunk| {
-            for line in chunk.lines() {
-                let line = line.trim();
-                if line.is_empty() {
-                    if can_insert_ws {
-                        output.push(' ');
-                        can_insert_ws = false;
-                    }
-                } else {
-                    output.push_str(line);
-                    can_insert_ws = true;
-                }
-            }
-        })
-    }
-    match_ast! {
-        match node {
-            ast::FnDef(it) => {
-                let mut detail = String::from("fn");
-                if let Some(type_param_list) = it.type_param_list() {
-                    collapse_ws(type_param_list.syntax(), &mut detail);
-                }
-                if let Some(param_list) = it.param_list() {
-                    collapse_ws(param_list.syntax(), &mut detail);
-                }
-                if let Some(ret_type) = it.ret_type() {
-                    detail.push_str(" ");
-                    collapse_ws(ret_type.syntax(), &mut detail);
-                }
-                decl_with_detail(it, Some(detail))
-            },
-            ast::StructDef(it) => decl(it),
-            ast::EnumDef(it) => decl(it),
-            ast::EnumVariant(it) => decl(it),
-            ast::TraitDef(it) => decl(it),
-            ast::Module(it) => decl(it),
-            ast::TypeAliasDef(it) => {
-                let ty = it.type_ref();
-                decl_with_type_ref(it, ty)
-            },
-            ast::RecordFieldDef(it) => decl_with_ascription(it),
-            ast::ConstDef(it) => decl_with_ascription(it),
-            ast::StaticDef(it) => decl_with_ascription(it),
-            ast::ImplDef(it) => {
-                let target_type = it.target_type()?;
-                let target_trait = it.target_trait();
-                let label = match target_trait {
-                    None => format!("impl {}", target_type.syntax().text()),
-                    Some(t) => {
-                        format!("impl {} for {}", t.syntax().text(), target_type.syntax().text(),)
-                    }
-                };
-                let node = StructureNode {
-                    parent: None,
-                    label,
-                    navigation_range: target_type.syntax().text_range(),
-                    node_range: it.syntax().text_range(),
-                    kind: it.syntax().kind(),
-                    detail: None,
-                    deprecated: false,
-                };
-                Some(node)
-            },
-            ast::MacroCall(it) => {
-                match it.path().and_then(|it| it.segment()).and_then(|it| it.name_ref()) {
-                    Some(path_segment) if path_segment.text() == "macro_rules"
-                    => decl(it),
-                    _ => None,
-                }
-            },
-            _ => None,
-        }
-    }
-}
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use insta::assert_debug_snapshot;
-    #[test]
-    fn test_file_structure() {
-        let file = SourceFile::parse(
-            r#"
-struct Foo {
-    x: i32
-}
-mod m {
-    fn bar1() {}
-    fn bar2<T>(t: T) -> T {}
-    fn bar3<A,
-        B>(a: A,
-        b: B) -> Vec<
-        u32
-    > {}
-}
-enum E { X, Y(i32) }
-type T = ();
-static S: i32 = 92;
-const C: i32 = 92;
-impl E {}
-impl fmt::Debug for E {}
-macro_rules! mc {
-    () => {}
-}
-#[macro_export]
-macro_rules! mcexp {
-    () => {}
-}
-/// Doc comment
-macro_rules! mcexp {
-    () => {}
-}
-#[deprecated]
-fn obsolete() {}
-#[deprecated(note = "for awhile")]
-fn very_obsolete() {}
-"#,
-        )
-        .ok()
-        .unwrap();
-        let structure = file_structure(&file);
-        assert_debug_snapshot!(structure,
-        @r###"
-        [
-            StructureNode {
-                parent: None,
-                label: "Foo",
-                navigation_range: 8..11,
-                node_range: 1..26,
-                kind: STRUCT_DEF,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: Some(
-                    0,
-                ),
-                label: "x",
-                navigation_range: 18..19,
-                node_range: 18..24,
-                kind: RECORD_FIELD_DEF,
-                detail: Some(
-                    "i32",
-                ),
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "m",
-                navigation_range: 32..33,
-                node_range: 28..158,
-                kind: MODULE,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: Some(
-                    2,
-                ),
-                label: "bar1",
-                navigation_range: 43..47,
-                node_range: 40..52,
-                kind: FN_DEF,
-                detail: Some(
-                    "fn()",
-                ),
-                deprecated: false,
-            },
-            StructureNode {
-                parent: Some(
-                    2,
-                ),
-                label: "bar2",
-                navigation_range: 60..64,
-                node_range: 57..81,
-                kind: FN_DEF,
-                detail: Some(
-                    "fn<T>(t: T) -> T",
-                ),
-                deprecated: false,
-            },
-            StructureNode {
-                parent: Some(
-                    2,
-                ),
-                label: "bar3",
-                navigation_range: 89..93,
-                node_range: 86..156,
-                kind: FN_DEF,
-                detail: Some(
-                    "fn<A, B>(a: A, b: B) -> Vec< u32 >",
-                ),
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "E",
-                navigation_range: 165..166,
-                node_range: 160..180,
-                kind: ENUM_DEF,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: Some(
-                    6,
-                ),
-                label: "X",
-                navigation_range: 169..170,
-                node_range: 169..170,
-                kind: ENUM_VARIANT,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: Some(
-                    6,
-                ),
-                label: "Y",
-                navigation_range: 172..173,
-                node_range: 172..178,
-                kind: ENUM_VARIANT,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "T",
-                navigation_range: 186..187,
-                node_range: 181..193,
-                kind: TYPE_ALIAS_DEF,
-                detail: Some(
-                    "()",
-                ),
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "S",
-                navigation_range: 201..202,
-                node_range: 194..213,
-                kind: STATIC_DEF,
-                detail: Some(
-                    "i32",
-                ),
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "C",
-                navigation_range: 220..221,
-                node_range: 214..232,
-                kind: CONST_DEF,
-                detail: Some(
-                    "i32",
-                ),
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "impl E",
-                navigation_range: 239..240,
-                node_range: 234..243,
-                kind: IMPL_DEF,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "impl fmt::Debug for E",
-                navigation_range: 265..266,
-                node_range: 245..269,
-                kind: IMPL_DEF,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "mc",
-                navigation_range: 284..286,
-                node_range: 271..303,
-                kind: MACRO_CALL,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "mcexp",
-                navigation_range: 334..339,
-                node_range: 305..356,
-                kind: MACRO_CALL,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "mcexp",
-                navigation_range: 387..392,
-                node_range: 358..409,
-                kind: MACRO_CALL,
-                detail: None,
-                deprecated: false,
-            },
-            StructureNode {
-                parent: None,
-                label: "obsolete",
-                navigation_range: 428..436,
-                node_range: 411..441,
-                kind: FN_DEF,
-                detail: Some(
-                    "fn()",
-                ),
-                deprecated: true,
-            },
-            StructureNode {
-                parent: None,
-                label: "very_obsolete",
-                navigation_range: 481..494,
-                node_range: 443..499,
-                kind: FN_DEF,
-                detail: Some(
-                    "fn()",
-                ),
-                deprecated: true,
-            },
-        ]
-        "###
-                );
-    }
-}
diff --git a/crates/ra_ide/src/expand_macro.rs b/crates/ra_ide/src/expand_macro.rs
index 54a47aac0..043515f54 100644
--- a/crates/ra_ide/src/expand_macro.rs
+++ b/crates/ra_ide/src/expand_macro.rs
@@ -2,7 +2,9 @@ use hir::Semantics;
 use ra_ide_db::RootDatabase;
 use ra_syntax::{
    algo::{find_node_at_offset, SyntaxRewriter},
-    ast, AstNode, NodeOrToken, SyntaxKind, SyntaxNode, WalkEvent, T,
+    ast, AstNode, NodeOrToken, SyntaxKind,
+    SyntaxKind::*,
+    SyntaxNode, WalkEvent, T,
 };
 use crate::FilePosition;
@@ -65,8 +67,6 @@ fn expand_macro_recur(
 // FIXME: It would also be cool to share logic here and in the mbe tests,
 // which are pretty unreadable at the moment.
 fn insert_whitespaces(syn: SyntaxNode) -> String {
-    use SyntaxKind::*;
    let mut res = String::new();
    let mut token_iter = syn
        .preorder_with_tokens()
@@ -120,175 +120,164 @@ fn insert_whitespaces(syn: SyntaxNode) -> String {
 #[cfg(test)]
 mod tests {
-    use insta::assert_snapshot;
+    use expect::{expect, Expect};
    use crate::mock_analysis::analysis_and_position;
-    use super::*;
+    fn check(ra_fixture: &str, expect: Expect) {
+        let (analysis, pos) = analysis_and_position(ra_fixture);
-    fn check_expand_macro(fixture: &str) -> ExpandedMacro {
+        let expansion = analysis.expand_macro(pos).unwrap().unwrap();
-        let (analysis, pos) = analysis_and_position(fixture);
+        let actual = format!("{}\n{}", expansion.name, expansion.expansion);
-        analysis.expand_macro(pos).unwrap().unwrap()
+        expect.assert_eq(&actual);
    }
    #[test]
    fn macro_expand_recursive_expansion() {
-        let res = check_expand_macro(
+        check(
            r#"
-        //- /lib.rs
+macro_rules! bar {
-        macro_rules! bar {
+    () => { fn  b() {} }
-            () => { fn  b() {} }
+}
-        }
+macro_rules! foo {
-        macro_rules! foo {
+    () => { bar!(); }
-            () => { bar!(); }
+}
-        }
+macro_rules! baz {
-        macro_rules! baz {
+    () => { foo!(); }
-            () => { foo!(); }
+}
-        }
+f<|>oo!();
-        f<|>oo!();
+"#,
-        "#,
+            expect![[r#"
+                foo
+                fn b(){}
+            "#]],
        );
-        assert_eq!(res.name, "foo");
-        assert_snapshot!(res.expansion, @r###"
-fn b(){}
-"###);
    }
    #[test]
    fn macro_expand_multiple_lines() {
-        let res = check_expand_macro(
+        check(
            r#"
-        //- /lib.rs
+macro_rules! foo {
-        macro_rules! foo {
+    () => {
-            () => {
+        fn some_thing() -> u32 {
-                fn some_thing() -> u32 {
+            let a = 0;
-                    let a = 0;
+            a + 10
-                    a + 10
-                }
-            }
        }
-        f<|>oo!();
+    }
+}
+f<|>oo!();
        "#,
+            expect![[r#"
+            foo
+            fn some_thing() -> u32 {
+              let a = 0;
+              a+10
+            }"#]],
        );
-        assert_eq!(res.name, "foo");
-        assert_snapshot!(res.expansion, @r###"
-fn some_thing() -> u32 {
-  let a = 0;
-  a+10
-}
-"###);
    }
    #[test]
    fn macro_expand_match_ast() {
-        let res = check_expand_macro(
+        check(
            r#"
-        //- /lib.rs
+macro_rules! match_ast {
-        macro_rules! match_ast {
+    (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };
-            (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };
+    (match ($node:expr) {
+        $( ast::$ast:ident($it:ident) => $res:block, )*
+        _ => $catch_all:expr $(,)?
+    }) => {{
+        $( if let Some($it) = ast::$ast::cast($node.clone()) $res else )*
+        { $catch_all }
+    }};
+}
-            (match ($node:expr) {
+fn main() {
-                $( ast::$ast:ident($it:ident) => $res:block, )*
+    mat<|>ch_ast! {
-                _ => $catch_all:expr $(,)?
+        match container {
-            }) => {{
+            ast::TraitDef(it) => {},
-                $( if let Some($it) = ast::$ast::cast($node.clone()) $res else )*
+            ast::ImplDef(it) => {},
-                { $catch_all }
+            _ => { continue },
-            }};
        }
-        fn main() {
-            mat<|>ch_ast! {
-                match container {
-                    ast::TraitDef(it) => {},
-                    ast::ImplDef(it) => {},
-                    _ => { continue },
-                }
-            }
-        }
-        "#,
-        );
-        assert_eq!(res.name, "match_ast");
-        assert_snapshot!(res.expansion, @r###"
-{
-  if let Some(it) = ast::TraitDef::cast(container.clone()){}
-  else if let Some(it) = ast::ImplDef::cast(container.clone()){}
-  else {
-    {
-      continue
    }
-  }
 }
-"###);
+"#,
+            expect![[r#"
+       match_ast
+       {
+         if let Some(it) = ast::TraitDef::cast(container.clone()){}
+         else if let Some(it) = ast::ImplDef::cast(container.clone()){}
+         else {
+           {
+             continue
+           }
+         }
+       }"#]],
+        );
    }
    #[test]
    fn macro_expand_match_ast_inside_let_statement() {
-        let res = check_expand_macro(
+        check(
            r#"
-        //- /lib.rs
+macro_rules! match_ast {
-        macro_rules! match_ast {
+    (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };
-            (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };
+    (match ($node:expr) {}) => {{}};
-            (match ($node:expr) {}) => {{}};
+}
-        }
-        fn main() {
+fn main() {
-            let p = f(|it| {
+    let p = f(|it| {
-                let res = mat<|>ch_ast! { match c {}};
+        let res = mat<|>ch_ast! { match c {}};
-                Some(res)
+        Some(res)
-            })?;
+    })?;
-        }
+}
-        "#,
+"#,
+            expect![[r#"
+                match_ast
+                {}
+            "#]],
        );
-        assert_eq!(res.name, "match_ast");
-        assert_snapshot!(res.expansion, @r###"{}"###);
    }
    #[test]
    fn macro_expand_inner_macro_fail_to_expand() {
-        let res = check_expand_macro(
+        check(
            r#"
-        //- /lib.rs
+macro_rules! bar {
-        macro_rules! bar {
+    (BAD) => {};
-            (BAD) => {};
+}
-        }
+macro_rules! foo {
-        macro_rules! foo {
+    () => {bar!()};
-            () => {bar!()};
+}
-        }
-        fn main() {
+fn main() {
-            let res = fo<|>o!();
+    let res = fo<|>o!();
-        }
+}
-        "#,
+"#,
+            expect![[r#"
+                foo
+            "#]],
        );
-        assert_eq!(res.name, "foo");
-        assert_snapshot!(res.expansion, @r###""###);
    }
    #[test]
    fn macro_expand_with_dollar_crate() {
-        let res = check_expand_macro(
+        check(
            r#"
-        //- /lib.rs
+#[macro_export]
-        #[macro_export]
+macro_rules! bar {
-        macro_rules! bar {
+    () => {0};
-            () => {0};
+}
-        }
+macro_rules! foo {
-        macro_rules! foo {
+    () => {$crate::bar!()};
-            () => {$crate::bar!()};
+}
-        }
-        fn main() {
+fn main() {
-            let res = fo<|>o!();
+    let res = fo<|>o!();
-        }
+}
-        "#,
+"#,
+            expect![[r#"
+                foo
+                0 "#]],
        );
-        assert_eq!(res.name, "foo");
-        assert_snapshot!(res.expansion, @r###"0"###);
    }
 }
diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs
index 8a6b3ea99..fc81b48cc 100644
--- a/crates/ra_ide/src/extend_selection.rs
+++ b/crates/ra_ide/src/extend_selection.rs
@@ -39,12 +39,12 @@ fn try_extend_selection(
    let list_kinds = [
        RECORD_FIELD_PAT_LIST,
        MATCH_ARM_LIST,
-        RECORD_FIELD_DEF_LIST,
-        TUPLE_FIELD_DEF_LIST,
        RECORD_FIELD_LIST,
-        ENUM_VARIANT_LIST,
+        TUPLE_FIELD_LIST,
+        RECORD_EXPR_FIELD_LIST,
+        VARIANT_LIST,
        USE_TREE_LIST,
-        TYPE_PARAM_LIST,
+        GENERIC_PARAM_LIST,
        TYPE_ARG_LIST,
        TYPE_BOUND_LIST,
        PARAM_LIST,
diff --git a/crates/ra_ide/src/file_structure.rs b/crates/ra_ide/src/file_structure.rs
new file mode 100644
index 000000000..91765140a
--- /dev/null
+++ b/crates/ra_ide/src/file_structure.rs
@@ -0,0 +1,431 @@
+use ra_syntax::{
+    ast::{self, AttrsOwner, GenericParamsOwner, NameOwner},
+    match_ast, AstNode, SourceFile, SyntaxKind, SyntaxNode, TextRange, WalkEvent,
+};
+#[derive(Debug, Clone)]
+pub struct StructureNode {
+    pub parent: Option<usize>,
+    pub label: String,
+    pub navigation_range: TextRange,
+    pub node_range: TextRange,
+    pub kind: SyntaxKind,
+    pub detail: Option<String>,
+    pub deprecated: bool,
+}
+// Feature: File Structure
+//
+// Provides a tree of the symbols defined in the file. Can be used to
+//
+// * fuzzy search symbol in a file (super useful)
+// * draw breadcrumbs to describe the context around the cursor
+// * draw outline of the file
+//
+// |===
+// | Editor  | Shortcut
+//
+// | VS Code | kbd:[Ctrl+Shift+O]
+// |===
+pub fn file_structure(file: &SourceFile) -> Vec<StructureNode> {
+    let mut res = Vec::new();
+    let mut stack = Vec::new();
+    for event in file.syntax().preorder() {
+        match event {
+            WalkEvent::Enter(node) => {
+                if let Some(mut symbol) = structure_node(&node) {
+                    symbol.parent = stack.last().copied();
+                    stack.push(res.len());
+                    res.push(symbol);
+                }
+            }
+            WalkEvent::Leave(node) => {
+                if structure_node(&node).is_some() {
+                    stack.pop().unwrap();
+                }
+            }
+        }
+    }
+    res
+}
+fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
+    fn decl<N: NameOwner + AttrsOwner>(node: N) -> Option<StructureNode> {
+        decl_with_detail(&node, None)
+    }
+    fn decl_with_type_ref<N: NameOwner + AttrsOwner>(
+        node: &N,
+        type_ref: Option<ast::TypeRef>,
+    ) -> Option<StructureNode> {
+        let detail = type_ref.map(|type_ref| {
+            let mut detail = String::new();
+            collapse_ws(type_ref.syntax(), &mut detail);
+            detail
+        });
+        decl_with_detail(node, detail)
+    }
+    fn decl_with_detail<N: NameOwner + AttrsOwner>(
+        node: &N,
+        detail: Option<String>,
+    ) -> Option<StructureNode> {
+        let name = node.name()?;
+        Some(StructureNode {
+            parent: None,
+            label: name.text().to_string(),
+            navigation_range: name.syntax().text_range(),
+            node_range: node.syntax().text_range(),
+            kind: node.syntax().kind(),
+            detail,
+            deprecated: node.attrs().filter_map(|x| x.simple_name()).any(|x| x == "deprecated"),
+        })
+    }
+    fn collapse_ws(node: &SyntaxNode, output: &mut String) {
+        let mut can_insert_ws = false;
+        node.text().for_each_chunk(|chunk| {
+            for line in chunk.lines() {
+                let line = line.trim();
+                if line.is_empty() {
+                    if can_insert_ws {
+                        output.push(' ');
+                        can_insert_ws = false;
+                    }
+                } else {
+                    output.push_str(line);
+                    can_insert_ws = true;
+                }
+            }
+        })
+    }
+    match_ast! {
+        match node {
+            ast::Fn(it) => {
+                let mut detail = String::from("fn");
+                if let Some(type_param_list) = it.generic_param_list() {
+                    collapse_ws(type_param_list.syntax(), &mut detail);
+                }
+                if let Some(param_list) = it.param_list() {
+                    collapse_ws(param_list.syntax(), &mut detail);
+                }
+                if let Some(ret_type) = it.ret_type() {
+                    detail.push_str(" ");
+                    collapse_ws(ret_type.syntax(), &mut detail);
+                }
+                decl_with_detail(&it, Some(detail))
+            },
+            ast::Struct(it) => decl(it),
+            ast::Union(it) => decl(it),
+            ast::Enum(it) => decl(it),
+            ast::Variant(it) => decl(it),
+            ast::Trait(it) => decl(it),
+            ast::Module(it) => decl(it),
+            ast::TypeAlias(it) => decl_with_type_ref(&it, it.ty()),
+            ast::RecordField(it) => decl_with_type_ref(&it, it.ty()),
+            ast::Const(it) => decl_with_type_ref(&it, it.ty()),
+            ast::Static(it) => decl_with_type_ref(&it, it.ty()),
+            ast::Impl(it) => {
+                let target_type = it.target_type()?;
+                let target_trait = it.target_trait();
+                let label = match target_trait {
+                    None => format!("impl {}", target_type.syntax().text()),
+                    Some(t) => {
+                        format!("impl {} for {}", t.syntax().text(), target_type.syntax().text(),)
+                    }
+                };
+                let node = StructureNode {
+                    parent: None,
+                    label,
+                    navigation_range: target_type.syntax().text_range(),
+                    node_range: it.syntax().text_range(),
+                    kind: it.syntax().kind(),
+                    detail: None,
+                    deprecated: false,
+                };
+                Some(node)
+            },
+            ast::MacroCall(it) => {
+                match it.path().and_then(|it| it.segment()).and_then(|it| it.name_ref()) {
+                    Some(path_segment) if path_segment.text() == "macro_rules"
+                    => decl(it),
+                    _ => None,
+                }
+            },
+            _ => None,
+        }
+    }
+}
+#[cfg(test)]
+mod tests {
+    use expect::{expect, Expect};
+    use super::*;
+    fn check(ra_fixture: &str, expect: Expect) {
+        let file = SourceFile::parse(ra_fixture).ok().unwrap();
+        let structure = file_structure(&file);
+        expect.assert_debug_eq(&structure)
+    }
+    #[test]
+    fn test_file_structure() {
+        check(
+            r#"
+struct Foo {
+    x: i32
+}
+mod m {
+    fn bar1() {}
+    fn bar2<T>(t: T) -> T {}
+    fn bar3<A,
+        B>(a: A,
+        b: B) -> Vec<
+        u32
+    > {}
+}
+enum E { X, Y(i32) }
+type T = ();
+static S: i32 = 92;
+const C: i32 = 92;
+impl E {}
+impl fmt::Debug for E {}
+macro_rules! mc {
+    () => {}
+}
+#[macro_export]
+macro_rules! mcexp {
+    () => {}
+}
+/// Doc comment
+macro_rules! mcexp {
+    () => {}
+}
+#[deprecated]
+fn obsolete() {}
+#[deprecated(note = "for awhile")]
+fn very_obsolete() {}
+"#,
+            expect![[r#"
+                [
+                    StructureNode {
+                        parent: None,
+                        label: "Foo",
+                        navigation_range: 8..11,
+                        node_range: 1..26,
+                        kind: STRUCT,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: Some(
+                            0,
+                        ),
+                        label: "x",
+                        navigation_range: 18..19,
+                        node_range: 18..24,
+                        kind: RECORD_FIELD,
+                        detail: Some(
+                            "i32",
+                        ),
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "m",
+                        navigation_range: 32..33,
+                        node_range: 28..158,
+                        kind: MODULE,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: Some(
+                            2,
+                        ),
+                        label: "bar1",
+                        navigation_range: 43..47,
+                        node_range: 40..52,
+                        kind: FN,
+                        detail: Some(
+                            "fn()",
+                        ),
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: Some(
+                            2,
+                        ),
+                        label: "bar2",
+                        navigation_range: 60..64,
+                        node_range: 57..81,
+                        kind: FN,
+                        detail: Some(
+                            "fn<T>(t: T) -> T",
+                        ),
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: Some(
+                            2,
+                        ),
+                        label: "bar3",
+                        navigation_range: 89..93,
+                        node_range: 86..156,
+                        kind: FN,
+                        detail: Some(
+                            "fn<A, B>(a: A, b: B) -> Vec< u32 >",
+                        ),
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "E",
+                        navigation_range: 165..166,
+                        node_range: 160..180,
+                        kind: ENUM,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: Some(
+                            6,
+                        ),
+                        label: "X",
+                        navigation_range: 169..170,
+                        node_range: 169..170,
+                        kind: VARIANT,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: Some(
+                            6,
+                        ),
+                        label: "Y",
+                        navigation_range: 172..173,
+                        node_range: 172..178,
+                        kind: VARIANT,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "T",
+                        navigation_range: 186..187,
+                        node_range: 181..193,
+                        kind: TYPE_ALIAS,
+                        detail: Some(
+                            "()",
+                        ),
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "S",
+                        navigation_range: 201..202,
+                        node_range: 194..213,
+                        kind: STATIC,
+                        detail: Some(
+                            "i32",
+                        ),
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "C",
+                        navigation_range: 220..221,
+                        node_range: 214..232,
+                        kind: CONST,
+                        detail: Some(
+                            "i32",
+                        ),
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "impl E",
+                        navigation_range: 239..240,
+                        node_range: 234..243,
+                        kind: IMPL,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "impl fmt::Debug for E",
+                        navigation_range: 265..266,
+                        node_range: 245..269,
+                        kind: IMPL,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "mc",
+                        navigation_range: 284..286,
+                        node_range: 271..303,
+                        kind: MACRO_CALL,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "mcexp",
+                        navigation_range: 334..339,
+                        node_range: 305..356,
+                        kind: MACRO_CALL,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "mcexp",
+                        navigation_range: 387..392,
+                        node_range: 358..409,
+                        kind: MACRO_CALL,
+                        detail: None,
+                        deprecated: false,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "obsolete",
+                        navigation_range: 428..436,
+                        node_range: 411..441,
+                        kind: FN,
+                        detail: Some(
+                            "fn()",
+                        ),
+                        deprecated: true,
+                    },
+                    StructureNode {
+                        parent: None,
+                        label: "very_obsolete",
+                        navigation_range: 481..494,
+                        node_range: 443..499,
+                        kind: FN,
+                        detail: Some(
+                            "fn()",
+                        ),
+                        deprecated: true,
+                    },
+                ]
+            "#]],
+        );
+    }
+}
diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index 8657377de..5a6e17936 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/crates/ra_ide/src/folding_ranges.rs
@@ -15,6 +15,7 @@ pub enum FoldKind {
    Imports,
    Mods,
    Block,
+    ArgList,
 }
 #[derive(Debug)]
@@ -57,7 +58,7 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
            }
            NodeOrToken::Node(node) => {
                // Fold groups of imports
-                if node.kind() == USE_ITEM && !visited_imports.contains(&node) {
+                if node.kind() == USE && !visited_imports.contains(&node) {
                    if let Some(range) = contiguous_range_for_group(&node, &mut visited_imports) {
                        res.push(Fold { range, kind: FoldKind::Imports })
                    }
@@ -82,15 +83,17 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
 fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
    match kind {
        COMMENT => Some(FoldKind::Comment),
-        USE_ITEM => Some(FoldKind::Imports),
+        USE => Some(FoldKind::Imports),
-        RECORD_FIELD_DEF_LIST
+        ARG_LIST | PARAM_LIST => Some(FoldKind::ArgList),
+        RECORD_FIELD_LIST
        | RECORD_FIELD_PAT_LIST
+        | RECORD_EXPR_FIELD_LIST
        | ITEM_LIST
        | EXTERN_ITEM_LIST
        | USE_TREE_LIST
        | BLOCK_EXPR
        | MATCH_ARM_LIST
-        | ENUM_VARIANT_LIST
+        | VARIANT_LIST
        | TOKEN_TREE => Some(FoldKind::Block),
        _ => None,
    }
@@ -196,89 +199,85 @@ fn contiguous_range_for_comment(
 #[cfg(test)]
 mod tests {
+    use test_utils::extract_tags;
    use super::*;
-    use test_utils::extract_ranges;
-    fn do_check(text: &str, fold_kinds: &[FoldKind]) {
+    fn check(ra_fixture: &str) {
-        let (ranges, text) = extract_ranges(text, "fold");
+        let (ranges, text) = extract_tags(ra_fixture, "fold");
        let parse = SourceFile::parse(&text);
        let folds = folding_ranges(&parse.tree());
        assert_eq!(
            folds.len(),
            ranges.len(),
            "The amount of folds is different than the expected amount"
        );
-        assert_eq!(
-            folds.len(),
+        for (fold, (range, attr)) in folds.iter().zip(ranges.into_iter()) {
-            fold_kinds.len(),
-            "The amount of fold kinds is different than the expected amount"
-        );
-        for ((fold, range), fold_kind) in
-            folds.iter().zip(ranges.into_iter()).zip(fold_kinds.iter())
-        {
            assert_eq!(fold.range.start(), range.start());
            assert_eq!(fold.range.end(), range.end());
-            assert_eq!(&fold.kind, fold_kind);
+            let kind = match fold.kind {
+                FoldKind::Comment => "comment",
+                FoldKind::Imports => "imports",
+                FoldKind::Mods => "mods",
+                FoldKind::Block => "block",
+                FoldKind::ArgList => "arglist",
+            };
+            assert_eq!(kind, &attr.unwrap());
        }
    }
    #[test]
    fn test_fold_comments() {
-        let text = r#"
+        check(
-<fold>// Hello
+            r#"
+<fold comment>// Hello
 // this is a multiline
 // comment
 //</fold>
 // But this is not
-fn main() <fold>{
+fn main() <fold block>{
-    <fold>// We should
+    <fold comment>// We should
    // also
    // fold
    // this one.</fold>
-    <fold>//! But this one is different
+    <fold comment>//! But this one is different
    //! because it has another flavor</fold>
-    <fold>/* As does this
+    <fold comment>/* As does this
    multiline comment */</fold>
-}</fold>"#;
+}</fold>"#,
+        );
-        let fold_kinds = &[
-            FoldKind::Comment,
-            FoldKind::Block,
-            FoldKind::Comment,
-            FoldKind::Comment,
-            FoldKind::Comment,
-        ];
-        do_check(text, fold_kinds);
    }
    #[test]
    fn test_fold_imports() {
-        let text = r#"
+        check(
-<fold>use std::<fold>{
+            r#"
+<fold imports>use std::<fold block>{
    str,
    vec,
    io as iop
 }</fold>;</fold>
-fn main() <fold>{
+fn main() <fold block>{
-}</fold>"#;
+}</fold>"#,
+        );
-        let folds = &[FoldKind::Imports, FoldKind::Block, FoldKind::Block];
-        do_check(text, folds);
    }
    #[test]
    fn test_fold_mods() {
-        let text = r#"
+        check(
+            r#"
 pub mod foo;
-<fold>mod after_pub;
+<fold mods>mod after_pub;
 mod after_pub_next;</fold>
-<fold>mod before_pub;
+<fold mods>mod before_pub;
 mod before_pub_next;</fold>
 pub mod bar;
@@ -286,90 +285,117 @@ mod not_folding_single;
 pub mod foobar;
 pub not_folding_single_next;
-<fold>#[cfg(test)]
+<fold mods>#[cfg(test)]
 mod with_attribute;
 mod with_attribute_next;</fold>
-fn main() <fold>{
+fn main() <fold block>{
-}</fold>"#;
+}</fold>"#,
+        );
-        let folds = &[FoldKind::Mods, FoldKind::Mods, FoldKind::Mods, FoldKind::Block];
-        do_check(text, folds);
    }
    #[test]
    fn test_fold_import_groups() {
-        let text = r#"
+        check(
-<fold>use std::str;
+            r#"
+<fold imports>use std::str;
 use std::vec;
 use std::io as iop;</fold>
-<fold>use std::mem;
+<fold imports>use std::mem;
 use std::f64;</fold>
 use std::collections::HashMap;
 // Some random comment
 use std::collections::VecDeque;
-fn main() <fold>{
+fn main() <fold block>{
-}</fold>"#;
+}</fold>"#,
+        );
-        let folds = &[FoldKind::Imports, FoldKind::Imports, FoldKind::Block];
-        do_check(text, folds);
    }
    #[test]
    fn test_fold_import_and_groups() {
-        let text = r#"
+        check(
-<fold>use std::str;
+            r#"
+<fold imports>use std::str;
 use std::vec;
 use std::io as iop;</fold>
-<fold>use std::mem;
+<fold imports>use std::mem;
 use std::f64;</fold>
-<fold>use std::collections::<fold>{
+<fold imports>use std::collections::<fold block>{
    HashMap,
    VecDeque,
 }</fold>;</fold>
 // Some random comment
-fn main() <fold>{
+fn main() <fold block>{
-}</fold>"#;
+}</fold>"#,
+        );
-        let folds = &[
-            FoldKind::Imports,
-            FoldKind::Imports,
-            FoldKind::Imports,
-            FoldKind::Block,
-            FoldKind::Block,
-        ];
-        do_check(text, folds);
    }
    #[test]
    fn test_folds_macros() {
-        let text = r#"
+        check(
-macro_rules! foo <fold>{
+            r#"
+macro_rules! foo <fold block>{
    ($($tt:tt)*) => { $($tt)* }
 }</fold>
-"#;
+"#,
+        );
-        let folds = &[FoldKind::Block];
-        do_check(text, folds);
    }
    #[test]
    fn test_fold_match_arms() {
-        let text = r#"
+        check(
-fn main() <fold>{
+            r#"
-    match 0 <fold>{
+fn main() <fold block>{
+    match 0 <fold block>{
        0 => 0,
        _ => 1,
    }</fold>
-}</fold>"#;
+}</fold>
+"#,
+        );
+    }
-        let folds = &[FoldKind::Block, FoldKind::Block];
+    #[test]
-        do_check(text, folds);
+    fn fold_big_calls() {
+        check(
+            r#"
+fn main() <fold block>{
+    frobnicate<fold arglist>(
+        1,
+        2,
+        3,
+    )</fold>
+}</fold>
+"#,
+        )
+    }
+    #[test]
+    fn fold_record_literals() {
+        check(
+            r#"
+const _: S = S <fold block>{
+}</fold>;
+"#,
+        )
+    }
+    #[test]
+    fn fold_multiline_params() {
+        check(
+            r#"
+fn foo<fold arglist>(
+    x: i32,
+    y: String,
+)</fold> {}
+"#,
+        )
    }
 }
diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs
index bea7fbfa7..4e3f428fa 100644
--- a/crates/ra_ide/src/goto_definition.rs
+++ b/crates/ra_ide/src/goto_definition.rs
@@ -7,7 +7,7 @@ use ra_syntax::{
    ast::{self},
    match_ast, AstNode,
    SyntaxKind::*,
-    SyntaxToken, TokenAtOffset,
+    SyntaxToken, TokenAtOffset, T,
 };
 use crate::{
@@ -32,9 +32,10 @@ pub(crate) fn goto_definition(
    let file = sema.parse(position.file_id).syntax().clone();
    let original_token = pick_best(file.token_at_offset(position.offset))?;
    let token = sema.descend_into_macros(original_token.clone());
+    let parent = token.parent();
    let nav_targets = match_ast! {
-        match (token.parent()) {
+        match parent {
            ast::NameRef(name_ref) => {
                reference_definition(&sema, &name_ref).to_vec()
            },
@@ -57,7 +58,7 @@ fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
    return tokens.max_by_key(priority);
    fn priority(n: &SyntaxToken) -> usize {
        match n.kind() {
-            IDENT | INT_NUMBER => 2,
+            IDENT | INT_NUMBER | T![self] => 2,
            kind if kind.is_trivia() => 0,
            _ => 1,
        }
@@ -103,205 +104,150 @@ pub(crate) fn reference_definition(
 #[cfg(test)]
 mod tests {
-    use test_utils::assert_eq_text;
+    use ra_db::FileRange;
+    use ra_syntax::{TextRange, TextSize};
-    use crate::mock_analysis::analysis_and_position;
+    use crate::mock_analysis::MockAnalysis;
-    fn check_goto(ra_fixture: &str, expected: &str, expected_range: &str) {
-        let (analysis, pos) = analysis_and_position(ra_fixture);
+    fn check(ra_fixture: &str) {
+        let (mock, position) = MockAnalysis::with_files_and_position(ra_fixture);
+        let (mut expected, data) = mock.annotation();
+        let analysis = mock.analysis();
+        match data.as_str() {
+            "" => (),
+            "file" => {
+                expected.range =
+                    TextRange::up_to(TextSize::of(&*analysis.file_text(expected.file_id).unwrap()))
+            }
+            data => panic!("bad data: {}", data),
+        }
-        let mut navs = analysis.goto_definition(pos).unwrap().unwrap().info;
+        let mut navs =
+            analysis.goto_definition(position).unwrap().expect("no definition found").info;
        if navs.len() == 0 {
            panic!("unresolved reference")
        }
        assert_eq!(navs.len(), 1);
        let nav = navs.pop().unwrap();
-        let file_text = analysis.file_text(nav.file_id()).unwrap();
+        assert_eq!(expected, FileRange { file_id: nav.file_id, range: nav.focus_or_full_range() });
-        let mut actual = file_text[nav.full_range()].to_string();
-        if let Some(focus) = nav.focus_range() {
-            actual += "|";
-            actual += &file_text[focus];
-        }
-        if !expected_range.contains("...") {
-            test_utils::assert_eq_text!(&actual, expected_range);
-        } else {
-            let mut parts = expected_range.split("...");
-            let prefix = parts.next().unwrap();
-            let suffix = parts.next().unwrap();
-            assert!(
-                actual.starts_with(prefix) && actual.ends_with(suffix),
-                "\nExpected: {}\n Actual: {}\n",
-                expected_range,
-                actual
-            );
-        }
-        nav.assert_match(expected);
    }
    #[test]
    fn goto_def_in_items() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+     //^^^
-            enum E { X(Foo<|>) }
+enum E { X(Foo<|>) }
-            ",
+"#,
-            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
-            "struct Foo;|Foo",
        );
    }
    #[test]
    fn goto_def_at_start_of_item() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+     //^^^
-            enum E { X(<|>Foo) }
+enum E { X(<|>Foo) }
-            ",
+"#,
-            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
-            "struct Foo;|Foo",
        );
    }
    #[test]
    fn goto_definition_resolves_correct_name() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            use a::Foo;
+use a::Foo;
-            mod a;
+mod a;
-            mod b;
+mod b;
-            enum E { X(Foo<|>) }
+enum E { X(Foo<|>) }
-            //- /a.rs
+//- /a.rs
-            struct Foo;
+struct Foo;
+     //^^^
-            //- /b.rs
+//- /b.rs
-            struct Foo;
+struct Foo;
-            ",
+"#,
-            "Foo STRUCT_DEF FileId(2) 0..11 7..10",
-            "struct Foo;|Foo",
        );
    }
    #[test]
    fn goto_def_for_module_declaration() {
-        check_goto(
+        check(
            r#"
 //- /lib.rs
 mod <|>foo;
 //- /foo.rs
 // empty
+//^ file
 "#,
-            "foo SOURCE_FILE FileId(2) 0..9",
-            "// empty\n",
        );
-        check_goto(
+        check(
            r#"
 //- /lib.rs
 mod <|>foo;
 //- /foo/mod.rs
 // empty
+//^ file
 "#,
-            "foo SOURCE_FILE FileId(2) 0..9",
-            "// empty\n",
        );
    }
    #[test]
    fn goto_def_for_macros() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+macro_rules! foo { () => { () } }
-            macro_rules! foo { () => { () } }
+           //^^^
+fn bar() {
-            fn bar() {
+    <|>foo!();
-                <|>foo!();
+}
-            }
+"#,
-            ",
-            "foo MACRO_CALL FileId(1) 0..33 13..16",
-            "macro_rules! foo { () => { () } }|foo",
        );
    }
    #[test]
    fn goto_def_for_macros_from_other_crates() {
-        check_goto(
+        check(
-            "
-            //- /lib.rs
-            use foo::foo;
-            fn bar() {
-                <|>foo!();
-            }
-            //- /foo/lib.rs
-            #[macro_export]
-            macro_rules! foo { () => { () } }
-            ",
-            "foo MACRO_CALL FileId(2) 0..49 29..32",
-            "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
-        );
-    }
-    #[test]
-    fn goto_def_for_use_alias() {
-        check_goto(
            r#"
 //- /lib.rs
-use foo as bar<|>;
+use foo::foo;
+fn bar() {
+    <|>foo!();
+}
 //- /foo/lib.rs
 #[macro_export]
 macro_rules! foo { () => { () } }
+           //^^^
 "#,
-            "SOURCE_FILE FileId(2) 0..50",
-            "#[macro_export]\nmacro_rules! foo { () => { () } }\n",
-        );
-    }
-    #[test]
-    fn goto_def_for_use_alias_foo_macro() {
-        check_goto(
-            "
-            //- /lib.rs
-            use foo::foo as bar<|>;
-            //- /foo/lib.rs
-            #[macro_export]
-            macro_rules! foo { () => { () } }
-            ",
-            "foo MACRO_CALL FileId(2) 0..49 29..32",
-            "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
        );
    }
    #[test]
    fn goto_def_for_macros_in_use_tree() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            use foo::foo<|>;
+use foo::foo<|>;
-            //- /foo/lib.rs
+//- /foo/lib.rs
-            #[macro_export]
+#[macro_export]
-            macro_rules! foo { () => { () } }
+macro_rules! foo { () => { () } }
-            ",
+           //^^^
-            "foo MACRO_CALL FileId(2) 0..49 29..32",
+"#,
-            "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
        );
    }
    #[test]
    fn goto_def_for_macro_defined_fn_with_arg() {
-        check_goto(
+        check(
            r#"
 //- /lib.rs
 macro_rules! define_fn {
@@ -309,522 +255,478 @@ macro_rules! define_fn {
 }
 define_fn!(foo);
+         //^^^
 fn bar() {
   <|>foo();
 }
 "#,
-            "foo FN_DEF FileId(1) 65..81 76..79",
-            "define_fn!(foo);|foo",
        );
    }
    #[test]
    fn goto_def_for_macro_defined_fn_no_arg() {
-        check_goto(
+        check(
            r#"
 //- /lib.rs
 macro_rules! define_fn {
    () => (fn foo() {})
 }
-define_fn!();
+  define_fn!();
+//^^^^^^^^^^^^^
 fn bar() {
   <|>foo();
 }
 "#,
-            "foo FN_DEF FileId(1) 52..65 52..65",
-            "define_fn!();|define_fn!();",
        );
    }
    #[test]
    fn goto_definition_works_for_macro_inside_pattern() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            macro_rules! foo {() => {0}}
+macro_rules! foo {() => {0}}
+           //^^^
-            fn bar() {
-                match (0,1) {
+fn bar() {
-                    (<|>foo!(), _) => {}
+    match (0,1) {
-                }
+        (<|>foo!(), _) => {}
-            }
+    }
-            ",
+}
-            "foo MACRO_CALL FileId(1) 0..28 13..16",
+"#,
-            "macro_rules! foo {() => {0}}|foo",
        );
    }
    #[test]
    fn goto_definition_works_for_macro_inside_match_arm_lhs() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            macro_rules! foo {() => {0}}
+macro_rules! foo {() => {0}}
+           //^^^
-            fn bar() {
+fn bar() {
-                match 0 {
+    match 0 {
-                    <|>foo!() => {}
+        <|>foo!() => {}
-                }
+    }
-            }
+}
-            ",
+"#,
-            "foo MACRO_CALL FileId(1) 0..28 13..16",
+        );
-            "macro_rules! foo {() => {0}}|foo",
+    }
+    #[test]
+    fn goto_def_for_use_alias() {
+        check(
+            r#"
+//- /lib.rs
+use foo as bar<|>;
+//- /foo/lib.rs
+// empty
+//^ file
+"#,
+        );
+    }
+    #[test]
+    fn goto_def_for_use_alias_foo_macro() {
+        check(
+            r#"
+//- /lib.rs
+use foo::foo as bar<|>;
+//- /foo/lib.rs
+#[macro_export]
+macro_rules! foo { () => { () } }
+           //^^^
+"#,
        );
    }
    #[test]
    fn goto_def_for_methods() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            struct Foo;
+struct Foo;
-            impl Foo {
+impl Foo {
-                fn frobnicate(&self) { }
+    fn frobnicate(&self) { }
-            }
+     //^^^^^^^^^^
+}
-            fn bar(foo: &Foo) {
+fn bar(foo: &Foo) {
-                foo.frobnicate<|>();
+    foo.frobnicate<|>();
-            }
+}
-            ",
+"#,
-            "frobnicate FN_DEF FileId(1) 27..51 30..40",
-            "fn frobnicate(&self) { }|frobnicate",
        );
    }
    #[test]
    fn goto_def_for_fields() {
-        check_goto(
+        check(
-            r"
+            r#"
-            //- /lib.rs
+struct Foo {
-            struct Foo {
+    spam: u32,
-                spam: u32,
+} //^^^^
-            }
-            fn bar(foo: &Foo) {
+fn bar(foo: &Foo) {
-                foo.spam<|>;
+    foo.spam<|>;
-            }
+}
-            ",
+"#,
-            "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
-            "spam: u32|spam",
        );
    }
    #[test]
    fn goto_def_for_record_fields() {
-        check_goto(
+        check(
-            r"
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            struct Foo {
+struct Foo {
-                spam: u32,
+    spam: u32,
-            }
+} //^^^^
-            fn bar() -> Foo {
+fn bar() -> Foo {
-                Foo {
+    Foo {
-                    spam<|>: 0,
+        spam<|>: 0,
-                }
+    }
-            }
+}
-            ",
+"#,
-            "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
-            "spam: u32|spam",
        );
    }
    #[test]
    fn goto_def_for_record_pat_fields() {
-        check_goto(
+        check(
-            r"
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            struct Foo {
+struct Foo {
-                spam: u32,
+    spam: u32,
-            }
+} //^^^^
-            fn bar(foo: Foo) -> Foo {
+fn bar(foo: Foo) -> Foo {
-                let Foo { spam<|>: _, } = foo
+    let Foo { spam<|>: _, } = foo
-            }
+}
-            ",
+"#,
-            "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
-            "spam: u32|spam",
        );
    }
    #[test]
    fn goto_def_for_record_fields_macros() {
-        check_goto(
+        check(
            r"
-            //- /lib.rs
+macro_rules! m { () => { 92 };}
-            macro_rules! m { () => { 92 };}
+struct Foo { spam: u32 }
-            struct Foo { spam: u32 }
+           //^^^^
-            fn bar() -> Foo {
+fn bar() -> Foo {
-                Foo { spam<|>: m!() }
+    Foo { spam<|>: m!() }
-            }
+}
-            ",
+",
-            "spam RECORD_FIELD_DEF FileId(1) 45..54 45..49",
-            "spam: u32|spam",
        );
    }
    #[test]
    fn goto_for_tuple_fields() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo(u32);
-            struct Foo(u32);
+         //^^^
-            fn bar() {
+fn bar() {
-                let foo = Foo(0);
+    let foo = Foo(0);
-                foo.<|>0;
+    foo.<|>0;
-            }
+}
-            ",
+"#,
-            "TUPLE_FIELD_DEF FileId(1) 11..14",
-            "u32",
        );
    }
    #[test]
    fn goto_def_for_ufcs_inherent_methods() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+impl Foo {
-            impl Foo {
+    fn frobnicate() { }
-                fn frobnicate() { }
+}    //^^^^^^^^^^
-            }
-            fn bar(foo: &Foo) {
+fn bar(foo: &Foo) {
-                Foo::frobnicate<|>();
+    Foo::frobnicate<|>();
-            }
+}
-            ",
+"#,
-            "frobnicate FN_DEF FileId(1) 27..46 30..40",
-            "fn frobnicate() { }|frobnicate",
        );
    }
    #[test]
    fn goto_def_for_ufcs_trait_methods_through_traits() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+trait Foo {
-            trait Foo {
+    fn frobnicate();
-                fn frobnicate();
+}    //^^^^^^^^^^
-            }
-            fn bar() {
+fn bar() {
-                Foo::frobnicate<|>();
+    Foo::frobnicate<|>();
-            }
+}
-            ",
+"#,
-            "frobnicate FN_DEF FileId(1) 16..32 19..29",
-            "fn frobnicate();|frobnicate",
        );
    }
    #[test]
    fn goto_def_for_ufcs_trait_methods_through_self() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+trait Trait {
-            trait Trait {
+    fn frobnicate();
-                fn frobnicate();
+}    //^^^^^^^^^^
-            }
+impl Trait for Foo {}
-            impl Trait for Foo {}
-            fn bar() {
+fn bar() {
-                Foo::frobnicate<|>();
+    Foo::frobnicate<|>();
-            }
+}
-            ",
+"#,
-            "frobnicate FN_DEF FileId(1) 30..46 33..43",
-            "fn frobnicate();|frobnicate",
        );
    }
    #[test]
    fn goto_definition_on_self() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+impl Foo {
-            impl Foo {
+   //^^^
-                pub fn new() -> Self {
+    pub fn new() -> Self {
-                    Self<|> {}
+        Self<|> {}
-                }
+    }
-            }
+}
-            ",
+"#,
-            "impl IMPL_DEF FileId(1) 12..73",
+        );
-            "impl Foo {...}",
+        check(
-        );
+            r#"
+struct Foo;
-        check_goto(
+impl Foo {
-            "
+   //^^^
-            //- /lib.rs
+    pub fn new() -> Self<|> {
-            struct Foo;
+        Self {}
-            impl Foo {
+    }
-                pub fn new() -> Self<|> {
+}
-                    Self {}
+"#,
-                }
+        );
-            }
-            ",
+        check(
-            "impl IMPL_DEF FileId(1) 12..73",
+            r#"
-            "impl Foo {...}",
+enum Foo { A }
-        );
+impl Foo {
+   //^^^
-        check_goto(
+    pub fn new() -> Self<|> {
-            "
+        Foo::A
-            //- /lib.rs
+    }
-            enum Foo { A }
+}
-            impl Foo {
+"#,
-                pub fn new() -> Self<|> {
+        );
-                    Foo::A
-                }
+        check(
-            }
+            r#"
-            ",
+enum Foo { A }
-            "impl IMPL_DEF FileId(1) 15..75",
+impl Foo {
-            "impl Foo {...}",
+   //^^^
-        );
+    pub fn thing(a: &Self<|>) {
+    }
-        check_goto(
+}
-            "
+"#,
-            //- /lib.rs
-            enum Foo { A }
-            impl Foo {
-                pub fn thing(a: &Self<|>) {
-                }
-            }
-            ",
-            "impl IMPL_DEF FileId(1) 15..62",
-            "impl Foo {...}",
        );
    }
    #[test]
    fn goto_definition_on_self_in_trait_impl() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+trait Make {
-            trait Make {
+    fn new() -> Self;
-                fn new() -> Self;
+}
-            }
+impl Make for Foo {
-            impl Make for Foo {
+            //^^^
-                fn new() -> Self {
+    fn new() -> Self {
-                    Self<|> {}
+        Self<|> {}
-                }
+    }
-            }
+}
-            ",
+"#,
-            "impl IMPL_DEF FileId(1) 49..115",
-            "impl Make for Foo {...}",
        );
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+trait Make {
-            trait Make {
+    fn new() -> Self;
-                fn new() -> Self;
+}
-            }
+impl Make for Foo {
-            impl Make for Foo {
+            //^^^
-                fn new() -> Self<|> {
+    fn new() -> Self<|> {
-                    Self {}
+        Self {}
-                }
+    }
-            }
+}
-            ",
+"#,
-            "impl IMPL_DEF FileId(1) 49..115",
-            "impl Make for Foo {...}",
        );
    }
    #[test]
    fn goto_def_when_used_on_definition_name_itself() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo<|> { value: u32 }
-            struct Foo<|> { value: u32 }
+     //^^^
-            ",
+            "#,
-            "Foo STRUCT_DEF FileId(1) 0..25 7..10",
-            "struct Foo { value: u32 }|Foo",
        );
-        check_goto(
+        check(
            r#"
-            //- /lib.rs
+struct Foo {
-            struct Foo {
+    field<|>: string,
-                field<|>: string,
+} //^^^^^
-            }
+"#,
-            "#,
-            "field RECORD_FIELD_DEF FileId(1) 17..30 17..22",
-            "field: string|field",
        );
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+fn foo_test<|>() { }
-            fn foo_test<|>() { }
+ //^^^^^^^^
-            ",
+"#,
-            "foo_test FN_DEF FileId(1) 0..17 3..11",
-            "fn foo_test() { }|foo_test",
        );
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+enum Foo<|> { Variant }
-            enum Foo<|> {
+   //^^^
-                Variant,
+"#,
-            }
-            ",
-            "Foo ENUM_DEF FileId(1) 0..25 5..8",
-            "enum Foo {...}|Foo",
-        );
-        check_goto(
-            "
-            //- /lib.rs
-            enum Foo {
-                Variant1,
-                Variant2<|>,
-                Variant3,
-            }
-            ",
-            "Variant2 ENUM_VARIANT FileId(1) 29..37 29..37",
-            "Variant2|Variant2",
        );
-        check_goto(
+        check(
            r#"
-            //- /lib.rs
+enum Foo {
-            static INNER<|>: &str = "";
+    Variant1,
-            "#,
+    Variant2<|>,
-            "INNER STATIC_DEF FileId(1) 0..24 7..12",
+  //^^^^^^^^
-            "static INNER: &str = \"\";|INNER",
+    Variant3,
+}
+"#,
        );
-        check_goto(
+        check(
            r#"
-            //- /lib.rs
+static INNER<|>: &str = "";
-            const INNER<|>: &str = "";
+     //^^^^^
-            "#,
+"#,
-            "INNER CONST_DEF FileId(1) 0..23 6..11",
-            "const INNER: &str = \"\";|INNER",
        );
-        check_goto(
+        check(
            r#"
-            //- /lib.rs
+const INNER<|>: &str = "";
-            type Thing<|> = Option<()>;
+    //^^^^^
-            "#,
+"#,
-            "Thing TYPE_ALIAS_DEF FileId(1) 0..24 5..10",
-            "type Thing = Option<()>;|Thing",
        );
-        check_goto(
+        check(
            r#"
-            //- /lib.rs
+type Thing<|> = Option<()>;
-            trait Foo<|> { }
+   //^^^^^
-            "#,
+"#,
-            "Foo TRAIT_DEF FileId(1) 0..13 6..9",
-            "trait Foo { }|Foo",
        );
-        check_goto(
+        check(
            r#"
-            //- /lib.rs
+trait Foo<|> { }
-            mod bar<|> { }
+    //^^^
-            "#,
+"#,
-            "bar MODULE FileId(1) 0..11 4..7",
+        );
-            "mod bar { }|bar",
+        check(
+            r#"
+mod bar<|> { }
+  //^^^
+"#,
        );
    }
    #[test]
    fn goto_from_macro() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+macro_rules! id {
-            macro_rules! id {
+    ($($tt:tt)*) => { $($tt)* }
-                ($($tt:tt)*) => { $($tt)* }
+}
-            }
+fn foo() {}
-            fn foo() {}
+ //^^^
-            id! {
+id! {
-                fn bar() {
+    fn bar() {
-                    fo<|>o();
+        fo<|>o();
-                }
+    }
-            }
+}
-            mod confuse_index { fn foo(); }
+mod confuse_index { fn foo(); }
-            ",
+"#,
-            "foo FN_DEF FileId(1) 52..63 55..58",
-            "fn foo() {}|foo",
        );
    }
    #[test]
    fn goto_through_format() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+#[macro_export]
-            #[macro_export]
+macro_rules! format {
-            macro_rules! format {
+    ($($arg:tt)*) => ($crate::fmt::format($crate::__export::format_args!($($arg)*)))
-                ($($arg:tt)*) => ($crate::fmt::format($crate::__export::format_args!($($arg)*)))
+}
-            }
+#[rustc_builtin_macro]
-            #[rustc_builtin_macro]
+#[macro_export]
-            #[macro_export]
+macro_rules! format_args {
-            macro_rules! format_args {
+    ($fmt:expr) => ({ /* compiler built-in */ });
-                ($fmt:expr) => ({ /* compiler built-in */ });
+    ($fmt:expr, $($args:tt)*) => ({ /* compiler built-in */ })
-                ($fmt:expr, $($args:tt)*) => ({ /* compiler built-in */ })
+}
-            }
+pub mod __export {
-            pub mod __export {
+    pub use crate::format_args;
-                pub use crate::format_args;
+    fn foo() {} // for index confusion
-                fn foo() {} // for index confusion
+}
-            }
+fn foo() -> i8 {}
-            fn foo() -> i8 {}
+ //^^^
-            fn test() {
+fn test() {
-                format!(\"{}\", fo<|>o())
+    format!("{}", fo<|>o())
-            }
+}
-            ",
+"#,
-            "foo FN_DEF FileId(1) 398..415 401..404",
-            "fn foo() -> i8 {}|foo",
        );
    }
    #[test]
    fn goto_for_type_param() {
-        check_goto(
+        check(
            r#"
-            //- /lib.rs
+struct Foo<T: Clone> { t: <|>T }
-            struct Foo<T: Clone> {
+         //^
-                t: <|>T,
+"#,
-            }
-            "#,
-            "T TYPE_PARAM FileId(1) 11..19 11..12",
-            "T: Clone|T",
        );
    }
    #[test]
    fn goto_within_macro() {
-        check_goto(
+        check(
            r#"
-//- /lib.rs
 macro_rules! id {
    ($($tt:tt)*) => ($($tt)*)
 }
 fn foo() {
    let x = 1;
+      //^
    id!({
        let y = <|>x;
        let z = y;
    });
 }
 "#,
-            "x BIND_PAT FileId(1) 70..71",
-            "x",
        );
-        check_goto(
+        check(
            r#"
-//- /lib.rs
 macro_rules! id {
    ($($tt:tt)*) => ($($tt)*)
 }
@@ -833,159 +735,233 @@ fn foo() {
    let x = 1;
    id!({
        let y = x;
+          //^
        let z = <|>y;
    });
 }
 "#,
-            "y BIND_PAT FileId(1) 99..100",
-            "y",
        );
    }
    #[test]
    fn goto_def_in_local_fn() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+fn main() {
-            fn main() {
+    fn foo() {
-                fn foo() {
+        let x = 92;
-                    let x = 92;
+          //^
-                    <|>x;
+        <|>x;
-                }
+    }
-            }
+}
-            ",
+"#,
-            "x BIND_PAT FileId(1) 39..40",
-            "x",
        );
    }
    #[test]
    fn goto_def_in_local_macro() {
-        check_goto(
+        check(
-            r"
+            r#"
-            //- /lib.rs
+fn bar() {
-            fn bar() {
+    macro_rules! foo { () => { () } }
-                macro_rules! foo { () => { () } }
+               //^^^
-                <|>foo!();
+    <|>foo!();
-            }
+}
-            ",
+"#,
-            "foo MACRO_CALL FileId(1) 15..48 28..31",
-            "macro_rules! foo { () => { () } }|foo",
        );
    }
    #[test]
    fn goto_def_for_field_init_shorthand() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo { x: i32 }
-            struct Foo { x: i32 }
+fn main() {
-            fn main() {
+    let x = 92;
-                let x = 92;
+      //^
-                Foo { x<|> };
+    Foo { x<|> };
-            }
+}
-            ",
+"#,
-            "x BIND_PAT FileId(1) 42..43",
-            "x",
        )
    }
    #[test]
    fn goto_def_for_enum_variant_field() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+enum Foo {
-            enum Foo {
+    Bar { x: i32 }
-                Bar { x: i32 }
+}       //^
-            }
+fn baz(foo: Foo) {
-            fn baz(foo: Foo) {
+    match foo {
-                match foo {
+        Foo::Bar { x<|> } => x
-                    Foo::Bar { x<|> } => x
+    };
-                };
+}
-            }
+"#,
-            ",
-            "x RECORD_FIELD_DEF FileId(1) 21..27 21..22",
-            "x: i32|x",
        );
    }
    #[test]
    fn goto_def_for_enum_variant_self_pattern_const() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+enum Foo { Bar }
-            enum Foo {
+         //^^^
-                Bar,
+impl Foo {
-            }
+    fn baz(self) {
-            impl Foo {
+        match self { Self::Bar<|> => {} }
-                fn baz(self) {
+    }
-                    match self {
+}
-                        Self::Bar<|> => {}
+"#,
-                    }
-                }
-            }
-            ",
-            "Bar ENUM_VARIANT FileId(1) 15..18 15..18",
-            "Bar|Bar",
        );
    }
    #[test]
    fn goto_def_for_enum_variant_self_pattern_record() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+enum Foo { Bar { val: i32 } }
-            enum Foo {
+         //^^^
-                Bar { val: i32 },
+impl Foo {
-            }
+    fn baz(self) -> i32 {
-            impl Foo {
+        match self { Self::Bar<|> { val } => {} }
-                fn baz(self) -> i32 {
+    }
-                    match self {
+}
-                        Self::Bar<|> { val } => {}
+"#,
-                    }
-                }
-            }
-            ",
-            "Bar ENUM_VARIANT FileId(1) 15..31 15..18",
-            "Bar { val: i32 }|Bar",
        );
    }
    #[test]
    fn goto_def_for_enum_variant_self_expr_const() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+enum Foo { Bar }
-            enum Foo {
+         //^^^
-                Bar,
+impl Foo {
-            }
+    fn baz(self) { Self::Bar<|>; }
-            impl Foo {
+}
-                fn baz(self) {
+"#,
-                    Self::Bar<|>;
-                }
-            }
-            ",
-            "Bar ENUM_VARIANT FileId(1) 15..18 15..18",
-            "Bar|Bar",
        );
    }
    #[test]
    fn goto_def_for_enum_variant_self_expr_record() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+enum Foo { Bar { val: i32 } }
-            enum Foo {
+         //^^^
-                Bar { val: i32 },
+impl Foo {
-            }
+    fn baz(self) { Self::Bar<|> {val: 4}; }
-            impl Foo {
+}
-                fn baz(self) {
+"#,
-                    Self::Bar<|> {val: 4};
+        );
-                }
+    }
-            }
-            ",
+    #[test]
-            "Bar ENUM_VARIANT FileId(1) 15..31 15..18",
+    fn goto_def_for_type_alias_generic_parameter() {
-            "Bar { val: i32 }|Bar",
+        check(
+            r#"
+type Alias<T> = T<|>;
+         //^
+"#,
+        )
+    }
+    #[test]
+    fn goto_def_for_macro_container() {
+        check(
+            r#"
+//- /lib.rs
+foo::module<|>::mac!();
+//- /foo/lib.rs
+pub mod module {
+      //^^^^^^
+    #[macro_export]
+    macro_rules! _mac { () => { () } }
+    pub use crate::_mac as mac;
+}
+"#,
+        );
+    }
+    #[test]
+    fn goto_def_for_assoc_ty_in_path() {
+        check(
+            r#"
+trait Iterator {
+    type Item;
+       //^^^^
+}
+fn f() -> impl Iterator<Item<|> = u8> {}
+"#,
+        );
+    }
+    #[test]
+    fn goto_def_for_assoc_ty_in_path_multiple() {
+        check(
+            r#"
+trait Iterator {
+    type A;
+       //^
+    type B;
+}
+fn f() -> impl Iterator<A<|> = u8, B = ()> {}
+"#,
+        );
+        check(
+            r#"
+trait Iterator {
+    type A;
+    type B;
+       //^
+}
+fn f() -> impl Iterator<A = u8, B<|> = ()> {}
+"#,
+        );
+    }
+    #[test]
+    fn goto_def_for_assoc_ty_ufcs() {
+        check(
+            r#"
+trait Iterator {
+    type Item;
+       //^^^^
+}
+fn g() -> <() as Iterator<Item<|> = ()>>::Item {}
+"#,
+        );
+    }
+    #[test]
+    fn goto_def_for_assoc_ty_ufcs_multiple() {
+        check(
+            r#"
+trait Iterator {
+    type A;
+       //^
+    type B;
+}
+fn g() -> <() as Iterator<A<|> = (), B = u8>>::B {}
+"#,
+        );
+        check(
+            r#"
+trait Iterator {
+    type A;
+    type B;
+       //^
+}
+fn g() -> <() as Iterator<A = (), B<|> = u8>>::A {}
+"#,
        );
    }
 }
diff --git a/crates/ra_ide/src/goto_implementation.rs b/crates/ra_ide/src/goto_implementation.rs
index 0cec0657e..9912b7142 100644
--- a/crates/ra_ide/src/goto_implementation.rs
+++ b/crates/ra_ide/src/goto_implementation.rs
@@ -23,12 +23,12 @@ pub(crate) fn goto_implementation(
    let krate = sema.to_module_def(position.file_id)?.krate();
-    if let Some(nominal_def) = find_node_at_offset::<ast::NominalDef>(&syntax, position.offset) {
+    if let Some(nominal_def) = find_node_at_offset::<ast::AdtDef>(&syntax, position.offset) {
        return Some(RangeInfo::new(
            nominal_def.syntax().text_range(),
            impls_for_def(&sema, &nominal_def, krate)?,
        ));
-    } else if let Some(trait_def) = find_node_at_offset::<ast::TraitDef>(&syntax, position.offset) {
+    } else if let Some(trait_def) = find_node_at_offset::<ast::Trait>(&syntax, position.offset) {
        return Some(RangeInfo::new(
            trait_def.syntax().text_range(),
            impls_for_trait(&sema, &trait_def, krate)?,
@@ -40,13 +40,13 @@ pub(crate) fn goto_implementation(
 fn impls_for_def(
    sema: &Semantics<RootDatabase>,
-    node: &ast::NominalDef,
+    node: &ast::AdtDef,
    krate: Crate,
 ) -> Option<Vec<NavigationTarget>> {
    let ty = match node {
-        ast::NominalDef::StructDef(def) => sema.to_def(def)?.ty(sema.db),
+        ast::AdtDef::Struct(def) => sema.to_def(def)?.ty(sema.db),
-        ast::NominalDef::EnumDef(def) => sema.to_def(def)?.ty(sema.db),
+        ast::AdtDef::Enum(def) => sema.to_def(def)?.ty(sema.db),
-        ast::NominalDef::UnionDef(def) => sema.to_def(def)?.ty(sema.db),
+        ast::AdtDef::Union(def) => sema.to_def(def)?.ty(sema.db),
    };
    let impls = ImplDef::all_in_crate(sema.db, krate);
@@ -62,7 +62,7 @@ fn impls_for_def(
 fn impls_for_trait(
    sema: &Semantics<RootDatabase>,
-    node: &ast::TraitDef,
+    node: &ast::Trait,
    krate: Crate,
 ) -> Option<Vec<NavigationTarget>> {
    let tr = sema.to_def(node)?;
@@ -74,135 +74,156 @@ fn impls_for_trait(
 #[cfg(test)]
 mod tests {
-    use crate::mock_analysis::analysis_and_position;
+    use ra_db::FileRange;
-    fn check_goto(fixture: &str, expected: &[&str]) {
+    use crate::mock_analysis::MockAnalysis;
-        let (analysis, pos) = analysis_and_position(fixture);
-        let mut navs = analysis.goto_implementation(pos).unwrap().unwrap().info;
+    fn check(ra_fixture: &str) {
-        assert_eq!(navs.len(), expected.len());
+        let (mock, position) = MockAnalysis::with_files_and_position(ra_fixture);
-        navs.sort_by_key(|nav| (nav.file_id(), nav.full_range().start()));
+        let annotations = mock.annotations();
-        navs.into_iter().enumerate().for_each(|(i, nav)| nav.assert_match(expected[i]));
+        let analysis = mock.analysis();
+        let navs = analysis.goto_implementation(position).unwrap().unwrap().info;
+        let key = |frange: &FileRange| (frange.file_id, frange.range.start());
+        let mut expected = annotations
+            .into_iter()
+            .map(|(range, data)| {
+                assert!(data.is_empty());
+                range
+            })
+            .collect::<Vec<_>>();
+        expected.sort_by_key(key);
+        let mut actual = navs
+            .into_iter()
+            .map(|nav| FileRange { file_id: nav.file_id, range: nav.focus_or_full_range() })
+            .collect::<Vec<_>>();
+        actual.sort_by_key(key);
+        assert_eq!(expected, actual);
    }
    #[test]
    fn goto_implementation_works() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo<|>;
-            struct Foo<|>;
+impl Foo {}
-            impl Foo {}
+   //^^^
-            ",
+"#,
-            &["impl IMPL_DEF FileId(1) 12..23"],
        );
    }
    #[test]
    fn goto_implementation_works_multiple_blocks() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo<|>;
-            struct Foo<|>;
+impl Foo {}
-            impl Foo {}
+   //^^^
-            impl Foo {}
+impl Foo {}
-            ",
+   //^^^
-            &["impl IMPL_DEF FileId(1) 12..23", "impl IMPL_DEF FileId(1) 24..35"],
+"#,
        );
    }
    #[test]
    fn goto_implementation_works_multiple_mods() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo<|>;
-            struct Foo<|>;
+mod a {
-            mod a {
+    impl super::Foo {}
-                impl super::Foo {}
+       //^^^^^^^^^^
-            }
+}
-            mod b {
+mod b {
-                impl super::Foo {}
+    impl super::Foo {}
-            }
+       //^^^^^^^^^^
-            ",
+}
-            &["impl IMPL_DEF FileId(1) 24..42", "impl IMPL_DEF FileId(1) 57..75"],
+"#,
        );
    }
    #[test]
    fn goto_implementation_works_multiple_files() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            struct Foo<|>;
+struct Foo<|>;
-            mod a;
+mod a;
-            mod b;
+mod b;
-            //- /a.rs
+//- /a.rs
-            impl crate::Foo {}
+impl crate::Foo {}
-            //- /b.rs
+   //^^^^^^^^^^
-            impl crate::Foo {}
+//- /b.rs
-            ",
+impl crate::Foo {}
-            &["impl IMPL_DEF FileId(2) 0..18", "impl IMPL_DEF FileId(3) 0..18"],
+   //^^^^^^^^^^
+"#,
        );
    }
    #[test]
    fn goto_implementation_for_trait() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+trait T<|> {}
-            trait T<|> {}
+struct Foo;
-            struct Foo;
+impl T for Foo {}
-            impl T for Foo {}
+         //^^^
-            ",
+"#,
-            &["impl IMPL_DEF FileId(1) 23..40"],
        );
    }
    #[test]
    fn goto_implementation_for_trait_multiple_files() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            trait T<|> {};
+trait T<|> {};
-            struct Foo;
+struct Foo;
-            mod a;
+mod a;
-            mod b;
+mod b;
-            //- /a.rs
+//- /a.rs
-            impl crate::T for crate::Foo {}
+impl crate::T for crate::Foo {}
-            //- /b.rs
+                //^^^^^^^^^^
-            impl crate::T for crate::Foo {}
+//- /b.rs
-            ",
+impl crate::T for crate::Foo {}
-            &["impl IMPL_DEF FileId(2) 0..31", "impl IMPL_DEF FileId(3) 0..31"],
+                //^^^^^^^^^^
+            "#,
        );
    }
    #[test]
    fn goto_implementation_all_impls() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+//- /lib.rs
-            trait T {}
+trait T {}
-            struct Foo<|>;
+struct Foo<|>;
-            impl Foo {}
+impl Foo {}
-            impl T for Foo {}
+   //^^^
-            impl T for &Foo {}
+impl T for Foo {}
-            ",
+         //^^^
-            &[
+impl T for &Foo {}
-                "impl IMPL_DEF FileId(1) 23..34",
+         //^^^^
-                "impl IMPL_DEF FileId(1) 35..52",
+"#,
-                "impl IMPL_DEF FileId(1) 53..71",
-            ],
        );
    }
    #[test]
    fn goto_implementation_to_builtin_derive() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+  #[derive(Copy)]
-            #[derive(Copy)]
+//^^^^^^^^^^^^^^^
-            struct Foo<|>;
+struct Foo<|>;
-            ",
-            &["impl IMPL_DEF FileId(1) 0..15"],
+mod marker {
+    trait Copy {}
+}
+"#,
        );
    }
 }
diff --git a/crates/ra_ide/src/goto_type_definition.rs b/crates/ra_ide/src/goto_type_definition.rs
index 91a3097fb..8f52feea6 100644
--- a/crates/ra_ide/src/goto_type_definition.rs
+++ b/crates/ra_ide/src/goto_type_definition.rs
@@ -1,5 +1,5 @@
 use ra_ide_db::RootDatabase;
-use ra_syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset};
+use ra_syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
 use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo};
@@ -25,8 +25,9 @@ pub(crate) fn goto_type_definition(
    let (ty, node) = sema.ancestors_with_macros(token.parent()).find_map(|node| {
        let ty = match_ast! {
            match node {
-                ast::Expr(expr) => sema.type_of_expr(&expr)?,
+                ast::Expr(it) => sema.type_of_expr(&it)?,
-                ast::Pat(pat) => sema.type_of_pat(&pat)?,
+                ast::Pat(it) => sema.type_of_pat(&it)?,
+                ast::SelfParam(it) => sema.type_of_self(&it)?,
                _ => return None,
            }
        };
@@ -34,7 +35,7 @@ pub(crate) fn goto_type_definition(
        Some((ty, node))
    })?;
-    let adt_def = ty.autoderef(db).find_map(|ty| ty.as_adt())?;
+    let adt_def = ty.autoderef(db).filter_map(|ty| ty.as_adt()).last()?;
    let nav = adt_def.to_nav(db);
    Some(RangeInfo::new(node.text_range(), vec![nav]))
@@ -44,7 +45,7 @@ fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
    return tokens.max_by_key(priority);
    fn priority(n: &SyntaxToken) -> usize {
        match n.kind() {
-            IDENT | INT_NUMBER => 2,
+            IDENT | INT_NUMBER | T![self] => 2,
            kind if kind.is_trivia() => 0,
            _ => 1,
        }
@@ -53,91 +54,98 @@ fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
 #[cfg(test)]
 mod tests {
-    use crate::mock_analysis::analysis_and_position;
+    use ra_db::FileRange;
-    fn check_goto(fixture: &str, expected: &str) {
+    use crate::mock_analysis::MockAnalysis;
-        let (analysis, pos) = analysis_and_position(fixture);
-        let mut navs = analysis.goto_type_definition(pos).unwrap().unwrap().info;
+    fn check(ra_fixture: &str) {
+        let (mock, position) = MockAnalysis::with_files_and_position(ra_fixture);
+        let (expected, data) = mock.annotation();
+        assert!(data.is_empty());
+        let analysis = mock.analysis();
+        let mut navs = analysis.goto_type_definition(position).unwrap().unwrap().info;
        assert_eq!(navs.len(), 1);
        let nav = navs.pop().unwrap();
-        nav.assert_match(expected);
+        assert_eq!(expected, FileRange { file_id: nav.file_id, range: nav.focus_or_full_range() });
    }
    #[test]
    fn goto_type_definition_works_simple() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+     //^^^
-            fn foo() {
+fn foo() {
-                let f: Foo;
+    let f: Foo; f<|>
-                f<|>
+}
-            }
+"#,
-            ",
-            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
        );
    }
    #[test]
    fn goto_type_definition_works_simple_ref() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+     //^^^
-            fn foo() {
+fn foo() {
-                let f: &Foo;
+    let f: &Foo; f<|>
-                f<|>
+}
-            }
+"#,
-            ",
-            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
        );
    }
    #[test]
    fn goto_type_definition_works_through_macro() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
-            macro_rules! id {
+struct Foo {}
-                ($($tt:tt)*) => { $($tt)* }
+     //^^^
-            }
+id! {
-            struct Foo {}
+    fn bar() { let f<|> = Foo {}; }
-            id! {
+}
-                fn bar() {
+"#,
-                    let f<|> = Foo {};
-                }
-            }
-            ",
-            "Foo STRUCT_DEF FileId(1) 52..65 59..62",
        );
    }
    #[test]
    fn goto_type_definition_for_param() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+     //^^^
-            fn foo(<|>f: Foo) {}
+fn foo(<|>f: Foo) {}
-            ",
+"#,
-            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
        );
    }
    #[test]
    fn goto_type_definition_for_tuple_field() {
-        check_goto(
+        check(
-            "
+            r#"
-            //- /lib.rs
+struct Foo;
-            struct Foo;
+     //^^^
-            struct Bar(Foo);
+struct Bar(Foo);
-            fn foo() {
+fn foo() {
-                let bar = Bar(Foo);
+    let bar = Bar(Foo);
-                bar.<|>0;
+    bar.<|>0;
-            }
+}
-            ",
+"#,
-            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
        );
    }
+    #[test]
+    fn goto_def_for_self_param() {
+        check(
+            r#"
+struct Foo;
+     //^^^
+impl Foo {
+    fn f(&self<|>) {}
+}
+"#,
+        )
+    }
 }
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index f36b9de7e..ad68bc43c 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -16,18 +16,18 @@ use ra_ide_db::{
    defs::{classify_name, classify_name_ref, Definition},
    RootDatabase,
 };
-use ra_syntax::{ast, ast::Path, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset};
+use ra_syntax::{ast, ast::Path, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
 use ra_tt::{Ident, Leaf, Literal, TokenTree};
+use stdx::format_to;
+use test_utils::mark;
 use url::Url;
 use crate::{
-    display::{
+    display::{macro_label, ShortLabel, ToNav, TryToNav},
-        macro_label, rust_code_markup, rust_code_markup_with_doc, ShortLabel, ToNav, TryToNav,
+    markup::Markup,
-    },
    runnables::runnable,
    FileId, FilePosition, NavigationTarget, RangeInfo, Runnable,
 };
-use test_utils::mark;
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct HoverConfig {
@@ -76,50 +76,8 @@ pub struct HoverGotoTypeData {
 /// Contains the results when hovering over an item
 #[derive(Debug, Default)]
 pub struct HoverResult {
-    results: Vec<String>,
+    pub markup: Markup,
-    actions: Vec<HoverAction>,
+    pub actions: Vec<HoverAction>,
-}
-impl HoverResult {
-    pub fn new() -> HoverResult {
-        Self::default()
-    }
-    pub fn extend(&mut self, item: Option<String>) {
-        self.results.extend(item);
-    }
-    pub fn is_empty(&self) -> bool {
-        self.results.is_empty()
-    }
-    pub fn len(&self) -> usize {
-        self.results.len()
-    }
-    pub fn first(&self) -> Option<&str> {
-        self.results.first().map(String::as_str)
-    }
-    pub fn results(&self) -> &[String] {
-        &self.results
-    }
-    pub fn actions(&self) -> &[HoverAction] {
-        &self.actions
-    }
-    pub fn push_action(&mut self, action: HoverAction) {
-        self.actions.push(action);
-    }
-    /// Returns the results converted into markup
-    /// for displaying in a UI
-    ///
-    /// Does not process actions!
-    pub fn to_markup(&self) -> String {
-        self.results.join("\n\n___\n")
-    }
 }
 // Feature: Hover
@@ -132,37 +90,33 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
    let token = pick_best(file.token_at_offset(position.offset))?;
    let token = sema.descend_into_macros(token);
-    let mut res = HoverResult::new();
+    let mut res = HoverResult::default();
-    if let Some((node, name_kind)) = match_ast! {
+    let node = token.parent();
-        match (token.parent()) {
+    let definition = match_ast! {
-            ast::NameRef(name_ref) => {
+        match node {
-                classify_name_ref(&sema, &name_ref).map(|d| (name_ref.syntax().clone(), d.definition()))
+            ast::NameRef(name_ref) => classify_name_ref(&sema, &name_ref).map(|d| d.definition()),
-            },
+            ast::Name(name) => classify_name(&sema, &name).map(|d| d.definition()),
-            ast::Name(name) => {
-                classify_name(&sema, &name).map(|d| (name.syntax().clone(), d.definition()))
-            },
            _ => None,
        }
-    } {
+    };
-        let range = sema.original_range(&node).range;
+    if let Some(definition) = definition {
-        let text = hover_text_from_name_kind(db, name_kind.clone());
+        if let Some(markup) = hover_for_definition(db, definition) {
-        let text = text.map(|text| rewrite_links(db, &text, &name_kind).unwrap_or(text));
+            let markup = rewrite_links(db, &markup.as_str(), &definition);
-        res.extend(text);
+            res.markup = Markup::from(markup);
+            if let Some(action) = show_implementations_action(db, definition) {
-        if !res.is_empty() {
+                res.actions.push(action);
-            if let Some(action) = show_implementations_action(db, name_kind) {
-                res.push_action(action);
            }
-            if let Some(action) = runnable_action(&sema, name_kind, position.file_id) {
+            if let Some(action) = runnable_action(&sema, definition, position.file_id) {
-                res.push_action(action);
+                res.actions.push(action);
            }
-            if let Some(action) = goto_type_action(db, name_kind) {
+            if let Some(action) = goto_type_action(db, definition) {
-                res.push_action(action);
+                res.actions.push(action);
            }
+            let range = sema.original_range(&node).range;
            return Some(RangeInfo::new(range, res));
        }
    }
@@ -173,22 +127,16 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
    let ty = match_ast! {
        match node {
-            ast::MacroCall(_it) => {
+            ast::Expr(it) => sema.type_of_expr(&it)?,
-                // If this node is a MACRO_CALL, it means that `descend_into_macros` failed to resolve.
+            ast::Pat(it) => sema.type_of_pat(&it)?,
-                // (e.g expanding a builtin macro). So we give up here.
+            // If this node is a MACRO_CALL, it means that `descend_into_macros` failed to resolve.
-                return None;
+            // (e.g expanding a builtin macro). So we give up here.
-            },
+            ast::MacroCall(_it) => return None,
-            ast::Expr(it) => {
+            _ => return None,
-                sema.type_of_expr(&it)
-            },
-            ast::Pat(it) => {
-                sema.type_of_pat(&it)
-            },
-            _ => None,
        }
-    }?;
+    };
-    res.extend(Some(rust_code_markup(&ty.display(db))));
+    res.markup = Markup::fenced_block(&ty.display(db));
    let range = sema.original_range(&node).range;
    Some(RangeInfo::new(range, res))
 }
@@ -196,8 +144,8 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
 fn show_implementations_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
    fn to_action(nav_target: NavigationTarget) -> HoverAction {
        HoverAction::Implementaion(FilePosition {
-            file_id: nav_target.file_id(),
+            file_id: nav_target.file_id,
-            offset: nav_target.range().start(),
+            offset: nav_target.focus_or_full_range().start(),
        })
    }
@@ -269,7 +217,11 @@ fn goto_type_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
                .into_iter()
                .filter_map(|it| {
                    Some(HoverGotoTypeData {
-                        mod_path: mod_path(db, &it)?,
+                        mod_path: render_path(
+                            db,
+                            it.module(db)?,
+                            it.name(db).map(|name| name.to_string()),
+                        ),
                        nav: it.try_to_nav(db)?,
                    })
                })
@@ -281,15 +233,28 @@ fn goto_type_action(db: &RootDatabase, def: Definition) -> Option<HoverAction> {
    }
 }
-fn hover_text(
+fn hover_markup(
    docs: Option<String>,
    desc: Option<String>,
    mod_path: Option<String>,
-) -> Option<String> {
+) -> Option<Markup> {
-    if let Some(desc) = desc {
+    match desc {
-        Some(rust_code_markup_with_doc(&desc, docs.as_deref(), mod_path.as_deref()))
+        Some(desc) => {
-    } else {
+            let mut buf = String::new();
-        docs
+            if let Some(mod_path) = mod_path {
+                if !mod_path.is_empty() {
+                    format_to!(buf, "```rust\n{}\n```\n\n", mod_path);
+                }
+            }
+            format_to!(buf, "```rust\n{}\n```", desc);
+            if let Some(doc) = docs {
+                format_to!(buf, "\n___\n\n{}", doc);
+            }
+            Some(buf.into())
+        }
+        None => docs.map(Markup::from),
    }
 }
@@ -311,43 +276,35 @@ fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option<String>
    .map(|name| name.to_string())
 }
-fn determine_mod_path(db: &RootDatabase, module: Module, name: Option<String>) -> String {
+fn render_path(db: &RootDatabase, module: Module, item_name: Option<String>) -> String {
-    once(db.crate_graph()[module.krate().into()].display_name.as_ref().map(ToString::to_string))
+    let crate_name =
-        .chain(
+        db.crate_graph()[module.krate().into()].display_name.as_ref().map(ToString::to_string);
-            module
+    let module_path = module
-                .path_to_root(db)
+        .path_to_root(db)
-                .into_iter()
+        .into_iter()
-                .rev()
+        .rev()
-                .map(|it| it.name(db).map(|name| name.to_string())),
+        .flat_map(|it| it.name(db).map(|name| name.to_string()));
-        )
+    crate_name.into_iter().chain(module_path).chain(item_name).join("::")
-        .chain(once(name))
-        .flatten()
-        .join("::")
-}
-// returns None only for ModuleDef::BuiltinType
-fn mod_path(db: &RootDatabase, item: &ModuleDef) -> Option<String> {
-    Some(determine_mod_path(db, item.module(db)?, item.name(db).map(|name| name.to_string())))
 }
 fn definition_mod_path(db: &RootDatabase, def: &Definition) -> Option<String> {
-    def.module(db).map(|module| determine_mod_path(db, module, definition_owner_name(db, def)))
+    def.module(db).map(|module| render_path(db, module, definition_owner_name(db, def)))
 }
-fn hover_text_from_name_kind(db: &RootDatabase, def: Definition) -> Option<String> {
+fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> {
    let mod_path = definition_mod_path(db, &def);
    return match def {
        Definition::Macro(it) => {
            let src = it.source(db);
            let docs = Documentation::from_ast(&src.value).map(Into::into);
-            hover_text(docs, Some(macro_label(&src.value)), mod_path)
+            hover_markup(docs, Some(macro_label(&src.value)), mod_path)
        }
        Definition::Field(it) => {
            let src = it.source(db);
            match src.value {
                FieldSource::Named(it) => {
                    let docs = Documentation::from_ast(&it).map(Into::into);
-                    hover_text(docs, it.short_label(), mod_path)
+                    hover_markup(docs, it.short_label(), mod_path)
                }
                _ => None,
            }
@@ -356,7 +313,7 @@ fn hover_text_from_name_kind(db: &RootDatabase, def: Definition) -> Option<Strin
            ModuleDef::Module(it) => match it.definition_source(db).value {
                ModuleSource::Module(it) => {
                    let docs = Documentation::from_ast(&it).map(Into::into);
-                    hover_text(docs, it.short_label(), mod_path)
+                    hover_markup(docs, it.short_label(), mod_path)
                }
                _ => None,
            },
@@ -369,23 +326,23 @@ fn hover_text_from_name_kind(db: &RootDatabase, def: Definition) -> Option<Strin
            ModuleDef::Static(it) => from_def_source(db, it, mod_path),
            ModuleDef::Trait(it) => from_def_source(db, it, mod_path),
            ModuleDef::TypeAlias(it) => from_def_source(db, it, mod_path),
-            ModuleDef::BuiltinType(it) => Some(it.to_string()),
+            ModuleDef::BuiltinType(it) => return Some(it.to_string().into()),
        },
-        Definition::Local(it) => Some(rust_code_markup(&it.ty(db).display(db))),
+        Definition::Local(it) => return Some(Markup::fenced_block(&it.ty(db).display(db))),
        Definition::TypeParam(_) | Definition::SelfType(_) => {
            // FIXME: Hover for generic param
            None
        }
    };
-    fn from_def_source<A, D>(db: &RootDatabase, def: D, mod_path: Option<String>) -> Option<String>
+    fn from_def_source<A, D>(db: &RootDatabase, def: D, mod_path: Option<String>) -> Option<Markup>
    where
        D: HasSource<Ast = A>,
        A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel + ast::AttrsOwner,
    {
        let src = def.source(db);
        let docs = Documentation::from_ast(&src.value).map(Into::into);
-        hover_text(docs, src.value.short_label(), mod_path)
+        hover_markup(docs, src.value.short_label(), mod_path)
    }
 }
@@ -422,7 +379,7 @@ fn map_links<'e>(
 }
 /// Rewrite documentation links in markdown to point to an online host (e.g. docs.rs)
-fn rewrite_links(db: &RootDatabase, markdown: &str, definition: &Definition) -> Option<String> {
+fn rewrite_links(db: &RootDatabase, markdown: &str, definition: &Definition) -> String {
    let doc = Parser::new_with_broken_link_callback(
        markdown,
        Options::empty(),
@@ -452,7 +409,7 @@ fn rewrite_links(db: &RootDatabase, markdown: &str, definition: &Definition) ->
    });
    let mut out = String::new();
    cmark(doc, &mut out, None).ok();
-    Some(out)
+    out
 }
 #[derive(PartialEq, Eq, Hash, Copy, Clone, Debug)]
@@ -665,7 +622,7 @@ fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
    fn priority(n: &SyntaxToken) -> usize {
        match n.kind() {
            IDENT | INT_NUMBER => 3,
-            L_PAREN | R_PAREN => 2,
+            T!['('] | T![')'] => 2,
            kind if kind.is_trivia() => 0,
            _ => 1,
        }
@@ -674,64 +631,38 @@ fn pick_best(tokens: TokenAtOffset<SyntaxToken>) -> Option<SyntaxToken> {
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use expect::{expect, Expect};
-    use insta::assert_debug_snapshot;
    use ra_db::FileLoader;
-    use ra_syntax::TextRange;
    use crate::mock_analysis::analysis_and_position;
-    fn trim_markup(s: &str) -> String {
+    use super::*;
-        s.trim()
-            .replace("````", "```")
-            .replace("---", "___")
-            .replace("\\<-", "<-")
-            .replace("```\n\n___", "```\n___")
-            .trim_start_matches("```rust\n")
-            .trim_start_matches("test\n```\n\n```rust\n")
-            .trim_end_matches("\n```")
-            .to_string()
-    }
-    fn trim_markup_opt(s: Option<&str>) -> Option<String> {
-        s.map(trim_markup)
-    }
-    fn assert_impl_action(action: &HoverAction, position: u32) {
+    fn check_hover_no_result(ra_fixture: &str) {
-        let offset = match action {
+        let (analysis, position) = analysis_and_position(ra_fixture);
-            HoverAction::Implementaion(pos) => pos.offset,
+        assert!(analysis.hover(position).unwrap().is_none());
-            it => panic!("Unexpected hover action: {:#?}", it),
-        };
-        assert_eq!(offset, position.into());
    }
-    fn check_hover_result(fixture: &str, expected: &[&str]) -> (String, Vec<HoverAction>) {
+    fn check(ra_fixture: &str, expect: Expect) {
-        let (analysis, position) = analysis_and_position(fixture);
+        let (analysis, position) = analysis_and_position(ra_fixture);
        let hover = analysis.hover(position).unwrap().unwrap();
-        let mut results = Vec::from(hover.info.results());
-        results.sort();
-        for (markup, expected) in
-            results.iter().zip(expected.iter().chain(std::iter::repeat(&"<missing>")))
-        {
-            assert_eq!(trim_markup(&markup), *expected);
-        }
-        assert_eq!(hover.info.len(), expected.len());
        let content = analysis.db.file_text(position.file_id);
-        (content[hover.range].to_string(), hover.info.actions().to_vec())
+        let hovered_element = &content[hover.range];
+        let actual = format!("*{}*\n{}\n", hovered_element, hover.info.markup);
+        expect.assert_eq(&actual)
    }
-    fn check_hover_no_result(fixture: &str) {
+    fn check_actions(ra_fixture: &str, expect: Expect) {
-        let (analysis, position) = analysis_and_position(fixture);
+        let (analysis, position) = analysis_and_position(ra_fixture);
-        assert!(analysis.hover(position).unwrap().is_none());
+        let hover = analysis.hover(position).unwrap().unwrap();
+        expect.assert_debug_eq(&hover.info.actions)
    }
    #[test]
    fn hover_shows_type_of_an_expression() {
-        let (analysis, position) = analysis_and_position(
+        check(
            r#"
 pub fn foo() -> u32 { 1 }
@@ -739,606 +670,643 @@ fn main() {
    let foo_test = foo()<|>;
 }
 "#,
+            expect![[r#"
+                *foo()*
+                ```rust
+                u32
+                ```
+            "#]],
        );
-        let hover = analysis.hover(position).unwrap().unwrap();
-        assert_eq!(hover.range, TextRange::new(58.into(), 63.into()));
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("u32"));
    }
    #[test]
    fn hover_shows_long_type_of_an_expression() {
-        check_hover_result(
+        check(
            r#"
-            //- /main.rs
+struct Scan<A, B, C> { a: A, b: B, c: C }
-            struct Scan<A, B, C> {
+struct Iter<I> { inner: I }
-                a: A,
+enum Option<T> { Some(T), None }
-                b: B,
-                c: C,
-            }
-            struct FakeIter<I> {
+struct OtherStruct<T> { i: T }
-                inner: I,
-            }
-            struct OtherStruct<T> {
-                i: T,
-            }
-            enum FakeOption<T> {
+fn scan<A, B, C>(a: A, b: B, c: C) -> Iter<Scan<OtherStruct<A>, B, C>> {
-                Some(T),
+    Iter { inner: Scan { a, b, c } }
-                None,
+}
-            }
-            fn scan<A, B, C>(a: A, b: B, c: C) -> FakeIter<Scan<OtherStruct<A>, B, C>> {
-                FakeIter { inner: Scan { a, b, c } }
-            }
-            fn main() {
+fn main() {
-                let num: i32 = 55;
+    let num: i32 = 55;
-                let closure = |memo: &mut u32, value: &u32, _another: &mut u32| -> FakeOption<u32> {
+    let closure = |memo: &mut u32, value: &u32, _another: &mut u32| -> Option<u32> {
-                    FakeOption::Some(*memo + value)
+        Option::Some(*memo + value)
-                };
+    };
-                let number = 5u32;
+    let number = 5u32;
-                let mut iter<|> = scan(OtherStruct { i: num }, closure, number);
+    let mut iter<|> = scan(OtherStruct { i: num }, closure, number);
-            }
+}
-            "#,
+"#,
-            &["FakeIter<Scan<OtherStruct<OtherStruct<i32>>, |&mut u32, &u32, &mut u32| -> FakeOption<u32>, u32>>"],
+            expect![[r#"
+                *iter*
+                ```rust
+                Iter<Scan<OtherStruct<OtherStruct<i32>>, |&mut u32, &u32, &mut u32| -> Option<u32>, u32>>
+                ```
+            "#]],
        );
    }
    #[test]
    fn hover_shows_fn_signature() {
        // Single file with result
-        check_hover_result(
+        check(
            r#"
-            //- /main.rs
+pub fn foo() -> u32 { 1 }
-            pub fn foo() -> u32 { 1 }
-            fn main() {
+fn main() { let foo_test = fo<|>o(); }
-                let foo_test = fo<|>o();
+"#,
-            }
+            expect![[r#"
-        "#,
+                *foo*
-            &["pub fn foo() -> u32"],
+                ```rust
+                pub fn foo() -> u32
+                ```
+            "#]],
        );
        // Multiple candidates but results are ambiguous.
-        check_hover_result(
+        check(
            r#"
-            //- /a.rs
+//- /a.rs
-            pub fn foo() -> u32 { 1 }
+pub fn foo() -> u32 { 1 }
-            //- /b.rs
+//- /b.rs
-            pub fn foo() -> &str { "" }
+pub fn foo() -> &str { "" }
-            //- /c.rs
+//- /c.rs
-            pub fn foo(a: u32, b: u32) {}
+pub fn foo(a: u32, b: u32) {}
-            //- /main.rs
+//- /main.rs
-            mod a;
+mod a;
-            mod b;
+mod b;
-            mod c;
+mod c;
-            fn main() {
+fn main() { let foo_test = fo<|>o(); }
-                let foo_test = fo<|>o();
-            }
        "#,
-            &["{unknown}"],
+            expect![[r#"
+                *foo*
+                ```rust
+                {unknown}
+                ```
+            "#]],
        );
    }
    #[test]
    fn hover_shows_fn_signature_with_type_params() {
-        check_hover_result(
+        check(
            r#"
-            //- /main.rs
+pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str { }
-            pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str { }
-            fn main() {
+fn main() { let foo_test = fo<|>o(); }
-                let foo_test = fo<|>o();
-            }
        "#,
-            &["pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str"],
+            expect![[r#"
+                *foo*
+                ```rust
+                pub fn foo<'a, T: AsRef<str>>(b: &'a T) -> &'a str
+                ```
+            "#]],
        );
    }
    #[test]
    fn hover_shows_fn_signature_on_fn_name() {
-        check_hover_result(
+        check(
            r#"
-            //- /main.rs
+pub fn foo<|>(a: u32, b: u32) -> u32 {}
-            pub fn foo<|>(a: u32, b: u32) -> u32 {}
-            fn main() {
+fn main() { }
-            }
+"#,
-        "#,
+            expect![[r#"
-            &["pub fn foo(a: u32, b: u32) -> u32"],
+                *foo*
+                ```rust
+                pub fn foo(a: u32, b: u32) -> u32
+                ```
+            "#]],
        );
    }
    #[test]
    fn hover_shows_struct_field_info() {
        // Hovering over the field when instantiating
-        check_hover_result(
+        check(
            r#"
-            //- /main.rs
+struct Foo { field_a: u32 }
-            struct Foo {
-                field_a: u32,
-            }
-            fn main() {
+fn main() {
-                let foo = Foo {
+    let foo = Foo { field_a<|>: 0, };
-                    field_a<|>: 0,
+}
-                };
+"#,
-            }
+            expect![[r#"
-        "#,
+                *field_a*
-            &["test::Foo\n```\n\n```rust\nfield_a: u32"],
+                ```rust
+                Foo
+                ```
+                ```rust
+                field_a: u32
+                ```
+            "#]],
        );
        // Hovering over the field in the definition
-        check_hover_result(
+        check(
            r#"
-            //- /main.rs
+struct Foo { field_a<|>: u32 }
-            struct Foo {
-                field_a<|>: u32,
-            }
-            fn main() {
+fn main() {
-                let foo = Foo {
+    let foo = Foo { field_a: 0 };
-                    field_a: 0,
+}
-                };
+"#,
-            }
+            expect![[r#"
-        "#,
+                *field_a*
-            &["test::Foo\n```\n\n```rust\nfield_a: u32"],
+                ```rust
+                Foo
+                ```
+                ```rust
+                field_a: u32
+                ```
+            "#]],
        );
    }
    #[test]
    fn hover_const_static() {
-        check_hover_result(
+        check(
-            r#"
+            r#"const foo<|>: u32 = 0;"#,
-            //- /main.rs
+            expect![[r#"
-            const foo<|>: u32 = 0;
+                *foo*
-        "#,
+                ```rust
-            &["const foo: u32"],
+                const foo: u32
+                ```
+            "#]],
        );
+        check(
-        check_hover_result(
+            r#"static foo<|>: u32 = 0;"#,
-            r#"
+            expect![[r#"
-            //- /main.rs
+                *foo*
-            static foo<|>: u32 = 0;
+                ```rust
-        "#,
+                static foo: u32
-            &["static foo: u32"],
+                ```
+            "#]],
        );
    }
    #[test]
    fn hover_default_generic_types() {
-        check_hover_result(
+        check(
            r#"
-//- /main.rs
+struct Test<K, T = u8> { k: K, t: T }
-struct Test<K, T = u8> {
-    k: K,
-    t: T,
-}
 fn main() {
    let zz<|> = Test { t: 23u8, k: 33 };
 }"#,
-            &["Test<i32, u8>"],
+            expect![[r#"
+                *zz*
+                ```rust
+                Test<i32, u8>
+                ```
+            "#]],
        );
    }
    #[test]
    fn hover_some() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"
-            enum Option<T> { Some(T) }
+enum Option<T> { Some(T) }
-            use Option::Some;
+use Option::Some;
-            fn main() {
+fn main() { So<|>me(12); }
-                So<|>me(12);
+"#,
-            }
+            expect![[r#"
-            ",
+                *Some*
-        );
+                ```rust
-        let hover = analysis.hover(position).unwrap().unwrap();
+                Option
-        assert_eq!(
+                ```
-            trim_markup_opt(hover.info.first()).as_deref(),
-            Some("test::Option\n```\n\n```rust\nSome")
+                ```rust
+                Some
+                ```
+            "#]],
        );
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"
-            enum Option<T> { Some(T) }
+enum Option<T> { Some(T) }
-            use Option::Some;
+use Option::Some;
-            fn main() {
+fn main() { let b<|>ar = Some(12); }
-                let b<|>ar = Some(12);
+"#,
-            }
+            expect![[r#"
-            ",
+                *bar*
+                ```rust
+                Option<i32>
+                ```
+            "#]],
        );
-        let hover = analysis.hover(position).unwrap().unwrap();
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("Option<i32>"));
    }
    #[test]
    fn hover_enum_variant() {
-        check_hover_result(
+        check(
            r#"
-            //- /main.rs
+enum Option<T> {
-            enum Option<T> {
+    /// The None variant
-                /// The None variant
+    Non<|>e
-                Non<|>e
+}
-            }
+"#,
-        "#,
+            expect![[r#"
-            &["
+                *None*
-test::Option
+                ```rust
-```
+                Option
+                ```
-```rust
+                ```rust
-None
+                None
-```
+                ```
-___
+                ___
-The None variant
+                The None variant
-            "
+            "#]],
-            .trim()],
        );
-        check_hover_result(
+        check(
            r#"
-            //- /main.rs
+enum Option<T> {
-            enum Option<T> {
+    /// The Some variant
-                /// The Some variant
+    Some(T)
-                Some(T)
+}
-            }
+fn main() {
-            fn main() {
+    let s = Option::Som<|>e(12);
-                let s = Option::Som<|>e(12);
+}
-            }
+"#,
-        "#,
+            expect![[r#"
-            &["
+                *Some*
-test::Option
+                ```rust
-```
+                Option
+                ```
-```rust
+                ```rust
-Some
+                Some
-```
+                ```
-___
+                ___
-The Some variant
+                The Some variant
-            "
+            "#]],
-            .trim()],
        );
    }
    #[test]
    fn hover_for_local_variable() {
-        let (analysis, position) = analysis_and_position("fn func(foo: i32) { fo<|>o; }");
+        check(
-        let hover = analysis.hover(position).unwrap().unwrap();
+            r#"fn func(foo: i32) { fo<|>o; }"#,
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("i32"));
+            expect![[r#"
+                *foo*
+                ```rust
+                i32
+                ```
+            "#]],
+        )
    }
    #[test]
    fn hover_for_local_variable_pat() {
-        let (analysis, position) = analysis_and_position("fn func(fo<|>o: i32) {}");
+        check(
-        let hover = analysis.hover(position).unwrap().unwrap();
+            r#"fn func(fo<|>o: i32) {}"#,
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("i32"));
+            expect![[r#"
+                *foo*
+                ```rust
+                i32
+                ```
+            "#]],
+        )
    }
    #[test]
    fn hover_local_var_edge() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"fn func(foo: i32) { if true { <|>foo; }; }"#,
-fn func(foo: i32) { if true { <|>foo; }; }
+            expect![[r#"
-",
+                *foo*
-        );
+                ```rust
-        let hover = analysis.hover(position).unwrap().unwrap();
+                i32
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("i32"));
+                ```
+            "#]],
+        )
    }
    #[test]
    fn hover_for_param_edge() {
-        let (analysis, position) = analysis_and_position("fn func(<|>foo: i32) {}");
+        check(
-        let hover = analysis.hover(position).unwrap().unwrap();
+            r#"fn func(<|>foo: i32) {}"#,
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("i32"));
+            expect![[r#"
+                *foo*
+                ```rust
+                i32
+                ```
+            "#]],
+        )
    }
    #[test]
    fn test_hover_infer_associated_method_result() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"
-            struct Thing { x: u32 }
+struct Thing { x: u32 }
-            impl Thing {
+impl Thing {
-                fn new() -> Thing {
+    fn new() -> Thing { Thing { x: 0 } }
-                    Thing { x: 0 }
+}
-                }
-            }
-            fn main() {
+fn main() { let foo_<|>test = Thing::new(); }
-                let foo_<|>test = Thing::new();
+            "#,
-            }
+            expect![[r#"
-            ",
+                *foo_test*
-        );
+                ```rust
-        let hover = analysis.hover(position).unwrap().unwrap();
+                Thing
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("Thing"));
+                ```
+            "#]],
+        )
    }
    #[test]
    fn test_hover_infer_associated_method_exact() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"
-            mod wrapper {
+mod wrapper {
-                struct Thing { x: u32 }
+    struct Thing { x: u32 }
-                impl Thing {
+    impl Thing {
-                    fn new() -> Thing {
+        fn new() -> Thing { Thing { x: 0 } }
-                        Thing { x: 0 }
+    }
-                    }
+}
-                }
-            }
-            fn main() {
+fn main() { let foo_test = wrapper::Thing::new<|>(); }
-                let foo_test = wrapper::Thing::new<|>();
+"#,
-            }
+            expect![[r#"
-            ",
+                *new*
-        );
+                ```rust
-        let hover = analysis.hover(position).unwrap().unwrap();
+                wrapper::Thing
-        assert_eq!(
+                ```
-            trim_markup_opt(hover.info.first()).as_deref(),
-            Some("test::wrapper::Thing\n```\n\n```rust\nfn new() -> Thing")
+                ```rust
-        );
+                fn new() -> Thing
+                ```
+            "#]],
+        )
    }
    #[test]
    fn test_hover_infer_associated_const_in_pattern() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"
-            struct X;
+struct X;
-            impl X {
+impl X {
-                const C: u32 = 1;
+    const C: u32 = 1;
-            }
+}
-            fn main() {
+fn main() {
-                match 1 {
+    match 1 {
-                    X::C<|> => {},
+        X::C<|> => {},
-                    2 => {},
+        2 => {},
-                    _ => {}
+        _ => {}
-                };
+    };
-            }
+}
-            ",
+"#,
-        );
+            expect![[r#"
-        let hover = analysis.hover(position).unwrap().unwrap();
+                *C*
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("const C: u32"));
+                ```rust
+                const C: u32
+                ```
+            "#]],
+        )
    }
    #[test]
    fn test_hover_self() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"
-            struct Thing { x: u32 }
+struct Thing { x: u32 }
-            impl Thing {
+impl Thing {
-                fn new() -> Self {
+    fn new() -> Self { Self<|> { x: 0 } }
-                    Self<|> { x: 0 }
+}
-                }
+"#,
-            }
+            expect![[r#"
-        ",
+                *Self { x: 0 }*
-        );
+                ```rust
-        let hover = analysis.hover(position).unwrap().unwrap();
+                Thing
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("Thing"));
+                ```
+            "#]],
-        /* FIXME: revive these tests
+        )
-                let (analysis, position) = analysis_and_position(
+    } /* FIXME: revive these tests
-                    "
+              let (analysis, position) = analysis_and_position(
-                    struct Thing { x: u32 }
+                  "
-                    impl Thing {
+                  struct Thing { x: u32 }
-                        fn new() -> Self<|> {
+                  impl Thing {
-                            Self { x: 0 }
+                      fn new() -> Self<|> {
-                        }
+                          Self { x: 0 }
-                    }
+                      }
-                    ",
+                  }
-                );
+                  ",
+              );
-                let hover = analysis.hover(position).unwrap().unwrap();
-                assert_eq!(trim_markup_opt(hover.info.first()), Some("Thing"));
+              let hover = analysis.hover(position).unwrap().unwrap();
+              assert_eq!(trim_markup(&hover.info.markup.as_str()), ("Thing"));
-                let (analysis, position) = analysis_and_position(
-                    "
+              let (analysis, position) = analysis_and_position(
-                    enum Thing { A }
+                  "
-                    impl Thing {
+                  enum Thing { A }
-                        pub fn new() -> Self<|> {
+                  impl Thing {
-                            Thing::A
+                      pub fn new() -> Self<|> {
-                        }
+                          Thing::A
-                    }
+                      }
-                    ",
+                  }
-                );
+                  ",
-                let hover = analysis.hover(position).unwrap().unwrap();
+              );
-                assert_eq!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
+              let hover = analysis.hover(position).unwrap().unwrap();
+              assert_eq!(trim_markup(&hover.info.markup.as_str()), ("enum Thing"));
-                let (analysis, position) = analysis_and_position(
-                    "
+              let (analysis, position) = analysis_and_position(
-                    enum Thing { A }
+                  "
-                    impl Thing {
+                  enum Thing { A }
-                        pub fn thing(a: Self<|>) {
+                  impl Thing {
-                        }
+                      pub fn thing(a: Self<|>) {
-                    }
+                      }
-                    ",
+                  }
-                );
+                  ",
-                let hover = analysis.hover(position).unwrap().unwrap();
+              );
-                assert_eq!(trim_markup_opt(hover.info.first()), Some("enum Thing"));
+              let hover = analysis.hover(position).unwrap().unwrap();
-        */
+              assert_eq!(trim_markup(&hover.info.markup.as_str()), ("enum Thing"));
-    }
+      */
    #[test]
    fn test_hover_shadowing_pat() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"
-            fn x() {}
+fn x() {}
-            fn y() {
+fn y() {
-                let x = 0i32;
+    let x = 0i32;
-                x<|>;
+    x<|>;
-            }
+}
-            ",
+"#,
-        );
+            expect![[r#"
-        let hover = analysis.hover(position).unwrap().unwrap();
+                *x*
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("i32"));
+                ```rust
+                i32
+                ```
+            "#]],
+        )
    }
    #[test]
    fn test_hover_macro_invocation() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"
-            macro_rules! foo {
+macro_rules! foo { () => {} }
-                () => {}
-            }
-            fn f() {
+fn f() { fo<|>o!(); }
-                fo<|>o!();
+"#,
-            }
+            expect![[r#"
-            ",
+                *foo*
-        );
+                ```rust
-        let hover = analysis.hover(position).unwrap().unwrap();
+                macro_rules! foo
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("macro_rules! foo"));
+                ```
+            "#]],
+        )
    }
    #[test]
    fn test_hover_tuple_field() {
-        let (analysis, position) = analysis_and_position(
+        check(
-            "
+            r#"struct TS(String, i32<|>);"#,
-            struct TS(String, i32<|>);
+            expect![[r#"
-            ",
+                *i32*
-        );
+                i32
-        let hover = analysis.hover(position).unwrap().unwrap();
+            "#]],
-        assert_eq!(trim_markup_opt(hover.info.first()).as_deref(), Some("i32"));
+        )
    }
    #[test]
    fn test_hover_through_macro() {
-        let (hover_on, _) = check_hover_result(
+        check(
-            "
+            r#"
-            //- /lib.rs
+macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
-            macro_rules! id {
+fn foo() {}
-                ($($tt:tt)*) => { $($tt)* }
+id! {
-            }
+    fn bar() { fo<|>o(); }
-            fn foo() {}
+}
-            id! {
+"#,
-                fn bar() {
+            expect![[r#"
-                    fo<|>o();
+                *foo*
-                }
+                ```rust
-            }
+                fn foo()
-            ",
+                ```
-            &["fn foo()"],
+            "#]],
        );
-        assert_eq!(hover_on, "foo")
    }
    #[test]
    fn test_hover_through_expr_in_macro() {
-        let (hover_on, _) = check_hover_result(
+        check(
-            "
+            r#"
-            //- /lib.rs
+macro_rules! id { ($($tt:tt)*) => { $($tt)* } }
-            macro_rules! id {
+fn foo(bar:u32) { let a = id!(ba<|>r); }
-                ($($tt:tt)*) => { $($tt)* }
+"#,
-            }
+            expect![[r#"
-            fn foo(bar:u32) {
+                *bar*
-                let a = id!(ba<|>r);
+                ```rust
-            }
+                u32
-            ",
+                ```
-            &["u32"],
+            "#]],
        );
-        assert_eq!(hover_on, "bar")
    }
    #[test]
    fn test_hover_through_expr_in_macro_recursive() {
-        let (hover_on, _) = check_hover_result(
+        check(
-            "
+            r#"
-            //- /lib.rs
+macro_rules! id_deep { ($($tt:tt)*) => { $($tt)* } }
-            macro_rules! id_deep {
+macro_rules! id { ($($tt:tt)*) => { id_deep!($($tt)*) } }
-                ($($tt:tt)*) => { $($tt)* }
+fn foo(bar:u32) { let a = id!(ba<|>r); }
-            }
+"#,
-            macro_rules! id {
+            expect![[r#"
-                ($($tt:tt)*) => { id_deep!($($tt)*) }
+                *bar*
-            }
+                ```rust
-            fn foo(bar:u32) {
+                u32
-                let a = id!(ba<|>r);
+                ```
-            }
+            "#]],
-            ",
-            &["u32"],
        );
-        assert_eq!(hover_on, "bar")
    }
    #[test]
    fn test_hover_through_func_in_macro_recursive() {
-        let (hover_on, _) = check_hover_result(
+        check(
-            "
+            r#"
-            //- /lib.rs
+macro_rules! id_deep { ($($tt:tt)*) => { $($tt)* } }
-            macro_rules! id_deep {
+macro_rules! id { ($($tt:tt)*) => { id_deep!($($tt)*) } }
-                ($($tt:tt)*) => { $($tt)* }
+fn bar() -> u32 { 0 }
-            }
+fn foo() { let a = id!([0u32, bar(<|>)] ); }
-            macro_rules! id {
+"#,
-                ($($tt:tt)*) => { id_deep!($($tt)*) }
+            expect![[r#"
-            }
+                *bar()*
-            fn bar() -> u32 {
+                ```rust
-                0
+                u32
-            }
+                ```
-            fn foo() {
+            "#]],
-                let a = id!([0u32, bar(<|>)] );
-            }
-            ",
-            &["u32"],
        );
-        assert_eq!(hover_on, "bar()")
    }
    #[test]
    fn test_hover_through_literal_string_in_macro() {
-        let (hover_on, _) = check_hover_result(
+        check(
            r#"
-            //- /lib.rs
+macro_rules! arr { ($($tt:tt)*) => { [$($tt)*)] } }
-            macro_rules! arr {
+fn foo() {
-                ($($tt:tt)*) => { [$($tt)*)] }
+    let mastered_for_itunes = "";
-            }
+    let _ = arr!("Tr<|>acks", &mastered_for_itunes);
-            fn foo() {
+}
-                let mastered_for_itunes = "";
+"#,
-                let _ = arr!("Tr<|>acks", &mastered_for_itunes);
+            expect![[r#"
-            }
+                *"Tracks"*
-            "#,
+                ```rust
-            &["&str"],
+                &str
+                ```
+            "#]],
        );
-        assert_eq!(hover_on, "\"Tracks\"");
    }
    #[test]
    fn test_hover_through_assert_macro() {
-        let (hover_on, _) = check_hover_result(
+        check(
            r#"
-            //- /lib.rs
+#[rustc_builtin_macro]
-            #[rustc_builtin_macro]
+macro_rules! assert {}
-            macro_rules! assert {}
-            fn bar() -> bool { true }
+fn bar() -> bool { true }
-            fn foo() {
+fn foo() {
-                assert!(ba<|>r());
+    assert!(ba<|>r());
-            }
+}
-            "#,
+"#,
-            &["fn bar() -> bool"],
+            expect![[r#"
+                *bar*
+                ```rust
+                fn bar() -> bool
+                ```
+            "#]],
        );
-        assert_eq!(hover_on, "bar");
    }
    #[test]
    fn test_hover_through_literal_string_in_builtin_macro() {
        check_hover_no_result(
            r#"
-            //- /lib.rs
            #[rustc_builtin_macro]
            macro_rules! format {}
@@ -1351,122 +1319,159 @@ fn func(foo: i32) { if true { <|>foo; }; }
    #[test]
    fn test_hover_non_ascii_space_doc() {
-        check_hover_result(
+        check(
            "
-            //- /lib.rs
+///　<- `\u{3000}` here
-            ///　<- `\u{3000}` here
+fn foo() { }
-            fn foo() {
-            }
-            fn bar() {
+fn bar() { fo<|>o(); }
-                fo<|>o();
+",
-            }
+            expect![[r#"
-            ",
+                *foo*
-            &["fn foo()\n```\n___\n\n<- `\u{3000}` here"],
+                ```rust
+                fn foo()
+                ```
+                ___
+                <- `　` here
+            "#]],
        );
    }
    #[test]
    fn test_hover_function_show_qualifiers() {
-        check_hover_result(
+        check(
-            "
+            r#"async fn foo<|>() {}"#,
-            //- /lib.rs
+            expect![[r#"
-            async fn foo<|>() {}
+                *foo*
-            ",
+                ```rust
-            &["async fn foo()"],
+                async fn foo()
-        );
+                ```
-        check_hover_result(
+            "#]],
-            "
+        );
-            //- /lib.rs
+        check(
-            pub const unsafe fn foo<|>() {}
+            r#"pub const unsafe fn foo<|>() {}"#,
-            ",
+            expect![[r#"
-            &["pub const unsafe fn foo()"],
+                *foo*
-        );
+                ```rust
-        check_hover_result(
+                pub const unsafe fn foo()
-            r#"
+                ```
-            //- /lib.rs
+            "#]],
-            pub(crate) async unsafe extern "C" fn foo<|>() {}
+        );
-            "#,
+        check(
-            &[r#"pub(crate) async unsafe extern "C" fn foo()"#],
+            r#"pub(crate) async unsafe extern "C" fn foo<|>() {}"#,
+            expect![[r#"
+                *foo*
+                ```rust
+                pub(crate) async unsafe extern "C" fn foo()
+                ```
+            "#]],
        );
    }
    #[test]
    fn test_hover_trait_show_qualifiers() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r"unsafe trait foo<|>() {}",
-            //- /lib.rs
+            expect![[r#"
-            unsafe trait foo<|>() {}
+                [
-            ",
+                    Implementaion(
-            &["unsafe trait foo"],
+                        FilePosition {
+                            file_id: FileId(
+                                1,
+                            ),
+                            offset: 13,
+                        },
+                    ),
+                ]
+            "#]],
        );
-        assert_impl_action(&actions[0], 13);
    }
    #[test]
    fn test_hover_mod_with_same_name_as_function() {
-        check_hover_result(
+        check(
-            "
+            r#"
-            //- /lib.rs
+use self::m<|>y::Bar;
-            use self::m<|>y::Bar;
+mod my { pub struct Bar; }
-            mod my {
-                pub struct Bar;
-            }
-            fn my() {}
+fn my() {}
-            ",
+"#,
-            &["mod my"],
+            expect![[r#"
+                *my*
+                ```rust
+                mod my
+                ```
+            "#]],
        );
    }
    #[test]
    fn test_hover_struct_doc_comment() {
-        check_hover_result(
+        check(
            r#"
-            //- /lib.rs
+/// bar docs
-            /// bar docs
+struct Bar;
-            struct Bar;
-            fn foo() {
+fn foo() { let bar = Ba<|>r; }
-                let bar = Ba<|>r;
+"#,
-            }
+            expect![[r#"
-            "#,
+                *Bar*
-            &["struct Bar\n```\n___\n\nbar docs"],
+                ```rust
+                struct Bar
+                ```
+                ___
+                bar docs
+            "#]],
        );
    }
    #[test]
    fn test_hover_struct_doc_attr() {
-        check_hover_result(
+        check(
            r#"
-            //- /lib.rs
+#[doc = "bar docs"]
-            #[doc = "bar docs"]
+struct Bar;
-            struct Bar;
-            fn foo() {
+fn foo() { let bar = Ba<|>r; }
-                let bar = Ba<|>r;
+"#,
-            }
+            expect![[r#"
-            "#,
+                *Bar*
-            &["struct Bar\n```\n___\n\nbar docs"],
+                ```rust
+                struct Bar
+                ```
+                ___
+                bar docs
+            "#]],
        );
    }
    #[test]
    fn test_hover_struct_doc_attr_multiple_and_mixed() {
-        check_hover_result(
+        check(
            r#"
-            //- /lib.rs
+/// bar docs 0
-            /// bar docs 0
+#[doc = "bar docs 1"]
-            #[doc = "bar docs 1"]
+#[doc = "bar docs 2"]
-            #[doc = "bar docs 2"]
+struct Bar;
-            struct Bar;
-            fn foo() {
+fn foo() { let bar = Ba<|>r; }
-                let bar = Ba<|>r;
+"#,
-            }
+            expect![[r#"
-            "#,
+                *Bar*
-            &["struct Bar\n```\n___\n\nbar docs 0\n\nbar docs 1\n\nbar docs 2"],
+                ```rust
+                struct Bar
+                ```
+                ___
+                bar docs 0
+                bar docs 1
+                bar docs 2
+            "#]],
        );
    }
@@ -1623,27 +1628,35 @@ fn func(foo: i32) { if true { <|>foo; }; }
    fn test_hover_macro_generated_struct_fn_doc_comment() {
        mark::check!(hover_macro_generated_struct_fn_doc_comment);
-        check_hover_result(
+        check(
            r#"
-            //- /lib.rs
+macro_rules! bar {
-            macro_rules! bar {
+    () => {
-                () => {
+        struct Bar;
-                    struct Bar;
+        impl Bar {
-                    impl Bar {
+            /// Do the foo
-                        /// Do the foo
+            fn foo(&self) {}
-                        fn foo(&self) {}
+        }
-                    }
+    }
-                }
+}
-            }
-            bar!();
+bar!();
-            fn foo() {
+fn foo() { let bar = Bar; bar.fo<|>o(); }
-                let bar = Bar;
+"#,
-                bar.fo<|>o();
+            expect![[r#"
-            }
+                *foo*
-            "#,
+                ```rust
-            &["test::Bar\n```\n\n```rust\nfn foo(&self)\n```\n___\n\nDo the foo"],
+                Bar
+                ```
+                ```rust
+                fn foo(&self)
+                ```
+                ___
+                 Do the foo
+            "#]],
        );
    }
@@ -1651,1204 +1664,1155 @@ fn func(foo: i32) { if true { <|>foo; }; }
    fn test_hover_macro_generated_struct_fn_doc_attr() {
        mark::check!(hover_macro_generated_struct_fn_doc_attr);
-        check_hover_result(
+        check(
            r#"
-            //- /lib.rs
+macro_rules! bar {
-            macro_rules! bar {
+    () => {
-                () => {
+        struct Bar;
-                    struct Bar;
+        impl Bar {
-                    impl Bar {
+            #[doc = "Do the foo"]
-                        #[doc = "Do the foo"]
+            fn foo(&self) {}
-                        fn foo(&self) {}
+        }
-                    }
+    }
-                }
+}
-            }
-            bar!();
+bar!();
-            fn foo() {
+fn foo() { let bar = Bar; bar.fo<|>o(); }
-                let bar = Bar;
+"#,
-                bar.fo<|>o();
+            expect![[r#"
-            }
+                *foo*
-            "#,
+                ```rust
-            &["test::Bar\n```\n\n```rust\nfn foo(&self)\n```\n___\n\nDo the foo"],
+                Bar
+                ```
+                ```rust
+                fn foo(&self)
+                ```
+                ___
+                Do the foo
+            "#]],
        );
    }
    #[test]
    fn test_hover_trait_has_impl_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"trait foo<|>() {}"#,
-            //- /lib.rs
+            expect![[r#"
-            trait foo<|>() {}
+                [
-            ",
+                    Implementaion(
-            &["trait foo"],
+                        FilePosition {
+                            file_id: FileId(
+                                1,
+                            ),
+                            offset: 6,
+                        },
+                    ),
+                ]
+            "#]],
        );
-        assert_impl_action(&actions[0], 6);
    }
    #[test]
    fn test_hover_struct_has_impl_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r"struct foo<|>() {}",
-            //- /lib.rs
+            expect![[r#"
-            struct foo<|>() {}
+                [
-            ",
+                    Implementaion(
-            &["struct foo"],
+                        FilePosition {
+                            file_id: FileId(
+                                1,
+                            ),
+                            offset: 7,
+                        },
+                    ),
+                ]
+            "#]],
        );
-        assert_impl_action(&actions[0], 7);
    }
    #[test]
    fn test_hover_union_has_impl_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"union foo<|>() {}"#,
-            //- /lib.rs
+            expect![[r#"
-            union foo<|>() {}
+                [
-            ",
+                    Implementaion(
-            &["union foo"],
+                        FilePosition {
+                            file_id: FileId(
+                                1,
+                            ),
+                            offset: 6,
+                        },
+                    ),
+                ]
+            "#]],
        );
-        assert_impl_action(&actions[0], 6);
    }
    #[test]
    fn test_hover_enum_has_impl_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r"enum foo<|>() { A, B }",
-            //- /lib.rs
+            expect![[r#"
-            enum foo<|>() {
+                [
-                A,
+                    Implementaion(
-                B
+                        FilePosition {
-            }
+                            file_id: FileId(
-            ",
+                                1,
-            &["enum foo"],
+                            ),
+                            offset: 5,
+                        },
+                    ),
+                ]
+            "#]],
        );
-        assert_impl_action(&actions[0], 5);
    }
    #[test]
    fn test_hover_test_has_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /lib.rs
+#[test]
-            #[test]
+fn foo_<|>test() {}
-            fn foo_<|>test() {}
+"#,
-            ",
+            expect![[r#"
-            &["fn foo_test()"],
+                [
-        );
+                    Runnable(
-        assert_debug_snapshot!(actions,
+                        Runnable {
-            @r###"
+                            nav: NavigationTarget {
-            [
+                                file_id: FileId(
-                Runnable(
+                                    1,
-                    Runnable {
+                                ),
-                        nav: NavigationTarget {
+                                full_range: 0..24,
-                            file_id: FileId(
+                                focus_range: Some(
-                                1,
+                                    11..19,
-                            ),
+                                ),
-                            full_range: 0..24,
+                                name: "foo_test",
-                            name: "foo_test",
+                                kind: FN,
-                            kind: FN_DEF,
+                                container_name: None,
-                            focus_range: Some(
+                                description: None,
-                                11..19,
+                                docs: None,
-                            ),
+                            },
-                            container_name: None,
+                            kind: Test {
-                            description: None,
+                                test_id: Path(
-                            docs: None,
+                                    "foo_test",
-                        },
+                                ),
-                        kind: Test {
+                                attr: TestAttr {
-                            test_id: Path(
+                                    ignore: false,
-                                "foo_test",
+                                },
-                            ),
-                            attr: TestAttr {
-                                ignore: false,
                            },
+                            cfg_exprs: [],
                        },
-                        cfg_exprs: [],
+                    ),
-                    },
+                ]
-                ),
+            "#]],
-            ]
+        );
-            "###);
    }
    #[test]
    fn test_hover_test_mod_has_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /lib.rs
+mod tests<|> {
-            mod tests<|> {
+    #[test]
-                #[test]
+    fn foo_test() {}
-                fn foo_test() {}
+}
-            }
+"#,
-            ",
+            expect![[r#"
-            &["mod tests"],
+                [
-        );
+                    Runnable(
-        assert_debug_snapshot!(actions,
+                        Runnable {
-            @r###"
+                            nav: NavigationTarget {
-            [
+                                file_id: FileId(
-                Runnable(
+                                    1,
-                    Runnable {
+                                ),
-                        nav: NavigationTarget {
+                                full_range: 0..46,
-                            file_id: FileId(
+                                focus_range: Some(
-                                1,
+                                    4..9,
-                            ),
+                                ),
-                            full_range: 0..46,
+                                name: "tests",
-                            name: "tests",
+                                kind: MODULE,
-                            kind: MODULE,
+                                container_name: None,
-                            focus_range: Some(
+                                description: None,
-                                4..9,
+                                docs: None,
-                            ),
+                            },
-                            container_name: None,
+                            kind: TestMod {
-                            description: None,
+                                path: "tests",
-                            docs: None,
+                            },
-                        },
+                            cfg_exprs: [],
-                        kind: TestMod {
-                            path: "tests",
                        },
-                        cfg_exprs: [],
+                    ),
-                    },
+                ]
-                ),
+            "#]],
-            ]
+        );
-            "###);
    }
    #[test]
    fn test_hover_struct_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+struct S{ f1: u32 }
-            struct S{ f1: u32 }
-            fn main() {
+fn main() { let s<|>t = S{ f1:0 }; }
-                let s<|>t = S{ f1:0 };
+            "#,
-            }
+            expect![[r#"
-            ",
-            &["S"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::S",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..19,
+                                        1,
-                            name: "S",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 0..19,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                7..8,
+                                        7..8,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_generic_struct_has_goto_type_actions() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+struct Arg(u32);
-            struct Arg(u32);
+struct S<T>{ f1: T }
-            struct S<T>{ f1: T }
-            fn main() {
+fn main() { let s<|>t = S{ f1:Arg(0) }; }
-                let s<|>t = S{ f1:Arg(0) };
+"#,
-            }
+            expect![[r#"
-            ",
-            &["S<Arg>"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::S",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 17..37,
+                                        1,
-                            name: "S",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 17..37,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                24..25,
+                                        24..25,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::Arg",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Arg",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..16,
+                                        1,
-                            name: "Arg",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 0..16,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                7..10,
+                                        7..10,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Arg",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct Arg",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct Arg",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_generic_struct_has_flattened_goto_type_actions() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+struct Arg(u32);
-            struct Arg(u32);
+struct S<T>{ f1: T }
-            struct S<T>{ f1: T }
-            fn main() {
+fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; }
-                let s<|>t = S{ f1: S{ f1: Arg(0) } };
+            "#,
-            }
+            expect![[r#"
-            ",
-            &["S<S<Arg>>"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::S",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 17..37,
+                                        1,
-                            name: "S",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 17..37,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                24..25,
+                                        24..25,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::Arg",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Arg",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..16,
+                                        1,
-                            name: "Arg",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 0..16,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                7..10,
+                                        7..10,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Arg",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct Arg",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct Arg",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_tuple_has_goto_type_actions() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+struct A(u32);
-            struct A(u32);
+struct B(u32);
-            struct B(u32);
+mod M {
-            mod M {
+    pub struct C(u32);
-                pub struct C(u32);
+}
-            }
-            fn main() {
+fn main() { let s<|>t = (A(1), B(2), M::C(3) ); }
-                let s<|>t = (A(1), B(2), M::C(3) );
+"#,
-            }
+            expect![[r#"
-            ",
-            &["(A, B, C)"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::A",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "A",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..14,
+                                        1,
-                            name: "A",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 0..14,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                7..8,
+                                        7..8,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "A",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct A",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct A",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::B",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "B",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 15..29,
+                                        1,
-                            name: "B",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 15..29,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                22..23,
+                                        22..23,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "B",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct B",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct B",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::M::C",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "M::C",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 42..60,
+                                        1,
-                            name: "C",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 42..60,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                53..54,
+                                        53..54,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "C",
-                            description: Some(
+                                    kind: STRUCT,
-                                "pub struct C",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "pub struct C",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_return_impl_trait_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+trait Foo {}
-            trait Foo {}
+fn foo() -> impl Foo {}
-            fn foo() -> impl Foo {}
-            fn main() {
+fn main() { let s<|>t = foo(); }
-                let s<|>t = foo();
+"#,
-            }
+            expect![[r#"
-            ",
-            &["impl Foo"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..12,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..12,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_generic_return_impl_trait_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+trait Foo<T> {}
-            trait Foo<T> {}
+struct S;
-            struct S;
+fn foo() -> impl Foo<S> {}
-            fn foo() -> impl Foo<S> {}
-            fn main() {
+fn main() { let s<|>t = foo(); }
-                let s<|>t = foo();
+"#,
-            }
+            expect![[r#"
-            ",
-            &["impl Foo<S>"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..15,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..15,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::S",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 16..25,
+                                        1,
-                            name: "S",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 16..25,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                23..24,
+                                        23..24,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_return_impl_traits_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+trait Foo {}
-            trait Foo {}
+trait Bar {}
-            trait Bar {}
+fn foo() -> impl Foo + Bar {}
-            fn foo() -> impl Foo + Bar {}
-            fn main() {
+fn main() { let s<|>t = foo(); }
-                let s<|>t = foo();
+            "#,
-            }
+            expect![[r#"
-            ",
-            &["impl Foo + Bar"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..12,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..12,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::Bar",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Bar",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 13..25,
+                                        1,
-                            name: "Bar",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 13..25,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                19..22,
+                                        19..22,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Bar",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Bar",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Bar",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_generic_return_impl_traits_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+trait Foo<T> {}
-            trait Foo<T> {}
+trait Bar<T> {}
-            trait Bar<T> {}
+struct S1 {}
-            struct S1 {}
+struct S2 {}
-            struct S2 {}
-            fn foo() -> impl Foo<S1> + Bar<S2> {}
+fn foo() -> impl Foo<S1> + Bar<S2> {}
-            fn main() {
+fn main() { let s<|>t = foo(); }
-                let s<|>t = foo();
+"#,
-            }
+            expect![[r#"
-            ",
-            &["impl Foo<S1> + Bar<S2>"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..15,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..15,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::Bar",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Bar",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 16..31,
+                                        1,
-                            name: "Bar",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 16..31,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                22..25,
+                                        22..25,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Bar",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Bar",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Bar",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::S1",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S1",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 32..44,
+                                        1,
-                            name: "S1",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 32..44,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                39..41,
+                                        39..41,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S1",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S1",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S1",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::S2",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S2",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 45..57,
+                                        1,
-                            name: "S2",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 45..57,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                52..54,
+                                        52..54,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S2",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S2",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S2",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_arg_impl_trait_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /lib.rs
+trait Foo {}
-            trait Foo {}
+fn foo(ar<|>g: &impl Foo) {}
-            fn foo(ar<|>g: &impl Foo) {}
+"#,
-            ",
+            expect![[r#"
-            &["&impl Foo"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..12,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..12,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_arg_impl_traits_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /lib.rs
+trait Foo {}
-            trait Foo {}
+trait Bar<T> {}
-            trait Bar<T> {}
+struct S{}
-            struct S{}
-            fn foo(ar<|>g: &impl Foo + Bar<S>) {}
+fn foo(ar<|>g: &impl Foo + Bar<S>) {}
-            ",
+"#,
-            &["&impl Foo + Bar<S>"],
+            expect![[r#"
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..12,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..12,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::Bar",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Bar",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 13..28,
+                                        1,
-                            name: "Bar",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 13..28,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                19..22,
+                                        19..22,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Bar",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Bar",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Bar",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::S",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 29..39,
+                                        1,
-                            name: "S",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 29..39,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                36..37,
+                                        36..37,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_arg_generic_impl_trait_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /lib.rs
+trait Foo<T> {}
-            trait Foo<T> {}
+struct S {}
-            struct S {}
+fn foo(ar<|>g: &impl Foo<S>) {}
-            fn foo(ar<|>g: &impl Foo<S>) {}
+"#,
-            ",
+            expect![[r#"
-            &["&impl Foo<S>"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..15,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..15,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::S",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 16..27,
+                                        1,
-                            name: "S",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 16..27,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                23..24,
+                                        23..24,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_dyn_return_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+trait Foo {}
-            trait Foo {}
+struct S;
-            struct S;
+impl Foo for S {}
-            impl Foo for S {}
-            struct B<T>{}
-            fn foo() -> B<dyn Foo> {}
+struct B<T>{}
+fn foo() -> B<dyn Foo> {}
-            fn main() {
+fn main() { let s<|>t = foo(); }
-                let s<|>t = foo();
+"#,
-            }
+            expect![[r#"
-            ",
-            &["B<dyn Foo>"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::B",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "B",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 42..55,
+                                        1,
-                            name: "B",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 42..55,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                49..50,
+                                        49..50,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "B",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct B",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct B",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::Foo",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..12,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..12,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_dyn_arg_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /lib.rs
+trait Foo {}
-            trait Foo {}
+fn foo(ar<|>g: &dyn Foo) {}
-            fn foo(ar<|>g: &dyn Foo) {}
+"#,
-            ",
+            expect![[r#"
-            &["&dyn Foo"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..12,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..12,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_generic_dyn_arg_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /lib.rs
+trait Foo<T> {}
-            trait Foo<T> {}
+struct S {}
-            struct S {}
+fn foo(ar<|>g: &dyn Foo<S>) {}
-            fn foo(ar<|>g: &dyn Foo<S>) {}
+"#,
-            ",
+            expect![[r#"
-            &["&dyn Foo<S>"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..15,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..15,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::S",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 16..27,
+                                        1,
-                            name: "S",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 16..27,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                23..24,
+                                        23..24,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_goto_type_action_links_order() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /lib.rs
+trait ImplTrait<T> {}
-            trait ImplTrait<T> {}
+trait DynTrait<T> {}
-            trait DynTrait<T> {}
+struct B<T> {}
-            struct B<T> {}
+struct S {}
-            struct S {}
-            fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
+fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {}
-            ",
+            "#,
-            &["&impl ImplTrait<B<dyn DynTrait<B<S>>>>"],
+            expect![[r#"
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::ImplTrait",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "ImplTrait",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..21,
+                                        1,
-                            name: "ImplTrait",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..21,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..15,
+                                        6..15,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "ImplTrait",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait ImplTrait",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait ImplTrait",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::B",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "B",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 43..57,
+                                        1,
-                            name: "B",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 43..57,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                50..51,
+                                        50..51,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "B",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct B",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct B",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::DynTrait",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "DynTrait",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 22..42,
+                                        1,
-                            name: "DynTrait",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 22..42,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                28..36,
+                                        28..36,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "DynTrait",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait DynTrait",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait DynTrait",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                    HoverGotoTypeData {
+                                },
-                        mod_path: "test::S",
+                            },
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "S",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 58..69,
+                                        1,
-                            name: "S",
+                                    ),
-                            kind: STRUCT_DEF,
+                                    full_range: 58..69,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                65..66,
+                                        65..66,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "S",
-                            description: Some(
+                                    kind: STRUCT,
-                                "struct S",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "struct S",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
    #[test]
    fn test_hover_associated_type_has_goto_type_action() {
-        let (_, actions) = check_hover_result(
+        check_actions(
-            "
+            r#"
-            //- /main.rs
+trait Foo {
-            trait Foo {
+    type Item;
-                type Item;
+    fn get(self) -> Self::Item {}
-                fn get(self) -> Self::Item {}
+}
-            }
-            struct Bar{}
+struct Bar{}
-            struct S{}
+struct S{}
-            impl Foo for S{
+impl Foo for S { type Item = Bar; }
-                type Item = Bar;
-            }
-            fn test() -> impl Foo {
+fn test() -> impl Foo { S {} }
-                S{}
-            }
-            fn main() {
+fn main() { let s<|>t = test().get(); }
-                let s<|>t = test().get();
+"#,
-            }
+            expect![[r#"
-            ",
-            &["Foo::Item<impl Foo>"],
-        );
-        assert_debug_snapshot!(actions,
-            @r###"
-        [
-            GoToType(
                [
-                    HoverGotoTypeData {
+                    GoToType(
-                        mod_path: "test::Foo",
+                        [
-                        nav: NavigationTarget {
+                            HoverGotoTypeData {
-                            file_id: FileId(
+                                mod_path: "Foo",
-                                1,
+                                nav: NavigationTarget {
-                            ),
+                                    file_id: FileId(
-                            full_range: 0..62,
+                                        1,
-                            name: "Foo",
+                                    ),
-                            kind: TRAIT_DEF,
+                                    full_range: 0..62,
-                            focus_range: Some(
+                                    focus_range: Some(
-                                6..9,
+                                        6..9,
-                            ),
+                                    ),
-                            container_name: None,
+                                    name: "Foo",
-                            description: Some(
+                                    kind: TRAIT,
-                                "trait Foo",
+                                    container_name: None,
-                            ),
+                                    description: Some(
-                            docs: None,
+                                        "trait Foo",
-                        },
+                                    ),
-                    },
+                                    docs: None,
-                ],
+                                },
-            ),
+                            },
-        ]
+                        ],
-        "###);
+                    ),
+                ]
+            "#]],
+        );
    }
 }
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index c87652555..4bbbcd258 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -1,14 +1,16 @@
-use hir::{Adt, HirDisplay, Semantics, Type};
+use hir::{Adt, Callable, HirDisplay, Semantics, Type};
 use ra_ide_db::RootDatabase;
 use ra_prof::profile;
 use ra_syntax::{
-    ast::{self, ArgListOwner, AstNode, TypeAscriptionOwner},
+    ast::{self, ArgListOwner, AstNode},
-    match_ast, Direction, NodeOrToken, SmolStr, SyntaxKind, TextRange,
+    match_ast, Direction, NodeOrToken, SmolStr, SyntaxKind, TextRange, T,
 };
-use crate::{FileId, FunctionSignature};
 use stdx::to_lower_snake_case;
+use crate::FileId;
+use ast::NameOwner;
+use either::Either;
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct InlayHintsConfig {
    pub type_hints: bool,
@@ -94,7 +96,7 @@ fn get_chaining_hints(
        return None;
    }
-    if matches!(expr, ast::Expr::RecordLit(_)) {
+    if matches!(expr, ast::Expr::RecordExpr(_)) {
        return None;
    }
@@ -112,7 +114,7 @@ fn get_chaining_hints(
    // Ignoring extra whitespace and comments
    let next = tokens.next()?.kind();
    let next_next = tokens.next()?.kind();
-    if next == SyntaxKind::WHITESPACE && next_next == SyntaxKind::DOT {
+    if next == SyntaxKind::WHITESPACE && next_next == T![.] {
        let ty = sema.type_of_expr(&expr)?;
        if ty.is_unknown() {
            return None;
@@ -150,19 +152,22 @@ fn get_param_name_hints(
        _ => return None,
    };
-    let fn_signature = get_fn_signature(sema, &expr)?;
+    let callable = get_callable(sema, &expr)?;
-    let n_params_to_skip =
+    let hints = callable
-        if fn_signature.has_self_param && matches!(&expr, ast::Expr::MethodCallExpr(_)) {
+        .params(sema.db)
-            1
+        .into_iter()
-        } else {
-            0
-        };
-    let hints = fn_signature
-        .parameter_names
-        .iter()
-        .skip(n_params_to_skip)
        .zip(args)
-        .filter(|(param, arg)| should_show_param_name_hint(sema, &fn_signature, param, &arg))
+        .filter_map(|((param, _ty), arg)| match param? {
+            Either::Left(self_param) => Some((self_param.to_string(), arg)),
+            Either::Right(pat) => {
+                let param_name = match pat {
+                    ast::Pat::BindPat(it) => it.name()?.to_string(),
+                    it => it.to_string(),
+                };
+                Some((param_name, arg))
+            }
+        })
+        .filter(|(param_name, arg)| should_show_param_name_hint(sema, &callable, &param_name, &arg))
        .map(|(param_name, arg)| InlayHint {
            range: arg.syntax().text_range(),
            kind: InlayKind::ParameterHint,
@@ -225,10 +230,10 @@ fn should_not_display_type_hint(db: &RootDatabase, bind_pat: &ast::BindPat, pat_
        match_ast! {
            match node {
                ast::LetStmt(it) => {
-                    return it.ascribed_type().is_some()
+                    return it.ty().is_some()
                },
                ast::Param(it) => {
-                    return it.ascribed_type().is_some()
+                    return it.ty().is_some()
                },
                ast::MatchArm(_it) => {
                    return pat_is_enum_variant(db, bind_pat, pat_ty);
@@ -250,28 +255,28 @@ fn should_not_display_type_hint(db: &RootDatabase, bind_pat: &ast::BindPat, pat_
 fn should_show_param_name_hint(
    sema: &Semantics<RootDatabase>,
-    fn_signature: &FunctionSignature,
+    callable: &Callable,
    param_name: &str,
    argument: &ast::Expr,
 ) -> bool {
    let param_name = param_name.trim_start_matches('_');
+    let fn_name = match callable.kind() {
+        hir::CallableKind::Function(it) => Some(it.name(sema.db).to_string()),
+        hir::CallableKind::TupleStruct(_)
+        | hir::CallableKind::TupleEnumVariant(_)
+        | hir::CallableKind::Closure => None,
+    };
    if param_name.is_empty()
-        || Some(param_name) == fn_signature.name.as_ref().map(|s| s.trim_start_matches('_'))
+        || Some(param_name) == fn_name.as_ref().map(|s| s.trim_start_matches('_'))
        || is_argument_similar_to_param_name(sema, argument, param_name)
        || param_name.starts_with("ra_fixture")
    {
        return false;
    }
-    let parameters_len = if fn_signature.has_self_param {
-        fn_signature.parameters.len() - 1
-    } else {
-        fn_signature.parameters.len()
-    };
    // avoid displaying hints for common functions like map, filter, etc.
    // or other obvious words used in std
-    !(parameters_len == 1 && is_obvious_param(param_name))
+    !(callable.n_params() == 1 && is_obvious_param(param_name))
 }
 fn is_argument_similar_to_param_name(
@@ -318,610 +323,264 @@ fn is_obvious_param(param_name: &str) -> bool {
    param_name.len() == 1 || is_obvious_param_name
 }
-fn get_fn_signature(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<FunctionSignature> {
+fn get_callable(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<Callable> {
    match expr {
-        ast::Expr::CallExpr(expr) => {
+        ast::Expr::CallExpr(expr) => sema.type_of_expr(&expr.expr()?)?.as_callable(sema.db),
-            // FIXME: Type::as_callable is broken for closures
+        ast::Expr::MethodCallExpr(expr) => sema.resolve_method_call_as_callable(expr),
-            let callable_def = sema.type_of_expr(&expr.expr()?)?.as_callable()?;
-            match callable_def {
-                hir::CallableDef::FunctionId(it) => {
-                    Some(FunctionSignature::from_hir(sema.db, it.into()))
-                }
-                hir::CallableDef::StructId(it) => {
-                    FunctionSignature::from_struct(sema.db, it.into())
-                }
-                hir::CallableDef::EnumVariantId(it) => {
-                    FunctionSignature::from_enum_variant(sema.db, it.into())
-                }
-            }
-        }
-        ast::Expr::MethodCallExpr(expr) => {
-            let fn_def = sema.resolve_method_call(&expr)?;
-            Some(FunctionSignature::from_hir(sema.db, fn_def))
-        }
        _ => None,
    }
 }
 #[cfg(test)]
 mod tests {
-    use crate::inlay_hints::InlayHintsConfig;
+    use expect::{expect, Expect};
-    use insta::assert_debug_snapshot;
+    use test_utils::extract_annotations;
+    use crate::{inlay_hints::InlayHintsConfig, mock_analysis::single_file};
+    fn check(ra_fixture: &str) {
+        check_with_config(InlayHintsConfig::default(), ra_fixture);
+    }
+    fn check_with_config(config: InlayHintsConfig, ra_fixture: &str) {
+        let (analysis, file_id) = single_file(ra_fixture);
+        let expected = extract_annotations(&*analysis.file_text(file_id).unwrap());
+        let inlay_hints = analysis.inlay_hints(file_id, &config).unwrap();
+        let actual =
+            inlay_hints.into_iter().map(|it| (it.range, it.label.to_string())).collect::<Vec<_>>();
+        assert_eq!(expected, actual, "\nExpected:\n{:#?}\n\nActual:\n{:#?}", expected, actual);
+    }
-    use crate::mock_analysis::single_file;
+    fn check_expect(config: InlayHintsConfig, ra_fixture: &str, expect: Expect) {
+        let (analysis, file_id) = single_file(ra_fixture);
+        let inlay_hints = analysis.inlay_hints(file_id, &config).unwrap();
+        expect.assert_debug_eq(&inlay_hints)
+    }
    #[test]
    fn param_hints_only() {
-        let (analysis, file_id) = single_file(
+        check_with_config(
+            InlayHintsConfig {
+                parameter_hints: true,
+                type_hints: false,
+                chaining_hints: false,
+                max_length: None,
+            },
            r#"
-            fn foo(a: i32, b: i32) -> i32 { a + b }
+fn foo(a: i32, b: i32) -> i32 { a + b }
-            fn main() {
+fn main() {
-                let _x = foo(4, 4);
+    let _x = foo(
-            }"#,
+        4,
+      //^ a
+        4,
+      //^ b
+    );
+}"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: true, type_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 69..70,
-                kind: ParameterHint,
-                label: "a",
-            },
-            InlayHint {
-                range: 72..73,
-                kind: ParameterHint,
-                label: "b",
-            },
-        ]
-        "###);
    }
    #[test]
    fn hints_disabled() {
-        let (analysis, file_id) = single_file(
+        check_with_config(
+            InlayHintsConfig {
+                type_hints: false,
+                parameter_hints: false,
+                chaining_hints: false,
+                max_length: None,
+            },
            r#"
-            fn foo(a: i32, b: i32) -> i32 { a + b }
+fn foo(a: i32, b: i32) -> i32 { a + b }
-            fn main() {
+fn main() {
-                let _x = foo(4, 4);
+    let _x = foo(4, 4);
-            }"#,
+}"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ type_hints: false, parameter_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"[]"###);
    }
    #[test]
    fn type_hints_only() {
-        let (analysis, file_id) = single_file(
+        check_with_config(
+            InlayHintsConfig {
+                type_hints: true,
+                parameter_hints: false,
+                chaining_hints: false,
+                max_length: None,
+            },
            r#"
-            fn foo(a: i32, b: i32) -> i32 { a + b }
+fn foo(a: i32, b: i32) -> i32 { a + b }
-            fn main() {
+fn main() {
-                let _x = foo(4, 4);
+    let _x = foo(4, 4);
-            }"#,
+      //^^ i32
+}"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ type_hints: true, parameter_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 60..62,
-                kind: TypeHint,
-                label: "i32",
-            },
-        ]
-        "###);
    }
    #[test]
    fn default_generic_types_should_not_be_displayed() {
-        let (analysis, file_id) = single_file(
+        check(
            r#"
-struct Test<K, T = u8> {
+struct Test<K, T = u8> { k: K, t: T }
-    k: K,
-    t: T,
-}
 fn main() {
    let zz = Test { t: 23u8, k: 33 };
+      //^^ Test<i32>
    let zz_ref = &zz;
+      //^^^^^^ &Test<i32>
+    let test = || zz;
+      //^^^^ || -> Test<i32>
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 68..70,
-                kind: TypeHint,
-                label: "Test<i32>",
-            },
-            InlayHint {
-                range: 106..112,
-                kind: TypeHint,
-                label: "&Test<i32>",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn let_statement() {
-        let (analysis, file_id) = single_file(
+        check(
            r#"
 #[derive(PartialEq)]
-enum CustomOption<T> {
+enum Option<T> { None, Some(T) }
-    None,
-    Some(T),
-}
 #[derive(PartialEq)]
-struct Test {
+struct Test { a: Option<u32>, b: u8 }
-    a: CustomOption<u32>,
-    b: u8,
-}
 fn main() {
    struct InnerStruct {}
    let test = 54;
+      //^^^^ i32
    let test: i32 = 33;
    let mut test = 33;
+      //^^^^^^^^ i32
    let _ = 22;
    let test = "test";
+      //^^^^ &str
    let test = InnerStruct {};
-    let test = vec![222];
+    let test = unresolved();
-    let test: Vec<_> = (0..3).collect();
-    let test = (0..3).collect::<Vec<i128>>();
-    let test = (0..3).collect::<Vec<_>>();
-    let mut test = Vec::new();
-    test.push(333);
    let test = (42, 'a');
-    let (a, (b, c, (d, e), f)) = (2, (3, 4, (6.6, 7.7), 5));
+      //^^^^ (i32, char)
+    let (a,    (b,     (c,)) = (2, (3, (9.2,));
+       //^ i32  ^ i32   ^ f64
    let &x = &92;
+       //^ i32
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 192..196,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 235..243,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 274..278,
-                kind: TypeHint,
-                label: "&str",
-            },
-            InlayHint {
-                range: 538..542,
-                kind: TypeHint,
-                label: "(i32, char)",
-            },
-            InlayHint {
-                range: 565..566,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 569..570,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 572..573,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 576..577,
-                kind: TypeHint,
-                label: "f64",
-            },
-            InlayHint {
-                range: 579..580,
-                kind: TypeHint,
-                label: "f64",
-            },
-            InlayHint {
-                range: 583..584,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 626..627,
-                kind: TypeHint,
-                label: "i32",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn closure_parameters() {
-        let (analysis, file_id) = single_file(
+        check(
            r#"
 fn main() {
    let mut start = 0;
-    (0..2).for_each(|increment| {
+      //^^^^^^^^^ i32
-        start += increment;
+    (0..2).for_each(|increment| { start += increment; });
-    });
+                   //^^^^^^^^^ i32
+    let multiply =
+      //^^^^^^^^ |…| -> i32
+      | a,     b| a * b
+      //^ i32  ^ i32
+    ;
-    let multiply = |a, b, c, d| a * b * c * d;
+    let _: i32 = multiply(1, 2);
-    let _: i32 = multiply(1, 2, 3, 4);
    let multiply_ref = &multiply;
+      //^^^^^^^^^^^^ &|…| -> i32
    let return_42 = || 42;
+      //^^^^^^^^^ || -> i32
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 20..29,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 56..65,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 114..122,
-                kind: TypeHint,
-                label: "|…| -> i32",
-            },
-            InlayHint {
-                range: 126..127,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 129..130,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 132..133,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 135..136,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 200..212,
-                kind: TypeHint,
-                label: "&|…| -> i32",
-            },
-            InlayHint {
-                range: 235..244,
-                kind: TypeHint,
-                label: "|| -> i32",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn for_expression() {
-        let (analysis, file_id) = single_file(
+        check(
            r#"
 fn main() {
    let mut start = 0;
-    for increment in 0..2 {
+      //^^^^^^^^^ i32
-        start += increment;
+    for increment in 0..2 { start += increment; }
-    }
+      //^^^^^^^^^ i32
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 20..29,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 43..52,
-                kind: TypeHint,
-                label: "i32",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn if_expr() {
-        let (analysis, file_id) = single_file(
+        check(
            r#"
-#[derive(PartialEq)]
+enum Option<T> { None, Some(T) }
-enum CustomOption<T> {
+use Option::*;
-    None,
-    Some(T),
-}
-#[derive(PartialEq)]
-struct Test {
-    a: CustomOption<u32>,
-    b: u8,
-}
-use CustomOption::*;
+struct Test { a: Option<u32>, b: u8 }
 fn main() {
    let test = Some(Test { a: Some(3), b: 1 });
+      //^^^^ Option<Test>
    if let None = &test {};
    if let test = &test {};
+         //^^^^ &Option<Test>
    if let Some(test) = &test {};
-    if let Some(Test { a, b }) = &test {};
+              //^^^^ &Test
-    if let Some(Test { a: x, b: y }) = &test {};
+    if let Some(Test { a,             b }) = &test {};
-    if let Some(Test { a: Some(x), b: y }) = &test {};
+                     //^ &Option<u32> ^ &u8
-    if let Some(Test { a: None, b: y }) = &test {};
+    if let Some(Test { a: x,             b: y }) = &test {};
+                        //^ &Option<u32>    ^ &u8
+    if let Some(Test { a: Some(x),  b: y }) = &test {};
+                             //^ &u32  ^ &u8
+    if let Some(Test { a: None,  b: y }) = &test {};
+                                  //^ &u8
    if let Some(Test { b: y, .. }) = &test {};
+                        //^ &u8
    if test == None {}
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 187..191,
-                kind: TypeHint,
-                label: "CustomOption<Test>",
-            },
-            InlayHint {
-                range: 266..270,
-                kind: TypeHint,
-                label: "&CustomOption<Test>",
-            },
-            InlayHint {
-                range: 299..303,
-                kind: TypeHint,
-                label: "&Test",
-            },
-            InlayHint {
-                range: 340..341,
-                kind: TypeHint,
-                label: "&CustomOption<u32>",
-            },
-            InlayHint {
-                range: 343..344,
-                kind: TypeHint,
-                label: "&u8",
-            },
-            InlayHint {
-                range: 386..387,
-                kind: TypeHint,
-                label: "&CustomOption<u32>",
-            },
-            InlayHint {
-                range: 392..393,
-                kind: TypeHint,
-                label: "&u8",
-            },
-            InlayHint {
-                range: 440..441,
-                kind: TypeHint,
-                label: "&u32",
-            },
-            InlayHint {
-                range: 447..448,
-                kind: TypeHint,
-                label: "&u8",
-            },
-            InlayHint {
-                range: 499..500,
-                kind: TypeHint,
-                label: "&u8",
-            },
-            InlayHint {
-                range: 542..543,
-                kind: TypeHint,
-                label: "&u8",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn while_expr() {
-        let (analysis, file_id) = single_file(
+        check(
            r#"
-#[derive(PartialEq)]
+enum Option<T> { None, Some(T) }
-enum CustomOption<T> {
+use Option::*;
-    None,
-    Some(T),
-}
-#[derive(PartialEq)]
+struct Test { a: Option<u32>, b: u8 }
-struct Test {
-    a: CustomOption<u32>,
-    b: u8,
-}
-use CustomOption::*;
 fn main() {
    let test = Some(Test { a: Some(3), b: 1 });
-    while let None = &test {};
+      //^^^^ Option<Test>
-    while let test = &test {};
+    while let Some(Test { a: Some(x),  b: y }) = &test {};
-    while let Some(test) = &test {};
+                                //^ &u32  ^ &u8
-    while let Some(Test { a, b }) = &test {};
-    while let Some(Test { a: x, b: y }) = &test {};
-    while let Some(Test { a: Some(x), b: y }) = &test {};
-    while let Some(Test { a: None, b: y }) = &test {};
-    while let Some(Test { b: y, .. }) = &test {};
-    while test == None {}
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 187..191,
-                kind: TypeHint,
-                label: "CustomOption<Test>",
-            },
-            InlayHint {
-                range: 272..276,
-                kind: TypeHint,
-                label: "&CustomOption<Test>",
-            },
-            InlayHint {
-                range: 308..312,
-                kind: TypeHint,
-                label: "&Test",
-            },
-            InlayHint {
-                range: 352..353,
-                kind: TypeHint,
-                label: "&CustomOption<u32>",
-            },
-            InlayHint {
-                range: 355..356,
-                kind: TypeHint,
-                label: "&u8",
-            },
-            InlayHint {
-                range: 401..402,
-                kind: TypeHint,
-                label: "&CustomOption<u32>",
-            },
-            InlayHint {
-                range: 407..408,
-                kind: TypeHint,
-                label: "&u8",
-            },
-            InlayHint {
-                range: 458..459,
-                kind: TypeHint,
-                label: "&u32",
-            },
-            InlayHint {
-                range: 465..466,
-                kind: TypeHint,
-                label: "&u8",
-            },
-            InlayHint {
-                range: 520..521,
-                kind: TypeHint,
-                label: "&u8",
-            },
-            InlayHint {
-                range: 566..567,
-                kind: TypeHint,
-                label: "&u8",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn match_arm_list() {
-        let (analysis, file_id) = single_file(
+        check(
            r#"
-#[derive(PartialEq)]
+enum Option<T> { None, Some(T) }
-enum CustomOption<T> {
+use Option::*;
-    None,
-    Some(T),
-}
-#[derive(PartialEq)]
+struct Test { a: Option<u32>, b: u8 }
-struct Test {
-    a: CustomOption<u32>,
-    b: u8,
-}
-use CustomOption::*;
 fn main() {
    match Some(Test { a: Some(3), b: 1 }) {
        None => (),
        test => (),
-        Some(test) => (),
+      //^^^^ Option<Test>
-        Some(Test { a, b }) => (),
-        Some(Test { a: x, b: y }) => (),
        Some(Test { a: Some(x), b: y }) => (),
-        Some(Test { a: None, b: y }) => (),
+                          //^ u32  ^ u8
-        Some(Test { b: y, .. }) => (),
        _ => {}
    }
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 251..255,
-                kind: TypeHint,
-                label: "CustomOption<Test>",
-            },
-            InlayHint {
-                range: 276..280,
-                kind: TypeHint,
-                label: "Test",
-            },
-            InlayHint {
-                range: 309..310,
-                kind: TypeHint,
-                label: "CustomOption<u32>",
-            },
-            InlayHint {
-                range: 312..313,
-                kind: TypeHint,
-                label: "u8",
-            },
-            InlayHint {
-                range: 347..348,
-                kind: TypeHint,
-                label: "CustomOption<u32>",
-            },
-            InlayHint {
-                range: 353..354,
-                kind: TypeHint,
-                label: "u8",
-            },
-            InlayHint {
-                range: 393..394,
-                kind: TypeHint,
-                label: "u32",
-            },
-            InlayHint {
-                range: 400..401,
-                kind: TypeHint,
-                label: "u8",
-            },
-            InlayHint {
-                range: 444..445,
-                kind: TypeHint,
-                label: "u8",
-            },
-            InlayHint {
-                range: 479..480,
-                kind: TypeHint,
-                label: "u8",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn hint_truncation() {
-        let (analysis, file_id) = single_file(
+        check_with_config(
+            InlayHintsConfig { max_length: Some(8), ..Default::default() },
            r#"
 struct Smol<T>(T);
@@ -929,52 +588,25 @@ struct VeryLongOuterName<T>(T);
 fn main() {
    let a = Smol(0u32);
+      //^ Smol<u32>
    let b = VeryLongOuterName(0usize);
+      //^ VeryLongOuterName<…>
    let c = Smol(Smol(0u32))
+      //^ Smol<Smol<…>>
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 73..74,
-                kind: TypeHint,
-                label: "Smol<u32>",
-            },
-            InlayHint {
-                range: 97..98,
-                kind: TypeHint,
-                label: "VeryLongOuterName<…>",
-            },
-            InlayHint {
-                range: 136..137,
-                kind: TypeHint,
-                label: "Smol<Smol<…>>",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn function_call_parameter_hint() {
-        let (analysis, file_id) = single_file(
+        check(
            r#"
-enum CustomOption<T> {
+enum Option<T> { None, Some(T) }
-    None,
+use Option::*;
-    Some(T),
-}
-use CustomOption::*;
 struct FileId {}
 struct SmolStr {}
-impl From<&str> for SmolStr {
-    fn from(_: &str) -> Self {
-        unimplemented!()
-    }
-}
 struct TextRange {}
 struct SyntaxKind {}
 struct NavigationTarget {}
@@ -982,18 +614,15 @@ struct NavigationTarget {}
 struct Test {}
 impl Test {
-    fn method(&self, mut param: i32) -> i32 {
+    fn method(&self, mut param: i32) -> i32 { param * 2 }
-        param * 2
-    }
    fn from_syntax(
        file_id: FileId,
        name: SmolStr,
-        focus_range: CustomOption<TextRange>,
+        focus_range: Option<TextRange>,
        full_range: TextRange,
        kind: SyntaxKind,
-        docs: CustomOption<String>,
+        docs: Option<String>,
-        description: CustomOption<String>,
    ) -> NavigationTarget {
        NavigationTarget {}
    }
@@ -1005,108 +634,36 @@ fn test_func(mut foo: i32, bar: i32, msg: &str, _: i32, last: i32) -> i32 {
 fn main() {
    let not_literal = 1;
-    let _: i32 = test_func(1, 2, "hello", 3, not_literal);
+      //^^^^^^^^^^^ i32
+    let _: i32 = test_func(1,    2,      "hello", 3,  not_literal);
+                         //^ foo ^ bar   ^^^^^^^ msg  ^^^^^^^^^^^ last
    let t: Test = Test {};
    t.method(123);
-    Test::method(&t, 3456);
+           //^^^ param
+    Test::method(&t,      3456);
+               //^^ &self ^^^^ param
    Test::from_syntax(
        FileId {},
+      //^^^^^^^^^ file_id
        "impl".into(),
+      //^^^^^^^^^^^^^ name
        None,
+      //^^^^ focus_range
        TextRange {},
+      //^^^^^^^^^^^^ full_range
        SyntaxKind {},
+      //^^^^^^^^^^^^^ kind
        None,
-        None,
+      //^^^^ docs
    );
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 797..808,
-                kind: TypeHint,
-                label: "i32",
-            },
-            InlayHint {
-                range: 841..842,
-                kind: ParameterHint,
-                label: "foo",
-            },
-            InlayHint {
-                range: 844..845,
-                kind: ParameterHint,
-                label: "bar",
-            },
-            InlayHint {
-                range: 847..854,
-                kind: ParameterHint,
-                label: "msg",
-            },
-            InlayHint {
-                range: 859..870,
-                kind: ParameterHint,
-                label: "last",
-            },
-            InlayHint {
-                range: 913..916,
-                kind: ParameterHint,
-                label: "param",
-            },
-            InlayHint {
-                range: 936..938,
-                kind: ParameterHint,
-                label: "&self",
-            },
-            InlayHint {
-                range: 940..944,
-                kind: ParameterHint,
-                label: "param",
-            },
-            InlayHint {
-                range: 979..988,
-                kind: ParameterHint,
-                label: "file_id",
-            },
-            InlayHint {
-                range: 998..1011,
-                kind: ParameterHint,
-                label: "name",
-            },
-            InlayHint {
-                range: 1021..1025,
-                kind: ParameterHint,
-                label: "focus_range",
-            },
-            InlayHint {
-                range: 1035..1047,
-                kind: ParameterHint,
-                label: "full_range",
-            },
-            InlayHint {
-                range: 1057..1070,
-                kind: ParameterHint,
-                label: "kind",
-            },
-            InlayHint {
-                range: 1080..1084,
-                kind: ParameterHint,
-                label: "docs",
-            },
-            InlayHint {
-                range: 1094..1098,
-                kind: ParameterHint,
-                label: "description",
-            },
-        ]
-        "###
-        );
    }
    #[test]
    fn omitted_parameters_hints_heuristics() {
-        let (analysis, file_id) = single_file(
+        check_with_config(
+            InlayHintsConfig { max_length: Some(8), ..Default::default() },
            r#"
 fn map(f: i32) {}
 fn filter(predicate: i32) {}
@@ -1188,22 +745,15 @@ fn main() {
    let _: f64 = a.abs_sub(b);
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
-        []
-        "###
-        );
    }
    #[test]
    fn unit_structs_have_no_type_hints() {
-        let (analysis, file_id) = single_file(
+        check_with_config(
+            InlayHintsConfig { max_length: Some(8), ..Default::default() },
            r#"
-enum CustomResult<T, E> {
+enum Result<T, E> { Ok(T), Err(E) }
-    Ok(T),
+use Result::*;
-    Err(E),
-}
-use CustomResult::*;
 struct SyntheticSyntax;
@@ -1214,135 +764,155 @@ fn main() {
    }
 }"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
-        []
-        "###
-        );
    }
    #[test]
    fn chaining_hints_ignore_comments() {
-        let (analysis, file_id) = single_file(
+        check_expect(
+            InlayHintsConfig {
+                parameter_hints: false,
+                type_hints: false,
+                chaining_hints: true,
+                max_length: None,
+            },
            r#"
-            struct A(B);
+struct A(B);
-            impl A { fn into_b(self) -> B { self.0 } }
+impl A { fn into_b(self) -> B { self.0 } }
-            struct B(C);
+struct B(C);
-            impl B { fn into_c(self) -> C { self.0 } }
+impl B { fn into_c(self) -> C { self.0 } }
-            struct C;
+struct C;
-            fn main() {
+fn main() {
-                let c = A(B(C))
+    let c = A(B(C))
-                    .into_b() // This is a comment
+        .into_b() // This is a comment
-                    .into_c();
+        .into_c();
-            }"#,
+}
+"#,
+            expect![[r#"
+                [
+                    InlayHint {
+                        range: 147..172,
+                        kind: ChainingHint,
+                        label: "B",
+                    },
+                    InlayHint {
+                        range: 147..154,
+                        kind: ChainingHint,
+                        label: "A",
+                    },
+                ]
+            "#]],
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 147..172,
-                kind: ChainingHint,
-                label: "B",
-            },
-            InlayHint {
-                range: 147..154,
-                kind: ChainingHint,
-                label: "A",
-            },
-        ]
-        "###);
    }
    #[test]
    fn chaining_hints_without_newlines() {
-        let (analysis, file_id) = single_file(
+        check_with_config(
+            InlayHintsConfig {
+                parameter_hints: false,
+                type_hints: false,
+                chaining_hints: true,
+                max_length: None,
+            },
            r#"
-            struct A(B);
+struct A(B);
-            impl A { fn into_b(self) -> B { self.0 } }
+impl A { fn into_b(self) -> B { self.0 } }
-            struct B(C);
+struct B(C);
-            impl B { fn into_c(self) -> C { self.0 } }
+impl B { fn into_c(self) -> C { self.0 } }
-            struct C;
+struct C;
-            fn main() {
+fn main() {
-                let c = A(B(C)).into_b().into_c();
+    let c = A(B(C)).into_b().into_c();
-            }"#,
+}"#,
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"[]"###);
    }
    #[test]
    fn struct_access_chaining_hints() {
-        let (analysis, file_id) = single_file(
+        check_expect(
+            InlayHintsConfig {
+                parameter_hints: false,
+                type_hints: false,
+                chaining_hints: true,
+                max_length: None,
+            },
            r#"
-            struct A { pub b: B }
+struct A { pub b: B }
-            struct B { pub c: C }
+struct B { pub c: C }
-            struct C(pub bool);
+struct C(pub bool);
-            struct D;
+struct D;
-            impl D {
+impl D {
-                fn foo(&self) -> i32 { 42 }
+    fn foo(&self) -> i32 { 42 }
-            }
+}
-            fn main() {
+fn main() {
-                let x = A { b: B { c: C(true) } }
+    let x = A { b: B { c: C(true) } }
-                    .b
+        .b
-                    .c
+        .c
-                    .0;
+        .0;
-                let x = D
+    let x = D
-                    .foo();
+        .foo();
-            }"#,
+}"#,
+            expect![[r#"
+                [
+                    InlayHint {
+                        range: 143..190,
+                        kind: ChainingHint,
+                        label: "C",
+                    },
+                    InlayHint {
+                        range: 143..179,
+                        kind: ChainingHint,
+                        label: "B",
+                    },
+                ]
+            "#]],
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 143..190,
-                kind: ChainingHint,
-                label: "C",
-            },
-            InlayHint {
-                range: 143..179,
-                kind: ChainingHint,
-                label: "B",
-            },
-        ]
-        "###);
    }
    #[test]
    fn generic_chaining_hints() {
-        let (analysis, file_id) = single_file(
+        check_expect(
+            InlayHintsConfig {
+                parameter_hints: false,
+                type_hints: false,
+                chaining_hints: true,
+                max_length: None,
+            },
            r#"
-            struct A<T>(T);
+struct A<T>(T);
-            struct B<T>(T);
+struct B<T>(T);
-            struct C<T>(T);
+struct C<T>(T);
-            struct X<T,R>(T, R);
+struct X<T,R>(T, R);
-            impl<T> A<T> {
+impl<T> A<T> {
-                fn new(t: T) -> Self { A(t) }
+    fn new(t: T) -> Self { A(t) }
-                fn into_b(self) -> B<T> { B(self.0) }
+    fn into_b(self) -> B<T> { B(self.0) }
-            }
+}
-            impl<T> B<T> {
+impl<T> B<T> {
-                fn into_c(self) -> C<T> { C(self.0) }
+    fn into_c(self) -> C<T> { C(self.0) }
-            }
+}
-            fn main() {
+fn main() {
-                let c = A::new(X(42, true))
+    let c = A::new(X(42, true))
-                    .into_b()
+        .into_b()
-                    .into_c();
+        .into_c();
-            }"#,
+}
+"#,
+            expect![[r#"
+                [
+                    InlayHint {
+                        range: 246..283,
+                        kind: ChainingHint,
+                        label: "B<X<i32, bool>>",
+                    },
+                    InlayHint {
+                        range: 246..265,
+                        kind: ChainingHint,
+                        label: "A<X<i32, bool>>",
+                    },
+                ]
+            "#]],
        );
-        assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
-        [
-            InlayHint {
-                range: 246..283,
-                kind: ChainingHint,
-                label: "B<X<i32, bool>>",
-            },
-            InlayHint {
-                range: 246..265,
-                kind: ChainingHint,
-                label: "A<X<i32, bool>>",
-            },
-        ]
-        "###);
    }
 }
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index ecac5134e..0fede0d87 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -17,30 +17,33 @@ macro_rules! eprintln {
 pub mod mock_analysis;
+mod markup;
 mod prime_caches;
-mod status;
+mod display;
+mod call_hierarchy;
+mod call_info;
 mod completion;
-mod runnables;
+mod diagnostics;
+mod expand_macro;
+mod extend_selection;
+mod file_structure;
+mod folding_ranges;
 mod goto_definition;
-mod goto_type_definition;
 mod goto_implementation;
-mod extend_selection;
+mod goto_type_definition;
 mod hover;
-mod call_hierarchy;
+mod inlay_hints;
-mod call_info;
+mod join_lines;
-mod syntax_highlighting;
+mod matching_brace;
 mod parent_module;
 mod references;
-mod diagnostics;
+mod runnables;
+mod ssr;
+mod status;
+mod syntax_highlighting;
 mod syntax_tree;
-mod folding_ranges;
-mod join_lines;
 mod typing;
-mod matching_brace;
-mod display;
-mod inlay_hints;
-mod expand_macro;
-mod ssr;
 use std::sync::Arc;
@@ -59,15 +62,18 @@ use crate::display::ToNav;
 pub use crate::{
    call_hierarchy::CallItem,
+    call_info::CallInfo,
    completion::{
        CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, InsertTextFormat,
    },
    diagnostics::Severity,
-    display::{file_structure, FunctionSignature, NavigationTarget, StructureNode},
+    display::NavigationTarget,
    expand_macro::ExpandedMacro,
+    file_structure::StructureNode,
    folding_ranges::{Fold, FoldKind},
    hover::{HoverAction, HoverConfig, HoverGotoTypeData, HoverResult},
    inlay_hints::{InlayHint, InlayHintsConfig, InlayKind},
+    markup::Markup,
    references::{Declaration, Reference, ReferenceAccess, ReferenceKind, ReferenceSearchResult},
    runnables::{Runnable, RunnableKind, TestId},
    syntax_highlighting::{
@@ -75,8 +81,8 @@ pub use crate::{
    },
 };
-pub use hir::Documentation;
+pub use hir::{Documentation, Semantics};
-pub use ra_assists::{Assist, AssistConfig, AssistId, ResolvedAssist};
+pub use ra_assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist};
 pub use ra_db::{
    Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot,
    SourceRootId,
@@ -129,14 +135,6 @@ impl<T> RangeInfo<T> {
    }
 }
-/// Contains information about a call site. Specifically the
-/// `FunctionSignature`and current parameter.
-#[derive(Debug)]
-pub struct CallInfo {
-    pub signature: FunctionSignature,
-    pub active_parameter: Option<usize>,
-}
 /// `AnalysisHost` stores the current state of the world.
 #[derive(Debug)]
 pub struct AnalysisHost {
@@ -328,7 +326,7 @@ impl Analysis {
    /// Returns a tree representation of symbols in the file. Useful to draw a
    /// file outline.
    pub fn file_structure(&self, file_id: FileId) -> Cancelable<Vec<StructureNode>> {
-        self.with_db(|db| file_structure(&db.parse(file_id).tree()))
+        self.with_db(|db| file_structure::file_structure(&db.parse(file_id).tree()))
    }
    /// Returns a list of the places in the file where type hints can be displayed.
@@ -385,7 +383,9 @@ impl Analysis {
        position: FilePosition,
        search_scope: Option<SearchScope>,
    ) -> Cancelable<Option<ReferenceSearchResult>> {
-        self.with_db(|db| references::find_all_refs(db, position, search_scope).map(|it| it.info))
+        self.with_db(|db| {
+            references::find_all_refs(&Semantics::new(db), position, search_scope).map(|it| it.info)
+        })
    }
    /// Returns a short text describing element at position.
@@ -487,8 +487,12 @@ impl Analysis {
    }
    /// Computes the set of diagnostics for the given file.
-    pub fn diagnostics(&self, file_id: FileId) -> Cancelable<Vec<Diagnostic>> {
+    pub fn diagnostics(
-        self.with_db(|db| diagnostics::diagnostics(db, file_id))
+        &self,
+        file_id: FileId,
+        enable_experimental: bool,
+    ) -> Cancelable<Vec<Diagnostic>> {
+        self.with_db(|db| diagnostics::diagnostics(db, file_id, enable_experimental))
    }
    /// Returns the edit required to rename reference at the position to the new
@@ -505,9 +509,11 @@ impl Analysis {
        &self,
        query: &str,
        parse_only: bool,
+        position: FilePosition,
+        selections: Vec<FileRange>,
    ) -> Cancelable<Result<SourceChange, SsrError>> {
        self.with_db(|db| {
-            let edits = ssr::parse_search_replace(query, parse_only, db)?;
+            let edits = ssr::parse_search_replace(query, parse_only, db, position, selections)?;
            Ok(SourceChange::from(edits))
        })
    }
@@ -526,77 +532,3 @@ fn analysis_is_send() {
    fn is_send<T: Send>() {}
    is_send::<Analysis>();
 }
-#[cfg(test)]
-mod tests {
-    use crate::{display::NavigationTarget, mock_analysis::single_file, Query};
-    use ra_syntax::{
-        SmolStr,
-        SyntaxKind::{FN_DEF, STRUCT_DEF},
-    };
-    #[test]
-    fn test_world_symbols_with_no_container() {
-        let code = r#"
-    enum FooInner { }
-    "#;
-        let mut symbols = get_symbols_matching(code, "FooInner");
-        let s = symbols.pop().unwrap();
-        assert_eq!(s.name(), "FooInner");
-        assert!(s.container_name().is_none());
-    }
-    #[test]
-    fn test_world_symbols_include_container_name() {
-        let code = r#"
-fn foo() {
-    enum FooInner { }
-}
-    "#;
-        let mut symbols = get_symbols_matching(code, "FooInner");
-        let s = symbols.pop().unwrap();
-        assert_eq!(s.name(), "FooInner");
-        assert_eq!(s.container_name(), Some(&SmolStr::new("foo")));
-        let code = r#"
-mod foo {
-    struct FooInner;
-}
-    "#;
-        let mut symbols = get_symbols_matching(code, "FooInner");
-        let s = symbols.pop().unwrap();
-        assert_eq!(s.name(), "FooInner");
-        assert_eq!(s.container_name(), Some(&SmolStr::new("foo")));
-    }
-    #[test]
-    fn test_world_symbols_are_case_sensitive() {
-        let code = r#"
-fn foo() {}
-struct Foo;
-        "#;
-        let symbols = get_symbols_matching(code, "Foo");
-        let fn_match = symbols.iter().find(|s| s.name() == "foo").map(|s| s.kind());
-        let struct_match = symbols.iter().find(|s| s.name() == "Foo").map(|s| s.kind());
-        assert_eq!(fn_match, Some(FN_DEF));
-        assert_eq!(struct_match, Some(STRUCT_DEF));
-    }
-    fn get_symbols_matching(text: &str, query: &str) -> Vec<NavigationTarget> {
-        let (analysis, _) = single_file(text);
-        analysis.symbol_search(Query::new(query.into())).unwrap()
-    }
-}
diff --git a/crates/ra_ide/src/markup.rs b/crates/ra_ide/src/markup.rs
new file mode 100644
index 000000000..60c193c40
--- /dev/null
+++ b/crates/ra_ide/src/markup.rs
@@ -0,0 +1,38 @@
+//! Markdown formatting.
+//!
+//! Sometimes, we want to display a "rich text" in the UI. At the moment, we use
+//! markdown for this purpose. It doesn't feel like a right option, but that's
+//! what is used by LSP, so let's keep it simple.
+use std::fmt;
+#[derive(Default, Debug)]
+pub struct Markup {
+    text: String,
+}
+impl From<Markup> for String {
+    fn from(markup: Markup) -> Self {
+        markup.text
+    }
+}
+impl From<String> for Markup {
+    fn from(text: String) -> Self {
+        Markup { text }
+    }
+}
+impl fmt::Display for Markup {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&self.text, f)
+    }
+}
+impl Markup {
+    pub fn as_str(&self) -> &str {
+        self.text.as_str()
+    }
+    pub fn fenced_block(contents: &impl fmt::Display) -> Markup {
+        format!("```rust\n{}\n```", contents).into()
+    }
+}
diff --git a/crates/ra_ide/src/mock_analysis.rs b/crates/ra_ide/src/mock_analysis.rs
index 490ee0dc3..cf2ee1bfa 100644
--- a/crates/ra_ide/src/mock_analysis.rs
+++ b/crates/ra_ide/src/mock_analysis.rs
@@ -2,8 +2,10 @@
 use std::sync::Arc;
 use ra_cfg::CfgOptions;
-use ra_db::{CrateName, Env, FileSet, SourceRoot, VfsPath};
+use ra_db::{CrateName, FileSet, SourceRoot, VfsPath};
-use test_utils::{extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER};
+use test_utils::{
+    extract_annotations, extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER,
+};
 use crate::{
    Analysis, AnalysisChange, AnalysisHost, CrateGraph, Edition, FileId, FilePosition, FileRange,
@@ -69,13 +71,27 @@ impl MockAnalysis {
    }
    pub fn id_of(&self, path: &str) -> FileId {
-        let (idx, _) = self
+        let (file_id, _) =
-            .files
+            self.files().find(|(_, data)| path == data.path).expect("no file in this mock");
-            .iter()
+        file_id
-            .enumerate()
+    }
-            .find(|(_, data)| path == data.path)
+    pub fn annotations(&self) -> Vec<(FileRange, String)> {
-            .expect("no file in this mock");
+        self.files()
-        FileId(idx as u32 + 1)
+            .flat_map(|(file_id, fixture)| {
+                let annotations = extract_annotations(&fixture.text);
+                annotations
+                    .into_iter()
+                    .map(move |(range, data)| (FileRange { file_id, range }, data))
+            })
+            .collect()
+    }
+    pub fn files(&self) -> impl Iterator<Item = (FileId, &Fixture)> + '_ {
+        self.files.iter().enumerate().map(|(idx, fixture)| (FileId(idx as u32 + 1), fixture))
+    }
+    pub fn annotation(&self) -> (FileRange, String) {
+        let mut all = self.annotations();
+        assert_eq!(all.len(), 1);
+        all.pop().unwrap()
    }
    pub fn analysis_host(self) -> AnalysisHost {
        let mut host = AnalysisHost::default();
@@ -94,12 +110,12 @@ impl MockAnalysis {
                data.edition.and_then(|it| it.parse().ok()).unwrap_or(Edition::Edition2018);
            let file_id = FileId(i as u32 + 1);
-            let env = Env::from(data.env.iter());
+            let env = data.env.into_iter().collect();
            if path == "/lib.rs" || path == "/main.rs" {
                root_crate = Some(crate_graph.add_crate_root(
                    file_id,
                    edition,
-                    Some(CrateName::new("test").unwrap()),
+                    Some("test".to_string()),
                    cfg,
                    env,
                    Default::default(),
@@ -110,7 +126,7 @@ impl MockAnalysis {
                let other_crate = crate_graph.add_crate_root(
                    file_id,
                    edition,
-                    Some(CrateName::new(crate_name).unwrap()),
+                    Some(crate_name.to_string()),
                    cfg,
                    env,
                    Default::default(),
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index 3433fdae3..519e4bf1a 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -74,8 +74,8 @@ impl IntoIterator for ReferenceSearchResult {
        let mut v = Vec::with_capacity(self.len());
        v.push(Reference {
            file_range: FileRange {
-                file_id: self.declaration.nav.file_id(),
+                file_id: self.declaration.nav.file_id,
-                range: self.declaration.nav.range(),
+                range: self.declaration.nav.focus_or_full_range(),
            },
            kind: self.declaration.kind,
            access: self.declaration.access,
@@ -86,12 +86,11 @@ impl IntoIterator for ReferenceSearchResult {
 }
 pub(crate) fn find_all_refs(
-    db: &RootDatabase,
+    sema: &Semantics<RootDatabase>,
    position: FilePosition,
    search_scope: Option<SearchScope>,
 ) -> Option<RangeInfo<ReferenceSearchResult>> {
    let _p = profile("find_all_refs");
-    let sema = Semantics::new(db);
    let syntax = sema.parse(position.file_id).syntax().clone();
    let (opt_name, search_kind) = if let Some(name) =
@@ -108,15 +107,15 @@ pub(crate) fn find_all_refs(
    let RangeInfo { range, info: def } = find_name(&sema, &syntax, position, opt_name)?;
    let references = def
-        .find_usages(db, search_scope)
+        .find_usages(sema, search_scope)
        .into_iter()
        .filter(|r| search_kind == ReferenceKind::Other || search_kind == r.kind)
        .collect();
-    let decl_range = def.try_to_nav(db)?.range();
+    let decl_range = def.try_to_nav(sema.db)?.focus_or_full_range();
    let declaration = Declaration {
-        nav: def.try_to_nav(db)?,
+        nav: def.try_to_nav(sema.db)?,
        kind: ReferenceKind::Other,
        access: decl_access(&def, &syntax, decl_range),
    };
@@ -173,16 +172,16 @@ fn get_struct_def_name_for_struct_literal_search(
        if let Some(name) =
            sema.find_node_at_offset_with_descend::<ast::Name>(&syntax, left.text_range().start())
        {
-            return name.syntax().ancestors().find_map(ast::StructDef::cast).and_then(|l| l.name());
+            return name.syntax().ancestors().find_map(ast::Struct::cast).and_then(|l| l.name());
        }
        if sema
-            .find_node_at_offset_with_descend::<ast::TypeParamList>(
+            .find_node_at_offset_with_descend::<ast::GenericParamList>(
                &syntax,
                left.text_range().start(),
            )
            .is_some()
        {
-            return left.ancestors().find_map(ast::StructDef::cast).and_then(|l| l.name());
+            return left.ancestors().find_map(ast::Struct::cast).and_then(|l| l.name());
        }
    }
    None
@@ -213,7 +212,7 @@ fn main() {
        );
        check_result(
            refs,
-            "Foo STRUCT_DEF FileId(1) 0..26 7..10 Other",
+            "Foo STRUCT FileId(1) 0..26 7..10 Other",
            &["FileId(1) 101..104 StructLiteral"],
        );
    }
@@ -231,7 +230,7 @@ struct Foo<|> {}
        );
        check_result(
            refs,
-            "Foo STRUCT_DEF FileId(1) 0..13 7..10 Other",
+            "Foo STRUCT FileId(1) 0..13 7..10 Other",
            &["FileId(1) 41..44 Other", "FileId(1) 54..57 StructLiteral"],
        );
    }
@@ -249,7 +248,7 @@ struct Foo<T> <|>{}
        );
        check_result(
            refs,
-            "Foo STRUCT_DEF FileId(1) 0..16 7..10 Other",
+            "Foo STRUCT FileId(1) 0..16 7..10 Other",
            &["FileId(1) 64..67 StructLiteral"],
        );
    }
@@ -268,7 +267,7 @@ fn main() {
        );
        check_result(
            refs,
-            "Foo STRUCT_DEF FileId(1) 0..16 7..10 Other",
+            "Foo STRUCT FileId(1) 0..16 7..10 Other",
            &["FileId(1) 54..57 StructLiteral"],
        );
    }
@@ -362,7 +361,7 @@ fn main(s: Foo) {
        );
        check_result(
            refs,
-            "spam RECORD_FIELD_DEF FileId(1) 17..30 21..25 Other",
+            "spam RECORD_FIELD FileId(1) 17..30 21..25 Other",
            &["FileId(1) 67..71 Other Read"],
        );
    }
@@ -377,7 +376,7 @@ impl Foo {
 }
 "#,
        );
-        check_result(refs, "f FN_DEF FileId(1) 27..43 30..31 Other", &[]);
+        check_result(refs, "f FN FileId(1) 27..43 30..31 Other", &[]);
    }
    #[test]
@@ -391,7 +390,7 @@ enum Foo {
 }
 "#,
        );
-        check_result(refs, "B ENUM_VARIANT FileId(1) 22..23 22..23 Other", &[]);
+        check_result(refs, "B VARIANT FileId(1) 22..23 22..23 Other", &[]);
    }
    #[test]
@@ -432,7 +431,7 @@ fn f() {
        let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
        check_result(
            refs,
-            "Foo STRUCT_DEF FileId(2) 17..51 28..31 Other",
+            "Foo STRUCT FileId(2) 17..51 28..31 Other",
            &["FileId(1) 53..56 StructLiteral", "FileId(3) 79..82 StructLiteral"],
        );
    }
@@ -487,7 +486,7 @@ pub(super) struct Foo<|> {
        let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
        check_result(
            refs,
-            "Foo STRUCT_DEF FileId(3) 0..41 18..21 Other",
+            "Foo STRUCT FileId(3) 0..41 18..21 Other",
            &["FileId(2) 20..23 Other", "FileId(2) 47..50 StructLiteral"],
        );
    }
@@ -515,7 +514,7 @@ pub(super) struct Foo<|> {
        let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
        check_result(
            refs,
-            "quux FN_DEF FileId(1) 19..35 26..30 Other",
+            "quux FN FileId(1) 19..35 26..30 Other",
            &["FileId(2) 16..20 StructLiteral", "FileId(3) 16..20 StructLiteral"],
        );
@@ -523,7 +522,7 @@ pub(super) struct Foo<|> {
            analysis.find_all_refs(pos, Some(SearchScope::single_file(bar))).unwrap().unwrap();
        check_result(
            refs,
-            "quux FN_DEF FileId(1) 19..35 26..30 Other",
+            "quux FN FileId(1) 19..35 26..30 Other",
            &["FileId(3) 16..20 StructLiteral"],
        );
    }
@@ -581,7 +580,7 @@ fn foo() {
        );
        check_result(
            refs,
-            "f RECORD_FIELD_DEF FileId(1) 15..21 15..16 Other",
+            "f RECORD_FIELD FileId(1) 15..21 15..16 Other",
            &["FileId(1) 55..56 Other Read", "FileId(1) 68..69 Other Write"],
        );
    }
@@ -620,7 +619,7 @@ fn main() {
        );
        check_result(
            refs,
-            "new FN_DEF FileId(1) 54..101 61..64 Other",
+            "new FN FileId(1) 54..101 61..64 Other",
            &["FileId(1) 146..149 StructLiteral"],
        );
    }
@@ -647,7 +646,7 @@ fn main() {
        let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
        check_result(
            refs,
-            "f FN_DEF FileId(1) 26..35 29..30 Other",
+            "f FN FileId(1) 26..35 29..30 Other",
            &["FileId(2) 11..12 Other", "FileId(2) 28..29 StructLiteral"],
        );
    }
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index 7ebc0adcf..31654bf79 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -7,7 +7,8 @@ use ra_ide_db::{
    RootDatabase,
 };
 use ra_syntax::{
-    algo::find_node_at_offset, ast, ast::NameOwner, ast::TypeAscriptionOwner,
+    algo::find_node_at_offset,
+    ast::{self, NameOwner},
    lex_single_valid_syntax_kind, match_ast, AstNode, SyntaxKind, SyntaxNode, SyntaxToken,
 };
 use ra_text_edit::TextEdit;
@@ -24,23 +25,24 @@ pub(crate) fn rename(
    position: FilePosition,
    new_name: &str,
 ) -> Option<RangeInfo<SourceChange>> {
+    let sema = Semantics::new(db);
    match lex_single_valid_syntax_kind(new_name)? {
        SyntaxKind::IDENT | SyntaxKind::UNDERSCORE => (),
-        SyntaxKind::SELF_KW => return rename_to_self(db, position),
+        SyntaxKind::SELF_KW => return rename_to_self(&sema, position),
        _ => return None,
    }
-    let sema = Semantics::new(db);
    let source_file = sema.parse(position.file_id);
    let syntax = source_file.syntax();
    if let Some(module) = find_module_at_offset(&sema, position, syntax) {
-        rename_mod(db, position, module, new_name)
+        rename_mod(&sema, position, module, new_name)
    } else if let Some(self_token) =
        syntax.token_at_offset(position.offset).find(|t| t.kind() == SyntaxKind::SELF_KW)
    {
-        rename_self_to_param(db, position, self_token, new_name)
+        rename_self_to_param(&sema, position, self_token, new_name)
    } else {
-        rename_reference(sema.db, position, new_name)
+        rename_reference(&sema, position, new_name)
    }
 }
@@ -97,7 +99,7 @@ fn source_edit_from_reference(reference: Reference, new_name: &str) -> SourceFil
 }
 fn rename_mod(
-    db: &RootDatabase,
+    sema: &Semantics<RootDatabase>,
    position: FilePosition,
    module: Module,
    new_name: &str,
@@ -105,34 +107,33 @@ fn rename_mod(
    let mut source_file_edits = Vec::new();
    let mut file_system_edits = Vec::new();
-    let src = module.definition_source(db);
+    let src = module.definition_source(sema.db);
-    let file_id = src.file_id.original_file(db);
+    let file_id = src.file_id.original_file(sema.db);
    match src.value {
        ModuleSource::SourceFile(..) => {
            // mod is defined in path/to/dir/mod.rs
-            let dst = if module.is_mod_rs(db) {
+            let dst = if module.is_mod_rs(sema.db) {
                format!("../{}/mod.rs", new_name)
            } else {
                format!("{}.rs", new_name)
            };
-            let move_file =
+            let move_file = FileSystemEdit::MoveFile { src: file_id, anchor: file_id, dst };
-                FileSystemEdit::MoveFile { src: file_id, anchor: position.file_id, dst };
            file_system_edits.push(move_file);
        }
        ModuleSource::Module(..) => {}
    }
-    if let Some(src) = module.declaration_source(db) {
+    if let Some(src) = module.declaration_source(sema.db) {
-        let file_id = src.file_id.original_file(db);
+        let file_id = src.file_id.original_file(sema.db);
        let name = src.value.name()?;
        let edit = SourceFileEdit {
-            file_id: file_id,
+            file_id,
            edit: TextEdit::replace(name.syntax().text_range(), new_name.into()),
        };
        source_file_edits.push(edit);
    }
-    let RangeInfo { range, info: refs } = find_all_refs(db, position, None)?;
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position, None)?;
    let ref_edits = refs
        .references
        .into_iter()
@@ -142,23 +143,25 @@ fn rename_mod(
    Some(RangeInfo::new(range, SourceChange::from_edits(source_file_edits, file_system_edits)))
 }
-fn rename_to_self(db: &RootDatabase, position: FilePosition) -> Option<RangeInfo<SourceChange>> {
+fn rename_to_self(
-    let sema = Semantics::new(db);
+    sema: &Semantics<RootDatabase>,
+    position: FilePosition,
+) -> Option<RangeInfo<SourceChange>> {
    let source_file = sema.parse(position.file_id);
    let syn = source_file.syntax();
-    let fn_def = find_node_at_offset::<ast::FnDef>(syn, position.offset)?;
+    let fn_def = find_node_at_offset::<ast::Fn>(syn, position.offset)?;
    let params = fn_def.param_list()?;
    if params.self_param().is_some() {
        return None; // method already has self param
    }
    let first_param = params.params().next()?;
-    let mutable = match first_param.ascribed_type() {
+    let mutable = match first_param.ty() {
        Some(ast::TypeRef::ReferenceType(rt)) => rt.mut_token().is_some(),
        _ => return None, // not renaming other types
    };
-    let RangeInfo { range, info: refs } = find_all_refs(db, position, None)?;
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position, None)?;
    let param_range = first_param.syntax().text_range();
    let (param_ref, usages): (Vec<Reference>, Vec<Reference>) = refs
@@ -190,15 +193,14 @@ fn text_edit_from_self_param(
    self_param: &ast::SelfParam,
    new_name: &str,
 ) -> Option<TextEdit> {
-    fn target_type_name(impl_def: &ast::ImplDef) -> Option<String> {
+    fn target_type_name(impl_def: &ast::Impl) -> Option<String> {
        if let Some(ast::TypeRef::PathType(p)) = impl_def.target_type() {
            return Some(p.path()?.segment()?.name_ref()?.text().to_string());
        }
        None
    }
-    let impl_def =
+    let impl_def = find_node_at_offset::<ast::Impl>(syn, self_param.syntax().text_range().start())?;
-        find_node_at_offset::<ast::ImplDef>(syn, self_param.syntax().text_range().start())?;
    let type_name = target_type_name(&impl_def)?;
    let mut replacement_text = String::from(new_name);
@@ -210,17 +212,16 @@ fn text_edit_from_self_param(
 }
 fn rename_self_to_param(
-    db: &RootDatabase,
+    sema: &Semantics<RootDatabase>,
    position: FilePosition,
    self_token: SyntaxToken,
    new_name: &str,
 ) -> Option<RangeInfo<SourceChange>> {
-    let sema = Semantics::new(db);
    let source_file = sema.parse(position.file_id);
    let syn = source_file.syntax();
-    let text = db.file_text(position.file_id);
+    let text = sema.db.file_text(position.file_id);
-    let fn_def = find_node_at_offset::<ast::FnDef>(syn, position.offset)?;
+    let fn_def = find_node_at_offset::<ast::Fn>(syn, position.offset)?;
    let search_range = fn_def.syntax().text_range();
    let mut edits: Vec<SourceFileEdit> = vec![];
@@ -249,11 +250,11 @@ fn rename_self_to_param(
 }
 fn rename_reference(
-    db: &RootDatabase,
+    sema: &Semantics<RootDatabase>,
    position: FilePosition,
    new_name: &str,
 ) -> Option<RangeInfo<SourceChange>> {
-    let RangeInfo { range, info: refs } = find_all_refs(db, position, None)?;
+    let RangeInfo { range, info: refs } = find_all_refs(sema, position, None)?;
    let edit = refs
        .into_iter()
@@ -269,51 +270,51 @@ fn rename_reference(
 #[cfg(test)]
 mod tests {
-    use insta::assert_debug_snapshot;
+    use expect::{expect, Expect};
    use ra_text_edit::TextEditBuilder;
    use stdx::trim_indent;
    use test_utils::{assert_eq_text, mark};
    use crate::{mock_analysis::analysis_and_position, FileId};
+    fn check(new_name: &str, ra_fixture_before: &str, ra_fixture_after: &str) {
+        let ra_fixture_after = &trim_indent(ra_fixture_after);
+        let (analysis, position) = analysis_and_position(ra_fixture_before);
+        let source_change = analysis.rename(position, new_name).unwrap();
+        let mut text_edit_builder = TextEditBuilder::default();
+        let mut file_id: Option<FileId> = None;
+        if let Some(change) = source_change {
+            for edit in change.info.source_file_edits {
+                file_id = Some(edit.file_id);
+                for indel in edit.edit.into_iter() {
+                    text_edit_builder.replace(indel.delete, indel.insert);
+                }
+            }
+        }
+        let mut result = analysis.file_text(file_id.unwrap()).unwrap().to_string();
+        text_edit_builder.finish().apply(&mut result);
+        assert_eq_text!(ra_fixture_after, &*result);
+    }
+    fn check_expect(new_name: &str, ra_fixture: &str, expect: Expect) {
+        let (analysis, position) = analysis_and_position(ra_fixture);
+        let source_change = analysis.rename(position, new_name).unwrap().unwrap();
+        expect.assert_debug_eq(&source_change)
+    }
    #[test]
    fn test_rename_to_underscore() {
-        test_rename(
+        check("_", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let _ = 1; }"#);
-            r#"
-    fn main() {
-        let i<|> = 1;
-    }"#,
-            "_",
-            r#"
-    fn main() {
-        let _ = 1;
-    }"#,
-        );
    }
    #[test]
    fn test_rename_to_raw_identifier() {
-        test_rename(
+        check("r#fn", r#"fn main() { let i<|> = 1; }"#, r#"fn main() { let r#fn = 1; }"#);
-            r#"
-    fn main() {
-        let i<|> = 1;
-    }"#,
-            "r#fn",
-            r#"
-    fn main() {
-        let r#fn = 1;
-    }"#,
-        );
    }
    #[test]
    fn test_rename_to_invalid_identifier() {
-        let (analysis, position) = analysis_and_position(
+        let (analysis, position) = analysis_and_position(r#"fn main() { let i<|> = 1; }"#);
-            "
-    fn main() {
-        let i<|> = 1;
-    }",
-        );
        let new_name = "invalid!";
        let source_change = analysis.rename(position, new_name).unwrap();
        assert!(source_change.is_none());
@@ -321,318 +322,269 @@ mod tests {
    #[test]
    fn test_rename_for_local() {
-        test_rename(
+        check(
+            "k",
            r#"
-    fn main() {
+fn main() {
-        let mut i = 1;
+    let mut i = 1;
-        let j = 1;
+    let j = 1;
-        i = i<|> + j;
+    i = i<|> + j;
-        {
+    { i = 0; }
-            i = 0;
-        }
-        i = 5;
+    i = 5;
-    }"#,
+}
-            "k",
+"#,
            r#"
-    fn main() {
+fn main() {
-        let mut k = 1;
+    let mut k = 1;
-        let j = 1;
+    let j = 1;
-        k = k + j;
+    k = k + j;
-        {
+    { k = 0; }
-            k = 0;
-        }
-        k = 5;
+    k = 5;
-    }"#,
+}
+"#,
        );
    }
    #[test]
    fn test_rename_for_macro_args() {
-        test_rename(
+        check(
-            r#"
-    macro_rules! foo {($i:ident) => {$i} }
-    fn main() {
-        let a<|> = "test";
-        foo!(a);
-    }"#,
            "b",
            r#"
-    macro_rules! foo {($i:ident) => {$i} }
+macro_rules! foo {($i:ident) => {$i} }
-    fn main() {
+fn main() {
-        let b = "test";
+    let a<|> = "test";
-        foo!(b);
+    foo!(a);
-    }"#,
+}
+"#,
+            r#"
+macro_rules! foo {($i:ident) => {$i} }
+fn main() {
+    let b = "test";
+    foo!(b);
+}
+"#,
        );
    }
    #[test]
    fn test_rename_for_macro_args_rev() {
-        test_rename(
+        check(
-            r#"
-    macro_rules! foo {($i:ident) => {$i} }
-    fn main() {
-        let a = "test";
-        foo!(a<|>);
-    }"#,
            "b",
            r#"
-    macro_rules! foo {($i:ident) => {$i} }
+macro_rules! foo {($i:ident) => {$i} }
-    fn main() {
+fn main() {
-        let b = "test";
+    let a = "test";
-        foo!(b);
+    foo!(a<|>);
-    }"#,
+}
+"#,
+            r#"
+macro_rules! foo {($i:ident) => {$i} }
+fn main() {
+    let b = "test";
+    foo!(b);
+}
+"#,
        );
    }
    #[test]
    fn test_rename_for_macro_define_fn() {
-        test_rename(
+        check(
-            r#"
-    macro_rules! define_fn {($id:ident) => { fn $id{} }}
-    define_fn!(foo);
-    fn main() {
-        fo<|>o();
-    }"#,
            "bar",
            r#"
-    macro_rules! define_fn {($id:ident) => { fn $id{} }}
+macro_rules! define_fn {($id:ident) => { fn $id{} }}
-    define_fn!(bar);
+define_fn!(foo);
-    fn main() {
+fn main() {
-        bar();
+    fo<|>o();
-    }"#,
+}
+"#,
+            r#"
+macro_rules! define_fn {($id:ident) => { fn $id{} }}
+define_fn!(bar);
+fn main() {
+    bar();
+}
+"#,
        );
    }
    #[test]
    fn test_rename_for_macro_define_fn_rev() {
-        test_rename(
+        check(
-            r#"
-    macro_rules! define_fn {($id:ident) => { fn $id{} }}
-    define_fn!(fo<|>o);
-    fn main() {
-        foo();
-    }"#,
            "bar",
            r#"
-    macro_rules! define_fn {($id:ident) => { fn $id{} }}
+macro_rules! define_fn {($id:ident) => { fn $id{} }}
-    define_fn!(bar);
+define_fn!(fo<|>o);
-    fn main() {
+fn main() {
-        bar();
+    foo();
-    }"#,
+}
+"#,
+            r#"
+macro_rules! define_fn {($id:ident) => { fn $id{} }}
+define_fn!(bar);
+fn main() {
+    bar();
+}
+"#,
        );
    }
    #[test]
    fn test_rename_for_param_inside() {
-        test_rename(
+        check("j", r#"fn foo(i : u32) -> u32 { i<|> }"#, r#"fn foo(j : u32) -> u32 { j }"#);
-            r#"
-    fn foo(i : u32) -> u32 {
-        i<|>
-    }"#,
-            "j",
-            r#"
-    fn foo(j : u32) -> u32 {
-        j
-    }"#,
-        );
    }
    #[test]
    fn test_rename_refs_for_fn_param() {
-        test_rename(
+        check("j", r#"fn foo(i<|> : u32) -> u32 { i }"#, r#"fn foo(j : u32) -> u32 { j }"#);
-            r#"
-    fn foo(i<|> : u32) -> u32 {
-        i
-    }"#,
-            "new_name",
-            r#"
-    fn foo(new_name : u32) -> u32 {
-        new_name
-    }"#,
-        );
    }
    #[test]
    fn test_rename_for_mut_param() {
-        test_rename(
+        check("j", r#"fn foo(mut i<|> : u32) -> u32 { i }"#, r#"fn foo(mut j : u32) -> u32 { j }"#);
-            r#"
-    fn foo(mut i<|> : u32) -> u32 {
-        i
-    }"#,
-            "new_name",
-            r#"
-    fn foo(mut new_name : u32) -> u32 {
-        new_name
-    }"#,
-        );
    }
    #[test]
    fn test_rename_struct_field() {
-        test_rename(
+        check(
+            "j",
            r#"
-    struct Foo {
+struct Foo { i<|>: i32 }
-        i<|>: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn new(i: i32) -> Self {
+    fn new(i: i32) -> Self {
-            Self { i: i }
+        Self { i: i }
-        }
    }
-    "#,
+}
-            "j",
+"#,
            r#"
-    struct Foo {
+struct Foo { j: i32 }
-        j: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn new(i: i32) -> Self {
+    fn new(i: i32) -> Self {
-            Self { j: i }
+        Self { j: i }
-        }
    }
-    "#,
+}
+"#,
        );
    }
    #[test]
    fn test_rename_struct_field_for_shorthand() {
        mark::check!(test_rename_struct_field_for_shorthand);
-        test_rename(
+        check(
+            "j",
            r#"
-    struct Foo {
+struct Foo { i<|>: i32 }
-        i<|>: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn new(i: i32) -> Self {
+    fn new(i: i32) -> Self {
-            Self { i }
+        Self { i }
-        }
    }
-    "#,
+}
-            "j",
+"#,
            r#"
-    struct Foo {
+struct Foo { j: i32 }
-        j: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn new(i: i32) -> Self {
+    fn new(i: i32) -> Self {
-            Self { j: i }
+        Self { j: i }
-        }
    }
-    "#,
+}
+"#,
        );
    }
    #[test]
    fn test_rename_local_for_field_shorthand() {
        mark::check!(test_rename_local_for_field_shorthand);
-        test_rename(
+        check(
+            "j",
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn new(i<|>: i32) -> Self {
+    fn new(i<|>: i32) -> Self {
-            Self { i }
+        Self { i }
-        }
    }
-    "#,
+}
-            "j",
+"#,
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn new(j: i32) -> Self {
+    fn new(j: i32) -> Self {
-            Self { i: j }
+        Self { i: j }
-        }
    }
-    "#,
+}
+"#,
        );
    }
    #[test]
    fn test_field_shorthand_correct_struct() {
-        test_rename(
+        check(
-            r#"
-    struct Foo {
-        i<|>: i32,
-    }
-    struct Bar {
-        i: i32,
-    }
-    impl Bar {
-        fn new(i: i32) -> Self {
-            Self { i }
-        }
-    }
-    "#,
            "j",
            r#"
-    struct Foo {
+struct Foo { i<|>: i32 }
-        j: i32,
+struct Bar { i: i32 }
-    }
-    struct Bar {
+impl Bar {
-        i: i32,
+    fn new(i: i32) -> Self {
+        Self { i }
    }
+}
+"#,
+            r#"
+struct Foo { j: i32 }
+struct Bar { i: i32 }
-    impl Bar {
+impl Bar {
-        fn new(i: i32) -> Self {
+    fn new(i: i32) -> Self {
-            Self { i }
+        Self { i }
-        }
    }
-    "#,
+}
+"#,
        );
    }
    #[test]
    fn test_shadow_local_for_struct_shorthand() {
-        test_rename(
+        check(
+            "j",
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    fn baz(i<|>: i32) -> Self {
+fn baz(i<|>: i32) -> Self {
-         let x = Foo { i };
+     let x = Foo { i };
-         {
+     {
-             let i = 0;
+         let i = 0;
-             Foo { i }
+         Foo { i }
-         }
     }
-    "#,
+}
-            "j",
+"#,
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    fn baz(j: i32) -> Self {
+fn baz(j: i32) -> Self {
-         let x = Foo { i: j };
+     let x = Foo { i: j };
-         {
+     {
-             let i = 0;
+         let i = 0;
-             Foo { i }
+         Foo { i }
-         }
     }
-    "#,
+}
+"#,
        );
    }
    #[test]
    fn test_rename_mod() {
-        let (analysis, position) = analysis_and_position(
+        check_expect(
+            "foo2",
            r#"
 //- /lib.rs
 mod bar;
@@ -641,53 +593,49 @@ mod bar;
 mod foo<|>;
 //- /bar/foo.rs
-// emtpy
+// empty
-            "#,
+"#,
-        );
+            expect![[r#"
-        let new_name = "foo2";
+                RangeInfo {
-        let source_change = analysis.rename(position, new_name).unwrap();
+                    range: 4..7,
-        assert_debug_snapshot!(&source_change,
+                    info: SourceChange {
-@r###"
+                        source_file_edits: [
-        Some(
+                            SourceFileEdit {
-            RangeInfo {
+                                file_id: FileId(
-                range: 4..7,
+                                    2,
-                info: SourceChange {
+                                ),
-                    source_file_edits: [
+                                edit: TextEdit {
-                        SourceFileEdit {
+                                    indels: [
-                            file_id: FileId(
+                                        Indel {
-                                2,
+                                            insert: "foo2",
-                            ),
+                                            delete: 4..7,
-                            edit: TextEdit {
+                                        },
-                                indels: [
+                                    ],
-                                    Indel {
+                                },
-                                        insert: "foo2",
-                                        delete: 4..7,
-                                    },
-                                ],
                            },
-                        },
+                        ],
-                    ],
+                        file_system_edits: [
-                    file_system_edits: [
+                            MoveFile {
-                        MoveFile {
+                                src: FileId(
-                            src: FileId(
+                                    3,
-                                3,
+                                ),
-                            ),
+                                anchor: FileId(
-                            anchor: FileId(
+                                    3,
-                                2,
+                                ),
-                            ),
+                                dst: "foo2.rs",
-                            dst: "foo2.rs",
+                            },
-                        },
+                        ],
-                    ],
+                        is_snippet: false,
-                    is_snippet: false,
+                    },
-                },
+                }
-            },
+            "#]],
-        )
+        );
-        "###);
    }
    #[test]
    fn test_rename_mod_in_use_tree() {
-        let (analysis, position) = analysis_and_position(
+        check_expect(
+            "quux",
            r#"
 //- /main.rs
 pub mod foo;
@@ -699,140 +647,173 @@ pub struct FooContent;
 //- /bar.rs
 use crate::foo<|>::FooContent;
-            "#,
+"#,
-        );
+            expect![[r#"
-        let new_name = "qux";
+                RangeInfo {
-        let source_change = analysis.rename(position, new_name).unwrap();
+                    range: 11..14,
-        assert_debug_snapshot!(&source_change,
+                    info: SourceChange {
-@r###"
+                        source_file_edits: [
-        Some(
+                            SourceFileEdit {
-            RangeInfo {
+                                file_id: FileId(
-                range: 11..14,
+                                    1,
-                info: SourceChange {
+                                ),
-                    source_file_edits: [
+                                edit: TextEdit {
-                        SourceFileEdit {
+                                    indels: [
-                            file_id: FileId(
+                                        Indel {
-                                1,
+                                            insert: "quux",
-                            ),
+                                            delete: 8..11,
-                            edit: TextEdit {
+                                        },
-                                indels: [
+                                    ],
-                                    Indel {
+                                },
-                                        insert: "qux",
-                                        delete: 8..11,
-                                    },
-                                ],
                            },
-                        },
+                            SourceFileEdit {
-                        SourceFileEdit {
+                                file_id: FileId(
-                            file_id: FileId(
+                                    3,
-                                3,
+                                ),
-                            ),
+                                edit: TextEdit {
-                            edit: TextEdit {
+                                    indels: [
-                                indels: [
+                                        Indel {
-                                    Indel {
+                                            insert: "quux",
-                                        insert: "qux",
+                                            delete: 11..14,
-                                        delete: 11..14,
+                                        },
-                                    },
+                                    ],
-                                ],
+                                },
                            },
-                        },
+                        ],
-                    ],
+                        file_system_edits: [
-                    file_system_edits: [
+                            MoveFile {
-                        MoveFile {
+                                src: FileId(
-                            src: FileId(
+                                    2,
-                                2,
+                                ),
-                            ),
+                                anchor: FileId(
-                            anchor: FileId(
+                                    2,
-                                3,
+                                ),
-                            ),
+                                dst: "quux.rs",
-                            dst: "qux.rs",
+                            },
-                        },
+                        ],
-                    ],
+                        is_snippet: false,
-                    is_snippet: false,
+                    },
-                },
+                }
-            },
+            "#]],
-        )
+        );
-        "###);
    }
    #[test]
    fn test_rename_mod_in_dir() {
-        let (analysis, position) = analysis_and_position(
+        check_expect(
+            "foo2",
            r#"
 //- /lib.rs
 mod fo<|>o;
 //- /foo/mod.rs
 // emtpy
-            "#,
+"#,
-        );
+            expect![[r#"
-        let new_name = "foo2";
+                RangeInfo {
-        let source_change = analysis.rename(position, new_name).unwrap();
+                    range: 4..7,
-        assert_debug_snapshot!(&source_change,
+                    info: SourceChange {
-        @r###"
+                        source_file_edits: [
-        Some(
+                            SourceFileEdit {
-            RangeInfo {
+                                file_id: FileId(
-                range: 4..7,
+                                    1,
-                info: SourceChange {
+                                ),
-                    source_file_edits: [
+                                edit: TextEdit {
-                        SourceFileEdit {
+                                    indels: [
-                            file_id: FileId(
+                                        Indel {
-                                1,
+                                            insert: "foo2",
-                            ),
+                                            delete: 4..7,
-                            edit: TextEdit {
+                                        },
-                                indels: [
+                                    ],
-                                    Indel {
+                                },
-                                        insert: "foo2",
-                                        delete: 4..7,
-                                    },
-                                ],
                            },
-                        },
+                        ],
-                    ],
+                        file_system_edits: [
-                    file_system_edits: [
+                            MoveFile {
-                        MoveFile {
+                                src: FileId(
-                            src: FileId(
+                                    2,
-                                2,
+                                ),
-                            ),
+                                anchor: FileId(
-                            anchor: FileId(
+                                    2,
-                                1,
+                                ),
-                            ),
+                                dst: "../foo2/mod.rs",
-                            dst: "../foo2/mod.rs",
+                            },
-                        },
+                        ],
-                    ],
+                        is_snippet: false,
-                    is_snippet: false,
+                    },
-                },
+                }
-            },
+            "#]],
-        )
+        );
-        "###
-               );
    }
    #[test]
-    fn test_module_rename_in_path() {
+    fn test_rename_unusually_nested_mod() {
-        test_rename(
+        check_expect(
+            "bar",
            r#"
-    mod <|>foo {
+//- /lib.rs
-        pub fn bar() {}
+mod outer { mod fo<|>o; }
+//- /outer/foo.rs
+// emtpy
+"#,
+            expect![[r#"
+                RangeInfo {
+                    range: 16..19,
+                    info: SourceChange {
+                        source_file_edits: [
+                            SourceFileEdit {
+                                file_id: FileId(
+                                    1,
+                                ),
+                                edit: TextEdit {
+                                    indels: [
+                                        Indel {
+                                            insert: "bar",
+                                            delete: 16..19,
+                                        },
+                                    ],
+                                },
+                            },
+                        ],
+                        file_system_edits: [
+                            MoveFile {
+                                src: FileId(
+                                    2,
+                                ),
+                                anchor: FileId(
+                                    2,
+                                ),
+                                dst: "bar.rs",
+                            },
+                        ],
+                        is_snippet: false,
+                    },
+                }
+            "#]],
+        );
    }
-    fn main() {
+    #[test]
-        foo::bar();
+    fn test_module_rename_in_path() {
-    }"#,
+        check(
            "baz",
            r#"
-    mod baz {
+mod <|>foo { pub fn bar() {} }
-        pub fn bar() {}
-    }
+fn main() { foo::bar(); }
+"#,
+            r#"
+mod baz { pub fn bar() {} }
-    fn main() {
+fn main() { baz::bar(); }
-        baz::bar();
+"#,
-    }"#,
        );
    }
    #[test]
    fn test_rename_mod_filename_and_path() {
-        let (analysis, position) = analysis_and_position(
+        check_expect(
+            "foo2",
            r#"
 //- /lib.rs
 mod bar;
@@ -845,229 +826,185 @@ pub mod foo<|>;
 //- /bar/foo.rs
 // pub fn fun() {}
-            "#,
+"#,
-        );
+            expect![[r#"
-        let new_name = "foo2";
+                RangeInfo {
-        let source_change = analysis.rename(position, new_name).unwrap();
+                    range: 8..11,
-        assert_debug_snapshot!(&source_change,
+                    info: SourceChange {
-@r###"
+                        source_file_edits: [
-        Some(
+                            SourceFileEdit {
-            RangeInfo {
+                                file_id: FileId(
-                range: 8..11,
+                                    2,
-                info: SourceChange {
+                                ),
-                    source_file_edits: [
+                                edit: TextEdit {
-                        SourceFileEdit {
+                                    indels: [
-                            file_id: FileId(
+                                        Indel {
-                                2,
+                                            insert: "foo2",
-                            ),
+                                            delete: 8..11,
-                            edit: TextEdit {
+                                        },
-                                indels: [
+                                    ],
-                                    Indel {
+                                },
-                                        insert: "foo2",
-                                        delete: 8..11,
-                                    },
-                                ],
                            },
-                        },
+                            SourceFileEdit {
-                        SourceFileEdit {
+                                file_id: FileId(
-                            file_id: FileId(
+                                    1,
-                                1,
+                                ),
-                            ),
+                                edit: TextEdit {
-                            edit: TextEdit {
+                                    indels: [
-                                indels: [
+                                        Indel {
-                                    Indel {
+                                            insert: "foo2",
-                                        insert: "foo2",
+                                            delete: 27..30,
-                                        delete: 27..30,
+                                        },
-                                    },
+                                    ],
-                                ],
+                                },
                            },
-                        },
+                        ],
-                    ],
+                        file_system_edits: [
-                    file_system_edits: [
+                            MoveFile {
-                        MoveFile {
+                                src: FileId(
-                            src: FileId(
+                                    3,
-                                3,
+                                ),
-                            ),
+                                anchor: FileId(
-                            anchor: FileId(
+                                    3,
-                                2,
+                                ),
-                            ),
+                                dst: "foo2.rs",
-                            dst: "foo2.rs",
+                            },
-                        },
+                        ],
-                    ],
+                        is_snippet: false,
-                    is_snippet: false,
+                    },
-                },
+                }
-            },
+            "#]],
-        )
+        );
-        "###);
    }
    #[test]
    fn test_enum_variant_from_module_1() {
-        test_rename(
+        check(
+            "Baz",
            r#"
-    mod foo {
+mod foo {
-        pub enum Foo {
+    pub enum Foo { Bar<|> }
-            Bar<|>,
+}
-        }
-    }
-    fn func(f: foo::Foo) {
+fn func(f: foo::Foo) {
-        match f {
+    match f {
-            foo::Foo::Bar => {}
+        foo::Foo::Bar => {}
-        }
    }
-    "#,
+}
-            "Baz",
+"#,
            r#"
-    mod foo {
+mod foo {
-        pub enum Foo {
+    pub enum Foo { Baz }
-            Baz,
+}
-        }
-    }
-    fn func(f: foo::Foo) {
+fn func(f: foo::Foo) {
-        match f {
+    match f {
-            foo::Foo::Baz => {}
+        foo::Foo::Baz => {}
-        }
    }
-    "#,
+}
+"#,
        );
    }
    #[test]
    fn test_enum_variant_from_module_2() {
-        test_rename(
+        check(
+            "baz",
            r#"
-    mod foo {
+mod foo {
-        pub struct Foo {
+    pub struct Foo { pub bar<|>: uint }
-            pub bar<|>: uint,
+}
-        }
-    }
-    fn foo(f: foo::Foo) {
+fn foo(f: foo::Foo) {
-        let _ = f.bar;
+    let _ = f.bar;
-    }
+}
-    "#,
+"#,
-            "baz",
            r#"
-    mod foo {
+mod foo {
-        pub struct Foo {
+    pub struct Foo { pub baz: uint }
-            pub baz: uint,
+}
-        }
-    }
-    fn foo(f: foo::Foo) {
+fn foo(f: foo::Foo) {
-        let _ = f.baz;
+    let _ = f.baz;
-    }
+}
-    "#,
+"#,
        );
    }
    #[test]
    fn test_parameter_to_self() {
-        test_rename(
+        check(
+            "self",
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn f(foo<|>: &mut Foo) -> i32 {
+    fn f(foo<|>: &mut Foo) -> i32 {
-            foo.i
+        foo.i
-        }
    }
-    "#,
+}
-            "self",
+"#,
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn f(&mut self) -> i32 {
+    fn f(&mut self) -> i32 {
-            self.i
+        self.i
-        }
    }
-    "#,
+}
+"#,
        );
    }
    #[test]
    fn test_self_to_parameter() {
-        test_rename(
+        check(
+            "foo",
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn f(&mut <|>self) -> i32 {
+    fn f(&mut <|>self) -> i32 {
-            self.i
+        self.i
-        }
    }
-    "#,
+}
-            "foo",
+"#,
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn f(foo: &mut Foo) -> i32 {
+    fn f(foo: &mut Foo) -> i32 {
-            foo.i
+        foo.i
-        }
    }
-    "#,
+}
+"#,
        );
    }
    #[test]
    fn test_self_in_path_to_parameter() {
-        test_rename(
+        check(
+            "foo",
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn f(&self) -> i32 {
+    fn f(&self) -> i32 {
-            let self_var = 1;
+        let self_var = 1;
-            self<|>.i
+        self<|>.i
-        }
    }
-    "#,
+}
-            "foo",
+"#,
            r#"
-    struct Foo {
+struct Foo { i: i32 }
-        i: i32,
-    }
-    impl Foo {
+impl Foo {
-        fn f(foo: &Foo) -> i32 {
+    fn f(foo: &Foo) -> i32 {
-            let self_var = 1;
+        let self_var = 1;
-            foo.i
+        foo.i
-        }
    }
-    "#,
+}
+"#,
        );
    }
-    fn test_rename(ra_fixture_before: &str, new_name: &str, ra_fixture_after: &str) {
-        let ra_fixture_after = &trim_indent(ra_fixture_after);
-        let (analysis, position) = analysis_and_position(ra_fixture_before);
-        let source_change = analysis.rename(position, new_name).unwrap();
-        let mut text_edit_builder = TextEditBuilder::default();
-        let mut file_id: Option<FileId> = None;
-        if let Some(change) = source_change {
-            for edit in change.info.source_file_edits {
-                file_id = Some(edit.file_id);
-                for indel in edit.edit.into_iter() {
-                    text_edit_builder.replace(indel.delete, indel.insert);
-                }
-            }
-        }
-        let mut result = analysis.file_text(file_id.unwrap()).unwrap().to_string();
-        text_edit_builder.finish().apply(&mut result);
-        assert_eq_text!(ra_fixture_after, &*result);
-    }
 }
diff --git a/crates/ra_ide/src/runnables.rs b/crates/ra_ide/src/runnables.rs
index f569a3f17..3b7162b84 100644
--- a/crates/ra_ide/src/runnables.rs
+++ b/crates/ra_ide/src/runnables.rs
@@ -102,7 +102,7 @@ pub(crate) fn runnable(
 ) -> Option<Runnable> {
    match_ast! {
        match item {
-            ast::FnDef(it) => runnable_fn(sema, it, file_id),
+            ast::Fn(it) => runnable_fn(sema, it, file_id),
            ast::Module(it) => runnable_mod(sema, it, file_id),
            _ => None,
        }
@@ -111,7 +111,7 @@ pub(crate) fn runnable(
 fn runnable_fn(
    sema: &Semantics<RootDatabase>,
-    fn_def: ast::FnDef,
+    fn_def: ast::Fn,
    file_id: FileId,
 ) -> Option<Runnable> {
    let name_string = fn_def.name()?.text().to_string();
@@ -168,8 +168,7 @@ fn runnable_fn(
    };
    let attrs = Attrs::from_attrs_owner(sema.db, InFile::new(HirFileId::from(file_id), &fn_def));
-    let cfg_exprs =
+    let cfg_exprs = attrs.cfg().collect();
-        attrs.by_key("cfg").tt_values().map(|subtree| ra_cfg::parse_cfg(subtree)).collect();
    let nav = if let RunnableKind::DocTest { .. } = kind {
        NavigationTarget::from_doc_commented(
@@ -189,7 +188,7 @@ pub struct TestAttr {
 }
 impl TestAttr {
-    fn from_fn(fn_def: &ast::FnDef) -> TestAttr {
+    fn from_fn(fn_def: &ast::Fn) -> TestAttr {
        let ignore = fn_def
            .attrs()
            .filter_map(|attr| attr.simple_name())
@@ -204,7 +203,7 @@ impl TestAttr {
 ///
 /// It may produce false positives, for example, `#[wasm_bindgen_test]` requires a different command to run the test,
 /// but it's better than not to have the runnables for the tests at all.
-fn has_test_related_attribute(fn_def: &ast::FnDef) -> bool {
+fn has_test_related_attribute(fn_def: &ast::Fn) -> bool {
    fn_def
        .attrs()
        .filter_map(|attr| attr.path())
@@ -212,7 +211,7 @@ fn has_test_related_attribute(fn_def: &ast::FnDef) -> bool {
        .any(|attribute_text| attribute_text.contains("test"))
 }
-fn has_doc_test(fn_def: &ast::FnDef) -> bool {
+fn has_doc_test(fn_def: &ast::Fn) -> bool {
    fn_def.doc_comment_text().map_or(false, |comment| comment.contains("```"))
 }
@@ -221,15 +220,7 @@ fn runnable_mod(
    module: ast::Module,
    file_id: FileId,
 ) -> Option<Runnable> {
-    let has_test_function = module
+    if !has_test_function_or_multiple_test_submodules(&module) {
-        .item_list()?
-        .items()
-        .filter_map(|it| match it {
-            ast::ModuleItem::FnDef(it) => Some(it),
-            _ => None,
-        })
-        .any(|f| has_test_related_attribute(&f));
-    if !has_test_function {
        return None;
    }
    let module_def = sema.to_def(&module)?;
@@ -242,22 +233,56 @@ fn runnable_mod(
        .join("::");
    let attrs = Attrs::from_attrs_owner(sema.db, InFile::new(HirFileId::from(file_id), &module));
-    let cfg_exprs =
+    let cfg_exprs = attrs.cfg().collect();
-        attrs.by_key("cfg").tt_values().map(|subtree| ra_cfg::parse_cfg(subtree)).collect();
    let nav = module_def.to_nav(sema.db);
    Some(Runnable { nav, kind: RunnableKind::TestMod { path }, cfg_exprs })
 }
+// We could create runnables for modules with number_of_test_submodules > 0,
+// but that bloats the runnables for no real benefit, since all tests can be run by the submodule already
+fn has_test_function_or_multiple_test_submodules(module: &ast::Module) -> bool {
+    if let Some(item_list) = module.item_list() {
+        let mut number_of_test_submodules = 0;
+        for item in item_list.items() {
+            match item {
+                ast::Item::Fn(f) => {
+                    if has_test_related_attribute(&f) {
+                        return true;
+                    }
+                }
+                ast::Item::Module(submodule) => {
+                    if has_test_function_or_multiple_test_submodules(&submodule) {
+                        number_of_test_submodules += 1;
+                    }
+                }
+                _ => (),
+            }
+        }
+        number_of_test_submodules > 1
+    } else {
+        false
+    }
+}
 #[cfg(test)]
 mod tests {
-    use insta::assert_debug_snapshot;
+    use expect::{expect, Expect};
    use crate::mock_analysis::analysis_and_position;
-    use super::{Runnable, RunnableAction, BENCH, BIN, DOCTEST, TEST};
+    use super::{RunnableAction, BENCH, BIN, DOCTEST, TEST};
-    fn assert_actions(runnables: &[Runnable], actions: &[&RunnableAction]) {
+    fn check(
+        ra_fixture: &str,
+        // FIXME: fold this into `expect` as well
+        actions: &[&RunnableAction],
+        expect: Expect,
+    ) {
+        let (analysis, position) = analysis_and_position(ra_fixture);
+        let runnables = analysis.runnables(position.file_id).unwrap();
+        expect.assert_debug_eq(&runnables);
        assert_eq!(
            actions,
            runnables.into_iter().map(|it| it.action()).collect::<Vec<_>>().as_slice()
@@ -266,579 +291,593 @@ mod tests {
    #[test]
    fn test_runnables() {
-        let (analysis, pos) = analysis_and_position(
+        check(
            r#"
-        //- /lib.rs
+//- /lib.rs
-        <|> //empty
+<|>
-        fn main() {}
+fn main() {}
-        #[test]
+#[test]
-        fn test_foo() {}
+fn test_foo() {}
-        #[test]
+#[test]
-        #[ignore]
+#[ignore]
-        fn test_foo() {}
+fn test_foo() {}
-        #[bench]
+#[bench]
-        fn bench() {}
+fn bench() {}
-        "#,
+"#,
-        );
+            &[&BIN, &TEST, &TEST, &BENCH],
-        let runnables = analysis.runnables(pos.file_id).unwrap();
+            expect![[r#"
-        assert_debug_snapshot!(&runnables,
+                [
-        @r###"
+                    Runnable {
-        [
+                        nav: NavigationTarget {
-            Runnable {
+                            file_id: FileId(
-                nav: NavigationTarget {
+                                1,
-                    file_id: FileId(
+                            ),
-                        1,
+                            full_range: 1..13,
-                    ),
+                            focus_range: Some(
-                    full_range: 1..21,
+                                4..8,
-                    name: "main",
+                            ),
-                    kind: FN_DEF,
+                            name: "main",
-                    focus_range: Some(
+                            kind: FN,
-                        12..16,
+                            container_name: None,
-                    ),
+                            description: None,
-                    container_name: None,
+                            docs: None,
-                    description: None,
+                        },
-                    docs: None,
+                        kind: Bin,
-                },
+                        cfg_exprs: [],
-                kind: Bin,
+                    },
-                cfg_exprs: [],
+                    Runnable {
-            },
+                        nav: NavigationTarget {
-            Runnable {
+                            file_id: FileId(
-                nav: NavigationTarget {
+                                1,
-                    file_id: FileId(
+                            ),
-                        1,
+                            full_range: 15..39,
-                    ),
+                            focus_range: Some(
-                    full_range: 23..47,
+                                26..34,
-                    name: "test_foo",
+                            ),
-                    kind: FN_DEF,
+                            name: "test_foo",
-                    focus_range: Some(
+                            kind: FN,
-                        34..42,
+                            container_name: None,
-                    ),
+                            description: None,
-                    container_name: None,
+                            docs: None,
-                    description: None,
+                        },
-                    docs: None,
+                        kind: Test {
-                },
+                            test_id: Path(
-                kind: Test {
+                                "test_foo",
-                    test_id: Path(
+                            ),
-                        "test_foo",
+                            attr: TestAttr {
-                    ),
+                                ignore: false,
-                    attr: TestAttr {
+                            },
-                        ignore: false,
+                        },
+                        cfg_exprs: [],
+                    },
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 41..75,
+                            focus_range: Some(
+                                62..70,
+                            ),
+                            name: "test_foo",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: Test {
+                            test_id: Path(
+                                "test_foo",
+                            ),
+                            attr: TestAttr {
+                                ignore: true,
+                            },
+                        },
+                        cfg_exprs: [],
                    },
-                },
+                    Runnable {
-                cfg_exprs: [],
+                        nav: NavigationTarget {
-            },
+                            file_id: FileId(
-            Runnable {
+                                1,
-                nav: NavigationTarget {
+                            ),
-                    file_id: FileId(
+                            full_range: 77..99,
-                        1,
+                            focus_range: Some(
-                    ),
+                                89..94,
-                    full_range: 49..83,
+                            ),
-                    name: "test_foo",
+                            name: "bench",
-                    kind: FN_DEF,
+                            kind: FN,
-                    focus_range: Some(
+                            container_name: None,
-                        70..78,
+                            description: None,
-                    ),
+                            docs: None,
-                    container_name: None,
+                        },
-                    description: None,
+                        kind: Bench {
-                    docs: None,
+                            test_id: Path(
-                },
+                                "bench",
-                kind: Test {
+                            ),
-                    test_id: Path(
+                        },
-                        "test_foo",
+                        cfg_exprs: [],
-                    ),
-                    attr: TestAttr {
-                        ignore: true,
                    },
-                },
+                ]
-                cfg_exprs: [],
+            "#]],
-            },
+        );
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 85..107,
-                    name: "bench",
-                    kind: FN_DEF,
-                    focus_range: Some(
-                        97..102,
-                    ),
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: Bench {
-                    test_id: Path(
-                        "bench",
-                    ),
-                },
-                cfg_exprs: [],
-            },
-        ]
-        "###
-                );
-        assert_actions(&runnables, &[&BIN, &TEST, &TEST, &BENCH]);
    }
    #[test]
    fn test_runnables_doc_test() {
-        let (analysis, pos) = analysis_and_position(
+        check(
            r#"
-        //- /lib.rs
+//- /lib.rs
-        <|> //empty
+<|>
-        fn main() {}
+fn main() {}
-        /// ```
+/// ```
-        /// let x = 5;
+/// let x = 5;
-        /// ```
+/// ```
-        fn foo() {}
+fn foo() {}
-        "#,
+"#,
+            &[&BIN, &DOCTEST],
+            expect![[r#"
+                [
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 1..13,
+                            focus_range: Some(
+                                4..8,
+                            ),
+                            name: "main",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: Bin,
+                        cfg_exprs: [],
+                    },
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 15..57,
+                            focus_range: None,
+                            name: "foo",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: DocTest {
+                            test_id: Path(
+                                "foo",
+                            ),
+                        },
+                        cfg_exprs: [],
+                    },
+                ]
+            "#]],
        );
-        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert_debug_snapshot!(&runnables,
-        @r###"
-        [
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 1..21,
-                    name: "main",
-                    kind: FN_DEF,
-                    focus_range: Some(
-                        12..16,
-                    ),
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: Bin,
-                cfg_exprs: [],
-            },
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 23..65,
-                    name: "foo",
-                    kind: FN_DEF,
-                    focus_range: None,
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: DocTest {
-                    test_id: Path(
-                        "foo",
-                    ),
-                },
-                cfg_exprs: [],
-            },
-        ]
-        "###
-                );
-        assert_actions(&runnables, &[&BIN, &DOCTEST]);
    }
    #[test]
    fn test_runnables_doc_test_in_impl() {
-        let (analysis, pos) = analysis_and_position(
+        check(
            r#"
-        //- /lib.rs
+//- /lib.rs
-        <|> //empty
+<|>
-        fn main() {}
+fn main() {}
-        struct Data;
+struct Data;
-        impl Data {
+impl Data {
-            /// ```
+    /// ```
-            /// let x = 5;
+    /// let x = 5;
-            /// ```
+    /// ```
-            fn foo() {}
+    fn foo() {}
-        }
+}
-        "#,
+"#,
+            &[&BIN, &DOCTEST],
+            expect![[r#"
+                [
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 1..13,
+                            focus_range: Some(
+                                4..8,
+                            ),
+                            name: "main",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: Bin,
+                        cfg_exprs: [],
+                    },
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 44..98,
+                            focus_range: None,
+                            name: "foo",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: DocTest {
+                            test_id: Path(
+                                "Data::foo",
+                            ),
+                        },
+                        cfg_exprs: [],
+                    },
+                ]
+            "#]],
        );
-        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert_debug_snapshot!(&runnables,
-        @r###"
-        [
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 1..21,
-                    name: "main",
-                    kind: FN_DEF,
-                    focus_range: Some(
-                        12..16,
-                    ),
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: Bin,
-                cfg_exprs: [],
-            },
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 52..106,
-                    name: "foo",
-                    kind: FN_DEF,
-                    focus_range: None,
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: DocTest {
-                    test_id: Path(
-                        "Data::foo",
-                    ),
-                },
-                cfg_exprs: [],
-            },
-        ]
-        "###
-                );
-        assert_actions(&runnables, &[&BIN, &DOCTEST]);
    }
    #[test]
    fn test_runnables_module() {
-        let (analysis, pos) = analysis_and_position(
+        check(
            r#"
-        //- /lib.rs
+//- /lib.rs
-        <|> //empty
+<|>
-        mod test_mod {
+mod test_mod {
-            #[test]
+    #[test]
-            fn test_foo1() {}
+    fn test_foo1() {}
-        }
+}
-        "#,
+"#,
-        );
+            &[&TEST, &TEST],
-        let runnables = analysis.runnables(pos.file_id).unwrap();
+            expect![[r#"
-        assert_debug_snapshot!(&runnables,
+                [
-        @r###"
+                    Runnable {
-        [
+                        nav: NavigationTarget {
-            Runnable {
+                            file_id: FileId(
-                nav: NavigationTarget {
+                                1,
-                    file_id: FileId(
+                            ),
-                        1,
+                            full_range: 1..51,
-                    ),
+                            focus_range: Some(
-                    full_range: 1..59,
+                                5..13,
-                    name: "test_mod",
+                            ),
-                    kind: MODULE,
+                            name: "test_mod",
-                    focus_range: Some(
+                            kind: MODULE,
-                        13..21,
+                            container_name: None,
-                    ),
+                            description: None,
-                    container_name: None,
+                            docs: None,
-                    description: None,
+                        },
-                    docs: None,
+                        kind: TestMod {
-                },
+                            path: "test_mod",
-                kind: TestMod {
+                        },
-                    path: "test_mod",
+                        cfg_exprs: [],
-                },
-                cfg_exprs: [],
-            },
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 28..57,
-                    name: "test_foo1",
-                    kind: FN_DEF,
-                    focus_range: Some(
-                        43..52,
-                    ),
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: Test {
-                    test_id: Path(
-                        "test_mod::test_foo1",
-                    ),
-                    attr: TestAttr {
-                        ignore: false,
                    },
-                },
+                    Runnable {
-                cfg_exprs: [],
+                        nav: NavigationTarget {
-            },
+                            file_id: FileId(
-        ]
+                                1,
-        "###
+                            ),
-                );
+                            full_range: 20..49,
-        assert_actions(&runnables, &[&TEST, &TEST]);
+                            focus_range: Some(
+                                35..44,
+                            ),
+                            name: "test_foo1",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: Test {
+                            test_id: Path(
+                                "test_mod::test_foo1",
+                            ),
+                            attr: TestAttr {
+                                ignore: false,
+                            },
+                        },
+                        cfg_exprs: [],
+                    },
+                ]
+            "#]],
+        );
    }
    #[test]
-    fn test_runnables_one_depth_layer_module() {
+    fn only_modules_with_test_functions_or_more_than_one_test_submodule_have_runners() {
-        let (analysis, pos) = analysis_and_position(
+        check(
            r#"
-        //- /lib.rs
+//- /lib.rs
-        <|> //empty
+<|>
-        mod foo {
+mod root_tests {
-            mod test_mod {
+    mod nested_tests_0 {
-                #[test]
+        mod nested_tests_1 {
-                fn test_foo1() {}
+            #[test]
-            }
+            fn nested_test_11() {}
+            #[test]
+            fn nested_test_12() {}
        }
-        "#,
-        );
-        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert_debug_snapshot!(&runnables,
-        @r###"
-        [
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 23..85,
-                    name: "test_mod",
-                    kind: MODULE,
-                    focus_range: Some(
-                        27..35,
-                    ),
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: TestMod {
-                    path: "foo::test_mod",
-                },
-                cfg_exprs: [],
-            },
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 46..79,
-                    name: "test_foo1",
-                    kind: FN_DEF,
-                    focus_range: Some(
-                        65..74,
-                    ),
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: Test {
-                    test_id: Path(
-                        "foo::test_mod::test_foo1",
-                    ),
-                    attr: TestAttr {
-                        ignore: false,
-                    },
-                },
-                cfg_exprs: [],
-            },
-        ]
-        "###
-                );
-        assert_actions(&runnables, &[&TEST, &TEST]);
-    }
-    #[test]
+        mod nested_tests_2 {
-    fn test_runnables_multiple_depth_module() {
+            #[test]
-        let (analysis, pos) = analysis_and_position(
+            fn nested_test_2() {}
-            r#"
-        //- /lib.rs
-        <|> //empty
-        mod foo {
-            mod bar {
-                mod test_mod {
-                    #[test]
-                    fn test_foo1() {}
-                }
-            }
        }
-        "#,
-        );
+        mod nested_tests_3 {}
-        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert_debug_snapshot!(&runnables,
-        @r###"
-        [
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 41..115,
-                    name: "test_mod",
-                    kind: MODULE,
-                    focus_range: Some(
-                        45..53,
-                    ),
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: TestMod {
-                    path: "foo::bar::test_mod",
-                },
-                cfg_exprs: [],
-            },
-            Runnable {
-                nav: NavigationTarget {
-                    file_id: FileId(
-                        1,
-                    ),
-                    full_range: 68..105,
-                    name: "test_foo1",
-                    kind: FN_DEF,
-                    focus_range: Some(
-                        91..100,
-                    ),
-                    container_name: None,
-                    description: None,
-                    docs: None,
-                },
-                kind: Test {
-                    test_id: Path(
-                        "foo::bar::test_mod::test_foo1",
-                    ),
-                    attr: TestAttr {
-                        ignore: false,
-                    },
-                },
-                cfg_exprs: [],
-            },
-        ]
-        "###
-                );
-        assert_actions(&runnables, &[&TEST, &TEST]);
    }
-    #[test]
+    mod nested_tests_4 {}
-    fn test_runnables_with_feature() {
+}
-        let (analysis, pos) = analysis_and_position(
+"#,
-            r#"
+            &[&TEST, &TEST, &TEST, &TEST, &TEST, &TEST],
-        //- /lib.rs crate:foo cfg:feature=foo
+            expect![[r#"
-        <|> //empty
+                [
-        #[test]
+                    Runnable {
-        #[cfg(feature = "foo")]
+                        nav: NavigationTarget {
-        fn test_foo1() {}
+                            file_id: FileId(
-        "#,
+                                1,
-        );
+                            ),
-        let runnables = analysis.runnables(pos.file_id).unwrap();
+                            full_range: 22..323,
-        assert_debug_snapshot!(&runnables,
+                            focus_range: Some(
-        @r###"
+                                26..40,
-        [
+                            ),
-            Runnable {
+                            name: "nested_tests_0",
-                nav: NavigationTarget {
+                            kind: MODULE,
-                    file_id: FileId(
+                            container_name: None,
-                        1,
+                            description: None,
-                    ),
+                            docs: None,
-                    full_range: 1..58,
+                        },
-                    name: "test_foo1",
+                        kind: TestMod {
-                    kind: FN_DEF,
+                            path: "root_tests::nested_tests_0",
-                    focus_range: Some(
+                        },
-                        44..53,
+                        cfg_exprs: [],
-                    ),
+                    },
-                    container_name: None,
+                    Runnable {
-                    description: None,
+                        nav: NavigationTarget {
-                    docs: None,
+                            file_id: FileId(
-                },
+                                1,
-                kind: Test {
+                            ),
-                    test_id: Path(
+                            full_range: 51..192,
-                        "test_foo1",
+                            focus_range: Some(
-                    ),
+                                55..69,
-                    attr: TestAttr {
+                            ),
-                        ignore: false,
+                            name: "nested_tests_1",
+                            kind: MODULE,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: TestMod {
+                            path: "root_tests::nested_tests_0::nested_tests_1",
+                        },
+                        cfg_exprs: [],
+                    },
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 84..126,
+                            focus_range: Some(
+                                107..121,
+                            ),
+                            name: "nested_test_11",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: Test {
+                            test_id: Path(
+                                "root_tests::nested_tests_0::nested_tests_1::nested_test_11",
+                            ),
+                            attr: TestAttr {
+                                ignore: false,
+                            },
+                        },
+                        cfg_exprs: [],
+                    },
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 140..182,
+                            focus_range: Some(
+                                163..177,
+                            ),
+                            name: "nested_test_12",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: Test {
+                            test_id: Path(
+                                "root_tests::nested_tests_0::nested_tests_1::nested_test_12",
+                            ),
+                            attr: TestAttr {
+                                ignore: false,
+                            },
+                        },
+                        cfg_exprs: [],
+                    },
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 202..286,
+                            focus_range: Some(
+                                206..220,
+                            ),
+                            name: "nested_tests_2",
+                            kind: MODULE,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: TestMod {
+                            path: "root_tests::nested_tests_0::nested_tests_2",
+                        },
+                        cfg_exprs: [],
                    },
-                },
+                    Runnable {
-                cfg_exprs: [
+                        nav: NavigationTarget {
-                    KeyValue {
+                            file_id: FileId(
-                        key: "feature",
+                                1,
-                        value: "foo",
+                            ),
+                            full_range: 235..276,
+                            focus_range: Some(
+                                258..271,
+                            ),
+                            name: "nested_test_2",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: Test {
+                            test_id: Path(
+                                "root_tests::nested_tests_0::nested_tests_2::nested_test_2",
+                            ),
+                            attr: TestAttr {
+                                ignore: false,
+                            },
+                        },
+                        cfg_exprs: [],
                    },
-                ],
+                ]
-            },
+            "#]],
-        ]
+        );
-        "###
-                );
-        assert_actions(&runnables, &[&TEST]);
    }
    #[test]
-    fn test_runnables_with_features() {
+    fn test_runnables_with_feature() {
-        let (analysis, pos) = analysis_and_position(
+        check(
            r#"
-        //- /lib.rs crate:foo cfg:feature=foo,feature=bar
+//- /lib.rs crate:foo cfg:feature=foo
-        <|> //empty
+<|>
-        #[test]
+#[test]
-        #[cfg(all(feature = "foo", feature = "bar"))]
+#[cfg(feature = "foo")]
-        fn test_foo1() {}
+fn test_foo1() {}
-        "#,
+"#,
-        );
+            &[&TEST],
-        let runnables = analysis.runnables(pos.file_id).unwrap();
+            expect![[r#"
-        assert_debug_snapshot!(&runnables,
+                [
-        @r###"
+                    Runnable {
-        [
+                        nav: NavigationTarget {
-            Runnable {
+                            file_id: FileId(
-                nav: NavigationTarget {
+                                1,
-                    file_id: FileId(
+                            ),
-                        1,
+                            full_range: 1..50,
-                    ),
+                            focus_range: Some(
-                    full_range: 1..80,
+                                36..45,
-                    name: "test_foo1",
+                            ),
-                    kind: FN_DEF,
+                            name: "test_foo1",
-                    focus_range: Some(
+                            kind: FN,
-                        66..75,
+                            container_name: None,
-                    ),
+                            description: None,
-                    container_name: None,
+                            docs: None,
-                    description: None,
+                        },
-                    docs: None,
+                        kind: Test {
-                },
+                            test_id: Path(
-                kind: Test {
+                                "test_foo1",
-                    test_id: Path(
+                            ),
-                        "test_foo1",
+                            attr: TestAttr {
-                    ),
+                                ignore: false,
-                    attr: TestAttr {
+                            },
-                        ignore: false,
+                        },
-                    },
+                        cfg_exprs: [
-                },
-                cfg_exprs: [
-                    All(
-                        [
                            KeyValue {
                                key: "feature",
                                value: "foo",
                            },
-                            KeyValue {
+                        ],
-                                key: "feature",
+                    },
-                                value: "bar",
+                ]
+            "#]],
+        );
+    }
+    #[test]
+    fn test_runnables_with_features() {
+        check(
+            r#"
+//- /lib.rs crate:foo cfg:feature=foo,feature=bar
+<|>
+#[test]
+#[cfg(all(feature = "foo", feature = "bar"))]
+fn test_foo1() {}
+"#,
+            &[&TEST],
+            expect![[r#"
+                [
+                    Runnable {
+                        nav: NavigationTarget {
+                            file_id: FileId(
+                                1,
+                            ),
+                            full_range: 1..72,
+                            focus_range: Some(
+                                58..67,
+                            ),
+                            name: "test_foo1",
+                            kind: FN,
+                            container_name: None,
+                            description: None,
+                            docs: None,
+                        },
+                        kind: Test {
+                            test_id: Path(
+                                "test_foo1",
+                            ),
+                            attr: TestAttr {
+                                ignore: false,
                            },
+                        },
+                        cfg_exprs: [
+                            All(
+                                [
+                                    KeyValue {
+                                        key: "feature",
+                                        value: "foo",
+                                    },
+                                    KeyValue {
+                                        key: "feature",
+                                        value: "bar",
+                                    },
+                                ],
+                            ),
                        ],
-                    ),
+                    },
-                ],
+                ]
-            },
+            "#]],
-        ]
+        );
-        "###
-                );
-        assert_actions(&runnables, &[&TEST]);
    }
    #[test]
    fn test_runnables_no_test_function_in_module() {
-        let (analysis, pos) = analysis_and_position(
+        check(
            r#"
-        //- /lib.rs
+//- /lib.rs
-        <|> //empty
+<|>
-        mod test_mod {
+mod test_mod {
-            fn foo1() {}
+    fn foo1() {}
-        }
+}
-        "#,
+"#,
+            &[],
+            expect![[r#"
+                []
+            "#]],
        );
-        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert!(runnables.is_empty())
    }
 }
diff --git a/crates/ra_ide/src/snapshots/highlight_doctest.html b/crates/ra_ide/src/snapshots/highlight_doctest.html
deleted file mode 100644
index e8155def7..000000000
--- a/crates/ra_ide/src/snapshots/highlight_doctest.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<style>
-body                { margin: 0; }
-pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
-.lifetime           { color: #DFAF8F; font-style: italic; }
-.comment            { color: #7F9F7F; }
-.documentation      { color: #629755; }
-.injected           { opacity: 0.65 ; }
-.struct, .enum      { color: #7CB8BB; }
-.enum_variant       { color: #BDE0F3; }
-.string_literal     { color: #CC9393; }
-.field              { color: #94BFF3; }
-.function           { color: #93E0E3; }
-.function.unsafe    { color: #BC8383; }
-.operator.unsafe    { color: #BC8383; }
-.parameter          { color: #94BFF3; }
-.text               { color: #DCDCCC; }
-.type               { color: #7CB8BB; }
-.builtin_type       { color: #8CD0D3; }
-.type_param         { color: #DFAF8F; }
-.attribute          { color: #94BFF3; }
-.numeric_literal    { color: #BFEBBF; }
-.bool_literal       { color: #BFE6EB; }
-.macro              { color: #94BFF3; }
-.module             { color: #AFD8AF; }
-.variable           { color: #DCDCCC; }
-.format_specifier   { color: #CC696B; }
-.mutable            { text-decoration: underline; }
-.unresolved_reference { color: #FC5555; }
-.escape_sequence    { color: #94BFF3; }
-.keyword            { color: #F0DFAF; font-weight: bold; }
-.keyword.unsafe     { color: #BC8383; font-weight: bold; }
-.control            { font-style: italic; }
-</style>
-<pre><code><span class="comment documentation">/// ```</span>
-<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> _ = </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="generic injected">;</span>
-<span class="comment documentation">/// ```</span>
-<span class="keyword">struct</span> <span class="struct declaration">Foo</span> {
-    <span class="field declaration">bar</span>: <span class="builtin_type">bool</span>,
-}
-<span class="keyword">impl</span> <span class="struct">Foo</span> {
-    <span class="keyword">pub</span> <span class="keyword">const</span> <span class="constant declaration">bar</span>: <span class="builtin_type">bool</span> = <span class="bool_literal">true</span>;
-    <span class="comment documentation">/// Constructs a new `Foo`.</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// # Examples</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// ```</span>
-    <span class="comment documentation">/// #</span><span class="generic injected"> </span><span class="attribute injected">#![</span><span class="function attribute injected">allow</span><span class="attribute injected">(unused_mut)]</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="keyword injected">mut</span><span class="generic injected"> </span><span class="variable declaration injected mutable">foo</span><span class="generic injected">: </span><span class="struct injected">Foo</span><span class="generic injected"> = </span><span class="struct injected">Foo</span><span class="generic injected">::</span><span class="function injected">new</span><span class="generic injected">();</span>
-    <span class="comment documentation">/// ```</span>
-    <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration">new</span>() -&gt; <span class="struct">Foo</span> {
-        <span class="struct">Foo</span> { <span class="field">bar</span>: <span class="bool_literal">true</span> }
-    }
-    <span class="comment documentation">/// `bar` method on `Foo`.</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// # Examples</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// ```</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="generic injected"> </span><span class="module injected">x</span><span class="generic injected">::</span><span class="module injected">y</span><span class="generic injected">;</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foo</span><span class="generic injected"> = </span><span class="struct injected">Foo</span><span class="generic injected">::</span><span class="function injected">new</span><span class="generic injected">();</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span>
-    <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="generic injected">(foo.bar());</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">bar</span><span class="generic injected"> = </span><span class="variable injected">foo</span><span class="generic injected">.</span><span class="field injected">bar</span><span class="generic injected"> || </span><span class="struct injected">Foo</span><span class="generic injected">::</span><span class="constant injected">bar</span><span class="generic injected">;</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="comment injected">/* multi-line
-    </span><span class="comment documentation">/// </span><span class="comment injected">       comment */</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="generic injected"> = </span><span class="string_literal injected">"Foo
-    </span><span class="comment documentation">/// </span><span class="string_literal injected">  bar
-    </span><span class="comment documentation">/// </span><span class="string_literal injected">         "</span><span class="generic injected">;</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// ```</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// ```rust,no_run</span>
-    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foobar</span><span class="generic injected"> = </span><span class="struct injected">Foo</span><span class="generic injected">::</span><span class="function injected">new</span><span class="generic injected">().</span><span class="function injected">bar</span><span class="generic injected">();</span>
-    <span class="comment documentation">/// ```</span>
-    <span class="comment documentation">///</span>
-    <span class="comment documentation">/// ```sh</span>
-    <span class="comment documentation">/// echo 1</span>
-    <span class="comment documentation">/// ```</span>
-    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration">foo</span>(&<span class="self_keyword">self</span>) -&gt; <span class="builtin_type">bool</span> {
-        <span class="bool_literal">true</span>
-    }
-}
-<span class="comment documentation">/// ```</span>
-<span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="generic injected">(</span><span class="numeric_literal injected">1</span><span class="generic injected">);</span>
-<span class="comment documentation">/// ```</span>
-<span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> {
-    ($expr:expr) =&gt; {
-        $expr
-    }
-}</code></pre>
-\ No newline at end of file
diff --git a/crates/ra_ide/src/snapshots/highlight_strings.html b/crates/ra_ide/src/snapshots/highlight_strings.html
deleted file mode 100644
index d184b5691..000000000
--- a/crates/ra_ide/src/snapshots/highlight_strings.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<style>
-body                { margin: 0; }
-pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
-.lifetime           { color: #DFAF8F; font-style: italic; }
-.comment            { color: #7F9F7F; }
-.documentation      { color: #629755; }
-.injected           { opacity: 0.65 ; }
-.struct, .enum      { color: #7CB8BB; }
-.enum_variant       { color: #BDE0F3; }
-.string_literal     { color: #CC9393; }
-.field              { color: #94BFF3; }
-.function           { color: #93E0E3; }
-.function.unsafe    { color: #BC8383; }
-.operator.unsafe    { color: #BC8383; }
-.parameter          { color: #94BFF3; }
-.text               { color: #DCDCCC; }
-.type               { color: #7CB8BB; }
-.builtin_type       { color: #8CD0D3; }
-.type_param         { color: #DFAF8F; }
-.attribute          { color: #94BFF3; }
-.numeric_literal    { color: #BFEBBF; }
-.bool_literal       { color: #BFE6EB; }
-.macro              { color: #94BFF3; }
-.module             { color: #AFD8AF; }
-.variable           { color: #DCDCCC; }
-.format_specifier   { color: #CC696B; }
-.mutable            { text-decoration: underline; }
-.unresolved_reference { color: #FC5555; }
-.escape_sequence    { color: #94BFF3; }
-.keyword            { color: #F0DFAF; font-weight: bold; }
-.keyword.unsafe     { color: #BC8383; font-weight: bold; }
-.control            { font-style: italic; }
-</style>
-<pre><code><span class="macro">macro_rules!</span> <span class="macro declaration">println</span> {
-    ($($arg:tt)*) =&gt; ({
-        $<span class="keyword">crate</span>::io::_print($<span class="keyword">crate</span>::format_args_nl!($($arg)*));
-    })
-}
-#[rustc_builtin_macro]
-<span class="macro">macro_rules!</span> <span class="macro declaration">format_args_nl</span> {
-    ($fmt:expr) =&gt; {{ <span class="comment">/* compiler built-in */</span> }};
-    ($fmt:expr, $($args:tt)*) =&gt; {{ <span class="comment">/* compiler built-in */</span> }};
-}
-<span class="keyword">fn</span> <span class="function declaration">main</span>() {
-    <span class="comment">// from https://doc.rust-lang.org/std/fmt/index.html</span>
-    <span class="macro">println!</span>(<span class="string_literal">"Hello"</span>);                 <span class="comment">// =&gt; "Hello"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"world"</span>);   <span class="comment">// =&gt; "Hello, world!"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"The number is </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="numeric_literal">1</span>);   <span class="comment">// =&gt; "The number is 1"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">?</span><span class="format_specifier">}</span><span class="string_literal">"</span>, (<span class="numeric_literal">3</span>, <span class="numeric_literal">4</span>));          <span class="comment">// =&gt; "(3, 4)"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">value</span><span class="format_specifier">}</span><span class="string_literal">"</span>, value=<span class="numeric_literal">4</span>);      <span class="comment">// =&gt; "4"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="numeric_literal">1</span>, <span class="numeric_literal">2</span>);           <span class="comment">// =&gt; "1 2"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">4</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="numeric_literal">42</span>);             <span class="comment">// =&gt; "0042" with leading zerosV</span>
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="numeric_literal">1</span>, <span class="numeric_literal">2</span>);   <span class="comment">// =&gt; "2 1 1 2"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">argument</span><span class="format_specifier">}</span><span class="string_literal">"</span>, argument = <span class="string_literal">"test"</span>);   <span class="comment">// =&gt; "test"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="numeric_literal">1</span>, name = <span class="numeric_literal">2</span>);          <span class="comment">// =&gt; "2 1"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">a</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">c</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">b</span><span class="format_specifier">}</span><span class="string_literal">"</span>, a=<span class="string_literal">"a"</span>, b=<span class="char_literal">'b'</span>, c=<span class="numeric_literal">3</span>);  <span class="comment">// =&gt; "a 3 b"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"{{</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">}}"</span>, <span class="numeric_literal">2</span>);                       <span class="comment">// =&gt; "{2}"</span>
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"x"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"x"</span>, <span class="numeric_literal">5</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="numeric_literal">5</span>, <span class="string_literal">"x"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="variable">width</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"x"</span>, width = <span class="numeric_literal">5</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">&lt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"x"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">-</span><span class="format_specifier">&lt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"x"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">^</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"x"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">&gt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"x"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">+</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="numeric_literal">5</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="numeric_literal">27</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="numeric_literal">5</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, -<span class="numeric_literal">5</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="numeric_literal">0</span><span class="numeric_literal">10</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="numeric_literal">27</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="string_literal">"x"</span>, <span class="numeric_literal">0.01</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="numeric_literal">5</span>, <span class="string_literal">"x"</span>, <span class="numeric_literal">0.01</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="string_literal">"x"</span>, <span class="numeric_literal">5</span>, <span class="numeric_literal">0.01</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span>,    <span class="string_literal">"x"</span>, <span class="numeric_literal">5</span>, <span class="numeric_literal">0.01</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span>,   <span class="string_literal">"x"</span>, <span class="numeric_literal">5</span>, <span class="numeric_literal">0.01</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="variable">number</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="variable">prec</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span>, <span class="string_literal">"x"</span>, prec = <span class="numeric_literal">5</span>, number = <span class="numeric_literal">0.01</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 fractional digits"</span>, <span class="string_literal">"Hello"</span>, <span class="numeric_literal">3</span>, name=<span class="numeric_literal">1234.56</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 characters"</span>, <span class="string_literal">"Hello"</span>, <span class="numeric_literal">3</span>, name=<span class="string_literal">"1234.56"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">&gt;</span><span class="numeric_literal">8</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 right-aligned characters"</span>, <span class="string_literal">"Hello"</span>, <span class="numeric_literal">3</span>, name=<span class="string_literal">"1234.56"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"Hello {{}}"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"{{ Hello"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">r"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span>, <span class="string_literal">"world"</span>);
-    <span class="comment">// escape sequences</span>
-    <span class="macro">println!</span>(<span class="string_literal">"Hello</span><span class="escape_sequence">\n</span><span class="string_literal">World"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="escape_sequence">\u{48}</span><span class="escape_sequence">\x65</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6F</span><span class="string_literal"> World"</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="escape_sequence">\x41</span><span class="format_specifier">}</span><span class="string_literal">"</span>, A = <span class="numeric_literal">92</span>);
-    <span class="macro">println!</span>(<span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">ничоси</span><span class="format_specifier">}</span><span class="string_literal">"</span>, ничоси = <span class="numeric_literal">92</span>);
-}</code></pre>
-\ No newline at end of file
diff --git a/crates/ra_ide/src/snapshots/highlighting.html b/crates/ra_ide/src/snapshots/highlighting.html
deleted file mode 100644
index 8d0b38f95..000000000
--- a/crates/ra_ide/src/snapshots/highlighting.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<style>
-body                { margin: 0; }
-pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
-.lifetime           { color: #DFAF8F; font-style: italic; }
-.comment            { color: #7F9F7F; }
-.documentation      { color: #629755; }
-.injected           { opacity: 0.65 ; }
-.struct, .enum      { color: #7CB8BB; }
-.enum_variant       { color: #BDE0F3; }
-.string_literal     { color: #CC9393; }
-.field              { color: #94BFF3; }
-.function           { color: #93E0E3; }
-.function.unsafe    { color: #BC8383; }
-.operator.unsafe    { color: #BC8383; }
-.parameter          { color: #94BFF3; }
-.text               { color: #DCDCCC; }
-.type               { color: #7CB8BB; }
-.builtin_type       { color: #8CD0D3; }
-.type_param         { color: #DFAF8F; }
-.attribute          { color: #94BFF3; }
-.numeric_literal    { color: #BFEBBF; }
-.bool_literal       { color: #BFE6EB; }
-.macro              { color: #94BFF3; }
-.module             { color: #AFD8AF; }
-.variable           { color: #DCDCCC; }
-.format_specifier   { color: #CC696B; }
-.mutable            { text-decoration: underline; }
-.unresolved_reference { color: #FC5555; }
-.escape_sequence    { color: #94BFF3; }
-.keyword            { color: #F0DFAF; font-weight: bold; }
-.keyword.unsafe     { color: #BC8383; font-weight: bold; }
-.control            { font-style: italic; }
-</style>
-<pre><code><span class="attribute">#[</span><span class="function attribute">derive</span><span class="attribute">(Clone, Debug)]</span>
-<span class="keyword">struct</span> <span class="struct declaration">Foo</span> {
-    <span class="keyword">pub</span> <span class="field declaration">x</span>: <span class="builtin_type">i32</span>,
-    <span class="keyword">pub</span> <span class="field declaration">y</span>: <span class="builtin_type">i32</span>,
-}
-<span class="keyword">trait</span> <span class="trait declaration">Bar</span> {
-    <span class="keyword">fn</span> <span class="function declaration">bar</span>(&<span class="self_keyword">self</span>) -&gt; <span class="builtin_type">i32</span>;
-}
-<span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> {
-    <span class="keyword">fn</span> <span class="function declaration">bar</span>(&<span class="self_keyword">self</span>) -&gt; <span class="builtin_type">i32</span> {
-        <span class="self_keyword">self</span>.<span class="field">x</span>
-    }
-}
-<span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable">STATIC_MUT</span>: <span class="builtin_type">i32</span> = <span class="numeric_literal">0</span>;
-<span class="keyword">fn</span> <span class="function declaration">foo</span>&lt;<span class="lifetime declaration">'a</span>, <span class="type_param declaration">T</span>&gt;() -&gt; <span class="type_param">T</span> {
-    <span class="function">foo</span>::&lt;<span class="lifetime">'a</span>, <span class="builtin_type">i32</span>&gt;()
-}
-<span class="macro">macro_rules!</span> <span class="macro declaration">def_fn</span> {
-    ($($tt:tt)*) =&gt; {$($tt)*}
-}
-<span class="macro">def_fn!</span> {
-    <span class="keyword">fn</span> <span class="function declaration">bar</span>() -&gt; <span class="builtin_type">u32</span> {
-        <span class="numeric_literal">100</span>
-    }
-}
-<span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> {
-    ($expr:expr) =&gt; {
-        $expr
-    }
-}
-<span class="comment">// comment</span>
-<span class="keyword">fn</span> <span class="function declaration">main</span>() {
-    <span class="macro">println!</span>(<span class="string_literal">"Hello, {}!"</span>, <span class="numeric_literal">92</span>);
-    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">vec</span> = <span class="unresolved_reference">Vec</span>::<span class="unresolved_reference">new</span>();
-    <span class="keyword control">if</span> <span class="bool_literal">true</span> {
-        <span class="keyword">let</span> <span class="variable declaration">x</span> = <span class="numeric_literal">92</span>;
-        <span class="variable mutable">vec</span>.<span class="unresolved_reference">push</span>(<span class="struct">Foo</span> { <span class="field">x</span>, <span class="field">y</span>: <span class="numeric_literal">1</span> });
-    }
-    <span class="keyword unsafe">unsafe</span> {
-        <span class="variable mutable">vec</span>.<span class="unresolved_reference">set_len</span>(<span class="numeric_literal">0</span>);
-        <span class="static mutable">STATIC_MUT</span> = <span class="numeric_literal">1</span>;
-    }
-    <span class="keyword control">for</span> <span class="variable declaration">e</span> <span class="keyword control">in</span> <span class="variable mutable">vec</span> {
-        <span class="comment">// Do nothing</span>
-    }
-    <span class="macro">noop!</span>(<span class="macro">noop</span><span class="macro">!</span>(<span class="numeric_literal">1</span>));
-    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">x</span> = <span class="numeric_literal">42</span>;
-    <span class="keyword">let</span> <span class="variable declaration mutable">y</span> = &<span class="keyword">mut</span> <span class="variable mutable">x</span>;
-    <span class="keyword">let</span> <span class="variable declaration">z</span> = &<span class="variable mutable">y</span>;
-    <span class="keyword">let</span> <span class="struct">Foo</span> { <span class="field">x</span>: <span class="variable declaration">z</span>, <span class="field">y</span> } = <span class="struct">Foo</span> { <span class="field">x</span>: <span class="variable">z</span>, <span class="field">y</span> };
-    <span class="variable">y</span>;
-}
-<span class="keyword">enum</span> <span class="enum declaration">Option</span>&lt;<span class="type_param declaration">T</span>&gt; {
-    <span class="enum_variant declaration">Some</span>(<span class="type_param">T</span>),
-    <span class="enum_variant declaration">None</span>,
-}
-<span class="keyword">use</span> <span class="enum">Option</span>::*;
-<span class="keyword">impl</span>&lt;<span class="type_param declaration">T</span>&gt; <span class="enum">Option</span>&lt;<span class="type_param">T</span>&gt; {
-    <span class="keyword">fn</span> <span class="function declaration">and</span>&lt;<span class="type_param declaration">U</span>&gt;(<span class="self_keyword">self</span>, <span class="variable declaration">other</span>: <span class="enum">Option</span>&lt;<span class="type_param">U</span>&gt;) -&gt; <span class="enum">Option</span>&lt;(<span class="type_param">T</span>, <span class="type_param">U</span>)&gt; {
-        <span class="keyword control">match</span> <span class="variable">other</span> {
-            <span class="enum_variant">None</span> =&gt; <span class="macro">unimplemented!</span>(),
-            <span class="variable declaration">Nope</span> =&gt; <span class="variable">Nope</span>,
-        }
-    }
-}</code></pre>
-\ No newline at end of file
diff --git a/crates/ra_ide/src/ssr.rs b/crates/ra_ide/src/ssr.rs
index 6cb96608b..4348b43be 100644
--- a/crates/ra_ide/src/ssr.rs
+++ b/crates/ra_ide/src/ssr.rs
@@ -1,15 +1,43 @@
-use ra_db::SourceDatabaseExt;
+use ra_db::{FilePosition, FileRange};
-use ra_ide_db::{symbol_index::SymbolsDatabase, RootDatabase};
+use ra_ide_db::RootDatabase;
 use crate::SourceFileEdit;
 use ra_ssr::{MatchFinder, SsrError, SsrRule};
-// Feature: Structural Seach and Replace
+// Feature: Structural Search and Replace
 //
 // Search and replace with named wildcards that will match any expression, type, path, pattern or item.
 // The syntax for a structural search replace command is `<search_pattern> ==>> <replace_pattern>`.
 // A `$<name>` placeholder in the search pattern will match any AST node and `$<name>` will reference it in the replacement.
 // Within a macro call, a placeholder will match up until whatever token follows the placeholder.
+//
+// All paths in both the search pattern and the replacement template must resolve in the context
+// in which this command is invoked. Paths in the search pattern will then match the code if they
+// resolve to the same item, even if they're written differently. For example if we invoke the
+// command in the module `foo` with a pattern of `Bar`, then code in the parent module that refers
+// to `foo::Bar` will match.
+//
+// Paths in the replacement template will be rendered appropriately for the context in which the
+// replacement occurs. For example if our replacement template is `foo::Bar` and we match some
+// code in the `foo` module, we'll insert just `Bar`.
+//
+// Method calls should generally be written in UFCS form. e.g. `foo::Bar::baz($s, $a)` will match
+// `$s.baz($a)`, provided the method call `baz` resolves to the method `foo::Bar::baz`.
+//
+// The scope of the search / replace will be restricted to the current selection if any, otherwise
+// it will apply to the whole workspace.
+//
+// Placeholders may be given constraints by writing them as `${<name>:<constraint1>:<constraint2>...}`.
+//
+// Supported constraints:
+//
+// |===
+// | Constraint    | Restricts placeholder
+//
+// | kind(literal) | Is a literal (e.g. `42` or `"forty two"`)
+// | not(a)        | Negates the constraint `a`
+// |===
+//
 // Available via the command `rust-analyzer.ssr`.
 //
 // ```rust
@@ -31,21 +59,14 @@ pub fn parse_search_replace(
    rule: &str,
    parse_only: bool,
    db: &RootDatabase,
+    resolve_context: FilePosition,
+    selections: Vec<FileRange>,
 ) -> Result<Vec<SourceFileEdit>, SsrError> {
-    let mut edits = vec![];
    let rule: SsrRule = rule.parse()?;
+    let mut match_finder = MatchFinder::in_context(db, resolve_context, selections);
+    match_finder.add_rule(rule)?;
    if parse_only {
-        return Ok(edits);
+        return Ok(Vec::new());
-    }
-    let mut match_finder = MatchFinder::new(db);
-    match_finder.add_rule(rule);
-    for &root in db.local_roots().iter() {
-        let sr = db.source_root(root);
-        for file_id in sr.iter() {
-            if let Some(edit) = match_finder.edits_for_file(file_id) {
-                edits.push(SourceFileEdit { file_id, edit });
-            }
-        }
    }
-    Ok(edits)
+    Ok(match_finder.edits())
 }
diff --git a/crates/ra_ide/src/status.rs b/crates/ra_ide/src/status.rs
index 45411b357..08e6f69cb 100644
--- a/crates/ra_ide/src/status.rs
+++ b/crates/ra_ide/src/status.rs
@@ -2,10 +2,7 @@ use std::{fmt, iter::FromIterator, sync::Arc};
 use hir::MacroFile;
 use ra_db::{
-    salsa::{
+    salsa::debug::{DebugQueryTable, TableEntry},
-        debug::{DebugQueryTable, TableEntry},
-        Database,
-    },
    FileTextQuery, SourceRootId,
 };
 use ra_ide_db::{
@@ -14,15 +11,15 @@ use ra_ide_db::{
 };
 use ra_prof::{memory_usage, Bytes};
 use ra_syntax::{ast, Parse, SyntaxNode};
+use rustc_hash::FxHashMap;
 use crate::FileId;
-use rustc_hash::FxHashMap;
 fn syntax_tree_stats(db: &RootDatabase) -> SyntaxTreeStats {
-    db.query(ra_db::ParseQuery).entries::<SyntaxTreeStats>()
+    ra_db::ParseQuery.in_db(db).entries::<SyntaxTreeStats>()
 }
 fn macro_syntax_tree_stats(db: &RootDatabase) -> SyntaxTreeStats {
-    db.query(hir::db::ParseMacroQuery).entries::<SyntaxTreeStats>()
+    hir::db::ParseMacroQuery.in_db(db).entries::<SyntaxTreeStats>()
 }
 // Feature: Status
@@ -35,10 +32,10 @@ fn macro_syntax_tree_stats(db: &RootDatabase) -> SyntaxTreeStats {
 // | VS Code | **Rust Analyzer: Status**
 // |===
 pub(crate) fn status(db: &RootDatabase) -> String {
-    let files_stats = db.query(FileTextQuery).entries::<FilesStats>();
+    let files_stats = FileTextQuery.in_db(db).entries::<FilesStats>();
    let syntax_tree_stats = syntax_tree_stats(db);
    let macro_syntax_tree_stats = macro_syntax_tree_stats(db);
-    let symbols_stats = db.query(LibrarySymbolsQuery).entries::<LibrarySymbolsStats>();
+    let symbols_stats = LibrarySymbolsQuery.in_db(db).entries::<LibrarySymbolsStats>();
    format!(
        "{}\n{}\n{}\n{} (macros)\n\n\nmemory:\n{}\ngc {:?} seconds ago",
        files_stats,
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index 028b55902..e3a96f9d5 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -464,7 +464,7 @@ fn highlight_element(
    let db = sema.db;
    let mut binding_hash = None;
    let highlight: Highlight = match element.kind() {
-        FN_DEF => {
+        FN => {
            bindings_shadow_count.clear();
            return None;
        }
@@ -539,20 +539,52 @@ fn highlight_element(
                _ => h,
            }
        }
-        T![*] => {
+        p if p.is_punct() => match p {
-            let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
+            T![::] | T![->] | T![=>] | T![&] | T![..] | T![=] | T![@] => {
+                HighlightTag::Operator.into()
-            let expr = prefix_expr.expr()?;
-            let ty = sema.type_of_expr(&expr)?;
-            if !ty.is_raw_ptr() {
-                return None;
-            } else {
-                HighlightTag::Operator | HighlightModifier::Unsafe
            }
-        }
+            T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
-        T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
+                HighlightTag::Macro.into()
-            Highlight::new(HighlightTag::Macro)
+            }
-        }
+            T![*] if element.parent().and_then(ast::PointerType::cast).is_some() => {
+                HighlightTag::Keyword.into()
+            }
+            T![*] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
+                let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
+                let expr = prefix_expr.expr()?;
+                let ty = sema.type_of_expr(&expr)?;
+                if ty.is_raw_ptr() {
+                    HighlightTag::Operator | HighlightModifier::Unsafe
+                } else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() {
+                    HighlightTag::Operator.into()
+                } else {
+                    HighlightTag::Punctuation.into()
+                }
+            }
+            T![-] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
+                HighlightTag::NumericLiteral.into()
+            }
+            _ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
+                HighlightTag::Operator.into()
+            }
+            _ if element.parent().and_then(ast::BinExpr::cast).is_some() => {
+                HighlightTag::Operator.into()
+            }
+            _ if element.parent().and_then(ast::RangeExpr::cast).is_some() => {
+                HighlightTag::Operator.into()
+            }
+            _ if element.parent().and_then(ast::RangePat::cast).is_some() => {
+                HighlightTag::Operator.into()
+            }
+            _ if element.parent().and_then(ast::DotDotPat::cast).is_some() => {
+                HighlightTag::Operator.into()
+            }
+            _ if element.parent().and_then(ast::Attr::cast).is_some() => {
+                HighlightTag::Attribute.into()
+            }
+            _ => HighlightTag::Punctuation.into(),
+        },
        k if k.is_keyword() => {
            let h = Highlight::new(HighlightTag::Keyword);
@@ -566,10 +598,31 @@ fn highlight_element(
                | T![return]
                | T![while]
                | T![in] => h | HighlightModifier::ControlFlow,
-                T![for] if !is_child_of_impl(element) => h | HighlightModifier::ControlFlow,
+                T![for] if !is_child_of_impl(&element) => h | HighlightModifier::ControlFlow,
                T![unsafe] => h | HighlightModifier::Unsafe,
                T![true] | T![false] => HighlightTag::BoolLiteral.into(),
-                T![self] => HighlightTag::SelfKeyword.into(),
+                T![self] => {
+                    let self_param_is_mut = element
+                        .parent()
+                        .and_then(ast::SelfParam::cast)
+                        .and_then(|p| p.mut_token())
+                        .is_some();
+                    // closure to enforce lazyness
+                    let self_path = || {
+                        sema.resolve_path(&element.parent()?.parent().and_then(ast::Path::cast)?)
+                    };
+                    if self_param_is_mut
+                        || matches!(self_path(),
+                            Some(hir::PathResolution::Local(local))
+                                if local.is_self(db)
+                                    && (local.is_mut(db) || local.ty(db).is_mutable_reference())
+                        )
+                    {
+                        HighlightTag::SelfKeyword | HighlightModifier::Mutable
+                    } else {
+                        HighlightTag::SelfKeyword.into()
+                    }
+                }
                _ => h,
            }
        }
@@ -592,9 +645,9 @@ fn highlight_element(
    }
 }
-fn is_child_of_impl(element: SyntaxElement) -> bool {
+fn is_child_of_impl(element: &SyntaxElement) -> bool {
    match element.parent() {
-        Some(e) => e.kind() == IMPL_DEF,
+        Some(e) => e.kind() == IMPL,
        _ => false,
    }
 }
@@ -630,9 +683,10 @@ fn highlight_name(db: &RootDatabase, def: Definition) -> Highlight {
        },
        Definition::SelfType(_) => HighlightTag::SelfType,
        Definition::TypeParam(_) => HighlightTag::TypeParam,
-        // FIXME: distinguish between locals and parameters
        Definition::Local(local) => {
-            let mut h = Highlight::new(HighlightTag::Local);
+            let tag =
+                if local.is_param(db) { HighlightTag::ValueParam } else { HighlightTag::Local };
+            let mut h = Highlight::new(tag);
            if local.is_mut(db) || local.ty(db).is_mutable_reference() {
                h |= HighlightModifier::Mutable;
            }
@@ -651,18 +705,18 @@ fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
    };
    let tag = match parent.kind() {
-        STRUCT_DEF => HighlightTag::Struct,
+        STRUCT => HighlightTag::Struct,
-        ENUM_DEF => HighlightTag::Enum,
+        ENUM => HighlightTag::Enum,
-        UNION_DEF => HighlightTag::Union,
+        UNION => HighlightTag::Union,
-        TRAIT_DEF => HighlightTag::Trait,
+        TRAIT => HighlightTag::Trait,
-        TYPE_ALIAS_DEF => HighlightTag::TypeAlias,
+        TYPE_ALIAS => HighlightTag::TypeAlias,
        TYPE_PARAM => HighlightTag::TypeParam,
-        RECORD_FIELD_DEF => HighlightTag::Field,
+        RECORD_FIELD => HighlightTag::Field,
        MODULE => HighlightTag::Module,
-        FN_DEF => HighlightTag::Function,
+        FN => HighlightTag::Function,
-        CONST_DEF => HighlightTag::Constant,
+        CONST => HighlightTag::Constant,
-        STATIC_DEF => HighlightTag::Static,
+        STATIC => HighlightTag::Static,
-        ENUM_VARIANT => HighlightTag::EnumVariant,
+        VARIANT => HighlightTag::EnumVariant,
        BIND_PAT => HighlightTag::Local,
        _ => default,
    };
diff --git a/crates/ra_ide/src/syntax_highlighting/html.rs b/crates/ra_ide/src/syntax_highlighting/html.rs
index 0c74f7370..a5e7d2867 100644
--- a/crates/ra_ide/src/syntax_highlighting/html.rs
+++ b/crates/ra_ide/src/syntax_highlighting/html.rs
@@ -1,5 +1,6 @@
 //! Renders a bit of code as HTML.
+use oorandom::Rand32;
 use ra_db::SourceDatabase;
 use ra_syntax::{AstNode, TextRange, TextSize};
@@ -9,13 +10,12 @@ pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId, rainbow: boo
    let parse = db.parse(file_id);
    fn rainbowify(seed: u64) -> String {
-        use rand::prelude::*;
+        let mut rng = Rand32::new(seed);
-        let mut rng = SmallRng::seed_from_u64(seed);
        format!(
            "hsl({h},{s}%,{l}%)",
-            h = rng.gen_range::<u16, _, _>(0, 361),
+            h = rng.rand_range(0..361),
-            s = rng.gen_range::<u16, _, _>(42, 99),
+            s = rng.rand_range(42..99),
-            l = rng.gen_range::<u16, _, _>(40, 91),
+            l = rng.rand_range(40..91),
        )
    }
@@ -83,14 +83,15 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .bool_literal       { color: #BFE6EB; }
 .macro              { color: #94BFF3; }
 .module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
 .variable           { color: #DCDCCC; }
 .format_specifier   { color: #CC696B; }
 .mutable            { text-decoration: underline; }
-.unresolved_reference { color: #FC5555; }
 .escape_sequence    { color: #94BFF3; }
 .keyword            { color: #F0DFAF; font-weight: bold; }
 .keyword.unsafe     { color: #BC8383; font-weight: bold; }
 .control            { font-style: italic; }
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
 ";
diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs
index 181c21256..8665b480f 100644
--- a/crates/ra_ide/src/syntax_highlighting/injection.rs
+++ b/crates/ra_ide/src/syntax_highlighting/injection.rs
@@ -25,7 +25,7 @@ pub(super) fn highlight_injection(
        return None;
    }
    let value = literal.value()?;
-    let (analysis, tmp_file_id) = Analysis::from_single_file(value);
+    let (analysis, tmp_file_id) = Analysis::from_single_file(value.into_owned());
    if let Some(range) = literal.open_quote_text_range() {
        acc.add(HighlightedRange {
diff --git a/crates/ra_ide/src/syntax_highlighting/tags.rs b/crates/ra_ide/src/syntax_highlighting/tags.rs
index 13d9dd195..49ec94bdc 100644
--- a/crates/ra_ide/src/syntax_highlighting/tags.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tags.rs
@@ -32,6 +32,7 @@ pub enum HighlightTag {
    Macro,
    Module,
    NumericLiteral,
+    Punctuation,
    SelfKeyword,
    SelfType,
    Static,
@@ -41,6 +42,7 @@ pub enum HighlightTag {
    TypeAlias,
    TypeParam,
    Union,
+    ValueParam,
    Local,
    UnresolvedReference,
    FormatSpecifier,
@@ -82,6 +84,7 @@ impl HighlightTag {
            HighlightTag::Generic => "generic",
            HighlightTag::Keyword => "keyword",
            HighlightTag::Lifetime => "lifetime",
+            HighlightTag::Punctuation => "punctuation",
            HighlightTag::Macro => "macro",
            HighlightTag::Module => "module",
            HighlightTag::NumericLiteral => "numeric_literal",
@@ -95,6 +98,7 @@ impl HighlightTag {
            HighlightTag::TypeAlias => "type_alias",
            HighlightTag::TypeParam => "type_param",
            HighlightTag::Union => "union",
+            HighlightTag::ValueParam => "value_param",
            HighlightTag::Local => "variable",
            HighlightTag::UnresolvedReference => "unresolved_reference",
        }
diff --git a/crates/ra_ide/src/syntax_highlighting/tests.rs b/crates/ra_ide/src/syntax_highlighting/tests.rs
index b7fad9719..87a6e2523 100644
--- a/crates/ra_ide/src/syntax_highlighting/tests.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tests.rs
@@ -1,6 +1,7 @@
 use std::fs;
-use test_utils::{assert_eq_text, project_dir, read_text};
+use expect::{expect_file, ExpectFile};
+use test_utils::project_dir;
 use crate::{mock_analysis::single_file, FileRange, TextRange};
@@ -24,6 +25,16 @@ impl Bar for Foo {
    }
 }
+impl Foo {
+    fn baz(mut self) -> i32 {
+        self.x
+    }
+    fn qux(&mut self) {
+        self.x = 0;
+    }
+}
 static mut STATIC_MUT: i32 = 0;
 fn foo<'a, T>() -> T {
@@ -91,7 +102,7 @@ impl<T> Option<T> {
 }
 "#
        .trim(),
-        "crates/ra_ide/src/snapshots/highlighting.html",
+        expect_file!["crates/ra_ide/test_data/highlighting.html"],
        false,
    );
 }
@@ -114,7 +125,7 @@ fn bar() {
 }
 "#
        .trim(),
-        "crates/ra_ide/src/snapshots/rainbow_highlighting.html",
+        expect_file!["crates/ra_ide/test_data/rainbow_highlighting.html"],
        true,
    );
 }
@@ -167,7 +178,7 @@ fn main() {
    );
 }"##
        .trim(),
-        "crates/ra_ide/src/snapshots/highlight_injection.html",
+        expect_file!["crates/ra_ide/test_data/highlight_injection.html"],
        false,
    );
 }
@@ -250,7 +261,7 @@ fn main() {
    println!("{ничоси}", ничоси = 92);
 }"#
        .trim(),
-        "crates/ra_ide/src/snapshots/highlight_strings.html",
+        expect_file!["crates/ra_ide/test_data/highlight_strings.html"],
        false,
    );
 }
@@ -278,7 +289,7 @@ fn main() {
 }
 "#
        .trim(),
-        "crates/ra_ide/src/snapshots/highlight_unsafe.html",
+        expect_file!["crates/ra_ide/test_data/highlight_unsafe.html"],
        false,
    );
 }
@@ -354,7 +365,7 @@ macro_rules! noop {
 }
 "#
        .trim(),
-        "crates/ra_ide/src/snapshots/highlight_doctest.html",
+        expect_file!["crates/ra_ide/test_data/highlight_doctest.html"],
        false,
    );
 }
@@ -362,11 +373,8 @@ macro_rules! noop {
 /// Highlights the code given by the `ra_fixture` argument, renders the
 /// result as HTML, and compares it with the HTML file given as `snapshot`.
 /// Note that the `snapshot` file is overwritten by the rendered HTML.
-fn check_highlighting(ra_fixture: &str, snapshot: &str, rainbow: bool) {
+fn check_highlighting(ra_fixture: &str, expect: ExpectFile, rainbow: bool) {
    let (analysis, file_id) = single_file(ra_fixture);
-    let dst_file = project_dir().join(snapshot);
    let actual_html = &analysis.highlight_as_html(file_id, rainbow).unwrap();
-    let expected_html = &read_text(&dst_file);
+    expect.assert_eq(actual_html)
-    fs::write(dst_file, &actual_html).unwrap();
-    assert_eq_text!(expected_html, actual_html);
 }
diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs
index f716a3861..07217e808 100644
--- a/crates/ra_ide/src/syntax_tree.rs
+++ b/crates/ra_ide/src/syntax_tree.rs
@@ -116,7 +116,7 @@ mod tests {
            syn.trim(),
            r#"
 [email protected]
-  FN_DEF@0..11
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -148,7 +148,7 @@ fn test() {
            syn.trim(),
            r#"
 [email protected]
-  FN_DEF@0..60
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -190,7 +190,7 @@ [email protected]
        assert_eq_text!(
            syn.trim(),
            r#"
-FN_DEF@0..11
+[email protected]
  [email protected] "fn"
  [email protected] " "
  [email protected]
@@ -258,7 +258,7 @@ fn bar() {
            syn.trim(),
            r#"
 [email protected]
-  FN_DEF@0..12
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -292,7 +292,7 @@ fn bar() {
            syn.trim(),
            r#"
 [email protected]
-  FN_DEF@0..12
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -325,7 +325,7 @@ fn bar() {
            syn.trim(),
            r#"
 [email protected]
-  FN_DEF@0..12
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -339,7 +339,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@13..25
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_ide/src/typing.rs b/crates/ra_ide/src/typing.rs
index 83776d2b6..d3ce744b4 100644
--- a/crates/ra_ide/src/typing.rs
+++ b/crates/ra_ide/src/typing.rs
@@ -39,7 +39,6 @@ pub(crate) const TRIGGER_CHARS: &str = ".=>";
 // Some features trigger on typing certain characters:
 //
 // - typing `let =` tries to smartly add `;` if `=` is followed by an existing expression
-// - Enter inside comments automatically inserts `///`
 // - typing `.` in a chain method call auto-indents
 pub(crate) fn on_char_typed(
    db: &RootDatabase,
diff --git a/crates/ra_ide/src/typing/on_enter.rs b/crates/ra_ide/src/typing/on_enter.rs
index 2faaa8ff0..143b1ae41 100644
--- a/crates/ra_ide/src/typing/on_enter.rs
+++ b/crates/ra_ide/src/typing/on_enter.rs
@@ -7,10 +7,31 @@ use ra_syntax::{
    ast::{self, AstToken},
    AstNode, SmolStr, SourceFile,
    SyntaxKind::*,
-    SyntaxToken, TextSize, TokenAtOffset,
+    SyntaxToken, TextRange, TextSize, TokenAtOffset,
 };
 use ra_text_edit::TextEdit;
+use test_utils::mark;
+// Feature: On Enter
+//
+// rust-analyzer can override kbd:[Enter] key to make it smarter:
+//
+// - kbd:[Enter] inside triple-slash comments automatically inserts `///`
+// - kbd:[Enter] in the middle or after a trailing space in `//` inserts `//`
+//
+// This action needs to be assigned to shortcut explicitly.
+//
+// VS Code::
+//
+// Add the following to `keybindings.json`:
+// [source,json]
+// ----
+// {
+//   "key": "Enter",
+//   "command": "rust-analyzer.onEnter",
+//   "when": "editorTextFocus && !suggestWidgetVisible && editorLangId == rust"
+// }
+// ----
 pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<TextEdit> {
    let parse = db.parse(position.file_id);
    let file = parse.tree();
@@ -30,15 +51,25 @@ pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<Text
        return None;
    }
+    let mut remove_last_space = false;
    // Continuing single-line non-doc comments (like this one :) ) is annoying
-    if prefix == "//" && comment_range.end() == position.offset && !followed_by_comment(&comment) {
+    if prefix == "//" && comment_range.end() == position.offset {
-        return None;
+        if comment.text().ends_with(' ') {
+            mark::hit!(continues_end_of_line_comment_with_space);
+            remove_last_space = true;
+        } else if !followed_by_comment(&comment) {
+            return None;
+        }
    }
    let indent = node_indent(&file, comment.syntax())?;
    let inserted = format!("\n{}{} $0", indent, prefix);
-    let edit = TextEdit::insert(position.offset, inserted);
+    let delete = if remove_last_space {
+        TextRange::new(position.offset - TextSize::of(' '), position.offset)
+    } else {
+        TextRange::empty(position.offset)
+    };
+    let edit = TextEdit::replace(delete, inserted);
    Some(edit)
 }
@@ -75,10 +106,10 @@ fn node_indent(file: &SourceFile, token: &SyntaxToken) -> Option<SmolStr> {
 #[cfg(test)]
 mod tests {
-    use test_utils::assert_eq_text;
+    use stdx::trim_indent;
+    use test_utils::{assert_eq_text, mark};
    use crate::mock_analysis::analysis_and_position;
-    use stdx::trim_indent;
    fn apply_on_enter(before: &str) -> Option<String> {
        let (analysis, position) = analysis_and_position(&before);
@@ -192,7 +223,7 @@ fn main() {
    }
    #[test]
-    fn does_not_continue_end_of_code_comment() {
+    fn does_not_continue_end_of_line_comment() {
        do_check_noop(
            r"
 fn main() {
@@ -202,4 +233,24 @@ fn main() {
 ",
        );
    }
+    #[test]
+    fn continues_end_of_line_comment_with_space() {
+        mark::check!(continues_end_of_line_comment_with_space);
+        do_check(
+            r#"
+fn main() {
+    // Fix me <|>
+    let x = 1 + 1;
+}
+"#,
+            r#"
+fn main() {
+    // Fix me
+    // $0
+    let x = 1 + 1;
+}
+"#,
+        );
+    }
 }
diff --git a/crates/ra_ide/test_data/highlight_doctest.html b/crates/ra_ide/test_data/highlight_doctest.html
new file mode 100644
index 000000000..6322d404f
--- /dev/null
+++ b/crates/ra_ide/test_data/highlight_doctest.html
@@ -0,0 +1,102 @@
+<style>
+body                { margin: 0; }
+pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
+.lifetime           { color: #DFAF8F; font-style: italic; }
+.comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
+.struct, .enum      { color: #7CB8BB; }
+.enum_variant       { color: #BDE0F3; }
+.string_literal     { color: #CC9393; }
+.field              { color: #94BFF3; }
+.function           { color: #93E0E3; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
+.parameter          { color: #94BFF3; }
+.text               { color: #DCDCCC; }
+.type               { color: #7CB8BB; }
+.builtin_type       { color: #8CD0D3; }
+.type_param         { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.numeric_literal    { color: #BFEBBF; }
+.bool_literal       { color: #BFE6EB; }
+.macro              { color: #94BFF3; }
+.module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
+.variable           { color: #DCDCCC; }
+.format_specifier   { color: #CC696B; }
+.mutable            { text-decoration: underline; }
+.escape_sequence    { color: #94BFF3; }
+.keyword            { color: #F0DFAF; font-weight: bold; }
+.keyword.unsafe     { color: #BC8383; font-weight: bold; }
+.control            { font-style: italic; }
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
+</style>
+<pre><code><span class="comment documentation">/// ```</span>
+<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="punctuation injected">_</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="punctuation injected">;</span><span class="punctuation injected">
+</span><span class="comment documentation">/// ```</span>
+<span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span>
+    <span class="field declaration">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span><span class="punctuation">,</span>
+<span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
+    <span class="keyword">pub</span> <span class="keyword">const</span> <span class="constant declaration">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span> <span class="operator">=</span> <span class="bool_literal">true</span><span class="punctuation">;</span>
+    <span class="comment documentation">/// Constructs a new `Foo`.</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// # Examples</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// ```</span>
+    <span class="comment documentation">/// #</span><span class="generic injected"> </span><span class="attribute injected">#</span><span class="attribute injected">!</span><span class="attribute injected">[</span><span class="function attribute injected">allow</span><span class="punctuation injected">(</span><span class="attribute injected">unused_mut</span><span class="punctuation injected">)</span><span class="attribute injected">]</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="keyword injected">mut</span><span class="generic injected"> </span><span class="variable declaration injected mutable">foo</span><span class="punctuation injected">:</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected">
+</span>    <span class="comment documentation">/// ```</span>
+    <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration">new</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
+        <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">bar</span><span class="punctuation">:</span> <span class="bool_literal">true</span> <span class="punctuation">}</span>
+    <span class="punctuation">}</span>
+    <span class="comment documentation">/// `bar` method on `Foo`.</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// # Examples</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// ```</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="generic injected"> </span><span class="module injected">x</span><span class="operator injected">::</span><span class="module injected">y</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foo</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span>
+    <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="punctuation injected">(</span><span class="generic injected">foo</span><span class="punctuation injected">.</span><span class="generic injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">bar</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="variable injected">foo</span><span class="punctuation injected">.</span><span class="field injected">bar</span><span class="generic injected"> </span><span class="operator injected">||</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="constant injected">bar</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// </span><span class="comment injected">/* multi-line
+    </span><span class="comment documentation">/// </span><span class="comment injected">       comment */</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="string_literal injected">"Foo
+    </span><span class="comment documentation">/// </span><span class="string_literal injected">  bar
+    </span><span class="comment documentation">/// </span><span class="string_literal injected">         "</span><span class="punctuation injected">;</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// ```</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// ```rust,no_run</span>
+    <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foobar</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">.</span><span class="function injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected">
+</span>    <span class="comment documentation">/// ```</span>
+    <span class="comment documentation">///</span>
+    <span class="comment documentation">/// ```sh</span>
+    <span class="comment documentation">/// echo 1</span>
+    <span class="comment documentation">/// ```</span>
+    <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">bool</span> <span class="punctuation">{</span>
+        <span class="bool_literal">true</span>
+    <span class="punctuation">}</span>
+<span class="punctuation">}</span>
+<span class="comment documentation">/// ```</span>
+<span class="comment documentation">/// </span><span class="macro injected">noop!</span><span class="punctuation injected">(</span><span class="numeric_literal injected">1</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected">
+</span><span class="comment documentation">/// ```</span>
+<span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> <span class="punctuation">{</span>
+    <span class="punctuation">(</span><span class="punctuation">$</span>expr<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
+        <span class="punctuation">$</span>expr
+    <span class="punctuation">}</span>
+<span class="punctuation">}</span></code></pre>
+\ No newline at end of file
diff --git a/crates/ra_ide/src/snapshots/highlight_injection.html b/crates/ra_ide/test_data/highlight_injection.html
index 1b0349bae..18addd00d 100644
--- a/crates/ra_ide/src/snapshots/highlight_injection.html
+++ b/crates/ra_ide/test_data/highlight_injection.html
@@ -24,24 +24,25 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .bool_literal       { color: #BFE6EB; }
 .macro              { color: #94BFF3; }
 .module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
 .variable           { color: #DCDCCC; }
 .format_specifier   { color: #CC696B; }
 .mutable            { text-decoration: underline; }
-.unresolved_reference { color: #FC5555; }
 .escape_sequence    { color: #94BFF3; }
 .keyword            { color: #F0DFAF; font-weight: bold; }
 .keyword.unsafe     { color: #BC8383; font-weight: bold; }
 .control            { font-style: italic; }
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span>(<span class="variable declaration">ra_fixture</span>: &<span class="builtin_type">str</span>) {}
+<pre><code><span class="keyword">fn</span> <span class="function declaration">fixture</span><span class="punctuation">(</span><span class="value_param declaration">ra_fixture</span><span class="punctuation">:</span> <span class="operator">&</span><span class="builtin_type">str</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="keyword">fn</span> <span class="function declaration">main</span>() {
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-    <span class="function">fixture</span>(<span class="string_literal">r#"</span>
+    <span class="function">fixture</span><span class="punctuation">(</span><span class="string_literal">r#"</span>
-        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> {
+        <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="punctuation">{</span>
-            <span class="keyword">fn</span> <span class="function declaration">foo</span>() {
+            <span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-                <span class="macro">println!</span>(<span class="string_literal">"2 + 2 = {}"</span>, <span class="numeric_literal">4</span>);
+                <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</span>
-            }
+            <span class="punctuation">}</span>
-        }<span class="string_literal">"#</span>
+        <span class="punctuation">}</span><span class="string_literal">"#</span>
-    );
+    <span class="punctuation">)</span><span class="punctuation">;</span>
-}</code></pre>
-\ No newline at end of file
+<span class="punctuation">}</span></code></pre>
+\ No newline at end of file
diff --git a/crates/ra_ide/test_data/highlight_strings.html b/crates/ra_ide/test_data/highlight_strings.html
new file mode 100644
index 000000000..1b681b2c6
--- /dev/null
+++ b/crates/ra_ide/test_data/highlight_strings.html
@@ -0,0 +1,96 @@
+<style>
+body                { margin: 0; }
+pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
+.lifetime           { color: #DFAF8F; font-style: italic; }
+.comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
+.struct, .enum      { color: #7CB8BB; }
+.enum_variant       { color: #BDE0F3; }
+.string_literal     { color: #CC9393; }
+.field              { color: #94BFF3; }
+.function           { color: #93E0E3; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
+.parameter          { color: #94BFF3; }
+.text               { color: #DCDCCC; }
+.type               { color: #7CB8BB; }
+.builtin_type       { color: #8CD0D3; }
+.type_param         { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.numeric_literal    { color: #BFEBBF; }
+.bool_literal       { color: #BFE6EB; }
+.macro              { color: #94BFF3; }
+.module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
+.variable           { color: #DCDCCC; }
+.format_specifier   { color: #CC696B; }
+.mutable            { text-decoration: underline; }
+.escape_sequence    { color: #94BFF3; }
+.keyword            { color: #F0DFAF; font-weight: bold; }
+.keyword.unsafe     { color: #BC8383; font-weight: bold; }
+.control            { font-style: italic; }
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
+</style>
+<pre><code><span class="macro">macro_rules!</span> <span class="macro declaration">println</span> <span class="punctuation">{</span>
+    <span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>arg<span class="punctuation">:</span>tt<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">(</span><span class="punctuation">{</span>
+        <span class="punctuation">$</span><span class="keyword">crate</span><span class="punctuation">:</span><span class="punctuation">:</span>io<span class="punctuation">:</span><span class="punctuation">:</span>_print<span class="punctuation">(</span><span class="punctuation">$</span><span class="keyword">crate</span><span class="punctuation">:</span><span class="punctuation">:</span>format_args_nl<span class="punctuation">!</span><span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>arg<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="punctuation">}</span><span class="punctuation">)</span>
+<span class="punctuation">}</span>
+#[rustc_builtin_macro]
+<span class="macro">macro_rules!</span> <span class="macro declaration">format_args_nl</span> <span class="punctuation">{</span>
+    <span class="punctuation">(</span><span class="punctuation">$</span>fmt<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">{</span> <span class="comment">/* compiler built-in */</span> <span class="punctuation">}</span><span class="punctuation">}</span><span class="punctuation">;</span>
+    <span class="punctuation">(</span><span class="punctuation">$</span>fmt<span class="punctuation">:</span>expr<span class="punctuation">,</span> <span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>args<span class="punctuation">:</span>tt<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">{</span> <span class="comment">/* compiler built-in */</span> <span class="punctuation">}</span><span class="punctuation">}</span><span class="punctuation">;</span>
+<span class="punctuation">}</span>
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
+    <span class="comment">// from https://doc.rust-lang.org/std/fmt/index.html</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello"</span><span class="punctuation">)</span><span class="punctuation">;</span>                 <span class="comment">// =&gt; "Hello"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"world"</span><span class="punctuation">)</span><span class="punctuation">;</span>   <span class="comment">// =&gt; "Hello, world!"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"The number is </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">)</span><span class="punctuation">;</span>   <span class="comment">// =&gt; "The number is 1"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">?</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="punctuation">(</span><span class="numeric_literal">3</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span>          <span class="comment">// =&gt; "(3, 4)"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">value</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> value<span class="operator">=</span><span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</span>      <span class="comment">// =&gt; "4"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span>           <span class="comment">// =&gt; "1 2"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">4</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">42</span><span class="punctuation">)</span><span class="punctuation">;</span>             <span class="comment">// =&gt; "0042" with leading zerosV</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span>   <span class="comment">// =&gt; "2 1 1 2"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">argument</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> argument <span class="operator">=</span> <span class="string_literal">"test"</span><span class="punctuation">)</span><span class="punctuation">;</span>   <span class="comment">// =&gt; "test"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">1</span><span class="punctuation">,</span> name <span class="operator">=</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span>          <span class="comment">// =&gt; "2 1"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">a</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">c</span><span class="format_specifier">}</span><span class="string_literal"> </span><span class="format_specifier">{</span><span class="variable">b</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> a<span class="operator">=</span><span class="string_literal">"a"</span><span class="punctuation">,</span> b<span class="operator">=</span><span class="char_literal">'b'</span><span class="punctuation">,</span> c<span class="operator">=</span><span class="numeric_literal">3</span><span class="punctuation">)</span><span class="punctuation">;</span>  <span class="comment">// =&gt; "a 3 b"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"{{</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">}}"</span><span class="punctuation">,</span> <span class="numeric_literal">2</span><span class="punctuation">)</span><span class="punctuation">;</span>                       <span class="comment">// =&gt; "{2}"</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="variable">width</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> width <span class="operator">=</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">&lt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">-</span><span class="format_specifier">&lt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">^</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">&gt;</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">+</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">27</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="numeric_literal">0</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="punctuation">-</span><span class="numeric_literal">5</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">#</span><span class="numeric_literal">0</span><span class="numeric_literal">10</span><span class="variable">x</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="numeric_literal">27</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">5</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">1</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">0</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="numeric_literal">0</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="numeric_literal">1</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span>    <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="numeric_literal">2</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span>   <span class="string_literal">"x"</span><span class="punctuation">,</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal"> is </span><span class="format_specifier">{</span><span class="variable">number</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="variable">prec</span><span class="format_specifier">$</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> <span class="string_literal">"x"</span><span class="punctuation">,</span> prec <span class="operator">=</span> <span class="numeric_literal">5</span><span class="punctuation">,</span> number <span class="operator">=</span> <span class="numeric_literal">0.01</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 fractional digits"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="operator">=</span><span class="numeric_literal">1234.56</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 characters"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="operator">=</span><span class="string_literal">"1234.56"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">, `</span><span class="format_specifier">{</span><span class="variable">name</span><span class="format_specifier">:</span><span class="format_specifier">&gt;</span><span class="numeric_literal">8</span><span class="format_specifier">.</span><span class="format_specifier">*</span><span class="format_specifier">}</span><span class="string_literal">` has 3 right-aligned characters"</span><span class="punctuation">,</span> <span class="string_literal">"Hello"</span><span class="punctuation">,</span> <span class="numeric_literal">3</span><span class="punctuation">,</span> name<span class="operator">=</span><span class="string_literal">"1234.56"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello {{}}"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"{{ Hello"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">r"Hello, </span><span class="format_specifier">{</span><span class="format_specifier">}</span><span class="string_literal">!"</span><span class="punctuation">,</span> <span class="string_literal">"world"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="comment">// escape sequences</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello</span><span class="escape_sequence">\n</span><span class="string_literal">World"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="escape_sequence">\u{48}</span><span class="escape_sequence">\x65</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6C</span><span class="escape_sequence">\x6F</span><span class="string_literal"> World"</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="escape_sequence">\x41</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> A <span class="operator">=</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"</span><span class="format_specifier">{</span><span class="variable">ничоси</span><span class="format_specifier">}</span><span class="string_literal">"</span><span class="punctuation">,</span> ничоси <span class="operator">=</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span>
+<span class="punctuation">}</span></code></pre>
+\ No newline at end of file
diff --git a/crates/ra_ide/src/snapshots/highlight_unsafe.html b/crates/ra_ide/test_data/highlight_unsafe.html
index 6936e949f..b81b6f1c3 100644
--- a/crates/ra_ide/src/snapshots/highlight_unsafe.html
+++ b/crates/ra_ide/test_data/highlight_unsafe.html
@@ -24,30 +24,31 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .bool_literal       { color: #BFE6EB; }
 .macro              { color: #94BFF3; }
 .module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
 .variable           { color: #DCDCCC; }
 .format_specifier   { color: #CC696B; }
 .mutable            { text-decoration: underline; }
-.unresolved_reference { color: #FC5555; }
 .escape_sequence    { color: #94BFF3; }
 .keyword            { color: #F0DFAF; font-weight: bold; }
 .keyword.unsafe     { color: #BC8383; font-weight: bold; }
 .control            { font-style: italic; }
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_fn</span>() {}
+<pre><code><span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_fn</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-<span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span>;
+<span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span><span class="punctuation">;</span>
-<span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> {
+<span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> <span class="punctuation">{</span>
-    <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_method</span>(&<span class="self_keyword">self</span>) {}
+    <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration unsafe">unsafe_method</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span>
-}
+<span class="punctuation">}</span>
-<span class="keyword">fn</span> <span class="function declaration">main</span>() {
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-    <span class="keyword">let</span> <span class="variable declaration">x</span> = &<span class="numeric_literal">5</span> <span class="keyword">as</span> *<span class="keyword">const</span> <span class="builtin_type">usize</span>;
+    <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="operator">=</span> <span class="operator">&</span><span class="numeric_literal">5</span> <span class="keyword">as</span> <span class="keyword">*</span><span class="keyword">const</span> <span class="builtin_type">usize</span><span class="punctuation">;</span>
-    <span class="keyword unsafe">unsafe</span> {
+    <span class="keyword unsafe">unsafe</span> <span class="punctuation">{</span>
-        <span class="function unsafe">unsafe_fn</span>();
+        <span class="function unsafe">unsafe_fn</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-        <span class="struct">HasUnsafeFn</span>.<span class="function unsafe">unsafe_method</span>();
+        <span class="struct">HasUnsafeFn</span><span class="punctuation">.</span><span class="function unsafe">unsafe_method</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-        <span class="keyword">let</span> <span class="variable declaration">y</span> = <span class="operator unsafe">*</span>(<span class="variable">x</span>);
+        <span class="keyword">let</span> <span class="variable declaration">y</span> <span class="operator">=</span> <span class="operator unsafe">*</span><span class="punctuation">(</span><span class="variable">x</span><span class="punctuation">)</span><span class="punctuation">;</span>
-        <span class="keyword">let</span> <span class="variable declaration">z</span> = -<span class="variable">x</span>;
+        <span class="keyword">let</span> <span class="variable declaration">z</span> <span class="operator">=</span> <span class="numeric_literal">-</span><span class="variable">x</span><span class="punctuation">;</span>
-    }
+    <span class="punctuation">}</span>
-}</code></pre>
-\ No newline at end of file
+<span class="punctuation">}</span></code></pre>
+\ No newline at end of file
diff --git a/crates/ra_ide/test_data/highlighting.html b/crates/ra_ide/test_data/highlighting.html
new file mode 100644
index 000000000..345a2f023
--- /dev/null
+++ b/crates/ra_ide/test_data/highlighting.html
@@ -0,0 +1,128 @@
+<style>
+body                { margin: 0; }
+pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
+.lifetime           { color: #DFAF8F; font-style: italic; }
+.comment            { color: #7F9F7F; }
+.documentation      { color: #629755; }
+.injected           { opacity: 0.65 ; }
+.struct, .enum      { color: #7CB8BB; }
+.enum_variant       { color: #BDE0F3; }
+.string_literal     { color: #CC9393; }
+.field              { color: #94BFF3; }
+.function           { color: #93E0E3; }
+.function.unsafe    { color: #BC8383; }
+.operator.unsafe    { color: #BC8383; }
+.parameter          { color: #94BFF3; }
+.text               { color: #DCDCCC; }
+.type               { color: #7CB8BB; }
+.builtin_type       { color: #8CD0D3; }
+.type_param         { color: #DFAF8F; }
+.attribute          { color: #94BFF3; }
+.numeric_literal    { color: #BFEBBF; }
+.bool_literal       { color: #BFE6EB; }
+.macro              { color: #94BFF3; }
+.module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
+.variable           { color: #DCDCCC; }
+.format_specifier   { color: #CC696B; }
+.mutable            { text-decoration: underline; }
+.escape_sequence    { color: #94BFF3; }
+.keyword            { color: #F0DFAF; font-weight: bold; }
+.keyword.unsafe     { color: #BC8383; font-weight: bold; }
+.control            { font-style: italic; }
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
+</style>
+<pre><code><span class="attribute">#</span><span class="attribute">[</span><span class="function attribute">derive</span><span class="punctuation">(</span><span class="attribute">Clone</span><span class="punctuation">,</span><span class="attribute"> Debug</span><span class="punctuation">)</span><span class="attribute">]</span>
+<span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span>
+    <span class="keyword">pub</span> <span class="field declaration">x</span><span class="punctuation">:</span> <span class="builtin_type">i32</span><span class="punctuation">,</span>
+    <span class="keyword">pub</span> <span class="field declaration">y</span><span class="punctuation">:</span> <span class="builtin_type">i32</span><span class="punctuation">,</span>
+<span class="punctuation">}</span>
+<span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="punctuation">{</span>
+    <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span><span class="punctuation">;</span>
+<span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
+    <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="punctuation">{</span>
+        <span class="self_keyword">self</span><span class="punctuation">.</span><span class="field">x</span>
+    <span class="punctuation">}</span>
+<span class="punctuation">}</span>
+<span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
+    <span class="keyword">fn</span> <span class="function declaration">baz</span><span class="punctuation">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="punctuation">{</span>
+        <span class="self_keyword">self</span><span class="punctuation">.</span><span class="field">x</span>
+    <span class="punctuation">}</span>
+    <span class="keyword">fn</span> <span class="function declaration">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
+        <span class="self_keyword mutable">self</span><span class="punctuation">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span>
+    <span class="punctuation">}</span>
+<span class="punctuation">}</span>
+<span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable">STATIC_MUT</span><span class="punctuation">:</span> <span class="builtin_type">i32</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span>
+<span class="keyword">fn</span> <span class="function declaration">foo</span><span class="punctuation">&lt;</span><span class="lifetime declaration">'a</span><span class="punctuation">,</span> <span class="type_param declaration">T</span><span class="punctuation">&gt;</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="type_param">T</span> <span class="punctuation">{</span>
+    <span class="function">foo</span><span class="operator">::</span><span class="punctuation">&lt;</span><span class="lifetime">'a</span><span class="punctuation">,</span> <span class="builtin_type">i32</span><span class="punctuation">&gt;</span><span class="punctuation">(</span><span class="punctuation">)</span>
+<span class="punctuation">}</span>
+<span class="macro">macro_rules!</span> <span class="macro declaration">def_fn</span> <span class="punctuation">{</span>
+    <span class="punctuation">(</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>tt<span class="punctuation">:</span>tt<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span><span class="punctuation">$</span><span class="punctuation">(</span><span class="punctuation">$</span>tt<span class="punctuation">)</span><span class="punctuation">*</span><span class="punctuation">}</span>
+<span class="punctuation">}</span>
+<span class="macro">def_fn!</span> <span class="punctuation">{</span>
+    <span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-</span><span class="operator">&gt;</span> <span class="builtin_type">u32</span> <span class="punctuation">{</span>
+        <span class="numeric_literal">100</span>
+    <span class="punctuation">}</span>
+<span class="punctuation">}</span>
+<span class="macro">macro_rules!</span> <span class="macro declaration">noop</span> <span class="punctuation">{</span>
+    <span class="punctuation">(</span><span class="punctuation">$</span>expr<span class="punctuation">:</span>expr<span class="punctuation">)</span> <span class="operator">=</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
+        <span class="punctuation">$</span>expr
+    <span class="punctuation">}</span>
+<span class="punctuation">}</span>
+<span class="comment">// comment</span>
+<span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
+    <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"Hello, {}!"</span><span class="punctuation">,</span> <span class="numeric_literal">92</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">vec</span> <span class="operator">=</span> <span class="unresolved_reference">Vec</span><span class="operator">::</span><span class="unresolved_reference">new</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="keyword control">if</span> <span class="bool_literal">true</span> <span class="punctuation">{</span>
+        <span class="keyword">let</span> <span class="variable declaration">x</span> <span class="operator">=</span> <span class="numeric_literal">92</span><span class="punctuation">;</span>
+        <span class="variable mutable">vec</span><span class="punctuation">.</span><span class="unresolved_reference">push</span><span class="punctuation">(</span><span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="numeric_literal">1</span> <span class="punctuation">}</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="punctuation">}</span>
+    <span class="keyword unsafe">unsafe</span> <span class="punctuation">{</span>
+        <span class="variable mutable">vec</span><span class="punctuation">.</span><span class="unresolved_reference">set_len</span><span class="punctuation">(</span><span class="numeric_literal">0</span><span class="punctuation">)</span><span class="punctuation">;</span>
+        <span class="static mutable">STATIC_MUT</span> <span class="operator">=</span> <span class="numeric_literal">1</span><span class="punctuation">;</span>
+    <span class="punctuation">}</span>
+    <span class="keyword control">for</span> <span class="variable declaration">e</span> <span class="keyword control">in</span> <span class="variable mutable">vec</span> <span class="punctuation">{</span>
+        <span class="comment">// Do nothing</span>
+    <span class="punctuation">}</span>
+    <span class="macro">noop!</span><span class="punctuation">(</span><span class="macro">noop</span><span class="macro">!</span><span class="punctuation">(</span><span class="numeric_literal">1</span><span class="punctuation">)</span><span class="punctuation">)</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">x</span> <span class="operator">=</span> <span class="numeric_literal">42</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="variable declaration mutable">y</span> <span class="operator">=</span> <span class="operator">&</span><span class="keyword">mut</span> <span class="variable mutable">x</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="variable declaration">z</span> <span class="operator">=</span> <span class="operator">&</span><span class="variable mutable">y</span><span class="punctuation">;</span>
+    <span class="keyword">let</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">:</span> <span class="variable declaration">z</span><span class="punctuation">,</span> <span class="field">y</span> <span class="punctuation">}</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">:</span> <span class="variable">z</span><span class="punctuation">,</span> <span class="field">y</span> <span class="punctuation">}</span><span class="punctuation">;</span>
+    <span class="variable">y</span><span class="punctuation">;</span>
+<span class="punctuation">}</span>
+<span class="keyword">enum</span> <span class="enum declaration">Option</span><span class="punctuation">&lt;</span><span class="type_param declaration">T</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
+    <span class="enum_variant declaration">Some</span><span class="punctuation">(</span><span class="type_param">T</span><span class="punctuation">)</span><span class="punctuation">,</span>
+    <span class="enum_variant declaration">None</span><span class="punctuation">,</span>
+<span class="punctuation">}</span>
+<span class="keyword">use</span> <span class="enum">Option</span><span class="operator">::</span><span class="punctuation">*</span><span class="punctuation">;</span>
+<span class="keyword">impl</span><span class="punctuation">&lt;</span><span class="type_param declaration">T</span><span class="punctuation">&gt;</span> <span class="enum">Option</span><span class="punctuation">&lt;</span><span class="type_param">T</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
+    <span class="keyword">fn</span> <span class="function declaration">and</span><span class="punctuation">&lt;</span><span class="type_param declaration">U</span><span class="punctuation">&gt;</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">other</span><span class="punctuation">:</span> <span class="enum">Option</span><span class="punctuation">&lt;</span><span class="type_param">U</span><span class="punctuation">&gt;</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="enum">Option</span><span class="punctuation">&lt;</span><span class="punctuation">(</span><span class="type_param">T</span><span class="punctuation">,</span> <span class="type_param">U</span><span class="punctuation">)</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>
+        <span class="keyword control">match</span> <span class="value_param">other</span> <span class="punctuation">{</span>
+            <span class="enum_variant">None</span> <span class="operator">=&gt;</span> <span class="macro">unimplemented!</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span>
+            <span class="variable declaration">Nope</span> <span class="operator">=&gt;</span> <span class="variable">Nope</span><span class="punctuation">,</span>
+        <span class="punctuation">}</span>
+    <span class="punctuation">}</span>
+<span class="punctuation">}</span></code></pre>
+\ No newline at end of file
diff --git a/crates/ra_ide/src/snapshots/rainbow_highlighting.html b/crates/ra_ide/test_data/rainbow_highlighting.html
index 9516c7441..401e87a73 100644
--- a/crates/ra_ide/src/snapshots/rainbow_highlighting.html
+++ b/crates/ra_ide/test_data/rainbow_highlighting.html
@@ -24,25 +24,26 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .bool_literal       { color: #BFE6EB; }
 .macro              { color: #94BFF3; }
 .module             { color: #AFD8AF; }
+.value_param        { color: #DCDCCC; }
 .variable           { color: #DCDCCC; }
 .format_specifier   { color: #CC696B; }
 .mutable            { text-decoration: underline; }
-.unresolved_reference { color: #FC5555; }
 .escape_sequence    { color: #94BFF3; }
 .keyword            { color: #F0DFAF; font-weight: bold; }
 .keyword.unsafe     { color: #BC8383; font-weight: bold; }
 .control            { font-style: italic; }
+.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
 </style>
-<pre><code><span class="keyword">fn</span> <span class="function declaration">main</span>() {
+<pre><code><span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> = <span class="string_literal">"hello"</span>;
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span> <span class="operator">=</span> <span class="string_literal">"hello"</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="2705725358298919760" style="color: hsl(17,51%,74%);">x</span> = <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span>.<span class="unresolved_reference">to_string</span>();
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="2705725358298919760" style="color: hsl(76,47%,83%);">x</span> <span class="operator">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span><span class="punctuation">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="3365759661443752373" style="color: hsl(127,76%,66%);">y</span> = <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span>.<span class="unresolved_reference">to_string</span>();
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="3365759661443752373" style="color: hsl(15,86%,51%);">y</span> <span class="operator">=</span> <span class="variable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span><span class="punctuation">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span> = <span class="string_literal">"other color please!"</span>;
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="794745962933817518" style="color: hsl(127,71%,87%);">x</span> <span class="operator">=</span> <span class="string_literal">"other color please!"</span><span class="punctuation">;</span>
-    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="6717528807933952652" style="color: hsl(85,49%,84%);">y</span> = <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(19,74%,76%);">x</span>.<span class="unresolved_reference">to_string</span>();
+    <span class="keyword">let</span> <span class="variable declaration" data-binding-hash="6717528807933952652" style="color: hsl(90,74%,79%);">y</span> <span class="operator">=</span> <span class="variable" data-binding-hash="794745962933817518" style="color: hsl(127,71%,87%);">x</span><span class="punctuation">.</span><span class="unresolved_reference">to_string</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
-}
+<span class="punctuation">}</span>
-<span class="keyword">fn</span> <span class="function declaration">bar</span>() {
+<span class="keyword">fn</span> <span class="function declaration">bar</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span>
-    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable" data-binding-hash="8121853618659664005" style="color: hsl(261,57%,61%);">hello</span> = <span class="string_literal">"hello"</span>;
+    <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable" data-binding-hash="8121853618659664005" style="color: hsl(273,88%,88%);">hello</span> <span class="operator">=</span> <span class="string_literal">"hello"</span><span class="punctuation">;</span>
-}</code></pre>
-\ No newline at end of file
+<span class="punctuation">}</span></code></pre>
+\ No newline at end of file
diff --git a/crates/ra_ide_db/Cargo.toml b/crates/ra_ide_db/Cargo.toml
index b14206c9b..f345f1de8 100644
--- a/crates/ra_ide_db/Cargo.toml
+++ b/crates/ra_ide_db/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_ide_db"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -15,10 +16,11 @@ log = "0.4.8"
 rayon = "1.3.0"
 fst = { version = "0.4", default-features = false }
 rustc-hash = "1.1.0"
-superslice = "1.0.0"
 once_cell = "1.3.1"
 either = "1.5.3"
+stdx = { path = "../stdx" }
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
diff --git a/crates/ra_ide_db/src/change.rs b/crates/ra_ide_db/src/change.rs
index b507000f2..32d9a8d1f 100644
--- a/crates/ra_ide_db/src/change.rs
+++ b/crates/ra_ide_db/src/change.rs
@@ -5,8 +5,7 @@ use std::{fmt, sync::Arc, time};
 use ra_db::{
    salsa::{Database, Durability, SweepStrategy},
-    CrateGraph, FileId, RelativePathBuf, SourceDatabase, SourceDatabaseExt, SourceRoot,
+    CrateGraph, FileId, SourceDatabase, SourceDatabaseExt, SourceRoot, SourceRootId,
-    SourceRootId,
 };
 use ra_prof::{memory_usage, profile, Bytes};
 use rustc_hash::FxHashSet;
@@ -57,14 +56,14 @@ impl AnalysisChange {
 #[derive(Debug)]
 struct AddFile {
    file_id: FileId,
-    path: RelativePathBuf,
+    path: String,
    text: Arc<String>,
 }
 #[derive(Debug)]
 struct RemoveFile {
    file_id: FileId,
-    path: RelativePathBuf,
+    path: String,
 }
 #[derive(Default)]
@@ -147,37 +146,46 @@ impl RootDatabase {
        let sweep = SweepStrategy::default().discard_values().sweep_all_revisions();
-        self.query(ra_db::ParseQuery).sweep(sweep);
+        ra_db::ParseQuery.in_db(self).sweep(sweep);
-        self.query(hir::db::ParseMacroQuery).sweep(sweep);
+        hir::db::ParseMacroQuery.in_db(self).sweep(sweep);
        // Macros do take significant space, but less then the syntax trees
        // self.query(hir::db::MacroDefQuery).sweep(sweep);
-        // self.query(hir::db::MacroArgQuery).sweep(sweep);
+        // self.query(hir::db::MacroArgTextQuery).sweep(sweep);
        // self.query(hir::db::MacroExpandQuery).sweep(sweep);
-        self.query(hir::db::AstIdMapQuery).sweep(sweep);
+        hir::db::AstIdMapQuery.in_db(self).sweep(sweep);
-        self.query(hir::db::BodyWithSourceMapQuery).sweep(sweep);
+        hir::db::BodyWithSourceMapQuery.in_db(self).sweep(sweep);
-        self.query(hir::db::ExprScopesQuery).sweep(sweep);
+        hir::db::ExprScopesQuery.in_db(self).sweep(sweep);
-        self.query(hir::db::InferQueryQuery).sweep(sweep);
+        hir::db::InferQueryQuery.in_db(self).sweep(sweep);
-        self.query(hir::db::BodyQuery).sweep(sweep);
+        hir::db::BodyQuery.in_db(self).sweep(sweep);
    }
+    // Feature: Memory Usage
+    //
+    // Clears rust-analyzer's internal database and prints memory usage statistics.
+    //
+    // |===
+    // | Editor  | Action Name
+    //
+    // | VS Code | **Rust Analyzer: Memory Usage (Clears Database)**
+    // |===
    pub fn per_query_memory_usage(&mut self) -> Vec<(String, Bytes)> {
        let mut acc: Vec<(String, Bytes)> = vec![];
        let sweep = SweepStrategy::default().discard_values().sweep_all_revisions();
        macro_rules! sweep_each_query {
            ($($q:path)*) => {$(
                let before = memory_usage().allocated;
-                self.query($q).sweep(sweep);
+                $q.in_db(self).sweep(sweep);
                let after = memory_usage().allocated;
                let q: $q = Default::default();
                let name = format!("{:?}", q);
                acc.push((name, before - after));
                let before = memory_usage().allocated;
-                self.query($q).sweep(sweep.discard_everything());
+                $q.in_db(self).sweep(sweep.discard_everything());
                let after = memory_usage().allocated;
                let q: $q = Default::default();
                let name = format!("{:?} (deps)", q);
@@ -191,12 +199,10 @@ impl RootDatabase {
            // AstDatabase
            hir::db::AstIdMapQuery
-            hir::db::InternMacroQuery
+            hir::db::MacroArgTextQuery
-            hir::db::MacroArgQuery
            hir::db::MacroDefQuery
            hir::db::ParseMacroQuery
            hir::db::MacroExpandQuery
-            hir::db::InternEagerExpansionQuery
            // DefDatabase
            hir::db::ItemTreeQuery
@@ -221,17 +227,6 @@ impl RootDatabase {
            hir::db::DocumentationQuery
            hir::db::ImportMapQuery
-            // InternDatabase
-            hir::db::InternFunctionQuery
-            hir::db::InternStructQuery
-            hir::db::InternUnionQuery
-            hir::db::InternEnumQuery
-            hir::db::InternConstQuery
-            hir::db::InternStaticQuery
-            hir::db::InternTraitQuery
-            hir::db::InternTypeAliasQuery
-            hir::db::InternImplQuery
            // HirDatabase
            hir::db::InferQueryQuery
            hir::db::TyQuery
@@ -243,12 +238,9 @@ impl RootDatabase {
            hir::db::GenericPredicatesForParamQuery
            hir::db::GenericPredicatesQuery
            hir::db::GenericDefaultsQuery
-            hir::db::ImplsInCrateQuery
+            hir::db::InherentImplsInCrateQuery
-            hir::db::ImplsFromDepsQuery
+            hir::db::TraitImplsInCrateQuery
-            hir::db::InternTypeCtorQuery
+            hir::db::TraitImplsInDepsQuery
-            hir::db::InternTypeParamIdQuery
-            hir::db::InternChalkImplQuery
-            hir::db::InternAssocTyValueQuery
            hir::db::AssociatedTyDataQuery
            hir::db::TraitDatumQuery
            hir::db::StructDatumQuery
@@ -263,6 +255,33 @@ impl RootDatabase {
            // LineIndexDatabase
            crate::LineIndexQuery
        ];
+        // To collect interned data, we need to bump the revision counter by performing a synthetic
+        // write.
+        // We do this after collecting the non-interned queries to correctly attribute memory used
+        // by interned data.
+        self.salsa_runtime_mut().synthetic_write(Durability::HIGH);
+        sweep_each_query![
+            // AstDatabase
+            hir::db::InternMacroQuery
+            hir::db::InternEagerExpansionQuery
+            // InternDatabase
+            hir::db::InternFunctionQuery
+            hir::db::InternStructQuery
+            hir::db::InternUnionQuery
+            hir::db::InternEnumQuery
+            hir::db::InternConstQuery
+            hir::db::InternStaticQuery
+            hir::db::InternTraitQuery
+            hir::db::InternTypeAliasQuery
+            hir::db::InternImplQuery
+            // HirDatabase
+            hir::db::InternTypeParamIdQuery
+        ];
        acc.sort_by_key(|it| std::cmp::Reverse(it.1));
        acc
    }
diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs
index bc6e89cbc..80c99935d 100644
--- a/crates/ra_ide_db/src/defs.rs
+++ b/crates/ra_ide_db/src/defs.rs
@@ -136,7 +136,7 @@ pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option
    match_ast! {
        match parent {
-            ast::Alias(it) => {
+            ast::Rename(it) => {
                let use_tree = it.syntax().parent().and_then(ast::UseTree::cast)?;
                let path = use_tree.path()?;
                let path_segment = path.segment()?;
@@ -159,7 +159,7 @@ pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option
                Some(NameClass::Definition(Definition::Local(local)))
            },
-            ast::RecordFieldDef(it) => {
+            ast::RecordField(it) => {
                let field: hir::Field = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::Field(field)))
            },
@@ -167,39 +167,39 @@ pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option
                let def = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::StructDef(it) => {
+            ast::Struct(it) => {
                let def: hir::Struct = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::UnionDef(it) => {
+            ast::Union(it) => {
                let def: hir::Union = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::EnumDef(it) => {
+            ast::Enum(it) => {
                let def: hir::Enum = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::TraitDef(it) => {
+            ast::Trait(it) => {
                let def: hir::Trait = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::StaticDef(it) => {
+            ast::Static(it) => {
                let def: hir::Static = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::EnumVariant(it) => {
+            ast::Variant(it) => {
                let def: hir::EnumVariant = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::FnDef(it) => {
+            ast::Fn(it) => {
                let def: hir::Function = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::ConstDef(it) => {
+            ast::Const(it) => {
                let def: hir::Const = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
-            ast::TypeAliasDef(it) => {
+            ast::TypeAlias(it) => {
                let def: hir::TypeAlias = sema.to_def(&it)?;
                Some(NameClass::Definition(Definition::ModuleDef(def.into())))
            },
@@ -253,7 +253,7 @@ pub fn classify_name_ref(
        }
    }
-    if let Some(record_field) = ast::RecordField::for_field_name(name_ref) {
+    if let Some(record_field) = ast::RecordExprField::for_field_name(name_ref) {
        if let Some((field, local)) = sema.resolve_record_field(&record_field) {
            let field = Definition::Field(field);
            let res = match local {
@@ -271,28 +271,61 @@ pub fn classify_name_ref(
        }
    }
+    if ast::AssocTypeArg::cast(parent.clone()).is_some() {
+        // `Trait<Assoc = Ty>`
+        //        ^^^^^
+        let path = name_ref.syntax().ancestors().find_map(ast::Path::cast)?;
+        let resolved = sema.resolve_path(&path)?;
+        if let PathResolution::Def(ModuleDef::Trait(tr)) = resolved {
+            if let Some(ty) = tr
+                .items(sema.db)
+                .iter()
+                .filter_map(|assoc| match assoc {
+                    hir::AssocItem::TypeAlias(it) => Some(*it),
+                    _ => None,
+                })
+                .find(|alias| alias.name(sema.db).to_string() == **name_ref.text())
+            {
+                return Some(NameRefClass::Definition(Definition::ModuleDef(
+                    ModuleDef::TypeAlias(ty),
+                )));
+            }
+        }
+    }
    if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) {
-        if let Some(macro_def) = sema.resolve_macro_call(&macro_call) {
+        if let Some(path) = macro_call.path() {
-            return Some(NameRefClass::Definition(Definition::Macro(macro_def)));
+            if path.qualifier().is_none() {
+                // Only use this to resolve single-segment macro calls like `foo!()`. Multi-segment
+                // paths are handled below (allowing `log<|>::info!` to resolve to the log crate).
+                if let Some(macro_def) = sema.resolve_macro_call(&macro_call) {
+                    return Some(NameRefClass::Definition(Definition::Macro(macro_def)));
+                }
+            }
        }
    }
    let path = name_ref.syntax().ancestors().find_map(ast::Path::cast)?;
    let resolved = sema.resolve_path(&path)?;
-    let res = match resolved {
+    Some(NameRefClass::Definition(resolved.into()))
-        PathResolution::Def(def) => Definition::ModuleDef(def),
+}
-        PathResolution::AssocItem(item) => {
-            let def = match item {
+impl From<PathResolution> for Definition {
-                hir::AssocItem::Function(it) => it.into(),
+    fn from(path_resolution: PathResolution) -> Self {
-                hir::AssocItem::Const(it) => it.into(),
+        match path_resolution {
-                hir::AssocItem::TypeAlias(it) => it.into(),
+            PathResolution::Def(def) => Definition::ModuleDef(def),
-            };
+            PathResolution::AssocItem(item) => {
-            Definition::ModuleDef(def)
+                let def = match item {
+                    hir::AssocItem::Function(it) => it.into(),
+                    hir::AssocItem::Const(it) => it.into(),
+                    hir::AssocItem::TypeAlias(it) => it.into(),
+                };
+                Definition::ModuleDef(def)
+            }
+            PathResolution::Local(local) => Definition::Local(local),
+            PathResolution::TypeParam(par) => Definition::TypeParam(par),
+            PathResolution::Macro(def) => Definition::Macro(def),
+            PathResolution::SelfType(impl_def) => Definition::SelfType(impl_def),
        }
-        PathResolution::Local(local) => Definition::Local(local),
+    }
-        PathResolution::TypeParam(par) => Definition::TypeParam(par),
-        PathResolution::Macro(def) => Definition::Macro(def),
-        PathResolution::SelfType(impl_def) => Definition::SelfType(impl_def),
-    };
-    Some(NameRefClass::Definition(res))
 }
diff --git a/crates/ra_ide_db/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs
index fff112e66..1fba71ff8 100644
--- a/crates/ra_ide_db/src/imports_locator.rs
+++ b/crates/ra_ide_db/src/imports_locator.rs
@@ -13,57 +13,53 @@ use crate::{
 use either::Either;
 use rustc_hash::FxHashSet;
-pub struct ImportsLocator<'a> {
+pub fn find_imports<'a>(
-    sema: Semantics<'a, RootDatabase>,
+    sema: &Semantics<'a, RootDatabase>,
    krate: Crate,
-}
+    name_to_import: &str,
+) -> Vec<Either<ModuleDef, MacroDef>> {
-impl<'a> ImportsLocator<'a> {
+    let _p = profile("search_for_imports");
-    pub fn new(db: &'a RootDatabase, krate: Crate) -> Self {
+    let db = sema.db;
-        Self { sema: Semantics::new(db), krate }
-    }
-    pub fn find_imports(&mut self, name_to_import: &str) -> Vec<Either<ModuleDef, MacroDef>> {
+    // Query dependencies first.
-        let _p = profile("search_for_imports");
+    let mut candidates: FxHashSet<_> =
-        let db = self.sema.db;
+        krate.query_external_importables(db, name_to_import).collect();
-        // Query dependencies first.
+    // Query the local crate using the symbol index.
-        let mut candidates: FxHashSet<_> =
+    let local_results = {
-            self.krate.query_external_importables(db, name_to_import).collect();
+        let mut query = Query::new(name_to_import.to_string());
+        query.exact();
+        query.limit(40);
+        symbol_index::crate_symbols(db, krate.into(), query)
+    };
-        // Query the local crate using the symbol index.
+    candidates.extend(
-        let local_results = {
+        local_results
-            let mut query = Query::new(name_to_import.to_string());
+            .into_iter()
-            query.exact();
+            .filter_map(|import_candidate| get_name_definition(sema, &import_candidate))
-            query.limit(40);
+            .filter_map(|name_definition_to_import| match name_definition_to_import {
-            symbol_index::crate_symbols(db, self.krate.into(), query)
+                Definition::ModuleDef(module_def) => Some(Either::Left(module_def)),
-        };
+                Definition::Macro(macro_def) => Some(Either::Right(macro_def)),
+                _ => None,
+            }),
+    );
-        candidates.extend(
+    candidates.into_iter().collect()
-            local_results
+}
-                .into_iter()
-                .filter_map(|import_candidate| self.get_name_definition(&import_candidate))
-                .filter_map(|name_definition_to_import| match name_definition_to_import {
-                    Definition::ModuleDef(module_def) => Some(Either::Left(module_def)),
-                    Definition::Macro(macro_def) => Some(Either::Right(macro_def)),
-                    _ => None,
-                }),
-        );
-        candidates.into_iter().collect()
-    }
-    fn get_name_definition(&mut self, import_candidate: &FileSymbol) -> Option<Definition> {
+fn get_name_definition<'a>(
-        let _p = profile("get_name_definition");
+    sema: &Semantics<'a, RootDatabase>,
-        let file_id = import_candidate.file_id;
+    import_candidate: &FileSymbol,
+) -> Option<Definition> {
+    let _p = profile("get_name_definition");
+    let file_id = import_candidate.file_id;
-        let candidate_node = import_candidate.ptr.to_node(self.sema.parse(file_id).syntax());
+    let candidate_node = import_candidate.ptr.to_node(sema.parse(file_id).syntax());
-        let candidate_name_node = if candidate_node.kind() != NAME {
+    let candidate_name_node = if candidate_node.kind() != NAME {
-            candidate_node.children().find(|it| it.kind() == NAME)?
+        candidate_node.children().find(|it| it.kind() == NAME)?
-        } else {
+    } else {
-            candidate_node
+        candidate_node
-        };
+    };
-        let name = ast::Name::cast(candidate_name_node)?;
+    let name = ast::Name::cast(candidate_name_node)?;
-        classify_name(&self.sema, &name)?.into_definition()
+    classify_name(sema, &name)?.into_definition()
-    }
 }
diff --git a/crates/ra_ide_db/src/lib.rs b/crates/ra_ide_db/src/lib.rs
index a808de4f1..6900cac73 100644
--- a/crates/ra_ide_db/src/lib.rs
+++ b/crates/ra_ide_db/src/lib.rs
@@ -11,11 +11,11 @@ pub mod imports_locator;
 pub mod source_change;
 mod wasm_shims;
-use std::sync::Arc;
+use std::{fmt, sync::Arc};
-use hir::db::{AstDatabase, DefDatabase};
+use hir::db::{AstDatabase, DefDatabase, HirDatabase};
 use ra_db::{
-    salsa::{self, Database, Durability},
+    salsa::{self, Durability},
    Canceled, CheckCanceled, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase,
    Upcast,
 };
@@ -33,13 +33,18 @@ use crate::{line_index::LineIndex, symbol_index::SymbolsDatabase};
    hir::db::DefDatabaseStorage,
    hir::db::HirDatabaseStorage
 )]
-#[derive(Debug)]
 pub struct RootDatabase {
-    runtime: salsa::Runtime<RootDatabase>,
+    storage: salsa::Storage<RootDatabase>,
    pub last_gc: crate::wasm_shims::Instant,
    pub last_gc_check: crate::wasm_shims::Instant,
 }
+impl fmt::Debug for RootDatabase {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("RootDatabase").finish()
+    }
+}
 impl Upcast<dyn AstDatabase> for RootDatabase {
    fn upcast(&self) -> &(dyn AstDatabase + 'static) {
        &*self
@@ -52,6 +57,12 @@ impl Upcast<dyn DefDatabase> for RootDatabase {
    }
 }
+impl Upcast<dyn HirDatabase> for RootDatabase {
+    fn upcast(&self) -> &(dyn HirDatabase + 'static) {
+        &*self
+    }
+}
 impl FileLoader for RootDatabase {
    fn file_text(&self, file_id: FileId) -> Arc<String> {
        FileLoaderDelegate(self).file_text(file_id)
@@ -65,17 +76,11 @@ impl FileLoader for RootDatabase {
 }
 impl salsa::Database for RootDatabase {
-    fn salsa_runtime(&self) -> &salsa::Runtime<RootDatabase> {
-        &self.runtime
-    }
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime<Self> {
-        &mut self.runtime
-    }
    fn on_propagated_panic(&self) -> ! {
        Canceled::throw()
    }
-    fn salsa_event(&self, event: impl Fn() -> salsa::Event<RootDatabase>) {
+    fn salsa_event(&self, event: salsa::Event) {
-        match event().kind {
+        match event.kind {
            salsa::EventKind::DidValidateMemoizedValue { .. }
            | salsa::EventKind::WillExecute { .. } => {
                self.check_canceled();
@@ -94,7 +99,7 @@ impl Default for RootDatabase {
 impl RootDatabase {
    pub fn new(lru_capacity: Option<usize>) -> RootDatabase {
        let mut db = RootDatabase {
-            runtime: salsa::Runtime::default(),
+            storage: salsa::Storage::default(),
            last_gc: crate::wasm_shims::Instant::now(),
            last_gc_check: crate::wasm_shims::Instant::now(),
        };
@@ -107,16 +112,16 @@ impl RootDatabase {
    pub fn update_lru_capacity(&mut self, lru_capacity: Option<usize>) {
        let lru_capacity = lru_capacity.unwrap_or(ra_db::DEFAULT_LRU_CAP);
-        self.query_mut(ra_db::ParseQuery).set_lru_capacity(lru_capacity);
+        ra_db::ParseQuery.in_db_mut(self).set_lru_capacity(lru_capacity);
-        self.query_mut(hir::db::ParseMacroQuery).set_lru_capacity(lru_capacity);
+        hir::db::ParseMacroQuery.in_db_mut(self).set_lru_capacity(lru_capacity);
-        self.query_mut(hir::db::MacroExpandQuery).set_lru_capacity(lru_capacity);
+        hir::db::MacroExpandQuery.in_db_mut(self).set_lru_capacity(lru_capacity);
    }
 }
 impl salsa::ParallelDatabase for RootDatabase {
    fn snapshot(&self) -> salsa::Snapshot<RootDatabase> {
        salsa::Snapshot::new(RootDatabase {
-            runtime: self.runtime.snapshot(self),
+            storage: self.storage.snapshot(),
            last_gc: self.last_gc,
            last_gc_check: self.last_gc_check,
        })
@@ -128,7 +133,7 @@ pub trait LineIndexDatabase: ra_db::SourceDatabase + CheckCanceled {
    fn line_index(&self, file_id: FileId) -> Arc<LineIndex>;
 }
-fn line_index(db: &impl LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
+fn line_index(db: &dyn LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
    let text = db.file_text(file_id);
    Arc::new(LineIndex::new(&*text))
 }
diff --git a/crates/ra_ide_db/src/line_index.rs b/crates/ra_ide_db/src/line_index.rs
index c7c744fce..2ab662098 100644
--- a/crates/ra_ide_db/src/line_index.rs
+++ b/crates/ra_ide_db/src/line_index.rs
@@ -4,7 +4,7 @@ use std::iter;
 use ra_syntax::{TextRange, TextSize};
 use rustc_hash::FxHashMap;
-use superslice::Ext;
+use stdx::partition_point;
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct LineIndex {
@@ -89,7 +89,7 @@ impl LineIndex {
    }
    pub fn line_col(&self, offset: TextSize) -> LineCol {
-        let line = self.newlines.upper_bound(&offset) - 1;
+        let line = partition_point(&self.newlines, |&it| it <= offset) - 1;
        let line_start_offset = self.newlines[line];
        let col = offset - line_start_offset;
@@ -103,8 +103,8 @@ impl LineIndex {
    }
    pub fn lines(&self, range: TextRange) -> impl Iterator<Item = TextRange> + '_ {
-        let lo = self.newlines.lower_bound(&range.start());
+        let lo = partition_point(&self.newlines, |&it| it < range.start());
-        let hi = self.newlines.upper_bound(&range.end());
+        let hi = partition_point(&self.newlines, |&it| it <= range.end());
        let all = iter::once(range.start())
            .chain(self.newlines[lo..hi].iter().copied())
            .chain(iter::once(range.end()));
diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs
index 44d5c35e6..0b862b449 100644
--- a/crates/ra_ide_db/src/search.rs
+++ b/crates/ra_ide_db/src/search.rs
@@ -60,6 +60,10 @@ impl SearchScope {
        SearchScope::new(std::iter::once((file, None)).collect())
    }
+    pub fn files(files: &[FileId]) -> SearchScope {
+        SearchScope::new(files.iter().map(|f| (*f, None)).collect())
+    }
    pub fn intersection(&self, other: &SearchScope) -> SearchScope {
        let (mut small, mut large) = (&self.entries, &other.entries);
        if small.len() > large.len() {
@@ -180,20 +184,20 @@ impl Definition {
    pub fn find_usages(
        &self,
-        db: &RootDatabase,
+        sema: &Semantics<RootDatabase>,
        search_scope: Option<SearchScope>,
    ) -> Vec<Reference> {
        let _p = profile("Definition::find_usages");
        let search_scope = {
-            let base = self.search_scope(db);
+            let base = self.search_scope(sema.db);
            match search_scope {
                None => base,
                Some(scope) => base.intersection(&scope),
            }
        };
-        let name = match self.name(db) {
+        let name = match self.name(sema.db) {
            None => return Vec::new(),
            Some(it) => it.to_string(),
        };
@@ -202,11 +206,10 @@ impl Definition {
        let mut refs = vec![];
        for (file_id, search_range) in search_scope {
-            let text = db.file_text(file_id);
+            let text = sema.db.file_text(file_id);
            let search_range =
                search_range.unwrap_or(TextRange::up_to(TextSize::of(text.as_str())));
-            let sema = Semantics::new(db);
            let tree = Lazy::new(|| sema.parse(file_id).syntax().clone());
            for (idx, _) in text.match_indices(pat) {
@@ -222,9 +225,6 @@ impl Definition {
                        continue;
                    };
-                // FIXME: reuse sb
-                // See https://github.com/rust-lang/rust/pull/68198#issuecomment-574269098
                match classify_name_ref(&sema, &name_ref) {
                    Some(NameRefClass::Definition(def)) if &def == self => {
                        let kind = if is_record_lit_name_ref(&name_ref)
@@ -315,7 +315,7 @@ fn is_record_lit_name_ref(name_ref: &ast::NameRef) -> bool {
    name_ref
        .syntax()
        .ancestors()
-        .find_map(ast::RecordLit::cast)
+        .find_map(ast::RecordExpr::cast)
        .and_then(|l| l.path())
        .and_then(|p| p.segment())
        .map(|p| p.name_ref().as_ref() == Some(name_ref))
diff --git a/crates/ra_ide_db/src/source_change.rs b/crates/ra_ide_db/src/source_change.rs
index 0bbd3c3e5..abb83f421 100644
--- a/crates/ra_ide_db/src/source_change.rs
+++ b/crates/ra_ide_db/src/source_change.rs
@@ -6,7 +6,7 @@
 use ra_db::FileId;
 use ra_text_edit::TextEdit;
-#[derive(Debug, Clone)]
+#[derive(Default, Debug, Clone)]
 pub struct SourceChange {
    pub source_file_edits: Vec<SourceFileEdit>,
    pub file_system_edits: Vec<FileSystemEdit>,
diff --git a/crates/ra_ide_db/src/symbol_index.rs b/crates/ra_ide_db/src/symbol_index.rs
index 5a09e7d1d..35a2c5be3 100644
--- a/crates/ra_ide_db/src/symbol_index.rs
+++ b/crates/ra_ide_db/src/symbol_index.rs
@@ -87,7 +87,7 @@ impl Query {
 }
 #[salsa::query_group(SymbolsDatabaseStorage)]
-pub trait SymbolsDatabase: hir::db::HirDatabase + SourceDatabaseExt + ParallelDatabase {
+pub trait SymbolsDatabase: hir::db::HirDatabase + SourceDatabaseExt {
    fn file_symbols(&self, file_id: FileId) -> Arc<SymbolIndex>;
    fn library_symbols(&self) -> Arc<FxHashMap<SourceRootId, SymbolIndex>>;
    /// The set of "local" (that is, from the current workspace) roots.
@@ -100,9 +100,7 @@ pub trait SymbolsDatabase: hir::db::HirDatabase + SourceDatabaseExt + ParallelDa
    fn library_roots(&self) -> Arc<FxHashSet<SourceRootId>>;
 }
-fn library_symbols(
+fn library_symbols(db: &dyn SymbolsDatabase) -> Arc<FxHashMap<SourceRootId, SymbolIndex>> {
-    db: &(impl SymbolsDatabase + ParallelDatabase),
-) -> Arc<FxHashMap<SourceRootId, SymbolIndex>> {
    let _p = profile("library_symbols");
    let roots = db.library_roots();
@@ -123,7 +121,7 @@ fn library_symbols(
    Arc::new(res)
 }
-fn file_symbols(db: &impl SymbolsDatabase, file_id: FileId) -> Arc<SymbolIndex> {
+fn file_symbols(db: &dyn SymbolsDatabase, file_id: FileId) -> Arc<SymbolIndex> {
    db.check_canceled();
    let parse = db.parse(file_id);
@@ -346,7 +344,7 @@ impl Query {
 }
 fn is_type(kind: SyntaxKind) -> bool {
-    matches!(kind, STRUCT_DEF | ENUM_DEF | TRAIT_DEF | TYPE_ALIAS_DEF)
+    matches!(kind, STRUCT | ENUM | TRAIT | TYPE_ALIAS)
 }
 /// The actual data that is stored in the index. It should be as compact as
@@ -399,14 +397,14 @@ fn to_symbol(node: &SyntaxNode) -> Option<(SmolStr, SyntaxNodePtr, TextRange)> {
    }
    match_ast! {
        match node {
-            ast::FnDef(it) => decl(it),
+            ast::Fn(it) => decl(it),
-            ast::StructDef(it) => decl(it),
+            ast::Struct(it) => decl(it),
-            ast::EnumDef(it) => decl(it),
+            ast::Enum(it) => decl(it),
-            ast::TraitDef(it) => decl(it),
+            ast::Trait(it) => decl(it),
            ast::Module(it) => decl(it),
-            ast::TypeAliasDef(it) => decl(it),
+            ast::TypeAlias(it) => decl(it),
-            ast::ConstDef(it) => decl(it),
+            ast::Const(it) => decl(it),
-            ast::StaticDef(it) => decl(it),
+            ast::Static(it) => decl(it),
            ast::MacroCall(it) => {
                if it.is_macro_rules().is_some() {
                    decl(it)
diff --git a/crates/ra_mbe/Cargo.toml b/crates/ra_mbe/Cargo.toml
index 4dec24914..a26746a19 100644
--- a/crates/ra_mbe/Cargo.toml
+++ b/crates/ra_mbe/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_mbe"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_mbe/src/lib.rs b/crates/ra_mbe/src/lib.rs
index 9c450eaba..dec7ba22e 100644
--- a/crates/ra_mbe/src/lib.rs
+++ b/crates/ra_mbe/src/lib.rs
@@ -9,6 +9,9 @@ mod syntax_bridge;
 mod tt_iter;
 mod subtree_source;
+#[cfg(test)]
+mod tests;
 pub use tt::{Delimiter, Punct};
 use crate::{
@@ -273,6 +276,3 @@ impl<T: Default> From<Result<T, ExpandError>> for ExpandResult<T> {
            .map_or_else(|e| ExpandResult(Default::default(), Some(e)), |it| ExpandResult(it, None))
    }
 }
-#[cfg(test)]
-mod tests;
diff --git a/crates/ra_mbe/src/mbe_expander/matcher.rs b/crates/ra_mbe/src/mbe_expander/matcher.rs
index 78f9efa1b..f9e515b81 100644
--- a/crates/ra_mbe/src/mbe_expander/matcher.rs
+++ b/crates/ra_mbe/src/mbe_expander/matcher.rs
@@ -260,7 +260,7 @@ impl<'a> TtIter<'a> {
            | ('|', '=', None)
            | ('|', '|', None) => {
                let tt2 = self.next().unwrap().clone();
-                Ok(tt::Subtree { delimiter: None, token_trees: vec![tt.clone(), tt2] }.into())
+                Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2] }.into())
            }
            _ => Ok(tt),
        }
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
index fc4133a67..5fc48507f 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/ra_mbe/src/syntax_bridge.rs
@@ -825,7 +825,7 @@ mod tests {
    #[test]
    fn test_token_tree_multi_char_punct() {
        let source_file = ast::SourceFile::parse("struct Foo { a: x::Y }").ok().unwrap();
-        let struct_def = source_file.syntax().descendants().find_map(ast::StructDef::cast).unwrap();
+        let struct_def = source_file.syntax().descendants().find_map(ast::Struct::cast).unwrap();
        let tt = ast_to_token_tree(&struct_def).unwrap().0;
        token_tree_to_syntax_node(&tt, FragmentKind::Item).unwrap();
    }
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index c43003fd6..707e84f42 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -258,7 +258,7 @@ fn test_expr_order() {
    assert_eq_text!(
        dump.trim(),
        r#"[email protected]
-  FN_DEF@0..15
+  [email protected]
    [email protected] "fn"
    [email protected]
      [email protected] "bar"
@@ -490,13 +490,13 @@ fn test_expand_to_item_list() {
        format!("{:#?}", tree).trim(),
        r#"
 [email protected]
-  STRUCT_DEF@0..20
+  [email protected]
    [email protected] "struct"
    [email protected]
      [email protected] "Foo"
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
-      RECORD_FIELD_DEF@10..19
+      [email protected]
        [email protected]
          [email protected] "field"
        [email protected] ":"
@@ -506,13 +506,13 @@ [email protected]
              [email protected]
                [email protected] "u32"
      [email protected] "}"
-  STRUCT_DEF@20..40
+  [email protected]
    [email protected] "struct"
    [email protected]
      [email protected] "Bar"
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
-      RECORD_FIELD_DEF@30..39
+      [email protected]
        [email protected]
          [email protected] "field"
        [email protected] ":"
@@ -1467,7 +1467,7 @@ macro_rules! quick_error {
        buf [ ]
        queue [ ]
    ) => {
-        quick_error!(ENUM_DEFINITION [enum $name $( #[$meta] )*]
+        quick_error!(ENUMINITION [enum $name $( #[$meta] )*]
            body []
            queue [$(
                $( #[$imeta] )*
@@ -1489,7 +1489,7 @@ quick_error ! (SORT [enum Wrapped # [derive (Debug)]] items [
 "#,
    );
-    assert_eq!(expanded.to_string(), "quick_error ! (ENUM_DEFINITION [enum Wrapped # [derive (Debug)]] body [] queue [=> One : UNIT [] => Two : TUPLE [s : String]]) ;");
+    assert_eq!(expanded.to_string(), "quick_error ! (ENUMINITION [enum Wrapped # [derive (Debug)]] body [] queue [=> One : UNIT [] => Two : TUPLE [s : String]]) ;");
 }
 #[test]
diff --git a/crates/ra_parser/Cargo.toml b/crates/ra_parser/Cargo.toml
index 0da581fd5..72ec3e4d9 100644
--- a/crates/ra_parser/Cargo.toml
+++ b/crates/ra_parser/Cargo.toml
@@ -4,6 +4,7 @@ name = "ra_parser"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index caedeead0..c2e1d701e 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -142,19 +142,19 @@ pub(crate) fn reparser(
 ) -> Option<fn(&mut Parser)> {
    let res = match node {
        BLOCK_EXPR => expressions::block_expr,
-        RECORD_FIELD_DEF_LIST => items::record_field_def_list,
+        RECORD_FIELD_LIST => items::record_field_def_list,
-        RECORD_FIELD_LIST => items::record_field_list,
+        RECORD_EXPR_FIELD_LIST => items::record_field_list,
-        ENUM_VARIANT_LIST => items::enum_variant_list,
+        VARIANT_LIST => items::enum_variant_list,
        MATCH_ARM_LIST => items::match_arm_list,
        USE_TREE_LIST => items::use_tree_list,
        EXTERN_ITEM_LIST => items::extern_item_list,
        TOKEN_TREE if first_child? == T!['{'] => items::token_tree,
-        ITEM_LIST => match parent? {
+        ASSOC_ITEM_LIST => match parent? {
-            IMPL_DEF => items::impl_item_list,
+            IMPL => items::impl_item_list,
-            TRAIT_DEF => items::trait_item_list,
+            TRAIT => items::trait_item_list,
-            MODULE => items::mod_item_list,
            _ => return None,
        },
+        ITEM_LIST => items::mod_item_list,
        _ => return None,
    };
    Some(res)
@@ -224,7 +224,7 @@ fn opt_alias(p: &mut Parser) {
        if !p.eat(T![_]) {
            name(p);
        }
-        m.complete(p, ALIAS);
+        m.complete(p, RENAME);
    }
 }
@@ -270,10 +270,6 @@ fn name_ref(p: &mut Parser) {
        let m = p.start();
        p.bump(IDENT);
        m.complete(p, NAME_REF);
-    } else if p.at(T![self]) {
-        let m = p.start();
-        p.bump(T![self]);
-        m.complete(p, T![self]);
    } else {
        p.err_and_bump("expected identifier");
    }
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index 6e72eea66..e1c25a838 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -587,7 +587,7 @@ fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, BlockLike) {
    match p.current() {
        T!['{'] if !r.forbid_structs => {
            record_field_list(p);
-            (m.complete(p, RECORD_LIT), BlockLike::NotBlock)
+            (m.complete(p, RECORD_EXPR), BlockLike::NotBlock)
        }
        T![!] if !p.at(T![!=]) => {
            let block_like = items::macro_call_after_excl(p);
@@ -627,7 +627,7 @@ pub(crate) fn record_field_list(p: &mut Parser) {
                    p.expect(T![:]);
                }
                expr(p);
-                m.complete(p, RECORD_FIELD);
+                m.complete(p, RECORD_EXPR_FIELD);
            }
            T![.] if p.at(T![..]) => {
                m.abandon(p);
@@ -648,5 +648,5 @@ pub(crate) fn record_field_list(p: &mut Parser) {
        }
    }
    p.expect(T!['}']);
-    m.complete(p, RECORD_FIELD_LIST);
+    m.complete(p, RECORD_EXPR_FIELD_LIST);
 }
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 97642bc24..cca524cea 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -180,7 +180,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
        // unsafe const fn bar() {}
        T![fn] => {
            fn_def(p);
-            m.complete(p, FN_DEF);
+            m.complete(p, FN);
        }
        // test unsafe_trait
@@ -193,7 +193,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
        // unsafe auto trait T {}
        T![trait] => {
            traits::trait_def(p);
-            m.complete(p, TRAIT_DEF);
+            m.complete(p, TRAIT);
        }
        // test unsafe_impl
@@ -221,7 +221,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
        // unsafe default impl Foo {}
        T![impl] => {
            traits::impl_def(p);
-            m.complete(p, IMPL_DEF);
+            m.complete(p, IMPL);
        }
        // test existential_type
@@ -304,10 +304,16 @@ fn extern_crate_item(p: &mut Parser, m: Marker) {
    p.bump(T![extern]);
    assert!(p.at(T![crate]));
    p.bump(T![crate]);
-    name_ref(p);
+    if p.at(T![self]) {
+        p.bump(T![self]);
+    } else {
+        name_ref(p);
+    }
    opt_alias(p);
    p.expect(T![;]);
-    m.complete(p, EXTERN_CRATE_ITEM);
+    m.complete(p, EXTERN_CRATE);
 }
 pub(crate) fn extern_item_list(p: &mut Parser) {
@@ -374,7 +380,7 @@ fn type_def(p: &mut Parser, m: Marker) {
        types::type_(p);
    }
    p.expect(T![;]);
-    m.complete(p, TYPE_ALIAS_DEF);
+    m.complete(p, TYPE_ALIAS);
 }
 pub(crate) fn mod_item(p: &mut Parser, m: Marker) {
diff --git a/crates/ra_parser/src/grammar/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs
index 74b9f514b..addfb59d4 100644
--- a/crates/ra_parser/src/grammar/items/adt.rs
+++ b/crates/ra_parser/src/grammar/items/adt.rs
@@ -5,13 +5,13 @@ use super::*;
 pub(super) fn struct_def(p: &mut Parser, m: Marker) {
    assert!(p.at(T![struct]));
    p.bump(T![struct]);
-    struct_or_union(p, m, T![struct], STRUCT_DEF);
+    struct_or_union(p, m, T![struct], STRUCT);
 }
 pub(super) fn union_def(p: &mut Parser, m: Marker) {
    assert!(p.at_contextual_kw("union"));
    p.bump_remap(T![union]);
-    struct_or_union(p, m, T![union], UNION_DEF);
+    struct_or_union(p, m, T![union], UNION);
 }
 fn struct_or_union(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) {
@@ -64,7 +64,7 @@ pub(super) fn enum_def(p: &mut Parser, m: Marker) {
    } else {
        p.error("expected `{`")
    }
-    m.complete(p, ENUM_DEF);
+    m.complete(p, ENUM);
 }
 pub(crate) fn enum_variant_list(p: &mut Parser) {
@@ -91,7 +91,7 @@ pub(crate) fn enum_variant_list(p: &mut Parser) {
            if p.eat(T![=]) {
                expressions::expr(p);
            }
-            var.complete(p, ENUM_VARIANT);
+            var.complete(p, VARIANT);
        } else {
            var.abandon(p);
            p.err_and_bump("expected enum variant");
@@ -101,7 +101,7 @@ pub(crate) fn enum_variant_list(p: &mut Parser) {
        }
    }
    p.expect(T!['}']);
-    m.complete(p, ENUM_VARIANT_LIST);
+    m.complete(p, VARIANT_LIST);
 }
 pub(crate) fn record_field_def_list(p: &mut Parser) {
@@ -119,7 +119,7 @@ pub(crate) fn record_field_def_list(p: &mut Parser) {
        }
    }
    p.expect(T!['}']);
-    m.complete(p, RECORD_FIELD_DEF_LIST);
+    m.complete(p, RECORD_FIELD_LIST);
    fn record_field_def(p: &mut Parser) {
        let m = p.start();
@@ -134,7 +134,7 @@ pub(crate) fn record_field_def_list(p: &mut Parser) {
            name(p);
            p.expect(T![:]);
            types::type_(p);
-            m.complete(p, RECORD_FIELD_DEF);
+            m.complete(p, RECORD_FIELD);
        } else {
            m.abandon(p);
            p.err_and_bump("expected field declaration");
@@ -167,12 +167,12 @@ fn tuple_field_def_list(p: &mut Parser) {
            break;
        }
        types::type_(p);
-        m.complete(p, TUPLE_FIELD_DEF);
+        m.complete(p, TUPLE_FIELD);
        if !p.at(T![')']) {
            p.expect(T![,]);
        }
    }
    p.expect(T![')']);
-    m.complete(p, TUPLE_FIELD_DEF_LIST);
+    m.complete(p, TUPLE_FIELD_LIST);
 }
diff --git a/crates/ra_parser/src/grammar/items/consts.rs b/crates/ra_parser/src/grammar/items/consts.rs
index 742a7e056..35ad766dc 100644
--- a/crates/ra_parser/src/grammar/items/consts.rs
+++ b/crates/ra_parser/src/grammar/items/consts.rs
@@ -3,11 +3,11 @@
 use super::*;
 pub(super) fn static_def(p: &mut Parser, m: Marker) {
-    const_or_static(p, m, T![static], STATIC_DEF)
+    const_or_static(p, m, T![static], STATIC)
 }
 pub(super) fn const_def(p: &mut Parser, m: Marker) {
-    const_or_static(p, m, T![const], CONST_DEF)
+    const_or_static(p, m, T![const], CONST)
 }
 fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) {
diff --git a/crates/ra_parser/src/grammar/items/traits.rs b/crates/ra_parser/src/grammar/items/traits.rs
index c819e33be..ef9c8ff5b 100644
--- a/crates/ra_parser/src/grammar/items/traits.rs
+++ b/crates/ra_parser/src/grammar/items/traits.rs
@@ -50,7 +50,7 @@ pub(crate) fn trait_item_list(p: &mut Parser) {
        item_or_macro(p, true, ItemFlavor::Trait);
    }
    p.expect(T!['}']);
-    m.complete(p, ITEM_LIST);
+    m.complete(p, ASSOC_ITEM_LIST);
 }
 // test impl_def
@@ -107,7 +107,7 @@ pub(crate) fn impl_item_list(p: &mut Parser) {
        item_or_macro(p, true, ItemFlavor::Mod);
    }
    p.expect(T!['}']);
-    m.complete(p, ITEM_LIST);
+    m.complete(p, ASSOC_ITEM_LIST);
 }
 // test impl_type_params
diff --git a/crates/ra_parser/src/grammar/items/use_item.rs b/crates/ra_parser/src/grammar/items/use_item.rs
index 3a0c7a31a..8e836a77e 100644
--- a/crates/ra_parser/src/grammar/items/use_item.rs
+++ b/crates/ra_parser/src/grammar/items/use_item.rs
@@ -7,7 +7,7 @@ pub(super) fn use_item(p: &mut Parser, m: Marker) {
    p.bump(T![use]);
    use_tree(p, true);
    p.expect(T![;]);
-    m.complete(p, USE_ITEM);
+    m.complete(p, USE);
 }
 /// Parse a use 'tree', such as `some::path` in `use some::path;`
diff --git a/crates/ra_parser/src/grammar/type_params.rs b/crates/ra_parser/src/grammar/type_params.rs
index d1330d4b9..90dabb4c0 100644
--- a/crates/ra_parser/src/grammar/type_params.rs
+++ b/crates/ra_parser/src/grammar/type_params.rs
@@ -36,7 +36,7 @@ fn type_param_list(p: &mut Parser) {
        }
    }
    p.expect(T![>]);
-    m.complete(p, TYPE_PARAM_LIST);
+    m.complete(p, GENERIC_PARAM_LIST);
 }
 fn lifetime_param(p: &mut Parser, m: Marker) {
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index e7404492a..be4da67bc 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/crates/ra_parser/src/syntax_kind/generated.rs
@@ -1,7 +1,7 @@
 //! Generated file, do not edit by hand, see `xtask/src/codegen`
 #![allow(bad_style, missing_docs, unreachable_pub)]
-#[doc = r" The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT_DEF`."]
+#[doc = r" The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT`."]
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 #[repr(u16)]
 pub enum SyntaxKind {
@@ -123,19 +123,19 @@ pub enum SyntaxKind {
    L_DOLLAR,
    R_DOLLAR,
    SOURCE_FILE,
-    STRUCT_DEF,
+    STRUCT,
-    UNION_DEF,
+    UNION,
-    ENUM_DEF,
+    ENUM,
-    FN_DEF,
+    FN,
    RET_TYPE,
-    EXTERN_CRATE_ITEM,
+    EXTERN_CRATE,
    MODULE,
-    USE_ITEM,
+    USE,
-    STATIC_DEF,
+    STATIC,
-    CONST_DEF,
+    CONST,
-    TRAIT_DEF,
+    TRAIT,
-    IMPL_DEF,
+    IMPL,
-    TYPE_ALIAS_DEF,
+    TYPE_ALIAS,
    MACRO_CALL,
    TOKEN_TREE,
    MACRO_DEF,
@@ -188,9 +188,9 @@ pub enum SyntaxKind {
    MATCH_ARM_LIST,
    MATCH_ARM,
    MATCH_GUARD,
-    RECORD_LIT,
+    RECORD_EXPR,
-    RECORD_FIELD_LIST,
+    RECORD_EXPR_FIELD_LIST,
-    RECORD_FIELD,
+    RECORD_EXPR_FIELD,
    EFFECT_EXPR,
    BOX_EXPR,
    CALL_EXPR,
@@ -206,13 +206,14 @@ pub enum SyntaxKind {
    BIN_EXPR,
    EXTERN_BLOCK,
    EXTERN_ITEM_LIST,
-    ENUM_VARIANT,
+    VARIANT,
-    RECORD_FIELD_DEF_LIST,
+    RECORD_FIELD_LIST,
-    RECORD_FIELD_DEF,
+    RECORD_FIELD,
-    TUPLE_FIELD_DEF_LIST,
+    TUPLE_FIELD_LIST,
-    TUPLE_FIELD_DEF,
+    TUPLE_FIELD,
-    ENUM_VARIANT_LIST,
+    VARIANT_LIST,
    ITEM_LIST,
+    ASSOC_ITEM_LIST,
    ATTR,
    META_ITEM,
    USE_TREE,
@@ -220,7 +221,7 @@ pub enum SyntaxKind {
    PATH,
    PATH_SEGMENT,
    LITERAL,
-    ALIAS,
+    RENAME,
    VISIBILITY,
    WHERE_CLAUSE,
    WHERE_PRED,
@@ -229,7 +230,8 @@ pub enum SyntaxKind {
    NAME_REF,
    LET_STMT,
    EXPR_STMT,
-    TYPE_PARAM_LIST,
+    GENERIC_PARAM_LIST,
+    GENERIC_PARAM,
    LIFETIME_PARAM,
    TYPE_PARAM,
    CONST_PARAM,
@@ -362,4 +364,4 @@ impl SyntaxKind {
    }
 }
 #[macro_export]
-macro_rules ! T { [ ; ] => { $ crate :: SyntaxKind :: SEMICOLON } ; [ , ] => { $ crate :: SyntaxKind :: COMMA } ; [ '(' ] => { $ crate :: SyntaxKind :: L_PAREN } ; [ ')' ] => { $ crate :: SyntaxKind :: R_PAREN } ; [ '{' ] => { $ crate :: SyntaxKind :: L_CURLY } ; [ '}' ] => { $ crate :: SyntaxKind :: R_CURLY } ; [ '[' ] => { $ crate :: SyntaxKind :: L_BRACK } ; [ ']' ] => { $ crate :: SyntaxKind :: R_BRACK } ; [ < ] => { $ crate :: SyntaxKind :: L_ANGLE } ; [ > ] => { $ crate :: SyntaxKind :: R_ANGLE } ; [ @ ] => { $ crate :: SyntaxKind :: AT } ; [ # ] => { $ crate :: SyntaxKind :: POUND } ; [ ~ ] => { $ crate :: SyntaxKind :: TILDE } ; [ ? ] => { $ crate :: SyntaxKind :: QUESTION } ; [ $ ] => { $ crate :: SyntaxKind :: DOLLAR } ; [ & ] => { $ crate :: SyntaxKind :: AMP } ; [ | ] => { $ crate :: SyntaxKind :: PIPE } ; [ + ] => { $ crate :: SyntaxKind :: PLUS } ; [ * ] => { $ crate :: SyntaxKind :: STAR } ; [ / ] => { $ crate :: SyntaxKind :: SLASH } ; [ ^ ] => { $ crate :: SyntaxKind :: CARET } ; [ % ] => { $ crate :: SyntaxKind :: PERCENT } ; [ _ ] => { $ crate :: SyntaxKind :: UNDERSCORE } ; [ . ] => { $ crate :: SyntaxKind :: DOT } ; [ .. ] => { $ crate :: SyntaxKind :: DOT2 } ; [ ... ] => { $ crate :: SyntaxKind :: DOT3 } ; [ ..= ] => { $ crate :: SyntaxKind :: DOT2EQ } ; [ : ] => { $ crate :: SyntaxKind :: COLON } ; [ :: ] => { $ crate :: SyntaxKind :: COLON2 } ; [ = ] => { $ crate :: SyntaxKind :: EQ } ; [ == ] => { $ crate :: SyntaxKind :: EQ2 } ; [ => ] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [ ! ] => { $ crate :: SyntaxKind :: BANG } ; [ != ] => { $ crate :: SyntaxKind :: NEQ } ; [ - ] => { $ crate :: SyntaxKind :: MINUS } ; [ -> ] => { $ crate :: SyntaxKind :: THIN_ARROW } ; [ <= ] => { $ crate :: SyntaxKind :: LTEQ } ; [ >= ] => { $ crate :: SyntaxKind :: GTEQ } ; [ += ] => { $ crate :: SyntaxKind :: PLUSEQ } ; [ -= ] => { $ crate :: SyntaxKind :: MINUSEQ } ; [ |= ] => { $ crate :: SyntaxKind :: PIPEEQ } ; [ &= ] => { $ crate :: SyntaxKind :: AMPEQ } ; [ ^= ] => { $ crate :: SyntaxKind :: CARETEQ } ; [ /= ] => { $ crate :: SyntaxKind :: SLASHEQ } ; [ *= ] => { $ crate :: SyntaxKind :: STAREQ } ; [ %= ] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [ && ] => { $ crate :: SyntaxKind :: AMP2 } ; [ || ] => { $ crate :: SyntaxKind :: PIPE2 } ; [ << ] => { $ crate :: SyntaxKind :: SHL } ; [ >> ] => { $ crate :: SyntaxKind :: SHR } ; [ <<= ] => { $ crate :: SyntaxKind :: SHLEQ } ; [ >>= ] => { $ crate :: SyntaxKind :: SHREQ } ; [ as ] => { $ crate :: SyntaxKind :: AS_KW } ; [ async ] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [ await ] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [ box ] => { $ crate :: SyntaxKind :: BOX_KW } ; [ break ] => { $ crate :: SyntaxKind :: BREAK_KW } ; [ const ] => { $ crate :: SyntaxKind :: CONST_KW } ; [ continue ] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [ crate ] => { $ crate :: SyntaxKind :: CRATE_KW } ; [ dyn ] => { $ crate :: SyntaxKind :: DYN_KW } ; [ else ] => { $ crate :: SyntaxKind :: ELSE_KW } ; [ enum ] => { $ crate :: SyntaxKind :: ENUM_KW } ; [ extern ] => { $ crate :: SyntaxKind :: EXTERN_KW } ; [ false ] => { $ crate :: SyntaxKind :: FALSE_KW } ; [ fn ] => { $ crate :: SyntaxKind :: FN_KW } ; [ for ] => { $ crate :: SyntaxKind :: FOR_KW } ; [ if ] => { $ crate :: SyntaxKind :: IF_KW } ; [ impl ] => { $ crate :: SyntaxKind :: IMPL_KW } ; [ in ] => { $ crate :: SyntaxKind :: IN_KW } ; [ let ] => { $ crate :: SyntaxKind :: LET_KW } ; [ loop ] => { $ crate :: SyntaxKind :: LOOP_KW } ; [ macro ] => { $ crate :: SyntaxKind :: MACRO_KW } ; [ match ] => { $ crate :: SyntaxKind :: MATCH_KW } ; [ mod ] => { $ crate :: SyntaxKind :: MOD_KW } ; [ move ] => { $ crate :: SyntaxKind :: MOVE_KW } ; [ mut ] => { $ crate :: SyntaxKind :: MUT_KW } ; [ pub ] => { $ crate :: SyntaxKind :: PUB_KW } ; [ ref ] => { $ crate :: SyntaxKind :: REF_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 } ; [ type ] => { $ crate :: SyntaxKind :: TYPE_KW } ; [ unsafe ] => { $ crate :: SyntaxKind :: UNSAFE_KW } ; [ use ] => { $ crate :: SyntaxKind :: USE_KW } ; [ where ] => { $ crate :: SyntaxKind :: WHERE_KW } ; [ while ] => { $ crate :: SyntaxKind :: WHILE_KW } ; [ auto ] => { $ crate :: SyntaxKind :: AUTO_KW } ; [ default ] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [ existential ] => { $ crate :: SyntaxKind :: EXISTENTIAL_KW } ; [ union ] => { $ crate :: SyntaxKind :: UNION_KW } ; [ raw ] => { $ crate :: SyntaxKind :: RAW_KW } ; [ lifetime ] => { $ crate :: SyntaxKind :: LIFETIME } ; [ ident ] => { $ crate :: SyntaxKind :: IDENT } ; }
+macro_rules ! T { [ ; ] => { $ crate :: SyntaxKind :: SEMICOLON } ; [ , ] => { $ crate :: SyntaxKind :: COMMA } ; [ '(' ] => { $ crate :: SyntaxKind :: L_PAREN } ; [ ')' ] => { $ crate :: SyntaxKind :: R_PAREN } ; [ '{' ] => { $ crate :: SyntaxKind :: L_CURLY } ; [ '}' ] => { $ crate :: SyntaxKind :: R_CURLY } ; [ '[' ] => { $ crate :: SyntaxKind :: L_BRACK } ; [ ']' ] => { $ crate :: SyntaxKind :: R_BRACK } ; [ < ] => { $ crate :: SyntaxKind :: L_ANGLE } ; [ > ] => { $ crate :: SyntaxKind :: R_ANGLE } ; [ @ ] => { $ crate :: SyntaxKind :: AT } ; [ # ] => { $ crate :: SyntaxKind :: POUND } ; [ ~ ] => { $ crate :: SyntaxKind :: TILDE } ; [ ? ] => { $ crate :: SyntaxKind :: QUESTION } ; [ $ ] => { $ crate :: SyntaxKind :: DOLLAR } ; [ & ] => { $ crate :: SyntaxKind :: AMP } ; [ | ] => { $ crate :: SyntaxKind :: PIPE } ; [ + ] => { $ crate :: SyntaxKind :: PLUS } ; [ * ] => { $ crate :: SyntaxKind :: STAR } ; [ / ] => { $ crate :: SyntaxKind :: SLASH } ; [ ^ ] => { $ crate :: SyntaxKind :: CARET } ; [ % ] => { $ crate :: SyntaxKind :: PERCENT } ; [ _ ] => { $ crate :: SyntaxKind :: UNDERSCORE } ; [ . ] => { $ crate :: SyntaxKind :: DOT } ; [ .. ] => { $ crate :: SyntaxKind :: DOT2 } ; [ ... ] => { $ crate :: SyntaxKind :: DOT3 } ; [ ..= ] => { $ crate :: SyntaxKind :: DOT2EQ } ; [ : ] => { $ crate :: SyntaxKind :: COLON } ; [ :: ] => { $ crate :: SyntaxKind :: COLON2 } ; [ = ] => { $ crate :: SyntaxKind :: EQ } ; [ == ] => { $ crate :: SyntaxKind :: EQ2 } ; [ => ] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [ ! ] => { $ crate :: SyntaxKind :: BANG } ; [ != ] => { $ crate :: SyntaxKind :: NEQ } ; [ - ] => { $ crate :: SyntaxKind :: MINUS } ; [ -> ] => { $ crate :: SyntaxKind :: THIN_ARROW } ; [ <= ] => { $ crate :: SyntaxKind :: LTEQ } ; [ >= ] => { $ crate :: SyntaxKind :: GTEQ } ; [ += ] => { $ crate :: SyntaxKind :: PLUSEQ } ; [ -= ] => { $ crate :: SyntaxKind :: MINUSEQ } ; [ |= ] => { $ crate :: SyntaxKind :: PIPEEQ } ; [ &= ] => { $ crate :: SyntaxKind :: AMPEQ } ; [ ^= ] => { $ crate :: SyntaxKind :: CARETEQ } ; [ /= ] => { $ crate :: SyntaxKind :: SLASHEQ } ; [ *= ] => { $ crate :: SyntaxKind :: STAREQ } ; [ %= ] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [ && ] => { $ crate :: SyntaxKind :: AMP2 } ; [ || ] => { $ crate :: SyntaxKind :: PIPE2 } ; [ << ] => { $ crate :: SyntaxKind :: SHL } ; [ >> ] => { $ crate :: SyntaxKind :: SHR } ; [ <<= ] => { $ crate :: SyntaxKind :: SHLEQ } ; [ >>= ] => { $ crate :: SyntaxKind :: SHREQ } ; [ as ] => { $ crate :: SyntaxKind :: AS_KW } ; [ async ] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [ await ] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [ box ] => { $ crate :: SyntaxKind :: BOX_KW } ; [ break ] => { $ crate :: SyntaxKind :: BREAK_KW } ; [ const ] => { $ crate :: SyntaxKind :: CONST_KW } ; [ continue ] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [ crate ] => { $ crate :: SyntaxKind :: CRATE_KW } ; [ dyn ] => { $ crate :: SyntaxKind :: DYN_KW } ; [ else ] => { $ crate :: SyntaxKind :: ELSE_KW } ; [ enum ] => { $ crate :: SyntaxKind :: ENUM_KW } ; [ extern ] => { $ crate :: SyntaxKind :: EXTERN_KW } ; [ false ] => { $ crate :: SyntaxKind :: FALSE_KW } ; [ fn ] => { $ crate :: SyntaxKind :: FN_KW } ; [ for ] => { $ crate :: SyntaxKind :: FOR_KW } ; [ if ] => { $ crate :: SyntaxKind :: IF_KW } ; [ impl ] => { $ crate :: SyntaxKind :: IMPL_KW } ; [ in ] => { $ crate :: SyntaxKind :: IN_KW } ; [ let ] => { $ crate :: SyntaxKind :: LET_KW } ; [ loop ] => { $ crate :: SyntaxKind :: LOOP_KW } ; [ macro ] => { $ crate :: SyntaxKind :: MACRO_KW } ; [ match ] => { $ crate :: SyntaxKind :: MATCH_KW } ; [ mod ] => { $ crate :: SyntaxKind :: MOD_KW } ; [ move ] => { $ crate :: SyntaxKind :: MOVE_KW } ; [ mut ] => { $ crate :: SyntaxKind :: MUT_KW } ; [ pub ] => { $ crate :: SyntaxKind :: PUB_KW } ; [ ref ] => { $ crate :: SyntaxKind :: REF_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 } ; [ type ] => { $ crate :: SyntaxKind :: TYPE_KW } ; [ unsafe ] => { $ crate :: SyntaxKind :: UNSAFE_KW } ; [ use ] => { $ crate :: SyntaxKind :: USE_KW } ; [ where ] => { $ crate :: SyntaxKind :: WHERE_KW } ; [ while ] => { $ crate :: SyntaxKind :: WHILE_KW } ; [ auto ] => { $ crate :: SyntaxKind :: AUTO_KW } ; [ default ] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [ existential ] => { $ crate :: SyntaxKind :: EXISTENTIAL_KW } ; [ union ] => { $ crate :: SyntaxKind :: UNION_KW } ; [ raw ] => { $ crate :: SyntaxKind :: RAW_KW } ; [ lifetime ] => { $ crate :: SyntaxKind :: LIFETIME } ; [ ident ] => { $ crate :: SyntaxKind :: IDENT } ; [ shebang ] => { $ crate :: SyntaxKind :: SHEBANG } ; }
diff --git a/crates/ra_proc_macro/Cargo.toml b/crates/ra_proc_macro/Cargo.toml
index d009ceb82..c4b6e9e7b 100644
--- a/crates/ra_proc_macro/Cargo.toml
+++ b/crates/ra_proc_macro/Cargo.toml
@@ -4,6 +4,7 @@ name = "ra_proc_macro"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_proc_macro_srv/Cargo.toml b/crates/ra_proc_macro_srv/Cargo.toml
index 582102945..bc119a6c7 100644
--- a/crates/ra_proc_macro_srv/Cargo.toml
+++ b/crates/ra_proc_macro_srv/Cargo.toml
@@ -4,6 +4,7 @@ name = "ra_proc_macro_srv"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -18,7 +19,7 @@ memmap = "0.7"
 test_utils = { path = "../test_utils" }
 [dev-dependencies]
-cargo_metadata = "0.10.0"
+cargo_metadata = "0.11.1"
 difference = "2.0.0"
 # used as proc macro test target
 serde_derive = "1.0.106"
diff --git a/crates/ra_proc_macro_srv/src/dylib.rs b/crates/ra_proc_macro_srv/src/dylib.rs
index aa84e951c..1addbbd54 100644
--- a/crates/ra_proc_macro_srv/src/dylib.rs
+++ b/crates/ra_proc_macro_srv/src/dylib.rs
@@ -45,7 +45,7 @@ fn find_registrar_symbol(file: &Path) -> io::Result<Option<String>> {
                    // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/dlsym.3.html
                    // Unlike other dyld API's, the symbol name passed to dlsym() must NOT be
                    // prepended with an underscore.
-                    if s.name.starts_with("_") {
+                    if s.name.starts_with('_') {
                        &s.name[1..]
                    } else {
                        &s.name
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs
index 4b5dc7fd0..cb4b3bdb0 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs
+++ b/crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs
@@ -18,7 +18,7 @@ macro_rules! define_handles {
        }
        impl HandleCounters {
-            // FIXME(eddyb) use a reference to the `static COUNTERS`, intead of
+            // FIXME(eddyb) use a reference to the `static COUNTERS`, instead of
            // a wrapper `fn` pointer, once `const fn` can reference `static`s.
            extern "C" fn get() -> &'static Self {
                static COUNTERS: HandleCounters = HandleCounters {
@@ -205,10 +205,16 @@ impl Clone for Literal {
    }
 }
-// FIXME(eddyb) `Literal` should not expose internal `Debug` impls.
 impl fmt::Debug for Literal {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.debug())
+        f.debug_struct("Literal")
+            // format the kind without quotes, as in `kind: Float`
+            // .field("kind", &format_args!("{}", &self.debug_kind()))
+            .field("symbol", &self.symbol())
+            // format `Some("...")` on one line even in {:#?} mode
+            // .field("suffix", &format_args!("{:?}", &self.suffix()))
+            .field("span", &self.span())
+            .finish()
    }
 }
@@ -339,7 +345,7 @@ impl Bridge<'_> {
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct Client<F> {
-    // FIXME(eddyb) use a reference to the `static COUNTERS`, intead of
+    // FIXME(eddyb) use a reference to the `static COUNTERS`, instead of
    // a wrapper `fn` pointer, once `const fn` can reference `static`s.
    pub(super) get_handle_counters: extern "C" fn() -> &'static HandleCounters,
    pub(super) run: extern "C" fn(Bridge<'_>, F) -> Buffer<u8>,
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs b/crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs
index b8addff4a..273a97715 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs
+++ b/crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs
@@ -11,6 +11,9 @@ pub struct Closure<'a, A, R> {
 struct Env;
+// impl<'a, A, R> !Sync for Closure<'a, A, R> {}
+// impl<'a, A, R> !Send for Closure<'a, A, R> {}
 impl<'a, A, R, F: FnMut(A) -> R> From<&'a mut F> for Closure<'a, A, R> {
    fn from(f: &'a mut F) -> Self {
        unsafe extern "C" fn call<A, R, F: FnMut(A) -> R>(env: &mut Env, arg: A) -> R {
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs
index 6ae3926b2..aeb05aad4 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs
+++ b/crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs
@@ -108,8 +108,9 @@ macro_rules! with_api {
            Literal {
                fn drop($self: $S::Literal);
                fn clone($self: &$S::Literal) -> $S::Literal;
-                // FIXME(eddyb) `Literal` should not expose internal `Debug` impls.
+                fn debug_kind($self: &$S::Literal) -> String;
-                fn debug($self: &$S::Literal) -> String;
+                fn symbol($self: &$S::Literal) -> String;
+                fn suffix($self: &$S::Literal) -> Option<String>;
                fn integer(n: &str) -> $S::Literal;
                fn typed_integer(n: &str, kind: &str) -> $S::Literal;
                fn float(n: &str) -> $S::Literal;
@@ -222,6 +223,9 @@ pub struct Bridge<'a> {
    dispatch: closure::Closure<'a, Buffer<u8>, Buffer<u8>>,
 }
+// impl<'a> !Sync for Bridge<'a> {}
+// impl<'a> !Send for Bridge<'a> {}
 #[forbid(unsafe_code)]
 #[allow(non_camel_case_types)]
 mod api_tags {
diff --git a/crates/ra_proc_macro_srv/src/rustc_server.rs b/crates/ra_proc_macro_srv/src/rustc_server.rs
index f481d70b2..cc32d5a6d 100644
--- a/crates/ra_proc_macro_srv/src/rustc_server.rs
+++ b/crates/ra_proc_macro_srv/src/rustc_server.rs
@@ -463,9 +463,16 @@ impl server::Ident for Rustc {
 }
 impl server::Literal for Rustc {
-    // FIXME(eddyb) `Literal` should not expose internal `Debug` impls.
+    fn debug_kind(&mut self, _literal: &Self::Literal) -> String {
-    fn debug(&mut self, literal: &Self::Literal) -> String {
+        // r-a: debug_kind and suffix are unsupported; corresponding client code has been changed to not call these.
-        format!("{:?}", literal)
+        // They must still be present to be ABI-compatible and work with upstream proc_macro.
+        "".to_owned()
+    }
+    fn symbol(&mut self, literal: &Self::Literal) -> String {
+        literal.text.to_string()
+    }
+    fn suffix(&mut self, _literal: &Self::Literal) -> Option<String> {
+        None
    }
    fn integer(&mut self, n: &str) -> Self::Literal {
diff --git a/crates/ra_proc_macro_srv/src/tests/mod.rs b/crates/ra_proc_macro_srv/src/tests/mod.rs
index 82cefbb29..8e6f28abd 100644
--- a/crates/ra_proc_macro_srv/src/tests/mod.rs
+++ b/crates/ra_proc_macro_srv/src/tests/mod.rs
@@ -11,7 +11,7 @@ fn test_derive_serialize_proc_macro() {
        "serde_derive",
        "Serialize",
        "1.0",
-        r##"struct Foo {}"##,
+        r"struct Foo {}",
        include_str!("fixtures/test_serialize_proc_macro.txt"),
    );
 }
@@ -22,9 +22,7 @@ fn test_derive_serialize_proc_macro_failed() {
        "serde_derive",
        "Serialize",
        "1.0",
-        r##"
+        r"struct {}",
-    struct {}
-"##,
        r##"
 SUBTREE $
  IDENT   compile_error 4294967295
diff --git a/crates/ra_proc_macro_srv/src/tests/utils.rs b/crates/ra_proc_macro_srv/src/tests/utils.rs
index 8d85f2d8a..dcb00671f 100644
--- a/crates/ra_proc_macro_srv/src/tests/utils.rs
+++ b/crates/ra_proc_macro_srv/src/tests/utils.rs
@@ -44,12 +44,12 @@ pub fn assert_expand(
    crate_name: &str,
    macro_name: &str,
    version: &str,
-    fixture: &str,
+    ra_fixture: &str,
    expect: &str,
 ) {
    let path = fixtures::dylib_path(crate_name, version);
    let expander = dylib::Expander::new(&path).unwrap();
-    let fixture = parse_string(fixture).unwrap();
+    let fixture = parse_string(ra_fixture).unwrap();
    let res = expander.expand(macro_name, &fixture.subtree, None).unwrap();
    assert_eq_text!(&format!("{:?}", res), &expect.trim());
diff --git a/crates/ra_prof/Cargo.toml b/crates/ra_prof/Cargo.toml
index c33b5121a..c82b9f76d 100644
--- a/crates/ra_prof/Cargo.toml
+++ b/crates/ra_prof/Cargo.toml
@@ -4,6 +4,7 @@ name = "ra_prof"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -12,11 +13,15 @@ doctest = false
 ra_arena = { path = "../ra_arena" }
 once_cell = "1.3.1"
 backtrace = { version = "0.3.44", optional = true }
+cfg-if = "0.1.10"
+libc = "0.2.73"
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
+[target.'cfg(target_os = "linux")'.dependencies]
-jemallocator = { version = "0.3.2", optional = true }
+perf-event = "0.4"
-jemalloc-ctl = { version = "0.3.3", optional = true }
 [features]
-jemalloc = [ "jemallocator", "jemalloc-ctl" ]
 cpu_profiler = []
+# Uncomment to enable for the whole crate graph
+# default = [ "backtrace" ]
+# default = [ "cpu_profiler" ]
diff --git a/crates/ra_prof/src/lib.rs b/crates/ra_prof/src/lib.rs
index 89df7f04b..eb50965ae 100644
--- a/crates/ra_prof/src/lib.rs
+++ b/crates/ra_prof/src/lib.rs
@@ -1,5 +1,6 @@
 //! A collection of tools for profiling rust-analyzer.
+mod stop_watch;
 mod memory_usage;
 #[cfg(feature = "cpu_profiler")]
 mod google_cpu_profiler;
@@ -11,14 +12,9 @@ use std::cell::RefCell;
 pub use crate::{
    hprof::{init, init_from, profile},
    memory_usage::{Bytes, MemoryUsage},
+    stop_watch::{StopWatch, StopWatchSpan},
 };
-// We use jemalloc mainly to get heap usage statistics, actual performance
-// difference is not measures.
-#[cfg(all(feature = "jemalloc", not(target_env = "msvc")))]
-#[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 /// Prints backtrace to stderr, useful for debugging.
 #[cfg(feature = "backtrace")]
 pub fn print_backtrace() {
@@ -43,6 +39,7 @@ pub struct Scope {
 }
 impl Scope {
+    #[must_use]
    pub fn enter() -> Scope {
        let prev = IN_SCOPE.with(|slot| std::mem::replace(&mut *slot.borrow_mut(), true));
        Scope { prev }
@@ -65,7 +62,8 @@ impl Drop for Scope {
 /// 2. Build with `cpu_profiler` feature.
 /// 3. Tun the code, the *raw* output would be in the `./out.profile` file.
 /// 4. Install pprof for visualization (https://github.com/google/pprof).
-/// 5. Use something like `pprof -svg target/release/rust-analyzer ./out.profile` to see the results.
+/// 5. Bump sampling frequency to once per ms: `export CPUPROFILE_FREQUENCY=1000`
+/// 6. Use something like `pprof -svg target/release/rust-analyzer ./out.profile` to see the results.
 ///
 /// For example, here's how I run profiling on NixOS:
 ///
@@ -73,11 +71,16 @@ impl Drop for Scope {
 /// $ nix-shell -p gperftools --run \
 ///     'cargo run --release -p rust-analyzer -- parse < ~/projects/rustbench/parser.rs > /dev/null'
 /// ```
+///
+/// See this diff for how to profile completions:
+///
+/// https://github.com/rust-analyzer/rust-analyzer/pull/5306
 #[derive(Debug)]
 pub struct CpuProfiler {
    _private: (),
 }
+#[must_use]
 pub fn cpu_profiler() -> CpuProfiler {
    #[cfg(feature = "cpu_profiler")]
    {
diff --git a/crates/ra_prof/src/memory_usage.rs b/crates/ra_prof/src/memory_usage.rs
index 9768f656c..c2ecbd33c 100644
--- a/crates/ra_prof/src/memory_usage.rs
+++ b/crates/ra_prof/src/memory_usage.rs
@@ -1,46 +1,58 @@
 //! FIXME: write short doc here
 use std::fmt;
+use cfg_if::cfg_if;
+#[derive(Copy, Clone)]
 pub struct MemoryUsage {
    pub allocated: Bytes,
-    pub resident: Bytes,
 }
-impl MemoryUsage {
+impl fmt::Display for MemoryUsage {
-    #[cfg(all(feature = "jemalloc", not(target_env = "msvc")))]
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-    pub fn current() -> MemoryUsage {
+        write!(fmt, "{}", self.allocated)
-        jemalloc_ctl::epoch::advance().unwrap();
-        MemoryUsage {
-            allocated: Bytes(jemalloc_ctl::stats::allocated::read().unwrap()),
-            resident: Bytes(jemalloc_ctl::stats::resident::read().unwrap()),
-        }
    }
+}
-    #[cfg(any(not(feature = "jemalloc"), target_env = "msvc"))]
+impl std::ops::Sub for MemoryUsage {
-    pub fn current() -> MemoryUsage {
+    type Output = MemoryUsage;
-        MemoryUsage { allocated: Bytes(0), resident: Bytes(0) }
+    fn sub(self, rhs: MemoryUsage) -> MemoryUsage {
+        MemoryUsage { allocated: self.allocated - rhs.allocated }
    }
 }
-impl fmt::Display for MemoryUsage {
+impl MemoryUsage {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    pub fn current() -> MemoryUsage {
-        write!(fmt, "{} allocated {} resident", self.allocated, self.resident,)
+        cfg_if! {
+            if #[cfg(target_os = "linux")] {
+                // Note: This is incredibly slow.
+                let alloc = unsafe { libc::mallinfo() }.uordblks as isize;
+                MemoryUsage { allocated: Bytes(alloc) }
+            } else {
+                MemoryUsage { allocated: Bytes(0) }
+            }
+        }
    }
 }
 #[derive(Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-pub struct Bytes(usize);
+pub struct Bytes(isize);
+impl Bytes {
+    pub fn megabytes(self) -> isize {
+        self.0 / 1024 / 1024
+    }
+}
 impl fmt::Display for Bytes {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        let bytes = self.0;
        let mut value = bytes;
        let mut suffix = "b";
-        if value > 4096 {
+        if value.abs() > 4096 {
            value /= 1024;
            suffix = "kb";
-            if value > 4096 {
+            if value.abs() > 4096 {
                value /= 1024;
                suffix = "mb";
            }
@@ -51,7 +63,7 @@ impl fmt::Display for Bytes {
 impl std::ops::AddAssign<usize> for Bytes {
    fn add_assign(&mut self, x: usize) {
-        self.0 += x;
+        self.0 += x as isize;
    }
 }
diff --git a/crates/ra_prof/src/stop_watch.rs b/crates/ra_prof/src/stop_watch.rs
new file mode 100644
index 000000000..5e276190e
--- /dev/null
+++ b/crates/ra_prof/src/stop_watch.rs
@@ -0,0 +1,86 @@
+//! Like `std::time::Instant`, but also measures memory & CPU cycles.
+use std::{
+    fmt,
+    time::{Duration, Instant},
+};
+use crate::MemoryUsage;
+pub struct StopWatch {
+    time: Instant,
+    #[cfg(target_os = "linux")]
+    counter: Option<perf_event::Counter>,
+    memory: Option<MemoryUsage>,
+}
+pub struct StopWatchSpan {
+    pub time: Duration,
+    pub instructions: Option<u64>,
+    pub memory: Option<MemoryUsage>,
+}
+impl StopWatch {
+    pub fn start() -> StopWatch {
+        #[cfg(target_os = "linux")]
+        let counter = {
+            let mut counter = perf_event::Builder::new()
+                .build()
+                .map_err(|err| eprintln!("Failed to create perf counter: {}", err))
+                .ok();
+            if let Some(counter) = &mut counter {
+                if let Err(err) = counter.enable() {
+                    eprintln!("Failed to start perf counter: {}", err)
+                }
+            }
+            counter
+        };
+        let time = Instant::now();
+        StopWatch {
+            time,
+            #[cfg(target_os = "linux")]
+            counter,
+            memory: None,
+        }
+    }
+    pub fn memory(mut self, yes: bool) -> StopWatch {
+        if yes {
+            self.memory = Some(MemoryUsage::current());
+        }
+        self
+    }
+    pub fn elapsed(&mut self) -> StopWatchSpan {
+        let time = self.time.elapsed();
+        #[cfg(target_os = "linux")]
+        let instructions = self.counter.as_mut().and_then(|it| {
+            it.read().map_err(|err| eprintln!("Failed to read perf counter: {}", err)).ok()
+        });
+        #[cfg(not(target_os = "linux"))]
+        let instructions = None;
+        let memory = self.memory.map(|it| MemoryUsage::current() - it);
+        StopWatchSpan { time, instructions, memory }
+    }
+}
+impl fmt::Display for StopWatchSpan {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:.2?}", self.time)?;
+        if let Some(mut instructions) = self.instructions {
+            let mut prefix = "";
+            if instructions > 10000 {
+                instructions /= 1000;
+                prefix = "k"
+            }
+            if instructions > 10000 {
+                instructions /= 1000;
+                prefix = "m"
+            }
+            write!(f, ", {}{}i", instructions, prefix)?;
+        }
+        if let Some(memory) = self.memory {
+            write!(f, ", {}", memory)?;
+        }
+        Ok(())
+    }
+}
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml
index b1b44dcf7..99adea8e4 100644
--- a/crates/ra_project_model/Cargo.toml
+++ b/crates/ra_project_model/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "ra_project_model"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -11,7 +12,7 @@ doctest = false
 log = "0.4.8"
 rustc-hash = "1.1.0"
-cargo_metadata = "0.10.0"
+cargo_metadata = "0.11.1"
 ra_arena = { path = "../ra_arena" }
 ra_cfg = { path = "../ra_cfg" }
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 3b124020d..10513542e 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -1,6 +1,11 @@
 //! FIXME: write short doc here
-use std::{ffi::OsStr, ops, path::Path, process::Command};
+use std::{
+    ffi::OsStr,
+    ops,
+    path::{Path, PathBuf},
+    process::Command,
+};
 use anyhow::{Context, Result};
 use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId};
@@ -9,6 +14,8 @@ use ra_arena::{Arena, Idx};
 use ra_db::Edition;
 use rustc_hash::FxHashMap;
+use crate::cfg_flag::CfgFlag;
 /// `CargoWorkspace` represents the logical structure of, well, a Cargo
 /// workspace. It pretty closely mirrors `cargo metadata` output.
 ///
@@ -19,7 +26,7 @@ use rustc_hash::FxHashMap;
 ///
 /// We use absolute paths here, `cargo metadata` guarantees to always produce
 /// abs paths.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct CargoWorkspace {
    packages: Arena<PackageData>,
    targets: Arena<TargetData>,
@@ -40,7 +47,7 @@ impl ops::Index<Target> for CargoWorkspace {
    }
 }
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Default, Clone, Debug, PartialEq, Eq)]
 pub struct CargoConfig {
    /// Do not activate the `default` feature.
    pub no_default_features: bool,
@@ -59,23 +66,11 @@ pub struct CargoConfig {
    pub target: Option<String>,
 }
-impl Default for CargoConfig {
-    fn default() -> Self {
-        CargoConfig {
-            no_default_features: false,
-            all_features: false,
-            features: Vec::new(),
-            load_out_dirs_from_check: false,
-            target: None,
-        }
-    }
-}
 pub type Package = Idx<PackageData>;
 pub type Target = Idx<TargetData>;
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct PackageData {
    pub version: String,
    pub name: String,
@@ -85,18 +80,18 @@ pub struct PackageData {
    pub dependencies: Vec<PackageDependency>,
    pub edition: Edition,
    pub features: Vec<String>,
-    pub cfgs: Vec<String>,
+    pub cfgs: Vec<CfgFlag>,
    pub out_dir: Option<AbsPathBuf>,
    pub proc_macro_dylib_path: Option<AbsPathBuf>,
 }
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct PackageDependency {
    pub pkg: Package,
    pub name: String,
 }
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct TargetData {
    pub package: Package,
    pub name: String,
@@ -141,28 +136,31 @@ impl PackageData {
 impl CargoWorkspace {
    pub fn from_cargo_metadata(
-        cargo_toml: &Path,
+        cargo_toml: &AbsPath,
        cargo_features: &CargoConfig,
    ) -> Result<CargoWorkspace> {
        let mut meta = MetadataCommand::new();
        meta.cargo_path(ra_toolchain::cargo());
-        meta.manifest_path(cargo_toml);
+        meta.manifest_path(cargo_toml.to_path_buf());
        if cargo_features.all_features {
            meta.features(CargoOpt::AllFeatures);
-        } else if cargo_features.no_default_features {
+        } else {
-            // FIXME: `NoDefaultFeatures` is mutual exclusive with `SomeFeatures`
+            if cargo_features.no_default_features {
-            // https://github.com/oli-obk/cargo_metadata/issues/79
+                // FIXME: `NoDefaultFeatures` is mutual exclusive with `SomeFeatures`
-            meta.features(CargoOpt::NoDefaultFeatures);
+                // https://github.com/oli-obk/cargo_metadata/issues/79
-        } else if !cargo_features.features.is_empty() {
+                meta.features(CargoOpt::NoDefaultFeatures);
-            meta.features(CargoOpt::SomeFeatures(cargo_features.features.clone()));
+            }
+            if !cargo_features.features.is_empty() {
+                meta.features(CargoOpt::SomeFeatures(cargo_features.features.clone()));
+            }
        }
        if let Some(parent) = cargo_toml.parent() {
-            meta.current_dir(parent);
+            meta.current_dir(parent.to_path_buf());
        }
        if let Some(target) = cargo_features.target.as_ref() {
            meta.other_options(vec![String::from("--filter-platform"), target.clone()]);
        }
-        let meta = meta.exec().with_context(|| {
+        let mut meta = meta.exec().with_context(|| {
            format!("Failed to run `cargo metadata --manifest-path {}`", cargo_toml.display())
        })?;
@@ -182,6 +180,7 @@ impl CargoWorkspace {
        let ws_members = &meta.workspace_members;
+        meta.packages.sort_by(|a, b| a.id.cmp(&b.id));
        for meta_pkg in meta.packages {
            let cargo_metadata::Package { id, edition, name, manifest_path, version, .. } =
                meta_pkg;
@@ -217,7 +216,7 @@ impl CargoWorkspace {
            }
        }
        let resolve = meta.resolve.expect("metadata executed with deps");
-        for node in resolve.nodes {
+        for mut node in resolve.nodes {
            let source = match pkg_by_id.get(&node.id) {
                Some(&src) => src,
                // FIXME: replace this and a similar branch below with `.unwrap`, once
@@ -228,6 +227,7 @@ impl CargoWorkspace {
                    continue;
                }
            };
+            node.deps.sort_by(|a, b| a.pkg.cmp(&b.pkg));
            for dep_node in node.deps {
                let pkg = match pkg_by_id.get(&dep_node.pkg) {
                    Some(&pkg) => pkg,
@@ -281,7 +281,7 @@ impl CargoWorkspace {
 pub struct ExternResources {
    out_dirs: FxHashMap<PackageId, AbsPathBuf>,
    proc_dylib_paths: FxHashMap<PackageId, AbsPathBuf>,
-    cfgs: FxHashMap<PackageId, Vec<String>>,
+    cfgs: FxHashMap<PackageId, Vec<CfgFlag>>,
 }
 pub fn load_extern_resources(
@@ -292,12 +292,16 @@ pub fn load_extern_resources(
    cmd.args(&["check", "--message-format=json", "--manifest-path"]).arg(cargo_toml);
    if cargo_features.all_features {
        cmd.arg("--all-features");
-    } else if cargo_features.no_default_features {
-        // FIXME: `NoDefaultFeatures` is mutual exclusive with `SomeFeatures`
-        // https://github.com/oli-obk/cargo_metadata/issues/79
-        cmd.arg("--no-default-features");
    } else {
-        cmd.args(&cargo_features.features);
+        if cargo_features.no_default_features {
+            // FIXME: `NoDefaultFeatures` is mutual exclusive with `SomeFeatures`
+            // https://github.com/oli-obk/cargo_metadata/issues/79
+            cmd.arg("--no-default-features");
+        }
+        if !cargo_features.features.is_empty() {
+            cmd.arg("--features");
+            cmd.arg(cargo_features.features.join(" "));
+        }
    }
    let output = cmd.output()?;
@@ -308,9 +312,25 @@ pub fn load_extern_resources(
        if let Ok(message) = message {
            match message {
                Message::BuildScriptExecuted(BuildScript { package_id, out_dir, cfgs, .. }) => {
-                    let out_dir = AbsPathBuf::assert(out_dir);
+                    let cfgs = {
-                    res.out_dirs.insert(package_id.clone(), out_dir);
+                        let mut acc = Vec::new();
-                    res.cfgs.insert(package_id, cfgs);
+                        for cfg in cfgs {
+                            match cfg.parse::<CfgFlag>() {
+                                Ok(it) => acc.push(it),
+                                Err(err) => {
+                                    anyhow::bail!("invalid cfg from cargo-metadata: {}", err)
+                                }
+                            };
+                        }
+                        acc
+                    };
+                    // cargo_metadata crate returns default (empty) path for
+                    // older cargos, which is not absolute, so work around that.
+                    if out_dir != PathBuf::default() {
+                        let out_dir = AbsPathBuf::assert(out_dir);
+                        res.out_dirs.insert(package_id.clone(), out_dir);
+                        res.cfgs.insert(package_id, cfgs);
+                    }
                }
                Message::CompilerArtifact(message) => {
                    if message.target.kind.contains(&"proc-macro".to_string()) {
diff --git a/crates/ra_project_model/src/cfg_flag.rs b/crates/ra_project_model/src/cfg_flag.rs
new file mode 100644
index 000000000..bd50056c6
--- /dev/null
+++ b/crates/ra_project_model/src/cfg_flag.rs
@@ -0,0 +1,51 @@
+//! Parsing of CfgFlags as command line arguments, as in
+//!
+//! rustc main.rs --cfg foo --cfg 'feature="bar"'
+use std::str::FromStr;
+use ra_cfg::CfgOptions;
+use stdx::split_once;
+#[derive(Clone, Eq, PartialEq, Debug)]
+pub enum CfgFlag {
+    Atom(String),
+    KeyValue { key: String, value: String },
+}
+impl FromStr for CfgFlag {
+    type Err = String;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let res = match split_once(s, '=') {
+            Some((key, value)) => {
+                if !(value.starts_with('"') && value.ends_with('"')) {
+                    return Err(format!("Invalid cfg ({:?}), value should be in quotes", s));
+                }
+                let key = key.to_string();
+                let value = value[1..value.len() - 1].to_string();
+                CfgFlag::KeyValue { key, value }
+            }
+            None => CfgFlag::Atom(s.into()),
+        };
+        Ok(res)
+    }
+}
+impl<'de> serde::Deserialize<'de> for CfgFlag {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        String::deserialize(deserializer)?.parse().map_err(serde::de::Error::custom)
+    }
+}
+impl Extend<CfgFlag> for CfgOptions {
+    fn extend<T: IntoIterator<Item = CfgFlag>>(&mut self, iter: T) {
+        for cfg_flag in iter {
+            match cfg_flag {
+                CfgFlag::Atom(it) => self.insert_atom(it.into()),
+                CfgFlag::KeyValue { key, value } => self.insert_key_value(key.into(), value.into()),
+            }
+        }
+    }
+}
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 8b85b4831..300e75135 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -3,12 +3,12 @@
 mod cargo_workspace;
 mod project_json;
 mod sysroot;
+mod cfg_flag;
 use std::{
    fs::{self, read_dir, ReadDir},
    io,
-    path::Path,
+    process::Command,
-    process::{Command, Output},
 };
 use anyhow::{bail, Context, Result};
@@ -17,14 +17,17 @@ use ra_cfg::CfgOptions;
 use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId};
 use rustc_hash::{FxHashMap, FxHashSet};
+use crate::cfg_flag::CfgFlag;
 pub use crate::{
    cargo_workspace::{CargoConfig, CargoWorkspace, Package, Target, TargetKind},
    project_json::{ProjectJson, ProjectJsonData},
    sysroot::Sysroot,
 };
 pub use ra_proc_macro::ProcMacroClient;
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum ProjectWorkspace {
    /// Project workspace was discovered by running `cargo metadata` and `rustc --print sysroot`.
    Cargo { cargo: CargoWorkspace, sysroot: Sysroot },
@@ -35,30 +38,12 @@ pub enum ProjectWorkspace {
 /// `PackageRoot` describes a package root folder.
 /// Which may be an external dependency, or a member of
 /// the current workspace.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub struct PackageRoot {
-    /// Path to the root folder
-    path: AbsPathBuf,
    /// Is a member of the current workspace
-    is_member: bool,
+    pub is_member: bool,
-    out_dir: Option<AbsPathBuf>,
+    pub include: Vec<AbsPathBuf>,
-}
+    pub exclude: Vec<AbsPathBuf>,
-impl PackageRoot {
-    pub fn new_member(path: AbsPathBuf) -> PackageRoot {
-        Self { path, is_member: true, out_dir: None }
-    }
-    pub fn new_non_member(path: AbsPathBuf) -> PackageRoot {
-        Self { path, is_member: false, out_dir: None }
-    }
-    pub fn path(&self) -> &AbsPath {
-        &self.path
-    }
-    pub fn out_dir(&self) -> Option<&AbsPath> {
-        self.out_dir.as_deref()
-    }
-    pub fn is_member(&self) -> bool {
-        self.is_member
-    }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)]
@@ -150,7 +135,7 @@ impl ProjectManifest {
 impl ProjectWorkspace {
    pub fn load(
        manifest: ProjectManifest,
-        cargo_features: &CargoConfig,
+        cargo_config: &CargoConfig,
        with_sysroot: bool,
    ) -> Result<ProjectWorkspace> {
        let res = match manifest {
@@ -166,7 +151,7 @@ impl ProjectWorkspace {
                ProjectWorkspace::Json { project }
            }
            ProjectManifest::CargoToml(cargo_toml) => {
-                let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_features)
+                let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_config)
                    .with_context(|| {
                        format!(
                            "Failed to read Cargo metadata from Cargo.toml file {}",
@@ -195,18 +180,40 @@ impl ProjectWorkspace {
    /// the root is a member of the current workspace
    pub fn to_roots(&self) -> Vec<PackageRoot> {
        match self {
-            ProjectWorkspace::Json { project } => {
+            ProjectWorkspace::Json { project } => project
-                project.roots.iter().map(|r| PackageRoot::new_member(r.path.clone())).collect()
+                .crates
-            }
+                .iter()
+                .map(|krate| PackageRoot {
+                    is_member: krate.is_workspace_member,
+                    include: krate.include.clone(),
+                    exclude: krate.exclude.clone(),
+                })
+                .collect::<FxHashSet<_>>()
+                .into_iter()
+                .collect::<Vec<_>>(),
            ProjectWorkspace::Cargo { cargo, sysroot } => cargo
                .packages()
-                .map(|pkg| PackageRoot {
+                .map(|pkg| {
-                    path: cargo[pkg].root().to_path_buf(),
+                    let is_member = cargo[pkg].is_member;
-                    is_member: cargo[pkg].is_member,
+                    let pkg_root = cargo[pkg].root().to_path_buf();
-                    out_dir: cargo[pkg].out_dir.clone(),
+                    let mut include = vec![pkg_root.clone()];
+                    include.extend(cargo[pkg].out_dir.clone());
+                    let mut exclude = vec![pkg_root.join(".git")];
+                    if is_member {
+                        exclude.push(pkg_root.join("target"));
+                    } else {
+                        exclude.push(pkg_root.join("tests"));
+                        exclude.push(pkg_root.join("examples"));
+                        exclude.push(pkg_root.join("benches"));
+                    }
+                    PackageRoot { is_member, include, exclude }
                })
-                .chain(sysroot.crates().map(|krate| {
+                .chain(sysroot.crates().map(|krate| PackageRoot {
-                    PackageRoot::new_non_member(sysroot[krate].root_dir().to_path_buf())
+                    is_member: false,
+                    include: vec![sysroot[krate].root_dir().to_path_buf()],
+                    exclude: Vec::new(),
                }))
                .collect(),
        }
@@ -246,6 +253,7 @@ impl ProjectWorkspace {
        let mut crate_graph = CrateGraph::default();
        match self {
            ProjectWorkspace::Json { project } => {
+                let mut cfg_cache: FxHashMap<Option<&str>, Vec<CfgFlag>> = FxHashMap::default();
                let crates: FxHashMap<_, _> = project
                    .crates
                    .iter()
@@ -254,17 +262,20 @@ impl ProjectWorkspace {
                        let file_path = &krate.root_module;
                        let file_id = load(&file_path)?;
-                        let mut env = Env::default();
+                        let env = krate.env.clone().into_iter().collect();
-                        if let Some(out_dir) = &krate.out_dir {
-                            // NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
-                            if let Some(out_dir) = out_dir.to_str().map(|s| s.to_owned()) {
-                                env.set("OUT_DIR", out_dir);
-                            }
-                        }
                        let proc_macro = krate
                            .proc_macro_dylib_path
                            .clone()
                            .map(|it| proc_macro_client.by_dylib_path(&it));
+                        let target = krate.target.as_deref().or(target);
+                        let target_cfgs = cfg_cache
+                            .entry(target)
+                            .or_insert_with(|| get_rustc_cfg_options(target));
+                        let mut cfg_options = CfgOptions::default();
+                        cfg_options.extend(target_cfgs.iter().chain(krate.cfg.iter()).cloned());
                        // FIXME: No crate name in json definition such that we cannot add OUT_DIR to env
                        Some((
                            CrateId(seq_index as u32),
@@ -273,7 +284,7 @@ impl ProjectWorkspace {
                                krate.edition,
                                // FIXME json definitions can store the crate name
                                None,
-                                krate.cfg.clone(),
+                                cfg_options,
                                env,
                                proc_macro.unwrap_or_default(),
                            ),
@@ -288,10 +299,7 @@ impl ProjectWorkspace {
                        if let (Some(&from), Some(&to)) =
                            (crates.get(&from_crate_id), crates.get(&to_crate_id))
                        {
-                            if crate_graph
+                            if crate_graph.add_dep(from, dep.name.clone(), to).is_err() {
-                                .add_dep(from, CrateName::new(&dep.name).unwrap(), to)
-                                .is_err()
-                            {
                                log::error!(
                                    "cyclic dependency {:?} -> {:?}",
                                    from_crate_id,
@@ -303,7 +311,8 @@ impl ProjectWorkspace {
                }
            }
            ProjectWorkspace::Cargo { cargo, sysroot } => {
-                let mut cfg_options = get_rustc_cfg_options(target);
+                let mut cfg_options = CfgOptions::default();
+                cfg_options.extend(get_rustc_cfg_options(target));
                let sysroot_crates: FxHashMap<_, _> = sysroot
                    .crates()
@@ -312,13 +321,11 @@ impl ProjectWorkspace {
                        let env = Env::default();
                        let proc_macro = vec![];
-                        let crate_name = CrateName::new(&sysroot[krate].name)
+                        let name = sysroot[krate].name.clone();
-                            .expect("Sysroot crate names should not contain dashes");
                        let crate_id = crate_graph.add_crate_root(
                            file_id,
                            Edition::Edition2018,
-                            Some(crate_name),
+                            Some(name),
                            cfg_options.clone(),
                            env,
                            proc_macro,
@@ -352,6 +359,7 @@ impl ProjectWorkspace {
                // Add test cfg for non-sysroot crates
                cfg_options.insert_atom("test".into());
+                cfg_options.insert_atom("debug_assertions".into());
                // Next, create crates for each package, target pair
                for pkg in cargo.packages() {
@@ -365,15 +373,7 @@ impl ProjectWorkspace {
                                for feature in cargo[pkg].features.iter() {
                                    opts.insert_key_value("feature".into(), feature.into());
                                }
-                                for cfg in cargo[pkg].cfgs.iter() {
+                                opts.extend(cargo[pkg].cfgs.iter().cloned());
-                                    match cfg.find('=') {
-                                        Some(split) => opts.insert_key_value(
-                                            cfg[..split].into(),
-                                            cfg[split + 1..].trim_matches('"').into(),
-                                        ),
-                                        None => opts.insert_atom(cfg.into()),
-                                    };
-                                }
                                opts
                            };
                            let mut env = Env::default();
@@ -392,7 +392,7 @@ impl ProjectWorkspace {
                            let crate_id = crate_graph.add_crate_root(
                                file_id,
                                edition,
-                                Some(CrateName::normalize_dashes(&cargo[pkg].name)),
+                                Some(cargo[pkg].name.clone()),
                                cfg_options,
                                env,
                                proc_macro.clone(),
@@ -499,66 +499,37 @@ impl ProjectWorkspace {
        }
        crate_graph
    }
-    pub fn workspace_root_for(&self, path: &Path) -> Option<&AbsPath> {
-        match self {
-            ProjectWorkspace::Cargo { cargo, .. } => {
-                Some(cargo.workspace_root()).filter(|root| path.starts_with(root))
-            }
-            ProjectWorkspace::Json { project: ProjectJson { roots, .. }, .. } => roots
-                .iter()
-                .find(|root| path.starts_with(&root.path))
-                .map(|root| root.path.as_path()),
-        }
-    }
 }
-fn get_rustc_cfg_options(target: Option<&str>) -> CfgOptions {
+fn get_rustc_cfg_options(target: Option<&str>) -> Vec<CfgFlag> {
-    let mut cfg_options = CfgOptions::default();
+    let mut res = Vec::new();
    // Some nightly-only cfgs, which are required for stdlib
-    {
+    res.push(CfgFlag::Atom("target_thread_local".into()));
-        cfg_options.insert_atom("target_thread_local".into());
+    for &ty in ["8", "16", "32", "64", "cas", "ptr"].iter() {
-        for &target_has_atomic in ["8", "16", "32", "64", "cas", "ptr"].iter() {
+        for &key in ["target_has_atomic", "target_has_atomic_load_store"].iter() {
-            cfg_options.insert_key_value("target_has_atomic".into(), target_has_atomic.into());
+            res.push(CfgFlag::KeyValue { key: key.to_string(), value: ty.into() });
-            cfg_options
-                .insert_key_value("target_has_atomic_load_store".into(), target_has_atomic.into());
        }
    }
-    let rustc_cfgs = || -> Result<String> {
+    let rustc_cfgs = {
-        // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here.
        let mut cmd = Command::new(ra_toolchain::rustc());
        cmd.args(&["--print", "cfg", "-O"]);
        if let Some(target) = target {
            cmd.args(&["--target", target]);
        }
-        let output = output(cmd)?;
+        utf8_stdout(cmd)
-        Ok(String::from_utf8(output.stdout)?)
+    };
-    }();
    match rustc_cfgs {
-        Ok(rustc_cfgs) => {
+        Ok(rustc_cfgs) => res.extend(rustc_cfgs.lines().map(|it| it.parse().unwrap())),
-            for line in rustc_cfgs.lines() {
-                match line.find('=') {
-                    None => cfg_options.insert_atom(line.into()),
-                    Some(pos) => {
-                        let key = &line[..pos];
-                        let value = line[pos + 1..].trim_matches('"');
-                        cfg_options.insert_key_value(key.into(), value.into());
-                    }
-                }
-            }
-        }
        Err(e) => log::error!("failed to get rustc cfgs: {:#}", e),
    }
-    cfg_options.insert_atom("debug_assertions".into());
+    res
-    cfg_options
 }
-fn output(mut cmd: Command) -> Result<Output> {
+fn utf8_stdout(mut cmd: Command) -> Result<String> {
    let output = cmd.output().with_context(|| format!("{:?} failed", cmd))?;
    if !output.status.success() {
        match String::from_utf8(output.stderr) {
@@ -568,5 +539,6 @@ fn output(mut cmd: Command) -> Result<Output> {
            _ => bail!("{:?} failed, {}", cmd, output.status),
        }
    }
-    Ok(output)
+    let stdout = String::from_utf8(output.stdout)?;
+    Ok(stdout)
 }
diff --git a/crates/ra_project_model/src/project_json.rs b/crates/ra_project_model/src/project_json.rs
index 4b5dcd634..e3f3163f6 100644
--- a/crates/ra_project_model/src/project_json.rs
+++ b/crates/ra_project_model/src/project_json.rs
@@ -3,70 +3,78 @@
 use std::path::PathBuf;
 use paths::{AbsPath, AbsPathBuf};
-use ra_cfg::CfgOptions;
+use ra_db::{CrateId, CrateName, Dependency, Edition};
-use ra_db::{CrateId, Dependency, Edition};
+use rustc_hash::FxHashMap;
-use rustc_hash::FxHashSet;
+use serde::{de, Deserialize};
-use serde::Deserialize;
-use stdx::split_delim;
+use crate::cfg_flag::CfgFlag;
 /// Roots and crates that compose this Rust project.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ProjectJson {
-    pub(crate) roots: Vec<Root>,
    pub(crate) crates: Vec<Crate>,
 }
-/// A root points to the directory which contains Rust crates. rust-analyzer watches all files in
-/// all roots. Roots might be nested.
-#[derive(Clone, Debug)]
-pub struct Root {
-    pub(crate) path: AbsPathBuf,
-}
 /// A crate points to the root module of a crate and lists the dependencies of the crate. This is
 /// useful in creating the crate graph.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Crate {
    pub(crate) root_module: AbsPathBuf,
    pub(crate) edition: Edition,
    pub(crate) deps: Vec<Dependency>,
-    pub(crate) cfg: CfgOptions,
+    pub(crate) cfg: Vec<CfgFlag>,
-    pub(crate) out_dir: Option<AbsPathBuf>,
+    pub(crate) target: Option<String>,
+    pub(crate) env: FxHashMap<String, String>,
    pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>,
+    pub(crate) is_workspace_member: bool,
+    pub(crate) include: Vec<AbsPathBuf>,
+    pub(crate) exclude: Vec<AbsPathBuf>,
 }
 impl ProjectJson {
    pub fn new(base: &AbsPath, data: ProjectJsonData) -> ProjectJson {
        ProjectJson {
-            roots: data.roots.into_iter().map(|path| Root { path: base.join(path) }).collect(),
            crates: data
                .crates
                .into_iter()
-                .map(|crate_data| Crate {
+                .map(|crate_data| {
-                    root_module: base.join(crate_data.root_module),
+                    let is_workspace_member = crate_data.is_workspace_member.unwrap_or_else(|| {
-                    edition: crate_data.edition.into(),
+                        crate_data.root_module.is_relative()
-                    deps: crate_data
+                            && !crate_data.root_module.starts_with("..")
-                        .deps
+                            || crate_data.root_module.starts_with(base)
-                        .into_iter()
+                    });
-                        .map(|dep_data| Dependency {
+                    let root_module = base.join(crate_data.root_module);
-                            crate_id: CrateId(dep_data.krate as u32),
+                    let (include, exclude) = match crate_data.source {
-                            name: dep_data.name.into(),
+                        Some(src) => {
-                        })
+                            let absolutize = |dirs: Vec<PathBuf>| {
-                        .collect::<Vec<_>>(),
+                                dirs.into_iter().map(|it| base.join(it)).collect::<Vec<_>>()
-                    cfg: {
+                            };
-                        let mut cfg = CfgOptions::default();
+                            (absolutize(src.include_dirs), absolutize(src.exclude_dirs))
-                        for entry in &crate_data.cfg {
-                            match split_delim(entry, '=') {
-                                Some((key, value)) => {
-                                    cfg.insert_key_value(key.into(), value.into());
-                                }
-                                None => cfg.insert_atom(entry.into()),
-                            }
                        }
-                        cfg
+                        None => (vec![root_module.parent().unwrap().to_path_buf()], Vec::new()),
-                    },
+                    };
-                    out_dir: crate_data.out_dir.map(|it| base.join(it)),
-                    proc_macro_dylib_path: crate_data.proc_macro_dylib_path.map(|it| base.join(it)),
+                    Crate {
+                        root_module,
+                        edition: crate_data.edition.into(),
+                        deps: crate_data
+                            .deps
+                            .into_iter()
+                            .map(|dep_data| Dependency {
+                                crate_id: CrateId(dep_data.krate as u32),
+                                name: dep_data.name,
+                            })
+                            .collect::<Vec<_>>(),
+                        cfg: crate_data.cfg,
+                        target: crate_data.target,
+                        env: crate_data.env,
+                        proc_macro_dylib_path: crate_data
+                            .proc_macro_dylib_path
+                            .map(|it| base.join(it)),
+                        is_workspace_member,
+                        include,
+                        exclude,
+                    }
                })
                .collect::<Vec<_>>(),
        }
@@ -75,7 +83,6 @@ impl ProjectJson {
 #[derive(Deserialize)]
 pub struct ProjectJsonData {
-    roots: Vec<PathBuf>,
    crates: Vec<CrateData>,
 }
@@ -85,9 +92,13 @@ struct CrateData {
    edition: EditionData,
    deps: Vec<DepData>,
    #[serde(default)]
-    cfg: FxHashSet<String>,
+    cfg: Vec<CfgFlag>,
-    out_dir: Option<PathBuf>,
+    target: Option<String>,
+    #[serde(default)]
+    env: FxHashMap<String, String>,
    proc_macro_dylib_path: Option<PathBuf>,
+    is_workspace_member: Option<bool>,
+    source: Option<CrateSource>,
 }
 #[derive(Deserialize)]
@@ -113,5 +124,20 @@ struct DepData {
    /// Identifies a crate by position in the crates array.
    #[serde(rename = "crate")]
    krate: usize,
-    name: String,
+    #[serde(deserialize_with = "deserialize_crate_name")]
+    name: CrateName,
+}
+#[derive(Deserialize)]
+struct CrateSource {
+    include_dirs: Vec<PathBuf>,
+    exclude_dirs: Vec<PathBuf>,
+}
+fn deserialize_crate_name<'de, D>(de: D) -> Result<CrateName, D::Error>
+where
+    D: de::Deserializer<'de>,
+{
+    let name = String::deserialize(de)?;
+    CrateName::new(&name).map_err(|err| de::Error::custom(format!("invalid crate name: {:?}", err)))
 }
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index 943ff92df..a10ade375 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -3,19 +3,19 @@
 use std::{convert::TryFrom, env, ops, path::Path, process::Command};
 use anyhow::{bail, format_err, Result};
+use paths::{AbsPath, AbsPathBuf};
 use ra_arena::{Arena, Idx};
-use crate::output;
+use crate::utf8_stdout;
-use paths::{AbsPath, AbsPathBuf};
-#[derive(Default, Debug, Clone)]
+#[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct Sysroot {
    crates: Arena<SysrootCrateData>,
 }
 pub type SysrootCrate = Idx<SysrootCrateData>;
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub struct SysrootCrateData {
    pub name: String,
    pub root: AbsPathBuf,
@@ -54,6 +54,8 @@ impl Sysroot {
        let src = get_or_install_rust_src(cargo_toml)?;
        let mut sysroot = Sysroot { crates: Arena::default() };
        for name in SYSROOT_CRATES.trim().lines() {
+            // FIXME: remove this path when 1.47 comes out
+            // https://github.com/rust-lang/rust/pull/73265
            let root = src.join(format!("lib{}", name)).join("lib.rs");
            if root.exists() {
                sysroot.crates.alloc(SysrootCrateData {
@@ -61,6 +63,15 @@ impl Sysroot {
                    root,
                    deps: Vec::new(),
                });
+            } else {
+                let root = src.join(name).join("src/lib.rs");
+                if root.exists() {
+                    sysroot.crates.alloc(SysrootCrateData {
+                        name: name.into(),
+                        root,
+                        deps: Vec::new(),
+                    });
+                }
            }
        }
        if let Some(std) = sysroot.std() {
@@ -92,26 +103,40 @@ fn get_or_install_rust_src(cargo_toml: &AbsPath) -> Result<AbsPathBuf> {
    let current_dir = cargo_toml.parent().unwrap();
    let mut rustc = Command::new(ra_toolchain::rustc());
    rustc.current_dir(current_dir).args(&["--print", "sysroot"]);
-    let rustc_output = output(rustc)?;
+    let stdout = utf8_stdout(rustc)?;
-    let stdout = String::from_utf8(rustc_output.stdout)?;
    let sysroot_path = AbsPath::assert(Path::new(stdout.trim()));
-    let src_path = sysroot_path.join("lib/rustlib/src/rust/src");
+    let mut src = get_rust_src(sysroot_path);
+    if src.is_none() {
-    if !src_path.exists() {
        let mut rustup = Command::new(ra_toolchain::rustup());
        rustup.current_dir(current_dir).args(&["component", "add", "rust-src"]);
-        let _output = output(rustup)?;
+        utf8_stdout(rustup)?;
+        src = get_rust_src(sysroot_path);
    }
-    if !src_path.exists() {
+    match src {
-        bail!(
+        Some(r) => Ok(r),
+        None => bail!(
            "can't load standard library from sysroot\n\
            {}\n\
            (discovered via `rustc --print sysroot`)\n\
            try running `rustup component add rust-src` or set `RUST_SRC_PATH`",
-            src_path.display(),
+            sysroot_path.display(),
-        )
+        ),
+    }
+}
+fn get_rust_src(sysroot_path: &AbsPath) -> Option<AbsPathBuf> {
+    // try the new path first since the old one still exists
+    let mut src_path = sysroot_path.join("lib/rustlib/src/rust/library");
+    if !src_path.exists() {
+        // FIXME: remove this path when 1.47 comes out
+        // https://github.com/rust-lang/rust/pull/73265
+        src_path = sysroot_path.join("lib/rustlib/src/rust/src");
+    }
+    if src_path.exists() {
+        Some(src_path)
+    } else {
+        None
    }
-    Ok(src_path)
 }
 impl SysrootCrateData {
@@ -121,43 +146,28 @@ impl SysrootCrateData {
 }
 const SYSROOT_CRATES: &str = "
-std
-core
 alloc
-collections
+core
-libc
+panic_abort
 panic_unwind
 proc_macro
-rustc_unicode
+profiler_builtins
-std_unicode
+rtstartup
-test
+std
-alloc_jemalloc
+stdarch
-alloc_system
-compiler_builtins
-getopts
-panic_unwind
-panic_abort
-rand
 term
-unwind
+test
-build_helper
+unwind";
-rustc_asan
-rustc_lsan
-rustc_msan
-rustc_tsan
-syntax";
 const STD_DEPS: &str = "
 alloc
-alloc_jemalloc
-alloc_system
 core
 panic_abort
-rand
+panic_unwind
-compiler_builtins
+profiler_builtins
-unwind
+rtstartup
-rustc_asan
+proc_macro
-rustc_lsan
+stdarch
-rustc_msan
+term
-rustc_tsan
+test
-build_helper";
+unwind";
diff --git a/crates/ra_ssr/Cargo.toml b/crates/ra_ssr/Cargo.toml
index 3c2f15a83..84e4b171e 100644
--- a/crates/ra_ssr/Cargo.toml
+++ b/crates/ra_ssr/Cargo.toml
@@ -17,3 +17,7 @@ ra_db = { path = "../ra_db" }
 ra_ide_db = { path = "../ra_ide_db" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 rustc-hash = "1.1.0"
+test_utils = { path = "../test_utils" }
+[dev-dependencies]
+expect = { path = "../expect" }
diff --git a/crates/ra_ssr/src/errors.rs b/crates/ra_ssr/src/errors.rs
new file mode 100644
index 000000000..c02bacae6
--- /dev/null
+++ b/crates/ra_ssr/src/errors.rs
@@ -0,0 +1,29 @@
+//! Code relating to errors produced by SSR.
+/// Constructs an SsrError taking arguments like the format macro.
+macro_rules! _error {
+    ($fmt:expr) => {$crate::SsrError::new(format!($fmt))};
+    ($fmt:expr, $($arg:tt)+) => {$crate::SsrError::new(format!($fmt, $($arg)+))}
+}
+pub(crate) use _error as error;
+/// Returns from the current function with an error, supplied by arguments as for format!
+macro_rules! _bail {
+    ($($tokens:tt)*) => {return Err(crate::errors::error!($($tokens)*))}
+}
+pub(crate) use _bail as bail;
+#[derive(Debug, PartialEq)]
+pub struct SsrError(pub(crate) String);
+impl std::fmt::Display for SsrError {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(f, "Parse error: {}", self.0)
+    }
+}
+impl SsrError {
+    pub(crate) fn new(message: impl Into<String>) -> SsrError {
+        SsrError(message.into())
+    }
+}
diff --git a/crates/ra_ssr/src/lib.rs b/crates/ra_ssr/src/lib.rs
index e148f4564..73abfecb2 100644
--- a/crates/ra_ssr/src/lib.rs
+++ b/crates/ra_ssr/src/lib.rs
@@ -4,136 +4,288 @@
 //! based on a template.
 mod matching;
+mod nester;
 mod parsing;
 mod replacing;
+mod resolving;
+mod search;
+#[macro_use]
+mod errors;
 #[cfg(test)]
 mod tests;
-use crate::matching::Match;
+use crate::errors::bail;
+pub use crate::errors::SsrError;
+pub use crate::matching::Match;
+use crate::matching::MatchFailureReason;
 use hir::Semantics;
-use ra_db::{FileId, FileRange};
+use ra_db::{FileId, FilePosition, FileRange};
-use ra_syntax::{ast, AstNode, SmolStr, SyntaxNode};
+use ra_ide_db::source_change::SourceFileEdit;
-use ra_text_edit::TextEdit;
+use ra_syntax::{ast, AstNode, SyntaxNode, TextRange};
+use resolving::ResolvedRule;
 use rustc_hash::FxHashMap;
 // A structured search replace rule. Create by calling `parse` on a str.
 #[derive(Debug)]
 pub struct SsrRule {
    /// A structured pattern that we're searching for.
-    pattern: SsrPattern,
+    pattern: parsing::RawPattern,
    /// What we'll replace it with.
-    template: parsing::SsrTemplate,
+    template: parsing::RawPattern,
+    parsed_rules: Vec<parsing::ParsedRule>,
 }
 #[derive(Debug)]
-struct SsrPattern {
+pub struct SsrPattern {
-    raw: parsing::RawSearchPattern,
+    raw: parsing::RawPattern,
-    /// Placeholders keyed by the stand-in ident that we use in Rust source code.
+    parsed_rules: Vec<parsing::ParsedRule>,
-    placeholders_by_stand_in: FxHashMap<SmolStr, parsing::Placeholder>,
-    // We store our search pattern, parsed as each different kind of thing we can look for. As we
-    // traverse the AST, we get the appropriate one of these for the type of node we're on. For many
-    // search patterns, only some of these will be present.
-    expr: Option<SyntaxNode>,
-    type_ref: Option<SyntaxNode>,
-    item: Option<SyntaxNode>,
-    path: Option<SyntaxNode>,
-    pattern: Option<SyntaxNode>,
 }
-#[derive(Debug, PartialEq)]
-pub struct SsrError(String);
 #[derive(Debug, Default)]
 pub struct SsrMatches {
-    matches: Vec<Match>,
+    pub matches: Vec<Match>,
 }
 /// Searches a crate for pattern matches and possibly replaces them with something else.
 pub struct MatchFinder<'db> {
    /// Our source of information about the user's code.
    sema: Semantics<'db, ra_ide_db::RootDatabase>,
-    rules: Vec<SsrRule>,
+    rules: Vec<ResolvedRule>,
+    resolution_scope: resolving::ResolutionScope<'db>,
+    restrict_ranges: Vec<FileRange>,
 }
 impl<'db> MatchFinder<'db> {
-    pub fn new(db: &'db ra_ide_db::RootDatabase) -> MatchFinder<'db> {
+    /// Constructs a new instance where names will be looked up as if they appeared at
-        MatchFinder { sema: Semantics::new(db), rules: Vec::new() }
+    /// `lookup_context`.
+    pub fn in_context(
+        db: &'db ra_ide_db::RootDatabase,
+        lookup_context: FilePosition,
+        mut restrict_ranges: Vec<FileRange>,
+    ) -> MatchFinder<'db> {
+        restrict_ranges.retain(|range| !range.range.is_empty());
+        let sema = Semantics::new(db);
+        let resolution_scope = resolving::ResolutionScope::new(&sema, lookup_context);
+        MatchFinder {
+            sema: Semantics::new(db),
+            rules: Vec::new(),
+            resolution_scope,
+            restrict_ranges,
+        }
    }
-    pub fn add_rule(&mut self, rule: SsrRule) {
+    /// Constructs an instance using the start of the first file in `db` as the lookup context.
-        self.rules.push(rule);
+    pub fn at_first_file(db: &'db ra_ide_db::RootDatabase) -> Result<MatchFinder<'db>, SsrError> {
+        use ra_db::SourceDatabaseExt;
+        use ra_ide_db::symbol_index::SymbolsDatabase;
+        if let Some(first_file_id) = db
+            .local_roots()
+            .iter()
+            .next()
+            .and_then(|root| db.source_root(root.clone()).iter().next())
+        {
+            Ok(MatchFinder::in_context(
+                db,
+                FilePosition { file_id: first_file_id, offset: 0.into() },
+                vec![],
+            ))
+        } else {
+            bail!("No files to search");
+        }
    }
-    pub fn edits_for_file(&self, file_id: FileId) -> Option<TextEdit> {
+    /// Adds a rule to be applied. The order in which rules are added matters. Earlier rules take
-        let matches = self.find_matches_in_file(file_id);
+    /// precedence. If a node is matched by an earlier rule, then later rules won't be permitted to
-        if matches.matches.is_empty() {
+    /// match to it.
-            None
+    pub fn add_rule(&mut self, rule: SsrRule) -> Result<(), SsrError> {
-        } else {
+        for parsed_rule in rule.parsed_rules {
-            use ra_db::SourceDatabaseExt;
+            self.rules.push(ResolvedRule::new(
-            Some(replacing::matches_to_edit(&matches, &self.sema.db.file_text(file_id)))
+                parsed_rule,
+                &self.resolution_scope,
+                self.rules.len(),
+            )?);
        }
+        Ok(())
    }
-    fn find_matches_in_file(&self, file_id: FileId) -> SsrMatches {
+    /// Finds matches for all added rules and returns edits for all found matches.
+    pub fn edits(&self) -> Vec<SourceFileEdit> {
+        use ra_db::SourceDatabaseExt;
+        let mut matches_by_file = FxHashMap::default();
+        for m in self.matches().matches {
+            matches_by_file
+                .entry(m.range.file_id)
+                .or_insert_with(|| SsrMatches::default())
+                .matches
+                .push(m);
+        }
+        let mut edits = vec![];
+        for (file_id, matches) in matches_by_file {
+            let edit =
+                replacing::matches_to_edit(&matches, &self.sema.db.file_text(file_id), &self.rules);
+            edits.push(SourceFileEdit { file_id, edit });
+        }
+        edits
+    }
+    /// Adds a search pattern. For use if you intend to only call `find_matches_in_file`. If you
+    /// intend to do replacement, use `add_rule` instead.
+    pub fn add_search_pattern(&mut self, pattern: SsrPattern) -> Result<(), SsrError> {
+        for parsed_rule in pattern.parsed_rules {
+            self.rules.push(ResolvedRule::new(
+                parsed_rule,
+                &self.resolution_scope,
+                self.rules.len(),
+            )?);
+        }
+        Ok(())
+    }
+    /// Returns matches for all added rules.
+    pub fn matches(&self) -> SsrMatches {
+        let mut matches = Vec::new();
+        let mut usage_cache = search::UsageCache::default();
+        for rule in &self.rules {
+            self.find_matches_for_rule(rule, &mut usage_cache, &mut matches);
+        }
+        nester::nest_and_remove_collisions(matches, &self.sema)
+    }
+    /// Finds all nodes in `file_id` whose text is exactly equal to `snippet` and attempts to match
+    /// them, while recording reasons why they don't match. This API is useful for command
+    /// line-based debugging where providing a range is difficult.
+    pub fn debug_where_text_equal(&self, file_id: FileId, snippet: &str) -> Vec<MatchDebugInfo> {
+        use ra_db::SourceDatabaseExt;
        let file = self.sema.parse(file_id);
-        let code = file.syntax();
+        let mut res = Vec::new();
-        let mut matches = SsrMatches::default();
+        let file_text = self.sema.db.file_text(file_id);
-        self.find_matches(code, &None, &mut matches);
+        let mut remaining_text = file_text.as_str();
-        matches
+        let mut base = 0;
+        let len = snippet.len() as u32;
+        while let Some(offset) = remaining_text.find(snippet) {
+            let start = base + offset as u32;
+            let end = start + len;
+            self.output_debug_for_nodes_at_range(
+                file.syntax(),
+                FileRange { file_id, range: TextRange::new(start.into(), end.into()) },
+                &None,
+                &mut res,
+            );
+            remaining_text = &remaining_text[offset + snippet.len()..];
+            base = end;
+        }
+        res
    }
-    fn find_matches(
+    fn output_debug_for_nodes_at_range(
        &self,
-        code: &SyntaxNode,
+        node: &SyntaxNode,
+        range: FileRange,
        restrict_range: &Option<FileRange>,
-        matches_out: &mut SsrMatches,
+        out: &mut Vec<MatchDebugInfo>,
    ) {
-        for rule in &self.rules {
+        for node in node.children() {
-            if let Ok(mut m) = matching::get_match(false, rule, &code, restrict_range, &self.sema) {
+            let node_range = self.sema.original_range(&node);
-                // Continue searching in each of our placeholders.
+            if node_range.file_id != range.file_id || !node_range.range.contains_range(range.range)
-                for placeholder_value in m.placeholder_values.values_mut() {
+            {
-                    if let Some(placeholder_node) = &placeholder_value.node {
+                continue;
-                        // Don't search our placeholder if it's the entire matched node, otherwise we'd
+            }
-                        // find the same match over and over until we got a stack overflow.
+            if node_range.range == range.range {
-                        if placeholder_node != code {
+                for rule in &self.rules {
-                            self.find_matches(
+                    // For now we ignore rules that have a different kind than our node, otherwise
-                                placeholder_node,
+                    // we get lots of noise. If at some point we add support for restricting rules
-                                restrict_range,
+                    // to a particular kind of thing (e.g. only match type references), then we can
-                                &mut placeholder_value.inner_matches,
+                    // relax this. We special-case expressions, since function calls can match
-                            );
+                    // method calls.
-                        }
+                    if rule.pattern.node.kind() != node.kind()
+                        && !(ast::Expr::can_cast(rule.pattern.node.kind())
+                            && ast::Expr::can_cast(node.kind()))
+                    {
+                        continue;
                    }
+                    out.push(MatchDebugInfo {
+                        matched: matching::get_match(true, rule, &node, restrict_range, &self.sema)
+                            .map_err(|e| MatchFailureReason {
+                                reason: e.reason.unwrap_or_else(|| {
+                                    "Match failed, but no reason was given".to_owned()
+                                }),
+                            }),
+                        pattern: rule.pattern.node.clone(),
+                        node: node.clone(),
+                    });
                }
-                matches_out.matches.push(m);
+            } else if let Some(macro_call) = ast::MacroCall::cast(node.clone()) {
-                return;
+                if let Some(expanded) = self.sema.expand(&macro_call) {
-            }
+                    if let Some(tt) = macro_call.token_tree() {
-        }
+                        self.output_debug_for_nodes_at_range(
-        // If we've got a macro call, we already tried matching it pre-expansion, which is the only
+                            &expanded,
-        // way to match the whole macro, now try expanding it and matching the expansion.
+                            range,
-        if let Some(macro_call) = ast::MacroCall::cast(code.clone()) {
+                            &Some(self.sema.original_range(tt.syntax())),
-            if let Some(expanded) = self.sema.expand(&macro_call) {
+                            out,
-                if let Some(tt) = macro_call.token_tree() {
+                        );
-                    // When matching within a macro expansion, we only want to allow matches of
+                    }
-                    // nodes that originated entirely from within the token tree of the macro call.
-                    // i.e. we don't want to match something that came from the macro itself.
-                    self.find_matches(
-                        &expanded,
-                        &Some(self.sema.original_range(tt.syntax())),
-                        matches_out,
-                    );
                }
            }
+            self.output_debug_for_nodes_at_range(&node, range, restrict_range, out);
        }
-        for child in code.children() {
+    }
-            self.find_matches(&child, restrict_range, matches_out);
+}
+pub struct MatchDebugInfo {
+    node: SyntaxNode,
+    /// Our search pattern parsed as an expression or item, etc
+    pattern: SyntaxNode,
+    matched: Result<Match, MatchFailureReason>,
+}
+impl std::fmt::Debug for MatchDebugInfo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match &self.matched {
+            Ok(_) => writeln!(f, "Node matched")?,
+            Err(reason) => writeln!(f, "Node failed to match because: {}", reason.reason)?,
        }
+        writeln!(
+            f,
+            "============ AST ===========\n\
+            {:#?}",
+            self.node
+        )?;
+        writeln!(f, "========= PATTERN ==========")?;
+        writeln!(f, "{:#?}", self.pattern)?;
+        writeln!(f, "============================")?;
+        Ok(())
    }
 }
-impl std::fmt::Display for SsrError {
+impl SsrMatches {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+    /// Returns `self` with any nested matches removed and made into top-level matches.
-        write!(f, "Parse error: {}", self.0)
+    pub fn flattened(self) -> SsrMatches {
+        let mut out = SsrMatches::default();
+        self.flatten_into(&mut out);
+        out
+    }
+    fn flatten_into(self, out: &mut SsrMatches) {
+        for mut m in self.matches {
+            for p in m.placeholder_values.values_mut() {
+                std::mem::replace(&mut p.inner_matches, SsrMatches::default()).flatten_into(out);
+            }
+            out.matches.push(m);
+        }
+    }
+}
+impl Match {
+    pub fn matched_text(&self) -> String {
+        self.matched_node.text().to_string()
    }
 }
 impl std::error::Error for SsrError {}
+#[cfg(test)]
+impl MatchDebugInfo {
+    pub(crate) fn match_failure_reason(&self) -> Option<&str> {
+        self.matched.as_ref().err().map(|r| r.reason.as_str())
+    }
+}
diff --git a/crates/ra_ssr/src/matching.rs b/crates/ra_ssr/src/matching.rs
index bb87bda43..74e15c631 100644
--- a/crates/ra_ssr/src/matching.rs
+++ b/crates/ra_ssr/src/matching.rs
@@ -2,17 +2,17 @@
 //! process of matching, placeholder values are recorded.
 use crate::{
-    parsing::{Placeholder, SsrTemplate},
+    parsing::{Constraint, NodeKind, Placeholder},
-    SsrMatches, SsrPattern, SsrRule,
+    resolving::{ResolvedPattern, ResolvedRule},
+    SsrMatches,
 };
 use hir::Semantics;
 use ra_db::FileRange;
 use ra_syntax::ast::{AstNode, AstToken};
-use ra_syntax::{
+use ra_syntax::{ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken};
-    ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken, TextRange,
-};
 use rustc_hash::FxHashMap;
 use std::{cell::Cell, iter::Peekable};
+use test_utils::mark;
 // Creates a match error. If we're currently attempting to match some code that we thought we were
 // going to match, as indicated by the --debug-snippet flag, then populate the reason field.
@@ -44,14 +44,16 @@ macro_rules! fail_match {
 /// Information about a match that was found.
 #[derive(Debug)]
-pub(crate) struct Match {
+pub struct Match {
-    pub(crate) range: TextRange,
+    pub(crate) range: FileRange,
    pub(crate) matched_node: SyntaxNode,
    pub(crate) placeholder_values: FxHashMap<Var, PlaceholderMatch>,
    pub(crate) ignored_comments: Vec<ast::Comment>,
-    // A copy of the template for the rule that produced this match. We store this on the match for
+    pub(crate) rule_index: usize,
-    // if/when we do replacement.
+    /// The depth of matched_node.
-    pub(crate) template: SsrTemplate,
+    pub(crate) depth: usize,
+    // Each path in the template rendered for the module in which the match was found.
+    pub(crate) rendered_template_paths: FxHashMap<SyntaxNode, hir::ModPath>,
 }
 /// Represents a `$var` in an SSR query.
@@ -87,64 +89,67 @@ pub(crate) struct MatchFailed {
 /// parent module, we don't populate nested matches.
 pub(crate) fn get_match(
    debug_active: bool,
-    rule: &SsrRule,
+    rule: &ResolvedRule,
    code: &SyntaxNode,
    restrict_range: &Option<FileRange>,
    sema: &Semantics<ra_ide_db::RootDatabase>,
 ) -> Result<Match, MatchFailed> {
    record_match_fails_reasons_scope(debug_active, || {
-        MatchState::try_match(rule, code, restrict_range, sema)
+        Matcher::try_match(rule, code, restrict_range, sema)
    })
 }
-/// Inputs to matching. This cannot be part of `MatchState`, since we mutate `MatchState` and in at
+/// Checks if our search pattern matches a particular node of the AST.
-/// least one case need to hold a borrow of a placeholder from the input pattern while calling a
+struct Matcher<'db, 'sema> {
-/// mutable `MatchState` method.
-struct MatchInputs<'pattern> {
-    ssr_pattern: &'pattern SsrPattern,
-}
-/// State used while attempting to match our search pattern against a particular node of the AST.
-struct MatchState<'db, 'sema> {
    sema: &'sema Semantics<'db, ra_ide_db::RootDatabase>,
    /// If any placeholders come from anywhere outside of this range, then the match will be
    /// rejected.
    restrict_range: Option<FileRange>,
-    /// The match that we're building. We do two passes for a successful match. On the first pass,
+    rule: &'sema ResolvedRule,
-    /// this is None so that we can avoid doing things like storing copies of what placeholders
+}
-    /// matched to. If that pass succeeds, then we do a second pass where we collect those details.
-    /// This means that if we have a pattern like `$a.foo()` we won't do an insert into the
+/// Which phase of matching we're currently performing. We do two phases because most attempted
-    /// placeholders map for every single method call in the codebase. Instead we'll discard all the
+/// matches will fail and it means we can defer more expensive checks to the second phase.
-    /// method calls that aren't calls to `foo` on the first pass and only insert into the
+enum Phase<'a> {
-    /// placeholders map on the second pass. Likewise for ignored comments.
+    /// On the first phase, we perform cheap checks. No state is mutated and nothing is recorded.
-    match_out: Option<Match>,
+    First,
+    /// On the second phase, we construct the `Match`. Things like what placeholders bind to is
+    /// recorded.
+    Second(&'a mut Match),
 }
-impl<'db, 'sema> MatchState<'db, 'sema> {
+impl<'db, 'sema> Matcher<'db, 'sema> {
    fn try_match(
-        rule: &SsrRule,
+        rule: &ResolvedRule,
        code: &SyntaxNode,
        restrict_range: &Option<FileRange>,
        sema: &'sema Semantics<'db, ra_ide_db::RootDatabase>,
    ) -> Result<Match, MatchFailed> {
-        let mut match_state =
+        let match_state = Matcher { sema, restrict_range: restrict_range.clone(), rule };
-            MatchState { sema, restrict_range: restrict_range.clone(), match_out: None };
-        let match_inputs = MatchInputs { ssr_pattern: &rule.pattern };
-        let pattern_tree = rule.pattern.tree_for_kind(code.kind())?;
        // First pass at matching, where we check that node types and idents match.
-        match_state.attempt_match_node(&match_inputs, &pattern_tree, code)?;
+        match_state.attempt_match_node(&mut Phase::First, &rule.pattern.node, code)?;
        match_state.validate_range(&sema.original_range(code))?;
-        match_state.match_out = Some(Match {
+        let mut the_match = Match {
-            range: sema.original_range(code).range,
+            range: sema.original_range(code),
            matched_node: code.clone(),
            placeholder_values: FxHashMap::default(),
            ignored_comments: Vec::new(),
-            template: rule.template.clone(),
+            rule_index: rule.index,
-        });
+            depth: 0,
+            rendered_template_paths: FxHashMap::default(),
+        };
        // Second matching pass, where we record placeholder matches, ignored comments and maybe do
        // any other more expensive checks that we didn't want to do on the first pass.
-        match_state.attempt_match_node(&match_inputs, &pattern_tree, code)?;
+        match_state.attempt_match_node(
-        Ok(match_state.match_out.unwrap())
+            &mut Phase::Second(&mut the_match),
+            &rule.pattern.node,
+            code,
+        )?;
+        the_match.depth = sema.ancestors_with_macros(the_match.matched_node.clone()).count();
+        if let Some(template) = &rule.template {
+            the_match.render_template_paths(template, sema)?;
+        }
+        Ok(the_match)
    }
    /// Checks that `range` is within the permitted range if any. This is applicable when we're
@@ -162,79 +167,91 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
    }
    fn attempt_match_node(
-        &mut self,
+        &self,
-        match_inputs: &MatchInputs,
+        phase: &mut Phase,
        pattern: &SyntaxNode,
        code: &SyntaxNode,
    ) -> Result<(), MatchFailed> {
        // Handle placeholders.
-        if let Some(placeholder) =
+        if let Some(placeholder) = self.get_placeholder(&SyntaxElement::Node(pattern.clone())) {
-            match_inputs.get_placeholder(&SyntaxElement::Node(pattern.clone()))
+            for constraint in &placeholder.constraints {
-        {
+                self.check_constraint(constraint, code)?;
-            if self.match_out.is_none() {
-                return Ok(());
            }
-            let original_range = self.sema.original_range(code);
+            if let Phase::Second(matches_out) = phase {
-            // We validated the range for the node when we started the match, so the placeholder
+                let original_range = self.sema.original_range(code);
-            // probably can't fail range validation, but just to be safe...
+                // We validated the range for the node when we started the match, so the placeholder
-            self.validate_range(&original_range)?;
+                // probably can't fail range validation, but just to be safe...
-            if let Some(match_out) = &mut self.match_out {
+                self.validate_range(&original_range)?;
-                match_out.placeholder_values.insert(
+                matches_out.placeholder_values.insert(
                    Var(placeholder.ident.to_string()),
                    PlaceholderMatch::new(code, original_range),
                );
            }
            return Ok(());
        }
-        // Non-placeholders.
+        // We allow a UFCS call to match a method call, provided they resolve to the same function.
+        if let Some(pattern_function) = self.rule.pattern.ufcs_function_calls.get(pattern) {
+            if let (Some(pattern), Some(code)) =
+                (ast::CallExpr::cast(pattern.clone()), ast::MethodCallExpr::cast(code.clone()))
+            {
+                return self.attempt_match_ufcs(phase, &pattern, &code, *pattern_function);
+            }
+        }
        if pattern.kind() != code.kind() {
-            fail_match!("Pattern had a {:?}, code had {:?}", pattern.kind(), code.kind());
+            fail_match!(
+                "Pattern had `{}` ({:?}), code had `{}` ({:?})",
+                pattern.text(),
+                pattern.kind(),
+                code.text(),
+                code.kind()
+            );
        }
        // Some kinds of nodes have special handling. For everything else, we fall back to default
        // matching.
        match code.kind() {
-            SyntaxKind::RECORD_FIELD_LIST => {
+            SyntaxKind::RECORD_EXPR_FIELD_LIST => {
-                self.attempt_match_record_field_list(match_inputs, pattern, code)
+                self.attempt_match_record_field_list(phase, pattern, code)
            }
-            SyntaxKind::TOKEN_TREE => self.attempt_match_token_tree(match_inputs, pattern, code),
+            SyntaxKind::TOKEN_TREE => self.attempt_match_token_tree(phase, pattern, code),
-            _ => self.attempt_match_node_children(match_inputs, pattern, code),
+            SyntaxKind::PATH => self.attempt_match_path(phase, pattern, code),
+            _ => self.attempt_match_node_children(phase, pattern, code),
        }
    }
    fn attempt_match_node_children(
-        &mut self,
+        &self,
-        match_inputs: &MatchInputs,
+        phase: &mut Phase,
        pattern: &SyntaxNode,
        code: &SyntaxNode,
    ) -> Result<(), MatchFailed> {
        self.attempt_match_sequences(
-            match_inputs,
+            phase,
            PatternIterator::new(pattern),
            code.children_with_tokens(),
        )
    }
    fn attempt_match_sequences(
-        &mut self,
+        &self,
-        match_inputs: &MatchInputs,
+        phase: &mut Phase,
        pattern_it: PatternIterator,
        mut code_it: SyntaxElementChildren,
    ) -> Result<(), MatchFailed> {
        let mut pattern_it = pattern_it.peekable();
        loop {
-            match self.next_non_trivial(&mut code_it) {
+            match phase.next_non_trivial(&mut code_it) {
                None => {
                    if let Some(p) = pattern_it.next() {
-                        fail_match!("Part of the pattern was unmached: {:?}", p);
+                        fail_match!("Part of the pattern was unmatched: {:?}", p);
                    }
                    return Ok(());
                }
                Some(SyntaxElement::Token(c)) => {
-                    self.attempt_match_token(&mut pattern_it, &c)?;
+                    self.attempt_match_token(phase, &mut pattern_it, &c)?;
                }
                Some(SyntaxElement::Node(c)) => match pattern_it.next() {
                    Some(SyntaxElement::Node(p)) => {
-                        self.attempt_match_node(match_inputs, &p, &c)?;
+                        self.attempt_match_node(phase, &p, &c)?;
                    }
                    Some(p) => fail_match!("Pattern wanted '{}', code has {}", p, c.text()),
                    None => fail_match!("Pattern reached end, code has {}", c.text()),
@@ -244,11 +261,12 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
    }
    fn attempt_match_token(
-        &mut self,
+        &self,
+        phase: &mut Phase,
        pattern: &mut Peekable<PatternIterator>,
        code: &ra_syntax::SyntaxToken,
    ) -> Result<(), MatchFailed> {
-        self.record_ignored_comments(code);
+        phase.record_ignored_comments(code);
        // Ignore whitespace and comments.
        if code.kind().is_trivia() {
            return Ok(());
@@ -294,18 +312,94 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
        Ok(())
    }
+    fn check_constraint(
+        &self,
+        constraint: &Constraint,
+        code: &SyntaxNode,
+    ) -> Result<(), MatchFailed> {
+        match constraint {
+            Constraint::Kind(kind) => {
+                kind.matches(code)?;
+            }
+            Constraint::Not(sub) => {
+                if self.check_constraint(&*sub, code).is_ok() {
+                    fail_match!("Constraint {:?} failed for '{}'", constraint, code.text());
+                }
+            }
+        }
+        Ok(())
+    }
+    /// Paths are matched based on whether they refer to the same thing, even if they're written
+    /// differently.
+    fn attempt_match_path(
+        &self,
+        phase: &mut Phase,
+        pattern: &SyntaxNode,
+        code: &SyntaxNode,
+    ) -> Result<(), MatchFailed> {
+        if let Some(pattern_resolved) = self.rule.pattern.resolved_paths.get(pattern) {
+            let pattern_path = ast::Path::cast(pattern.clone()).unwrap();
+            let code_path = ast::Path::cast(code.clone()).unwrap();
+            if let (Some(pattern_segment), Some(code_segment)) =
+                (pattern_path.segment(), code_path.segment())
+            {
+                // Match everything within the segment except for the name-ref, which is handled
+                // separately via comparing what the path resolves to below.
+                self.attempt_match_opt(
+                    phase,
+                    pattern_segment.type_arg_list(),
+                    code_segment.type_arg_list(),
+                )?;
+                self.attempt_match_opt(
+                    phase,
+                    pattern_segment.param_list(),
+                    code_segment.param_list(),
+                )?;
+            }
+            if matches!(phase, Phase::Second(_)) {
+                let resolution = self
+                    .sema
+                    .resolve_path(&code_path)
+                    .ok_or_else(|| match_error!("Failed to resolve path `{}`", code.text()))?;
+                if pattern_resolved.resolution != resolution {
+                    fail_match!("Pattern had path `{}` code had `{}`", pattern.text(), code.text());
+                }
+            }
+        } else {
+            return self.attempt_match_node_children(phase, pattern, code);
+        }
+        Ok(())
+    }
+    fn attempt_match_opt<T: AstNode>(
+        &self,
+        phase: &mut Phase,
+        pattern: Option<T>,
+        code: Option<T>,
+    ) -> Result<(), MatchFailed> {
+        match (pattern, code) {
+            (Some(p), Some(c)) => self.attempt_match_node(phase, &p.syntax(), &c.syntax()),
+            (None, None) => Ok(()),
+            (Some(p), None) => fail_match!("Pattern `{}` had nothing to match", p.syntax().text()),
+            (None, Some(c)) => {
+                fail_match!("Nothing in pattern to match code `{}`", c.syntax().text())
+            }
+        }
+    }
    /// We want to allow the records to match in any order, so we have special matching logic for
    /// them.
    fn attempt_match_record_field_list(
-        &mut self,
+        &self,
-        match_inputs: &MatchInputs,
+        phase: &mut Phase,
        pattern: &SyntaxNode,
        code: &SyntaxNode,
    ) -> Result<(), MatchFailed> {
        // Build a map keyed by field name.
        let mut fields_by_name = FxHashMap::default();
        for child in code.children() {
-            if let Some(record) = ast::RecordField::cast(child.clone()) {
+            if let Some(record) = ast::RecordExprField::cast(child.clone()) {
                if let Some(name) = record.field_name() {
                    fields_by_name.insert(name.text().clone(), child.clone());
                }
@@ -314,11 +408,11 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
        for p in pattern.children_with_tokens() {
            if let SyntaxElement::Node(p) = p {
                if let Some(name_element) = p.first_child_or_token() {
-                    if match_inputs.get_placeholder(&name_element).is_some() {
+                    if self.get_placeholder(&name_element).is_some() {
                        // If the pattern is using placeholders for field names then order
                        // independence doesn't make sense. Fall back to regular ordered
                        // matching.
-                        return self.attempt_match_node_children(match_inputs, pattern, code);
+                        return self.attempt_match_node_children(phase, pattern, code);
                    }
                    if let Some(ident) = only_ident(name_element) {
                        let code_record = fields_by_name.remove(ident.text()).ok_or_else(|| {
@@ -327,7 +421,7 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
                                ident
                            )
                        })?;
-                        self.attempt_match_node(match_inputs, &p, &code_record)?;
+                        self.attempt_match_node(phase, &p, &code_record)?;
                    }
                }
            }
@@ -347,16 +441,15 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
    /// pattern matches the macro invocation. For matches within the macro call, we'll already have
    /// expanded the macro.
    fn attempt_match_token_tree(
-        &mut self,
+        &self,
-        match_inputs: &MatchInputs,
+        phase: &mut Phase,
        pattern: &SyntaxNode,
        code: &ra_syntax::SyntaxNode,
    ) -> Result<(), MatchFailed> {
        let mut pattern = PatternIterator::new(pattern).peekable();
        let mut children = code.children_with_tokens();
        while let Some(child) = children.next() {
-            if let Some(placeholder) = pattern.peek().and_then(|p| match_inputs.get_placeholder(p))
+            if let Some(placeholder) = pattern.peek().and_then(|p| self.get_placeholder(p)) {
-            {
                pattern.next();
                let next_pattern_token = pattern
                    .peek()
@@ -382,7 +475,7 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
                                if Some(first_token.to_string()) == next_pattern_token {
                                    if let Some(SyntaxElement::Node(p)) = pattern.next() {
                                        // We have a subtree that starts with the next token in our pattern.
-                                        self.attempt_match_token_tree(match_inputs, &p, &n)?;
+                                        self.attempt_match_token_tree(phase, &p, &n)?;
                                        break;
                                    }
                                }
@@ -391,7 +484,7 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
                    };
                    last_matched_token = next;
                }
-                if let Some(match_out) = &mut self.match_out {
+                if let Phase::Second(match_out) = phase {
                    match_out.placeholder_values.insert(
                        Var(placeholder.ident.to_string()),
                        PlaceholderMatch::from_range(FileRange {
@@ -407,11 +500,11 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
            // Match literal (non-placeholder) tokens.
            match child {
                SyntaxElement::Token(token) => {
-                    self.attempt_match_token(&mut pattern, &token)?;
+                    self.attempt_match_token(phase, &mut pattern, &token)?;
                }
                SyntaxElement::Node(node) => match pattern.next() {
                    Some(SyntaxElement::Node(p)) => {
-                        self.attempt_match_token_tree(match_inputs, &p, &node)?;
+                        self.attempt_match_token_tree(phase, &p, &node)?;
                    }
                    Some(SyntaxElement::Token(p)) => fail_match!(
                        "Pattern has token '{}', code has subtree '{}'",
@@ -428,6 +521,65 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
        Ok(())
    }
+    fn attempt_match_ufcs(
+        &self,
+        phase: &mut Phase,
+        pattern: &ast::CallExpr,
+        code: &ast::MethodCallExpr,
+        pattern_function: hir::Function,
+    ) -> Result<(), MatchFailed> {
+        use ast::ArgListOwner;
+        let code_resolved_function = self
+            .sema
+            .resolve_method_call(code)
+            .ok_or_else(|| match_error!("Failed to resolve method call"))?;
+        if pattern_function != code_resolved_function {
+            fail_match!("Method call resolved to a different function");
+        }
+        // Check arguments.
+        let mut pattern_args = pattern
+            .arg_list()
+            .ok_or_else(|| match_error!("Pattern function call has no args"))?
+            .args();
+        self.attempt_match_opt(phase, pattern_args.next(), code.expr())?;
+        let mut code_args =
+            code.arg_list().ok_or_else(|| match_error!("Code method call has no args"))?.args();
+        loop {
+            match (pattern_args.next(), code_args.next()) {
+                (None, None) => return Ok(()),
+                (p, c) => self.attempt_match_opt(phase, p, c)?,
+            }
+        }
+    }
+    fn get_placeholder(&self, element: &SyntaxElement) -> Option<&Placeholder> {
+        only_ident(element.clone()).and_then(|ident| self.rule.get_placeholder(&ident))
+    }
+}
+impl Match {
+    fn render_template_paths(
+        &mut self,
+        template: &ResolvedPattern,
+        sema: &Semantics<ra_ide_db::RootDatabase>,
+    ) -> Result<(), MatchFailed> {
+        let module = sema
+            .scope(&self.matched_node)
+            .module()
+            .ok_or_else(|| match_error!("Matched node isn't in a module"))?;
+        for (path, resolved_path) in &template.resolved_paths {
+            if let hir::PathResolution::Def(module_def) = resolved_path.resolution {
+                let mod_path = module.find_use_path(sema.db, module_def).ok_or_else(|| {
+                    match_error!("Failed to render template path `{}` at match location")
+                })?;
+                self.rendered_template_paths.insert(path.clone(), mod_path);
+            }
+        }
+        Ok(())
+    }
+}
+impl Phase<'_> {
    fn next_non_trivial(&mut self, code_it: &mut SyntaxElementChildren) -> Option<SyntaxElement> {
        loop {
            let c = code_it.next();
@@ -443,7 +595,7 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
    fn record_ignored_comments(&mut self, token: &SyntaxToken) {
        if token.kind() == SyntaxKind::COMMENT {
-            if let Some(match_out) = &mut self.match_out {
+            if let Phase::Second(match_out) = self {
                if let Some(comment) = ast::Comment::cast(token.clone()) {
                    match_out.ignored_comments.push(comment);
                }
@@ -452,13 +604,6 @@ impl<'db, 'sema> MatchState<'db, 'sema> {
    }
 }
-impl MatchInputs<'_> {
-    fn get_placeholder(&self, element: &SyntaxElement) -> Option<&Placeholder> {
-        only_ident(element.clone())
-            .and_then(|ident| self.ssr_pattern.placeholders_by_stand_in.get(ident.text()))
-    }
-}
 fn is_closing_token(kind: SyntaxKind) -> bool {
    kind == SyntaxKind::R_PAREN || kind == SyntaxKind::R_CURLY || kind == SyntaxKind::R_BRACK
 }
@@ -495,25 +640,18 @@ impl PlaceholderMatch {
    }
 }
-impl SsrPattern {
+impl NodeKind {
-    pub(crate) fn tree_for_kind(&self, kind: SyntaxKind) -> Result<&SyntaxNode, MatchFailed> {
+    fn matches(&self, node: &SyntaxNode) -> Result<(), MatchFailed> {
-        let (tree, kind_name) = if ast::Expr::can_cast(kind) {
+        let ok = match self {
-            (&self.expr, "expression")
+            Self::Literal => {
-        } else if ast::TypeRef::can_cast(kind) {
+                mark::hit!(literal_constraint);
-            (&self.type_ref, "type reference")
+                ast::Literal::can_cast(node.kind())
-        } else if ast::ModuleItem::can_cast(kind) {
+            }
-            (&self.item, "item")
-        } else if ast::Path::can_cast(kind) {
-            (&self.path, "path")
-        } else if ast::Pat::can_cast(kind) {
-            (&self.pattern, "pattern")
-        } else {
-            fail_match!("Matching nodes of kind {:?} is not supported", kind);
        };
-        match tree {
+        if !ok {
-            Some(tree) => Ok(tree),
+            fail_match!("Code '{}' isn't of kind {:?}", node.text(), self);
-            None => fail_match!("Pattern cannot be parsed as a {}", kind_name),
        }
+        Ok(())
    }
 }
@@ -561,18 +699,17 @@ impl PatternIterator {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::MatchFinder;
+    use crate::{MatchFinder, SsrRule};
    #[test]
    fn parse_match_replace() {
        let rule: SsrRule = "foo($x) ==>> bar($x)".parse().unwrap();
-        let input = "fn main() { foo(1+2); }";
+        let input = "fn foo() {} fn bar() {} fn main() { foo(1+2); }";
-        use ra_db::fixture::WithFixture;
+        let (db, position, selections) = crate::tests::single_file(input);
-        let (db, file_id) = ra_ide_db::RootDatabase::with_single_file(input);
+        let mut match_finder = MatchFinder::in_context(&db, position, selections);
-        let mut match_finder = MatchFinder::new(&db);
+        match_finder.add_rule(rule).unwrap();
-        match_finder.add_rule(rule);
+        let matches = match_finder.matches();
-        let matches = match_finder.find_matches_in_file(file_id);
        assert_eq!(matches.matches.len(), 1);
        assert_eq!(matches.matches[0].matched_node.text(), "foo(1+2)");
        assert_eq!(matches.matches[0].placeholder_values.len(), 1);
@@ -585,9 +722,11 @@ mod tests {
            "1+2"
        );
-        let edit = crate::replacing::matches_to_edit(&matches, input);
+        let edits = match_finder.edits();
+        assert_eq!(edits.len(), 1);
+        let edit = &edits[0];
        let mut after = input.to_string();
-        edit.apply(&mut after);
+        edit.edit.apply(&mut after);
-        assert_eq!(after, "fn main() { bar(1+2); }");
+        assert_eq!(after, "fn foo() {} fn bar() {} fn main() { bar(1+2); }");
    }
 }
diff --git a/crates/ra_ssr/src/nester.rs b/crates/ra_ssr/src/nester.rs
new file mode 100644
index 000000000..b3e20579b
--- /dev/null
+++ b/crates/ra_ssr/src/nester.rs
@@ -0,0 +1,98 @@
+//! Converts a flat collection of matches into a nested form suitable for replacement. When there
+//! are multiple matches for a node, or that overlap, priority is given to the earlier rule. Nested
+//! matches are only permitted if the inner match is contained entirely within a placeholder of an
+//! outer match.
+//!
+//! For example, if our search pattern is `foo(foo($a))` and the code had `foo(foo(foo(foo(42))))`,
+//! then we'll get 3 matches, however only the outermost and innermost matches can be accepted. The
+//! middle match would take the second `foo` from the outer match.
+use crate::{Match, SsrMatches};
+use ra_syntax::SyntaxNode;
+use rustc_hash::FxHashMap;
+pub(crate) fn nest_and_remove_collisions(
+    mut matches: Vec<Match>,
+    sema: &hir::Semantics<ra_ide_db::RootDatabase>,
+) -> SsrMatches {
+    // We sort the matches by depth then by rule index. Sorting by depth means that by the time we
+    // see a match, any parent matches or conflicting matches will have already been seen. Sorting
+    // by rule_index means that if there are two matches for the same node, the rule added first
+    // will take precedence.
+    matches.sort_by(|a, b| a.depth.cmp(&b.depth).then_with(|| a.rule_index.cmp(&b.rule_index)));
+    let mut collector = MatchCollector::default();
+    for m in matches {
+        collector.add_match(m, sema);
+    }
+    collector.into()
+}
+#[derive(Default)]
+struct MatchCollector {
+    matches_by_node: FxHashMap<SyntaxNode, Match>,
+}
+impl MatchCollector {
+    /// Attempts to add `m` to matches. If it conflicts with an existing match, it is discarded. If
+    /// it is entirely within the a placeholder of an existing match, then it is added as a child
+    /// match of the existing match.
+    fn add_match(&mut self, m: Match, sema: &hir::Semantics<ra_ide_db::RootDatabase>) {
+        let matched_node = m.matched_node.clone();
+        if let Some(existing) = self.matches_by_node.get_mut(&matched_node) {
+            try_add_sub_match(m, existing, sema);
+            return;
+        }
+        for ancestor in sema.ancestors_with_macros(m.matched_node.clone()) {
+            if let Some(existing) = self.matches_by_node.get_mut(&ancestor) {
+                try_add_sub_match(m, existing, sema);
+                return;
+            }
+        }
+        self.matches_by_node.insert(matched_node, m);
+    }
+}
+/// Attempts to add `m` as a sub-match of `existing`.
+fn try_add_sub_match(
+    m: Match,
+    existing: &mut Match,
+    sema: &hir::Semantics<ra_ide_db::RootDatabase>,
+) {
+    for p in existing.placeholder_values.values_mut() {
+        // Note, no need to check if p.range.file is equal to m.range.file, since we
+        // already know we're within `existing`.
+        if p.range.range.contains_range(m.range.range) {
+            // Convert the inner matches in `p` into a temporary MatchCollector. When
+            // we're done, we then convert it back into an SsrMatches. If we expected
+            // lots of inner matches, it might be worthwhile keeping a MatchCollector
+            // around for each placeholder match. However we expect most placeholder
+            // will have 0 and a few will have 1. More than that should hopefully be
+            // exceptional.
+            let mut collector = MatchCollector::default();
+            for m in std::mem::replace(&mut p.inner_matches.matches, Vec::new()) {
+                collector.matches_by_node.insert(m.matched_node.clone(), m);
+            }
+            collector.add_match(m, sema);
+            p.inner_matches = collector.into();
+            break;
+        }
+    }
+}
+impl From<MatchCollector> for SsrMatches {
+    fn from(mut match_collector: MatchCollector) -> Self {
+        let mut matches = SsrMatches::default();
+        for (_, m) in match_collector.matches_by_node.drain() {
+            matches.matches.push(m);
+        }
+        matches.matches.sort_by(|a, b| {
+            // Order matches by file_id then by start range. This should be sufficient since ranges
+            // shouldn't be overlapping.
+            a.range
+                .file_id
+                .cmp(&b.range.file_id)
+                .then_with(|| a.range.range.start().cmp(&b.range.range.start()))
+        });
+        matches
+    }
+}
diff --git a/crates/ra_ssr/src/parsing.rs b/crates/ra_ssr/src/parsing.rs
index 1ae166d19..78e03f394 100644
--- a/crates/ra_ssr/src/parsing.rs
+++ b/crates/ra_ssr/src/parsing.rs
@@ -5,24 +5,22 @@
 //! search patterns, we go further and parse the pattern as each kind of thing that we can match.
 //! e.g. expressions, type references etc.
+use crate::errors::bail;
 use crate::{SsrError, SsrPattern, SsrRule};
-use ra_syntax::{ast, AstNode, SmolStr, SyntaxKind};
+use ra_syntax::{ast, AstNode, SmolStr, SyntaxKind, SyntaxNode, T};
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::str::FromStr;
+use test_utils::mark;
-/// Returns from the current function with an error, supplied by arguments as for format!
+#[derive(Debug)]
-macro_rules! bail {
+pub(crate) struct ParsedRule {
-    ($e:expr) => {return Err($crate::SsrError::new($e))};
+    pub(crate) placeholders_by_stand_in: FxHashMap<SmolStr, Placeholder>,
-    ($fmt:expr, $($arg:tt)+) => {return Err($crate::SsrError::new(format!($fmt, $($arg)+)))}
+    pub(crate) pattern: SyntaxNode,
-}
+    pub(crate) template: Option<SyntaxNode>,
-#[derive(Clone, Debug)]
-pub(crate) struct SsrTemplate {
-    pub(crate) tokens: Vec<PatternElement>,
 }
 #[derive(Debug)]
-pub(crate) struct RawSearchPattern {
+pub(crate) struct RawPattern {
    tokens: Vec<PatternElement>,
 }
@@ -39,6 +37,18 @@ pub(crate) struct Placeholder {
    pub(crate) ident: SmolStr,
    /// A unique name used in place of this placeholder when we parse the pattern as Rust code.
    stand_in_name: String,
+    pub(crate) constraints: Vec<Constraint>,
+}
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) enum Constraint {
+    Kind(NodeKind),
+    Not(Box<Constraint>),
+}
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) enum NodeKind {
+    Literal,
 }
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -47,6 +57,78 @@ pub(crate) struct Token {
    pub(crate) text: SmolStr,
 }
+impl ParsedRule {
+    fn new(
+        pattern: &RawPattern,
+        template: Option<&RawPattern>,
+    ) -> Result<Vec<ParsedRule>, SsrError> {
+        let raw_pattern = pattern.as_rust_code();
+        let raw_template = template.map(|t| t.as_rust_code());
+        let raw_template = raw_template.as_ref().map(|s| s.as_str());
+        let mut builder = RuleBuilder {
+            placeholders_by_stand_in: pattern.placeholders_by_stand_in(),
+            rules: Vec::new(),
+        };
+        builder.try_add(ast::Expr::parse(&raw_pattern), raw_template.map(ast::Expr::parse));
+        builder.try_add(ast::TypeRef::parse(&raw_pattern), raw_template.map(ast::TypeRef::parse));
+        builder.try_add(ast::Item::parse(&raw_pattern), raw_template.map(ast::Item::parse));
+        builder.try_add(ast::Path::parse(&raw_pattern), raw_template.map(ast::Path::parse));
+        builder.try_add(ast::Pat::parse(&raw_pattern), raw_template.map(ast::Pat::parse));
+        builder.build()
+    }
+}
+struct RuleBuilder {
+    placeholders_by_stand_in: FxHashMap<SmolStr, Placeholder>,
+    rules: Vec<ParsedRule>,
+}
+impl RuleBuilder {
+    fn try_add<T: AstNode>(&mut self, pattern: Result<T, ()>, template: Option<Result<T, ()>>) {
+        match (pattern, template) {
+            (Ok(pattern), Some(Ok(template))) => self.rules.push(ParsedRule {
+                placeholders_by_stand_in: self.placeholders_by_stand_in.clone(),
+                pattern: pattern.syntax().clone(),
+                template: Some(template.syntax().clone()),
+            }),
+            (Ok(pattern), None) => self.rules.push(ParsedRule {
+                placeholders_by_stand_in: self.placeholders_by_stand_in.clone(),
+                pattern: pattern.syntax().clone(),
+                template: None,
+            }),
+            _ => {}
+        }
+    }
+    fn build(mut self) -> Result<Vec<ParsedRule>, SsrError> {
+        if self.rules.is_empty() {
+            bail!("Not a valid Rust expression, type, item, path or pattern");
+        }
+        // If any rules contain paths, then we reject any rules that don't contain paths. Allowing a
+        // mix leads to strange semantics, since the path-based rules only match things where the
+        // path refers to semantically the same thing, whereas the non-path-based rules could match
+        // anything. Specifically, if we have a rule like `foo ==>> bar` we only want to match the
+        // `foo` that is in the current scope, not any `foo`. However "foo" can be parsed as a
+        // pattern (BIND_PAT -> NAME -> IDENT). Allowing such a rule through would result in
+        // renaming everything called `foo` to `bar`. It'd also be slow, since without a path, we'd
+        // have to use the slow-scan search mechanism.
+        if self.rules.iter().any(|rule| contains_path(&rule.pattern)) {
+            let old_len = self.rules.len();
+            self.rules.retain(|rule| contains_path(&rule.pattern));
+            if self.rules.len() < old_len {
+                mark::hit!(pattern_is_a_single_segment_path);
+            }
+        }
+        Ok(self.rules)
+    }
+}
+/// Returns whether there are any paths in `node`.
+fn contains_path(node: &SyntaxNode) -> bool {
+    node.kind() == SyntaxKind::PATH
+        || node.descendants().any(|node| node.kind() == SyntaxKind::PATH)
+}
 impl FromStr for SsrRule {
    type Err = SsrError;
@@ -55,27 +137,30 @@ impl FromStr for SsrRule {
        let pattern = it.next().expect("at least empty string").trim();
        let template = it
            .next()
-            .ok_or_else(|| SsrError("Cannot find delemiter `==>>`".into()))?
+            .ok_or_else(|| SsrError("Cannot find delimiter `==>>`".into()))?
            .trim()
            .to_string();
        if it.next().is_some() {
            return Err(SsrError("More than one delimiter found".into()));
        }
-        let rule = SsrRule { pattern: pattern.parse()?, template: template.parse()? };
+        let raw_pattern = pattern.parse()?;
+        let raw_template = template.parse()?;
+        let parsed_rules = ParsedRule::new(&raw_pattern, Some(&raw_template))?;
+        let rule = SsrRule { pattern: raw_pattern, template: raw_template, parsed_rules };
        validate_rule(&rule)?;
        Ok(rule)
    }
 }
-impl FromStr for RawSearchPattern {
+impl FromStr for RawPattern {
    type Err = SsrError;
-    fn from_str(pattern_str: &str) -> Result<RawSearchPattern, SsrError> {
+    fn from_str(pattern_str: &str) -> Result<RawPattern, SsrError> {
-        Ok(RawSearchPattern { tokens: parse_pattern(pattern_str)? })
+        Ok(RawPattern { tokens: parse_pattern(pattern_str)? })
    }
 }
-impl RawSearchPattern {
+impl RawPattern {
    /// Returns this search pattern as Rust source code that we can feed to the Rust parser.
    fn as_rust_code(&self) -> String {
        let mut res = String::new();
@@ -88,7 +173,7 @@ impl RawSearchPattern {
        res
    }
-    fn placeholders_by_stand_in(&self) -> FxHashMap<SmolStr, Placeholder> {
+    pub(crate) fn placeholders_by_stand_in(&self) -> FxHashMap<SmolStr, Placeholder> {
        let mut res = FxHashMap::default();
        for t in &self.tokens {
            if let PatternElement::Placeholder(placeholder) = t {
@@ -103,41 +188,9 @@ impl FromStr for SsrPattern {
    type Err = SsrError;
    fn from_str(pattern_str: &str) -> Result<SsrPattern, SsrError> {
-        let raw: RawSearchPattern = pattern_str.parse()?;
+        let raw_pattern = pattern_str.parse()?;
-        let raw_str = raw.as_rust_code();
+        let parsed_rules = ParsedRule::new(&raw_pattern, None)?;
-        let res = SsrPattern {
+        Ok(SsrPattern { raw: raw_pattern, parsed_rules })
-            expr: ast::Expr::parse(&raw_str).ok().map(|n| n.syntax().clone()),
-            type_ref: ast::TypeRef::parse(&raw_str).ok().map(|n| n.syntax().clone()),
-            item: ast::ModuleItem::parse(&raw_str).ok().map(|n| n.syntax().clone()),
-            path: ast::Path::parse(&raw_str).ok().map(|n| n.syntax().clone()),
-            pattern: ast::Pat::parse(&raw_str).ok().map(|n| n.syntax().clone()),
-            placeholders_by_stand_in: raw.placeholders_by_stand_in(),
-            raw,
-        };
-        if res.expr.is_none()
-            && res.type_ref.is_none()
-            && res.item.is_none()
-            && res.path.is_none()
-            && res.pattern.is_none()
-        {
-            bail!("Pattern is not a valid Rust expression, type, item, path or pattern");
-        }
-        Ok(res)
-    }
-}
-impl FromStr for SsrTemplate {
-    type Err = SsrError;
-    fn from_str(pattern_str: &str) -> Result<SsrTemplate, SsrError> {
-        let tokens = parse_pattern(pattern_str)?;
-        // Validate that the template is a valid fragment of Rust code. We reuse the validation
-        // logic for search patterns since the only thing that differs is the error message.
-        if SsrPattern::from_str(pattern_str).is_err() {
-            bail!("Replacement is not a valid Rust expression, type, item, path or pattern");
-        }
-        // Our actual template needs to preserve whitespace, so we can't reuse `tokens`.
-        Ok(SsrTemplate { tokens })
    }
 }
@@ -149,7 +202,7 @@ fn parse_pattern(pattern_str: &str) -> Result<Vec<PatternElement>, SsrError> {
    let mut placeholder_names = FxHashSet::default();
    let mut tokens = tokenize(pattern_str)?.into_iter();
    while let Some(token) = tokens.next() {
-        if token.kind == SyntaxKind::DOLLAR {
+        if token.kind == T![$] {
            let placeholder = parse_placeholder(&mut tokens)?;
            if !placeholder_names.insert(placeholder.ident.clone()) {
                bail!("Name `{}` repeats more than once", placeholder.ident);
@@ -166,7 +219,7 @@ fn parse_pattern(pattern_str: &str) -> Result<Vec<PatternElement>, SsrError> {
 /// pattern didn't define.
 fn validate_rule(rule: &SsrRule) -> Result<(), SsrError> {
    let mut defined_placeholders = FxHashSet::default();
-    for p in &rule.pattern.raw.tokens {
+    for p in &rule.pattern.tokens {
        if let PatternElement::Placeholder(placeholder) = p {
            defined_placeholders.insert(&placeholder.ident);
        }
@@ -177,6 +230,9 @@ fn validate_rule(rule: &SsrRule) -> Result<(), SsrError> {
            if !defined_placeholders.contains(&placeholder.ident) {
                undefined.push(format!("${}", placeholder.ident));
            }
+            if !placeholder.constraints.is_empty() {
+                bail!("Replacement placeholders cannot have constraints");
+            }
        }
    }
    if !undefined.is_empty() {
@@ -205,29 +261,90 @@ fn tokenize(source: &str) -> Result<Vec<Token>, SsrError> {
 fn parse_placeholder(tokens: &mut std::vec::IntoIter<Token>) -> Result<Placeholder, SsrError> {
    let mut name = None;
+    let mut constraints = Vec::new();
    if let Some(token) = tokens.next() {
        match token.kind {
            SyntaxKind::IDENT => {
                name = Some(token.text);
            }
+            T!['{'] => {
+                let token =
+                    tokens.next().ok_or_else(|| SsrError::new("Unexpected end of placeholder"))?;
+                if token.kind == SyntaxKind::IDENT {
+                    name = Some(token.text);
+                }
+                loop {
+                    let token = tokens
+                        .next()
+                        .ok_or_else(|| SsrError::new("Placeholder is missing closing brace '}'"))?;
+                    match token.kind {
+                        T![:] => {
+                            constraints.push(parse_constraint(tokens)?);
+                        }
+                        T!['}'] => break,
+                        _ => bail!("Unexpected token while parsing placeholder: '{}'", token.text),
+                    }
+                }
+            }
            _ => {
-                bail!("Placeholders should be $name");
+                bail!("Placeholders should either be $name or ${{name:constraints}}");
            }
        }
    }
    let name = name.ok_or_else(|| SsrError::new("Placeholder ($) with no name"))?;
-    Ok(Placeholder::new(name))
+    Ok(Placeholder::new(name, constraints))
 }
-impl Placeholder {
+fn parse_constraint(tokens: &mut std::vec::IntoIter<Token>) -> Result<Constraint, SsrError> {
-    fn new(name: SmolStr) -> Self {
+    let constraint_type = tokens
-        Self { stand_in_name: format!("__placeholder_{}", name), ident: name }
+        .next()
+        .ok_or_else(|| SsrError::new("Found end of placeholder while looking for a constraint"))?
+        .text
+        .to_string();
+    match constraint_type.as_str() {
+        "kind" => {
+            expect_token(tokens, "(")?;
+            let t = tokens.next().ok_or_else(|| {
+                SsrError::new("Unexpected end of constraint while looking for kind")
+            })?;
+            if t.kind != SyntaxKind::IDENT {
+                bail!("Expected ident, found {:?} while parsing kind constraint", t.kind);
+            }
+            expect_token(tokens, ")")?;
+            Ok(Constraint::Kind(NodeKind::from(&t.text)?))
+        }
+        "not" => {
+            expect_token(tokens, "(")?;
+            let sub = parse_constraint(tokens)?;
+            expect_token(tokens, ")")?;
+            Ok(Constraint::Not(Box::new(sub)))
+        }
+        x => bail!("Unsupported constraint type '{}'", x),
+    }
+}
+fn expect_token(tokens: &mut std::vec::IntoIter<Token>, expected: &str) -> Result<(), SsrError> {
+    if let Some(t) = tokens.next() {
+        if t.text == expected {
+            return Ok(());
+        }
+        bail!("Expected {} found {}", expected, t.text);
+    }
+    bail!("Expected {} found end of stream", expected);
+}
+impl NodeKind {
+    fn from(name: &SmolStr) -> Result<NodeKind, SsrError> {
+        Ok(match name.as_str() {
+            "literal" => NodeKind::Literal,
+            _ => bail!("Unknown node kind '{}'", name),
+        })
    }
 }
-impl SsrError {
+impl Placeholder {
-    fn new(message: impl Into<String>) -> SsrError {
+    fn new(name: SmolStr, constraints: Vec<Constraint>) -> Self {
-        SsrError(message.into())
+        Self { stand_in_name: format!("__placeholder_{}", name), constraints, ident: name }
    }
 }
@@ -241,31 +358,31 @@ mod tests {
            PatternElement::Token(Token { kind, text: SmolStr::new(text) })
        }
        fn placeholder(name: &str) -> PatternElement {
-            PatternElement::Placeholder(Placeholder::new(SmolStr::new(name)))
+            PatternElement::Placeholder(Placeholder::new(SmolStr::new(name), Vec::new()))
        }
        let result: SsrRule = "foo($a, $b) ==>> bar($b, $a)".parse().unwrap();
        assert_eq!(
-            result.pattern.raw.tokens,
+            result.pattern.tokens,
            vec![
                token(SyntaxKind::IDENT, "foo"),
-                token(SyntaxKind::L_PAREN, "("),
+                token(T!['('], "("),
                placeholder("a"),
-                token(SyntaxKind::COMMA, ","),
+                token(T![,], ","),
                token(SyntaxKind::WHITESPACE, " "),
                placeholder("b"),
-                token(SyntaxKind::R_PAREN, ")"),
+                token(T![')'], ")"),
            ]
        );
        assert_eq!(
            result.template.tokens,
            vec![
                token(SyntaxKind::IDENT, "bar"),
-                token(SyntaxKind::L_PAREN, "("),
+                token(T!['('], "("),
                placeholder("b"),
-                token(SyntaxKind::COMMA, ","),
+                token(T![,], ","),
                token(SyntaxKind::WHITESPACE, " "),
                placeholder("a"),
-                token(SyntaxKind::R_PAREN, ")"),
+                token(T![')'], ")"),
            ]
        );
    }
diff --git a/crates/ra_ssr/src/replacing.rs b/crates/ra_ssr/src/replacing.rs
index 70ce1c185..0943244ff 100644
--- a/crates/ra_ssr/src/replacing.rs
+++ b/crates/ra_ssr/src/replacing.rs
@@ -1,64 +1,194 @@
 //! Code for applying replacement templates for matches that have previously been found.
 use crate::matching::Var;
-use crate::parsing::PatternElement;
+use crate::{resolving::ResolvedRule, Match, SsrMatches};
-use crate::{Match, SsrMatches};
+use ra_syntax::ast::{self, AstToken};
-use ra_syntax::ast::AstToken;
+use ra_syntax::{SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize};
-use ra_syntax::TextSize;
 use ra_text_edit::TextEdit;
+use rustc_hash::{FxHashMap, FxHashSet};
 /// Returns a text edit that will replace each match in `matches` with its corresponding replacement
 /// template. Placeholders in the template will have been substituted with whatever they matched to
 /// in the original code.
-pub(crate) fn matches_to_edit(matches: &SsrMatches, file_src: &str) -> TextEdit {
+pub(crate) fn matches_to_edit(
-    matches_to_edit_at_offset(matches, file_src, 0.into())
+    matches: &SsrMatches,
+    file_src: &str,
+    rules: &[ResolvedRule],
+) -> TextEdit {
+    matches_to_edit_at_offset(matches, file_src, 0.into(), rules)
 }
 fn matches_to_edit_at_offset(
    matches: &SsrMatches,
    file_src: &str,
    relative_start: TextSize,
+    rules: &[ResolvedRule],
 ) -> TextEdit {
    let mut edit_builder = ra_text_edit::TextEditBuilder::default();
    for m in &matches.matches {
-        edit_builder
+        edit_builder.replace(
-            .replace(m.range.checked_sub(relative_start).unwrap(), render_replace(m, file_src));
+            m.range.range.checked_sub(relative_start).unwrap(),
+            render_replace(m, file_src, rules),
+        );
    }
    edit_builder.finish()
 }
-fn render_replace(match_info: &Match, file_src: &str) -> String {
+struct ReplacementRenderer<'a> {
-    let mut out = String::new();
+    match_info: &'a Match,
-    for r in &match_info.template.tokens {
+    file_src: &'a str,
-        match r {
+    rules: &'a [ResolvedRule],
-            PatternElement::Token(t) => out.push_str(t.text.as_str()),
+    rule: &'a ResolvedRule,
-            PatternElement::Placeholder(p) => {
+    out: String,
-                if let Some(placeholder_value) =
+    // Map from a range within `out` to a token in `template` that represents a placeholder. This is
-                    match_info.placeholder_values.get(&Var(p.ident.to_string()))
+    // used to validate that the generated source code doesn't split any placeholder expansions (see
-                {
+    // below).
-                    let range = &placeholder_value.range.range;
+    placeholder_tokens_by_range: FxHashMap<TextRange, SyntaxToken>,
-                    let mut matched_text =
+    // Which placeholder tokens need to be wrapped in parenthesis in order to ensure that when `out`
-                        file_src[usize::from(range.start())..usize::from(range.end())].to_owned();
+    // is parsed, placeholders don't get split. e.g. if a template of `$a.to_string()` results in `1
-                    let edit = matches_to_edit_at_offset(
+    // + 2.to_string()` then the placeholder value `1 + 2` was split and needs parenthesis.
-                        &placeholder_value.inner_matches,
+    placeholder_tokens_requiring_parenthesis: FxHashSet<SyntaxToken>,
-                        file_src,
+}
-                        range.start(),
-                    );
+fn render_replace(match_info: &Match, file_src: &str, rules: &[ResolvedRule]) -> String {
-                    edit.apply(&mut matched_text);
+    let rule = &rules[match_info.rule_index];
-                    out.push_str(&matched_text);
+    let template = rule
-                } else {
+        .template
-                    // We validated that all placeholder references were valid before we
+        .as_ref()
-                    // started, so this shouldn't happen.
+        .expect("You called MatchFinder::edits after calling MatchFinder::add_search_pattern");
-                    panic!(
+    let mut renderer = ReplacementRenderer {
-                        "Internal error: replacement referenced unknown placeholder {}",
+        match_info,
-                        p.ident
+        file_src,
-                    );
+        rules,
+        rule,
+        out: String::new(),
+        placeholder_tokens_requiring_parenthesis: FxHashSet::default(),
+        placeholder_tokens_by_range: FxHashMap::default(),
+    };
+    renderer.render_node(&template.node);
+    renderer.maybe_rerender_with_extra_parenthesis(&template.node);
+    for comment in &match_info.ignored_comments {
+        renderer.out.push_str(&comment.syntax().to_string());
+    }
+    renderer.out
+}
+impl ReplacementRenderer<'_> {
+    fn render_node_children(&mut self, node: &SyntaxNode) {
+        for node_or_token in node.children_with_tokens() {
+            self.render_node_or_token(&node_or_token);
+        }
+    }
+    fn render_node_or_token(&mut self, node_or_token: &SyntaxElement) {
+        match node_or_token {
+            SyntaxElement::Token(token) => {
+                self.render_token(&token);
+            }
+            SyntaxElement::Node(child_node) => {
+                self.render_node(&child_node);
+            }
+        }
+    }
+    fn render_node(&mut self, node: &SyntaxNode) {
+        use ra_syntax::ast::AstNode;
+        if let Some(mod_path) = self.match_info.rendered_template_paths.get(&node) {
+            self.out.push_str(&mod_path.to_string());
+            // Emit everything except for the segment's name-ref, since we already effectively
+            // emitted that as part of `mod_path`.
+            if let Some(path) = ast::Path::cast(node.clone()) {
+                if let Some(segment) = path.segment() {
+                    for node_or_token in segment.syntax().children_with_tokens() {
+                        if node_or_token.kind() != SyntaxKind::NAME_REF {
+                            self.render_node_or_token(&node_or_token);
+                        }
+                    }
                }
            }
+        } else {
+            self.render_node_children(&node);
        }
    }
-    for comment in &match_info.ignored_comments {
-        out.push_str(&comment.syntax().to_string());
+    fn render_token(&mut self, token: &SyntaxToken) {
+        if let Some(placeholder) = self.rule.get_placeholder(&token) {
+            if let Some(placeholder_value) =
+                self.match_info.placeholder_values.get(&Var(placeholder.ident.to_string()))
+            {
+                let range = &placeholder_value.range.range;
+                let mut matched_text =
+                    self.file_src[usize::from(range.start())..usize::from(range.end())].to_owned();
+                let edit = matches_to_edit_at_offset(
+                    &placeholder_value.inner_matches,
+                    self.file_src,
+                    range.start(),
+                    self.rules,
+                );
+                let needs_parenthesis =
+                    self.placeholder_tokens_requiring_parenthesis.contains(token);
+                edit.apply(&mut matched_text);
+                if needs_parenthesis {
+                    self.out.push('(');
+                }
+                self.placeholder_tokens_by_range.insert(
+                    TextRange::new(
+                        TextSize::of(&self.out),
+                        TextSize::of(&self.out) + TextSize::of(&matched_text),
+                    ),
+                    token.clone(),
+                );
+                self.out.push_str(&matched_text);
+                if needs_parenthesis {
+                    self.out.push(')');
+                }
+            } else {
+                // We validated that all placeholder references were valid before we
+                // started, so this shouldn't happen.
+                panic!(
+                    "Internal error: replacement referenced unknown placeholder {}",
+                    placeholder.ident
+                );
+            }
+        } else {
+            self.out.push_str(token.text().as_str());
+        }
+    }
+    // Checks if the resulting code, when parsed doesn't split any placeholders due to different
+    // order of operations between the search pattern and the replacement template. If any do, then
+    // we rerender the template and wrap the problematic placeholders with parenthesis.
+    fn maybe_rerender_with_extra_parenthesis(&mut self, template: &SyntaxNode) {
+        if let Some(node) = parse_as_kind(&self.out, template.kind()) {
+            self.remove_node_ranges(node);
+            if self.placeholder_tokens_by_range.is_empty() {
+                return;
+            }
+            self.placeholder_tokens_requiring_parenthesis =
+                self.placeholder_tokens_by_range.values().cloned().collect();
+            self.out.clear();
+            self.render_node(template);
+        }
+    }
+    fn remove_node_ranges(&mut self, node: SyntaxNode) {
+        self.placeholder_tokens_by_range.remove(&node.text_range());
+        for child in node.children() {
+            self.remove_node_ranges(child);
+        }
+    }
+}
+fn parse_as_kind(code: &str, kind: SyntaxKind) -> Option<SyntaxNode> {
+    use ra_syntax::ast::AstNode;
+    if ast::Expr::can_cast(kind) {
+        if let Ok(expr) = ast::Expr::parse(code) {
+            return Some(expr.syntax().clone());
+        }
+    } else if ast::Item::can_cast(kind) {
+        if let Ok(item) = ast::Item::parse(code) {
+            return Some(item.syntax().clone());
+        }
    }
-    out
+    None
 }
diff --git a/crates/ra_ssr/src/resolving.rs b/crates/ra_ssr/src/resolving.rs
new file mode 100644
index 000000000..78d456546
--- /dev/null
+++ b/crates/ra_ssr/src/resolving.rs
@@ -0,0 +1,228 @@
+//! This module is responsible for resolving paths within rules.
+use crate::errors::error;
+use crate::{parsing, SsrError};
+use parsing::Placeholder;
+use ra_db::FilePosition;
+use ra_syntax::{ast, SmolStr, SyntaxKind, SyntaxNode, SyntaxToken};
+use rustc_hash::{FxHashMap, FxHashSet};
+use test_utils::mark;
+pub(crate) struct ResolutionScope<'db> {
+    scope: hir::SemanticsScope<'db>,
+    hygiene: hir::Hygiene,
+}
+pub(crate) struct ResolvedRule {
+    pub(crate) pattern: ResolvedPattern,
+    pub(crate) template: Option<ResolvedPattern>,
+    pub(crate) index: usize,
+}
+pub(crate) struct ResolvedPattern {
+    pub(crate) placeholders_by_stand_in: FxHashMap<SmolStr, parsing::Placeholder>,
+    pub(crate) node: SyntaxNode,
+    // Paths in `node` that we've resolved.
+    pub(crate) resolved_paths: FxHashMap<SyntaxNode, ResolvedPath>,
+    pub(crate) ufcs_function_calls: FxHashMap<SyntaxNode, hir::Function>,
+}
+pub(crate) struct ResolvedPath {
+    pub(crate) resolution: hir::PathResolution,
+    /// The depth of the ast::Path that was resolved within the pattern.
+    pub(crate) depth: u32,
+}
+impl ResolvedRule {
+    pub(crate) fn new(
+        rule: parsing::ParsedRule,
+        resolution_scope: &ResolutionScope,
+        index: usize,
+    ) -> Result<ResolvedRule, SsrError> {
+        let resolver =
+            Resolver { resolution_scope, placeholders_by_stand_in: rule.placeholders_by_stand_in };
+        let resolved_template = if let Some(template) = rule.template {
+            Some(resolver.resolve_pattern_tree(template)?)
+        } else {
+            None
+        };
+        Ok(ResolvedRule {
+            pattern: resolver.resolve_pattern_tree(rule.pattern)?,
+            template: resolved_template,
+            index,
+        })
+    }
+    pub(crate) fn get_placeholder(&self, token: &SyntaxToken) -> Option<&Placeholder> {
+        if token.kind() != SyntaxKind::IDENT {
+            return None;
+        }
+        self.pattern.placeholders_by_stand_in.get(token.text())
+    }
+}
+struct Resolver<'a, 'db> {
+    resolution_scope: &'a ResolutionScope<'db>,
+    placeholders_by_stand_in: FxHashMap<SmolStr, parsing::Placeholder>,
+}
+impl Resolver<'_, '_> {
+    fn resolve_pattern_tree(&self, pattern: SyntaxNode) -> Result<ResolvedPattern, SsrError> {
+        let mut resolved_paths = FxHashMap::default();
+        self.resolve(pattern.clone(), 0, &mut resolved_paths)?;
+        let ufcs_function_calls = resolved_paths
+            .iter()
+            .filter_map(|(path_node, resolved)| {
+                if let Some(grandparent) = path_node.parent().and_then(|parent| parent.parent()) {
+                    if grandparent.kind() == SyntaxKind::CALL_EXPR {
+                        if let hir::PathResolution::AssocItem(hir::AssocItem::Function(function)) =
+                            &resolved.resolution
+                        {
+                            return Some((grandparent, *function));
+                        }
+                    }
+                }
+                None
+            })
+            .collect();
+        Ok(ResolvedPattern {
+            node: pattern,
+            resolved_paths,
+            placeholders_by_stand_in: self.placeholders_by_stand_in.clone(),
+            ufcs_function_calls,
+        })
+    }
+    fn resolve(
+        &self,
+        node: SyntaxNode,
+        depth: u32,
+        resolved_paths: &mut FxHashMap<SyntaxNode, ResolvedPath>,
+    ) -> Result<(), SsrError> {
+        use ra_syntax::ast::AstNode;
+        if let Some(path) = ast::Path::cast(node.clone()) {
+            // Check if this is an appropriate place in the path to resolve. If the path is
+            // something like `a::B::<i32>::c` then we want to resolve `a::B`. If the path contains
+            // a placeholder. e.g. `a::$b::c` then we want to resolve `a`.
+            if !path_contains_type_arguments(path.qualifier())
+                && !self.path_contains_placeholder(&path)
+            {
+                let resolution = self
+                    .resolution_scope
+                    .resolve_path(&path)
+                    .ok_or_else(|| error!("Failed to resolve path `{}`", node.text()))?;
+                resolved_paths.insert(node, ResolvedPath { resolution, depth });
+                return Ok(());
+            }
+        }
+        for node in node.children() {
+            self.resolve(node, depth + 1, resolved_paths)?;
+        }
+        Ok(())
+    }
+    /// Returns whether `path` contains a placeholder, but ignores any placeholders within type
+    /// arguments.
+    fn path_contains_placeholder(&self, path: &ast::Path) -> bool {
+        if let Some(segment) = path.segment() {
+            if let Some(name_ref) = segment.name_ref() {
+                if self.placeholders_by_stand_in.contains_key(name_ref.text()) {
+                    return true;
+                }
+            }
+        }
+        if let Some(qualifier) = path.qualifier() {
+            return self.path_contains_placeholder(&qualifier);
+        }
+        false
+    }
+}
+impl<'db> ResolutionScope<'db> {
+    pub(crate) fn new(
+        sema: &hir::Semantics<'db, ra_ide_db::RootDatabase>,
+        resolve_context: FilePosition,
+    ) -> ResolutionScope<'db> {
+        use ra_syntax::ast::AstNode;
+        let file = sema.parse(resolve_context.file_id);
+        // Find a node at the requested position, falling back to the whole file.
+        let node = file
+            .syntax()
+            .token_at_offset(resolve_context.offset)
+            .left_biased()
+            .map(|token| token.parent())
+            .unwrap_or_else(|| file.syntax().clone());
+        let node = pick_node_for_resolution(node);
+        let scope = sema.scope(&node);
+        ResolutionScope {
+            scope,
+            hygiene: hir::Hygiene::new(sema.db, resolve_context.file_id.into()),
+        }
+    }
+    fn resolve_path(&self, path: &ast::Path) -> Option<hir::PathResolution> {
+        let hir_path = hir::Path::from_src(path.clone(), &self.hygiene)?;
+        // First try resolving the whole path. This will work for things like
+        // `std::collections::HashMap`, but will fail for things like
+        // `std::collections::HashMap::new`.
+        if let Some(resolution) = self.scope.resolve_hir_path(&hir_path) {
+            return Some(resolution);
+        }
+        // Resolution failed, try resolving the qualifier (e.g. `std::collections::HashMap` and if
+        // that succeeds, then iterate through the candidates on the resolved type with the provided
+        // name.
+        let resolved_qualifier = self.scope.resolve_hir_path_qualifier(&hir_path.qualifier()?)?;
+        if let hir::PathResolution::Def(hir::ModuleDef::Adt(adt)) = resolved_qualifier {
+            adt.ty(self.scope.db).iterate_path_candidates(
+                self.scope.db,
+                self.scope.module()?.krate(),
+                &FxHashSet::default(),
+                Some(hir_path.segments().last()?.name),
+                |_ty, assoc_item| Some(hir::PathResolution::AssocItem(assoc_item)),
+            )
+        } else {
+            None
+        }
+    }
+}
+/// Returns a suitable node for resolving paths in the current scope. If we create a scope based on
+/// a statement node, then we can't resolve local variables that were defined in the current scope
+/// (only in parent scopes). So we find another node, ideally a child of the statement where local
+/// variable resolution is permitted.
+fn pick_node_for_resolution(node: SyntaxNode) -> SyntaxNode {
+    match node.kind() {
+        SyntaxKind::EXPR_STMT => {
+            if let Some(n) = node.first_child() {
+                mark::hit!(cursor_after_semicolon);
+                return n;
+            }
+        }
+        SyntaxKind::LET_STMT | SyntaxKind::BIND_PAT => {
+            if let Some(next) = node.next_sibling() {
+                return pick_node_for_resolution(next);
+            }
+        }
+        SyntaxKind::NAME => {
+            if let Some(parent) = node.parent() {
+                return pick_node_for_resolution(parent);
+            }
+        }
+        _ => {}
+    }
+    node
+}
+/// Returns whether `path` or any of its qualifiers contains type arguments.
+fn path_contains_type_arguments(path: Option<ast::Path>) -> bool {
+    if let Some(path) = path {
+        if let Some(segment) = path.segment() {
+            if segment.type_arg_list().is_some() {
+                mark::hit!(type_arguments_within_path);
+                return true;
+            }
+        }
+        return path_contains_type_arguments(path.qualifier());
+    }
+    false
+}
diff --git a/crates/ra_ssr/src/search.rs b/crates/ra_ssr/src/search.rs
new file mode 100644
index 000000000..213dc494f
--- /dev/null
+++ b/crates/ra_ssr/src/search.rs
@@ -0,0 +1,273 @@
+//! Searching for matches.
+use crate::{
+    matching,
+    resolving::{ResolvedPath, ResolvedPattern, ResolvedRule},
+    Match, MatchFinder,
+};
+use ra_db::{FileId, FileRange};
+use ra_ide_db::{
+    defs::Definition,
+    search::{Reference, SearchScope},
+};
+use ra_syntax::{ast, AstNode, SyntaxKind, SyntaxNode};
+use rustc_hash::FxHashSet;
+use test_utils::mark;
+/// A cache for the results of find_usages. This is for when we have multiple patterns that have the
+/// same path. e.g. if the pattern was `foo::Bar` that can parse as a path, an expression, a type
+/// and as a pattern. In each, the usages of `foo::Bar` are the same and we'd like to avoid finding
+/// them more than once.
+#[derive(Default)]
+pub(crate) struct UsageCache {
+    usages: Vec<(Definition, Vec<Reference>)>,
+}
+impl<'db> MatchFinder<'db> {
+    /// Adds all matches for `rule` to `matches_out`. Matches may overlap in ways that make
+    /// replacement impossible, so further processing is required in order to properly nest matches
+    /// and remove overlapping matches. This is done in the `nesting` module.
+    pub(crate) fn find_matches_for_rule(
+        &self,
+        rule: &ResolvedRule,
+        usage_cache: &mut UsageCache,
+        matches_out: &mut Vec<Match>,
+    ) {
+        if pick_path_for_usages(&rule.pattern).is_none() {
+            self.slow_scan(rule, matches_out);
+            return;
+        }
+        self.find_matches_for_pattern_tree(rule, &rule.pattern, usage_cache, matches_out);
+    }
+    fn find_matches_for_pattern_tree(
+        &self,
+        rule: &ResolvedRule,
+        pattern: &ResolvedPattern,
+        usage_cache: &mut UsageCache,
+        matches_out: &mut Vec<Match>,
+    ) {
+        if let Some(resolved_path) = pick_path_for_usages(pattern) {
+            let definition: Definition = resolved_path.resolution.clone().into();
+            for reference in self.find_usages(usage_cache, definition) {
+                if let Some(node_to_match) = self.find_node_to_match(resolved_path, reference) {
+                    if !is_search_permitted_ancestors(&node_to_match) {
+                        mark::hit!(use_declaration_with_braces);
+                        continue;
+                    }
+                    self.try_add_match(rule, &node_to_match, &None, matches_out);
+                }
+            }
+        }
+    }
+    fn find_node_to_match(
+        &self,
+        resolved_path: &ResolvedPath,
+        reference: &Reference,
+    ) -> Option<SyntaxNode> {
+        let file = self.sema.parse(reference.file_range.file_id);
+        let depth = resolved_path.depth as usize;
+        let offset = reference.file_range.range.start();
+        if let Some(path) =
+            self.sema.find_node_at_offset_with_descend::<ast::Path>(file.syntax(), offset)
+        {
+            self.sema.ancestors_with_macros(path.syntax().clone()).skip(depth).next()
+        } else if let Some(path) =
+            self.sema.find_node_at_offset_with_descend::<ast::MethodCallExpr>(file.syntax(), offset)
+        {
+            // If the pattern contained a path and we found a reference to that path that wasn't
+            // itself a path, but was a method call, then we need to adjust how far up to try
+            // matching by how deep the path was within a CallExpr. The structure would have been
+            // CallExpr, PathExpr, Path - i.e. a depth offset of 2. We don't need to check if the
+            // path was part of a CallExpr because if it wasn't then all that will happen is we'll
+            // fail to match, which is the desired behavior.
+            const PATH_DEPTH_IN_CALL_EXPR: usize = 2;
+            if depth < PATH_DEPTH_IN_CALL_EXPR {
+                return None;
+            }
+            self.sema
+                .ancestors_with_macros(path.syntax().clone())
+                .skip(depth - PATH_DEPTH_IN_CALL_EXPR)
+                .next()
+        } else {
+            None
+        }
+    }
+    fn find_usages<'a>(
+        &self,
+        usage_cache: &'a mut UsageCache,
+        definition: Definition,
+    ) -> &'a [Reference] {
+        // Logically if a lookup succeeds we should just return it. Unfortunately returning it would
+        // extend the lifetime of the borrow, then we wouldn't be able to do the insertion on a
+        // cache miss. This is a limitation of NLL and is fixed with Polonius. For now we do two
+        // lookups in the case of a cache hit.
+        if usage_cache.find(&definition).is_none() {
+            let usages = definition.find_usages(&self.sema, Some(self.search_scope()));
+            usage_cache.usages.push((definition, usages));
+            return &usage_cache.usages.last().unwrap().1;
+        }
+        usage_cache.find(&definition).unwrap()
+    }
+    /// Returns the scope within which we want to search. We don't want un unrestricted search
+    /// scope, since we don't want to find references in external dependencies.
+    fn search_scope(&self) -> SearchScope {
+        // FIXME: We should ideally have a test that checks that we edit local roots and not library
+        // roots. This probably would require some changes to fixtures, since currently everything
+        // seems to get put into a single source root.
+        let mut files = Vec::new();
+        self.search_files_do(|file_id| {
+            files.push(file_id);
+        });
+        SearchScope::files(&files)
+    }
+    fn slow_scan(&self, rule: &ResolvedRule, matches_out: &mut Vec<Match>) {
+        self.search_files_do(|file_id| {
+            let file = self.sema.parse(file_id);
+            let code = file.syntax();
+            self.slow_scan_node(code, rule, &None, matches_out);
+        })
+    }
+    fn search_files_do(&self, mut callback: impl FnMut(FileId)) {
+        if self.restrict_ranges.is_empty() {
+            // Unrestricted search.
+            use ra_db::SourceDatabaseExt;
+            use ra_ide_db::symbol_index::SymbolsDatabase;
+            for &root in self.sema.db.local_roots().iter() {
+                let sr = self.sema.db.source_root(root);
+                for file_id in sr.iter() {
+                    callback(file_id);
+                }
+            }
+        } else {
+            // Search is restricted, deduplicate file IDs (generally only one).
+            let mut files = FxHashSet::default();
+            for range in &self.restrict_ranges {
+                if files.insert(range.file_id) {
+                    callback(range.file_id);
+                }
+            }
+        }
+    }
+    fn slow_scan_node(
+        &self,
+        code: &SyntaxNode,
+        rule: &ResolvedRule,
+        restrict_range: &Option<FileRange>,
+        matches_out: &mut Vec<Match>,
+    ) {
+        if !is_search_permitted(code) {
+            return;
+        }
+        self.try_add_match(rule, &code, restrict_range, matches_out);
+        // If we've got a macro call, we already tried matching it pre-expansion, which is the only
+        // way to match the whole macro, now try expanding it and matching the expansion.
+        if let Some(macro_call) = ast::MacroCall::cast(code.clone()) {
+            if let Some(expanded) = self.sema.expand(&macro_call) {
+                if let Some(tt) = macro_call.token_tree() {
+                    // When matching within a macro expansion, we only want to allow matches of
+                    // nodes that originated entirely from within the token tree of the macro call.
+                    // i.e. we don't want to match something that came from the macro itself.
+                    self.slow_scan_node(
+                        &expanded,
+                        rule,
+                        &Some(self.sema.original_range(tt.syntax())),
+                        matches_out,
+                    );
+                }
+            }
+        }
+        for child in code.children() {
+            self.slow_scan_node(&child, rule, restrict_range, matches_out);
+        }
+    }
+    fn try_add_match(
+        &self,
+        rule: &ResolvedRule,
+        code: &SyntaxNode,
+        restrict_range: &Option<FileRange>,
+        matches_out: &mut Vec<Match>,
+    ) {
+        if !self.within_range_restrictions(code) {
+            mark::hit!(replace_nonpath_within_selection);
+            return;
+        }
+        if let Ok(m) = matching::get_match(false, rule, code, restrict_range, &self.sema) {
+            matches_out.push(m);
+        }
+    }
+    /// Returns whether `code` is within one of our range restrictions if we have any. No range
+    /// restrictions is considered unrestricted and always returns true.
+    fn within_range_restrictions(&self, code: &SyntaxNode) -> bool {
+        if self.restrict_ranges.is_empty() {
+            // There is no range restriction.
+            return true;
+        }
+        let node_range = self.sema.original_range(code);
+        for range in &self.restrict_ranges {
+            if range.file_id == node_range.file_id && range.range.contains_range(node_range.range) {
+                return true;
+            }
+        }
+        false
+    }
+}
+/// Returns whether we support matching within `node` and all of its ancestors.
+fn is_search_permitted_ancestors(node: &SyntaxNode) -> bool {
+    if let Some(parent) = node.parent() {
+        if !is_search_permitted_ancestors(&parent) {
+            return false;
+        }
+    }
+    is_search_permitted(node)
+}
+/// Returns whether we support matching within this kind of node.
+fn is_search_permitted(node: &SyntaxNode) -> bool {
+    // FIXME: Properly handle use declarations. At the moment, if our search pattern is `foo::bar`
+    // and the code is `use foo::{baz, bar}`, we'll match `bar`, since it resolves to `foo::bar`.
+    // However we'll then replace just the part we matched `bar`. We probably need to instead remove
+    // `bar` and insert a new use declaration.
+    node.kind() != SyntaxKind::USE
+}
+impl UsageCache {
+    fn find(&mut self, definition: &Definition) -> Option<&[Reference]> {
+        // We expect a very small number of cache entries (generally 1), so a linear scan should be
+        // fast enough and avoids the need to implement Hash for Definition.
+        for (d, refs) in &self.usages {
+            if d == definition {
+                return Some(refs);
+            }
+        }
+        None
+    }
+}
+/// Returns a path that's suitable for path resolution. We exclude builtin types, since they aren't
+/// something that we can find references to. We then somewhat arbitrarily pick the path that is the
+/// longest as this is hopefully more likely to be less common, making it faster to find.
+fn pick_path_for_usages(pattern: &ResolvedPattern) -> Option<&ResolvedPath> {
+    // FIXME: Take the scope of the resolved path into account. e.g. if there are any paths that are
+    // private to the current module, then we definitely would want to pick them over say a path
+    // from std. Possibly we should go further than this and intersect the search scopes for all
+    // resolved paths then search only in that scope.
+    pattern
+        .resolved_paths
+        .iter()
+        .filter(|(_, p)| {
+            !matches!(p.resolution, hir::PathResolution::Def(hir::ModuleDef::BuiltinType(_)))
+        })
+        .map(|(node, resolved)| (node.text().len(), resolved))
+        .max_by(|(a, _), (b, _)| a.cmp(b))
+        .map(|(_, resolved)| resolved)
+}
diff --git a/crates/ra_ssr/src/tests.rs b/crates/ra_ssr/src/tests.rs
index 8be60c293..a4fa2cb44 100644
--- a/crates/ra_ssr/src/tests.rs
+++ b/crates/ra_ssr/src/tests.rs
@@ -1,150 +1,9 @@
-use crate::matching::MatchFailureReason;
+use crate::{MatchFinder, SsrRule};
-use crate::{matching, Match, MatchFinder, SsrMatches, SsrPattern, SsrRule};
+use expect::{expect, Expect};
-use matching::record_match_fails_reasons_scope;
+use ra_db::{salsa::Durability, FileId, FilePosition, FileRange, SourceDatabaseExt};
-use ra_db::{FileId, FileRange, SourceDatabaseExt};
+use rustc_hash::FxHashSet;
-use ra_syntax::ast::AstNode;
+use std::sync::Arc;
-use ra_syntax::{ast, SyntaxKind, SyntaxNode, TextRange};
+use test_utils::{mark, RangeOrOffset};
-struct MatchDebugInfo {
-    node: SyntaxNode,
-    /// Our search pattern parsed as the same kind of syntax node as `node`. e.g. expression, item,
-    /// etc. Will be absent if the pattern can't be parsed as that kind.
-    pattern: Result<SyntaxNode, MatchFailureReason>,
-    matched: Result<Match, MatchFailureReason>,
-}
-impl SsrPattern {
-    pub(crate) fn tree_for_kind_with_reason(
-        &self,
-        kind: SyntaxKind,
-    ) -> Result<&SyntaxNode, MatchFailureReason> {
-        record_match_fails_reasons_scope(true, || self.tree_for_kind(kind))
-            .map_err(|e| MatchFailureReason { reason: e.reason.unwrap() })
-    }
-}
-impl std::fmt::Debug for MatchDebugInfo {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "========= PATTERN ==========\n")?;
-        match &self.pattern {
-            Ok(pattern) => {
-                write!(f, "{:#?}", pattern)?;
-            }
-            Err(err) => {
-                write!(f, "{}", err.reason)?;
-            }
-        }
-        write!(
-            f,
-            "\n============ AST ===========\n\
-            {:#?}\n============================",
-            self.node
-        )?;
-        match &self.matched {
-            Ok(_) => write!(f, "Node matched")?,
-            Err(reason) => write!(f, "Node failed to match because: {}", reason.reason)?,
-        }
-        Ok(())
-    }
-}
-impl SsrMatches {
-    /// Returns `self` with any nested matches removed and made into top-level matches.
-    pub(crate) fn flattened(self) -> SsrMatches {
-        let mut out = SsrMatches::default();
-        self.flatten_into(&mut out);
-        out
-    }
-    fn flatten_into(self, out: &mut SsrMatches) {
-        for mut m in self.matches {
-            for p in m.placeholder_values.values_mut() {
-                std::mem::replace(&mut p.inner_matches, SsrMatches::default()).flatten_into(out);
-            }
-            out.matches.push(m);
-        }
-    }
-}
-impl Match {
-    pub(crate) fn matched_text(&self) -> String {
-        self.matched_node.text().to_string()
-    }
-}
-impl<'db> MatchFinder<'db> {
-    /// Adds a search pattern. For use if you intend to only call `find_matches_in_file`. If you
-    /// intend to do replacement, use `add_rule` instead.
-    fn add_search_pattern(&mut self, pattern: SsrPattern) {
-        self.add_rule(SsrRule { pattern, template: "()".parse().unwrap() })
-    }
-    /// Finds all nodes in `file_id` whose text is exactly equal to `snippet` and attempts to match
-    /// them, while recording reasons why they don't match. This API is useful for command
-    /// line-based debugging where providing a range is difficult.
-    fn debug_where_text_equal(&self, file_id: FileId, snippet: &str) -> Vec<MatchDebugInfo> {
-        let file = self.sema.parse(file_id);
-        let mut res = Vec::new();
-        let file_text = self.sema.db.file_text(file_id);
-        let mut remaining_text = file_text.as_str();
-        let mut base = 0;
-        let len = snippet.len() as u32;
-        while let Some(offset) = remaining_text.find(snippet) {
-            let start = base + offset as u32;
-            let end = start + len;
-            self.output_debug_for_nodes_at_range(
-                file.syntax(),
-                TextRange::new(start.into(), end.into()),
-                &None,
-                &mut res,
-            );
-            remaining_text = &remaining_text[offset + snippet.len()..];
-            base = end;
-        }
-        res
-    }
-    fn output_debug_for_nodes_at_range(
-        &self,
-        node: &SyntaxNode,
-        range: TextRange,
-        restrict_range: &Option<FileRange>,
-        out: &mut Vec<MatchDebugInfo>,
-    ) {
-        for node in node.children() {
-            if !node.text_range().contains_range(range) {
-                continue;
-            }
-            if node.text_range() == range {
-                for rule in &self.rules {
-                    let pattern =
-                        rule.pattern.tree_for_kind_with_reason(node.kind()).map(|p| p.clone());
-                    out.push(MatchDebugInfo {
-                        matched: matching::get_match(true, rule, &node, restrict_range, &self.sema)
-                            .map_err(|e| MatchFailureReason {
-                                reason: e.reason.unwrap_or_else(|| {
-                                    "Match failed, but no reason was given".to_owned()
-                                }),
-                            }),
-                        pattern,
-                        node: node.clone(),
-                    });
-                }
-            } else if let Some(macro_call) = ast::MacroCall::cast(node.clone()) {
-                if let Some(expanded) = self.sema.expand(&macro_call) {
-                    if let Some(tt) = macro_call.token_tree() {
-                        self.output_debug_for_nodes_at_range(
-                            &expanded,
-                            range,
-                            &Some(self.sema.original_range(tt.syntax())),
-                            out,
-                        );
-                    }
-                }
-            }
-        }
-    }
-}
 fn parse_error_text(query: &str) -> String {
    format!("{}", query.parse::<SsrRule>().unwrap_err())
@@ -152,12 +11,12 @@ fn parse_error_text(query: &str) -> String {
 #[test]
 fn parser_empty_query() {
-    assert_eq!(parse_error_text(""), "Parse error: Cannot find delemiter `==>>`");
+    assert_eq!(parse_error_text(""), "Parse error: Cannot find delimiter `==>>`");
 }
 #[test]
 fn parser_no_delimiter() {
-    assert_eq!(parse_error_text("foo()"), "Parse error: Cannot find delemiter `==>>`");
+    assert_eq!(parse_error_text("foo()"), "Parse error: Cannot find delimiter `==>>`");
 }
 #[test]
@@ -180,7 +39,7 @@ fn parser_repeated_name() {
 fn parser_invalid_pattern() {
    assert_eq!(
        parse_error_text(" ==>> ()"),
-        "Parse error: Pattern is not a valid Rust expression, type, item, path or pattern"
+        "Parse error: Not a valid Rust expression, type, item, path or pattern"
    );
 }
@@ -188,7 +47,7 @@ fn parser_invalid_pattern() {
 fn parser_invalid_template() {
    assert_eq!(
        parse_error_text("() ==>> )"),
-        "Parse error: Replacement is not a valid Rust expression, type, item, path or pattern"
+        "Parse error: Not a valid Rust expression, type, item, path or pattern"
    );
 }
@@ -200,72 +59,112 @@ fn parser_undefined_placeholder_in_replacement() {
    );
 }
-fn single_file(code: &str) -> (ra_ide_db::RootDatabase, FileId) {
+/// `code` may optionally contain a cursor marker `<|>`. If it doesn't, then the position will be
+/// the start of the file. If there's a second cursor marker, then we'll return a single range.
+pub(crate) fn single_file(code: &str) -> (ra_ide_db::RootDatabase, FilePosition, Vec<FileRange>) {
    use ra_db::fixture::WithFixture;
-    ra_ide_db::RootDatabase::with_single_file(code)
+    use ra_ide_db::symbol_index::SymbolsDatabase;
-}
+    let (mut db, file_id, range_or_offset) = if code.contains(test_utils::CURSOR_MARKER) {
+        ra_ide_db::RootDatabase::with_range_or_offset(code)
-fn assert_ssr_transform(rule: &str, input: &str, result: &str) {
+    } else {
-    assert_ssr_transforms(&[rule], input, result);
+        let (db, file_id) = ra_ide_db::RootDatabase::with_single_file(code);
+        (db, file_id, RangeOrOffset::Offset(0.into()))
+    };
+    let selections;
+    let position;
+    match range_or_offset {
+        RangeOrOffset::Range(range) => {
+            position = FilePosition { file_id, offset: range.start() };
+            selections = vec![FileRange { file_id, range: range }];
+        }
+        RangeOrOffset::Offset(offset) => {
+            position = FilePosition { file_id, offset };
+            selections = vec![];
+        }
+    }
+    let mut local_roots = FxHashSet::default();
+    local_roots.insert(ra_db::fixture::WORKSPACE);
+    db.set_local_roots_with_durability(Arc::new(local_roots), Durability::HIGH);
+    (db, position, selections)
 }
-fn normalize_code(code: &str) -> String {
+fn assert_ssr_transform(rule: &str, input: &str, expected: Expect) {
-    let (db, file_id) = single_file(code);
+    assert_ssr_transforms(&[rule], input, expected);
-    db.file_text(file_id).to_string()
 }
-fn assert_ssr_transforms(rules: &[&str], input: &str, result: &str) {
+fn assert_ssr_transforms(rules: &[&str], input: &str, expected: Expect) {
-    let (db, file_id) = single_file(input);
+    let (db, position, selections) = single_file(input);
-    let mut match_finder = MatchFinder::new(&db);
+    let mut match_finder = MatchFinder::in_context(&db, position, selections);
    for rule in rules {
        let rule: SsrRule = rule.parse().unwrap();
-        match_finder.add_rule(rule);
+        match_finder.add_rule(rule).unwrap();
    }
-    if let Some(edits) = match_finder.edits_for_file(file_id) {
+    let edits = match_finder.edits();
-        // Note, db.file_text is not necessarily the same as `input`, since fixture parsing alters
+    if edits.is_empty() {
-        // stuff.
-        let mut after = db.file_text(file_id).to_string();
-        edits.apply(&mut after);
-        // Likewise, we need to make sure that whatever transformations fixture parsing applies,
-        // also get appplied to our expected result.
-        let result = normalize_code(result);
-        assert_eq!(after, result);
-    } else {
        panic!("No edits were made");
    }
+    assert_eq!(edits[0].file_id, position.file_id);
+    // Note, db.file_text is not necessarily the same as `input`, since fixture parsing alters
+    // stuff.
+    let mut actual = db.file_text(position.file_id).to_string();
+    edits[0].edit.apply(&mut actual);
+    expected.assert_eq(&actual);
+}
+fn print_match_debug_info(match_finder: &MatchFinder, file_id: FileId, snippet: &str) {
+    let debug_info = match_finder.debug_where_text_equal(file_id, snippet);
+    println!(
+        "Match debug info: {} nodes had text exactly equal to '{}'",
+        debug_info.len(),
+        snippet
+    );
+    for (index, d) in debug_info.iter().enumerate() {
+        println!("Node #{}\n{:#?}\n", index, d);
+    }
 }
 fn assert_matches(pattern: &str, code: &str, expected: &[&str]) {
-    let (db, file_id) = single_file(code);
+    let (db, position, selections) = single_file(code);
-    let mut match_finder = MatchFinder::new(&db);
+    let mut match_finder = MatchFinder::in_context(&db, position, selections);
-    match_finder.add_search_pattern(pattern.parse().unwrap());
+    match_finder.add_search_pattern(pattern.parse().unwrap()).unwrap();
-    let matched_strings: Vec<String> = match_finder
+    let matched_strings: Vec<String> =
-        .find_matches_in_file(file_id)
+        match_finder.matches().flattened().matches.iter().map(|m| m.matched_text()).collect();
-        .flattened()
-        .matches
-        .iter()
-        .map(|m| m.matched_text())
-        .collect();
    if matched_strings != expected && !expected.is_empty() {
-        let debug_info = match_finder.debug_where_text_equal(file_id, &expected[0]);
+        print_match_debug_info(&match_finder, position.file_id, &expected[0]);
-        eprintln!("Test is about to fail. Some possibly useful info: {} nodes had text exactly equal to '{}'", debug_info.len(), &expected[0]);
-        for d in debug_info {
-            eprintln!("{:#?}", d);
-        }
    }
    assert_eq!(matched_strings, expected);
 }
 fn assert_no_match(pattern: &str, code: &str) {
-    assert_matches(pattern, code, &[]);
+    let (db, position, selections) = single_file(code);
+    let mut match_finder = MatchFinder::in_context(&db, position, selections);
+    match_finder.add_search_pattern(pattern.parse().unwrap()).unwrap();
+    let matches = match_finder.matches().flattened().matches;
+    if !matches.is_empty() {
+        print_match_debug_info(&match_finder, position.file_id, &matches[0].matched_text());
+        panic!("Got {} matches when we expected none: {:#?}", matches.len(), matches);
+    }
+}
+fn assert_match_failure_reason(pattern: &str, code: &str, snippet: &str, expected_reason: &str) {
+    let (db, position, selections) = single_file(code);
+    let mut match_finder = MatchFinder::in_context(&db, position, selections);
+    match_finder.add_search_pattern(pattern.parse().unwrap()).unwrap();
+    let mut reasons = Vec::new();
+    for d in match_finder.debug_where_text_equal(position.file_id, snippet) {
+        if let Some(reason) = d.match_failure_reason() {
+            reasons.push(reason.to_owned());
+        }
+    }
+    assert_eq!(reasons, vec![expected_reason]);
 }
 #[test]
 fn ssr_function_to_method() {
    assert_ssr_transform(
        "my_function($a, $b) ==>> ($a).my_method($b)",
-        "loop { my_function( other_func(x, y), z + w) }",
+        "fn my_function() {} fn main() { loop { my_function( other_func(x, y), z + w) } }",
-        "loop { (other_func(x, y)).my_method(z + w) }",
+        expect![["fn my_function() {} fn main() { loop { (other_func(x, y)).my_method(z + w) } }"]],
    )
 }
@@ -273,8 +172,19 @@ fn ssr_function_to_method() {
 fn ssr_nested_function() {
    assert_ssr_transform(
        "foo($a, $b, $c) ==>> bar($c, baz($a, $b))",
-        "fn main { foo  (x + value.method(b), x+y-z, true && false) }",
+        r#"
-        "fn main { bar(true && false, baz(x + value.method(b), x+y-z)) }",
+            //- /lib.rs crate:foo
+            fn foo() {}
+            fn bar() {}
+            fn baz() {}
+            fn main { foo  (x + value.method(b), x+y-z, true && false) }
+            "#,
+        expect![[r#"
+            fn foo() {}
+            fn bar() {}
+            fn baz() {}
+            fn main { bar(true && false, baz(x + value.method(b), x+y-z)) }
+        "#]],
    )
 }
@@ -282,8 +192,8 @@ fn ssr_nested_function() {
 fn ssr_expected_spacing() {
    assert_ssr_transform(
        "foo($x) + bar() ==>> bar($x)",
-        "fn main() { foo(5) + bar() }",
+        "fn foo() {} fn bar() {} fn main() { foo(5) + bar() }",
-        "fn main() { bar(5) }",
+        expect![["fn foo() {} fn bar() {} fn main() { bar(5) }"]],
    );
 }
@@ -291,8 +201,8 @@ fn ssr_expected_spacing() {
 fn ssr_with_extra_space() {
    assert_ssr_transform(
        "foo($x  ) +    bar() ==>> bar($x)",
-        "fn main() { foo(  5 )  +bar(   ) }",
+        "fn foo() {} fn bar() {} fn main() { foo(  5 )  +bar(   ) }",
-        "fn main() { bar(5) }",
+        expect![["fn foo() {} fn bar() {} fn main() { bar(5) }"]],
    );
 }
@@ -300,8 +210,8 @@ fn ssr_with_extra_space() {
 fn ssr_keeps_nested_comment() {
    assert_ssr_transform(
        "foo($x) ==>> bar($x)",
-        "fn main() { foo(other(5 /* using 5 */)) }",
+        "fn foo() {} fn bar() {} fn main() { foo(other(5 /* using 5 */)) }",
-        "fn main() { bar(other(5 /* using 5 */)) }",
+        expect![["fn foo() {} fn bar() {} fn main() { bar(other(5 /* using 5 */)) }"]],
    )
 }
@@ -309,17 +219,25 @@ fn ssr_keeps_nested_comment() {
 fn ssr_keeps_comment() {
    assert_ssr_transform(
        "foo($x) ==>> bar($x)",
-        "fn main() { foo(5 /* using 5 */) }",
+        "fn foo() {} fn bar() {} fn main() { foo(5 /* using 5 */) }",
-        "fn main() { bar(5)/* using 5 */ }",
+        expect![["fn foo() {} fn bar() {} fn main() { bar(5)/* using 5 */ }"]],
    )
 }
 #[test]
 fn ssr_struct_lit() {
    assert_ssr_transform(
-        "foo{a: $a, b: $b} ==>> foo::new($a, $b)",
+        "Foo{a: $a, b: $b} ==>> Foo::new($a, $b)",
-        "fn main() { foo{b:2, a:1} }",
+        r#"
-        "fn main() { foo::new(1, 2) }",
+            struct Foo() {}
+            impl Foo { fn new() {} }
+            fn main() { Foo{b:2, a:1} }
+            "#,
+        expect![[r#"
+            struct Foo() {}
+            impl Foo { fn new() {} }
+            fn main() { Foo::new(1, 2) }
+        "#]],
    )
 }
@@ -341,16 +259,18 @@ fn match_fn_definition() {
 #[test]
 fn match_struct_definition() {
-    assert_matches(
+    let code = r#"
-        "struct $n {$f: Option<String>}",
+        struct Option<T> {}
-        "struct Bar {} struct Foo {name: Option<String>}",
+        struct Bar {}
-        &["struct Foo {name: Option<String>}"],
+        struct Foo {name: Option<String>}"#;
-    );
+    assert_matches("struct $n {$f: Option<String>}", code, &["struct Foo {name: Option<String>}"]);
 }
 #[test]
 fn match_expr() {
-    let code = "fn f() -> i32 {foo(40 + 2, 42)}";
+    let code = r#"
+        fn foo() {}
+        fn f() -> i32 {foo(40 + 2, 42)}"#;
    assert_matches("foo($a, $b)", code, &["foo(40 + 2, 42)"]);
    assert_no_match("foo($a, $b, $c)", code);
    assert_no_match("foo($a)", code);
@@ -379,7 +299,9 @@ fn match_nested_method_calls_with_macro_call() {
 #[test]
 fn match_complex_expr() {
-    let code = "fn f() -> i32 {foo(bar(40, 2), 42)}";
+    let code = r#"
+        fn foo() {} fn bar() {}
+        fn f() -> i32 {foo(bar(40, 2), 42)}"#;
    assert_matches("foo($a, $b)", code, &["foo(bar(40, 2), 42)"]);
    assert_no_match("foo($a, $b, $c)", code);
    assert_no_match("foo($a)", code);
@@ -390,71 +312,162 @@ fn match_complex_expr() {
 #[test]
 fn match_with_trailing_commas() {
    // Code has comma, pattern doesn't.
-    assert_matches("foo($a, $b)", "fn f() {foo(1, 2,);}", &["foo(1, 2,)"]);
+    assert_matches("foo($a, $b)", "fn foo() {} fn f() {foo(1, 2,);}", &["foo(1, 2,)"]);
-    assert_matches("Foo{$a, $b}", "fn f() {Foo{1, 2,};}", &["Foo{1, 2,}"]);
+    assert_matches("Foo{$a, $b}", "struct Foo {} fn f() {Foo{1, 2,};}", &["Foo{1, 2,}"]);
    // Pattern has comma, code doesn't.
-    assert_matches("foo($a, $b,)", "fn f() {foo(1, 2);}", &["foo(1, 2)"]);
+    assert_matches("foo($a, $b,)", "fn foo() {} fn f() {foo(1, 2);}", &["foo(1, 2)"]);
-    assert_matches("Foo{$a, $b,}", "fn f() {Foo{1, 2};}", &["Foo{1, 2}"]);
+    assert_matches("Foo{$a, $b,}", "struct Foo {} fn f() {Foo{1, 2};}", &["Foo{1, 2}"]);
 }
 #[test]
 fn match_type() {
    assert_matches("i32", "fn f() -> i32 {1  +  2}", &["i32"]);
-    assert_matches("Option<$a>", "fn f() -> Option<i32> {42}", &["Option<i32>"]);
+    assert_matches(
-    assert_no_match("Option<$a>", "fn f() -> Result<i32, ()> {42}");
+        "Option<$a>",
+        "struct Option<T> {} fn f() -> Option<i32> {42}",
+        &["Option<i32>"],
+    );
+    assert_no_match(
+        "Option<$a>",
+        "struct Option<T> {} struct Result<T, E> {} fn f() -> Result<i32, ()> {42}",
+    );
 }
 #[test]
 fn match_struct_instantiation() {
-    assert_matches(
+    let code = r#"
-        "Foo {bar: 1, baz: 2}",
+        struct Foo {bar: i32, baz: i32}
-        "fn f() {Foo {bar: 1, baz: 2}}",
+        fn f() {Foo {bar: 1, baz: 2}}"#;
-        &["Foo {bar: 1, baz: 2}"],
+    assert_matches("Foo {bar: 1, baz: 2}", code, &["Foo {bar: 1, baz: 2}"]);
-    );
    // Now with placeholders for all parts of the struct.
-    assert_matches(
+    assert_matches("Foo {$a: $b, $c: $d}", code, &["Foo {bar: 1, baz: 2}"]);
-        "Foo {$a: $b, $c: $d}",
+    assert_matches("Foo {}", "struct Foo {} fn f() {Foo {}}", &["Foo {}"]);
-        "fn f() {Foo {bar: 1, baz: 2}}",
-        &["Foo {bar: 1, baz: 2}"],
-    );
-    assert_matches("Foo {}", "fn f() {Foo {}}", &["Foo {}"]);
 }
 #[test]
 fn match_path() {
-    assert_matches("foo::bar", "fn f() {foo::bar(42)}", &["foo::bar"]);
+    let code = r#"
-    assert_matches("$a::bar", "fn f() {foo::bar(42)}", &["foo::bar"]);
+        mod foo {
-    assert_matches("foo::$b", "fn f() {foo::bar(42)}", &["foo::bar"]);
+            pub fn bar() {}
+        }
+        fn f() {foo::bar(42)}"#;
+    assert_matches("foo::bar", code, &["foo::bar"]);
+    assert_matches("$a::bar", code, &["foo::bar"]);
+    assert_matches("foo::$b", code, &["foo::bar"]);
 }
 #[test]
 fn match_pattern() {
-    assert_matches("Some($a)", "fn f() {if let Some(x) = foo() {}}", &["Some(x)"]);
+    assert_matches("Some($a)", "struct Some(); fn f() {if let Some(x) = foo() {}}", &["Some(x)"]);
+}
+// If our pattern has a full path, e.g. a::b::c() and the code has c(), but c resolves to
+// a::b::c, then we should match.
+#[test]
+fn match_fully_qualified_fn_path() {
+    let code = r#"
+        mod a {
+            pub mod b {
+                pub fn c(_: i32) {}
+            }
+        }
+        use a::b::c;
+        fn f1() {
+            c(42);
+        }
+        "#;
+    assert_matches("a::b::c($a)", code, &["c(42)"]);
+}
+#[test]
+fn match_resolved_type_name() {
+    let code = r#"
+        mod m1 {
+            pub mod m2 {
+                pub trait Foo<T> {}
+            }
+        }
+        mod m3 {
+            trait Foo<T> {}
+            fn f1(f: Option<&dyn Foo<bool>>) {}
+        }
+        mod m4 {
+            use crate::m1::m2::Foo;
+            fn f1(f: Option<&dyn Foo<i32>>) {}
+        }
+        "#;
+    assert_matches("m1::m2::Foo<$t>", code, &["Foo<i32>"]);
+}
+#[test]
+fn type_arguments_within_path() {
+    mark::check!(type_arguments_within_path);
+    let code = r#"
+        mod foo {
+            pub struct Bar<T> {t: T}
+            impl<T> Bar<T> {
+                pub fn baz() {}
+            }
+        }
+        fn f1() {foo::Bar::<i32>::baz();}
+        "#;
+    assert_no_match("foo::Bar::<i64>::baz()", code);
+    assert_matches("foo::Bar::<i32>::baz()", code, &["foo::Bar::<i32>::baz()"]);
+}
+#[test]
+fn literal_constraint() {
+    mark::check!(literal_constraint);
+    let code = r#"
+        enum Option<T> { Some(T), None }
+        use Option::Some;
+        fn f1() {
+            let x1 = Some(42);
+            let x2 = Some("foo");
+            let x3 = Some(x1);
+            let x4 = Some(40 + 2);
+            let x5 = Some(true);
+        }
+        "#;
+    assert_matches("Some(${a:kind(literal)})", code, &["Some(42)", "Some(\"foo\")", "Some(true)"]);
+    assert_matches("Some(${a:not(kind(literal))})", code, &["Some(x1)", "Some(40 + 2)"]);
 }
 #[test]
 fn match_reordered_struct_instantiation() {
    assert_matches(
        "Foo {aa: 1, b: 2, ccc: 3}",
-        "fn f() {Foo {b: 2, ccc: 3, aa: 1}}",
+        "struct Foo {} fn f() {Foo {b: 2, ccc: 3, aa: 1}}",
        &["Foo {b: 2, ccc: 3, aa: 1}"],
    );
-    assert_no_match("Foo {a: 1}", "fn f() {Foo {b: 1}}");
+    assert_no_match("Foo {a: 1}", "struct Foo {} fn f() {Foo {b: 1}}");
-    assert_no_match("Foo {a: 1}", "fn f() {Foo {a: 2}}");
+    assert_no_match("Foo {a: 1}", "struct Foo {} fn f() {Foo {a: 2}}");
-    assert_no_match("Foo {a: 1, b: 2}", "fn f() {Foo {a: 1}}");
+    assert_no_match("Foo {a: 1, b: 2}", "struct Foo {} fn f() {Foo {a: 1}}");
-    assert_no_match("Foo {a: 1, b: 2}", "fn f() {Foo {b: 2}}");
+    assert_no_match("Foo {a: 1, b: 2}", "struct Foo {} fn f() {Foo {b: 2}}");
-    assert_no_match("Foo {a: 1, }", "fn f() {Foo {a: 1, b: 2}}");
+    assert_no_match("Foo {a: 1, }", "struct Foo {} fn f() {Foo {a: 1, b: 2}}");
-    assert_no_match("Foo {a: 1, z: 9}", "fn f() {Foo {a: 1}}");
+    assert_no_match("Foo {a: 1, z: 9}", "struct Foo {} fn f() {Foo {a: 1}}");
 }
 #[test]
 fn match_macro_invocation() {
-    assert_matches("foo!($a)", "fn() {foo(foo!(foo()))}", &["foo!(foo())"]);
+    assert_matches(
-    assert_matches("foo!(41, $a, 43)", "fn() {foo!(41, 42, 43)}", &["foo!(41, 42, 43)"]);
+        "foo!($a)",
-    assert_no_match("foo!(50, $a, 43)", "fn() {foo!(41, 42, 43}");
+        "macro_rules! foo {() => {}} fn() {foo(foo!(foo()))}",
-    assert_no_match("foo!(41, $a, 50)", "fn() {foo!(41, 42, 43}");
+        &["foo!(foo())"],
-    assert_matches("foo!($a())", "fn() {foo!(bar())}", &["foo!(bar())"]);
+    );
+    assert_matches(
+        "foo!(41, $a, 43)",
+        "macro_rules! foo {() => {}} fn() {foo!(41, 42, 43)}",
+        &["foo!(41, 42, 43)"],
+    );
+    assert_no_match("foo!(50, $a, 43)", "macro_rules! foo {() => {}} fn() {foo!(41, 42, 43}");
+    assert_no_match("foo!(41, $a, 50)", "macro_rules! foo {() => {}} fn() {foo!(41, 42, 43}");
+    assert_matches(
+        "foo!($a())",
+        "macro_rules! foo {() => {}} fn() {foo!(bar())}",
+        &["foo!(bar())"],
+    );
 }
 // When matching within a macro expansion, we only allow matches of nodes that originated from
@@ -489,15 +502,20 @@ fn no_match_split_expression() {
 #[test]
 fn replace_function_call() {
-    assert_ssr_transform("foo() ==>> bar()", "fn f1() {foo(); foo();}", "fn f1() {bar(); bar();}");
+    // This test also makes sure that we ignore empty-ranges.
+    assert_ssr_transform(
+        "foo() ==>> bar()",
+        "fn foo() {<|><|>} fn bar() {} fn f1() {foo(); foo();}",
+        expect![["fn foo() {} fn bar() {} fn f1() {bar(); bar();}"]],
+    );
 }
 #[test]
 fn replace_function_call_with_placeholders() {
    assert_ssr_transform(
        "foo($a, $b) ==>> bar($b, $a)",
-        "fn f1() {foo(5, 42)}",
+        "fn foo() {} fn bar() {} fn f1() {foo(5, 42)}",
-        "fn f1() {bar(42, 5)}",
+        expect![["fn foo() {} fn bar() {} fn f1() {bar(42, 5)}"]],
    );
 }
@@ -505,26 +523,120 @@ fn replace_function_call_with_placeholders() {
 fn replace_nested_function_calls() {
    assert_ssr_transform(
        "foo($a) ==>> bar($a)",
-        "fn f1() {foo(foo(42))}",
+        "fn foo() {} fn bar() {} fn f1() {foo(foo(42))}",
-        "fn f1() {bar(bar(42))}",
+        expect![["fn foo() {} fn bar() {} fn f1() {bar(bar(42))}"]],
    );
 }
 #[test]
-fn replace_type() {
+fn replace_associated_function_call() {
    assert_ssr_transform(
-        "Result<(), $a> ==>> Option<$a>",
+        "Foo::new() ==>> Bar::new()",
-        "fn f1() -> Result<(), Vec<Error>> {foo()}",
+        r#"
-        "fn f1() -> Option<Vec<Error>> {foo()}",
+            struct Foo {}
+            impl Foo { fn new() {} }
+            struct Bar {}
+            impl Bar { fn new() {} }
+            fn f1() {Foo::new();}
+            "#,
+        expect![[r#"
+            struct Foo {}
+            impl Foo { fn new() {} }
+            struct Bar {}
+            impl Bar { fn new() {} }
+            fn f1() {Bar::new();}
+        "#]],
    );
 }
 #[test]
-fn replace_struct_init() {
+fn replace_path_in_different_contexts() {
+    // Note the <|> inside module a::b which marks the point where the rule is interpreted. We
+    // replace foo with bar, but both need different path qualifiers in different contexts. In f4,
+    // foo is unqualified because of a use statement, however the replacement needs to be fully
+    // qualified.
    assert_ssr_transform(
-        "Foo {a: $a, b: $b} ==>> Foo::new($a, $b)",
+        "c::foo() ==>> c::bar()",
-        "fn f1() {Foo{b: 1, a: 2}}",
+        r#"
-        "fn f1() {Foo::new(2, 1)}",
+            mod a {
+                pub mod b {<|>
+                    pub mod c {
+                        pub fn foo() {}
+                        pub fn bar() {}
+                        fn f1() { foo() }
+                    }
+                    fn f2() { c::foo() }
+                }
+                fn f3() { b::c::foo() }
+            }
+            use a::b::c::foo;
+            fn f4() { foo() }
+            "#,
+        expect![[r#"
+            mod a {
+                pub mod b {
+                    pub mod c {
+                        pub fn foo() {}
+                        pub fn bar() {}
+                        fn f1() { bar() }
+                    }
+                    fn f2() { c::bar() }
+                }
+                fn f3() { b::c::bar() }
+            }
+            use a::b::c::foo;
+            fn f4() { a::b::c::bar() }
+            "#]],
+    );
+}
+#[test]
+fn replace_associated_function_with_generics() {
+    assert_ssr_transform(
+        "c::Foo::<$a>::new() ==>> d::Bar::<$a>::default()",
+        r#"
+            mod c {
+                pub struct Foo<T> {v: T}
+                impl<T> Foo<T> { pub fn new() {} }
+                fn f1() {
+                    Foo::<i32>::new();
+                }
+            }
+            mod d {
+                pub struct Bar<T> {v: T}
+                impl<T> Bar<T> { pub fn default() {} }
+                fn f1() {
+                    super::c::Foo::<i32>::new();
+                }
+            }
+            "#,
+        expect![[r#"
+            mod c {
+                pub struct Foo<T> {v: T}
+                impl<T> Foo<T> { pub fn new() {} }
+                fn f1() {
+                    crate::d::Bar::<i32>::default();
+                }
+            }
+            mod d {
+                pub struct Bar<T> {v: T}
+                impl<T> Bar<T> { pub fn default() {} }
+                fn f1() {
+                    Bar::<i32>::default();
+                }
+            }
+            "#]],
+    );
+}
+#[test]
+fn replace_type() {
+    assert_ssr_transform(
+        "Result<(), $a> ==>> Option<$a>",
+        "struct Result<T, E> {} struct Option<T> {} fn f1() -> Result<(), Vec<Error>> {foo()}",
+        expect![[
+            "struct Result<T, E> {} struct Option<T> {} fn f1() -> Option<Vec<Error>> {foo()}"
+        ]],
    );
 }
@@ -532,13 +644,13 @@ fn replace_struct_init() {
 fn replace_macro_invocations() {
    assert_ssr_transform(
        "try!($a) ==>> $a?",
-        "fn f1() -> Result<(), E> {bar(try!(foo()));}",
+        "macro_rules! try {() => {}} fn f1() -> Result<(), E> {bar(try!(foo()));}",
-        "fn f1() -> Result<(), E> {bar(foo()?);}",
+        expect![["macro_rules! try {() => {}} fn f1() -> Result<(), E> {bar(foo()?);}"]],
    );
    assert_ssr_transform(
        "foo!($a($b)) ==>> foo($b, $a)",
-        "fn f1() {foo!(abc(def() + 2));}",
+        "macro_rules! foo {() => {}} fn f1() {foo!(abc(def() + 2));}",
-        "fn f1() {foo(def() + 2, abc);}",
+        expect![["macro_rules! foo {() => {}} fn f1() {foo(def() + 2, abc);}"]],
    );
 }
@@ -547,12 +659,12 @@ fn replace_binary_op() {
    assert_ssr_transform(
        "$a + $b ==>> $b + $a",
        "fn f() {2 * 3 + 4 * 5}",
-        "fn f() {4 * 5 + 2 * 3}",
+        expect![["fn f() {4 * 5 + 2 * 3}"]],
    );
    assert_ssr_transform(
        "$a + $b ==>> $b + $a",
        "fn f() {1 + 2 + 3 + 4}",
-        "fn f() {4 + 3 + 2 + 1}",
+        expect![[r#"fn f() {4 + (3 + (2 + 1))}"#]],
    );
 }
@@ -565,8 +677,23 @@ fn match_binary_op() {
 fn multiple_rules() {
    assert_ssr_transforms(
        &["$a + 1 ==>> add_one($a)", "$a + $b ==>> add($a, $b)"],
-        "fn f() -> i32 {3 + 2 + 1}",
+        "fn add() {} fn add_one() {} fn f() -> i32 {3 + 2 + 1}",
-        "fn f() -> i32 {add_one(add(3, 2))}",
+        expect![["fn add() {} fn add_one() {} fn f() -> i32 {add_one(add(3, 2))}"]],
+    )
+}
+#[test]
+fn multiple_rules_with_nested_matches() {
+    assert_ssr_transforms(
+        &["foo1($a) ==>> bar1($a)", "foo2($a) ==>> bar2($a)"],
+        r#"
+            fn foo1() {} fn foo2() {} fn bar1() {} fn bar2() {}
+            fn f() {foo1(foo2(foo1(foo2(foo1(42)))))}
+            "#,
+        expect![[r#"
+            fn foo1() {} fn foo2() {} fn bar1() {} fn bar2() {}
+            fn f() {bar1(bar2(bar1(bar2(bar1(42)))))}
+        "#]],
    )
 }
@@ -598,12 +725,37 @@ fn replace_within_macro_expansion() {
            macro_rules! macro1 {
                ($a:expr) => {$a}
            }
-            fn f() {macro1!(5.x().foo().o2())}"#,
+            fn bar() {}
+            fn f() {macro1!(5.x().foo().o2())}
+            "#,
+        expect![[r#"
+            macro_rules! macro1 {
+                ($a:expr) => {$a}
+            }
+            fn bar() {}
+            fn f() {macro1!(bar(5.x()).o2())}
+            "#]],
+    )
+}
+#[test]
+fn replace_outside_and_within_macro_expansion() {
+    assert_ssr_transform(
+        "foo($a) ==>> bar($a)",
        r#"
+            fn foo() {} fn bar() {}
            macro_rules! macro1 {
                ($a:expr) => {$a}
            }
-            fn f() {macro1!(bar(5.x()).o2())}"#,
+            fn f() {foo(foo(macro1!(foo(foo(42)))))}
+            "#,
+        expect![[r#"
+            fn foo() {} fn bar() {}
+            macro_rules! macro1 {
+                ($a:expr) => {$a}
+            }
+            fn f() {bar(bar(macro1!(bar(bar(42)))))}
+        "#]],
    )
 }
@@ -615,11 +767,280 @@ fn preserves_whitespace_within_macro_expansion() {
            macro_rules! macro1 {
                ($a:expr) => {$a}
            }
-            fn f() {macro1!(1   *   2 + 3 + 4}"#,
+            fn f() {macro1!(1   *   2 + 3 + 4}
-        r#"
+            "#,
+        expect![[r#"
            macro_rules! macro1 {
                ($a:expr) => {$a}
            }
-            fn f() {macro1!(4 - 3 - 1   *   2}"#,
+            fn f() {macro1!(4 - (3 - 1   *   2)}
+            "#]],
+    )
+}
+#[test]
+fn add_parenthesis_when_necessary() {
+    assert_ssr_transform(
+        "foo($a) ==>> $a.to_string()",
+        r#"
+        fn foo(_: i32) {}
+        fn bar3(v: i32) {
+            foo(1 + 2);
+            foo(-v);
+        }
+        "#,
+        expect![[r#"
+            fn foo(_: i32) {}
+            fn bar3(v: i32) {
+                (1 + 2).to_string();
+                (-v).to_string();
+            }
+        "#]],
+    )
+}
+#[test]
+fn match_failure_reasons() {
+    let code = r#"
+        fn bar() {}
+        macro_rules! foo {
+            ($a:expr) => {
+                1 + $a + 2
+            };
+        }
+        fn f1() {
+            bar(1, 2);
+            foo!(5 + 43.to_string() + 5);
+        }
+        "#;
+    assert_match_failure_reason(
+        "bar($a, 3)",
+        code,
+        "bar(1, 2)",
+        r#"Pattern wanted token '3' (INT_NUMBER), but code had token '2' (INT_NUMBER)"#,
+    );
+    assert_match_failure_reason(
+        "42.to_string()",
+        code,
+        "43.to_string()",
+        r#"Pattern wanted token '42' (INT_NUMBER), but code had token '43' (INT_NUMBER)"#,
+    );
+}
+#[test]
+fn overlapping_possible_matches() {
+    // There are three possible matches here, however the middle one, `foo(foo(foo(42)))` shouldn't
+    // match because it overlaps with the outer match. The inner match is permitted since it's is
+    // contained entirely within the placeholder of the outer match.
+    assert_matches(
+        "foo(foo($a))",
+        "fn foo() {} fn main() {foo(foo(foo(foo(42))))}",
+        &["foo(foo(42))", "foo(foo(foo(foo(42))))"],
+    );
+}
+#[test]
+fn use_declaration_with_braces() {
+    // It would be OK for a path rule to match and alter a use declaration. We shouldn't mess it up
+    // though. In particular, we must not change `use foo::{baz, bar}` to `use foo::{baz,
+    // foo2::bar2}`.
+    mark::check!(use_declaration_with_braces);
+    assert_ssr_transform(
+        "foo::bar ==>> foo2::bar2",
+        r#"
+        mod foo { pub fn bar() {} pub fn baz() {} }
+        mod foo2 { pub fn bar2() {} }
+        use foo::{baz, bar};
+        fn main() { bar() }
+        "#,
+        expect![["
+        mod foo { pub fn bar() {} pub fn baz() {} }
+        mod foo2 { pub fn bar2() {} }
+        use foo::{baz, bar};
+        fn main() { foo2::bar2() }
+        "]],
+    )
+}
+#[test]
+fn ufcs_matches_method_call() {
+    let code = r#"
+    struct Foo {}
+    impl Foo {
+        fn new(_: i32) -> Foo { Foo {} }
+        fn do_stuff(&self, _: i32) {}
+    }
+    struct Bar {}
+    impl Bar {
+        fn new(_: i32) -> Bar { Bar {} }
+        fn do_stuff(&self, v: i32) {}
+    }
+    fn main() {
+        let b = Bar {};
+        let f = Foo {};
+        b.do_stuff(1);
+        f.do_stuff(2);
+        Foo::new(4).do_stuff(3);
+        // Too many / too few args - should never match
+        f.do_stuff(2, 10);
+        f.do_stuff();
+    }
+    "#;
+    assert_matches("Foo::do_stuff($a, $b)", code, &["f.do_stuff(2)", "Foo::new(4).do_stuff(3)"]);
+    // The arguments needs special handling in the case of a function call matching a method call
+    // and the first argument is different.
+    assert_matches("Foo::do_stuff($a, 2)", code, &["f.do_stuff(2)"]);
+    assert_matches("Foo::do_stuff(Foo::new(4), $b)", code, &["Foo::new(4).do_stuff(3)"]);
+    assert_ssr_transform(
+        "Foo::do_stuff(Foo::new($a), $b) ==>> Bar::new($b).do_stuff($a)",
+        code,
+        expect![[r#"
+            struct Foo {}
+            impl Foo {
+                fn new(_: i32) -> Foo { Foo {} }
+                fn do_stuff(&self, _: i32) {}
+            }
+            struct Bar {}
+            impl Bar {
+                fn new(_: i32) -> Bar { Bar {} }
+                fn do_stuff(&self, v: i32) {}
+            }
+            fn main() {
+                let b = Bar {};
+                let f = Foo {};
+                b.do_stuff(1);
+                f.do_stuff(2);
+                Bar::new(3).do_stuff(4);
+                // Too many / too few args - should never match
+                f.do_stuff(2, 10);
+                f.do_stuff();
+            }
+        "#]],
+    );
+}
+#[test]
+fn pattern_is_a_single_segment_path() {
+    mark::check!(pattern_is_a_single_segment_path);
+    // The first function should not be altered because the `foo` in scope at the cursor position is
+    // a different `foo`. This case is special because "foo" can be parsed as a pattern (BIND_PAT ->
+    // NAME -> IDENT), which contains no path. If we're not careful we'll end up matching the `foo`
+    // in `let foo` from the first function. Whether we should match the `let foo` in the second
+    // function is less clear. At the moment, we don't. Doing so sounds like a rename operation,
+    // which isn't really what SSR is for, especially since the replacement `bar` must be able to be
+    // resolved, which means if we rename `foo` we'll get a name collision.
+    assert_ssr_transform(
+        "foo ==>> bar",
+        r#"
+        fn f1() -> i32 {
+            let foo = 1;
+            let bar = 2;
+            foo
+        }
+        fn f1() -> i32 {
+            let foo = 1;
+            let bar = 2;
+            foo<|>
+        }
+        "#,
+        expect![[r#"
+            fn f1() -> i32 {
+                let foo = 1;
+                let bar = 2;
+                foo
+            }
+            fn f1() -> i32 {
+                let foo = 1;
+                let bar = 2;
+                bar
+            }
+        "#]],
+    );
+}
+#[test]
+fn replace_local_variable_reference() {
+    // The pattern references a local variable `foo` in the block containing the cursor. We should
+    // only replace references to this variable `foo`, not other variables that just happen to have
+    // the same name.
+    mark::check!(cursor_after_semicolon);
+    assert_ssr_transform(
+        "foo + $a ==>> $a - foo",
+        r#"
+            fn bar1() -> i32 {
+                let mut res = 0;
+                let foo = 5;
+                res += foo + 1;
+                let foo = 10;
+                res += foo + 2;<|>
+                res += foo + 3;
+                let foo = 15;
+                res += foo + 4;
+                res
+            }
+            "#,
+        expect![[r#"
+            fn bar1() -> i32 {
+                let mut res = 0;
+                let foo = 5;
+                res += foo + 1;
+                let foo = 10;
+                res += 2 - foo;
+                res += 3 - foo;
+                let foo = 15;
+                res += foo + 4;
+                res
+            }
+        "#]],
    )
 }
+#[test]
+fn replace_path_within_selection() {
+    assert_ssr_transform(
+        "foo ==>> bar",
+        r#"
+        fn main() {
+            let foo = 41;
+            let bar = 42;
+            do_stuff(foo);
+            do_stuff(foo);<|>
+            do_stuff(foo);
+            do_stuff(foo);<|>
+            do_stuff(foo);
+        }"#,
+        expect![[r#"
+            fn main() {
+                let foo = 41;
+                let bar = 42;
+                do_stuff(foo);
+                do_stuff(foo);
+                do_stuff(bar);
+                do_stuff(bar);
+                do_stuff(foo);
+            }"#]],
+    );
+}
+#[test]
+fn replace_nonpath_within_selection() {
+    mark::check!(replace_nonpath_within_selection);
+    assert_ssr_transform(
+        "$a + $b ==>> $b * $a",
+        r#"
+        fn main() {
+            let v = 1 + 2;<|>
+            let v2 = 3 + 3;
+            let v3 = 4 + 5;<|>
+            let v4 = 6 + 7;
+        }"#,
+        expect![[r#"
+            fn main() {
+                let v = 1 + 2;
+                let v2 = 3 * 3;
+                let v3 = 5 * 4;
+                let v4 = 6 + 7;
+            }"#]],
+    );
+}
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 49696ce75..fc4d7aa04 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 [dependencies]
 itertools = "0.9.0"
 rowan = "0.10.0"
-rustc_lexer = { version = "666.0.0", package = "rustc-ap-rustc_lexer" }
+rustc_lexer = { version = "671.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.5.1"
 once_cell = "1.3.1"
@@ -31,4 +31,6 @@ serde = { version = "1.0.106", features = ["derive"] }
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
+expect = { path = "../expect" }
 walkdir = "2.3.1"
+rayon = "1"
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index 9d02aeef3..fd426ece9 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/ra_syntax/src/ast.rs
@@ -2,9 +2,9 @@
 mod generated;
 mod traits;
-mod tokens;
+mod token_ext;
-mod extensions;
+mod node_ext;
-mod expr_extensions;
+mod expr_ext;
 pub mod edit;
 pub mod make;
@@ -16,13 +16,13 @@ use crate::{
 };
 pub use self::{
-    expr_extensions::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp},
+    expr_ext::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp},
-    extensions::{
+    generated::{nodes::*, tokens::*},
+    node_ext::{
        AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents,
        StructKind, TypeBoundKind, VisibilityKind,
    },
-    generated::{nodes::*, tokens::*},
+    token_ext::*,
-    tokens::*,
    traits::*,
 };
@@ -139,7 +139,7 @@ fn test_doc_comment_of_statics() {
    )
    .ok()
    .unwrap();
-    let st = file.syntax().descendants().find_map(StaticDef::cast).unwrap();
+    let st = file.syntax().descendants().find_map(Static::cast).unwrap();
    assert_eq!("Number of levels", st.doc_comment_text().unwrap());
 }
@@ -235,7 +235,7 @@ fn test_comments_preserve_trailing_whitespace() {
    )
    .ok()
    .unwrap();
-    let def = file.syntax().descendants().find_map(StructDef::cast).unwrap();
+    let def = file.syntax().descendants().find_map(Struct::cast).unwrap();
    assert_eq!(
        "Representation of a Realm.   \nIn the specification these are called Realm Records.",
        def.doc_comment_text().unwrap()
@@ -286,7 +286,7 @@ where
    let mut bounds = pred.type_bound_list().unwrap().bounds();
    assert!(pred.for_token().is_none());
-    assert!(pred.type_param_list().is_none());
+    assert!(pred.generic_param_list().is_none());
    assert_eq!("T", pred.type_ref().unwrap().syntax().text().to_string());
    assert_bound("Clone", bounds.next());
    assert_bound("Copy", bounds.next());
@@ -325,7 +325,7 @@ where
    let mut bounds = pred.type_bound_list().unwrap().bounds();
    assert!(pred.for_token().is_some());
-    assert_eq!("<'a>", pred.type_param_list().unwrap().syntax().text().to_string());
+    assert_eq!("<'a>", pred.generic_param_list().unwrap().syntax().text().to_string());
    assert_eq!("F", pred.type_ref().unwrap().syntax().text().to_string());
    assert_bound("Fn(&'a str)", bounds.next());
 }
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 2ef173a03..8d3e42f25 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -29,9 +29,9 @@ impl ast::BinExpr {
    }
 }
-impl ast::FnDef {
+impl ast::Fn {
    #[must_use]
-    pub fn with_body(&self, body: ast::BlockExpr) -> ast::FnDef {
+    pub fn with_body(&self, body: ast::BlockExpr) -> ast::Fn {
        let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
        let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() {
            old_body.syntax().clone().into()
@@ -80,9 +80,12 @@ where
    }
 }
-impl ast::ItemList {
+impl ast::AssocItemList {
    #[must_use]
-    pub fn append_items(&self, items: impl IntoIterator<Item = ast::AssocItem>) -> ast::ItemList {
+    pub fn append_items(
+        &self,
+        items: impl IntoIterator<Item = ast::AssocItem>,
+    ) -> ast::AssocItemList {
        let mut res = self.clone();
        if !self.syntax().text().contains_char('\n') {
            res = make_multiline(res);
@@ -92,7 +95,7 @@ impl ast::ItemList {
    }
    #[must_use]
-    pub fn append_item(&self, item: ast::AssocItem) -> ast::ItemList {
+    pub fn append_item(&self, item: ast::AssocItem) -> ast::AssocItemList {
        let (indent, position) = match self.assoc_items().last() {
            Some(it) => (
                leading_indent(it.syntax()).unwrap_or_default().to_string(),
@@ -113,18 +116,18 @@ impl ast::ItemList {
    }
 }
-impl ast::RecordFieldList {
+impl ast::RecordExprFieldList {
    #[must_use]
-    pub fn append_field(&self, field: &ast::RecordField) -> ast::RecordFieldList {
+    pub fn append_field(&self, field: &ast::RecordExprField) -> ast::RecordExprFieldList {
        self.insert_field(InsertPosition::Last, field)
    }
    #[must_use]
    pub fn insert_field(
        &self,
-        position: InsertPosition<&'_ ast::RecordField>,
+        position: InsertPosition<&'_ ast::RecordExprField>,
-        field: &ast::RecordField,
+        field: &ast::RecordExprField,
-    ) -> ast::RecordFieldList {
+    ) -> ast::RecordExprFieldList {
        let is_multiline = self.syntax().text().contains_char('\n');
        let ws;
        let space = if is_multiline {
@@ -189,6 +192,21 @@ impl ast::RecordFieldList {
    }
 }
+impl ast::TypeAlias {
+    #[must_use]
+    pub fn remove_bounds(&self) -> ast::TypeAlias {
+        let colon = match self.colon_token() {
+            Some(it) => it,
+            None => return self.clone(),
+        };
+        let end = match self.type_bound_list() {
+            Some(it) => it.syntax().clone().into(),
+            None => colon.clone().into(),
+        };
+        self.replace_children(colon.into()..=end, iter::empty())
+    }
+}
 impl ast::TypeParam {
    #[must_use]
    pub fn remove_bounds(&self) -> ast::TypeParam {
@@ -244,9 +262,9 @@ impl ast::PathSegment {
    }
 }
-impl ast::UseItem {
+impl ast::Use {
    #[must_use]
-    pub fn with_use_tree(&self, use_tree: ast::UseTree) -> ast::UseItem {
+    pub fn with_use_tree(&self, use_tree: ast::UseTree) -> ast::Use {
        if let Some(old) = self.use_tree() {
            return self.replace_descendant(old, use_tree);
        }
@@ -300,9 +318,9 @@ impl ast::UseTree {
            None => return self.clone(),
        };
        let use_tree = make::use_tree(
-            suffix.clone(),
+            suffix,
            self.use_tree_list(),
-            self.alias(),
+            self.rename(),
            self.star_token().is_some(),
        );
        let nested = make::use_tree_list(iter::once(use_tree));
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_ext.rs
index db5438d68..f5ba87223 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_ext.rs
@@ -7,6 +7,8 @@ use crate::{
    SyntaxToken, T,
 };
+impl ast::AttrsOwner for ast::Expr {}
 impl ast::Expr {
    pub fn is_block_like(&self) -> bool {
        match self {
@@ -331,13 +333,12 @@ impl ast::Literal {
        match token.kind() {
            INT_NUMBER => {
-                // FYI: there was a bug here previously, thus an if statement bellow is necessary.
+                // FYI: there was a bug here previously, thus the if statement below is necessary.
                // The lexer treats e.g. `1f64` as an integer literal. See
                // https://github.com/rust-analyzer/rust-analyzer/issues/1592
                // and the comments on the linked PR.
                let text = token.text();
                if let suffix @ Some(_) = Self::find_suffix(&text, &FLOAT_SUFFIXES) {
                    LiteralKind::FloatNumber { suffix }
                } else {
@@ -399,7 +400,7 @@ impl ast::BlockExpr {
            Some(it) => it,
            None => return true,
        };
-        !matches!(parent.kind(), FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR)
+        !matches!(parent.kind(), FN | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR)
    }
 }
@@ -410,8 +411,8 @@ fn test_literal_with_attr() {
    assert_eq!(lit.token().text(), r#""Hello""#);
 }
-impl ast::RecordField {
+impl ast::RecordExprField {
-    pub fn parent_record_lit(&self) -> ast::RecordLit {
+    pub fn parent_record_lit(&self) -> ast::RecordExpr {
-        self.syntax().ancestors().find_map(ast::RecordLit::cast).unwrap()
+        self.syntax().ancestors().find_map(ast::RecordExpr::cast).unwrap()
    }
 }
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index 58141da11..4306efe13 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -5,557 +5,529 @@ use crate::{
    SyntaxKind::{self, *},
    SyntaxNode, SyntaxToken, T,
 };
-/// The entire Rust source file. Includes all top-level inner attributes and module items.
-///
-/// [Reference](https://doc.rust-lang.org/reference/crates-and-source-files.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SourceFile {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::ModuleItemOwner for SourceFile {}
 impl ast::AttrsOwner for SourceFile {}
-impl ast::DocCommentsOwner for SourceFile {}
+impl ast::ModuleItemOwner for SourceFile {}
 impl SourceFile {
-    pub fn modules(&self) -> AstChildren<Module> { support::children(&self.syntax) }
+    pub fn shebang_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![shebang]) }
-}
+}
-/// Function definition either with body or not.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes all of its attributes and doc comments.
+pub struct Attr {
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     pub extern "C" fn foo<T>(#[attr] Patern {p}: Pattern) -> u32
-///     where
-///         T: Debug
-///     {
-///         42
-///     }
-/// ❱
-///
-/// extern "C" {
-///     ❰ fn fn_decl(also_variadic_ffi: u32, ...) -> u32; ❱
-/// }
-/// ```
-///
-/// - [Reference](https://doc.rust-lang.org/reference/items/functions.html)
-/// - [Nomicon](https://doc.rust-lang.org/nomicon/ffi.html#variadic-functions)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct FnDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for FnDef {}
+impl Attr {
-impl ast::NameOwner for FnDef {}
+    pub fn pound_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![#]) }
-impl ast::TypeParamsOwner for FnDef {}
+    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
-impl ast::DocCommentsOwner for FnDef {}
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
-impl ast::AttrsOwner for FnDef {}
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-impl FnDef {
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
+    pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) }
+    pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
+    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Const {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Const {}
+impl ast::NameOwner for Const {}
+impl ast::VisibilityOwner for Const {}
+impl Const {
+    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
+    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
+    pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Enum {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Enum {}
+impl ast::NameOwner for Enum {}
+impl ast::VisibilityOwner for Enum {}
+impl ast::GenericParamsOwner for Enum {}
+impl Enum {
+    pub fn enum_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![enum]) }
+    pub fn variant_list(&self) -> Option<VariantList> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ExternBlock {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for ExternBlock {}
+impl ExternBlock {
+    pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
+    pub fn extern_item_list(&self) -> Option<ExternItemList> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ExternCrate {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for ExternCrate {}
+impl ast::VisibilityOwner for ExternCrate {}
+impl ExternCrate {
+    pub fn extern_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![extern]) }
+    pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
+    pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
+    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
+    pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Fn {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Fn {}
+impl ast::NameOwner for Fn {}
+impl ast::VisibilityOwner for Fn {}
+impl ast::GenericParamsOwner for Fn {}
+impl Fn {
    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
+    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
    pub fn fn_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![fn]) }
    pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) }
    pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
    pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
-/// Return type annotation.
-///
-/// ```
-/// fn foo(a: u32) ❰ -> Option<u32> ❱ { Some(a) }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/functions.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RetType {
+pub struct Impl {
    pub(crate) syntax: SyntaxNode,
 }
-impl RetType {
+impl ast::AttrsOwner for Impl {}
-    pub fn thin_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![->]) }
+impl ast::VisibilityOwner for Impl {}
+impl ast::GenericParamsOwner for Impl {}
+impl Impl {
+    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn impl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![impl]) }
+    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
+    pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
+    pub fn assoc_item_list(&self) -> Option<AssocItemList> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct MacroCall {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for MacroCall {}
+impl ast::NameOwner for MacroCall {}
+impl MacroCall {
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
+    pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Module {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Module {}
+impl ast::NameOwner for Module {}
+impl ast::VisibilityOwner for Module {}
+impl Module {
+    pub fn mod_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mod]) }
+    pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Static {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Static {}
+impl ast::NameOwner for Static {}
+impl ast::VisibilityOwner for Static {}
+impl Static {
+    pub fn static_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![static]) }
+    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
+    pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
-/// Struct definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes all of its attributes and doc comments.
+pub struct Struct {
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     struct Foo<T> where T: Debug {
-///         /// Docs
-///         #[attr]
-///         pub a: u32,
-///         b: T,
-///     }
-/// ❱
-///
-/// ❰ struct Foo; ❱
-/// ❰ struct Foo<T>(#[attr] T) where T: Debug; ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StructDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for StructDef {}
+impl ast::AttrsOwner for Struct {}
-impl ast::NameOwner for StructDef {}
+impl ast::NameOwner for Struct {}
-impl ast::TypeParamsOwner for StructDef {}
+impl ast::VisibilityOwner for Struct {}
-impl ast::AttrsOwner for StructDef {}
+impl ast::GenericParamsOwner for Struct {}
-impl ast::DocCommentsOwner for StructDef {}
+impl Struct {
-impl StructDef {
    pub fn struct_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![struct]) }
-    pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) }
    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
+    pub fn field_list(&self) -> Option<FieldList> { support::child(&self.syntax) }
 }
-/// Union definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes all of its attributes and doc comments.
+pub struct Trait {
-///
+    pub(crate) syntax: SyntaxNode,
-/// ```
+}
-/// ❰
+impl ast::AttrsOwner for Trait {}
-///     /// Docs
+impl ast::NameOwner for Trait {}
-///     #[attr]
+impl ast::VisibilityOwner for Trait {}
-///     pub union Foo<T> where T: Debug {
+impl ast::GenericParamsOwner for Trait {}
-///         /// Docs
+impl ast::TypeBoundsOwner for Trait {}
-///         #[attr]
+impl Trait {
-///         a: T,
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
-///         b: u32,
+    pub fn auto_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![auto]) }
-///     }
+    pub fn trait_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![trait]) }
-/// ❱
+    pub fn assoc_item_list(&self) -> Option<AssocItemList> { support::child(&self.syntax) }
-/// ```
+}
-///
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// [Reference](https://doc.rust-lang.org/reference/items/unions.html)
+pub struct TypeAlias {
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UnionDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for UnionDef {}
+impl ast::AttrsOwner for TypeAlias {}
-impl ast::NameOwner for UnionDef {}
+impl ast::NameOwner for TypeAlias {}
-impl ast::TypeParamsOwner for UnionDef {}
+impl ast::VisibilityOwner for TypeAlias {}
-impl ast::AttrsOwner for UnionDef {}
+impl ast::GenericParamsOwner for TypeAlias {}
-impl ast::DocCommentsOwner for UnionDef {}
+impl ast::TypeBoundsOwner for TypeAlias {}
-impl UnionDef {
+impl TypeAlias {
+    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
+    pub fn type_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![type]) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Union {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Union {}
+impl ast::NameOwner for Union {}
+impl ast::VisibilityOwner for Union {}
+impl ast::GenericParamsOwner for Union {}
+impl Union {
    pub fn union_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![union]) }
-    pub fn record_field_def_list(&self) -> Option<RecordFieldDefList> {
+    pub fn record_field_list(&self) -> Option<RecordFieldList> { support::child(&self.syntax) }
-        support::child(&self.syntax)
+}
-    }
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Use {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Use {}
+impl ast::VisibilityOwner for Use {}
+impl Use {
+    pub fn use_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![use]) }
+    pub fn use_tree(&self) -> Option<UseTree> { support::child(&self.syntax) }
+    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Visibility {
+    pub(crate) syntax: SyntaxNode,
+}
+impl Visibility {
+    pub fn pub_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![pub]) }
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
+    pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) }
+    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
+    pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
+    pub fn in_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![in]) }
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Name {
+    pub(crate) syntax: SyntaxNode,
+}
+impl Name {
+    pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ItemList {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for ItemList {}
+impl ast::ModuleItemOwner for ItemList {}
+impl ItemList {
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct NameRef {
+    pub(crate) syntax: SyntaxNode,
 }
-/// Record field definition list including enclosing curly braces.
+impl NameRef {
-///
+    pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) }
-/// ```
+}
-/// struct Foo // same for union
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// ❰
+pub struct Rename {
-///     {
+    pub(crate) syntax: SyntaxNode,
-///         a: u32,
+}
-///         b: bool,
+impl ast::NameOwner for Rename {}
-///     }
+impl Rename {
-/// ❱
+    pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }
-/// ```
+    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
-///
+}
-/// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct UseTree {
-pub struct RecordFieldDefList {
+    pub(crate) syntax: SyntaxNode,
+}
+impl UseTree {
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
+    pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) }
+    pub fn rename(&self) -> Option<Rename> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Path {
+    pub(crate) syntax: SyntaxNode,
+}
+impl Path {
+    pub fn qualifier(&self) -> Option<Path> { support::child(&self.syntax) }
+    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn segment(&self) -> Option<PathSegment> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct UseTreeList {
    pub(crate) syntax: SyntaxNode,
 }
-impl RecordFieldDefList {
+impl UseTreeList {
    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn fields(&self) -> AstChildren<RecordFieldDef> { support::children(&self.syntax) }
+    pub fn use_trees(&self) -> AstChildren<UseTree> { support::children(&self.syntax) }
    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
-/// Record field definition including its attributes and doc comments.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-///
+pub struct Abi {
-/// ` ``
-/// same for union
-/// struct Foo {
-///      ❰
-///          /// Docs
-///          #[attr]
-///          pub a: u32
-///      ❱
-///
-///      ❰ b: bool ❱
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for RecordFieldDef {}
+impl Abi {
-impl ast::NameOwner for RecordFieldDef {}
+    pub fn extern_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![extern]) }
-impl ast::AttrsOwner for RecordFieldDef {}
+}
-impl ast::DocCommentsOwner for RecordFieldDef {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-impl ast::TypeAscriptionOwner for RecordFieldDef {}
+pub struct GenericParamList {
-impl RecordFieldDef {}
+    pub(crate) syntax: SyntaxNode,
-/// Tuple field definition list including enclosing parens.
+}
-///
+impl GenericParamList {
-/// ```
+    pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
-/// struct Foo ❰ (u32, String, Vec<u32>) ❱;
+    pub fn generic_params(&self) -> AstChildren<GenericParam> { support::children(&self.syntax) }
-/// ```
+    pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
-///
+}
-/// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ParamList {
-pub struct TupleFieldDefList {
    pub(crate) syntax: SyntaxNode,
 }
-impl TupleFieldDefList {
+impl ParamList {
    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-    pub fn fields(&self) -> AstChildren<TupleFieldDef> { support::children(&self.syntax) }
+    pub fn self_param(&self) -> Option<SelfParam> { support::child(&self.syntax) }
+    pub fn comma_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![,]) }
+    pub fn params(&self) -> AstChildren<Param> { support::children(&self.syntax) }
    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
-/// Tuple field definition including its attributes.
-///
-/// ```
-/// struct Foo(❰ #[attr] u32 ❱);
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TupleFieldDef {
+pub struct RetType {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for TupleFieldDef {}
+impl RetType {
-impl ast::AttrsOwner for TupleFieldDef {}
+    pub fn thin_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![->]) }
-impl TupleFieldDef {
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Enum definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes all of its attributes and doc comments.
+pub struct WhereClause {
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     pub enum Foo<T> where T: Debug {
-///         /// Docs
-///         #[attr]
-///         Bar,
-///         Baz(#[attr] u32),
-///         Bruh {
-///             a: u32,
-///             /// Docs
-///             #[attr]
-///             b: T,
-///         }
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for EnumDef {}
+impl WhereClause {
-impl ast::NameOwner for EnumDef {}
+    pub fn where_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![where]) }
-impl ast::TypeParamsOwner for EnumDef {}
+    pub fn predicates(&self) -> AstChildren<WherePred> { support::children(&self.syntax) }
-impl ast::AttrsOwner for EnumDef {}
+}
-impl ast::DocCommentsOwner for EnumDef {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-impl EnumDef {
+pub struct BlockExpr {
-    pub fn enum_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![enum]) }
-    pub fn variant_list(&self) -> Option<EnumVariantList> { support::child(&self.syntax) }
-}
-/// Enum variant definition list including enclosing curly braces.
-///
-/// ```
-/// enum Foo
-/// ❰
-///     {
-///         Bar,
-///         Baz(u32),
-///         Bruh {
-///             a: u32
-///         }
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumVariantList {
    pub(crate) syntax: SyntaxNode,
 }
-impl EnumVariantList {
+impl ast::AttrsOwner for BlockExpr {}
+impl ast::ModuleItemOwner for BlockExpr {}
+impl BlockExpr {
+    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn variants(&self) -> AstChildren<EnumVariant> { support::children(&self.syntax) }
+    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
-/// Enum variant definition including its attributes and discriminant value definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-///
+pub struct SelfParam {
-/// ```
-/// enum Foo {
-///     ❰
-///         /// Docs
-///         #[attr]
-///         Bar
-///     ❱
-///
-///     // same for tuple and record variants
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct EnumVariant {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for EnumVariant {}
+impl ast::AttrsOwner for SelfParam {}
-impl ast::NameOwner for EnumVariant {}
+impl SelfParam {
-impl ast::DocCommentsOwner for EnumVariant {}
+    pub fn amp_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![&]) }
-impl ast::AttrsOwner for EnumVariant {}
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
-impl EnumVariant {
+        support::token(&self.syntax, T![lifetime])
-    pub fn field_def_list(&self) -> Option<FieldDefList> { support::child(&self.syntax) }
+    }
-    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
+    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Trait definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes all of its attributes and doc comments.
+pub struct Param {
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     pub unsafe trait Foo<T>: Debug where T: Debug {
-///         // ...
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/traits.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TraitDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for TraitDef {}
+impl ast::AttrsOwner for Param {}
-impl ast::NameOwner for TraitDef {}
+impl Param {
-impl ast::AttrsOwner for TraitDef {}
+    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-impl ast::DocCommentsOwner for TraitDef {}
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
-impl ast::TypeParamsOwner for TraitDef {}
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-impl ast::TypeBoundsOwner for TraitDef {}
+    pub fn dotdotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![...]) }
-impl TraitDef {
-    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
-    pub fn auto_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![auto]) }
-    pub fn trait_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![trait]) }
-    pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) }
 }
-/// Module definition either with body or not.
-/// Includes all of its inner and outer attributes, module items, doc comments.
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     pub mod foo;
-/// ❱
-///
-/// ❰
-///     /// Docs
-///     #[attr]
-///     pub mod bar {
-///        //! Inner docs
-///        #![inner_attr]
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/modules.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Module {
+pub struct TypeBoundList {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for Module {}
+impl TypeBoundList {
-impl ast::NameOwner for Module {}
+    pub fn bounds(&self) -> AstChildren<TypeBound> { support::children(&self.syntax) }
-impl ast::AttrsOwner for Module {}
-impl ast::DocCommentsOwner for Module {}
-impl Module {
-    pub fn mod_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mod]) }
-    pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) }
-    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
-/// Item defintion list.
-/// This is used for both top-level items and impl block items.
-///
-/// ```
-/// ❰
-///     fn foo {}
-///     struct Bar;
-///     enum Baz;
-///     trait Bruh;
-///     const BRUUH: u32 = 42;
-/// ❱
-///
-/// impl Foo
-/// ❰
-///     {
-///         fn bar() {}
-///         const BAZ: u32 = 42;
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ItemList {
+pub struct RecordFieldList {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::ModuleItemOwner for ItemList {}
+impl RecordFieldList {
-impl ItemList {
    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn assoc_items(&self) -> AstChildren<AssocItem> { support::children(&self.syntax) }
+    pub fn fields(&self) -> AstChildren<RecordField> { support::children(&self.syntax) }
    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
-/// Constant variable definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes all of its attributes and doc comments.
+pub struct TupleFieldList {
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     pub const FOO: u32 = 42;
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/constant-items.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ConstDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for ConstDef {}
+impl TupleFieldList {
-impl ast::NameOwner for ConstDef {}
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-impl ast::TypeParamsOwner for ConstDef {}
+    pub fn fields(&self) -> AstChildren<TupleField> { support::children(&self.syntax) }
-impl ast::AttrsOwner for ConstDef {}
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
-impl ast::DocCommentsOwner for ConstDef {}
+}
-impl ast::TypeAscriptionOwner for ConstDef {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-impl ConstDef {
+pub struct RecordField {
-    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
+    pub(crate) syntax: SyntaxNode,
-    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
+}
-    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
+impl ast::AttrsOwner for RecordField {}
-    pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
+impl ast::NameOwner for RecordField {}
-    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
+impl ast::VisibilityOwner for RecordField {}
+impl RecordField {
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Static variable definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes all of its attributes and doc comments.
+pub struct TupleField {
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     pub static mut FOO: u32 = 42;
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/static-items.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct StaticDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for StaticDef {}
+impl ast::AttrsOwner for TupleField {}
-impl ast::NameOwner for StaticDef {}
+impl ast::VisibilityOwner for TupleField {}
-impl ast::TypeParamsOwner for StaticDef {}
+impl TupleField {
-impl ast::AttrsOwner for StaticDef {}
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-impl ast::DocCommentsOwner for StaticDef {}
+}
-impl ast::TypeAscriptionOwner for StaticDef {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-impl StaticDef {
+pub struct VariantList {
-    pub fn static_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![static]) }
+    pub(crate) syntax: SyntaxNode,
-    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
+}
+impl VariantList {
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn variants(&self) -> AstChildren<Variant> { support::children(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Variant {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for Variant {}
+impl ast::NameOwner for Variant {}
+impl ast::VisibilityOwner for Variant {}
+impl Variant {
+    pub fn field_list(&self) -> Option<FieldList> { support::child(&self.syntax) }
    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
-/// Type alias definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes associated type clauses with type bounds.
+pub struct AssocItemList {
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     pub type Foo<T> where T: Debug = T;
-/// ❱
-///
-/// trait Bar {
-///     ❰ type Baz: Debug; ❱
-///     ❰ type Bruh = String; ❱
-///     ❰ type Bruuh: Debug = u32; ❱
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/type-aliases.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeAliasDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::VisibilityOwner for TypeAliasDef {}
+impl ast::AttrsOwner for AssocItemList {}
-impl ast::NameOwner for TypeAliasDef {}
+impl AssocItemList {
-impl ast::TypeParamsOwner for TypeAliasDef {}
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-impl ast::AttrsOwner for TypeAliasDef {}
+    pub fn assoc_items(&self) -> AstChildren<AssocItem> { support::children(&self.syntax) }
-impl ast::DocCommentsOwner for TypeAliasDef {}
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-impl ast::TypeBoundsOwner for TypeAliasDef {}
+}
-impl TypeAliasDef {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
+pub struct ExternItemList {
-    pub fn type_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![type]) }
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for ExternItemList {}
+impl ExternItemList {
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn extern_items(&self) -> AstChildren<ExternItem> { support::children(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct LifetimeParam {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for LifetimeParam {}
+impl LifetimeParam {
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct TypeParam {
+    pub(crate) syntax: SyntaxNode,
+}
+impl ast::AttrsOwner for TypeParam {}
+impl ast::NameOwner for TypeParam {}
+impl ast::TypeBoundsOwner for TypeParam {}
+impl TypeParam {
    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn default_type(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
-/// Inherent and trait impl definition.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Includes all of its inner and outer attributes.
+pub struct ConstParam {
-///
-/// ```
-/// ❰
-///     #[attr]
-///     unsafe impl<T> const !Foo for Bar where T: Debug {
-///         #![inner_attr]
-///         // ...
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/implementations.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ImplDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::TypeParamsOwner for ImplDef {}
+impl ast::AttrsOwner for ConstParam {}
-impl ast::AttrsOwner for ImplDef {}
+impl ast::NameOwner for ConstParam {}
-impl ast::DocCommentsOwner for ImplDef {}
+impl ConstParam {
-impl ImplDef {
-    pub fn default_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![default]) }
    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
-    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
-    pub fn impl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![impl]) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
+    pub fn default_val(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn item_list(&self) -> Option<ItemList> { support::child(&self.syntax) }
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Literal {
+    pub(crate) syntax: SyntaxNode,
+}
+impl Literal {}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct TokenTree {
+    pub(crate) syntax: SyntaxNode,
+}
+impl TokenTree {
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
+    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
-/// Parenthesized type reference.
-/// Note: parens are only used for grouping, this is not a tuple type.
-///
-/// ```
-/// // This is effectively just `u32`.
-/// // Single-item tuple must be defined with a trailing comma: `(u32,)`
-/// type Foo = ❰ (u32) ❱;
-///
-/// let bar: &'static ❰ (dyn Debug) ❱ = "bruh";
-/// ```
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParenType {
    pub(crate) syntax: SyntaxNode,
 }
 impl ParenType {
    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
-/// Unnamed tuple type.
-///
-/// ```
-/// let foo: ❰ (u32, bool) ❱ = (42, true);
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/tuple.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TupleType {
    pub(crate) syntax: SyntaxNode,
@@ -565,17 +537,6 @@ impl TupleType {
    pub fn fields(&self) -> AstChildren<TypeRef> { support::children(&self.syntax) }
    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
-/// The never type (i.e. the exclamation point).
-///
-/// ```
-/// type T = ❰ ! ❱;
-///
-/// fn no_return() -> ❰ ! ❱ {
-///     loop {}
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/never.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct NeverType {
    pub(crate) syntax: SyntaxNode,
@@ -583,17 +544,6 @@ pub struct NeverType {
 impl NeverType {
    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
 }
-/// Path to a type.
-/// Includes single identifier type names and elaborate paths with
-/// generic parameters.
-///
-/// ```
-/// type Foo = ❰ String ❱;
-/// type Bar = ❰ std::vec::Vec<T> ❱;
-/// type Baz = ❰ ::bruh::<Bruuh as Iterator>::Item ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/paths.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathType {
    pub(crate) syntax: SyntaxNode,
@@ -601,14 +551,6 @@ pub struct PathType {
 impl PathType {
    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
-/// Raw pointer type.
-///
-/// ```
-/// type Foo = ❰ *const u32 ❱;
-/// type Bar = ❰ *mut u32 ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/pointer.html#raw-pointers-const-and-mut)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PointerType {
    pub(crate) syntax: SyntaxNode,
@@ -617,49 +559,28 @@ impl PointerType {
    pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Array type.
-///
-/// ```
-/// type Foo = ❰ [u32; 24 - 3] ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/array.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ArrayType {
    pub(crate) syntax: SyntaxNode,
 }
 impl ArrayType {
    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
-/// Slice type.
-///
-/// ```
-/// type Foo = ❰ [u8] ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/slice.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SliceType {
    pub(crate) syntax: SyntaxNode,
 }
 impl SliceType {
    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
-/// Reference type.
-///
-/// ```
-/// type Foo = ❰ &'static str ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/pointer.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ReferenceType {
    pub(crate) syntax: SyntaxNode,
@@ -670,15 +591,8 @@ impl ReferenceType {
        support::token(&self.syntax, T![lifetime])
    }
    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Placeholder type (i.e. the underscore).
-///
-/// ```
-/// let foo: ❰ _ ❱ = 42_u32;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/inferred.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PlaceholderType {
    pub(crate) syntax: SyntaxNode,
@@ -686,15 +600,6 @@ pub struct PlaceholderType {
 impl PlaceholderType {
    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
 }
-/// Function pointer type (not to be confused with `Fn*` family of traits).
-///
-/// ```
-/// type Foo = ❰ async fn(#[attr] u32, named: bool) -> u32 ❱;
-///
-/// type Bar = ❰ extern "C" fn(variadic: u32, #[attr] ...) ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/function-pointer.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct FnPointerType {
    pub(crate) syntax: SyntaxNode,
@@ -706,59 +611,31 @@ impl FnPointerType {
    pub fn param_list(&self) -> Option<ParamList> { support::child(&self.syntax) }
    pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
 }
-/// Higher order type.
-///
-/// ```
-/// type Foo = ❰ for<'a> fn(&'a str) ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/nomicon/hrtb.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ForType {
    pub(crate) syntax: SyntaxNode,
 }
 impl ForType {
    pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
-    pub fn type_param_list(&self) -> Option<TypeParamList> { support::child(&self.syntax) }
+    pub fn generic_param_list(&self) -> Option<GenericParamList> { support::child(&self.syntax) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Opaque `impl Trait` type.
-///
-/// ```
-/// fn foo(bar: ❰ impl Debug + Eq ❱) {}
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/impl-trait.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ImplTraitType {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::TypeBoundsOwner for ImplTraitType {}
 impl ImplTraitType {
    pub fn impl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![impl]) }
+    pub fn type_bound_list(&self) -> Option<TypeBoundList> { support::child(&self.syntax) }
 }
-/// Trait object type.
-///
-/// ```
-/// type Foo = ❰ dyn Debug ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/types/trait-object.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct DynTraitType {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::TypeBoundsOwner for DynTraitType {}
 impl DynTraitType {
    pub fn dyn_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![dyn]) }
+    pub fn type_bound_list(&self) -> Option<TypeBoundList> { support::child(&self.syntax) }
 }
-/// Tuple literal.
-///
-/// ```
-/// ❰ (42, true) ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/tuple-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TupleExpr {
    pub(crate) syntax: SyntaxNode,
@@ -769,15 +646,6 @@ impl TupleExpr {
    pub fn exprs(&self) -> AstChildren<Expr> { support::children(&self.syntax) }
    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
-/// Array literal.
-///
-/// ```
-/// ❰ [#![inner_attr] true, false, true] ❱;
-///
-/// ❰ ["baz"; 24] ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/array-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ArrayExpr {
    pub(crate) syntax: SyntaxNode,
@@ -786,17 +654,10 @@ impl ast::AttrsOwner for ArrayExpr {}
 impl ArrayExpr {
    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
    pub fn exprs(&self) -> AstChildren<Expr> { support::children(&self.syntax) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
-/// Parenthesized expression.
-/// Note: parens are only used for grouping, this is not a tuple literal.
-///
-/// ```
-/// ❰ (#![inner_attr] 2 + 2) ❱ * 2;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/grouped-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParenExpr {
    pub(crate) syntax: SyntaxNode,
@@ -807,19 +668,6 @@ impl ParenExpr {
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
-/// Path to a symbol in expression context.
-/// Includes single identifier variable names and elaborate paths with
-/// generic parameters.
-///
-/// ```
-/// ❰ Some::<i32> ❱;
-/// ❰ foo ❱ + 42;
-/// ❰ Vec::<i32>::push ❱;
-/// ❰ <[i32]>::reverse ❱;
-/// ❰ <String as std::borrow::Borrow<str>>::borrow ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/path-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathExpr {
    pub(crate) syntax: SyntaxNode,
@@ -827,17 +675,6 @@ pub struct PathExpr {
 impl PathExpr {
    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
-/// Anonymous callable object literal a.k.a. closure, lambda or functor.
-///
-/// ```
-/// ❰ || 42 ❱;
-/// ❰ |a: u32| val + 1 ❱;
-/// ❰ async |#[attr] Pattern(_): Pattern| { bar } ❱;
-/// ❰ move || baz ❱;
-/// ❰ || -> u32 { closure_with_ret_type_annotation_requires_block_expr } ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/closure-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LambdaExpr {
    pub(crate) syntax: SyntaxNode,
@@ -851,25 +688,6 @@ impl LambdaExpr {
    pub fn ret_type(&self) -> Option<RetType> { support::child(&self.syntax) }
    pub fn body(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// If expression. Includes both regular `if` and `if let` forms.
-/// Beware that `else if` is a special case syntax sugar, because in general
-/// there has to be block expression after `else`.
-///
-/// ```
-/// ❰ if bool_cond { 42 } ❱
-/// ❰ if bool_cond { 42 } else { 24 } ❱
-/// ❰ if bool_cond { 42 } else if bool_cond2 { 42 } ❱
-///
-/// ❰
-///     if let Pattern(foo) = bar {
-///         foo
-///     } else {
-///         panic!();
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/if-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct IfExpr {
    pub(crate) syntax: SyntaxNode,
@@ -879,40 +697,16 @@ impl IfExpr {
    pub fn if_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![if]) }
    pub fn condition(&self) -> Option<Condition> { support::child(&self.syntax) }
 }
-/// Unconditional loop expression.
-///
-/// ```
-/// ❰
-///     loop {
-///         // yeah, it's that simple...
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LoopExpr {
+pub struct Condition {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for LoopExpr {}
+impl Condition {
-impl ast::LoopBodyOwner for LoopExpr {}
+    pub fn let_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![let]) }
-impl LoopExpr {
+    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn loop_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![loop]) }
+    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Block expression with an optional prefix (label, try ketword,
-/// unsafe keyword, async keyword...).
-///
-/// ```
-/// ❰
-///     'label: try {
-///         None?
-///     }
-/// ❱
-/// ```
-///
-/// - [try block](https://doc.rust-lang.org/unstable-book/language-features/try-blocks.html)
-/// - [unsafe block](https://doc.rust-lang.org/reference/expressions/block-expr.html#unsafe-blocks)
-/// - [async block](https://doc.rust-lang.org/reference/expressions/block-expr.html#async-blocks)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct EffectExpr {
    pub(crate) syntax: SyntaxNode,
@@ -925,19 +719,24 @@ impl EffectExpr {
    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
    pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
 }
-/// For loop expression.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// Note: record struct literals are not valid as iterable expression
+pub struct Label {
-/// due to ambiguity.
+    pub(crate) syntax: SyntaxNode,
-///
+}
-/// ```
+impl Label {
-/// ❰
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
-/// for i in (0..4) {
+        support::token(&self.syntax, T![lifetime])
-///     dbg!(i);
+    }
-/// }
+}
-/// ❱
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// ```
+pub struct LoopExpr {
-///
+    pub(crate) syntax: SyntaxNode,
-/// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#iterator-loops)
+}
+impl ast::AttrsOwner for LoopExpr {}
+impl ast::LoopBodyOwner for LoopExpr {}
+impl LoopExpr {
+    pub fn loop_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![loop]) }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ForExpr {
    pub(crate) syntax: SyntaxNode,
@@ -950,22 +749,6 @@ impl ForExpr {
    pub fn in_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![in]) }
    pub fn iterable(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// While loop expression. Includes both regular `while` and `while let` forms.
-///
-/// ```
-/// ❰
-///     while bool_cond {
-///         42;
-///     }
-/// ❱
-/// ❰
-///     while let Pattern(foo) = bar {
-///         bar += 1;
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#predicate-loops)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct WhileExpr {
    pub(crate) syntax: SyntaxNode,
@@ -976,22 +759,6 @@ impl WhileExpr {
    pub fn while_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![while]) }
    pub fn condition(&self) -> Option<Condition> { support::child(&self.syntax) }
 }
-/// Continue expression.
-///
-/// ```
-/// while bool_cond {
-///     ❰ continue ❱;
-/// }
-///
-/// 'outer: loop {
-///     loop {
-///         ❰ continue 'outer ❱;
-///     }
-/// }
-///
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#continue-expressions)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ContinueExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1005,25 +772,6 @@ impl ContinueExpr {
        support::token(&self.syntax, T![lifetime])
    }
 }
-/// Break expression.
-///
-/// ```
-/// while bool_cond {
-///     ❰ break ❱;
-/// }
-/// 'outer: loop {
-///     for foo in bar {
-///         ❰ break 'outer ❱;
-///     }
-/// }
-/// 'outer: loop {
-///     loop {
-///         ❰ break 'outer 42 ❱;
-///     }
-/// }
-/// ```
-///
-/// [Refernce](https://doc.rust-lang.org/reference/expressions/loop-expr.html#break-expressions)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BreakExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1036,104 +784,33 @@ impl BreakExpr {
    }
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Label.
-///
-/// ```
-/// ❰ 'outer: ❱ loop {}
-///
-/// let foo = ❰ 'bar: ❱ loop {}
-///
-/// ❰ 'baz: ❱ {
-///     break 'baz;
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html?highlight=label#loop-labels)
-/// [Labels for blocks RFC](https://github.com/rust-lang/rfcs/blob/master/text/2046-label-break-value.md)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Label {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Label {
-    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
-        support::token(&self.syntax, T![lifetime])
-    }
-}
-/// Block expression. Includes unsafe blocks and block labels.
-///
-/// ```
-///     let foo = ❰
-///         {
-///             #![inner_attr]
-///             ❰ { } ❱
-///
-///             ❰ 'label: { break 'label } ❱
-///         }
-///     ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/block-expr.html)
-/// [Labels for blocks RFC](https://github.com/rust-lang/rfcs/blob/master/text/2046-label-break-value.md)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct BlockExpr {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for BlockExpr {}
-impl ast::ModuleItemOwner for BlockExpr {}
-impl BlockExpr {
-    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-}
-/// Return expression.
-///
-/// ```
-/// || ❰ return 42 ❱;
-///
-/// fn bar() {
-///     ❰ return ❱;
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/return-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ReturnExpr {
    pub(crate) syntax: SyntaxNode,
 }
 impl ast::AttrsOwner for ReturnExpr {}
 impl ReturnExpr {
+    pub fn return_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![return]) }
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Call expression (not to be confused with method call expression, it is
-/// a separate ast node).
-///
-/// ```
-/// ❰ foo() ❱;
-/// ❰ &str::len("bar") ❱;
-/// ❰ <&str as PartialEq<&str>>::eq(&"", &"") ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/call-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct CallExpr {
    pub(crate) syntax: SyntaxNode,
 }
+impl ast::AttrsOwner for CallExpr {}
 impl ast::ArgListOwner for CallExpr {}
 impl CallExpr {
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Method call expression.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-///
+pub struct ArgList {
-/// ```
+    pub(crate) syntax: SyntaxNode,
-/// ❰ receiver_expr.method() ❱;
+}
-/// ❰ receiver_expr.method::<T>(42, true) ❱;
+impl ArgList {
-///
+    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-/// ❰ ❰ ❰ foo.bar() ❱ .baz() ❱ .bruh() ❱;
+    pub fn args(&self) -> AstChildren<Expr> { support::children(&self.syntax) }
-/// ```
+    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
-///
+}
-/// [Reference](https://doc.rust-lang.org/reference/expressions/method-call-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MethodCallExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1146,31 +823,19 @@ impl MethodCallExpr {
    pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
    pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) }
 }
-/// Index expression a.k.a. subscript operator call.
-///
-/// ```
-/// ❰ foo[42] ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/array-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct IndexExpr {
+pub struct TypeArgList {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for IndexExpr {}
+impl TypeArgList {
-impl IndexExpr {
+    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
-    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
+    pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
-    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
+    pub fn type_args(&self) -> AstChildren<TypeArg> { support::children(&self.syntax) }
+    pub fn lifetime_args(&self) -> AstChildren<LifetimeArg> { support::children(&self.syntax) }
+    pub fn assoc_type_args(&self) -> AstChildren<AssocTypeArg> { support::children(&self.syntax) }
+    pub fn const_args(&self) -> AstChildren<ConstArg> { support::children(&self.syntax) }
+    pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
 }
-/// Field access expression.
-///
-/// ```
-/// ❰ expr.bar ❱;
-///
-/// ❰ ❰ ❰ foo.bar ❱ .baz ❱ .bruh ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/field-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct FieldExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1181,13 +846,15 @@ impl FieldExpr {
    pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) }
    pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
 }
-/// Await operator call expression.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-///
+pub struct IndexExpr {
-/// ```
+    pub(crate) syntax: SyntaxNode,
-/// ❰ expr.await ❱;
+}
-/// ```
+impl ast::AttrsOwner for IndexExpr {}
-///
+impl IndexExpr {
-/// [Reference](https://doc.rust-lang.org/reference/expressions/await-expr.html)
+    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
+    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct AwaitExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1198,13 +865,6 @@ impl AwaitExpr {
    pub fn dot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![.]) }
    pub fn await_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![await]) }
 }
-/// The question mark operator call.
-///
-/// ```
-/// ❰ expr? ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#the-question-mark-operator)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TryExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1214,13 +874,6 @@ impl TryExpr {
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn question_mark_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![?]) }
 }
-/// Type cast expression.
-///
-/// ```
-/// ❰ expr as T ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#type-cast-expressions)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct CastExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1229,18 +882,8 @@ impl ast::AttrsOwner for CastExpr {}
 impl CastExpr {
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Borrow operator call.
-///
-/// ```
-/// ❰ &foo ❱;
-/// ❰ &mut bar ❱;
-/// ❰ &raw const bar ❱;
-/// ❰ &raw mut bar ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#borrow-operators)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RefExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1253,15 +896,6 @@ impl RefExpr {
    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Prefix operator call. This is either `!` or `*` or `-`.
-///
-/// ```
-/// ❰ !foo ❱;
-/// ❰ *bar ❱;
-/// ❰ -42 ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PrefixExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1270,13 +904,6 @@ impl ast::AttrsOwner for PrefixExpr {}
 impl PrefixExpr {
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Box operator call.
-///
-/// ```
-/// ❰ box 42 ❱;
-/// ```
-///
-/// [RFC](https://github.com/rust-lang/rfcs/blob/0806be4f282144cfcd55b1d20284b43f87cbe1c6/text/0809-box-and-in-for-stdlib.md)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BoxExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1286,69 +913,18 @@ impl BoxExpr {
    pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) }
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Range operator call.
-///
-/// ```
-/// ❰ 0..42 ❱;
-/// ❰ ..42 ❱;
-/// ❰ 0.. ❱;
-/// ❰ .. ❱;
-/// ❰ 0..=42 ❱;
-/// ❰ ..=42 ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/range-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RangeExpr {
    pub(crate) syntax: SyntaxNode,
 }
 impl ast::AttrsOwner for RangeExpr {}
 impl RangeExpr {}
-/// Binary operator call.
-/// Includes all arithmetic, logic, bitwise and assignment operators.
-///
-/// ```
-/// ❰ 2 + ❰ 2 * 2 ❱ ❱;
-/// ❰ ❰ true && false ❱ || true ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#arithmetic-and-logical-binary-operators)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BinExpr {
    pub(crate) syntax: SyntaxNode,
 }
 impl ast::AttrsOwner for BinExpr {}
 impl BinExpr {}
-/// [Raw] string, [raw] byte string, char, byte, integer, float or bool literal.
-///
-/// ```
-/// ❰ "str" ❱;
-/// ❰ br##"raw byte str"## ❱;
-/// ❰ 'c' ❱;
-/// ❰ b'c' ❱;
-/// ❰ 42 ❱;
-/// ❰ 1e9 ❱;
-/// ❰ true ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/literal-expr.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Literal {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Literal {}
-/// Match expression.
-///
-/// ```
-/// ❰
-///     match expr {
-///         Pat1 => {}
-///         Pat2(_) => 42,
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MatchExpr {
    pub(crate) syntax: SyntaxNode,
@@ -1359,40 +935,15 @@ impl MatchExpr {
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn match_arm_list(&self) -> Option<MatchArmList> { support::child(&self.syntax) }
 }
-/// Match arm list part of match expression. Includes its inner attributes.
-///
-/// ```
-/// match expr
-/// ❰
-///     {
-///         #![inner_attr]
-///         Pat1 => {}
-///         Pat2(_) => 42,
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MatchArmList {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for MatchArmList {}
 impl MatchArmList {
    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
    pub fn arms(&self) -> AstChildren<MatchArm> { support::children(&self.syntax) }
    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
-/// Match arm.
-/// Note: record struct literals are not valid as target match expression
-/// due to ambiguity.
-/// ```
-/// match expr {
-///     ❰ #[attr] Pattern(it) if bool_cond => it ❱,
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MatchArm {
    pub(crate) syntax: SyntaxNode,
@@ -1404,15 +955,6 @@ impl MatchArm {
    pub fn fat_arrow_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=>]) }
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Match guard.
-///
-/// ```
-/// match expr {
-///     Pattern(it) ❰ if bool_cond ❱ => it,
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html#match-guards)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MatchGuard {
    pub(crate) syntax: SyntaxNode,
@@ -1421,76 +963,37 @@ impl MatchGuard {
    pub fn if_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![if]) }
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Record literal expression. The same syntax is used for structs,
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-/// unions and record enum variants.
+pub struct RecordExpr {
-///
-/// ```
-/// ❰
-///     foo::Bar {
-///         #![inner_attr]
-///         baz: 42,
-///         bruh: true,
-///         ..spread
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordLit {
    pub(crate) syntax: SyntaxNode,
 }
-impl RecordLit {
+impl RecordExpr {
    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn record_field_list(&self) -> Option<RecordFieldList> { support::child(&self.syntax) }
+    pub fn record_expr_field_list(&self) -> Option<RecordExprFieldList> {
+        support::child(&self.syntax)
+    }
 }
-/// Record field list including enclosing curly braces.
-///
-/// foo::Bar ❰
-///     {
-///         baz: 42,
-///         ..spread
-///     }
-/// ❱
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordFieldList {
+pub struct RecordExprFieldList {
    pub(crate) syntax: SyntaxNode,
 }
-impl RecordFieldList {
+impl RecordExprFieldList {
    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn fields(&self) -> AstChildren<RecordField> { support::children(&self.syntax) }
+    pub fn fields(&self) -> AstChildren<RecordExprField> { support::children(&self.syntax) }
    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
    pub fn spread(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
-/// Record field.
-///
-/// ```
-/// foo::Bar {
-///     ❰ #[attr] baz: 42 ❱
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct RecordField {
+pub struct RecordExprField {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for RecordField {}
+impl ast::AttrsOwner for RecordExprField {}
-impl RecordField {
+impl RecordExprField {
    pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
-/// Disjunction of patterns.
-///
-/// ```
-/// let ❰ Foo(it) | Bar(it) | Baz(it) ❱ = bruh;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct OrPat {
    pub(crate) syntax: SyntaxNode,
@@ -1498,14 +1001,6 @@ pub struct OrPat {
 impl OrPat {
    pub fn pats(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
 }
-/// Parenthesized pattern.
-/// Note: parens are only used for grouping, this is not a tuple pattern.
-///
-/// ```
-/// if let ❰ &(0..=42) ❱ = foo {}
-/// ```
-///
-/// https://doc.rust-lang.org/reference/patterns.html#grouped-patterns
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParenPat {
    pub(crate) syntax: SyntaxNode,
@@ -1515,16 +1010,6 @@ impl ParenPat {
    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
-/// Reference pattern.
-/// Note: this has nothing to do with `ref` keyword, the latter is used in bind patterns.
-///
-/// ```
-/// let ❰ &mut foo ❱ = bar;
-///
-/// let ❰ & ❰ &mut ❰ &_ ❱ ❱ ❱ = baz;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#reference-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RefPat {
    pub(crate) syntax: SyntaxNode,
@@ -1534,31 +1019,14 @@ impl RefPat {
    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
 }
-/// Box pattern.
-///
-/// ```
-/// let ❰ box foo ❱ = box 42;
-/// ```
-///
-/// [Unstable book](https://doc.rust-lang.org/unstable-book/language-features/box-patterns.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BoxPat {
    pub(crate) syntax: SyntaxNode,
 }
 impl BoxPat {
    pub fn box_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![box]) }
-    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
-/// Bind pattern.
-///
-/// ```
-/// match foo {
-///     Some(❰ ref mut bar ❱) => {}
-///     ❰ baz @ None ❱ => {}
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#identifier-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct BindPat {
    pub(crate) syntax: SyntaxNode,
@@ -1571,13 +1039,6 @@ impl BindPat {
    pub fn at_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![@]) }
    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
 }
-/// Placeholder pattern a.k.a. the wildcard pattern or the underscore.
-///
-/// ```
-/// let ❰ _ ❱ = foo;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#wildcard-pattern)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PlaceholderPat {
    pub(crate) syntax: SyntaxNode,
@@ -1585,16 +1046,6 @@ pub struct PlaceholderPat {
 impl PlaceholderPat {
    pub fn underscore_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![_]) }
 }
-/// Rest-of-the record/tuple pattern.
-/// Note: this is not the unbonded range pattern (even more: it doesn't exist).
-///
-/// ```
-/// let Foo { bar, ❰ .. ❱ } = baz;
-/// let (❰ .. ❱, bruh) = (42, 24, 42);
-/// let Bruuh(❰ .. ❱) = bruuuh;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct DotDotPat {
    pub(crate) syntax: SyntaxNode,
@@ -1602,15 +1053,6 @@ pub struct DotDotPat {
 impl DotDotPat {
    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
 }
-/// Path pattern.
-/// Doesn't include the underscore pattern (it is a special case, namely `PlaceholderPat`).
-///
-/// ```
-/// let ❰ foo::bar::Baz ❱ { .. } = bruh;
-/// if let ❰ CONST ❱ = 42 {}
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#path-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathPat {
    pub(crate) syntax: SyntaxNode,
@@ -1618,13 +1060,6 @@ pub struct PathPat {
 impl PathPat {
    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
-/// Slice pattern.
-///
-/// ```
-/// let ❰ [foo, bar, baz] ❱ = [1, 2, 3];
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#slice-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct SlicePat {
    pub(crate) syntax: SyntaxNode,
@@ -1634,33 +1069,14 @@ impl SlicePat {
    pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
 }
-/// Range pattern.
-///
-/// ```
-/// match foo {
-///     ❰ 0..42 ❱ => {}
-///     ❰ 0..=42 ❱ => {}
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#range-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RangePat {
    pub(crate) syntax: SyntaxNode,
 }
-impl RangePat {}
+impl RangePat {
-/// Literal pattern.
+    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
-/// Includes only bool, number, char, and string literals.
+    pub fn dotdoteq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..=]) }
-///
+}
-/// ```
-/// match foo {
-///     Number(❰ 42 ❱) => {}
-///     String(❰ "42" ❱) => {}
-///     Bool(❰ true ❱) => {}
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#literal-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LiteralPat {
    pub(crate) syntax: SyntaxNode,
@@ -1668,13 +1084,6 @@ pub struct LiteralPat {
 impl LiteralPat {
    pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) }
 }
-/// Macro invocation in pattern position.
-///
-/// ```
-/// let ❰ foo!(my custom syntax) ❱ = baz;
-///
-/// ```
-/// [Reference](https://doc.rust-lang.org/reference/macros.html#macro-invocation)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MacroPat {
    pub(crate) syntax: SyntaxNode,
@@ -1682,37 +1091,22 @@ pub struct MacroPat {
 impl MacroPat {
    pub fn macro_call(&self) -> Option<MacroCall> { support::child(&self.syntax) }
 }
-/// Record literal pattern.
-///
-/// ```
-/// let ❰ foo::Bar { baz, .. } ❱ = bruh;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordPat {
    pub(crate) syntax: SyntaxNode,
 }
 impl RecordPat {
+    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
    pub fn record_field_pat_list(&self) -> Option<RecordFieldPatList> {
        support::child(&self.syntax)
    }
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
 }
-/// Record literal's field patterns list including enclosing curly braces.
-///
-/// ```
-/// let foo::Bar ❰ { baz, bind @ bruh, .. } ❱ = bruuh;
-/// ``
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordFieldPatList {
    pub(crate) syntax: SyntaxNode,
 }
 impl RecordFieldPatList {
    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn pats(&self) -> AstChildren<RecordInnerPat> { support::children(&self.syntax) }
    pub fn record_field_pats(&self) -> AstChildren<RecordFieldPat> {
        support::children(&self.syntax)
    }
@@ -1720,15 +1114,6 @@ impl RecordFieldPatList {
    pub fn dotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![..]) }
    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
-/// Record literal's field pattern.
-/// Note: record literal can also match tuple structs.
-///
-/// ```
-/// let Foo { ❰ bar: _ ❱ } = baz;
-/// let TupleStruct { ❰ 0: _ ❱ } = bruh;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct RecordFieldPat {
    pub(crate) syntax: SyntaxNode,
@@ -1739,13 +1124,6 @@ impl RecordFieldPat {
    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
 }
-/// Tuple struct literal pattern.
-///
-/// ```
-/// let ❰ foo::Bar(baz, bruh) ❱ = bruuh;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#tuple-struct-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TupleStructPat {
    pub(crate) syntax: SyntaxNode,
@@ -1756,14 +1134,6 @@ impl TupleStructPat {
    pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
-/// Tuple pattern.
-/// Note: this doesn't include tuple structs (see `TupleStructPat`)
-///
-/// ```
-/// let ❰ (foo, bar, .., baz) ❱ = bruh;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/patterns.html#tuple-patterns)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TuplePat {
    pub(crate) syntax: SyntaxNode,
@@ -1773,234 +1143,28 @@ impl TuplePat {
    pub fn args(&self) -> AstChildren<Pat> { support::children(&self.syntax) }
    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
 }
-/// Visibility.
-///
-/// ```
-/// ❰ pub mod ❱ foo;
-/// ❰ pub(crate) ❱ struct Bar;
-/// ❰ pub(self) ❱ enum Baz {}
-/// ❰ pub(super) ❱ fn bruh() {}
-/// ❰ pub(in bruuh::bruuuh) ❱ type T = u64;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/visibility-and-privacy.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Visibility {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Visibility {
-    pub fn pub_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![pub]) }
-    pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) }
-    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
-    pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
-}
-/// Single identifier.
-/// Note(@matklad): `Name` is for things that install a new name into the scope,
-/// `NameRef` is a usage of a name. Most of the time, this definition/reference
-/// distinction can be determined purely syntactically, ie in
-/// ```
-/// fn foo() { foo() }
-/// ```
-/// the first foo is `Name`, the second one is `NameRef`.
-/// The notable exception are patterns, where in
-/// ``
-/// let x = 92
-/// ```
-/// `x` can be semantically either a name or a name ref, depeding on
-/// wether there's an `x` constant in scope.
-/// We use `Name` for patterns, and disambiguate semantically (see `NameClass` in ide_db).
-///
-/// ```
-/// let ❰ foo ❱ = bar;
-/// struct ❰ Baz ❱;
-/// fn ❰ bruh ❱() {}
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/identifiers.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Name {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Name {
-    pub fn ident_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![ident]) }
-}
-/// Reference to a name.
-/// See the explanation on the difference between `Name` and `NameRef`
-/// in `Name` ast node docs.
-///
-/// ```
-/// let foo = ❰ bar ❱(❰ Baz(❰ bruh ❱) ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/identifiers.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct NameRef {
-    pub(crate) syntax: SyntaxNode,
-}
-impl NameRef {}
-/// Macro call.
-/// Includes all of its attributes and doc comments.
-///
-/// ```
-/// ❰
-///     /// Docs
-///     #[attr]
-///     macro_rules! foo {   // macro rules is also a macro call
-///         ($bar: tt) => {}
-///     }
-/// ❱
-///
-/// // semicolon is a part of `MacroCall` when it is used in item positions
-/// ❰ foo!(); ❱
-///
-/// fn main() {
-///     ❰ foo!() ❱; // macro call in expression positions doesn't include the semi
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/macros.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroCall {
+pub struct MacroDef {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::NameOwner for MacroCall {}
+impl ast::NameOwner for MacroDef {}
-impl ast::AttrsOwner for MacroCall {}
+impl MacroDef {
-impl ast::DocCommentsOwner for MacroCall {}
-impl MacroCall {
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
    pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
-    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
-}
-/// Attribute.
-///
-/// ```
-/// ❰ #![inner_attr] ❱
-///
-/// ❰ #[attr] ❱
-/// ❰ #[foo = "bar"] ❱
-/// ❰ #[baz(bruh::bruuh = "42")] ❱
-/// struct Foo;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/attributes.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Attr {
-    pub(crate) syntax: SyntaxNode,
 }
-impl Attr {
-    pub fn pound_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![#]) }
-    pub fn excl_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![!]) }
-    pub fn l_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['[']) }
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn input(&self) -> Option<AttrInput> { support::child(&self.syntax) }
-    pub fn r_brack_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![']']) }
-}
-/// Stores a list of lexer tokens and other `TokenTree`s.
-/// It appears in attributes, macro_rules and macro call (foo!)
-///
-/// ```
-/// macro_call! ❰ { my syntax here } ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/macros.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TokenTree {
+pub struct MacroItems {
-    pub(crate) syntax: SyntaxNode,
-}
-impl TokenTree {}
-/// Generic lifetime, type and constants parameters list **declaration**.
-///
-/// ```
-/// fn foo❰ <'a, 'b, T, U, const BAR: u64> ❱() {}
-///
-/// struct Baz❰ <T> ❱(T);
-///
-/// impl❰ <T> ❱ Bruh<T> {}
-///
-/// type Bruuh = for❰ <'a> ❱ fn(&'a str) -> &'a str;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/generics.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeParamList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl TypeParamList {
-    pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
-    pub fn generic_params(&self) -> AstChildren<GenericParam> { support::children(&self.syntax) }
-    pub fn type_params(&self) -> AstChildren<TypeParam> { support::children(&self.syntax) }
-    pub fn lifetime_params(&self) -> AstChildren<LifetimeParam> { support::children(&self.syntax) }
-    pub fn const_params(&self) -> AstChildren<ConstParam> { support::children(&self.syntax) }
-    pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
-}
-/// Single type parameter **declaration**.
-///
-/// ```
-/// fn foo<❰ K ❱, ❰ I ❱, ❰ E: Debug ❱, ❰ V = DefaultType ❱>() {}
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/generics.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeParam {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::NameOwner for TypeParam {}
-impl ast::AttrsOwner for TypeParam {}
-impl ast::TypeBoundsOwner for TypeParam {}
-impl TypeParam {
-    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn default_type(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-}
-/// Const generic parameter **declaration**.
-/// ```
-/// fn foo<T, U, ❰ const BAR: usize ❱, ❰ const BAZ: bool ❱>() {}
-/// ```
-///
-/// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/2000-const-generics.md#declaring-a-const-parameter)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ConstParam {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::NameOwner for ConstParam {}
+impl ast::ModuleItemOwner for MacroItems {}
-impl ast::AttrsOwner for ConstParam {}
+impl MacroItems {}
-impl ast::TypeAscriptionOwner for ConstParam {}
-impl ConstParam {
-    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn default_val(&self) -> Option<Expr> { support::child(&self.syntax) }
-}
-/// Lifetime parameter **declaration**.
-///
-/// ```
-/// fn foo<❰ 'a ❱, ❰ 'b ❱, V, G, D>(bar: &'a str, baz: &'b mut str) {}
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/generics.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LifetimeParam {
+pub struct MacroStmts {
    pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for LifetimeParam {}
+impl MacroStmts {
-impl LifetimeParam {
+    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-        support::token(&self.syntax, T![lifetime])
-    }
 }
-/// Type bound declaration clause.
-///
-/// ```
-/// fn foo<T: ❰ ?Sized ❱ + ❰ Debug ❱>() {}
-///
-/// trait Bar<T>
-/// where
-///     T: ❰ Send ❱ + ❰ Sync ❱
-/// {
-///     type Baz: ❰ !Sync ❱ + ❰ Debug ❱ + ❰ ?const Add ❱;
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/trait-bounds.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct TypeBound {
    pub(crate) syntax: SyntaxNode,
@@ -2012,40 +1176,6 @@ impl TypeBound {
    pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Type bounds list.
-///
-/// ```
-///
-/// fn foo<T: ❰ ?Sized + Debug ❱>() {}
-///
-/// trait Bar<T>
-/// where
-///     T: ❰ Send + Sync ❱
-/// {
-///     type Baz: ❰ !Sync + Debug ❱;
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/trait-bounds.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeBoundList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl TypeBoundList {
-    pub fn bounds(&self) -> AstChildren<TypeBound> { support::children(&self.syntax) }
-}
-/// Single where predicate.
-///
-/// ```
-/// trait Foo<'a, 'b, T>
-/// where
-///     ❰ 'a: 'b ❱,
-///     ❰ T: IntoIterator ❱,
-///     ❰ for<'c> <T as IntoIterator>::Item: Bar<'c> ❱
-/// {}
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/generics.html#where-clauses)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct WherePred {
    pub(crate) syntax: SyntaxNode,
@@ -2053,64 +1183,12 @@ pub struct WherePred {
 impl ast::TypeBoundsOwner for WherePred {}
 impl WherePred {
    pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
-    pub fn type_param_list(&self) -> Option<TypeParamList> { support::child(&self.syntax) }
+    pub fn generic_param_list(&self) -> Option<GenericParamList> { support::child(&self.syntax) }
    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
        support::token(&self.syntax, T![lifetime])
    }
    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Where clause.
-///
-/// ```
-/// trait Foo<'a, T> ❰ where 'a: 'static, T: Debug ❱ {}
-///
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/generics.html#where-clauses)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct WhereClause {
-    pub(crate) syntax: SyntaxNode,
-}
-impl WhereClause {
-    pub fn where_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![where]) }
-    pub fn predicates(&self) -> AstChildren<WherePred> { support::children(&self.syntax) }
-}
-/// Abi declaration.
-/// Note: the abi string is optional.
-///
-/// ```
-/// ❰ extern "C" ❱ {
-///     fn foo() {}
-/// }
-///
-/// type Bar = ❰ extern ❱ fn() -> u32;
-///
-/// type Baz = ❰ extern r#"stdcall"# ❱ fn() -> bool;
-/// ```
-///
-/// - [Extern blocks reference](https://doc.rust-lang.org/reference/items/external-blocks.html)
-/// - [FFI function pointers reference](https://doc.rust-lang.org/reference/items/functions.html#functions)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Abi {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Abi {}
-/// Expression statement.
-///
-/// ```
-/// ❰ 42; ❱
-/// ❰ foo(); ❱
-/// ❰ (); ❱
-/// ❰ {}; ❱
-///
-/// // constructions with trailing curly brace can omit the semicolon
-/// // but only when there are satements immediately after them (this is important!)
-/// ❰ if bool_cond { } ❱
-/// ❰ loop {} ❱
-/// ❰ somestatment; ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/statements.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ExprStmt {
    pub(crate) syntax: SyntaxNode,
@@ -2120,267 +1198,20 @@ impl ExprStmt {
    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
-/// Let statement.
-///
-/// ```
-/// ❰ #[attr] let foo; ❱
-/// ❰ let bar: u64; ❱
-/// ❰ let baz = 42; ❱
-/// ❰ let bruh: bool = true; ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/statements.html#let-statements)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LetStmt {
    pub(crate) syntax: SyntaxNode,
 }
 impl ast::AttrsOwner for LetStmt {}
-impl ast::TypeAscriptionOwner for LetStmt {}
 impl LetStmt {
    pub fn let_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![let]) }
    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
+    pub fn colon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![:]) }
+    pub fn ty(&self) -> Option<TypeRef> { support::child(&self.syntax) }
    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
    pub fn initializer(&self) -> Option<Expr> { support::child(&self.syntax) }
    pub fn semicolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![;]) }
 }
-/// Condition of `if` or `while` expression.
-///
-/// ```
-/// if ❰ true ❱ {}
-/// if ❰ let Pat(foo) = bar ❱ {}
-///
-/// while ❰ true ❱ {}
-/// while ❰ let Pat(baz) = bruh ❱ {}
-/// ```
-///
-/// [If expression reference](https://doc.rust-lang.org/reference/expressions/if-expr.html)
-/// [While expression reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#predicate-loops)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Condition {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Condition {
-    pub fn let_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![let]) }
-    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-}
-/// Parameter list **declaration**.
-///
-/// ```
-/// fn foo❰ (a: u32, b: bool) ❱ -> u32 {}
-/// let bar = ❰ |a, b| ❱ {};
-///
-/// impl Baz {
-///     fn bruh❰ (&self, a: u32) ❱ {}
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/functions.html)ocs to codegen script
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ParamList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ParamList {
-    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-    pub fn self_param(&self) -> Option<SelfParam> { support::child(&self.syntax) }
-    pub fn params(&self) -> AstChildren<Param> { support::children(&self.syntax) }
-    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
-}
-/// Self parameter **declaration**.
-///
-/// ```
-/// impl Bruh {
-///     fn foo(❰ self ❱) {}
-///     fn bar(❰ &self ❱) {}
-///     fn baz(❰ &mut self ❱) {}
-///     fn blah<'a>(❰ &'a self ❱) {}
-///     fn blin(❰ self: Box<Self> ❱) {}
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/functions.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SelfParam {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::TypeAscriptionOwner for SelfParam {}
-impl ast::AttrsOwner for SelfParam {}
-impl SelfParam {
-    pub fn amp_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![&]) }
-    pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }
-    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
-        support::token(&self.syntax, T![lifetime])
-    }
-    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
-}
-/// Parameter **declaration**.
-///
-/// ```
-/// fn foo(❰ #[attr] Pat(bar): Pat(u32) ❱, ❰ #[attr] _: bool ❱) {}
-///
-/// extern "C" {
-///     fn bar(❰ baz: u32 ❱, ❰ ... ❱) -> u32;
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/functions.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Param {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::TypeAscriptionOwner for Param {}
-impl ast::AttrsOwner for Param {}
-impl Param {
-    pub fn pat(&self) -> Option<Pat> { support::child(&self.syntax) }
-    pub fn dotdotdot_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![...]) }
-}
-/// Use declaration.
-///
-/// ```
-/// ❰ #[attr] pub use foo; ❱
-/// ❰ use bar as baz; ❱
-/// ❰ use bruh::{self, bruuh}; ❱
-/// ❰ use { blin::blen, blah::* };
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UseItem {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for UseItem {}
-impl ast::VisibilityOwner for UseItem {}
-impl UseItem {
-    pub fn use_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![use]) }
-    pub fn use_tree(&self) -> Option<UseTree> { support::child(&self.syntax) }
-}
-/// Use tree.
-///
-/// ```
-/// pub use ❰ foo::❰ * ❱ ❱;
-/// use ❰ bar as baz ❱;
-/// use ❰ bruh::bruuh::{ ❰ self ❱, ❰ blin ❱ } ❱;
-/// use ❰ { ❰ blin::blen ❱ } ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UseTree {
-    pub(crate) syntax: SyntaxNode,
-}
-impl UseTree {
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn star_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![*]) }
-    pub fn use_tree_list(&self) -> Option<UseTreeList> { support::child(&self.syntax) }
-    pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }
-}
-/// Item alias.
-/// Note: this is not the type alias.
-///
-/// ```
-/// use foo ❰ as bar ❱;
-/// use baz::{bruh ❰ as _ ❱};
-/// extern crate bruuh ❰ as blin ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Alias {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::NameOwner for Alias {}
-impl Alias {
-    pub fn as_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![as]) }
-}
-/// Sublist of use trees.
-///
-/// ```
-/// use bruh::bruuh::❰ { ❰ self ❱, ❰ blin ❱ } ❱;
-/// use ❰ { blin::blen::❰ {} ❱ } ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct UseTreeList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl UseTreeList {
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn use_trees(&self) -> AstChildren<UseTree> { support::children(&self.syntax) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-}
-/// Extern crate item.
-///
-/// ```
-/// ❰ #[attr] pub extern crate foo; ❱
-/// ❰ extern crate self as bar; ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/extern-crates.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ExternCrateItem {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for ExternCrateItem {}
-impl ast::VisibilityOwner for ExternCrateItem {}
-impl ExternCrateItem {
-    pub fn extern_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![extern]) }
-    pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
-    pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
-    pub fn alias(&self) -> Option<Alias> { support::child(&self.syntax) }
-}
-/// Call site arguments list.
-///
-/// ```
-/// foo::<T, U>❰ (42, true) ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/expressions/call-expr.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ArgList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ArgList {
-    pub fn l_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['(']) }
-    pub fn args(&self) -> AstChildren<Expr> { support::children(&self.syntax) }
-    pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
-}
-/// Path to a symbol. Includes single identifier names and elaborate paths with
-/// generic parameters.
-///
-/// ```
-/// (0..10).❰ ❰ collect ❱ ::<Vec<_>> ❱();
-/// ❰ ❰ ❰ Vec ❱ ::<u8> ❱ ::with_capacity ❱(1024);
-/// ❰ ❰ <❰ Foo ❱ as ❰ ❰ bar ❱ ::Bar ❱> ❱ ::baz ❱();
-/// ❰ ❰ <❰ bruh ❱> ❱ ::bruuh ❱();
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/paths.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Path {
-    pub(crate) syntax: SyntaxNode,
-}
-impl Path {
-    pub fn segment(&self) -> Option<PathSegment> { support::child(&self.syntax) }
-    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
-    pub fn qualifier(&self) -> Option<Path> { support::child(&self.syntax) }
-}
-/// Segment of the path to a symbol.
-/// Only path segment of an absolute path holds the `::` token,
-/// all other `::` tokens that connect path segments reside under `Path` itself.`
-///
-/// ```
-/// (0..10).❰ collect ❱ :: ❰ <Vec<_>> ❱();
-/// ❰ Vec ❱ :: ❰ <u8> ❱ :: ❰ with_capacity ❱(1024);
-/// ❰ <❰ Foo ❱ as ❰ bar ❱ :: ❰ Bar ❱> ❱ :: ❰ baz ❱();
-/// ❰ <❰ bruh ❱> ❱ :: ❰ bruuh ❱();
-///
-/// // Note that only in this case `::` token is inlcuded:
-/// ❰ ::foo ❱;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/paths.html)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct PathSegment {
    pub(crate) syntax: SyntaxNode,
@@ -2398,50 +1229,22 @@ impl PathSegment {
    pub fn path_type(&self) -> Option<PathType> { support::child(&self.syntax) }
    pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
 }
-/// List of type arguments that are passed at generic instantiation site.
-///
-/// ```
-/// type _ = Foo ❰ ::<'a, u64, Item = Bar, 42, {true}> ❱::Bar;
-///
-/// Vec❰ ::<bool> ❱::();
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeArgList {
+pub struct TypeArg {
    pub(crate) syntax: SyntaxNode,
 }
-impl TypeArgList {
+impl TypeArg {
-    pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
-    pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
-    pub fn generic_args(&self) -> AstChildren<GenericArg> { support::children(&self.syntax) }
-    pub fn type_args(&self) -> AstChildren<TypeArg> { support::children(&self.syntax) }
-    pub fn lifetime_args(&self) -> AstChildren<LifetimeArg> { support::children(&self.syntax) }
-    pub fn assoc_type_args(&self) -> AstChildren<AssocTypeArg> { support::children(&self.syntax) }
-    pub fn const_args(&self) -> AstChildren<ConstArg> { support::children(&self.syntax) }
-    pub fn r_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![>]) }
 }
-/// Type argument that is passed at generic instantiation site.
-///
-/// ```
-/// type _ = Foo::<'a, ❰ u64 ❱, ❰ bool ❱, Item = Bar, 42>::Baz;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TypeArg {
+pub struct LifetimeArg {
    pub(crate) syntax: SyntaxNode,
 }
-impl TypeArg {
+impl LifetimeArg {
-    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
+    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
+        support::token(&self.syntax, T![lifetime])
+    }
 }
-/// Associated type argument that is passed at generic instantiation site.
-/// ```
-/// type Foo = Bar::<'a, u64, bool, ❰ Item = Baz ❱, 42>::Bruh;
-///
-/// trait Bruh<T>: Iterator<❰ Item: Debug ❱> {}
-/// ```
-///
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct AssocTypeArg {
    pub(crate) syntax: SyntaxNode,
@@ -2452,33 +1255,6 @@ impl AssocTypeArg {
    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
    pub fn type_ref(&self) -> Option<TypeRef> { support::child(&self.syntax) }
 }
-/// Lifetime argument that is passed at generic instantiation site.
-///
-/// ```
-/// fn foo<'a>(s: &'a str) {
-///     bar::<❰ 'a ❱>(s);
-/// }
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct LifetimeArg {
-    pub(crate) syntax: SyntaxNode,
-}
-impl LifetimeArg {
-    pub fn lifetime_token(&self) -> Option<SyntaxToken> {
-        support::token(&self.syntax, T![lifetime])
-    }
-}
-/// Constant value argument that is passed at generic instantiation site.
-///
-/// ```
-/// foo::<u32, ❰ { true } ❱>();
-///
-/// bar::<❰ { 2 + 2} ❱>();
-/// ```
-///
-/// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/2000-const-generics.md#declaring-a-const-parameter)
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ConstArg {
    pub(crate) syntax: SyntaxNode,
@@ -2487,136 +1263,24 @@ impl ConstArg {
    pub fn literal(&self) -> Option<Literal> { support::child(&self.syntax) }
    pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
 }
-/// FIXME: (@edwin0cheng) Remove it to use ItemList instead
-/// https://github.com/rust-analyzer/rust-analyzer/pull/4083#discussion_r422666243
-///
-/// [Reference](https://doc.rust-lang.org/reference/macros.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroItems {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::ModuleItemOwner for MacroItems {}
-impl MacroItems {}
-/// FIXME: (@edwin0cheng) add some documentation here. As per the writing
-/// of this comment this ast node is not used.
-///
-/// ```
-/// // FIXME: example here
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/macros.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroStmts {
-    pub(crate) syntax: SyntaxNode,
-}
-impl MacroStmts {
-    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-}
-/// List of items in an extern block.
-///
-/// ```
-/// extern "C" ❰
-///     {
-///         fn foo();
-///         static var: u32;
-///     }
-/// ❱
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/external-blocks.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ExternItemList {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::ModuleItemOwner for ExternItemList {}
-impl ExternItemList {
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn extern_items(&self) -> AstChildren<ExternItem> { support::children(&self.syntax) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-}
-/// Extern block.
-///
-/// ```
-/// ❰
-///     extern "C" {
-///         fn foo();
-///     }
-/// ❱
-///
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/items/external-blocks.html)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ExternBlock {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ExternBlock {
-    pub fn abi(&self) -> Option<Abi> { support::child(&self.syntax) }
-    pub fn extern_item_list(&self) -> Option<ExternItemList> { support::child(&self.syntax) }
-}
-/// Meta item in an attribute.
-///
-/// ```
-/// #[❰ bar::baz = "42" ❱]
-/// #[❰ bruh(bruuh("true")) ❱]
-/// struct Foo;
-/// ```
-///
-/// [Reference](https://doc.rust-lang.org/reference/attributes.html?highlight=meta,item#meta-item-attribute-syntax)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MetaItem {
-    pub(crate) syntax: SyntaxNode,
-}
-impl MetaItem {
-    pub fn path(&self) -> Option<Path> { support::child(&self.syntax) }
-    pub fn eq_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![=]) }
-    pub fn attr_input(&self) -> Option<AttrInput> { support::child(&self.syntax) }
-    pub fn nested_meta_items(&self) -> AstChildren<MetaItem> { support::children(&self.syntax) }
-}
-/// Macro 2.0 definition.
-/// Their syntax is still WIP by rustc team...
-/// ```
-/// ❰
-///     macro foo { }
-/// ❱
-/// ```
-///
-/// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/1584-macros.md)
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct MacroDef {
-    pub(crate) syntax: SyntaxNode,
-}
-impl MacroDef {
-    pub fn name(&self) -> Option<Name> { support::child(&self.syntax) }
-    pub fn token_tree(&self) -> Option<TokenTree> { support::child(&self.syntax) }
-}
-/// Any kind of nominal type definition.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum NominalDef {
+pub enum Item {
-    StructDef(StructDef),
+    Const(Const),
-    EnumDef(EnumDef),
+    Enum(Enum),
-    UnionDef(UnionDef),
+    ExternBlock(ExternBlock),
-}
+    ExternCrate(ExternCrate),
-impl ast::NameOwner for NominalDef {}
+    Fn(Fn),
-impl ast::TypeParamsOwner for NominalDef {}
+    Impl(Impl),
-impl ast::AttrsOwner for NominalDef {}
+    MacroCall(MacroCall),
-/// Any kind of **declared** generic parameter
+    Module(Module),
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+    Static(Static),
-pub enum GenericParam {
+    Struct(Struct),
-    LifetimeParam(LifetimeParam),
+    Trait(Trait),
-    TypeParam(TypeParam),
+    TypeAlias(TypeAlias),
-    ConstParam(ConstParam),
+    Union(Union),
-}
+    Use(Use),
-/// Any kind of generic argument passed at instantiation site
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum GenericArg {
-    LifetimeArg(LifetimeArg),
-    TypeArg(TypeArg),
-    ConstArg(ConstArg),
-    AssocTypeArg(AssocTypeArg),
 }
-/// Any kind of construct valid in type context
+impl ast::AttrsOwner for Item {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum TypeRef {
    ParenType(ParenType),
@@ -2633,50 +1297,29 @@ pub enum TypeRef {
    ImplTraitType(ImplTraitType),
    DynTraitType(DynTraitType),
 }
-/// Any kind of top-level item that may appear in a module
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ModuleItem {
-    StructDef(StructDef),
-    UnionDef(UnionDef),
-    EnumDef(EnumDef),
-    FnDef(FnDef),
-    TraitDef(TraitDef),
-    TypeAliasDef(TypeAliasDef),
-    ImplDef(ImplDef),
-    UseItem(UseItem),
-    ExternCrateItem(ExternCrateItem),
-    ConstDef(ConstDef),
-    StaticDef(StaticDef),
-    Module(Module),
-    MacroCall(MacroCall),
-    ExternBlock(ExternBlock),
-}
-impl ast::NameOwner for ModuleItem {}
-impl ast::AttrsOwner for ModuleItem {}
-impl ast::VisibilityOwner for ModuleItem {}
-/// Any kind of item that may appear in an impl block
-///
-/// // FIXME: impl blocks can also contain MacroCall
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum AssocItem {
+pub enum Pat {
-    FnDef(FnDef),
+    OrPat(OrPat),
-    TypeAliasDef(TypeAliasDef),
+    ParenPat(ParenPat),
-    ConstDef(ConstDef),
+    RefPat(RefPat),
+    BoxPat(BoxPat),
+    BindPat(BindPat),
+    PlaceholderPat(PlaceholderPat),
+    DotDotPat(DotDotPat),
+    PathPat(PathPat),
+    RecordPat(RecordPat),
+    TupleStructPat(TupleStructPat),
+    TuplePat(TuplePat),
+    SlicePat(SlicePat),
+    RangePat(RangePat),
+    LiteralPat(LiteralPat),
+    MacroPat(MacroPat),
 }
-impl ast::NameOwner for AssocItem {}
-impl ast::AttrsOwner for AssocItem {}
-/// Any kind of item that may appear in an extern block
-///
-/// // FIXME: extern blocks can also contain MacroCall
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ExternItem {
+pub enum FieldList {
-    FnDef(FnDef),
+    RecordFieldList(RecordFieldList),
-    StaticDef(StaticDef),
+    TupleFieldList(TupleFieldList),
 }
-impl ast::NameOwner for ExternItem {}
-impl ast::AttrsOwner for ExternItem {}
-impl ast::VisibilityOwner for ExternItem {}
-/// Any kind of expression
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Expr {
    TupleExpr(TupleExpr),
@@ -2694,7 +1337,7 @@ pub enum Expr {
    BlockExpr(BlockExpr),
    ReturnExpr(ReturnExpr),
    MatchExpr(MatchExpr),
-    RecordLit(RecordLit),
+    RecordExpr(RecordExpr),
    CallExpr(CallExpr),
    IndexExpr(IndexExpr),
    MethodCallExpr(MethodCallExpr),
@@ -2711,53 +1354,46 @@ pub enum Expr {
    MacroCall(MacroCall),
    BoxExpr(BoxExpr),
 }
-impl ast::AttrsOwner for Expr {}
-/// Any kind of pattern
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum Pat {
+pub enum AssocItem {
-    OrPat(OrPat),
+    Fn(Fn),
-    ParenPat(ParenPat),
+    TypeAlias(TypeAlias),
-    RefPat(RefPat),
+    Const(Const),
-    BoxPat(BoxPat),
+    MacroCall(MacroCall),
-    BindPat(BindPat),
-    PlaceholderPat(PlaceholderPat),
-    DotDotPat(DotDotPat),
-    PathPat(PathPat),
-    RecordPat(RecordPat),
-    TupleStructPat(TupleStructPat),
-    TuplePat(TuplePat),
-    SlicePat(SlicePat),
-    RangePat(RangePat),
-    LiteralPat(LiteralPat),
-    MacroPat(MacroPat),
 }
-/// Any kind of pattern that appears directly inside of the curly
+impl ast::AttrsOwner for AssocItem {}
-/// braces of a record pattern
+impl ast::NameOwner for AssocItem {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum RecordInnerPat {
+pub enum ExternItem {
-    RecordFieldPat(RecordFieldPat),
+    Fn(Fn),
-    BindPat(BindPat),
+    Static(Static),
+    MacroCall(MacroCall),
 }
-/// Any kind of input to an attribute
+impl ast::AttrsOwner for ExternItem {}
+impl ast::NameOwner for ExternItem {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum AttrInput {
+pub enum GenericParam {
-    Literal(Literal),
+    LifetimeParam(LifetimeParam),
-    TokenTree(TokenTree),
+    TypeParam(TypeParam),
+    ConstParam(ConstParam),
 }
-/// Any kind of statement
+impl ast::AttrsOwner for GenericParam {}
-/// Note: there are no empty statements, these are just represented as
-/// bare semicolons without a dedicated statement ast node.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Stmt {
    LetStmt(LetStmt),
    ExprStmt(ExprStmt),
 }
-/// Any kind of fields list (record or tuple field lists)
+impl ast::AttrsOwner for Stmt {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum FieldDefList {
+pub enum AdtDef {
-    RecordFieldDefList(RecordFieldDefList),
+    Struct(Struct),
-    TupleFieldDefList(TupleFieldDefList),
+    Enum(Enum),
+    Union(Union),
 }
+impl ast::AttrsOwner for AdtDef {}
+impl ast::GenericParamsOwner for AdtDef {}
+impl ast::NameOwner for AdtDef {}
+impl ast::VisibilityOwner for AdtDef {}
 impl AstNode for SourceFile {
    fn can_cast(kind: SyntaxKind) -> bool { kind == SOURCE_FILE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -2769,8 +1405,8 @@ impl AstNode for SourceFile {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for FnDef {
+impl AstNode for Attr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FN_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ATTR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2780,8 +1416,8 @@ impl AstNode for FnDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RetType {
+impl AstNode for Const {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RET_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2791,8 +1427,8 @@ impl AstNode for RetType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for StructDef {
+impl AstNode for Enum {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STRUCT_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2802,8 +1438,8 @@ impl AstNode for StructDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for UnionDef {
+impl AstNode for ExternBlock {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == UNION_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == EXTERN_BLOCK }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2813,8 +1449,8 @@ impl AstNode for UnionDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldDefList {
+impl AstNode for ExternCrate {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_DEF_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == EXTERN_CRATE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2824,8 +1460,8 @@ impl AstNode for RecordFieldDefList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldDef {
+impl AstNode for Fn {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == FN }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2835,8 +1471,8 @@ impl AstNode for RecordFieldDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TupleFieldDefList {
+impl AstNode for Impl {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_FIELD_DEF_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == IMPL }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2846,8 +1482,8 @@ impl AstNode for TupleFieldDefList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TupleFieldDef {
+impl AstNode for MacroCall {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_FIELD_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_CALL }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2857,8 +1493,8 @@ impl AstNode for TupleFieldDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for EnumDef {
+impl AstNode for Module {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MODULE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2868,8 +1504,8 @@ impl AstNode for EnumDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for EnumVariantList {
+impl AstNode for Static {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM_VARIANT_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == STATIC }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2879,8 +1515,8 @@ impl AstNode for EnumVariantList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for EnumVariant {
+impl AstNode for Struct {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ENUM_VARIANT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == STRUCT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2890,8 +1526,8 @@ impl AstNode for EnumVariant {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TraitDef {
+impl AstNode for Trait {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TRAIT_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TRAIT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2901,8 +1537,8 @@ impl AstNode for TraitDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Module {
+impl AstNode for TypeAlias {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MODULE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ALIAS }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2912,8 +1548,8 @@ impl AstNode for Module {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ItemList {
+impl AstNode for Union {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ITEM_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == UNION }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2923,8 +1559,8 @@ impl AstNode for ItemList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ConstDef {
+impl AstNode for Use {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == USE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2934,8 +1570,8 @@ impl AstNode for ConstDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for StaticDef {
+impl AstNode for Visibility {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == STATIC_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == VISIBILITY }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2945,8 +1581,8 @@ impl AstNode for StaticDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeAliasDef {
+impl AstNode for Name {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ALIAS_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == NAME }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2956,8 +1592,8 @@ impl AstNode for TypeAliasDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ImplDef {
+impl AstNode for ItemList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == IMPL_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ITEM_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2967,8 +1603,8 @@ impl AstNode for ImplDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ParenType {
+impl AstNode for NameRef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PAREN_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == NAME_REF }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2978,8 +1614,8 @@ impl AstNode for ParenType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TupleType {
+impl AstNode for Rename {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RENAME }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -2989,8 +1625,8 @@ impl AstNode for TupleType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for NeverType {
+impl AstNode for UseTree {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == NEVER_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_TREE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3000,8 +1636,8 @@ impl AstNode for NeverType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PathType {
+impl AstNode for Path {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3011,8 +1647,8 @@ impl AstNode for PathType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PointerType {
+impl AstNode for UseTreeList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == POINTER_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_TREE_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3022,8 +1658,8 @@ impl AstNode for PointerType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ArrayType {
+impl AstNode for Abi {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ARRAY_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ABI }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3033,8 +1669,8 @@ impl AstNode for ArrayType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for SliceType {
+impl AstNode for GenericParamList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SLICE_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == GENERIC_PARAM_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3044,8 +1680,8 @@ impl AstNode for SliceType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ReferenceType {
+impl AstNode for ParamList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == REFERENCE_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3055,8 +1691,8 @@ impl AstNode for ReferenceType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PlaceholderType {
+impl AstNode for RetType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PLACEHOLDER_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RET_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3066,8 +1702,8 @@ impl AstNode for PlaceholderType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for FnPointerType {
+impl AstNode for WhereClause {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FN_POINTER_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == WHERE_CLAUSE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3077,8 +1713,8 @@ impl AstNode for FnPointerType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ForType {
+impl AstNode for BlockExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FOR_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == BLOCK_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3088,8 +1724,8 @@ impl AstNode for ForType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ImplTraitType {
+impl AstNode for SelfParam {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == IMPL_TRAIT_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == SELF_PARAM }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3099,8 +1735,8 @@ impl AstNode for ImplTraitType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for DynTraitType {
+impl AstNode for Param {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DYN_TRAIT_TYPE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3110,8 +1746,8 @@ impl AstNode for DynTraitType {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TupleExpr {
+impl AstNode for TypeBoundList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_BOUND_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3121,8 +1757,8 @@ impl AstNode for TupleExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ArrayExpr {
+impl AstNode for RecordFieldList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ARRAY_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3132,8 +1768,8 @@ impl AstNode for ArrayExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ParenExpr {
+impl AstNode for TupleFieldList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PAREN_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_FIELD_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3143,8 +1779,8 @@ impl AstNode for ParenExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PathExpr {
+impl AstNode for RecordField {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3154,8 +1790,8 @@ impl AstNode for PathExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for LambdaExpr {
+impl AstNode for TupleField {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LAMBDA_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_FIELD }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3165,8 +1801,8 @@ impl AstNode for LambdaExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for IfExpr {
+impl AstNode for VariantList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == IF_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == VARIANT_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3176,8 +1812,8 @@ impl AstNode for IfExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for LoopExpr {
+impl AstNode for Variant {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LOOP_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == VARIANT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3187,8 +1823,8 @@ impl AstNode for LoopExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for EffectExpr {
+impl AstNode for AssocItemList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EFFECT_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ASSOC_ITEM_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3198,8 +1834,8 @@ impl AstNode for EffectExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ForExpr {
+impl AstNode for ExternItemList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FOR_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == EXTERN_ITEM_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3209,8 +1845,8 @@ impl AstNode for ForExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for WhileExpr {
+impl AstNode for LifetimeParam {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == WHILE_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LIFETIME_PARAM }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3220,8 +1856,8 @@ impl AstNode for WhileExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ContinueExpr {
+impl AstNode for TypeParam {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CONTINUE_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_PARAM }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3231,8 +1867,8 @@ impl AstNode for ContinueExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for BreakExpr {
+impl AstNode for ConstParam {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BREAK_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST_PARAM }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3242,8 +1878,8 @@ impl AstNode for BreakExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Label {
+impl AstNode for Literal {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LABEL }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LITERAL }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3253,8 +1889,8 @@ impl AstNode for Label {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for BlockExpr {
+impl AstNode for TokenTree {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BLOCK_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TOKEN_TREE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3264,8 +1900,8 @@ impl AstNode for BlockExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ReturnExpr {
+impl AstNode for ParenType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RETURN_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PAREN_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3275,8 +1911,8 @@ impl AstNode for ReturnExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for CallExpr {
+impl AstNode for TupleType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CALL_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3286,8 +1922,8 @@ impl AstNode for CallExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MethodCallExpr {
+impl AstNode for NeverType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == METHOD_CALL_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == NEVER_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3297,8 +1933,8 @@ impl AstNode for MethodCallExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for IndexExpr {
+impl AstNode for PathType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == INDEX_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3308,8 +1944,8 @@ impl AstNode for IndexExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for FieldExpr {
+impl AstNode for PointerType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == FIELD_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == POINTER_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3319,8 +1955,8 @@ impl AstNode for FieldExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for AwaitExpr {
+impl AstNode for ArrayType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == AWAIT_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ARRAY_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3330,8 +1966,8 @@ impl AstNode for AwaitExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TryExpr {
+impl AstNode for SliceType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TRY_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == SLICE_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3341,8 +1977,8 @@ impl AstNode for TryExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for CastExpr {
+impl AstNode for ReferenceType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CAST_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == REFERENCE_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3352,8 +1988,8 @@ impl AstNode for CastExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RefExpr {
+impl AstNode for PlaceholderType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == REF_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PLACEHOLDER_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3363,8 +1999,8 @@ impl AstNode for RefExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PrefixExpr {
+impl AstNode for FnPointerType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PREFIX_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == FN_POINTER_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3374,8 +2010,8 @@ impl AstNode for PrefixExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for BoxExpr {
+impl AstNode for ForType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BOX_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == FOR_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3385,8 +2021,8 @@ impl AstNode for BoxExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RangeExpr {
+impl AstNode for ImplTraitType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RANGE_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == IMPL_TRAIT_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3396,8 +2032,8 @@ impl AstNode for RangeExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for BinExpr {
+impl AstNode for DynTraitType {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BIN_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == DYN_TRAIT_TYPE }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3407,8 +2043,8 @@ impl AstNode for BinExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Literal {
+impl AstNode for TupleExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LITERAL }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3418,8 +2054,8 @@ impl AstNode for Literal {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MatchExpr {
+impl AstNode for ArrayExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_EXPR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ARRAY_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3429,8 +2065,8 @@ impl AstNode for MatchExpr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MatchArmList {
+impl AstNode for ParenExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_ARM_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PAREN_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3440,8 +2076,8 @@ impl AstNode for MatchArmList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MatchArm {
+impl AstNode for PathExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_ARM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3451,8 +2087,8 @@ impl AstNode for MatchArm {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MatchGuard {
+impl AstNode for LambdaExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_GUARD }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LAMBDA_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3462,8 +2098,8 @@ impl AstNode for MatchGuard {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordLit {
+impl AstNode for IfExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_LIT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == IF_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3473,8 +2109,8 @@ impl AstNode for RecordLit {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldList {
+impl AstNode for Condition {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == CONDITION }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3484,8 +2120,8 @@ impl AstNode for RecordFieldList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordField {
+impl AstNode for EffectExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == EFFECT_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3495,8 +2131,8 @@ impl AstNode for RecordField {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for OrPat {
+impl AstNode for Label {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == OR_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LABEL }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3506,8 +2142,8 @@ impl AstNode for OrPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ParenPat {
+impl AstNode for LoopExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PAREN_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LOOP_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3517,8 +2153,8 @@ impl AstNode for ParenPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RefPat {
+impl AstNode for ForExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == REF_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == FOR_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3528,8 +2164,8 @@ impl AstNode for RefPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for BoxPat {
+impl AstNode for WhileExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BOX_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == WHILE_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3539,8 +2175,8 @@ impl AstNode for BoxPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for BindPat {
+impl AstNode for ContinueExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BIND_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == CONTINUE_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3550,8 +2186,8 @@ impl AstNode for BindPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PlaceholderPat {
+impl AstNode for BreakExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PLACEHOLDER_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == BREAK_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3561,8 +2197,8 @@ impl AstNode for PlaceholderPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for DotDotPat {
+impl AstNode for ReturnExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == DOT_DOT_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RETURN_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3572,8 +2208,8 @@ impl AstNode for DotDotPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PathPat {
+impl AstNode for CallExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == CALL_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3583,8 +2219,8 @@ impl AstNode for PathPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for SlicePat {
+impl AstNode for ArgList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SLICE_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ARG_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3594,8 +2230,8 @@ impl AstNode for SlicePat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RangePat {
+impl AstNode for MethodCallExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RANGE_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == METHOD_CALL_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3605,8 +2241,8 @@ impl AstNode for RangePat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for LiteralPat {
+impl AstNode for TypeArgList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LITERAL_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ARG_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3616,8 +2252,8 @@ impl AstNode for LiteralPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MacroPat {
+impl AstNode for FieldExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == FIELD_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3627,8 +2263,8 @@ impl AstNode for MacroPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordPat {
+impl AstNode for IndexExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == INDEX_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3638,8 +2274,8 @@ impl AstNode for RecordPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldPatList {
+impl AstNode for AwaitExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_PAT_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == AWAIT_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3649,8 +2285,8 @@ impl AstNode for RecordFieldPatList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for RecordFieldPat {
+impl AstNode for TryExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TRY_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3660,8 +2296,8 @@ impl AstNode for RecordFieldPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TupleStructPat {
+impl AstNode for CastExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_STRUCT_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == CAST_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3671,8 +2307,8 @@ impl AstNode for TupleStructPat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TuplePat {
+impl AstNode for RefExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_PAT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == REF_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3682,8 +2318,8 @@ impl AstNode for TuplePat {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Visibility {
+impl AstNode for PrefixExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == VISIBILITY }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PREFIX_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3693,8 +2329,8 @@ impl AstNode for Visibility {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Name {
+impl AstNode for BoxExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == NAME }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == BOX_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3704,8 +2340,8 @@ impl AstNode for Name {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for NameRef {
+impl AstNode for RangeExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == NAME_REF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RANGE_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3715,8 +2351,8 @@ impl AstNode for NameRef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MacroCall {
+impl AstNode for BinExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_CALL }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == BIN_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3726,8 +2362,8 @@ impl AstNode for MacroCall {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Attr {
+impl AstNode for MatchExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ATTR }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3737,8 +2373,8 @@ impl AstNode for Attr {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TokenTree {
+impl AstNode for MatchArmList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TOKEN_TREE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_ARM_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3748,8 +2384,8 @@ impl AstNode for TokenTree {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeParamList {
+impl AstNode for MatchArm {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_PARAM_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_ARM }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3759,8 +2395,8 @@ impl AstNode for TypeParamList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeParam {
+impl AstNode for MatchGuard {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_PARAM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MATCH_GUARD }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3770,8 +2406,8 @@ impl AstNode for TypeParam {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ConstParam {
+impl AstNode for RecordExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST_PARAM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_EXPR }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3781,8 +2417,8 @@ impl AstNode for ConstParam {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for LifetimeParam {
+impl AstNode for RecordExprFieldList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LIFETIME_PARAM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_EXPR_FIELD_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3792,8 +2428,8 @@ impl AstNode for LifetimeParam {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeBound {
+impl AstNode for RecordExprField {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_BOUND }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_EXPR_FIELD }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3803,8 +2439,8 @@ impl AstNode for TypeBound {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeBoundList {
+impl AstNode for OrPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_BOUND_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == OR_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3814,8 +2450,8 @@ impl AstNode for TypeBoundList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for WherePred {
+impl AstNode for ParenPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == WHERE_PRED }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PAREN_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3825,8 +2461,8 @@ impl AstNode for WherePred {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for WhereClause {
+impl AstNode for RefPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == WHERE_CLAUSE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == REF_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3836,8 +2472,8 @@ impl AstNode for WhereClause {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Abi {
+impl AstNode for BoxPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ABI }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == BOX_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3847,8 +2483,8 @@ impl AstNode for Abi {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ExprStmt {
+impl AstNode for BindPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EXPR_STMT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == BIND_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3858,8 +2494,8 @@ impl AstNode for ExprStmt {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for LetStmt {
+impl AstNode for PlaceholderPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LET_STMT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PLACEHOLDER_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3869,8 +2505,8 @@ impl AstNode for LetStmt {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Condition {
+impl AstNode for DotDotPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CONDITION }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == DOT_DOT_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3880,8 +2516,8 @@ impl AstNode for Condition {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ParamList {
+impl AstNode for PathPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3891,8 +2527,8 @@ impl AstNode for ParamList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for SelfParam {
+impl AstNode for SlicePat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == SELF_PARAM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == SLICE_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3902,8 +2538,8 @@ impl AstNode for SelfParam {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Param {
+impl AstNode for RangePat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RANGE_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3913,8 +2549,8 @@ impl AstNode for Param {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for UseItem {
+impl AstNode for LiteralPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_ITEM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LITERAL_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3924,8 +2560,8 @@ impl AstNode for UseItem {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for UseTree {
+impl AstNode for MacroPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_TREE }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3935,8 +2571,8 @@ impl AstNode for UseTree {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Alias {
+impl AstNode for RecordPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ALIAS }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3946,8 +2582,8 @@ impl AstNode for Alias {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for UseTreeList {
+impl AstNode for RecordFieldPatList {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == USE_TREE_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_PAT_LIST }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3957,8 +2593,8 @@ impl AstNode for UseTreeList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ExternCrateItem {
+impl AstNode for RecordFieldPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EXTERN_CRATE_ITEM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3968,8 +2604,8 @@ impl AstNode for ExternCrateItem {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ArgList {
+impl AstNode for TupleStructPat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ARG_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_STRUCT_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3979,8 +2615,8 @@ impl AstNode for ArgList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Path {
+impl AstNode for TuplePat {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TUPLE_PAT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -3990,8 +2626,8 @@ impl AstNode for Path {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for PathSegment {
+impl AstNode for MacroDef {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_SEGMENT }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_DEF }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4001,8 +2637,8 @@ impl AstNode for PathSegment {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeArgList {
+impl AstNode for MacroItems {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ARG_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_ITEMS }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4012,8 +2648,8 @@ impl AstNode for TypeArgList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TypeArg {
+impl AstNode for MacroStmts {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ARG }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_STMTS }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4023,8 +2659,8 @@ impl AstNode for TypeArg {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for AssocTypeArg {
+impl AstNode for TypeBound {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == ASSOC_TYPE_ARG }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_BOUND }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4034,8 +2670,8 @@ impl AstNode for AssocTypeArg {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for LifetimeArg {
+impl AstNode for WherePred {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == LIFETIME_ARG }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == WHERE_PRED }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4045,8 +2681,8 @@ impl AstNode for LifetimeArg {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ConstArg {
+impl AstNode for ExprStmt {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST_ARG }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == EXPR_STMT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4056,8 +2692,8 @@ impl AstNode for ConstArg {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MacroItems {
+impl AstNode for LetStmt {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_ITEMS }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LET_STMT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4067,8 +2703,8 @@ impl AstNode for MacroItems {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MacroStmts {
+impl AstNode for PathSegment {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_STMTS }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == PATH_SEGMENT }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4078,8 +2714,8 @@ impl AstNode for MacroStmts {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ExternItemList {
+impl AstNode for TypeArg {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EXTERN_ITEM_LIST }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == TYPE_ARG }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4089,8 +2725,8 @@ impl AstNode for ExternItemList {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for ExternBlock {
+impl AstNode for LifetimeArg {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == EXTERN_BLOCK }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == LIFETIME_ARG }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4100,8 +2736,8 @@ impl AstNode for ExternBlock {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MetaItem {
+impl AstNode for AssocTypeArg {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == META_ITEM }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == ASSOC_TYPE_ARG }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4111,8 +2747,8 @@ impl AstNode for MetaItem {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for MacroDef {
+impl AstNode for ConstArg {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == MACRO_DEF }
+    fn can_cast(kind: SyntaxKind) -> bool { kind == CONST_ARG }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        if Self::can_cast(syntax.kind()) {
            Some(Self { syntax })
@@ -4122,107 +2758,92 @@ impl AstNode for MacroDef {
    }
    fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl From<StructDef> for NominalDef {
+impl From<Const> for Item {
-    fn from(node: StructDef) -> NominalDef { NominalDef::StructDef(node) }
+    fn from(node: Const) -> Item { Item::Const(node) }
 }
-impl From<EnumDef> for NominalDef {
+impl From<Enum> for Item {
-    fn from(node: EnumDef) -> NominalDef { NominalDef::EnumDef(node) }
+    fn from(node: Enum) -> Item { Item::Enum(node) }
 }
-impl From<UnionDef> for NominalDef {
+impl From<ExternBlock> for Item {
-    fn from(node: UnionDef) -> NominalDef { NominalDef::UnionDef(node) }
+    fn from(node: ExternBlock) -> Item { Item::ExternBlock(node) }
 }
-impl AstNode for NominalDef {
+impl From<ExternCrate> for Item {
-    fn can_cast(kind: SyntaxKind) -> bool {
+    fn from(node: ExternCrate) -> Item { Item::ExternCrate(node) }
-        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 From<LifetimeParam> for GenericParam {
+impl From<Fn> for Item {
-    fn from(node: LifetimeParam) -> GenericParam { GenericParam::LifetimeParam(node) }
+    fn from(node: Fn) -> Item { Item::Fn(node) }
 }
-impl From<TypeParam> for GenericParam {
+impl From<Impl> for Item {
-    fn from(node: TypeParam) -> GenericParam { GenericParam::TypeParam(node) }
+    fn from(node: Impl) -> Item { Item::Impl(node) }
 }
-impl From<ConstParam> for GenericParam {
+impl From<MacroCall> for Item {
-    fn from(node: ConstParam) -> GenericParam { GenericParam::ConstParam(node) }
+    fn from(node: MacroCall) -> Item { Item::MacroCall(node) }
 }
-impl AstNode for GenericParam {
+impl From<Module> for Item {
-    fn can_cast(kind: SyntaxKind) -> bool {
+    fn from(node: Module) -> Item { Item::Module(node) }
-        match kind {
+}
-            LIFETIME_PARAM | TYPE_PARAM | CONST_PARAM => true,
+impl From<Static> for Item {
-            _ => false,
+    fn from(node: Static) -> Item { Item::Static(node) }
-        }
+}
-    }
+impl From<Struct> for Item {
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
+    fn from(node: Struct) -> Item { Item::Struct(node) }
-        let res = match syntax.kind() {
-            LIFETIME_PARAM => GenericParam::LifetimeParam(LifetimeParam { syntax }),
-            TYPE_PARAM => GenericParam::TypeParam(TypeParam { syntax }),
-            CONST_PARAM => GenericParam::ConstParam(ConstParam { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        match self {
-            GenericParam::LifetimeParam(it) => &it.syntax,
-            GenericParam::TypeParam(it) => &it.syntax,
-            GenericParam::ConstParam(it) => &it.syntax,
-        }
-    }
 }
-impl From<LifetimeArg> for GenericArg {
+impl From<Trait> for Item {
-    fn from(node: LifetimeArg) -> GenericArg { GenericArg::LifetimeArg(node) }
+    fn from(node: Trait) -> Item { Item::Trait(node) }
 }
-impl From<TypeArg> for GenericArg {
+impl From<TypeAlias> for Item {
-    fn from(node: TypeArg) -> GenericArg { GenericArg::TypeArg(node) }
+    fn from(node: TypeAlias) -> Item { Item::TypeAlias(node) }
 }
-impl From<ConstArg> for GenericArg {
+impl From<Union> for Item {
-    fn from(node: ConstArg) -> GenericArg { GenericArg::ConstArg(node) }
+    fn from(node: Union) -> Item { Item::Union(node) }
 }
-impl From<AssocTypeArg> for GenericArg {
+impl From<Use> for Item {
-    fn from(node: AssocTypeArg) -> GenericArg { GenericArg::AssocTypeArg(node) }
+    fn from(node: Use) -> Item { Item::Use(node) }
 }
-impl AstNode for GenericArg {
+impl AstNode for Item {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LIFETIME_ARG | TYPE_ARG | CONST_ARG | ASSOC_TYPE_ARG => true,
+            CONST | ENUM | EXTERN_BLOCK | EXTERN_CRATE | FN | IMPL | MACRO_CALL | MODULE
+            | STATIC | STRUCT | TRAIT | TYPE_ALIAS | UNION | USE => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        let res = match syntax.kind() {
-            LIFETIME_ARG => GenericArg::LifetimeArg(LifetimeArg { syntax }),
+            CONST => Item::Const(Const { syntax }),
-            TYPE_ARG => GenericArg::TypeArg(TypeArg { syntax }),
+            ENUM => Item::Enum(Enum { syntax }),
-            CONST_ARG => GenericArg::ConstArg(ConstArg { syntax }),
+            EXTERN_BLOCK => Item::ExternBlock(ExternBlock { syntax }),
-            ASSOC_TYPE_ARG => GenericArg::AssocTypeArg(AssocTypeArg { syntax }),
+            EXTERN_CRATE => Item::ExternCrate(ExternCrate { syntax }),
+            FN => Item::Fn(Fn { syntax }),
+            IMPL => Item::Impl(Impl { syntax }),
+            MACRO_CALL => Item::MacroCall(MacroCall { syntax }),
+            MODULE => Item::Module(Module { syntax }),
+            STATIC => Item::Static(Static { syntax }),
+            STRUCT => Item::Struct(Struct { syntax }),
+            TRAIT => Item::Trait(Trait { syntax }),
+            TYPE_ALIAS => Item::TypeAlias(TypeAlias { syntax }),
+            UNION => Item::Union(Union { syntax }),
+            USE => Item::Use(Use { syntax }),
            _ => return None,
        };
        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
        match self {
-            GenericArg::LifetimeArg(it) => &it.syntax,
+            Item::Const(it) => &it.syntax,
-            GenericArg::TypeArg(it) => &it.syntax,
+            Item::Enum(it) => &it.syntax,
-            GenericArg::ConstArg(it) => &it.syntax,
+            Item::ExternBlock(it) => &it.syntax,
-            GenericArg::AssocTypeArg(it) => &it.syntax,
+            Item::ExternCrate(it) => &it.syntax,
+            Item::Fn(it) => &it.syntax,
+            Item::Impl(it) => &it.syntax,
+            Item::MacroCall(it) => &it.syntax,
+            Item::Module(it) => &it.syntax,
+            Item::Static(it) => &it.syntax,
+            Item::Struct(it) => &it.syntax,
+            Item::Trait(it) => &it.syntax,
+            Item::TypeAlias(it) => &it.syntax,
+            Item::Union(it) => &it.syntax,
+            Item::Use(it) => &it.syntax,
        }
    }
 }
@@ -4311,154 +2932,126 @@ impl AstNode for TypeRef {
        }
    }
 }
-impl From<StructDef> for ModuleItem {
+impl From<OrPat> for Pat {
-    fn from(node: StructDef) -> ModuleItem { ModuleItem::StructDef(node) }
+    fn from(node: OrPat) -> Pat { Pat::OrPat(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 {
+impl From<ParenPat> for Pat {
-    fn from(node: TraitDef) -> ModuleItem { ModuleItem::TraitDef(node) }
+    fn from(node: ParenPat) -> Pat { Pat::ParenPat(node) }
 }
-impl From<TypeAliasDef> for ModuleItem {
+impl From<RefPat> for Pat {
-    fn from(node: TypeAliasDef) -> ModuleItem { ModuleItem::TypeAliasDef(node) }
+    fn from(node: RefPat) -> Pat { Pat::RefPat(node) }
 }
-impl From<ImplDef> for ModuleItem {
+impl From<BoxPat> for Pat {
-    fn from(node: ImplDef) -> ModuleItem { ModuleItem::ImplDef(node) }
+    fn from(node: BoxPat) -> Pat { Pat::BoxPat(node) }
 }
-impl From<UseItem> for ModuleItem {
+impl From<BindPat> for Pat {
-    fn from(node: UseItem) -> ModuleItem { ModuleItem::UseItem(node) }
+    fn from(node: BindPat) -> Pat { Pat::BindPat(node) }
 }
-impl From<ExternCrateItem> for ModuleItem {
+impl From<PlaceholderPat> for Pat {
-    fn from(node: ExternCrateItem) -> ModuleItem { ModuleItem::ExternCrateItem(node) }
+    fn from(node: PlaceholderPat) -> Pat { Pat::PlaceholderPat(node) }
 }
-impl From<ConstDef> for ModuleItem {
+impl From<DotDotPat> for Pat {
-    fn from(node: ConstDef) -> ModuleItem { ModuleItem::ConstDef(node) }
+    fn from(node: DotDotPat) -> Pat { Pat::DotDotPat(node) }
 }
-impl From<StaticDef> for ModuleItem {
+impl From<PathPat> for Pat {
-    fn from(node: StaticDef) -> ModuleItem { ModuleItem::StaticDef(node) }
+    fn from(node: PathPat) -> Pat { Pat::PathPat(node) }
 }
-impl From<Module> for ModuleItem {
+impl From<RecordPat> for Pat {
-    fn from(node: Module) -> ModuleItem { ModuleItem::Module(node) }
+    fn from(node: RecordPat) -> Pat { Pat::RecordPat(node) }
 }
-impl From<MacroCall> for ModuleItem {
+impl From<TupleStructPat> for Pat {
-    fn from(node: MacroCall) -> ModuleItem { ModuleItem::MacroCall(node) }
+    fn from(node: TupleStructPat) -> Pat { Pat::TupleStructPat(node) }
 }
-impl From<ExternBlock> for ModuleItem {
+impl From<TuplePat> for Pat {
-    fn from(node: ExternBlock) -> ModuleItem { ModuleItem::ExternBlock(node) }
+    fn from(node: TuplePat) -> Pat { Pat::TuplePat(node) }
 }
-impl AstNode for ModuleItem {
+impl From<SlicePat> for Pat {
-    fn can_cast(kind: SyntaxKind) -> bool {
+    fn from(node: SlicePat) -> Pat { Pat::SlicePat(node) }
-        match kind {
-            STRUCT_DEF | UNION_DEF | ENUM_DEF | FN_DEF | TRAIT_DEF | TYPE_ALIAS_DEF | IMPL_DEF
-            | USE_ITEM | EXTERN_CRATE_ITEM | CONST_DEF | STATIC_DEF | MODULE | MACRO_CALL
-            | EXTERN_BLOCK => true,
-            _ => false,
-        }
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        let res = match syntax.kind() {
-            STRUCT_DEF => ModuleItem::StructDef(StructDef { syntax }),
-            UNION_DEF => ModuleItem::UnionDef(UnionDef { syntax }),
-            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_DEF => ModuleItem::ImplDef(ImplDef { 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 }),
-            MACRO_CALL => ModuleItem::MacroCall(MacroCall { syntax }),
-            EXTERN_BLOCK => ModuleItem::ExternBlock(ExternBlock { syntax }),
-            _ => return None,
-        };
-        Some(res)
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        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::ImplDef(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,
-            ModuleItem::MacroCall(it) => &it.syntax,
-            ModuleItem::ExternBlock(it) => &it.syntax,
-        }
-    }
 }
-impl From<FnDef> for AssocItem {
+impl From<RangePat> for Pat {
-    fn from(node: FnDef) -> AssocItem { AssocItem::FnDef(node) }
+    fn from(node: RangePat) -> Pat { Pat::RangePat(node) }
 }
-impl From<TypeAliasDef> for AssocItem {
+impl From<LiteralPat> for Pat {
-    fn from(node: TypeAliasDef) -> AssocItem { AssocItem::TypeAliasDef(node) }
+    fn from(node: LiteralPat) -> Pat { Pat::LiteralPat(node) }
 }
-impl From<ConstDef> for AssocItem {
+impl From<MacroPat> for Pat {
-    fn from(node: ConstDef) -> AssocItem { AssocItem::ConstDef(node) }
+    fn from(node: MacroPat) -> Pat { Pat::MacroPat(node) }
 }
-impl AstNode for AssocItem {
+impl AstNode for Pat {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            FN_DEF | TYPE_ALIAS_DEF | CONST_DEF => true,
+            OR_PAT | PAREN_PAT | 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 | MACRO_PAT => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        let res = match syntax.kind() {
-            FN_DEF => AssocItem::FnDef(FnDef { syntax }),
+            OR_PAT => Pat::OrPat(OrPat { syntax }),
-            TYPE_ALIAS_DEF => AssocItem::TypeAliasDef(TypeAliasDef { syntax }),
+            PAREN_PAT => Pat::ParenPat(ParenPat { syntax }),
-            CONST_DEF => AssocItem::ConstDef(ConstDef { syntax }),
+            REF_PAT => Pat::RefPat(RefPat { syntax }),
+            BOX_PAT => Pat::BoxPat(BoxPat { syntax }),
+            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 }),
+            MACRO_PAT => Pat::MacroPat(MacroPat { syntax }),
            _ => return None,
        };
        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
        match self {
-            AssocItem::FnDef(it) => &it.syntax,
+            Pat::OrPat(it) => &it.syntax,
-            AssocItem::TypeAliasDef(it) => &it.syntax,
+            Pat::ParenPat(it) => &it.syntax,
-            AssocItem::ConstDef(it) => &it.syntax,
+            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,
+            Pat::MacroPat(it) => &it.syntax,
        }
    }
 }
-impl From<FnDef> for ExternItem {
+impl From<RecordFieldList> for FieldList {
-    fn from(node: FnDef) -> ExternItem { ExternItem::FnDef(node) }
+    fn from(node: RecordFieldList) -> FieldList { FieldList::RecordFieldList(node) }
 }
-impl From<StaticDef> for ExternItem {
+impl From<TupleFieldList> for FieldList {
-    fn from(node: StaticDef) -> ExternItem { ExternItem::StaticDef(node) }
+    fn from(node: TupleFieldList) -> FieldList { FieldList::TupleFieldList(node) }
 }
-impl AstNode for ExternItem {
+impl AstNode for FieldList {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            FN_DEF | STATIC_DEF => true,
+            RECORD_FIELD_LIST | TUPLE_FIELD_LIST => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        let res = match syntax.kind() {
-            FN_DEF => ExternItem::FnDef(FnDef { syntax }),
+            RECORD_FIELD_LIST => FieldList::RecordFieldList(RecordFieldList { syntax }),
-            STATIC_DEF => ExternItem::StaticDef(StaticDef { syntax }),
+            TUPLE_FIELD_LIST => FieldList::TupleFieldList(TupleFieldList { syntax }),
            _ => return None,
        };
        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
        match self {
-            ExternItem::FnDef(it) => &it.syntax,
+            FieldList::RecordFieldList(it) => &it.syntax,
-            ExternItem::StaticDef(it) => &it.syntax,
+            FieldList::TupleFieldList(it) => &it.syntax,
        }
    }
 }
@@ -4507,8 +3100,8 @@ impl From<ReturnExpr> for Expr {
 impl From<MatchExpr> for Expr {
    fn from(node: MatchExpr) -> Expr { Expr::MatchExpr(node) }
 }
-impl From<RecordLit> for Expr {
+impl From<RecordExpr> for Expr {
-    fn from(node: RecordLit) -> Expr { Expr::RecordLit(node) }
+    fn from(node: RecordExpr) -> Expr { Expr::RecordExpr(node) }
 }
 impl From<CallExpr> for Expr {
    fn from(node: CallExpr) -> Expr { Expr::CallExpr(node) }
@@ -4560,7 +3153,7 @@ impl AstNode for Expr {
        match kind {
            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
+            | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_EXPR | CALL_EXPR | INDEX_EXPR
            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | EFFECT_EXPR | CAST_EXPR
            | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => {
                true
@@ -4585,7 +3178,7 @@ impl AstNode for Expr {
            BLOCK_EXPR => Expr::BlockExpr(BlockExpr { syntax }),
            RETURN_EXPR => Expr::ReturnExpr(ReturnExpr { syntax }),
            MATCH_EXPR => Expr::MatchExpr(MatchExpr { syntax }),
-            RECORD_LIT => Expr::RecordLit(RecordLit { syntax }),
+            RECORD_EXPR => Expr::RecordExpr(RecordExpr { syntax }),
            CALL_EXPR => Expr::CallExpr(CallExpr { syntax }),
            INDEX_EXPR => Expr::IndexExpr(IndexExpr { syntax }),
            METHOD_CALL_EXPR => Expr::MethodCallExpr(MethodCallExpr { syntax }),
@@ -4622,7 +3215,7 @@ impl AstNode for Expr {
            Expr::BlockExpr(it) => &it.syntax,
            Expr::ReturnExpr(it) => &it.syntax,
            Expr::MatchExpr(it) => &it.syntax,
-            Expr::RecordLit(it) => &it.syntax,
+            Expr::RecordExpr(it) => &it.syntax,
            Expr::CallExpr(it) => &it.syntax,
            Expr::IndexExpr(it) => &it.syntax,
            Expr::MethodCallExpr(it) => &it.syntax,
@@ -4641,154 +3234,107 @@ impl AstNode for Expr {
        }
    }
 }
-impl From<OrPat> for Pat {
+impl From<Fn> for AssocItem {
-    fn from(node: OrPat) -> Pat { Pat::OrPat(node) }
+    fn from(node: Fn) -> AssocItem { AssocItem::Fn(node) }
-}
-impl From<ParenPat> for Pat {
-    fn from(node: ParenPat) -> Pat { Pat::ParenPat(node) }
-}
-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 {
+impl From<TypeAlias> for AssocItem {
-    fn from(node: RangePat) -> Pat { Pat::RangePat(node) }
+    fn from(node: TypeAlias) -> AssocItem { AssocItem::TypeAlias(node) }
 }
-impl From<LiteralPat> for Pat {
+impl From<Const> for AssocItem {
-    fn from(node: LiteralPat) -> Pat { Pat::LiteralPat(node) }
+    fn from(node: Const) -> AssocItem { AssocItem::Const(node) }
 }
-impl From<MacroPat> for Pat {
+impl From<MacroCall> for AssocItem {
-    fn from(node: MacroPat) -> Pat { Pat::MacroPat(node) }
+    fn from(node: MacroCall) -> AssocItem { AssocItem::MacroCall(node) }
 }
-impl AstNode for Pat {
+impl AstNode for AssocItem {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            OR_PAT | PAREN_PAT | REF_PAT | BOX_PAT | BIND_PAT | PLACEHOLDER_PAT | DOT_DOT_PAT
+            FN | TYPE_ALIAS | CONST | MACRO_CALL => true,
-            | PATH_PAT | RECORD_PAT | TUPLE_STRUCT_PAT | TUPLE_PAT | SLICE_PAT | RANGE_PAT
-            | LITERAL_PAT | MACRO_PAT => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        let res = match syntax.kind() {
-            OR_PAT => Pat::OrPat(OrPat { syntax }),
+            FN => AssocItem::Fn(Fn { syntax }),
-            PAREN_PAT => Pat::ParenPat(ParenPat { syntax }),
+            TYPE_ALIAS => AssocItem::TypeAlias(TypeAlias { syntax }),
-            REF_PAT => Pat::RefPat(RefPat { syntax }),
+            CONST => AssocItem::Const(Const { syntax }),
-            BOX_PAT => Pat::BoxPat(BoxPat { syntax }),
+            MACRO_CALL => AssocItem::MacroCall(MacroCall { syntax }),
-            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 }),
-            MACRO_PAT => Pat::MacroPat(MacroPat { syntax }),
            _ => return None,
        };
        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
        match self {
-            Pat::OrPat(it) => &it.syntax,
+            AssocItem::Fn(it) => &it.syntax,
-            Pat::ParenPat(it) => &it.syntax,
+            AssocItem::TypeAlias(it) => &it.syntax,
-            Pat::RefPat(it) => &it.syntax,
+            AssocItem::Const(it) => &it.syntax,
-            Pat::BoxPat(it) => &it.syntax,
+            AssocItem::MacroCall(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,
-            Pat::MacroPat(it) => &it.syntax,
        }
    }
 }
-impl From<RecordFieldPat> for RecordInnerPat {
+impl From<Fn> for ExternItem {
-    fn from(node: RecordFieldPat) -> RecordInnerPat { RecordInnerPat::RecordFieldPat(node) }
+    fn from(node: Fn) -> ExternItem { ExternItem::Fn(node) }
 }
-impl From<BindPat> for RecordInnerPat {
+impl From<Static> for ExternItem {
-    fn from(node: BindPat) -> RecordInnerPat { RecordInnerPat::BindPat(node) }
+    fn from(node: Static) -> ExternItem { ExternItem::Static(node) }
 }
-impl AstNode for RecordInnerPat {
+impl From<MacroCall> for ExternItem {
+    fn from(node: MacroCall) -> ExternItem { ExternItem::MacroCall(node) }
+}
+impl AstNode for ExternItem {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_FIELD_PAT | BIND_PAT => true,
+            FN | STATIC | MACRO_CALL => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        let res = match syntax.kind() {
-            RECORD_FIELD_PAT => RecordInnerPat::RecordFieldPat(RecordFieldPat { syntax }),
+            FN => ExternItem::Fn(Fn { syntax }),
-            BIND_PAT => RecordInnerPat::BindPat(BindPat { syntax }),
+            STATIC => ExternItem::Static(Static { syntax }),
+            MACRO_CALL => ExternItem::MacroCall(MacroCall { syntax }),
            _ => return None,
        };
        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
        match self {
-            RecordInnerPat::RecordFieldPat(it) => &it.syntax,
+            ExternItem::Fn(it) => &it.syntax,
-            RecordInnerPat::BindPat(it) => &it.syntax,
+            ExternItem::Static(it) => &it.syntax,
+            ExternItem::MacroCall(it) => &it.syntax,
        }
    }
 }
-impl From<Literal> for AttrInput {
+impl From<LifetimeParam> for GenericParam {
-    fn from(node: Literal) -> AttrInput { AttrInput::Literal(node) }
+    fn from(node: LifetimeParam) -> GenericParam { GenericParam::LifetimeParam(node) }
+}
+impl From<TypeParam> for GenericParam {
+    fn from(node: TypeParam) -> GenericParam { GenericParam::TypeParam(node) }
 }
-impl From<TokenTree> for AttrInput {
+impl From<ConstParam> for GenericParam {
-    fn from(node: TokenTree) -> AttrInput { AttrInput::TokenTree(node) }
+    fn from(node: ConstParam) -> GenericParam { GenericParam::ConstParam(node) }
 }
-impl AstNode for AttrInput {
+impl AstNode for GenericParam {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            LITERAL | TOKEN_TREE => true,
+            LIFETIME_PARAM | TYPE_PARAM | CONST_PARAM => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        let res = match syntax.kind() {
-            LITERAL => AttrInput::Literal(Literal { syntax }),
+            LIFETIME_PARAM => GenericParam::LifetimeParam(LifetimeParam { syntax }),
-            TOKEN_TREE => AttrInput::TokenTree(TokenTree { syntax }),
+            TYPE_PARAM => GenericParam::TypeParam(TypeParam { syntax }),
+            CONST_PARAM => GenericParam::ConstParam(ConstParam { syntax }),
            _ => return None,
        };
        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
        match self {
-            AttrInput::Literal(it) => &it.syntax,
+            GenericParam::LifetimeParam(it) => &it.syntax,
-            AttrInput::TokenTree(it) => &it.syntax,
+            GenericParam::TypeParam(it) => &it.syntax,
+            GenericParam::ConstParam(it) => &it.syntax,
        }
    }
 }
@@ -4820,47 +3366,40 @@ impl AstNode for Stmt {
        }
    }
 }
-impl From<RecordFieldDefList> for FieldDefList {
+impl From<Struct> for AdtDef {
-    fn from(node: RecordFieldDefList) -> FieldDefList { FieldDefList::RecordFieldDefList(node) }
+    fn from(node: Struct) -> AdtDef { AdtDef::Struct(node) }
+}
+impl From<Enum> for AdtDef {
+    fn from(node: Enum) -> AdtDef { AdtDef::Enum(node) }
 }
-impl From<TupleFieldDefList> for FieldDefList {
+impl From<Union> for AdtDef {
-    fn from(node: TupleFieldDefList) -> FieldDefList { FieldDefList::TupleFieldDefList(node) }
+    fn from(node: Union) -> AdtDef { AdtDef::Union(node) }
 }
-impl AstNode for FieldDefList {
+impl AstNode for AdtDef {
    fn can_cast(kind: SyntaxKind) -> bool {
        match kind {
-            RECORD_FIELD_DEF_LIST | TUPLE_FIELD_DEF_LIST => true,
+            STRUCT | ENUM | UNION => true,
            _ => false,
        }
    }
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        let res = match syntax.kind() {
-            RECORD_FIELD_DEF_LIST => {
+            STRUCT => AdtDef::Struct(Struct { syntax }),
-                FieldDefList::RecordFieldDefList(RecordFieldDefList { syntax })
+            ENUM => AdtDef::Enum(Enum { syntax }),
-            }
+            UNION => AdtDef::Union(Union { syntax }),
-            TUPLE_FIELD_DEF_LIST => FieldDefList::TupleFieldDefList(TupleFieldDefList { syntax }),
            _ => return None,
        };
        Some(res)
    }
    fn syntax(&self) -> &SyntaxNode {
        match self {
-            FieldDefList::RecordFieldDefList(it) => &it.syntax,
+            AdtDef::Struct(it) => &it.syntax,
-            FieldDefList::TupleFieldDefList(it) => &it.syntax,
+            AdtDef::Enum(it) => &it.syntax,
+            AdtDef::Union(it) => &it.syntax,
        }
    }
 }
-impl std::fmt::Display for NominalDef {
+impl std::fmt::Display for Item {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl std::fmt::Display for GenericParam {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl std::fmt::Display for GenericArg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
@@ -4870,17 +3409,12 @@ impl std::fmt::Display for TypeRef {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ModuleItem {
+impl std::fmt::Display for Pat {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
-impl std::fmt::Display for AssocItem {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ExternItem {
+impl std::fmt::Display for FieldList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
@@ -4890,17 +3424,17 @@ impl std::fmt::Display for Expr {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Pat {
+impl std::fmt::Display for AssocItem {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordInnerPat {
+impl std::fmt::Display for ExternItem {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for AttrInput {
+impl std::fmt::Display for GenericParam {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
@@ -4910,7 +3444,7 @@ impl std::fmt::Display for Stmt {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for FieldDefList {
+impl std::fmt::Display for AdtDef {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
@@ -4920,617 +3454,617 @@ impl std::fmt::Display for SourceFile {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for FnDef {
+impl std::fmt::Display for Attr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RetType {
+impl std::fmt::Display for Const {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for StructDef {
+impl std::fmt::Display for Enum {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for UnionDef {
+impl std::fmt::Display for ExternBlock {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordFieldDefList {
+impl std::fmt::Display for ExternCrate {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordFieldDef {
+impl std::fmt::Display for Fn {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TupleFieldDefList {
+impl std::fmt::Display for Impl {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TupleFieldDef {
+impl std::fmt::Display for MacroCall {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for EnumDef {
+impl std::fmt::Display for Module {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for EnumVariantList {
+impl std::fmt::Display for Static {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for EnumVariant {
+impl std::fmt::Display for Struct {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TraitDef {
+impl std::fmt::Display for Trait {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Module {
+impl std::fmt::Display for TypeAlias {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ItemList {
+impl std::fmt::Display for Union {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ConstDef {
+impl std::fmt::Display for Use {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for StaticDef {
+impl std::fmt::Display for Visibility {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TypeAliasDef {
+impl std::fmt::Display for Name {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ImplDef {
+impl std::fmt::Display for ItemList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ParenType {
+impl std::fmt::Display for NameRef {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TupleType {
+impl std::fmt::Display for Rename {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for NeverType {
+impl std::fmt::Display for UseTree {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for PathType {
+impl std::fmt::Display for Path {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for PointerType {
+impl std::fmt::Display for UseTreeList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ArrayType {
+impl std::fmt::Display for Abi {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for SliceType {
+impl std::fmt::Display for GenericParamList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ReferenceType {
+impl std::fmt::Display for ParamList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for PlaceholderType {
+impl std::fmt::Display for RetType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for FnPointerType {
+impl std::fmt::Display for WhereClause {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ForType {
+impl std::fmt::Display for BlockExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ImplTraitType {
+impl std::fmt::Display for SelfParam {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for DynTraitType {
+impl std::fmt::Display for Param {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TupleExpr {
+impl std::fmt::Display for TypeBoundList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ArrayExpr {
+impl std::fmt::Display for RecordFieldList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ParenExpr {
+impl std::fmt::Display for TupleFieldList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for PathExpr {
+impl std::fmt::Display for RecordField {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for LambdaExpr {
+impl std::fmt::Display for TupleField {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for IfExpr {
+impl std::fmt::Display for VariantList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for LoopExpr {
+impl std::fmt::Display for Variant {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for EffectExpr {
+impl std::fmt::Display for AssocItemList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ForExpr {
+impl std::fmt::Display for ExternItemList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for WhileExpr {
+impl std::fmt::Display for LifetimeParam {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ContinueExpr {
+impl std::fmt::Display for TypeParam {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for BreakExpr {
+impl std::fmt::Display for ConstParam {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Label {
+impl std::fmt::Display for Literal {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for BlockExpr {
+impl std::fmt::Display for TokenTree {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ReturnExpr {
+impl std::fmt::Display for ParenType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for CallExpr {
+impl std::fmt::Display for TupleType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MethodCallExpr {
+impl std::fmt::Display for NeverType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for IndexExpr {
+impl std::fmt::Display for PathType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for FieldExpr {
+impl std::fmt::Display for PointerType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for AwaitExpr {
+impl std::fmt::Display for ArrayType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TryExpr {
+impl std::fmt::Display for SliceType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for CastExpr {
+impl std::fmt::Display for ReferenceType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RefExpr {
+impl std::fmt::Display for PlaceholderType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for PrefixExpr {
+impl std::fmt::Display for FnPointerType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for BoxExpr {
+impl std::fmt::Display for ForType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RangeExpr {
+impl std::fmt::Display for ImplTraitType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for BinExpr {
+impl std::fmt::Display for DynTraitType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Literal {
+impl std::fmt::Display for TupleExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MatchExpr {
+impl std::fmt::Display for ArrayExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MatchArmList {
+impl std::fmt::Display for ParenExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MatchArm {
+impl std::fmt::Display for PathExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MatchGuard {
+impl std::fmt::Display for LambdaExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordLit {
+impl std::fmt::Display for IfExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordFieldList {
+impl std::fmt::Display for Condition {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordField {
+impl std::fmt::Display for EffectExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for OrPat {
+impl std::fmt::Display for Label {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ParenPat {
+impl std::fmt::Display for LoopExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RefPat {
+impl std::fmt::Display for ForExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for BoxPat {
+impl std::fmt::Display for WhileExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for BindPat {
+impl std::fmt::Display for ContinueExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for PlaceholderPat {
+impl std::fmt::Display for BreakExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for DotDotPat {
+impl std::fmt::Display for ReturnExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for PathPat {
+impl std::fmt::Display for CallExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for SlicePat {
+impl std::fmt::Display for ArgList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RangePat {
+impl std::fmt::Display for MethodCallExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for LiteralPat {
+impl std::fmt::Display for TypeArgList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MacroPat {
+impl std::fmt::Display for FieldExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordPat {
+impl std::fmt::Display for IndexExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordFieldPatList {
+impl std::fmt::Display for AwaitExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for RecordFieldPat {
+impl std::fmt::Display for TryExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TupleStructPat {
+impl std::fmt::Display for CastExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TuplePat {
+impl std::fmt::Display for RefExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Visibility {
+impl std::fmt::Display for PrefixExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Name {
+impl std::fmt::Display for BoxExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for NameRef {
+impl std::fmt::Display for RangeExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MacroCall {
+impl std::fmt::Display for BinExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Attr {
+impl std::fmt::Display for MatchExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TokenTree {
+impl std::fmt::Display for MatchArmList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TypeParamList {
+impl std::fmt::Display for MatchArm {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TypeParam {
+impl std::fmt::Display for MatchGuard {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ConstParam {
+impl std::fmt::Display for RecordExpr {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for LifetimeParam {
+impl std::fmt::Display for RecordExprFieldList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TypeBound {
+impl std::fmt::Display for RecordExprField {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TypeBoundList {
+impl std::fmt::Display for OrPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for WherePred {
+impl std::fmt::Display for ParenPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for WhereClause {
+impl std::fmt::Display for RefPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Abi {
+impl std::fmt::Display for BoxPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ExprStmt {
+impl std::fmt::Display for BindPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for LetStmt {
+impl std::fmt::Display for PlaceholderPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Condition {
+impl std::fmt::Display for DotDotPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ParamList {
+impl std::fmt::Display for PathPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for SelfParam {
+impl std::fmt::Display for SlicePat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Param {
+impl std::fmt::Display for RangePat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for UseItem {
+impl std::fmt::Display for LiteralPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for UseTree {
+impl std::fmt::Display for MacroPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Alias {
+impl std::fmt::Display for RecordPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for UseTreeList {
+impl std::fmt::Display for RecordFieldPatList {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ExternCrateItem {
+impl std::fmt::Display for RecordFieldPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ArgList {
+impl std::fmt::Display for TupleStructPat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for Path {
+impl std::fmt::Display for TuplePat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for PathSegment {
+impl std::fmt::Display for MacroDef {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TypeArgList {
+impl std::fmt::Display for MacroItems {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for TypeArg {
+impl std::fmt::Display for MacroStmts {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for AssocTypeArg {
+impl std::fmt::Display for TypeBound {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for LifetimeArg {
+impl std::fmt::Display for WherePred {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ConstArg {
+impl std::fmt::Display for ExprStmt {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MacroItems {
+impl std::fmt::Display for LetStmt {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MacroStmts {
+impl std::fmt::Display for PathSegment {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ExternItemList {
+impl std::fmt::Display for TypeArg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for ExternBlock {
+impl std::fmt::Display for LifetimeArg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MetaItem {
+impl std::fmt::Display for AssocTypeArg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
 }
-impl std::fmt::Display for MacroDef {
+impl std::fmt::Display for ConstArg {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        std::fmt::Display::fmt(self.syntax(), f)
    }
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index 192c610f1..509e8ae7a 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -37,7 +37,7 @@ fn path_from_text(text: &str) -> ast::Path {
 pub fn use_tree(
    path: ast::Path,
    use_tree_list: Option<ast::UseTreeList>,
-    alias: Option<ast::Alias>,
+    alias: Option<ast::Rename>,
    add_star: bool,
 ) -> ast::UseTree {
    let mut buf = "use ".to_string();
@@ -60,22 +60,22 @@ pub fn use_tree_list(use_trees: impl IntoIterator<Item = ast::UseTree>) -> ast::
    ast_from_text(&format!("use {{{}}};", use_trees))
 }
-pub fn use_item(use_tree: ast::UseTree) -> ast::UseItem {
+pub fn use_item(use_tree: ast::UseTree) -> ast::Use {
    ast_from_text(&format!("use {};", use_tree))
 }
-pub fn record_field(name: ast::NameRef, expr: Option<ast::Expr>) -> ast::RecordField {
+pub fn record_field(name: ast::NameRef, expr: Option<ast::Expr>) -> ast::RecordExprField {
    return match expr {
        Some(expr) => from_text(&format!("{}: {}", name, expr)),
        None => from_text(&name.to_string()),
    };
-    fn from_text(text: &str) -> ast::RecordField {
+    fn from_text(text: &str) -> ast::RecordExprField {
        ast_from_text(&format!("fn f() {{ S {{ {}, }} }}", text))
    }
 }
-pub fn record_field_def(name: ast::NameRef, ty: ast::TypeRef) -> ast::RecordFieldDef {
+pub fn record_field_def(name: ast::NameRef, ty: ast::TypeRef) -> ast::RecordField {
    ast_from_text(&format!("struct S {{ {}: {}, }}", name, ty))
 }
@@ -291,10 +291,10 @@ pub fn visibility_pub_crate() -> ast::Visibility {
 pub fn fn_def(
    visibility: Option<ast::Visibility>,
    fn_name: ast::Name,
-    type_params: Option<ast::TypeParamList>,
+    type_params: Option<ast::GenericParamList>,
    params: ast::ParamList,
    body: ast::BlockExpr,
-) -> ast::FnDef {
+) -> ast::Fn {
    let type_params =
        if let Some(type_params) = type_params { format!("<{}>", type_params) } else { "".into() };
    let visibility = match visibility {
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/node_ext.rs
index 662c6f73e..bba7310ad 100644
--- a/crates/ra_syntax/src/ast/extensions.rs
+++ b/crates/ra_syntax/src/ast/node_ext.rs
@@ -7,7 +7,7 @@ use itertools::Itertools;
 use ra_parser::SyntaxKind;
 use crate::{
-    ast::{self, support, AstNode, AttrInput, NameOwner, SyntaxNode},
+    ast::{self, support, AstNode, NameOwner, SyntaxNode},
    SmolStr, SyntaxElement, SyntaxToken, T,
 };
@@ -39,29 +39,23 @@ pub enum AttrKind {
 impl ast::Attr {
    pub fn as_simple_atom(&self) -> Option<SmolStr> {
-        match self.input() {
+        if self.eq_token().is_some() || self.token_tree().is_some() {
-            None => self.simple_name(),
+            return None;
-            Some(_) => None,
        }
+        self.simple_name()
    }
    pub fn as_simple_call(&self) -> Option<(SmolStr, ast::TokenTree)> {
-        match self.input() {
+        let tt = self.token_tree()?;
-            Some(AttrInput::TokenTree(tt)) => Some((self.simple_name()?, tt)),
+        Some((self.simple_name()?, tt))
-            _ => None,
-        }
    }
    pub fn as_simple_key_value(&self) -> Option<(SmolStr, SmolStr)> {
-        match self.input() {
+        let lit = self.literal()?;
-            Some(AttrInput::Literal(lit)) => {
+        let key = self.simple_name()?;
-                let key = self.simple_name()?;
+        // FIXME: escape? raw string?
-                // FIXME: escape? raw string?
+        let value = lit.syntax().first_token()?.text().trim_matches('"').into();
-                let value = lit.syntax().first_token()?.text().trim_matches('"').into();
+        Some((key, value))
-                Some((key, value))
-            }
-            _ => None,
-        }
    }
    pub fn simple_name(&self) -> Option<SmolStr> {
@@ -141,7 +135,7 @@ impl ast::UseTreeList {
    }
 }
-impl ast::ImplDef {
+impl ast::Impl {
    pub fn target_type(&self) -> Option<ast::TypeRef> {
        match self.target() {
            (Some(t), None) | (_, Some(t)) => Some(t),
@@ -166,16 +160,16 @@ impl ast::ImplDef {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum StructKind {
-    Record(ast::RecordFieldDefList),
+    Record(ast::RecordFieldList),
-    Tuple(ast::TupleFieldDefList),
+    Tuple(ast::TupleFieldList),
    Unit,
 }
 impl StructKind {
    fn from_node<N: AstNode>(node: &N) -> StructKind {
-        if let Some(nfdl) = support::child::<ast::RecordFieldDefList>(node.syntax()) {
+        if let Some(nfdl) = support::child::<ast::RecordFieldList>(node.syntax()) {
            StructKind::Record(nfdl)
-        } else if let Some(pfl) = support::child::<ast::TupleFieldDefList>(node.syntax()) {
+        } else if let Some(pfl) = support::child::<ast::TupleFieldList>(node.syntax()) {
            StructKind::Tuple(pfl)
        } else {
            StructKind::Unit
@@ -183,17 +177,17 @@ impl StructKind {
    }
 }
-impl ast::StructDef {
+impl ast::Struct {
    pub fn kind(&self) -> StructKind {
        StructKind::from_node(self)
    }
 }
-impl ast::RecordField {
+impl ast::RecordExprField {
-    pub fn for_field_name(field_name: &ast::NameRef) -> Option<ast::RecordField> {
+    pub fn for_field_name(field_name: &ast::NameRef) -> Option<ast::RecordExprField> {
        let candidate =
-            field_name.syntax().parent().and_then(ast::RecordField::cast).or_else(|| {
+            field_name.syntax().parent().and_then(ast::RecordExprField::cast).or_else(|| {
-                field_name.syntax().ancestors().nth(4).and_then(ast::RecordField::cast)
+                field_name.syntax().ancestors().nth(4).and_then(ast::RecordExprField::cast)
            })?;
        if candidate.field_name().as_ref() == Some(field_name) {
            Some(candidate)
@@ -247,12 +241,12 @@ impl ast::RecordFieldPat {
    }
 }
-impl ast::EnumVariant {
+impl ast::Variant {
-    pub fn parent_enum(&self) -> ast::EnumDef {
+    pub fn parent_enum(&self) -> ast::Enum {
        self.syntax()
            .parent()
            .and_then(|it| it.parent())
-            .and_then(ast::EnumDef::cast)
+            .and_then(ast::Enum::cast)
            .expect("EnumVariants are always nested in Enums")
    }
    pub fn kind(&self) -> StructKind {
@@ -472,3 +466,40 @@ impl ast::TokenTree {
            .filter(|it| matches!(it.kind(), T!['}'] | T![')'] | T![']']))
    }
 }
+impl ast::GenericParamList {
+    pub fn lifetime_params(&self) -> impl Iterator<Item = ast::LifetimeParam> {
+        self.generic_params().filter_map(|param| match param {
+            ast::GenericParam::LifetimeParam(it) => Some(it),
+            ast::GenericParam::TypeParam(_) | ast::GenericParam::ConstParam(_) => None,
+        })
+    }
+    pub fn type_params(&self) -> impl Iterator<Item = ast::TypeParam> {
+        self.generic_params().filter_map(|param| match param {
+            ast::GenericParam::TypeParam(it) => Some(it),
+            ast::GenericParam::LifetimeParam(_) | ast::GenericParam::ConstParam(_) => None,
+        })
+    }
+    pub fn const_params(&self) -> impl Iterator<Item = ast::ConstParam> {
+        self.generic_params().filter_map(|param| match param {
+            ast::GenericParam::ConstParam(it) => Some(it),
+            ast::GenericParam::TypeParam(_) | ast::GenericParam::LifetimeParam(_) => None,
+        })
+    }
+}
+impl ast::DocCommentsOwner for ast::SourceFile {}
+impl ast::DocCommentsOwner for ast::Fn {}
+impl ast::DocCommentsOwner for ast::Struct {}
+impl ast::DocCommentsOwner for ast::Union {}
+impl ast::DocCommentsOwner for ast::RecordField {}
+impl ast::DocCommentsOwner for ast::TupleField {}
+impl ast::DocCommentsOwner for ast::Enum {}
+impl ast::DocCommentsOwner for ast::Variant {}
+impl ast::DocCommentsOwner for ast::Trait {}
+impl ast::DocCommentsOwner for ast::Module {}
+impl ast::DocCommentsOwner for ast::Static {}
+impl ast::DocCommentsOwner for ast::Const {}
+impl ast::DocCommentsOwner for ast::TypeAlias {}
+impl ast::DocCommentsOwner for ast::Impl {}
+impl ast::DocCommentsOwner for ast::MacroCall {}
diff --git a/crates/ra_syntax/src/ast/tokens.rs b/crates/ra_syntax/src/ast/token_ext.rs
index 2e72d4927..c5ef92733 100644
--- a/crates/ra_syntax/src/ast/tokens.rs
+++ b/crates/ra_syntax/src/ast/token_ext.rs
@@ -1,12 +1,16 @@
 //! There are many AstNodes, but only a few tokens, so we hand-write them here.
-use std::convert::{TryFrom, TryInto};
+use std::{
+    borrow::Cow,
+    convert::{TryFrom, TryInto},
+};
+use rustc_lexer::unescape::{unescape_literal, Mode};
 use crate::{
    ast::{AstToken, Comment, RawString, String, Whitespace},
    TextRange, TextSize,
 };
-use rustc_lexer::unescape::{unescape_literal, Mode};
 impl Comment {
    pub fn kind(&self) -> CommentKind {
@@ -138,11 +142,11 @@ impl HasQuotes for String {}
 impl HasQuotes for RawString {}
 pub trait HasStringValue: HasQuotes {
-    fn value(&self) -> Option<std::string::String>;
+    fn value(&self) -> Option<Cow<'_, str>>;
 }
 impl HasStringValue for String {
-    fn value(&self) -> Option<std::string::String> {
+    fn value(&self) -> Option<Cow<'_, str>> {
        let text = self.text().as_str();
        let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
@@ -156,15 +160,17 @@ impl HasStringValue for String {
        if has_error {
            return None;
        }
-        Some(buf)
+        // FIXME: don't actually allocate for borrowed case
+        let res = if buf == text { Cow::Borrowed(text) } else { Cow::Owned(buf) };
+        Some(res)
    }
 }
 impl HasStringValue for RawString {
-    fn value(&self) -> Option<std::string::String> {
+    fn value(&self) -> Option<Cow<'_, str>> {
        let text = self.text().as_str();
        let text = &text[self.text_range_between_quotes()? - self.syntax().text_range().start()];
-        Some(text.to_string())
+        Some(Cow::Borrowed(text))
    }
 }
diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/ra_syntax/src/ast/traits.rs
index a8f2454fd..3a56b1674 100644
--- a/crates/ra_syntax/src/ast/traits.rs
+++ b/crates/ra_syntax/src/ast/traits.rs
@@ -9,12 +9,6 @@ use crate::{
    SyntaxToken, T,
 };
-pub trait TypeAscriptionOwner: AstNode {
-    fn ascribed_type(&self) -> Option<ast::TypeRef> {
-        support::child(self.syntax())
-    }
-}
 pub trait NameOwner: AstNode {
    fn name(&self) -> Option<ast::Name> {
        support::child(self.syntax())
@@ -44,13 +38,13 @@ pub trait ArgListOwner: AstNode {
 }
 pub trait ModuleItemOwner: AstNode {
-    fn items(&self) -> AstChildren<ast::ModuleItem> {
+    fn items(&self) -> AstChildren<ast::Item> {
        support::children(self.syntax())
    }
 }
-pub trait TypeParamsOwner: AstNode {
+pub trait GenericParamsOwner: AstNode {
-    fn type_param_list(&self) -> Option<ast::TypeParamList> {
+    fn generic_param_list(&self) -> Option<ast::GenericParamList> {
        support::child(self.syntax())
    }
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 9b7664576..6203b6206 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -42,8 +42,6 @@ use std::{marker::PhantomData, sync::Arc};
 use ra_text_edit::Indel;
 use stdx::format_to;
-use crate::syntax_node::GreenNode;
 pub use crate::{
    algo::InsertPosition,
    ast::{AstNode, AstToken},
@@ -51,7 +49,7 @@ pub use crate::{
    ptr::{AstPtr, SyntaxNodePtr},
    syntax_error::SyntaxError,
    syntax_node::{
-        Direction, NodeOrToken, SyntaxElement, SyntaxElementChildren, SyntaxNode,
+        Direction, GreenNode, NodeOrToken, SyntaxElement, SyntaxElementChildren, SyntaxNode,
        SyntaxNodeChildren, SyntaxToken, SyntaxTreeBuilder,
    },
 };
@@ -189,7 +187,7 @@ impl ast::Expr {
    }
 }
-impl ast::ModuleItem {
+impl ast::Item {
    /// Returns `text`, parsed as an item, but only if it has no errors.
    pub fn parse(text: &str) -> Result<Self, ()> {
        parsing::parse_text_fragment(text, ra_parser::FragmentKind::Item)
@@ -257,11 +255,11 @@ fn api_walkthrough() {
    let mut func = None;
    for item in file.items() {
        match item {
-            ast::ModuleItem::FnDef(f) => func = Some(f),
+            ast::Item::Fn(f) => func = Some(f),
            _ => unreachable!(),
        }
    }
-    let func: ast::FnDef = func.unwrap();
+    let func: ast::Fn = func.unwrap();
    // Each AST node has a bunch of getters for children. All getters return
    // `Option`s though, to account for incomplete code. Some getters are common
@@ -318,7 +316,7 @@ fn api_walkthrough() {
    );
    // As well as some iterator helpers:
-    let f = expr_syntax.ancestors().find_map(ast::FnDef::cast);
+    let f = expr_syntax.ancestors().find_map(ast::Fn::cast);
    assert_eq!(f, Some(func));
    assert!(expr_syntax.siblings_with_tokens(Direction::Next).any(|it| it.kind() == T!['}']));
    assert_eq!(
diff --git a/crates/ra_syntax/src/parsing/text_tree_sink.rs b/crates/ra_syntax/src/parsing/text_tree_sink.rs
index 22aed1db1..6d1828d20 100644
--- a/crates/ra_syntax/src/parsing/text_tree_sink.rs
+++ b/crates/ra_syntax/src/parsing/text_tree_sink.rs
@@ -146,8 +146,8 @@ fn n_attached_trivias<'a>(
    trivias: impl Iterator<Item = (SyntaxKind, &'a str)>,
 ) -> usize {
    match kind {
-        MACRO_CALL | CONST_DEF | TYPE_ALIAS_DEF | STRUCT_DEF | ENUM_DEF | ENUM_VARIANT | FN_DEF
+        MACRO_CALL | CONST | TYPE_ALIAS | STRUCT | ENUM | VARIANT | FN | TRAIT | MODULE
-        | TRAIT_DEF | MODULE | RECORD_FIELD_DEF | STATIC_DEF => {
+        | RECORD_FIELD | STATIC => {
            let mut res = 0;
            let mut trivias = trivias.enumerate().peekable();
@@ -160,7 +160,10 @@ fn n_attached_trivias<'a>(
                            if let Some((peek_kind, peek_text)) =
                                trivias.peek().map(|(_, pair)| pair)
                            {
-                                if *peek_kind == COMMENT && peek_text.starts_with("///") {
+                                if *peek_kind == COMMENT
+                                    && peek_text.starts_with("///")
+                                    && !peek_text.starts_with("////")
+                                {
                                    continue;
                                }
                            }
diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs
index 62f03e93d..ca7957747 100644
--- a/crates/ra_syntax/src/ptr.rs
+++ b/crates/ra_syntax/src/ptr.rs
@@ -98,7 +98,7 @@ fn test_local_syntax_ptr() {
    use crate::{ast, AstNode, SourceFile};
    let file = SourceFile::parse("struct Foo { f: u32, }").ok().unwrap();
-    let field = file.syntax().descendants().find_map(ast::RecordFieldDef::cast).unwrap();
+    let field = file.syntax().descendants().find_map(ast::RecordField::cast).unwrap();
    let ptr = SyntaxNodePtr::new(field.syntax());
    let field_syntax = ptr.to_node(file.syntax());
    assert_eq!(field.syntax(), &field_syntax);
diff --git a/crates/ra_syntax/src/syntax_node.rs b/crates/ra_syntax/src/syntax_node.rs
index 9650b8781..a7dbdba7b 100644
--- a/crates/ra_syntax/src/syntax_node.rs
+++ b/crates/ra_syntax/src/syntax_node.rs
@@ -10,7 +10,9 @@ use rowan::{GreenNodeBuilder, Language};
 use crate::{Parse, SmolStr, SyntaxError, SyntaxKind, TextSize};
-pub(crate) use rowan::{GreenNode, GreenToken};
+pub use rowan::GreenNode;
+pub(crate) use rowan::GreenToken;
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum RustLanguage {}
diff --git a/crates/ra_syntax/src/tests.rs b/crates/ra_syntax/src/tests.rs
index 959967b79..68cee8914 100644
--- a/crates/ra_syntax/src/tests.rs
+++ b/crates/ra_syntax/src/tests.rs
@@ -1,9 +1,12 @@
 use std::{
    fmt::Write,
-    path::{Component, Path, PathBuf},
+    fs,
+    path::{Path, PathBuf},
 };
-use test_utils::{collect_rust_files, dir_tests, project_dir, read_text};
+use expect::expect_file;
+use rayon::prelude::*;
+use test_utils::project_dir;
 use crate::{fuzz, tokenize, SourceFile, SyntaxError, TextRange, TextSize, Token};
@@ -86,7 +89,7 @@ fn item_parser_tests() {
    fragment_parser_dir_test(
        &["parser/fragments/item/ok"],
        &["parser/fragments/item/err"],
-        crate::ast::ModuleItem::parse,
+        crate::ast::Item::parse,
    );
 }
@@ -119,33 +122,43 @@ fn reparse_fuzz_tests() {
 /// FIXME: Use this as a benchmark
 #[test]
 fn self_hosting_parsing() {
-    use std::ffi::OsStr;
    let dir = project_dir().join("crates");
-    let mut count = 0;
+    let files = walkdir::WalkDir::new(dir)
-    for entry in walkdir::WalkDir::new(dir)
        .into_iter()
        .filter_entry(|entry| {
-            !entry.path().components().any(|component| {
+            // Get all files which are not in the crates/ra_syntax/test_data folder
-                // Get all files which are not in the crates/ra_syntax/test_data folder
+            !entry.path().components().any(|component| component.as_os_str() == "test_data")
-                component == Component::Normal(OsStr::new("test_data"))
-            })
        })
        .map(|e| e.unwrap())
        .filter(|entry| {
            // Get all `.rs ` files
-            !entry.path().is_dir() && (entry.path().extension() == Some(OsStr::new("rs")))
+            !entry.path().is_dir() && (entry.path().extension().unwrap_or_default() == "rs")
        })
-    {
+        .map(|entry| entry.into_path())
-        count += 1;
+        .collect::<Vec<_>>();
-        let text = read_text(entry.path());
-        if let Err(errors) = SourceFile::parse(&text).ok() {
-            panic!("Parsing errors:\n{:?}\n{}\n", errors, entry.path().display());
-        }
-    }
    assert!(
-        count > 30,
+        files.len() > 100,
        "self_hosting_parsing found too few files - is it running in the right directory?"
-    )
+    );
+    let errors = files
+        .into_par_iter()
+        .filter_map(|file| {
+            let text = read_text(&file);
+            match SourceFile::parse(&text).ok() {
+                Ok(_) => None,
+                Err(err) => Some((file, err)),
+            }
+        })
+        .collect::<Vec<_>>();
+    if !errors.is_empty() {
+        let errors = errors
+            .into_iter()
+            .map(|(path, err)| format!("{}: {:?}\n", path.display(), err))
+            .collect::<String>();
+        panic!("Parsing errors:\n{}\n", errors);
+    }
 }
 fn test_data_dir() -> PathBuf {
@@ -200,3 +213,68 @@ where
        }
    });
 }
+/// Calls callback `f` with input code and file paths for each `.rs` file in `test_data_dir`
+/// subdirectories defined by `paths`.
+///
+/// If the content of the matching output file differs from the output of `f()`
+/// the test will fail.
+///
+/// If there is no matching output file it will be created and filled with the
+/// output of `f()`, but the test will fail.
+fn dir_tests<F>(test_data_dir: &Path, paths: &[&str], outfile_extension: &str, f: F)
+where
+    F: Fn(&str, &Path) -> String,
+{
+    for (path, input_code) in collect_rust_files(test_data_dir, paths) {
+        let actual = f(&input_code, &path);
+        let path = path.with_extension(outfile_extension);
+        expect_file![path].assert_eq(&actual)
+    }
+}
+/// Collects all `.rs` files from `dir` subdirectories defined by `paths`.
+fn collect_rust_files(root_dir: &Path, paths: &[&str]) -> Vec<(PathBuf, String)> {
+    paths
+        .iter()
+        .flat_map(|path| {
+            let path = root_dir.to_owned().join(path);
+            rust_files_in_dir(&path).into_iter()
+        })
+        .map(|path| {
+            let text = read_text(&path);
+            (path, text)
+        })
+        .collect()
+}
+/// Collects paths to all `.rs` files from `dir` in a sorted `Vec<PathBuf>`.
+fn rust_files_in_dir(dir: &Path) -> Vec<PathBuf> {
+    let mut acc = Vec::new();
+    for file in fs::read_dir(&dir).unwrap() {
+        let file = file.unwrap();
+        let path = file.path();
+        if path.extension().unwrap_or_default() == "rs" {
+            acc.push(path);
+        }
+    }
+    acc.sort();
+    acc
+}
+/// Read file and normalize newlines.
+///
+/// `rustc` seems to always normalize `\r\n` newlines to `\n`:
+///
+/// ```
+/// let s = "
+/// ";
+/// assert_eq!(s.as_bytes(), &[10]);
+/// ```
+///
+/// so this should always be correct.
+fn read_text(path: &Path) -> String {
+    fs::read_to_string(path)
+        .unwrap_or_else(|_| panic!("File at {:?} should be valid", path))
+        .replace("\r\n", "\n")
+}
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index fdec48fb0..0325ab0b4 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -4,7 +4,7 @@ mod block;
 use crate::{
    ast, match_ast, AstNode, SyntaxError,
-    SyntaxKind::{BYTE, BYTE_STRING, CHAR, CONST_DEF, FN_DEF, INT_NUMBER, STRING, TYPE_ALIAS_DEF},
+    SyntaxKind::{BYTE, BYTE_STRING, CHAR, CONST, FN, INT_NUMBER, STRING, TYPE_ALIAS},
    SyntaxNode, SyntaxToken, TextSize, T,
 };
 use rustc_lexer::unescape::{
@@ -91,7 +91,7 @@ pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
                ast::Literal(it) => validate_literal(it, &mut errors),
                ast::BlockExpr(it) => block::validate_block_expr(it, &mut errors),
                ast::FieldExpr(it) => validate_numeric_name(it.name_ref(), &mut errors),
-                ast::RecordField(it) => validate_numeric_name(it.name_ref(), &mut errors),
+                ast::RecordExprField(it) => validate_numeric_name(it.name_ref(), &mut errors),
                ast::Visibility(it) => validate_visibility(it, &mut errors),
                ast::RangeExpr(it) => validate_range_expr(it, &mut errors),
                ast::PathSegment(it) => validate_path_keywords(it, &mut errors),
@@ -200,11 +200,11 @@ fn validate_visibility(vis: ast::Visibility, errors: &mut Vec<SyntaxError>) {
        None => return,
    };
    match parent.kind() {
-        FN_DEF | CONST_DEF | TYPE_ALIAS_DEF => (),
+        FN | CONST | TYPE_ALIAS => (),
        _ => return,
    }
-    let impl_def = match parent.parent().and_then(|it| it.parent()).and_then(ast::ImplDef::cast) {
+    let impl_def = match parent.parent().and_then(|it| it.parent()).and_then(ast::Impl::cast) {
        Some(it) => it,
        None => return,
    };
diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs
index 2c08f7e6e..ad9901468 100644
--- a/crates/ra_syntax/src/validation/block.rs
+++ b/crates/ra_syntax/src/validation/block.rs
@@ -9,7 +9,7 @@ use crate::{
 pub(crate) fn validate_block_expr(block: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
    if let Some(parent) = block.syntax().parent() {
        match parent.kind() {
-            FN_DEF | EXPR_STMT | BLOCK_EXPR => return,
+            FN | EXPR_STMT | BLOCK_EXPR => return,
            _ => {}
        }
    }
diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
index 81f0f575c..bbbf496c8 100644
--- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
+++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..34
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
        [email protected]
          [email protected] "a"
        [email protected] ":"
@@ -19,7 +19,7 @@ [email protected]
              [email protected]
                [email protected] "u32"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@26..32
+      [email protected]
        [email protected]
          [email protected] "b"
        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
index 97d0fe910..6dc73bfdb 100644
--- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
@@ -5,13 +5,13 @@ [email protected]
  [email protected]
    [email protected] "match"
  [email protected] "\n\n"
-  STRUCT_DEF@10..21
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "}"
 error 0..0: expected an item
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
index 6717995e9..4cfd1bce4 100644
--- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
+++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
@@ -6,7 +6,7 @@ [email protected]
    [email protected] "!"
  [email protected]
    [email protected] "/"
-  USE_ITEM@24..28
+  [email protected]
    [email protected] "use"
    [email protected]
      [email protected] "/"
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
index 21c255698..7763fad84 100644
--- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..39
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
        [email protected]
          [email protected] "a"
        [email protected] ":"
@@ -20,7 +20,7 @@ [email protected]
                [email protected] "i32"
      [email protected] ","
      [email protected] "\n    "
-      RECORD_FIELD_DEF@27..36
+      [email protected]
        [email protected]
          [email protected] "b"
        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
index b3bcf472a..9a0f4665e 100644
--- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
+++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
index 375ed45e0..4845a6563 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..31
+  [email protected]
    [email protected]
      [email protected] "#"
      [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
index 2d6364998..5f85c3943 100644
--- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..73
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@15..21
+      [email protected]
        [email protected]
          [email protected] "f"
        [email protected] ":"
@@ -35,7 +35,7 @@ [email protected]
      [email protected]
        [email protected] "*"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@48..58
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -50,7 +50,7 @@ [email protected]
                [email protected] "u32"
      [email protected] ","
      [email protected] "\n    "
-      RECORD_FIELD_DEF@64..70
+      [email protected]
        [email protected]
          [email protected] "z"
        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index b72c92c33..560bfd751 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
@@ -2,7 +2,7 @@ [email protected]
  [email protected]
    [email protected] "}"
  [email protected] "\n\n"
-  STRUCT_DEF@3..12
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
@@ -12,7 +12,7 @@ [email protected]
  [email protected]
    [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@17..27
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
index 33953d8d7..1e9637c26 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..12
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -58,7 +58,7 @@ [email protected]
    [email protected] "\n"
    [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@82..94
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
index aca02ece4..dacf71aa1 100644
--- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
+++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..11
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "90"
@@ -38,7 +38,7 @@ [email protected]
    [email protected] "\n"
    [email protected] "}"
  [email protected] "\n\n"
-  STRUCT_DEF@33..42
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index 3bf57eacc..1c3e0f65b 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..41
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
index 87c54c32c..b02d390af 100644
--- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
+++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
@@ -3,7 +3,7 @@ [email protected]
    [email protected]
      [email protected] "extern"
  [email protected] " "
-  STRUCT_DEF@7..18
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
index e1e782f5f..d62906b99 100644
--- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
+++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..389
+  [email protected]
    [email protected]
      [email protected]
      [email protected]
@@ -10,7 +10,7 @@ [email protected]
    [email protected]
    [email protected]
      [email protected] "process"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected]
      [email protected]
        [email protected] "'a"
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
index 211e5fd46..3eef848fc 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  STRUCT_DEF@0..72
+  [email protected]
    [email protected]
      [email protected] "pub"
    [email protected] " "
@@ -7,10 +7,10 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "Cache"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
      [email protected] "\n    "
-      TUPLE_FIELD_DEF@22..68
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
@@ -47,7 +47,7 @@ [email protected]
                                      [email protected]
                                        [email protected] "@"
      [email protected] " "
-      TUPLE_FIELD_DEF@69..72
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
index 9323b7890..a1f39b22a 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
index b18378cff..a3c25b450 100644
--- a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
+++ b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..7
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
index 93434f34f..66157c3dc 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
index 628315c78..bb4a28f4e 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..46
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index 31cc4e551..bc95b8512 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..182
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -8,10 +8,10 @@ [email protected]
          [email protected]
            [email protected] "FnScopes"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@20..161
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -75,16 +75,16 @@ [email protected]
              [email protected] "push"
            [email protected]
              [email protected] "("
-              RECORD_LIT@111..154
+              RECORD_EXPR@111..154
                [email protected]
                  [email protected]
                    [email protected]
                      [email protected] "ScopeData"
                [email protected] " "
-                [email protected]
+                RECORD_EXPR_[email protected]
                  [email protected] "{"
                  [email protected] " "
-                  [email protected]
+                  RECORD_EXPR_[email protected]
                    [email protected]
                      [email protected] "parent"
                    [email protected] ":"
@@ -96,7 +96,7 @@ [email protected]
                            [email protected] "None"
                  [email protected] ","
                  [email protected] " "
-                  [email protected]
+                  RECORD_EXPR_[email protected]
                    [email protected]
                      [email protected] "entries"
                    [email protected] ":"
@@ -116,7 +116,7 @@ [email protected]
          [email protected] "\n    "
          [email protected] "}"
      [email protected] "\n\n    "
-      FN_DEF@167..180
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
index 4ff27f5c8..f6fa964b7 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..138
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
index 5f3a31473..6f6feba5a 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
@@ -1,8 +1,8 @@
 [email protected]
-  FN_DEF@0..2
+  [email protected]
    [email protected] "fn"
  [email protected] "\n\n"
-  FN_DEF@4..15
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
index 1746bd3c1..ba4ce4795 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..21
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
index 28146f44e..71fb19783 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -28,7 +28,7 @@ [email protected]
        [email protected]
          [email protected] ","
      [email protected] " "
-      STRUCT_DEF@19..26
+      [email protected]
        [email protected] "struct"
        [email protected]
          [email protected] ","
@@ -40,7 +40,7 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@34..68
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -75,7 +75,7 @@ [email protected]
        [email protected]
          [email protected] ","
      [email protected] " "
-      IMPL_DEF@56..60
+      [email protected]
        [email protected] "impl"
      [email protected]
        [email protected]
@@ -88,7 +88,7 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@69..111
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -133,7 +133,7 @@ [email protected]
        [email protected]
          [email protected] ","
      [email protected] " "
-      TRAIT_DEF@98..104
+      [email protected]
        [email protected] "trait"
        [email protected]
          [email protected] ","
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
index 9ea9d715e..5ffefd742 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
index 48610a5eb..4c2d1ad68 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..53
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "f"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -39,7 +39,7 @@ [email protected]
            [email protected] "("
            [email protected]
              [email protected] "for"
-              TYP[email protected]
+              GENERIC[email protected]
                [email protected] "<"
                [email protected]
                  [email protected] "\'a"
@@ -65,7 +65,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@55..239
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -122,7 +122,7 @@ [email protected]
              [email protected] "("
              [email protected]
                [email protected] "for"
-                TYP[email protected]
+                GENERIC[email protected]
                  [email protected] "<"
                  [email protected]
                    [email protected] "\'a"
@@ -242,7 +242,7 @@ [email protected]
                          [email protected] "("
                          [email protected]
                            [email protected] "for"
-                            TYP[email protected]
+                            GENERIC[email protected]
                              [email protected] "<"
                              [email protected]
                                [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
index 88b086daf..fca646557 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..574
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -11,26 +11,26 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      ENUM_DEF@16..152
+      [email protected]
        [email protected] "enum"
        [email protected] " "
        [email protected]
          [email protected] "Test"
        [email protected] " "
-        ENUM_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
            [email protected]
              [email protected] "Var1"
          [email protected] ","
          [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
            [email protected]
              [email protected] "Var2"
-            TUPLE_FIELD_DEF_[email protected]
+            [email protected]
              [email protected] "("
-              TUPLE_FIELD_DEF@55..61
+              [email protected]
                [email protected]
                  [email protected]
                    [email protected]
@@ -39,14 +39,14 @@ [email protected]
              [email protected] ")"
          [email protected] ","
          [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
            [email protected]
              [email protected] "Var3"
            [email protected] " "
-            RECORD_FIELD_DEF_[email protected]
+            [email protected]
              [email protected] "{"
              [email protected] "\n            "
-              RECORD_FIELD_DEF@91..95
+              [email protected]
                [email protected]
                  [email protected] "abc"
                [email protected] ":"
@@ -79,39 +79,39 @@ [email protected]
          [email protected] "1"
        [email protected] ";"
      [email protected] "\n    "
-      ENUM_DEF@191..223
+      [email protected]
        [email protected] "enum"
        [email protected] " "
        [email protected]
          [email protected] "Test2"
        [email protected] " "
-        ENUM_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
            [email protected]
              [email protected] "Fine"
          [email protected] ","
          [email protected] "\n    "
          [email protected] "}"
      [email protected] "\n\n    "
-      ENUM_DEF@229..300
+      [email protected]
        [email protected] "enum"
        [email protected] " "
        [email protected]
          [email protected] "Test3"
        [email protected] " "
-        ENUM_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
            [email protected]
              [email protected] "StillFine"
            [email protected] " "
-            RECORD_FIELD_DEF_[email protected]
+            [email protected]
              [email protected] "{"
              [email protected] "\n            "
-              RECORD_FIELD_DEF@274..282
+              [email protected]
                [email protected]
                  [email protected] "def"
                [email protected] ":"
@@ -132,7 +132,7 @@ [email protected]
        [email protected]
          [email protected] "{"
          [email protected] "\n        "
-          ENUM_DEF@316..453
+          [email protected]
            [email protected] "// fail again"
            [email protected] "\n        "
            [email protected] "enum"
@@ -140,15 +140,15 @@ [email protected]
            [email protected]
              [email protected] "Test4"
            [email protected] " "
-            ENUM_[email protected]
+            [email protected]
              [email protected] "{"
              [email protected] "\n            "
-              ENUM_[email protected]
+              [email protected]
                [email protected]
                  [email protected] "Nope"
-                TUPLE_FIELD_DEF_[email protected]
+                [email protected]
                  [email protected] "("
-                  TUPLE_FIELD_DEF@368..371
+                  [email protected]
                    [email protected]
                      [email protected]
                        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
index bf07409fb..7e4b11c27 100644
--- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
@@ -1,7 +1,7 @@
 [email protected]
-  IMPL_DEF@0..14
+  [email protected]
    [email protected] "impl"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -17,9 +17,9 @@ [email protected]
                    [email protected] "Clone"
      [email protected] ">"
  [email protected] "\n"
-  IMPL_DEF@15..37
+  [email protected]
    [email protected] "impl"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -41,7 +41,7 @@ [email protected]
                      [email protected] "T"
            [email protected] ">"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
index 4d6461d1e..a8e42e6ea 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -13,7 +13,7 @@ [email protected]
      [email protected] " "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
index 0da8f59f0..bfcd0149e 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..23
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
index 515819e42..55ff3943f 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..349
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index c6859eca8..ec9f556aa 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..292
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index 53e445459..063532e02 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..88
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
index 1b2ac5011..303a49576 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..89
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
index 9588cf3b3..2f03709eb 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..13
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -14,10 +14,10 @@ [email protected]
            [email protected] "bar"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@14..17
+  [email protected]
    [email protected] "use"
  [email protected] "\n"
-  USE_ITEM@18..33
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -31,10 +31,10 @@ [email protected]
            [email protected] "baz"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@34..37
+  [email protected]
    [email protected] "use"
  [email protected] "\n"
-  FN_DEF@38..47
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
index f926b67d2..ef6172f8a 100644
--- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
+++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..36
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index e3cda7c43..faf87d6e5 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..117
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -14,10 +14,10 @@ [email protected]
      [email protected] "("
      [email protected] ")"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@20..31
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -30,7 +30,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@36..51
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -46,7 +46,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      TYPE_ALIAS_DEF@56..81
+      [email protected]
        [email protected]
          [email protected] "pub"
          [email protected] "("
@@ -65,7 +65,7 @@ [email protected]
          [email protected] ")"
        [email protected] ";"
      [email protected] "\n    "
-      CONST_DEF@86..115
+      [email protected]
        [email protected]
          [email protected] "pub"
          [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
index 21db9ee85..bed7ad6c3 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
index ec950381b..a98c31b0c 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..82
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
index d2a549273..284c8715b 100644
--- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -9,7 +9,7 @@ [email protected]
          [email protected] "crate"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@13..54
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -52,7 +52,7 @@ [email protected]
        [email protected] "}"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@55..72
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -66,7 +66,7 @@ [email protected]
          [email protected] "crate"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@73..97
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
index d0360c467..2049a9d72 100644
--- a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -9,7 +9,7 @@ [email protected]
          [email protected] "super"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@13..26
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -23,7 +23,7 @@ [email protected]
          [email protected] "super"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@27..47
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -41,7 +41,7 @@ [email protected]
          [email protected] "super"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@48..66
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
index 4f382b06c..deadf56b4 100644
--- a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..11
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -9,7 +9,7 @@ [email protected]
          [email protected] "self"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@12..24
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
index 8eb583ef8..51ad2a846 100644
--- a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
+++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
@@ -1,11 +1,11 @@
 [email protected]
-  TRAIT_DEF@0..38
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "T"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n  "
      [email protected]
@@ -14,7 +14,7 @@ [email protected]
            [email protected]
              [email protected] "default"
      [email protected] " "
-      CONST_DEF@20..36
+      [email protected]
        [email protected] "const"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
index cb90f28bc..082625c13 100644
--- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..30
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -9,7 +9,7 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
        [email protected] "<"
        [email protected]
          [email protected] "\'a"
@@ -26,7 +26,7 @@ [email protected]
                [email protected] "u32"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@31..64
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -36,7 +36,7 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
        [email protected] "<"
        [email protected]
          [email protected] "\'a"
@@ -57,7 +57,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@65..95
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -67,7 +67,7 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
        [email protected] "<"
        [email protected]
          [email protected] "\'a"
@@ -83,7 +83,7 @@ [email protected]
        [email protected] "]"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@96..149
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -93,7 +93,7 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
        [email protected] "<"
        [email protected]
          [email protected] "\'a"
@@ -101,7 +101,7 @@ [email protected]
      [email protected] " "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'b"
@@ -136,12 +136,12 @@ [email protected]
            [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  FN_DEF@150..238
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "for_for_for"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -156,7 +156,7 @@ [email protected]
      [email protected] "\n    "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -164,7 +164,7 @@ [email protected]
        [email protected] " "
        [email protected]
          [email protected] "for"
-          TYP[email protected]
+          GENERIC[email protected]
            [email protected] "<"
            [email protected]
              [email protected] "\'b"
@@ -172,7 +172,7 @@ [email protected]
          [email protected] " "
          [email protected]
            [email protected] "for"
-            TYP[email protected]
+            GENERIC[email protected]
              [email protected] "<"
              [email protected]
                [email protected] "\'c"
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
index e46456384..df29017e7 100644
--- a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..82
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast b/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast
index f1e78f388..93c429e12 100644
--- a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast
+++ b/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast
@@ -1,4 +1,4 @@
-FN_DEF@0..11
+[email protected]
  [email protected] "fn"
  [email protected] " "
  [email protected]
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
index 0e6e0ccc3..f1d0dc343 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
@@ -86,7 +86,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax
    fn reparser(node: SyntaxNodeRef) -> Option<fn(&mut Parser)> {
        let res = match node.kind() {
            BLOCK => grammar::block,
-            RECORD_FIELD_DEF_LIST => grammar::record_field_def_list,
+            RECORD_FIELD_LIST => grammar::record_field_list,
            _ => return None,
        };
        Some(res)
@@ -138,7 +138,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax
        let res = match node.kind() {
     ;
    let end = u32::from(range.end()) as usize;
-    text.replaT => grammar::record_field_def_list,
+    text.replaT => grammar::record_field_list,
            _ => return None,
        };
        Some(res)
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
index bf70ebca4..0b9bbec07 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..12
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index 75668c818..a4271fc87 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -17,7 +17,7 @@ [email protected]
            [email protected] "\'loop"
            [email protected] ":"
      [email protected] " "
-      IMPL_DEF@23..27
+      [email protected]
        [email protected] "impl"
      [email protected] "\n"
      [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
index 95bcc3c0a..2409eefe7 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..13
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
index fd939be8d..29d6b3974 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..12
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -8,11 +8,11 @@ [email protected]
          [email protected]
            [email protected] "Type"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  IMPL_DEF@13..33
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -29,14 +29,14 @@ [email protected]
          [email protected]
            [email protected] "T"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  IMPL_DEF@34..38
+  [email protected]
    [email protected] "impl"
  [email protected] " "
-  IMPL_DEF@39..54
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -45,11 +45,11 @@ [email protected]
          [email protected]
            [email protected] "NotType"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  IMPL_DEF@55..70
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -60,7 +60,7 @@ [email protected]
    [email protected] " "
    [email protected] "for"
  [email protected] " "
-  IMPL_DEF@71..86
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -69,7 +69,7 @@ [email protected]
          [email protected]
            [email protected] "NotType"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
index 90202d764..776022fd9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..15
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
index c789e8d82..cc0f8bcaf 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..10
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -19,7 +19,7 @@ [email protected]
    [email protected] " "
    [email protected] "}"
  [email protected] " "
-  FN_DEF@22..32
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
index cd24313d4..3f3a7f1b9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
index c5fa7a404..63a10127d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..20
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
index 4e3fa704e..8fd8d5e59 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..47
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
index e1abc5633..fa14e1e6d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..46
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
index 53f7ebaf9..a6e6552a9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
@@ -2,7 +2,7 @@ [email protected]
  [email protected]
    [email protected] "unsafe"
  [email protected] " "
-  FN_DEF@7..24
+  [email protected]
    [email protected] "async"
    [email protected] " "
    [email protected] "fn"
@@ -17,7 +17,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  CONST_DEF@25..46
+  [email protected]
    [email protected] "unsafe"
    [email protected] " "
    [email protected] "const"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
index ebcc26e0d..8d761b907 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
@@ -1,5 +1,5 @@
 [email protected]
-  STATIC_DEF@0..18
+  [email protected]
    [email protected] "static"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
index b8cd0587d..acd72094b 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
@@ -1,11 +1,11 @@
 [email protected]
-  TRAIT_DEF@0..61
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "T"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
      [email protected]
@@ -14,7 +14,7 @@ [email protected]
            [email protected]
              [email protected] "default"
      [email protected] " "
-      TYPE_ALIAS_DEF@22..35
+      [email protected]
        [email protected] "type"
        [email protected] " "
        [email protected]
@@ -35,7 +35,7 @@ [email protected]
            [email protected]
              [email protected] "default"
      [email protected] " "
-      FN_DEF@48..59
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
index a9de44b57..a81c442c0 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..44
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -11,16 +11,16 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_LIT@16..42
+      RECORD_EXPR@16..42
        [email protected]
          [email protected]
            [email protected]
              [email protected] "S"
        [email protected] " "
-        [email protected]
+        RECORD_EXPR_[email protected]
          [email protected] "{"
          [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
            [email protected]
              [email protected] "field"
            [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast
index da8505607..2f59d0606 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..12
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index a38b4f573..c7289e400 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..82
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -8,10 +8,10 @@ [email protected]
          [email protected]
            [email protected] "F"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      TYPE_ALIAS_DEF@13..27
+      [email protected]
        [email protected] "type"
        [email protected] " "
        [email protected]
@@ -27,7 +27,7 @@ [email protected]
                    [email protected] "Clone"
        [email protected] ";"
      [email protected] "\n    "
-      CONST_DEF@32..45
+      [email protected]
        [email protected] "const"
        [email protected] " "
        [email protected]
@@ -41,7 +41,7 @@ [email protected]
                [email protected] "i32"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@50..61
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -54,7 +54,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@66..80
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index cf3a90400..1e80dd7e2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..58
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -51,7 +51,7 @@ [email protected]
  [email protected] " "
  [email protected] "// Rust 2018 (with a  ..."
  [email protected] "\n"
-  USE_ITEM@98..121
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -77,7 +77,7 @@ [email protected]
  [email protected] " "
  [email protected] "// Rust 2015"
  [email protected] "\n"
-  USE_ITEM@135..166
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -104,7 +104,7 @@ [email protected]
  [email protected] " "
  [email protected] "// Rust 2015"
  [email protected] "\n"
-  USE_ITEM@180..205
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
index cd0892451..b0f2b5888 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..53
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "for_trait"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -19,7 +19,7 @@ [email protected]
      [email protected] "\n   "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
index 20eba09f5..ace8ad050 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..38
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
index 6c8c1e24b..8e0252ce7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..27
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index 9f4a9e69b..ae61cbad8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..127
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -8,10 +8,10 @@ [email protected]
          [email protected]
            [email protected] "S"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@13..26
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -26,7 +26,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@31..46
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -43,7 +43,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@51..69
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -62,7 +62,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@74..103
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -95,7 +95,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@108..125
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
index 7cb9e1d55..e95688f56 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..34
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
index 10eb31d68..3ce2acfae 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..102
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
index 425e5196c..f62826fd5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
index d823c08fc..66a609346 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..47
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
index 283442a8b..28c94bfd6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..30
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
index e2e871dda..845b32e6d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..17
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -16,7 +16,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@18..35
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
index a60940fcf..b1d5106ce 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..15
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index 422912e3c..104e153ce 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..68
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
index d59c6006d..625ab4c2d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..17
+  [email protected]
    [email protected] "unsafe"
    [email protected] " "
    [email protected] "trait"
@@ -7,7 +7,7 @@ [email protected]
    [email protected]
      [email protected] "T"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
index 61a0b22f4..c131df1c9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..18
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index 15da6fdd6..20b2b6c19 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..68
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -8,10 +8,10 @@ [email protected]
          [email protected]
            [email protected] "S"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@13..33
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -35,7 +35,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@38..66
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
index 10d6b2fde..7db38ea4d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..43
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
index 9e898b7b9..b3623c445 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
@@ -1,12 +1,12 @@
 [email protected]
-  USE_ITEM@0..6
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
      [email protected] "*"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@7..15
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -14,7 +14,7 @@ [email protected]
      [email protected] "*"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@16..36
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -35,7 +35,7 @@ [email protected]
        [email protected] "}"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@37..59
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index c204aeb63..ca0702aba 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..88
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -8,10 +8,10 @@ [email protected]
          [email protected]
            [email protected] "F"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      TYPE_ALIAS_DEF@13..26
+      [email protected]
        [email protected] "type"
        [email protected] " "
        [email protected]
@@ -26,7 +26,7 @@ [email protected]
                [email protected] "i32"
        [email protected] ";"
      [email protected] "\n    "
-      CONST_DEF@31..49
+      [email protected]
        [email protected] "const"
        [email protected] " "
        [email protected]
@@ -45,7 +45,7 @@ [email protected]
          [email protected] "92"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@54..65
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -58,7 +58,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@70..86
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
index 1b810607e..50742cbcf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
@@ -1,5 +1,5 @@
 [email protected]
-  STRUCT_DEF@0..20
+  [email protected]
    [email protected]
      [email protected] "pub"
      [email protected] "("
@@ -12,7 +12,7 @@ [email protected]
      [email protected] "S"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@21..40
+  [email protected]
    [email protected]
      [email protected] "pub"
      [email protected] "("
@@ -25,7 +25,7 @@ [email protected]
      [email protected] "S"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@41..60
+  [email protected]
    [email protected]
      [email protected] "pub"
      [email protected] "("
@@ -38,7 +38,7 @@ [email protected]
      [email protected] "S"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@61..80
+  [email protected]
    [email protected]
      [email protected] "pub"
      [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
index 17687617b..57008e5fe 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..21
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
index 7eb27d5e1..dea0c73f7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..38
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
index 0a6d77f45..fd819ea37 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..14
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
index b4598768e..e5f550347 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..96
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
index b824c10a8..9e76d881e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..51
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
index 93f5c738c..f45f3cab8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..42
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
index fabb09937..e096b3a1f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..88
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
index 3aed26732..381284dc5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..37
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -41,7 +41,7 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@38..196
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
index 899b63aac..ffe1a3a01 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..92
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
index 72705e148..79a5ee339 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..14
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -14,7 +14,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@15..36
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -31,7 +31,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@37..69
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -53,7 +53,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@70..112
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
index 784fbb592..c522f76cf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..13
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -14,7 +14,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@14..35
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -31,7 +31,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@36..53
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
index e064aafaf..f905def6f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..101
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
index cf5825593..293b1d64c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
    [email protected] "unsafe"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
index fbd90bc0f..b6379e62f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..26
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -32,7 +32,7 @@ [email protected]
            [email protected] "Output"
    [email protected] ";"
  [email protected] "\n"
-  FN_DEF@27..70
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
index a767f145d..64e705fb3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..20
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
index e92ea2bf2..2185d3c91 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..45
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
index aa582516a..db5bd2849 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..19
+  [email protected]
    [email protected]
      [email protected] "crate"
    [email protected] " "
@@ -16,16 +16,16 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n"
-  STRUCT_DEF@20..49
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] " "
-      RECORD_FIELD_DEF@31..47
+      [email protected]
        [email protected]
          [email protected] "crate"
        [email protected] " "
@@ -41,14 +41,14 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n"
-  STRUCT_DEF@50..70
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "T"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
-      TUPLE_FIELD_DEF@59..68
+      [email protected]
        [email protected]
          [email protected] "crate"
        [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
index 1ae791361..3638462f8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
@@ -1,10 +1,10 @@
 [email protected]
-  TRAIT_DEF@0..41
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "T"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -48,16 +48,16 @@ [email protected]
                  [email protected]
                    [email protected] "Copy"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  TRAIT_DEF@42..100
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "X"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -119,7 +119,7 @@ [email protected]
                  [email protected]
                    [email protected] "Copy"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
index 0c1c6e877..40875ae1e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..117
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
index f0e09d40d..60b517230 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..28
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -13,14 +13,14 @@ [email protected]
          [email protected]
            [email protected] "path"
      [email protected] " "
-      ALIAS@15..27
+      RENAME@15..27
        [email protected] "as"
        [email protected] " "
        [email protected]
          [email protected] "some_name"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@29..181
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -43,7 +43,7 @@ [email protected]
              [email protected]
                [email protected] "path"
          [email protected] " "
-          ALIAS@54..72
+          RENAME@54..72
            [email protected] "as"
            [email protected] " "
            [email protected]
@@ -61,7 +61,7 @@ [email protected]
              [email protected]
                [email protected] "path"
          [email protected] " "
-          ALIAS@91..108
+          RENAME@91..108
            [email protected] "as"
            [email protected] " "
            [email protected]
@@ -121,7 +121,7 @@ [email protected]
        [email protected] "}"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@182..197
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -130,7 +130,7 @@ [email protected]
          [email protected]
            [email protected] "Trait"
      [email protected] " "
-      ALIAS@192..196
+      RENAME@192..196
        [email protected] "as"
        [email protected] " "
        [email protected] "_"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
index c23b3b67c..1fd3cd0e7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..20
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -11,7 +11,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] " "
-      FN_DEF@9..18
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index 9ca2165ba..d4235a8b1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
index c28dc9d61..e89284c14 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..16
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
index 52de6023b..d6dfa83b7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..26
+  [email protected]
    [email protected] "unsafe"
    [email protected] " "
    [email protected] "default"
@@ -12,7 +12,7 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index b209f67f8..37757ccd4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -38,7 +38,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@27..57
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
index 8bf62cda9..a5bf55131 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
@@ -1,14 +1,14 @@
 [email protected]
-  TRAIT_DEF@0..21
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "T"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] " "
-      FN_DEF@10..19
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
index 798ef2a48..6330dbf9e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..12
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
index 0d2f5ff56..9bc36bea7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..13
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -14,7 +14,7 @@ [email protected]
            [email protected] "Foo"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@14..29
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -30,7 +30,7 @@ [email protected]
            [email protected] "Foo"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@30..49
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -49,7 +49,7 @@ [email protected]
            [email protected] "Foo"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@50..70
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
index 70232a3b2..2bfb52453 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..90
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
index 6362aa02d..9ae271817 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..63
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@15..60
+      [email protected]
        [email protected]
          [email protected] "#"
          [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
index 03c52525e..68bb43852 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..112
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
index 24f89b83f..28129c50c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..115
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
index bb43d1eaf..97548a5ee 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..17
+  [email protected]
    [email protected] "const"
    [email protected] " "
    [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
index 8bd94a868..3e72f9671 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..111
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
index 9210f155c..fa659c19b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..82
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
index d06fc0be5..25e1777d1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
@@ -1,5 +1,5 @@
 [email protected]
-  EXTERN_CRATE_ITEM@0..17
+  [email protected]
    [email protected] "extern"
    [email protected] " "
    [email protected] "crate"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
index 850465d82..a9ae1aa59 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..111
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -12,28 +12,28 @@ [email protected]
      [email protected] "{"
      [email protected] "\n    "
      [email protected]
-        RECORD_LIT@15..19
+        RECORD_EXPR@15..19
          [email protected]
            [email protected]
              [email protected]
                [email protected] "S"
          [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
            [email protected] "{"
            [email protected] "}"
        [email protected] ";"
      [email protected] "\n    "
      [email protected]
-        RECORD_LIT@25..40
+        RECORD_EXPR@25..40
          [email protected]
            [email protected]
              [email protected]
                [email protected] "S"
          [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
            [email protected] "{"
            [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
              [email protected]
                [email protected]
                  [email protected]
@@ -41,7 +41,7 @@ [email protected]
                      [email protected] "x"
            [email protected] ","
            [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
              [email protected]
                [email protected] "y"
              [email protected] ":"
@@ -54,16 +54,16 @@ [email protected]
        [email protected] ";"
      [email protected] "\n    "
      [email protected]
-        RECORD_LIT@46..82
+        RECORD_EXPR@46..82
          [email protected]
            [email protected]
              [email protected]
                [email protected] "S"
          [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
            [email protected] "{"
            [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
              [email protected]
                [email protected]
                  [email protected]
@@ -71,7 +71,7 @@ [email protected]
                      [email protected] "x"
            [email protected] ","
            [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
              [email protected]
                [email protected] "y"
              [email protected] ":"
@@ -100,16 +100,16 @@ [email protected]
        [email protected] ";"
      [email protected] "\n    "
      [email protected]
-        RECORD_LIT@88..108
+        RECORD_EXPR@88..108
          [email protected]
            [email protected]
              [email protected]
                [email protected] "TupleStruct"
          [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
            [email protected] "{"
            [email protected] " "
-            [email protected]
+            RECORD_EXPR_[email protected]
              [email protected]
                [email protected] "0"
              [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index 02656df31..de8217064 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..11
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -57,7 +57,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  STRUCT_DEF@60..69
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
index 24b9a1f46..4368930cc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..19
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected] "!"
@@ -17,7 +17,7 @@ [email protected]
          [email protected]
            [email protected] "X"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
index 445d8d309..587160003 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..136
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
index 8e10f3673..629fea99d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..41
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
index 177bb5514..37ca478e6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..166
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -49,14 +49,14 @@ [email protected]
                  [email protected] " "
                  [email protected] ">"
                  [email protected] " "
-                  RECORD_LIT@63..77
+                  RECORD_EXPR@63..77
                    [email protected]
                      [email protected]
                        [email protected]
                          [email protected] "Test"
-                    [email protected]
+                    RECORD_EXPR_[email protected]
                      [email protected] "{"
-                      [email protected]
+                      RECORD_EXPR_[email protected]
                        [email protected]
                          [email protected] "field"
                        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
index caa76fe8a..702f2e0b0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..15
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
index ec2496072..6589e4795 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
@@ -1,24 +1,24 @@
 [email protected]
-  UNION_DEF@0..12
+  [email protected]
    [email protected] "union"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  UNION_DEF@13..50
+  [email protected]
    [email protected] "union"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@29..35
+      [email protected]
        [email protected]
          [email protected] "a"
        [email protected] ":"
@@ -30,7 +30,7 @@ [email protected]
                [email protected] "i32"
      [email protected] ","
      [email protected] "\n    "
-      RECORD_FIELD_DEF@41..47
+      [email protected]
        [email protected]
          [email protected] "b"
        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
index 18cd5271f..c4c5bc51e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..18
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -17,7 +17,7 @@ [email protected]
        [email protected] "}"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@19..36
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
index f8ff7079b..4c1165dc8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..45
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
index 07b3d1435..673d396ee 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..96
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -72,13 +72,13 @@ [email protected]
          [email protected]
            [email protected] "{"
            [email protected] " "
-            RECORD_LIT@84..88
+            RECORD_EXPR@84..88
              [email protected]
                [email protected]
                  [email protected]
                    [email protected] "S"
              [email protected] " "
-              [email protected]
+              RECORD_EXPR_[email protected]
                [email protected] "{"
                [email protected] "}"
            [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
index 665f716a8..437d7ac04 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..39
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
index cc871ac0c..00cce69e6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
@@ -1,10 +1,10 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..20
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
      [email protected] "Result"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
index 3fd3a4391..3ca70f021 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..83
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
index 97c6e6a9d..5cefc5076 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..9
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -12,7 +12,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@10..31
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -38,7 +38,7 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@32..48
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -62,7 +62,7 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@49..64
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
index e2c1a507d..96217a7fd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..28
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
index 4f3a8ed24..33e6fb93f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..20
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
index a08e16fab..2befc8388 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..15
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
index a00ab40f9..209711fc4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..11
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -8,7 +8,7 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
index 462d1a8bb..3c80846db 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..88
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
index b26ac2d36..e7629ac03 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..28
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -9,7 +9,7 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
        [email protected] "<"
        [email protected]
          [email protected] "\'a"
@@ -29,7 +29,7 @@ [email protected]
            [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@29..81
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -39,7 +39,7 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
        [email protected] "<"
        [email protected]
          [email protected] "\'a"
@@ -74,7 +74,7 @@ [email protected]
            [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@82..120
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -84,7 +84,7 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "for"
-      TYP[email protected]
+      GENERIC[email protected]
        [email protected] "<"
        [email protected]
          [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
index 58bdf7e34..1563b1988 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..199
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
index 217b07e59..cdbc40fe0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
@@ -1,39 +1,39 @@
 [email protected]
-  STRUCT_DEF@0..11
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@12..25
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  STRUCT_DEF@26..39
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
      [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@40..66
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
-      TUPLE_FIELD_DEF@51..57
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
@@ -41,7 +41,7 @@ [email protected]
                [email protected] "String"
      [email protected] ","
      [email protected] " "
-      TUPLE_FIELD_DEF@59..64
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
@@ -50,16 +50,16 @@ [email protected]
      [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@67..105
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@84..90
+      [email protected]
        [email protected]
          [email protected] "a"
        [email protected] ":"
@@ -71,7 +71,7 @@ [email protected]
                [email protected] "i32"
      [email protected] ","
      [email protected] "\n    "
-      RECORD_FIELD_DEF@96..102
+      [email protected]
        [email protected]
          [email protected] "b"
        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
index 9cd8910d4..ee8894966 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..15
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index 9fcb7899e..ded36949a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..188
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
index a42abc189..70e05a859 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..11
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -12,7 +12,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@12..29
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
index 01ed3afca..43c09affe 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..18
+  [email protected]
    [email protected] "unsafe"
    [email protected] " "
    [email protected] "impl"
@@ -10,7 +10,7 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
index 7e71d7373..34f520994 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..87
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
index 48aaf1004..405b6a259 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..18
+  [email protected]
    [email protected]
      [email protected] "extern"
    [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
index cee2bc906..2ef026e37 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..18
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
index 800412cef..0cac9ac43 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..15
+  [email protected]
    [email protected] "auto"
    [email protected] " "
    [email protected] "trait"
@@ -7,7 +7,7 @@ [email protected]
    [email protected]
      [email protected] "T"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
index 1e2d7db7c..95686977f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..20
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
index aed81f9b0..82f03f9c1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
index 9370f6ae7..0ef11c682 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TRAIT_DEF@0..22
+  [email protected]
    [email protected] "unsafe"
    [email protected] " "
    [email protected] "auto"
@@ -9,7 +9,7 @@ [email protected]
    [email protected]
      [email protected] "T"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
index 67d9595d3..25706d2a4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
index 031e74652..cb5316a0d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..166
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
index 80bda4ba7..0a1b21d6e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..19
+  [email protected]
    [email protected] "default"
    [email protected] " "
    [email protected] "impl"
@@ -10,7 +10,7 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
index 816e49310..32a77ba49 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..24
+  [email protected]
    [email protected] "const"
    [email protected] " "
    [email protected] "unsafe"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
index d48ef865c..1627556c8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..9
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -12,7 +12,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@10..25
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -36,7 +36,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@26..43
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -62,7 +62,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@44..66
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
index e4455cd3e..766de4efe 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
index 8a8743060..73c94e5d4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..18
+  [email protected]
    [email protected] "unsafe"
    [email protected] " "
    [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
index 9f966ff8a..fe1c290c3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..118
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
index 9b3bef04e..c4c0a0568 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..54
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
index e3c4cfeb3..3f53d60c0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..28
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
index e64717152..51a6c5170 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..133
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
index 98963dc62..b2961b0ff 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..48
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
index ea603e2c9..ca7e4a5c3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..39
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
index 30ff96a7c..a6a169f1b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..73
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
index 015a7a7d2..82028096f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..17
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -12,7 +12,7 @@ [email protected]
  [email protected] " "
  [email protected] "// Rust 2018 - All fl ..."
  [email protected] "\n"
-  USE_ITEM@46..61
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -24,7 +24,7 @@ [email protected]
  [email protected] " "
  [email protected] "// Rust 2018 - Anchor ..."
  [email protected] "\n"
-  USE_ITEM@92..124
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
index b58f40ac1..432318da0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..93
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
index b67714c17..3cd554d45 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..145
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
index 5de480da9..d761c1c68 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..49
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
index 01d717d6b..0e1594dc4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
@@ -1,18 +1,18 @@
 [email protected]
-  STRUCT_DEF@0..33
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Test"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
          [email protected] "T"
      [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
-      TUPLE_FIELD_DEF@15..16
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
@@ -40,20 +40,20 @@ [email protected]
                    [email protected] "Clone"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@34..52
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Test"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
          [email protected] "T"
      [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
-      TUPLE_FIELD_DEF@49..50
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
index 3c0ef9005..4d09c9f50 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..59
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
      [email protected] "\n    "
-      TUPLE_FIELD_DEF@15..55
+      [email protected]
        [email protected]
          [email protected] "#"
          [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
index ddfcf974e..f3d4ad72c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..16
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -18,7 +18,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@17..40
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
index a65a5c85f..141a7b203 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
@@ -1,14 +1,14 @@
 [email protected]
-  ENUM_DEF@0..8
+  [email protected]
    [email protected] "enum"
    [email protected] " "
    [email protected]
      [email protected] "F"
-    ENUM_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  IMPL_DEF@9..93
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -17,7 +17,7 @@ [email protected]
          [email protected]
            [email protected] "F"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n     "
      [email protected] "//! This is a doc com ..."
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
index e152c6b6c..aaaf803b7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..57
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
index b283ab804..4b5f9cdc9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..138
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
index 9d5470914..54cc3be3a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..258
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index ada2fc54e..edac8d5d9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..63
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
index b3a33c14d..f155743cf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
@@ -8,7 +8,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] " "
-      FN_DEF@13..54
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
index 6178dfe59..a7df188bd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..17
+  [email protected]
    [email protected] "async"
    [email protected] " "
    [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index ced59b7c1..aa4d7a784 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
index 97611f7f3..54ea2c7c6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..45
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -11,16 +11,16 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_LIT@16..43
+      RECORD_EXPR@16..43
        [email protected]
          [email protected]
            [email protected]
              [email protected] "S"
        [email protected] " "
-        [email protected]
+        RECORD_EXPR_[email protected]
          [email protected] "{"
          [email protected] " "
-          [email protected]
+          RECORD_EXPR_[email protected]
            [email protected]
              [email protected] "#"
              [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
index 09221fc54..0342e64f3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..81
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
index 93cc41533..3b46e5b47 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..46
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
index 0901f2348..98a20f36d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..24
+  [email protected]
    [email protected] "async"
    [email protected] " "
    [email protected] "unsafe"
@@ -16,7 +16,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@25..49
+  [email protected]
    [email protected] "const"
    [email protected] " "
    [email protected] "unsafe"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
index 28291afc2..e283966ca 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
index bb94a05c6..931e81f27 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..134
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
index 8f2f144c7..0fe3bf582 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
index 4a1c2b3a4..d47071a91 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..36
+  [email protected]
    [email protected] "existential"
    [email protected] " "
    [email protected] "type"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
index 87ac42748..48f483813 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..105
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
index 00ce5ecf0..b8d26a53a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..68
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -16,10 +16,10 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      TYPE_ALIAS_DEF@21..42
+      [email protected]
        [email protected] "default"
        [email protected] " "
        [email protected] "type"
@@ -36,7 +36,7 @@ [email protected]
                [email protected] "Bar"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@47..66
+      [email protected]
        [email protected] "default"
        [email protected] " "
        [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
index b330a0932..429a0506e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..110
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -11,21 +11,21 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      ENUM_DEF@27..75
+      [email protected]
        [email protected] "enum"
        [email protected] " "
        [email protected]
          [email protected] "LocalEnum"
        [email protected] " "
-        ENUM_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
            [email protected]
              [email protected] "One"
          [email protected] ","
          [email protected] "\n        "
-          ENUM_[email protected]
+          [email protected]
            [email protected]
              [email protected] "Two"
          [email protected] ","
@@ -33,7 +33,7 @@ [email protected]
          [email protected] "}"
      [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@81..90
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -47,13 +47,13 @@ [email protected]
          [email protected] "}"
      [email protected] ";"
      [email protected] "\n    "
-      STRUCT_DEF@96..107
+      [email protected]
        [email protected] "struct"
        [email protected] " "
        [email protected]
          [email protected] "S"
        [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] ";"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
index 8e8d9e992..923effe38 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..66
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
index c457851c9..157513565 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..58
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "print_all"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
index ea325831e..a7f87c020 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..51
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -22,14 +22,14 @@ [email protected]
        [email protected] " "
        [email protected] "="
        [email protected] " "
-        RECORD_LIT@26..33
+        RECORD_EXPR@26..33
          [email protected]
            [email protected]
              [email protected]
                [email protected] "F"
-          [email protected]
+          RECORD_EXPR_[email protected]
            [email protected] "{"
-            [email protected]
+            RECORD_EXPR_[email protected]
              [email protected]
                [email protected] "x"
              [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
index 9135de9df..6403ff8d5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
index 14610a0a2..36fd2997b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..27
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
index e6be8b7e4..d11019076 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..50
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
index 57fba5fd5..09fd9e9b8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..117
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
index 8d8b9597b..8d0f1ead5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..554
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
index 7c092d518..b41ef4098 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..62
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
index 8382a4f96..2d0c83458 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..42
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
index 4b9b8e0ab..9312eab65 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..23
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "const"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
index 3c00a2647..0c35bf2b7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  CONST_DEF@0..39
+  [email protected]
    [email protected] "const"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
index e70c3b710..8f197a19d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
@@ -1,7 +1,7 @@
 [email protected]
-  IMPL_DEF@0..28
+  [email protected]
    [email protected] "impl"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "const"
@@ -32,7 +32,7 @@ [email protected]
                      [email protected] "N"
            [email protected] ">"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
index 48d73a4e7..cc220e534 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
@@ -1,10 +1,10 @@
 [email protected]
-  TRAIT_DEF@0..18
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "Z"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -31,12 +31,12 @@ [email protected]
                [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  TRAIT_DEF@19..51
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "Z"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -82,12 +82,12 @@ [email protected]
                    [email protected] "Copy"
    [email protected] ";"
  [email protected] "\n"
-  TRAIT_DEF@52..82
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "Z"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
index f43dfbe63..2905c5f1a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
index 861065362..69b4d73d7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..24
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -25,7 +25,7 @@ [email protected]
        [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  TYPE_ALIAS_DEF@25..54
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
index ecac05950..c63a55a56 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..62
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
index 092833417..3b8dfefc6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..29
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
index 88d512f1a..4d4c41f1a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..129
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
index fad9df007..ccca045b6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..22
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
index e8a0e9ddd..a2e05eb2e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
@@ -1,19 +1,19 @@
 [email protected]
-  ENUM_DEF@0..22
+  [email protected]
    [email protected] "enum"
    [email protected] " "
    [email protected]
      [email protected] "E"
    [email protected] " "
-    ENUM_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] " "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "X"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "("
-          TUPLE_FIELD_DEF@11..14
+          [email protected]
            [email protected]
              [email protected]
                [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
index bd9e8d40f..8ae24b9c1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..27
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
index 08333a325..9c071ec2e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
index 5f09e4f4a..fb46d4ce4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
index 9efebd8b8..9e9a5f9c5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
index 4991f2c36..ca9a1183d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..21
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
index adb6159f4..1269621dc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..49
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -16,10 +16,10 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@21..47
+      [email protected]
        [email protected] "default"
        [email protected] " "
        [email protected] "unsafe"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
index a9eda5668..6bfe925af 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..26
+  [email protected]
    [email protected] "default"
    [email protected] " "
    [email protected] "unsafe"
@@ -12,7 +12,7 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
index 868899275..f5e20b93d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..32
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
index 705f7e001..a171fe7a8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..31
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -20,10 +20,10 @@ [email protected]
                    [email protected] "Copy"
      [email protected] ">"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@24..28
+      [email protected]
        [email protected]
          [email protected] "f"
        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
index a1d546491..362892b91 100644
--- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..25
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@15..23
+      [email protected]
        [email protected]
          [email protected] "foo"
        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
index 0ec237f8e..a7a2b11a7 100644
--- a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..12
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast
index b5bdf0aa9..594c2f8f2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast
@@ -1,5 +1,5 @@
 [email protected]
-  EXTERN_CRATE_ITEM@0..17
+  [email protected]
    [email protected] "extern"
    [email protected] " "
    [email protected] "crate"
@@ -8,7 +8,7 @@ [email protected]
      [email protected] "foo"
    [email protected] ";"
  [email protected] "\n"
-  EXTERN_CRATE_ITEM@18..42
+  [email protected]
    [email protected] "extern"
    [email protected] " "
    [email protected] "crate"
@@ -16,22 +16,21 @@ [email protected]
    [email protected]
      [email protected] "foo"
    [email protected] " "
-    ALIAS@35..41
+    RENAME@35..41
      [email protected] "as"
      [email protected] " "
      [email protected]
        [email protected] "bar"
    [email protected] ";"
  [email protected] "\n"
-  EXTERN_CRATE_ITEM@43..68
+  [email protected]
    [email protected] "extern"
    [email protected] " "
    [email protected] "crate"
    [email protected] " "
-    [email protected]
+    [email protected] "self"
-      [email protected] "self"
    [email protected] " "
-    ALIAS@61..67
+    RENAME@61..67
      [email protected] "as"
      [email protected] " "
      [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
index 37b452ec4..b2c1d791f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
@@ -26,7 +26,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@31..47
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -40,13 +40,13 @@ [email protected]
          [email protected] "\n    "
          [email protected] "}"
      [email protected] "\n    "
-      STRUCT_DEF@52..63
+      [email protected]
        [email protected] "struct"
        [email protected] " "
        [email protected]
          [email protected] "S"
        [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
index 96b8a94fc..6be1cf9fc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..8
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -9,7 +9,7 @@ [email protected]
            [email protected] "foo"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@9..19
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
index 07272dc3c..4d49e7933 100644
--- a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..20
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -20,7 +20,7 @@ [email protected]
            [email protected] "baz"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@21..39
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
index 0b9bc58e8..478fdba75 100644
--- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
    [email protected]
      [email protected] "#"
      [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
index 980b34049..83a93b5a9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..9
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -12,7 +12,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@10..23
+  [email protected]
    [email protected]
      [email protected] "pub"
    [email protected] " "
@@ -28,7 +28,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@24..44
+  [email protected]
    [email protected]
      [email protected] "pub"
      [email protected] "("
@@ -47,7 +47,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@45..65
+  [email protected]
    [email protected]
      [email protected] "pub"
      [email protected] "("
@@ -66,7 +66,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@66..97
+  [email protected]
    [email protected]
      [email protected] "pub"
      [email protected] "("
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
index 05d9c05ad..66ab13660 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..14
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -13,7 +13,7 @@ [email protected]
            [email protected] "foo"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@15..37
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
index 3642c107b..4389d2d4b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
@@ -1,12 +1,12 @@
 [email protected]
-  USE_ITEM@0..6
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
      [email protected] "*"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@7..15
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -14,7 +14,7 @@ [email protected]
      [email protected] "*"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@16..25
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -24,7 +24,7 @@ [email protected]
        [email protected] "}"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@26..33
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -33,7 +33,7 @@ [email protected]
        [email protected] "}"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@34..45
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -45,7 +45,7 @@ [email protected]
      [email protected] "*"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@46..58
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -59,7 +59,7 @@ [email protected]
        [email protected] "}"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@59..80
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
index 09e0050f0..d7e93f7eb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
@@ -1,5 +1,5 @@
 [email protected]
-  USE_ITEM@0..15
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -8,14 +8,14 @@ [email protected]
          [email protected]
            [email protected] "foo"
      [email protected] " "
-      ALIAS@8..14
+      RENAME@8..14
        [email protected] "as"
        [email protected] " "
        [email protected]
          [email protected] "bar"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@16..54
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -32,7 +32,7 @@ [email protected]
              [email protected]
                [email protected] "a"
          [email protected] " "
-          ALIAS@28..32
+          RENAME@28..32
            [email protected] "as"
            [email protected] " "
            [email protected]
@@ -55,7 +55,7 @@ [email protected]
              [email protected]
                [email protected] "foo"
          [email protected] " "
-          ALIAS@48..52
+          RENAME@48..52
            [email protected] "as"
            [email protected] " "
            [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
index 95656d19b..b15f41dd7 100644
--- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
@@ -1,41 +1,41 @@
 [email protected]
-  STRUCT_DEF@0..9
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "A"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@10..21
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "B"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  STRUCT_DEF@22..33
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "C"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
      [email protected] ")"
    [email protected] ";"
  [email protected] "\n\n"
-  STRUCT_DEF@35..74
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "D"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@50..56
+      [email protected]
        [email protected]
          [email protected] "a"
        [email protected] ":"
@@ -47,7 +47,7 @@ [email protected]
                [email protected] "u32"
      [email protected] ","
      [email protected] "\n    "
-      RECORD_FIELD_DEF@62..72
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -63,14 +63,14 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  STRUCT_DEF@76..96
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "E"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
-      TUPLE_FIELD_DEF@85..90
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -81,7 +81,7 @@ [email protected]
                [email protected] "x"
      [email protected] ","
      [email protected] " "
-      TUPLE_FIELD_DEF@92..93
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
index 964cbf5dd..a3e091ad3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..22
+  [email protected]
    [email protected]
      [email protected] "#"
      [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
index 451634e3f..630aa0708 100644
--- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..13
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S1"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -12,20 +12,20 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@14..32
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S2"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
          [email protected] "T"
      [email protected] ">"
-    TUPLE_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "("
-      TUPLE_FIELD_DEF@27..30
+      [email protected]
        [email protected]
          [email protected]
            [email protected]
@@ -34,22 +34,22 @@ [email protected]
      [email protected] ")"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@33..56
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S3"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
          [email protected] "T"
      [email protected] ">"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] " "
-      RECORD_FIELD_DEF@48..54
+      [email protected]
        [email protected]
          [email protected] "u"
        [email protected] ":"
@@ -62,34 +62,34 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n\n"
-  STRUCT_DEF@58..70
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S4"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@71..85
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S5"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@86..101
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S6"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -97,12 +97,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@102..120
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S7"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -112,12 +112,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@121..142
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S8"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -130,12 +130,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@143..166
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S9"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -149,12 +149,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@167..183
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S10"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -162,12 +162,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@184..203
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S11"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -178,12 +178,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@204..233
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S12"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
@@ -202,12 +202,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n\n"
-  STRUCT_DEF@235..249
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S13"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -215,12 +215,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@250..267
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S14"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -233,12 +233,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@268..289
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S15"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
index f767e9e19..c3df00814 100644
--- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
@@ -1,78 +1,78 @@
 [email protected]
-  ENUM_DEF@0..11
+  [email protected]
    [email protected] "enum"
    [email protected] " "
    [email protected]
      [email protected] "E1"
    [email protected] " "
-    ENUM_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  ENUM_DEF@13..27
+  [email protected]
    [email protected] "enum"
    [email protected] " "
    [email protected]
      [email protected] "E2"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
          [email protected] "T"
      [email protected] ">"
    [email protected] " "
-    ENUM_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  ENUM_DEF@29..46
+  [email protected]
    [email protected] "enum"
    [email protected] " "
    [email protected]
      [email protected] "E3"
    [email protected] " "
-    ENUM_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "X"
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  ENUM_DEF@48..66
+  [email protected]
    [email protected] "enum"
    [email protected] " "
    [email protected]
      [email protected] "E4"
    [email protected] " "
-    ENUM_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "X"
      [email protected] ","
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  ENUM_DEF@68..181
+  [email protected]
    [email protected] "enum"
    [email protected] " "
    [email protected]
      [email protected] "E5"
    [email protected] " "
-    ENUM_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "A"
      [email protected] ","
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "B"
        [email protected] " "
@@ -82,14 +82,14 @@ [email protected]
          [email protected] "92"
      [email protected] ","
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "C"
        [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] "\n        "
-          RECORD_FIELD_DEF@113..119
+          [email protected]
            [email protected]
              [email protected] "a"
            [email protected] ":"
@@ -101,7 +101,7 @@ [email protected]
                    [email protected] "u32"
          [email protected] ","
          [email protected] "\n        "
-          RECORD_FIELD_DEF@129..139
+          [email protected]
            [email protected]
              [email protected] "pub"
            [email protected] " "
@@ -119,21 +119,21 @@ [email protected]
          [email protected] "}"
      [email protected] ","
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "F"
        [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] ","
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "D"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "("
-          TUPLE_FIELD_DEF@164..167
+          [email protected]
            [email protected]
              [email protected]
                [email protected]
@@ -143,10 +143,10 @@ [email protected]
          [email protected] ")"
      [email protected] ","
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "E"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "("
          [email protected] ")"
      [email protected] ","
diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
index 4fb4baf56..9bdc50e1e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
@@ -1,10 +1,10 @@
 [email protected]
-  STRUCT_DEF@0..12
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "A"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -12,12 +12,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@13..26
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "B"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -27,12 +27,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@27..43
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "C"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -45,12 +45,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@44..63
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "D"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -66,12 +66,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@64..86
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "E"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -90,12 +90,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@87..116
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "F"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -122,12 +122,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@117..143
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "G"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -153,12 +153,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@144..180
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "H"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -194,12 +194,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@181..199
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "I"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -217,12 +217,12 @@ [email protected]
      [email protected] ">"
    [email protected] ";"
  [email protected] "\n"
-  STRUCT_DEF@200..250
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "K"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected] "\'a"
diff --git a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
index 873791f50..5524efaaf 100644
--- a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..19
+  [email protected]
    [email protected]
      [email protected] "extern"
    [email protected] " "
@@ -16,7 +16,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@21..44
+  [email protected]
    [email protected]
      [email protected] "extern"
      [email protected] " "
@@ -35,7 +35,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@46..70
+  [email protected]
    [email protected]
      [email protected] "extern"
      [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
index 97d90dc75..9374cf5e9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
@@ -1,5 +1,5 @@
 [email protected]
-  STATIC_DEF@0..20
+  [email protected]
    [email protected] "static"
    [email protected] " "
    [email protected]
@@ -18,7 +18,7 @@ [email protected]
      [email protected] "1"
    [email protected] ";"
  [email protected] "\n"
-  STATIC_DEF@21..46
+  [email protected]
    [email protected] "static"
    [email protected] " "
    [email protected] "mut"
diff --git a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
index d241f034c..dd1b9c9a0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  CONST_DEF@0..17
+  [email protected]
    [email protected] "const"
    [email protected] " "
    [email protected] "_"
@@ -17,7 +17,7 @@ [email protected]
      [email protected] "0"
    [email protected] ";"
  [email protected] "\n"
-  CONST_DEF@18..38
+  [email protected]
    [email protected] "const"
    [email protected] " "
    [email protected]
@@ -36,7 +36,7 @@ [email protected]
      [email protected] "92"
    [email protected] ";"
  [email protected] "\n"
-  CONST_DEF@39..63
+  [email protected]
    [email protected] "const"
    [email protected] " "
    [email protected] "mut"
diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
index 5701f566e..bb6527b48 100644
--- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -11,7 +11,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@16..32
+      [email protected]
        [email protected]
          [email protected] "extern"
        [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
index b029d8692..5bcf54deb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..33
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -11,7 +11,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@16..31
+      [email protected]
        [email protected] "const"
        [email protected] " "
        [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
index 299bbd136..a7cc12295 100644
--- a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..52
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -11,7 +11,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@16..32
+      [email protected]
        [email protected] "unsafe"
        [email protected] " "
        [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
index de3c4b786..efe018484 100644
--- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..247
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
index dc47d68a6..47e46f009 100644
--- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..152
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
index 86c3b46c4..93f766149 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..111
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
index 0aadc11a4..280d4cb82 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
@@ -1,14 +1,14 @@
 [email protected]
-  TRAIT_DEF@0..36
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "Runnable"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@21..34
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -20,16 +20,16 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  TRAIT_DEF@38..95
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "TraitWithExpr"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@64..93
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
index ea285f52f..0509f7504 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
@@ -6,7 +6,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@13..87
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -69,7 +69,7 @@ [email protected]
                  [email protected] "c_int"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@92..167
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -134,7 +134,7 @@ [email protected]
                  [email protected] "c_int"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@172..276
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -199,7 +199,7 @@ [email protected]
                  [email protected] "c_int"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@281..341
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -248,7 +248,7 @@ [email protected]
                  [email protected] "c_int"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@346..469
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -317,7 +317,7 @@ [email protected]
                  [email protected] "c_int"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@474..691
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -416,7 +416,7 @@ [email protected]
                  [email protected] "c_int"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@696..864
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -510,7 +510,7 @@ [email protected]
                  [email protected] "c_int"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@869..992
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -579,7 +579,7 @@ [email protected]
                  [email protected] "c_int"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@997..1173
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -690,7 +690,7 @@ [email protected]
                  [email protected] "ssize_t"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@1178..1289
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -771,7 +771,7 @@ [email protected]
                  [email protected] "ssize_t"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@1294..1481
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
@@ -888,7 +888,7 @@ [email protected]
                  [email protected] "ssize_t"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@1486..1595
+      [email protected]
        [email protected]
          [email protected] "pub"
        [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
index 8d76c4e0b..10da87c71 100644
--- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..115
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "test_serialization"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -38,7 +38,7 @@ [email protected]
          [email protected]
            [email protected]
              [email protected] "for"
-              TYP[email protected]
+              GENERIC[email protected]
                [email protected] "<"
                [email protected]
                  [email protected] "\'de"
diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
index 13b730ded..b3f29638c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..505
+  [email protected]
    [email protected] "// format with label  ..."
    [email protected] "\n"
    [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
index 21874ae3a..5ad8c570d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..61
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
index eb59d6e17..b04a505ea 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -78,7 +78,7 @@ [email protected]
      [email protected] "\"128\""
    [email protected] "]"
  [email protected] "\n\n"
-  USE_ITEM@407..427
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -98,7 +98,7 @@ [email protected]
            [email protected] "Cell"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@428..447
+  [email protected]
    [email protected] "use"
    [email protected] " "
    [email protected]
@@ -120,7 +120,7 @@ [email protected]
  [email protected] "\n\n"
  [email protected] "// Just a grab bag of ..."
  [email protected] "\n\n"
-  FN_DEF@520..572
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -166,7 +166,7 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@574..624
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -178,7 +178,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@591..607
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -217,7 +217,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@626..816
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -229,7 +229,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@642..720
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -407,7 +407,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@818..1322
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -572,7 +572,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@1324..1539
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -809,7 +809,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@1541..1741
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -830,7 +830,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@1575..1598
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -988,7 +988,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@1743..1904
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -1131,7 +1131,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@1906..1960
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -1166,7 +1166,7 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@1962..2198
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -1284,7 +1284,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@2200..2693
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -1468,7 +1468,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@2695..2832
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -1548,7 +1548,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@2834..2906
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -1560,21 +1560,21 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      UNION_DEF@2851..2904
+      [email protected]
        [email protected] "union"
        [email protected] " "
        [email protected]
          [email protected] "union"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'union"
          [email protected] ">"
        [email protected] " "
-        RECORD_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "{"
          [email protected] " "
-          RECORD_FIELD_DEF@2873..2901
+          [email protected]
            [email protected]
              [email protected] "union"
            [email protected] ":"
@@ -1599,7 +1599,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@2908..3042
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -1722,7 +1722,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@3044..3514
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -2056,7 +2056,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@3516..3552
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -2090,7 +2090,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@3554..3812
+  [email protected]
    [email protected]
      [email protected] "pub"
    [email protected] " "
diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
index a64a82e94..c4da317b9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
@@ -1,7 +1,7 @@
 [email protected]
  [email protected] "// https://github.com ..."
  [email protected] "\n\n"
-  FN_DEF@62..156
+  [email protected]
    [email protected]
      [email protected] "pub"
    [email protected] " "
@@ -9,7 +9,7 @@ [email protected]
    [email protected] " "
    [email protected]
      [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
index 7fd414090..22168eaf1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
index 17be2c238..68a366354 100644
--- a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..14
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
index 5640bae0a..8cfc14f49 100644
--- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
@@ -1,14 +1,14 @@
 [email protected]
-  STRUCT_DEF@0..27
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "S"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      RECORD_FIELD_DEF@15..25
+      [email protected]
        [email protected]
          [email protected] "r#foo"
        [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
index acf32a852..92ede8ccb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..59
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
index 468982b74..ed29b0812 100644
--- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
@@ -1,14 +1,14 @@
 [email protected]
  [email protected] "// https://github.com ..."
  [email protected] "\n\n"
-  STRUCT_DEF@62..73
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
    [email protected] ";"
  [email protected] "\n\n"
-  IMPL_DEF@75..141
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -17,10 +17,10 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@90..139
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -55,7 +55,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@143..161
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -78,7 +78,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@163..198
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
index 900eeb445..adc4a22e9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
@@ -1,16 +1,16 @@
 [email protected]
  [email protected] "// https://github.com ..."
  [email protected] "\n\n"
-  STRUCT_DEF@62..90
+  [email protected]
    [email protected] "struct"
    [email protected] " "
    [email protected]
      [email protected] "Repr"
    [email protected] " "
-    RECORD_FIELD_DEF_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] " "
-      RECORD_FIELD_DEF@76..88
+      [email protected]
        [email protected]
          [email protected] "raw"
        [email protected] ":"
@@ -30,7 +30,7 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@92..159
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -46,16 +46,16 @@ [email protected]
        [email protected]
          [email protected]
            [email protected]
-              RECORD_LIT@107..124
+              RECORD_EXPR@107..124
                [email protected]
                  [email protected]
                    [email protected]
                      [email protected] "Repr"
                [email protected] " "
-                [email protected]
+                RECORD_EXPR_[email protected]
                  [email protected] "{"
                  [email protected] " "
-                  [email protected]
+                  RECORD_EXPR_[email protected]
                    [email protected]
                      [email protected] "raw"
                    [email protected] ":"
@@ -83,14 +83,14 @@ [email protected]
      [email protected] "\n    "
      [email protected]
        [email protected]
-          RECORD_LIT@141..154
+          RECORD_EXPR@141..154
            [email protected]
              [email protected]
                [email protected]
                  [email protected] "Repr"
-            [email protected]
+            RECORD_EXPR_[email protected]
              [email protected] "{"
-              [email protected]
+              RECORD_EXPR_[email protected]
                [email protected]
                  [email protected] "raw"
                [email protected] ":"
diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
index 6d941487b..c9e6d88eb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..165
+  [email protected]
    [email protected] "// https://github.com ..."
    [email protected] "\n"
    [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index e8b095251..139ce9046 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..461
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -89,7 +89,7 @@ [email protected]
  [email protected] "\n\n"
  [email protected] "// https://github.com ..."
  [email protected] "\n"
-  IMPL_DEF@524..685
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -98,10 +98,10 @@ [email protected]
          [email protected]
            [email protected] "Whatever"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@544..683
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
index 38e44e48a..7a54fa113 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
@@ -1,7 +1,7 @@
 [email protected]
  [email protected] "// https://github.com ..."
  [email protected] "\n\n"
-  FN_DEF@62..341
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -256,21 +256,21 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  ENUM_DEF@343..367
+  [email protected]
    [email protected] "enum"
    [email protected] " "
    [email protected]
      [email protected] "A"
    [email protected] " "
-    ENUM_[email protected]
+    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      ENUM_[email protected]
+      [email protected]
        [email protected]
          [email protected] "B"
-        TUPLE_FIELD_DEF_[email protected]
+        [email protected]
          [email protected] "("
-          TUPLE_FIELD_DEF@358..360
+          [email protected]
            [email protected]
              [email protected]
                [email protected]
@@ -278,7 +278,7 @@ [email protected]
                    [email protected] "i8"
          [email protected] ","
          [email protected] " "
-          TUPLE_FIELD_DEF@362..364
+          [email protected]
            [email protected]
              [email protected]
                [email protected]
@@ -288,7 +288,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@369..394
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
index 28233c5d0..662576e5f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
@@ -1,7 +1,7 @@
 [email protected]
  [email protected] "// https://github.com ..."
  [email protected] "\n\n"
-  FN_DEF@60..256
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
index 0569488f8..57ecad3cf 100644
--- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..45
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
index 7847da085..798e81ca6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..52
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -52,7 +52,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@54..94
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 816740a7c..2cc849784 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..37
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -41,7 +41,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@38..62
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -83,7 +83,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] " "
-      FN_DEF@77..126
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -132,12 +132,12 @@ [email protected]
      [email protected] " "
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@130..172
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "foo"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -186,16 +186,16 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n\n"
-  TRAIT_DEF@174..236
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@190..234
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -251,7 +251,7 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n\n"
-  IMPL_DEF@238..519
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -260,10 +260,10 @@ [email protected]
          [email protected]
            [email protected] "S"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n     "
-      FN_DEF@252..277
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -287,7 +287,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n     "
-      FN_DEF@283..305
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -311,7 +311,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n     "
-      FN_DEF@311..334
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -336,12 +336,12 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n     "
-      FN_DEF@340..371
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
          [email protected] "g3"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -368,12 +368,12 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n     "
-      FN_DEF@377..407
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
          [email protected] "g4"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -400,12 +400,12 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n     "
-      FN_DEF@413..447
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
          [email protected] "g5"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -434,7 +434,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n     "
-      FN_DEF@453..480
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -465,7 +465,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n     "
-      FN_DEF@486..517
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
index 65cfa7bc5..a30000398 100644
--- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..79
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
index d6aec7ab9..e3997ac5b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..26
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -35,7 +35,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@28..56
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -77,7 +77,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@58..87
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
index 9e0cec35f..7447d516e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
@@ -1,5 +1,5 @@
 [email protected]
-  TYPE_ALIAS_DEF@0..12
+  [email protected]
    [email protected] "type"
    [email protected] " "
    [email protected]
@@ -12,7 +12,7 @@ [email protected]
      [email protected] ")"
    [email protected] ";"
  [email protected] "\n\n"
-  FN_DEF@14..48
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
index 7fa3033ac..3ef916e55 100644
--- a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..70
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
index d93968016..53410a1ee 100644
--- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..17
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
@@ -23,7 +23,7 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@19..50
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
index b5c72ee36..a1dfd58f2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..78
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
index ddcb139c1..767b516a2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..104
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
index 098152fc3..1fd1a2888 100644
--- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
index c6e982976..ba49c115b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..34
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
index bf791ee2b..0c22c31a4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
@@ -51,7 +51,7 @@ [email protected]
        [email protected] "\n"
        [email protected] "}"
  [email protected] "\n\n"
-  FN_DEF@95..348
+  [email protected]
    [email protected]
      [email protected] "#"
      [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
index 886b211d0..facce8167 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
@@ -1,14 +1,14 @@
 [email protected]
-  TRAIT_DEF@0..169
+  [email protected]
    [email protected] "trait"
    [email protected] " "
    [email protected]
      [email protected] "T"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@14..46
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -50,7 +50,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@51..74
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -92,7 +92,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@79..108
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -123,7 +123,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@113..135
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -155,7 +155,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@140..167
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
index 5a9f07c89..7adedb02e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
@@ -8,7 +8,7 @@ [email protected]
    [email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@17..40
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -37,7 +37,7 @@ [email protected]
          [email protected] ")"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@45..70
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -69,7 +69,7 @@ [email protected]
          [email protected] ")"
        [email protected] ";"
      [email protected] "\n    "
-      FN_DEF@75..123
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
index a0423806c..453757c3c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..136
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -8,10 +8,10 @@ [email protected]
          [email protected]
            [email protected] "U"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n    "
-      FN_DEF@13..45
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -53,7 +53,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@50..73
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -95,7 +95,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@78..107
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
@@ -126,7 +126,7 @@ [email protected]
          [email protected] "{"
          [email protected] "}"
      [email protected] "\n    "
-      FN_DEF@112..134
+      [email protected]
        [email protected] "fn"
        [email protected] " "
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
index d1fffdd63..29bd38c05 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
@@ -1,5 +1,5 @@
 [email protected]
-  FN_DEF@0..25
+  [email protected]
    [email protected] "/// Example"
    [email protected] "\n\n"
    [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
index eb2f8eb3c..2c699ffcb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..39
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "f"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
index dab0247ee..6246a31a6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
@@ -1,5 +1,5 @@
 [email protected]
-  IMPL_DEF@0..45
+  [email protected]
    [email protected] "impl"
    [email protected] " "
    [email protected]
@@ -16,10 +16,10 @@ [email protected]
          [email protected]
            [email protected] "Foo"
    [email protected] " "
-    [email protected]
+    ASSOC_[email protected]
      [email protected] "{"
      [email protected] "\n  "
-      CONST_DEF@19..43
+      [email protected]
        [email protected] "default"
        [email protected] " "
        [email protected] "const"
diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
index 503585103..a368ac1e8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
@@ -1,10 +1,10 @@
 [email protected]
-  FN_DEF@0..55
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "for_trait"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -19,7 +19,7 @@ [email protected]
      [email protected] "\n    "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -59,12 +59,12 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@56..107
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "for_ref"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -79,7 +79,7 @@ [email protected]
      [email protected] "\n    "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -110,12 +110,12 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@108..170
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "for_parens"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -130,7 +130,7 @@ [email protected]
      [email protected] "\n    "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -177,12 +177,12 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@171..223
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "for_slice"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -197,7 +197,7 @@ [email protected]
      [email protected] "\n    "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -231,12 +231,12 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@224..300
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "for_qpath"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -264,7 +264,7 @@ [email protected]
      [email protected] "\n    "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -313,12 +313,12 @@ [email protected]
      [email protected] "\n"
      [email protected] "}"
  [email protected] "\n"
-  FN_DEF@301..373
+  [email protected]
    [email protected] "fn"
    [email protected] " "
    [email protected]
      [email protected] "for_for_fn"
-    TYP[email protected]
+    GENERIC[email protected]
      [email protected] "<"
      [email protected]
        [email protected]
@@ -333,7 +333,7 @@ [email protected]
      [email protected] "\n    "
      [email protected]
        [email protected] "for"
-        TYP[email protected]
+        GENERIC[email protected]
          [email protected] "<"
          [email protected]
            [email protected] "\'a"
@@ -341,7 +341,7 @@ [email protected]
        [email protected] " "
        [email protected]
          [email protected] "for"
-          TYP[email protected]
+          GENERIC[email protected]
            [email protected] "<"
            [email protected]
              [email protected] "\'b"
diff --git a/crates/ra_text_edit/Cargo.toml b/crates/ra_text_edit/Cargo.toml
index 46a2ab68f..dbb223350 100644
--- a/crates/ra_text_edit/Cargo.toml
+++ b/crates/ra_text_edit/Cargo.toml
@@ -4,6 +4,7 @@ name = "ra_text_edit"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/ra_toolchain/Cargo.toml b/crates/ra_toolchain/Cargo.toml
index 1873fbe16..84b748c0a 100644
--- a/crates/ra_toolchain/Cargo.toml
+++ b/crates/ra_toolchain/Cargo.toml
@@ -3,6 +3,10 @@ edition = "2018"
 name = "ra_toolchain"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
+[lib]
+doctest = false
 [dependencies]
 home = "0.5.3"
diff --git a/crates/ra_tt/Cargo.toml b/crates/ra_tt/Cargo.toml
index f7230a9ca..3c45248c3 100644
--- a/crates/ra_tt/Cargo.toml
+++ b/crates/ra_tt/Cargo.toml
@@ -3,11 +3,13 @@ edition = "2018"
 name = "ra_tt"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
 [dependencies]
+stdx = { path = "../stdx" }
 # ideally, `serde` should be enabled by `rust-analyzer`, but we enable it here
 # to reduce number of compilations
 smol_str = { version = "0.1.15", features = ["serde"] }
diff --git a/crates/ra_tt/src/lib.rs b/crates/ra_tt/src/lib.rs
index 342ddbe32..8faf1cc67 100644
--- a/crates/ra_tt/src/lib.rs
+++ b/crates/ra_tt/src/lib.rs
@@ -1,24 +1,13 @@
 //! `tt` crate defines a `TokenTree` data structure: this is the interface (both
 //! input and output) of macros. It closely mirrors `proc_macro` crate's
 //! `TokenTree`.
-macro_rules! impl_froms {
-    ($e:ident: $($v:ident), *) => {
-        $(
-            impl From<$v> for $e {
-                fn from(it: $v) -> $e {
-                    $e::$v(it)
-                }
-            }
-        )*
-    }
-}
 use std::{
    fmt::{self, Debug},
    panic::RefUnwindSafe,
 };
+use stdx::impl_from;
 pub use smol_str::SmolStr;
 /// Represents identity of the token.
@@ -41,7 +30,7 @@ pub enum TokenTree {
    Leaf(Leaf),
    Subtree(Subtree),
 }
-impl_froms!(TokenTree: Leaf, Subtree);
+impl_from!(Leaf, Subtree for TokenTree);
 impl TokenTree {
    pub fn empty() -> Self {
@@ -55,7 +44,7 @@ pub enum Leaf {
    Punct(Punct),
    Ident(Ident),
 }
-impl_froms!(Leaf: Literal, Punct, Ident);
+impl_from!(Literal, Punct, Ident for Leaf);
 #[derive(Clone, PartialEq, Eq, Hash, Default)]
 pub struct Subtree {
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 803755106..02c1371ac 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -4,6 +4,7 @@ name = "rust-analyzer"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 autobins = false
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
@@ -16,18 +17,19 @@ path = "src/bin/main.rs"
 anyhow = "1.0.26"
 crossbeam-channel = "0.4.0"
 env_logger = { version = "0.7.1", default-features = false }
-globset = "0.4.4"
 itertools = "0.9.0"
 jod-thread = "0.1.0"
 log = "0.4.8"
-lsp-types = { version = "0.74.0", features = ["proposed"] }
+lsp-types = { version = "0.79.0", features = ["proposed"] }
 parking_lot = "0.11.0"
 pico-args = "0.3.1"
-rand = { version = "0.7.3", features = ["small_rng"] }
+oorandom = "11.1.2"
 rustc-hash = "1.1.0"
 serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.48"
 threadpool = "1.7.1"
+rayon = "1.3.1"
+mimalloc = { version = "0.1.19", default-features = false, optional = true }
 stdx = { path = "../stdx" }
@@ -40,7 +42,7 @@ ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
 vfs = { path = "../vfs" }
 vfs-notify = { path = "../vfs-notify" }
-ra_cfg = { path = "../ra_cfg"}
+ra_cfg = { path = "../ra_cfg" }
 ra_toolchain = { path = "../ra_toolchain" }
 # This should only be used in CLI
@@ -56,11 +58,7 @@ ra_proc_macro_srv = { path = "../ra_proc_macro_srv" }
 winapi = "0.3.8"
 [dev-dependencies]
-tempfile = "3.1.0"
+expect = { path = "../expect" }
-insta = "0.16.0"
 test_utils = { path = "../test_utils" }
 mbe = { path = "../ra_mbe", package = "ra_mbe" }
 tt = { path = "../ra_tt", package = "ra_tt" }
-[features]
-jemalloc = [ "ra_prof/jemalloc" ]
diff --git a/crates/rust-analyzer/src/bin/args.rs b/crates/rust-analyzer/src/bin/args.rs
index 3f0bb3865..f16e35d86 100644
--- a/crates/rust-analyzer/src/bin/args.rs
+++ b/crates/rust-analyzer/src/bin/args.rs
@@ -3,12 +3,13 @@
 //! If run started args, we run the LSP server loop. With a subcommand, we do a
 //! one-time batch processing.
+use std::{env, fmt::Write, path::PathBuf};
 use anyhow::{bail, Result};
 use pico_args::Arguments;
-use ra_ssr::SsrRule;
+use ra_ssr::{SsrPattern, SsrRule};
-use rust_analyzer::cli::{BenchWhat, Position, Verbosity};
+use rust_analyzer::cli::{AnalysisStatsCmd, BenchCmd, BenchWhat, Position, Verbosity};
+use vfs::AbsPathBuf;
-use std::{fmt::Write, path::PathBuf};
 pub(crate) struct Args {
    pub(crate) verbosity: Verbosity,
@@ -23,21 +24,8 @@ pub(crate) enum Command {
    Highlight {
        rainbow: bool,
    },
-    Stats {
+    AnalysisStats(AnalysisStatsCmd),
-        randomize: bool,
+    Bench(BenchCmd),
-        memory_usage: bool,
-        only: Option<String>,
-        with_deps: bool,
-        path: PathBuf,
-        load_output_dirs: bool,
-        with_proc_macro: bool,
-    },
-    Bench {
-        path: PathBuf,
-        what: BenchWhat,
-        load_output_dirs: bool,
-        with_proc_macro: bool,
-    },
    Diagnostics {
        path: PathBuf,
        load_output_dirs: bool,
@@ -49,6 +37,10 @@ pub(crate) enum Command {
    Ssr {
        rules: Vec<SsrRule>,
    },
+    StructuredSearch {
+        debug_snippet: Option<String>,
+        patterns: Vec<SsrPattern>,
+    },
    ProcMacro,
    RunServer,
    Version,
@@ -98,7 +90,7 @@ USAGE:
    rust-analyzer parse [FLAGS]
 FLAGS:
-    -h, --help       Prints help inforamtion
+    -h, --help       Prints help information
        --no-dump"
                    );
                    return Ok(Err(HelpPrinted));
@@ -157,10 +149,14 @@ USAGE:
    rust-analyzer analysis-stats [FLAGS] [OPTIONS] [PATH]
 FLAGS:
+    -o, --only              Only analyze items matching this path
    -h, --help              Prints help information
-        --memory-usage
+        --memory-usage      Collect memory usage statistics
+        --randomize         Randomize order in which crates, modules, and items are processed
+        --parallel          Run type inference in parallel
        --load-output-dirs  Load OUT_DIR values by running `cargo check` before analysis
-        --with-proc-macro    Use ra-proc-macro-srv for proc-macro expanding
+        --with-proc-macro   Use ra-proc-macro-srv for proc-macro expanding
+        --with-deps         Also analyze all dependencies
    -v, --verbose
    -q, --quiet
@@ -174,6 +170,7 @@ ARGS:
                }
                let randomize = matches.contains("--randomize");
+                let parallel = matches.contains("--parallel");
                let memory_usage = matches.contains("--memory-usage");
                let only: Option<String> = matches.opt_value_from_str(["-o", "--only"])?;
                let with_deps: bool = matches.contains("--with-deps");
@@ -187,15 +184,16 @@ ARGS:
                    trailing.pop().unwrap().into()
                };
-                Command::Stats {
+                Command::AnalysisStats(AnalysisStatsCmd {
                    randomize,
+                    parallel,
                    memory_usage,
                    only,
                    with_deps,
                    path,
                    load_output_dirs,
                    with_proc_macro,
-                }
+                })
            }
            "analysis-bench" => {
                if matches.contains(["-h", "--help"]) {
@@ -208,8 +206,9 @@ USAGE:
 FLAGS:
    -h, --help          Prints help information
+    --memory-usage      Collect memory usage statistics
    --load-output-dirs  Load OUT_DIR values by running `cargo check` before analysis
-    --with-proc-macro    Use ra-proc-macro-srv for proc-macro expanding
+    --with-proc-macro   Use ra-proc-macro-srv for proc-macro expanding
    -v, --verbose
 OPTIONS:
@@ -229,16 +228,26 @@ ARGS:
                let complete_path: Option<Position> = matches.opt_value_from_str("--complete")?;
                let goto_def_path: Option<Position> = matches.opt_value_from_str("--goto-def")?;
                let what = match (highlight_path, complete_path, goto_def_path) {
-                    (Some(path), None, None) => BenchWhat::Highlight { path: path.into() },
+                    (Some(path), None, None) => {
+                        let path = env::current_dir().unwrap().join(path);
+                        BenchWhat::Highlight { path: AbsPathBuf::assert(path) }
+                    }
                    (None, Some(position), None) => BenchWhat::Complete(position),
                    (None, None, Some(position)) => BenchWhat::GotoDef(position),
                    _ => panic!(
                        "exactly one of  `--highlight`, `--complete` or `--goto-def` must be set"
                    ),
                };
+                let memory_usage = matches.contains("--memory-usage");
                let load_output_dirs = matches.contains("--load-output-dirs");
                let with_proc_macro = matches.contains("--with-proc-macro");
-                Command::Bench { path, what, load_output_dirs, with_proc_macro }
+                Command::Bench(BenchCmd {
+                    memory_usage,
+                    path,
+                    what,
+                    load_output_dirs,
+                    with_proc_macro,
+                })
            }
            "diagnostics" => {
                if matches.contains(["-h", "--help"]) {
@@ -287,6 +296,7 @@ EXAMPLE:
    rust-analyzer ssr '$a.foo($b) ==> bar($a, $b)'
 FLAGS:
+    --debug <snippet>   Prints debug information for any nodes with source exactly equal to <snippet>
    -h, --help          Prints help information
 ARGS:
@@ -300,6 +310,34 @@ ARGS:
                }
                Command::Ssr { rules }
            }
+            "search" => {
+                if matches.contains(["-h", "--help"]) {
+                    eprintln!(
+                        "\
+rust-analyzer search
+USAGE:
+    rust-analyzer search [FLAGS] [PATTERN...]
+EXAMPLE:
+    rust-analyzer search '$a.foo($b)'
+FLAGS:
+    --debug <snippet>   Prints debug information for any nodes with source exactly equal to <snippet>
+    -h, --help          Prints help information
+ARGS:
+    <PATTERN>           A structured search pattern"
+                    );
+                    return Ok(Err(HelpPrinted));
+                }
+                let debug_snippet = matches.opt_value_from_str("--debug")?;
+                let mut patterns = Vec::new();
+                while let Some(rule) = matches.free_from_str()? {
+                    patterns.push(rule);
+                }
+                Command::StructuredSearch { patterns, debug_snippet }
+            }
            _ => {
                print_subcommands();
                return Ok(Err(HelpPrinted));
@@ -327,6 +365,7 @@ SUBCOMMANDS:
    diagnostics
    proc-macro
    parse
+    search
    ssr
    symbols"
    )
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index 16882fc13..ff8234495 100644
--- a/crates/rust-analyzer/src/bin/main.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -6,17 +6,20 @@ mod args;
 use std::convert::TryFrom;
 use lsp_server::Connection;
+use ra_project_model::ProjectManifest;
 use rust_analyzer::{
    cli,
    config::{Config, LinkedProject},
    from_json, Result,
 };
+use vfs::AbsPathBuf;
-use ra_db::AbsPathBuf;
-use ra_project_model::ProjectManifest;
 use crate::args::HelpPrinted;
+#[cfg(all(feature = "mimalloc"))]
+#[global_allocator]
+static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
 fn main() -> Result<()> {
    setup_logging()?;
    let args = match args::Args::parse()? {
@@ -30,39 +33,17 @@ fn main() -> Result<()> {
        args::Command::Parse { no_dump } => cli::parse(no_dump)?,
        args::Command::Symbols => cli::symbols()?,
        args::Command::Highlight { rainbow } => cli::highlight(rainbow)?,
-        args::Command::Stats {
+        args::Command::AnalysisStats(cmd) => cmd.run(args.verbosity)?,
-            randomize,
+        args::Command::Bench(cmd) => cmd.run(args.verbosity)?,
-            memory_usage,
-            only,
-            with_deps,
-            path,
-            load_output_dirs,
-            with_proc_macro,
-        } => cli::analysis_stats(
-            args.verbosity,
-            memory_usage,
-            path.as_ref(),
-            only.as_ref().map(String::as_ref),
-            with_deps,
-            randomize,
-            load_output_dirs,
-            with_proc_macro,
-        )?,
-        args::Command::Bench { path, what, load_output_dirs, with_proc_macro } => {
-            cli::analysis_bench(
-                args.verbosity,
-                path.as_ref(),
-                what,
-                load_output_dirs,
-                with_proc_macro,
-            )?
-        }
        args::Command::Diagnostics { path, load_output_dirs, with_proc_macro, all } => {
            cli::diagnostics(path.as_ref(), load_output_dirs, with_proc_macro, all)?
        }
        args::Command::Ssr { rules } => {
            cli::apply_ssr_rules(rules)?;
        }
+        args::Command::StructuredSearch { patterns, debug_snippet } => {
+            cli::search_for_patterns(patterns, debug_snippet)?;
+        }
        args::Command::Version => println!("rust-analyzer {}", env!("REV")),
    }
    Ok(())
@@ -116,8 +97,8 @@ fn run_server() -> Result<()> {
        };
        let mut config = Config::new(root_path);
-        if let Some(value) = &initialize_params.initialization_options {
+        if let Some(json) = initialize_params.initialization_options {
-            config.update(value);
+            config.update(json);
        }
        config.update_caps(&initialize_params.capabilities);
diff --git a/crates/rust-analyzer/src/caps.rs b/crates/rust-analyzer/src/caps.rs
index 673795e78..37d695448 100644
--- a/crates/rust-analyzer/src/caps.rs
+++ b/crates/rust-analyzer/src/caps.rs
@@ -2,9 +2,9 @@
 use std::env;
 use lsp_types::{
-    CallHierarchyServerCapability, ClientCapabilities, CodeActionOptions,
+    CallHierarchyServerCapability, ClientCapabilities, CodeActionKind, CodeActionOptions,
    CodeActionProviderCapability, CodeLensOptions, CompletionOptions,
-    DocumentOnTypeFormattingOptions, FoldingRangeProviderCapability,
+    DocumentOnTypeFormattingOptions, FoldingRangeProviderCapability, HoverProviderCapability,
    ImplementationProviderCapability, RenameOptions, RenameProviderCapability, SaveOptions,
    SelectionRangeProviderCapability, SemanticTokensDocumentProvider, SemanticTokensLegend,
    SemanticTokensOptions, ServerCapabilities, SignatureHelpOptions, TextDocumentSyncCapability,
@@ -28,9 +28,9 @@ pub fn server_capabilities(client_caps: &ClientCapabilities) -> ServerCapabiliti
            }),
            will_save: None,
            will_save_wait_until: None,
-            save: Some(SaveOptions::default()),
+            save: Some(SaveOptions::default().into()),
        })),
-        hover_provider: Some(true),
+        hover_provider: Some(HoverProviderCapability::Simple(true)),
        completion_provider: Some(CompletionOptions {
            resolve_provider: None,
            trigger_characters: Some(vec![":".to_string(), ".".to_string()]),
@@ -106,14 +106,12 @@ fn code_action_capabilities(client_caps: &ClientCapabilities) -> CodeActionProvi
                // Ideally we would base this off of the client capabilities
                // but the client is supposed to fall back gracefully for unknown values.
                code_action_kinds: Some(vec![
-                    lsp_types::code_action_kind::EMPTY.to_string(),
+                    CodeActionKind::EMPTY,
-                    lsp_types::code_action_kind::QUICKFIX.to_string(),
+                    CodeActionKind::QUICKFIX,
-                    lsp_types::code_action_kind::REFACTOR.to_string(),
+                    CodeActionKind::REFACTOR,
-                    lsp_types::code_action_kind::REFACTOR_EXTRACT.to_string(),
+                    CodeActionKind::REFACTOR_EXTRACT,
-                    lsp_types::code_action_kind::REFACTOR_INLINE.to_string(),
+                    CodeActionKind::REFACTOR_INLINE,
-                    lsp_types::code_action_kind::REFACTOR_REWRITE.to_string(),
+                    CodeActionKind::REFACTOR_REWRITE,
-                    lsp_types::code_action_kind::SOURCE.to_string(),
-                    lsp_types::code_action_kind::SOURCE_ORGANIZE_IMPORTS.to_string(),
                ]),
                work_done_progress_options: Default::default(),
            })
diff --git a/crates/rust-analyzer/src/cargo_target_spec.rs b/crates/rust-analyzer/src/cargo_target_spec.rs
index e4dd5d92d..03c41263a 100644
--- a/crates/rust-analyzer/src/cargo_target_spec.rs
+++ b/crates/rust-analyzer/src/cargo_target_spec.rs
@@ -1,9 +1,9 @@
 //! See `CargoTargetSpec`
 use ra_cfg::CfgExpr;
-use ra_db::AbsPathBuf;
 use ra_ide::{FileId, RunnableKind, TestId};
 use ra_project_model::{self, TargetKind};
+use vfs::AbsPathBuf;
 use crate::{global_state::GlobalStateSnapshot, Result};
@@ -21,6 +21,7 @@ pub(crate) struct CargoTargetSpec {
 impl CargoTargetSpec {
    pub(crate) fn runnable_args(
+        snap: &GlobalStateSnapshot,
        spec: Option<CargoTargetSpec>,
        kind: &RunnableKind,
        cfgs: &[CfgExpr],
@@ -78,13 +79,21 @@ impl CargoTargetSpec {
            }
        }
-        let mut features = Vec::new();
+        if snap.config.cargo.all_features {
-        for cfg in cfgs {
+            args.push("--all-features".to_string());
-            required_features(cfg, &mut features);
+        } else {
-        }
+            let mut features = Vec::new();
-        for feature in features {
+            for cfg in cfgs {
-            args.push("--features".to_string());
+                required_features(cfg, &mut features);
-            args.push(feature);
+            }
+            for feature in &snap.config.cargo.features {
+                features.push(feature.clone());
+            }
+            features.dedup();
+            for feature in features {
+                args.push("--features".to_string());
+                args.push(feature);
+            }
        }
        Ok((args, extra_args))
@@ -168,49 +177,35 @@ fn required_features(cfg_expr: &CfgExpr, features: &mut Vec<String>) {
 mod tests {
    use super::*;
-    use mbe::{ast_to_token_tree, TokenMap};
+    use mbe::ast_to_token_tree;
-    use ra_cfg::parse_cfg;
+    use ra_cfg::CfgExpr;
    use ra_syntax::{
        ast::{self, AstNode},
        SmolStr,
    };
-    fn get_token_tree_generated(input: &str) -> (tt::Subtree, TokenMap) {
+    fn check(cfg: &str, expected_features: &[&str]) {
-        let source_file = ast::SourceFile::parse(input).ok().unwrap();
+        let cfg_expr = {
-        let tt = source_file.syntax().descendants().find_map(ast::TokenTree::cast).unwrap();
+            let source_file = ast::SourceFile::parse(cfg).ok().unwrap();
-        ast_to_token_tree(&tt).unwrap()
+            let tt = source_file.syntax().descendants().find_map(ast::TokenTree::cast).unwrap();
-    }
+            let (tt, _) = ast_to_token_tree(&tt).unwrap();
+            CfgExpr::parse(&tt)
-    #[test]
+        };
-    fn test_cfg_expr_minimal_features_needed() {
-        let (subtree, _) = get_token_tree_generated(r#"#![cfg(feature = "baz")]"#);
-        let cfg_expr = parse_cfg(&subtree);
-        let mut min_features = vec![];
-        required_features(&cfg_expr, &mut min_features);
-        assert_eq!(min_features, vec![SmolStr::new("baz")]);
-        let (subtree, _) =
-            get_token_tree_generated(r#"#![cfg(all(feature = "baz", feature = "foo"))]"#);
-        let cfg_expr = parse_cfg(&subtree);
-        let mut min_features = vec![];
-        required_features(&cfg_expr, &mut min_features);
-        assert_eq!(min_features, vec![SmolStr::new("baz"), SmolStr::new("foo")]);
-        let (subtree, _) =
+        let mut features = vec![];
-            get_token_tree_generated(r#"#![cfg(any(feature = "baz", feature = "foo", unix))]"#);
+        required_features(&cfg_expr, &mut features);
-        let cfg_expr = parse_cfg(&subtree);
-        let mut min_features = vec![];
+        let expected_features =
-        required_features(&cfg_expr, &mut min_features);
+            expected_features.iter().map(|&it| SmolStr::new(it)).collect::<Vec<_>>();
-        assert_eq!(min_features, vec![SmolStr::new("baz")]);
-        let (subtree, _) = get_token_tree_generated(r#"#![cfg(foo)]"#);
+        assert_eq!(features, expected_features);
-        let cfg_expr = parse_cfg(&subtree);
+    }
-        let mut min_features = vec![];
+    #[test]
-        required_features(&cfg_expr, &mut min_features);
+    fn test_cfg_expr_minimal_features_needed() {
-        assert!(min_features.is_empty());
+        check(r#"#![cfg(feature = "baz")]"#, &["baz"]);
+        check(r#"#![cfg(all(feature = "baz", feature = "foo"))]"#, &["baz", "foo"]);
+        check(r#"#![cfg(any(feature = "baz", feature = "foo", unix))]"#, &["baz"]);
+        check(r#"#![cfg(foo)]"#, &[]);
    }
 }
diff --git a/crates/rust-analyzer/src/cli.rs b/crates/rust-analyzer/src/cli.rs
index 13e3d75be..1034d11bd 100644
--- a/crates/rust-analyzer/src/cli.rs
+++ b/crates/rust-analyzer/src/cli.rs
@@ -10,15 +10,15 @@ mod ssr;
 use std::io::Read;
 use anyhow::Result;
-use ra_ide::{file_structure, Analysis};
+use ra_ide::Analysis;
 use ra_prof::profile;
 use ra_syntax::{AstNode, SourceFile};
-pub use analysis_bench::{analysis_bench, BenchWhat, Position};
+pub use analysis_bench::{BenchCmd, BenchWhat, Position};
-pub use analysis_stats::analysis_stats;
+pub use analysis_stats::AnalysisStatsCmd;
 pub use diagnostics::diagnostics;
 pub use load_cargo::load_cargo;
-pub use ssr::apply_ssr_rules;
+pub use ssr::{apply_ssr_rules, search_for_patterns};
 #[derive(Clone, Copy)]
 pub enum Verbosity {
@@ -48,8 +48,10 @@ pub fn parse(no_dump: bool) -> Result<()> {
 }
 pub fn symbols() -> Result<()> {
-    let file = file()?;
+    let text = read_stdin()?;
-    for s in file_structure(&file) {
+    let (analysis, file_id) = Analysis::from_single_file(text);
+    let structure = analysis.file_structure(file_id).unwrap();
+    for s in structure {
        println!("{:?}", s);
    }
    Ok(())
@@ -72,3 +74,10 @@ fn read_stdin() -> Result<String> {
    std::io::stdin().read_to_string(&mut buff)?;
    Ok(buff)
 }
+fn report_metric(metric: &str, value: u64, unit: &str) {
+    if std::env::var("RA_METRICS").is_err() {
+        return;
+    }
+    println!("METRIC:{}:{}:{}", metric, value, unit)
+}
diff --git a/crates/rust-analyzer/src/cli/analysis_bench.rs b/crates/rust-analyzer/src/cli/analysis_bench.rs
index 930375d3e..c54ee5f4d 100644
--- a/crates/rust-analyzer/src/cli/analysis_bench.rs
+++ b/crates/rust-analyzer/src/cli/analysis_bench.rs
@@ -1,30 +1,36 @@
 //! Benchmark operations like highlighting or goto definition.
-use std::{
+use std::{env, path::PathBuf, str::FromStr, sync::Arc, time::Instant};
-    convert::TryFrom,
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::Arc,
-    time::Instant,
-};
-use anyhow::{format_err, Result};
+use anyhow::{bail, format_err, Result};
 use ra_db::{
    salsa::{Database, Durability},
-    AbsPathBuf, FileId,
+    FileId,
 };
 use ra_ide::{Analysis, AnalysisChange, AnalysisHost, CompletionConfig, FilePosition, LineCol};
+use vfs::AbsPathBuf;
+use crate::{
+    cli::{load_cargo::load_cargo, Verbosity},
+    print_memory_usage,
+};
-use crate::cli::{load_cargo::load_cargo, Verbosity};
+pub struct BenchCmd {
+    pub path: PathBuf,
+    pub what: BenchWhat,
+    pub memory_usage: bool,
+    pub load_output_dirs: bool,
+    pub with_proc_macro: bool,
+}
 pub enum BenchWhat {
-    Highlight { path: PathBuf },
+    Highlight { path: AbsPathBuf },
    Complete(Position),
    GotoDef(Position),
 }
 pub struct Position {
-    pub path: PathBuf,
+    pub path: AbsPathBuf,
    pub line: u32,
    pub column: u32,
 }
@@ -32,78 +38,80 @@ pub struct Position {
 impl FromStr for Position {
    type Err = anyhow::Error;
    fn from_str(s: &str) -> Result<Self> {
-        let (path_line, column) = rsplit_at_char(s, ':')?;
+        let mut split = s.rsplitn(3, ':');
-        let (path, line) = rsplit_at_char(path_line, ':')?;
+        match (split.next(), split.next(), split.next()) {
-        Ok(Position { path: path.into(), line: line.parse()?, column: column.parse()? })
+            (Some(column), Some(line), Some(path)) => {
+                let path = env::current_dir().unwrap().join(path);
+                let path = AbsPathBuf::assert(path);
+                Ok(Position { path, line: line.parse()?, column: column.parse()? })
+            }
+            _ => bail!("position should be in file:line:column format: {:?}", s),
+        }
    }
 }
-fn rsplit_at_char(s: &str, c: char) -> Result<(&str, &str)> {
+impl BenchCmd {
-    let idx = s.rfind(c).ok_or_else(|| format_err!("no `{}` in {}", c, s))?;
+    pub fn run(self, verbosity: Verbosity) -> Result<()> {
-    Ok((&s[..idx], &s[idx + 1..]))
+        ra_prof::init();
-}
-pub fn analysis_bench(
+        let start = Instant::now();
-    verbosity: Verbosity,
+        eprint!("loading: ");
-    path: &Path,
+        let (mut host, vfs) = load_cargo(&self.path, self.load_output_dirs, self.with_proc_macro)?;
-    what: BenchWhat,
+        eprintln!("{:?}\n", start.elapsed());
-    load_output_dirs: bool,
-    with_proc_macro: bool,
-) -> Result<()> {
-    ra_prof::init();
-    let start = Instant::now();
-    eprint!("loading: ");
-    let (mut host, vfs) = load_cargo(path, load_output_dirs, with_proc_macro)?;
-    eprintln!("{:?}\n", start.elapsed());
-    let file_id = {
-        let path = match &what {
-            BenchWhat::Highlight { path } => path,
-            BenchWhat::Complete(pos) | BenchWhat::GotoDef(pos) => &pos.path,
-        };
-        let path = AbsPathBuf::try_from(path.clone()).unwrap();
-        let path = path.into();
-        vfs.file_id(&path).ok_or_else(|| format_err!("Can't find {}", path))?
-    };
-    match &what {
-        BenchWhat::Highlight { .. } => {
-            let res = do_work(&mut host, file_id, |analysis| {
-                analysis.diagnostics(file_id).unwrap();
-                analysis.highlight_as_html(file_id, false).unwrap()
-            });
-            if verbosity.is_verbose() {
-                println!("\n{}", res);
-            }
-        }
-        BenchWhat::Complete(pos) | BenchWhat::GotoDef(pos) => {
-            let is_completion = matches!(what, BenchWhat::Complete(..));
-            let offset = host
+        let file_id = {
-                .analysis()
+            let path = match &self.what {
-                .file_line_index(file_id)?
+                BenchWhat::Highlight { path } => path,
-                .offset(LineCol { line: pos.line - 1, col_utf16: pos.column });
+                BenchWhat::Complete(pos) | BenchWhat::GotoDef(pos) => &pos.path,
-            let file_position = FilePosition { file_id, offset };
+            };
+            let path = path.clone().into();
+            vfs.file_id(&path).ok_or_else(|| format_err!("Can't find {}", path))?
+        };
-            if is_completion {
+        match &self.what {
-                let options = CompletionConfig::default();
+            BenchWhat::Highlight { .. } => {
                let res = do_work(&mut host, file_id, |analysis| {
-                    analysis.completions(&options, file_position)
+                    analysis.diagnostics(file_id, true).unwrap();
+                    analysis.highlight_as_html(file_id, false).unwrap()
                });
                if verbosity.is_verbose() {
-                    println!("\n{:#?}", res);
+                    println!("\n{}", res);
                }
-            } else {
+            }
-                let res =
+            BenchWhat::Complete(pos) | BenchWhat::GotoDef(pos) => {
-                    do_work(&mut host, file_id, |analysis| analysis.goto_definition(file_position));
+                let is_completion = matches!(self.what, BenchWhat::Complete(..));
-                if verbosity.is_verbose() {
-                    println!("\n{:#?}", res);
+                let offset = host
+                    .analysis()
+                    .file_line_index(file_id)?
+                    .offset(LineCol { line: pos.line - 1, col_utf16: pos.column });
+                let file_position = FilePosition { file_id, offset };
+                if is_completion {
+                    let options = CompletionConfig::default();
+                    let res = do_work(&mut host, file_id, |analysis| {
+                        analysis.completions(&options, file_position)
+                    });
+                    if verbosity.is_verbose() {
+                        println!("\n{:#?}", res);
+                    }
+                } else {
+                    let res = do_work(&mut host, file_id, |analysis| {
+                        analysis.goto_definition(file_position)
+                    });
+                    if verbosity.is_verbose() {
+                        println!("\n{:#?}", res);
+                    }
                }
            }
        }
+        if self.memory_usage {
+            print_memory_usage(host, vfs);
+        }
+        Ok(())
    }
-    Ok(())
 }
 fn do_work<F: Fn(&Analysis) -> T, T>(host: &mut AnalysisHost, file_id: FileId, work: F) -> T {
@@ -141,6 +149,19 @@ fn do_work<F: Fn(&Analysis) -> T, T>(host: &mut AnalysisHost, file_id: FileId, w
    }
    {
        let start = Instant::now();
+        eprint!("item change:    ");
+        {
+            let mut text = host.analysis().file_text(file_id).unwrap().to_string();
+            text.push_str("\npub fn _dummy() {}\n");
+            let mut change = AnalysisChange::new();
+            change.change_file(file_id, Some(Arc::new(text)));
+            host.apply_change(change);
+        }
+        work(&host.analysis());
+        eprintln!("{:?}", start.elapsed());
+    }
+    {
+        let start = Instant::now();
        eprint!("const change:   ");
        host.raw_database_mut().salsa_runtime_mut().synthetic_write(Durability::HIGH);
        let res = work(&host.analysis());
diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index 9d09501cd..721d41a58 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs
@@ -1,11 +1,10 @@
 //! Fully type-check project and print various stats, like the number of type
 //! errors.
-use std::{path::Path, time::Instant};
+use std::{
+    path::PathBuf,
-use itertools::Itertools;
+    time::{SystemTime, UNIX_EPOCH},
-use rand::{seq::SliceRandom, thread_rng};
+};
-use rustc_hash::FxHashSet;
 use hir::{
    db::{AstDatabase, DefDatabase, HirDatabase},
@@ -13,246 +12,317 @@ use hir::{
 };
 use hir_def::FunctionId;
 use hir_ty::{Ty, TypeWalk};
-use ra_db::SourceDatabaseExt;
+use itertools::Itertools;
+use oorandom::Rand32;
+use ra_db::{
+    salsa::{self, ParallelDatabase},
+    SourceDatabaseExt,
+};
 use ra_syntax::AstNode;
+use rayon::prelude::*;
+use rustc_hash::FxHashSet;
 use stdx::format_to;
-use crate::cli::{load_cargo::load_cargo, progress_report::ProgressReport, Result, Verbosity};
+use crate::{
+    cli::{
-pub fn analysis_stats(
+        load_cargo::load_cargo, progress_report::ProgressReport, report_metric, Result, Verbosity,
-    verbosity: Verbosity,
+    },
-    memory_usage: bool,
+    print_memory_usage,
-    path: &Path,
+};
-    only: Option<&str>,
+use ra_prof::StopWatch;
-    with_deps: bool,
-    randomize: bool,
-    load_output_dirs: bool,
-    with_proc_macro: bool,
-) -> Result<()> {
-    let db_load_time = Instant::now();
-    let (mut host, vfs) = load_cargo(path, load_output_dirs, with_proc_macro)?;
-    let db = host.raw_database();
-    println!("Database loaded {:?}", db_load_time.elapsed());
-    let analysis_time = Instant::now();
-    let mut num_crates = 0;
-    let mut visited_modules = FxHashSet::default();
-    let mut visit_queue = Vec::new();
-    let mut krates = Crate::all(db);
+/// Need to wrap Snapshot to provide `Clone` impl for `map_with`
-    if randomize {
+struct Snap<DB>(DB);
-        krates.shuffle(&mut thread_rng());
+impl<DB: ParallelDatabase> Clone for Snap<salsa::Snapshot<DB>> {
-    }
+    fn clone(&self) -> Snap<salsa::Snapshot<DB>> {
-    for krate in krates {
+        Snap(self.0.snapshot())
-        let module = krate.root_module(db).expect("crate without root module");
-        let file_id = module.definition_source(db).file_id;
-        let file_id = file_id.original_file(db);
-        let source_root = db.file_source_root(file_id);
-        let source_root = db.source_root(source_root);
-        if !source_root.is_library || with_deps {
-            num_crates += 1;
-            visit_queue.push(module);
-        }
    }
+}
-    if randomize {
+pub struct AnalysisStatsCmd {
-        visit_queue.shuffle(&mut thread_rng());
+    pub randomize: bool,
-    }
+    pub parallel: bool,
+    pub memory_usage: bool,
+    pub only: Option<String>,
+    pub with_deps: bool,
+    pub path: PathBuf,
+    pub load_output_dirs: bool,
+    pub with_proc_macro: bool,
+}
-    println!("Crates in this dir: {}", num_crates);
+impl AnalysisStatsCmd {
-    let mut num_decls = 0;
+    pub fn run(self, verbosity: Verbosity) -> Result<()> {
-    let mut funcs = Vec::new();
+        let mut rng = {
-    while let Some(module) = visit_queue.pop() {
+            let seed = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis() as u64;
-        if visited_modules.insert(module) {
+            Rand32::new(seed)
-            visit_queue.extend(module.children(db));
+        };
-            for decl in module.declarations(db) {
+        let mut db_load_sw = self.stop_watch();
-                num_decls += 1;
+        let (host, vfs) = load_cargo(&self.path, self.load_output_dirs, self.with_proc_macro)?;
-                if let ModuleDef::Function(f) = decl {
+        let db = host.raw_database();
-                    funcs.push(f);
+        eprintln!("Database loaded {}", db_load_sw.elapsed());
-                }
+        let mut analysis_sw = self.stop_watch();
+        let mut num_crates = 0;
+        let mut visited_modules = FxHashSet::default();
+        let mut visit_queue = Vec::new();
+        let mut krates = Crate::all(db);
+        if self.randomize {
+            shuffle(&mut rng, &mut krates);
+        }
+        for krate in krates {
+            let module = krate.root_module(db).expect("crate without root module");
+            let file_id = module.definition_source(db).file_id;
+            let file_id = file_id.original_file(db);
+            let source_root = db.file_source_root(file_id);
+            let source_root = db.source_root(source_root);
+            if !source_root.is_library || self.with_deps {
+                num_crates += 1;
+                visit_queue.push(module);
            }
+        }
+        if self.randomize {
+            shuffle(&mut rng, &mut visit_queue);
+        }
-            for impl_def in module.impl_defs(db) {
+        eprintln!("Crates in this dir: {}", num_crates);
-                for item in impl_def.items(db) {
+        let mut num_decls = 0;
+        let mut funcs = Vec::new();
+        while let Some(module) = visit_queue.pop() {
+            if visited_modules.insert(module) {
+                visit_queue.extend(module.children(db));
+                for decl in module.declarations(db) {
                    num_decls += 1;
-                    if let AssocItem::Function(f) = item {
+                    if let ModuleDef::Function(f) = decl {
                        funcs.push(f);
                    }
                }
+                for impl_def in module.impl_defs(db) {
+                    for item in impl_def.items(db) {
+                        num_decls += 1;
+                        if let AssocItem::Function(f) = item {
+                            funcs.push(f);
+                        }
+                    }
+                }
            }
        }
-    }
+        eprintln!("Total modules found: {}", visited_modules.len());
-    println!("Total modules found: {}", visited_modules.len());
+        eprintln!("Total declarations: {}", num_decls);
-    println!("Total declarations: {}", num_decls);
+        eprintln!("Total functions: {}", funcs.len());
-    println!("Total functions: {}", funcs.len());
+        eprintln!("Item Collection: {}", analysis_sw.elapsed());
-    println!("Item Collection: {:?}, {}", analysis_time.elapsed(), ra_prof::memory_usage());
-    if randomize {
+        if self.randomize {
-        funcs.shuffle(&mut thread_rng());
+            shuffle(&mut rng, &mut funcs);
-    }
+        }
-    let inference_time = Instant::now();
+        let mut bar = match verbosity {
-    let mut bar = match verbosity {
+            Verbosity::Quiet | Verbosity::Spammy => ProgressReport::hidden(),
-        Verbosity::Quiet | Verbosity::Spammy => ProgressReport::hidden(),
+            _ if self.parallel => ProgressReport::hidden(),
-        _ => ProgressReport::new(funcs.len() as u64),
+            _ => ProgressReport::new(funcs.len() as u64),
-    };
+        };
-    bar.tick();
+        if self.parallel {
-    let mut num_exprs = 0;
+            let mut inference_sw = self.stop_watch();
-    let mut num_exprs_unknown = 0;
+            let snap = Snap(db.snapshot());
-    let mut num_exprs_partially_unknown = 0;
+            funcs
-    let mut num_type_mismatches = 0;
+                .par_iter()
-    for f in funcs {
+                .map_with(snap, |snap, &f| {
-        let name = f.name(db);
+                    let f_id = FunctionId::from(f);
-        let full_name = f
+                    snap.0.body(f_id.into());
-            .module(db)
+                    snap.0.infer(f_id.into());
-            .path_to_root(db)
+                })
-            .into_iter()
+                .count();
-            .rev()
+            eprintln!("Parallel Inference: {}", inference_sw.elapsed());
-            .filter_map(|it| it.name(db))
-            .chain(Some(f.name(db)))
-            .join("::");
-        if let Some(only_name) = only {
-            if name.to_string() != only_name && full_name != only_name {
-                continue;
-            }
-        }
-        let mut msg = format!("processing: {}", full_name);
-        if verbosity.is_verbose() {
-            let src = f.source(db);
-            let original_file = src.file_id.original_file(db);
-            let path = vfs.file_path(original_file);
-            let syntax_range = src.value.syntax().text_range();
-            format_to!(msg, " ({} {:?})", path, syntax_range);
        }
-        if verbosity.is_spammy() {
-            bar.println(msg.to_string());
+        let mut inference_sw = self.stop_watch();
-        }
+        bar.tick();
-        bar.set_message(&msg);
+        let mut num_exprs = 0;
-        let f_id = FunctionId::from(f);
+        let mut num_exprs_unknown = 0;
-        let body = db.body(f_id.into());
+        let mut num_exprs_partially_unknown = 0;
-        let inference_result = db.infer(f_id.into());
+        let mut num_type_mismatches = 0;
-        let (previous_exprs, previous_unknown, previous_partially_unknown) =
+        for f in funcs {
-            (num_exprs, num_exprs_unknown, num_exprs_partially_unknown);
+            let name = f.name(db);
-        for (expr_id, _) in body.exprs.iter() {
+            let full_name = f
-            let ty = &inference_result[expr_id];
+                .module(db)
-            num_exprs += 1;
+                .path_to_root(db)
-            if let Ty::Unknown = ty {
+                .into_iter()
-                num_exprs_unknown += 1;
+                .rev()
-            } else {
+                .filter_map(|it| it.name(db))
-                let mut is_partially_unknown = false;
+                .chain(Some(f.name(db)))
-                ty.walk(&mut |ty| {
+                .join("::");
-                    if let Ty::Unknown = ty {
+            if let Some(only_name) = self.only.as_deref() {
-                        is_partially_unknown = true;
+                if name.to_string() != only_name && full_name != only_name {
-                    }
+                    continue;
-                });
-                if is_partially_unknown {
-                    num_exprs_partially_unknown += 1;
                }
            }
-            if only.is_some() && verbosity.is_spammy() {
+            let mut msg = format!("processing: {}", full_name);
-                // in super-verbose mode for just one function, we print every single expression
+            if verbosity.is_verbose() {
-                let (_, sm) = db.body_with_source_map(f_id.into());
+                let src = f.source(db);
-                let src = sm.expr_syntax(expr_id);
+                let original_file = src.file_id.original_file(db);
-                if let Ok(src) = src {
+                let path = vfs.file_path(original_file);
-                    let node = {
+                let syntax_range = src.value.syntax().text_range();
-                        let root = db.parse_or_expand(src.file_id).unwrap();
+                format_to!(msg, " ({} {:?})", path, syntax_range);
-                        src.value.to_node(&root)
+            }
-                    };
+            if verbosity.is_spammy() {
-                    let original_file = src.file_id.original_file(db);
+                bar.println(msg.to_string());
-                    let line_index = host.analysis().file_line_index(original_file).unwrap();
+            }
-                    let text_range = node.syntax().text_range();
+            bar.set_message(&msg);
-                    let (start, end) = (
+            let f_id = FunctionId::from(f);
-                        line_index.line_col(text_range.start()),
+            let body = db.body(f_id.into());
-                        line_index.line_col(text_range.end()),
+            let inference_result = db.infer(f_id.into());
-                    );
+            let (previous_exprs, previous_unknown, previous_partially_unknown) =
-                    bar.println(format!(
+                (num_exprs, num_exprs_unknown, num_exprs_partially_unknown);
-                        "{}:{}-{}:{}: {}",
+            for (expr_id, _) in body.exprs.iter() {
-                        start.line + 1,
+                let ty = &inference_result[expr_id];
-                        start.col_utf16,
+                num_exprs += 1;
-                        end.line + 1,
+                if let Ty::Unknown = ty {
-                        end.col_utf16,
+                    num_exprs_unknown += 1;
-                        ty.display(db)
-                    ));
                } else {
-                    bar.println(format!("unknown location: {}", ty.display(db)));
+                    let mut is_partially_unknown = false;
+                    ty.walk(&mut |ty| {
+                        if let Ty::Unknown = ty {
+                            is_partially_unknown = true;
+                        }
+                    });
+                    if is_partially_unknown {
+                        num_exprs_partially_unknown += 1;
+                    }
                }
-            }
+                if self.only.is_some() && verbosity.is_spammy() {
-            if let Some(mismatch) = inference_result.type_mismatch_for_expr(expr_id) {
+                    // in super-verbose mode for just one function, we print every single expression
-                num_type_mismatches += 1;
-                if verbosity.is_verbose() {
                    let (_, sm) = db.body_with_source_map(f_id.into());
                    let src = sm.expr_syntax(expr_id);
                    if let Ok(src) = src {
-                        // FIXME: it might be nice to have a function (on Analysis?) that goes from Source<T> -> (LineCol, LineCol) directly
+                        let node = {
-                        // But also, we should just turn the type mismatches into diagnostics and provide these
+                            let root = db.parse_or_expand(src.file_id).unwrap();
-                        let root = db.parse_or_expand(src.file_id).unwrap();
+                            src.value.to_node(&root)
-                        let node = src.map(|e| e.to_node(&root).syntax().clone());
+                        };
-                        let original_range = original_range(db, node.as_ref());
+                        let original_file = src.file_id.original_file(db);
-                        let path = vfs.file_path(original_range.file_id);
+                        let line_index = host.analysis().file_line_index(original_file).unwrap();
-                        let line_index =
+                        let text_range = node.syntax().text_range();
-                            host.analysis().file_line_index(original_range.file_id).unwrap();
-                        let text_range = original_range.range;
                        let (start, end) = (
                            line_index.line_col(text_range.start()),
                            line_index.line_col(text_range.end()),
                        );
                        bar.println(format!(
-                            "{} {}:{}-{}:{}: Expected {}, got {}",
+                            "{}:{}-{}:{}: {}",
-                            path,
                            start.line + 1,
                            start.col_utf16,
                            end.line + 1,
                            end.col_utf16,
-                            mismatch.expected.display(db),
+                            ty.display(db)
-                            mismatch.actual.display(db)
                        ));
                    } else {
-                        bar.println(format!(
+                        bar.println(format!("unknown location: {}", ty.display(db)));
-                            "{}: Expected {}, got {}",
-                            name,
-                            mismatch.expected.display(db),
-                            mismatch.actual.display(db)
-                        ));
                    }
                }
+                if let Some(mismatch) = inference_result.type_mismatch_for_expr(expr_id) {
+                    num_type_mismatches += 1;
+                    if verbosity.is_verbose() {
+                        let (_, sm) = db.body_with_source_map(f_id.into());
+                        let src = sm.expr_syntax(expr_id);
+                        if let Ok(src) = src {
+                            // FIXME: it might be nice to have a function (on Analysis?) that goes from Source<T> -> (LineCol, LineCol) directly
+                            // But also, we should just turn the type mismatches into diagnostics and provide these
+                            let root = db.parse_or_expand(src.file_id).unwrap();
+                            let node = src.map(|e| e.to_node(&root).syntax().clone());
+                            let original_range = original_range(db, node.as_ref());
+                            let path = vfs.file_path(original_range.file_id);
+                            let line_index =
+                                host.analysis().file_line_index(original_range.file_id).unwrap();
+                            let text_range = original_range.range;
+                            let (start, end) = (
+                                line_index.line_col(text_range.start()),
+                                line_index.line_col(text_range.end()),
+                            );
+                            bar.println(format!(
+                                "{} {}:{}-{}:{}: Expected {}, got {}",
+                                path,
+                                start.line + 1,
+                                start.col_utf16,
+                                end.line + 1,
+                                end.col_utf16,
+                                mismatch.expected.display(db),
+                                mismatch.actual.display(db)
+                            ));
+                        } else {
+                            bar.println(format!(
+                                "{}: Expected {}, got {}",
+                                name,
+                                mismatch.expected.display(db),
+                                mismatch.actual.display(db)
+                            ));
+                        }
+                    }
+                }
+            }
+            if verbosity.is_spammy() {
+                bar.println(format!(
+                    "In {}: {} exprs, {} unknown, {} partial",
+                    full_name,
+                    num_exprs - previous_exprs,
+                    num_exprs_unknown - previous_unknown,
+                    num_exprs_partially_unknown - previous_partially_unknown
+                ));
            }
+            bar.inc(1);
        }
-        if verbosity.is_spammy() {
+        bar.finish_and_clear();
-            bar.println(format!(
+        eprintln!("Total expressions: {}", num_exprs);
-                "In {}: {} exprs, {} unknown, {} partial",
+        eprintln!(
-                full_name,
+            "Expressions of unknown type: {} ({}%)",
-                num_exprs - previous_exprs,
+            num_exprs_unknown,
-                num_exprs_unknown - previous_unknown,
+            if num_exprs > 0 { num_exprs_unknown * 100 / num_exprs } else { 100 }
-                num_exprs_partially_unknown - previous_partially_unknown
+        );
-            ));
+        report_metric("unknown type", num_exprs_unknown, "#");
+        eprintln!(
+            "Expressions of partially unknown type: {} ({}%)",
+            num_exprs_partially_unknown,
+            if num_exprs > 0 { num_exprs_partially_unknown * 100 / num_exprs } else { 100 }
+        );
+        eprintln!("Type mismatches: {}", num_type_mismatches);
+        report_metric("type mismatches", num_type_mismatches, "#");
+        eprintln!("Inference: {}", inference_sw.elapsed());
+        let total_span = analysis_sw.elapsed();
+        eprintln!("Total: {}", total_span);
+        report_metric("total time", total_span.time.as_millis() as u64, "ms");
+        if let Some(instructions) = total_span.instructions {
+            report_metric("total instructions", instructions, "#instr");
+        }
+        if let Some(memory) = total_span.memory {
+            report_metric("total memory", memory.allocated.megabytes() as u64, "MB");
        }
-        bar.inc(1);
-    }
-    bar.finish_and_clear();
-    println!("Total expressions: {}", num_exprs);
-    println!(
-        "Expressions of unknown type: {} ({}%)",
-        num_exprs_unknown,
-        if num_exprs > 0 { num_exprs_unknown * 100 / num_exprs } else { 100 }
-    );
-    println!(
-        "Expressions of partially unknown type: {} ({}%)",
-        num_exprs_partially_unknown,
-        if num_exprs > 0 { num_exprs_partially_unknown * 100 / num_exprs } else { 100 }
-    );
-    println!("Type mismatches: {}", num_type_mismatches);
-    println!("Inference: {:?}, {}", inference_time.elapsed(), ra_prof::memory_usage());
-    println!("Total: {:?}, {}", analysis_time.elapsed(), ra_prof::memory_usage());
-    if memory_usage {
+        if self.memory_usage {
-        for (name, bytes) in host.per_query_memory_usage() {
+            print_memory_usage(host, vfs);
-            println!("{:>8} {}", bytes, name)
        }
-        let before = ra_prof::memory_usage();
-        drop(host);
+        Ok(())
-        println!("leftover: {}", before.allocated - ra_prof::memory_usage().allocated)
    }
-    Ok(())
+    fn stop_watch(&self) -> StopWatch {
+        StopWatch::start().memory(self.memory_usage)
+    }
+}
+fn shuffle<T>(rng: &mut Rand32, slice: &mut [T]) {
+    for i in 0..slice.len() {
+        randomize_first(rng, &mut slice[i..]);
+    }
+    fn randomize_first<T>(rng: &mut Rand32, slice: &mut [T]) {
+        assert!(!slice.is_empty());
+        let idx = rng.rand_range(0..slice.len() as u32) as usize;
+        slice.swap(0, idx);
+    }
 }
diff --git a/crates/rust-analyzer/src/cli/diagnostics.rs b/crates/rust-analyzer/src/cli/diagnostics.rs
index 6f3c1c1f9..4ac8c8772 100644
--- a/crates/rust-analyzer/src/cli/diagnostics.rs
+++ b/crates/rust-analyzer/src/cli/diagnostics.rs
@@ -47,7 +47,7 @@ pub fn diagnostics(
                String::from("unknown")
            };
            println!("processing crate: {}, module: {}", crate_name, _vfs.file_path(file_id));
-            for diagnostic in analysis.diagnostics(file_id).unwrap() {
+            for diagnostic in analysis.diagnostics(file_id, true).unwrap() {
                if matches!(diagnostic.severity, Severity::Error) {
                    found_error = true;
                }
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index d8677c231..a43bf2244 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -4,10 +4,10 @@ use std::{path::Path, sync::Arc};
 use anyhow::Result;
 use crossbeam_channel::{unbounded, Receiver};
-use ra_db::{AbsPathBuf, CrateGraph};
+use ra_db::CrateGraph;
 use ra_ide::{AnalysisChange, AnalysisHost};
 use ra_project_model::{CargoConfig, ProcMacroClient, ProjectManifest, ProjectWorkspace};
-use vfs::{loader::Handle, AbsPath};
+use vfs::{loader::Handle, AbsPath, AbsPathBuf};
 use crate::reload::{ProjectFolders, SourceRootConfig};
diff --git a/crates/rust-analyzer/src/cli/ssr.rs b/crates/rust-analyzer/src/cli/ssr.rs
index a5265ac15..194bec008 100644
--- a/crates/rust-analyzer/src/cli/ssr.rs
+++ b/crates/rust-analyzer/src/cli/ssr.rs
@@ -1,27 +1,17 @@
 //! Applies structured search replace rules from the command line.
 use crate::cli::{load_cargo::load_cargo, Result};
-use ra_ide::SourceFileEdit;
+use ra_ssr::{MatchFinder, SsrPattern, SsrRule};
-use ra_ssr::{MatchFinder, SsrRule};
 pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> {
    use ra_db::SourceDatabaseExt;
-    use ra_ide_db::symbol_index::SymbolsDatabase;
    let (host, vfs) = load_cargo(&std::env::current_dir()?, true, true)?;
    let db = host.raw_database();
-    let mut match_finder = MatchFinder::new(db);
+    let mut match_finder = MatchFinder::at_first_file(db)?;
    for rule in rules {
-        match_finder.add_rule(rule);
+        match_finder.add_rule(rule)?;
-    }
-    let mut edits = Vec::new();
-    for &root in db.local_roots().iter() {
-        let sr = db.source_root(root);
-        for file_id in sr.iter() {
-            if let Some(edit) = match_finder.edits_for_file(file_id) {
-                edits.push(SourceFileEdit { file_id, edit });
-            }
-        }
    }
+    let edits = match_finder.edits();
    for edit in edits {
        if let Some(path) = vfs.file_path(edit.file_id).as_path() {
            let mut contents = db.file_text(edit.file_id).to_string();
@@ -31,3 +21,34 @@ pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> {
    }
    Ok(())
 }
+/// Searches for `patterns`, printing debug information for any nodes whose text exactly matches
+/// `debug_snippet`. This is intended for debugging and probably isn't in it's current form useful
+/// for much else.
+pub fn search_for_patterns(patterns: Vec<SsrPattern>, debug_snippet: Option<String>) -> Result<()> {
+    use ra_db::SourceDatabaseExt;
+    use ra_ide_db::symbol_index::SymbolsDatabase;
+    let (host, _vfs) = load_cargo(&std::env::current_dir()?, true, true)?;
+    let db = host.raw_database();
+    let mut match_finder = MatchFinder::at_first_file(db)?;
+    for pattern in patterns {
+        match_finder.add_search_pattern(pattern)?;
+    }
+    if let Some(debug_snippet) = &debug_snippet {
+        for &root in db.local_roots().iter() {
+            let sr = db.source_root(root);
+            for file_id in sr.iter() {
+                for debug_info in match_finder.debug_where_text_equal(file_id, debug_snippet) {
+                    println!("{:#?}", debug_info);
+                }
+            }
+        }
+    } else {
+        for m in match_finder.matches().flattened().matches {
+            // We could possibly at some point do something more useful than just printing
+            // the matched text. For now though, that's the easiest thing to do.
+            println!("{}", m.matched_text());
+        }
+    }
+    Ok(())
+}
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 6b17ce18b..70b4512d0 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -9,25 +9,28 @@
 use std::{ffi::OsString, path::PathBuf};
-use crate::diagnostics::DiagnosticsConfig;
 use flycheck::FlycheckConfig;
 use lsp_types::ClientCapabilities;
-use ra_db::AbsPathBuf;
 use ra_ide::{AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig};
 use ra_project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
 use serde::Deserialize;
+use vfs::AbsPathBuf;
+use crate::diagnostics::DiagnosticsConfig;
 #[derive(Debug, Clone)]
 pub struct Config {
    pub client_caps: ClientCapsConfig,
    pub publish_diagnostics: bool,
+    pub experimental_diagnostics: bool,
    pub diagnostics: DiagnosticsConfig,
    pub lru_capacity: Option<usize>,
    pub proc_macro_srv: Option<(PathBuf, Vec<OsString>)>,
    pub files: FilesConfig,
    pub notifications: NotificationsConfig,
+    pub cargo_autoreload: bool,
    pub cargo: CargoConfig,
    pub rustfmt: RustfmtConfig,
    pub flycheck: Option<FlycheckConfig>,
@@ -44,7 +47,7 @@ pub struct Config {
    pub root_path: AbsPathBuf,
 }
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum LinkedProject {
    ProjectManifest(ProjectManifest),
    InlineJsonProject(ProjectJson),
@@ -66,20 +69,20 @@ impl From<ProjectJson> for LinkedProject {
 pub struct LensConfig {
    pub run: bool,
    pub debug: bool,
-    pub impementations: bool,
+    pub implementations: bool,
 }
 impl Default for LensConfig {
    fn default() -> Self {
-        Self { run: true, debug: true, impementations: true }
+        Self { run: true, debug: true, implementations: true }
    }
 }
 impl LensConfig {
-    pub const NO_LENS: LensConfig = Self { run: false, debug: false, impementations: false };
+    pub const NO_LENS: LensConfig = Self { run: false, debug: false, implementations: false };
    pub fn any(&self) -> bool {
-        self.impementations || self.runnable()
+        self.implementations || self.runnable()
    }
    pub fn none(&self) -> bool {
@@ -110,14 +113,8 @@ pub struct NotificationsConfig {
 #[derive(Debug, Clone)]
 pub enum RustfmtConfig {
-    Rustfmt {
+    Rustfmt { extra_args: Vec<String> },
-        extra_args: Vec<String>,
+    CustomCommand { command: String, args: Vec<String> },
-    },
-    #[allow(unused)]
-    CustomCommand {
-        command: String,
-        args: Vec<String>,
-    },
 }
 #[derive(Debug, Clone, Default)]
@@ -130,6 +127,8 @@ pub struct ClientCapsConfig {
    pub code_action_group: bool,
    pub resolve_code_action: bool,
    pub hover_actions: bool,
+    pub status_notification: bool,
+    pub signature_help_label_offsets: bool,
 }
 impl Config {
@@ -139,16 +138,20 @@ impl Config {
            with_sysroot: true,
            publish_diagnostics: true,
+            experimental_diagnostics: true,
            diagnostics: DiagnosticsConfig::default(),
            lru_capacity: None,
            proc_macro_srv: None,
            files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() },
            notifications: NotificationsConfig { cargo_toml_not_found: true },
+            cargo_autoreload: true,
            cargo: CargoConfig::default(),
            rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
            flycheck: Some(FlycheckConfig::CargoCommand {
                command: "check".to_string(),
+                target_triple: None,
+                no_default_features: false,
                all_targets: true,
                all_features: false,
                extra_args: Vec::new(),
@@ -176,144 +179,121 @@ impl Config {
        }
    }
-    #[rustfmt::skip]
+    pub fn update(&mut self, json: serde_json::Value) {
-    pub fn update(&mut self, value: &serde_json::Value) {
+        log::info!("Config::update({:#})", json);
-        log::info!("Config::update({:#})", value);
+        if json.is_null() || json.as_object().map_or(false, |it| it.is_empty()) {
-        let client_caps = self.client_caps.clone();
+            return;
-        *self = Config::new(self.root_path.clone());
-        self.client_caps = client_caps;
-        set(value, "/withSysroot", &mut self.with_sysroot);
-        set(value, "/diagnostics/enable", &mut self.publish_diagnostics);
-        set(value, "/diagnostics/warningsAsInfo", &mut self.diagnostics.warnings_as_info);
-        set(value, "/diagnostics/warningsAsHint", &mut self.diagnostics.warnings_as_hint);
-        set(value, "/lruCapacity", &mut self.lru_capacity);
-        self.files.watcher = match get(value, "/files/watcher") {
-            Some("client") => FilesWatcher::Client,
-            Some("notify") | _ => FilesWatcher::Notify
-        };
-        set(value, "/notifications/cargoTomlNotFound", &mut self.notifications.cargo_toml_not_found);
-        set(value, "/cargo/noDefaultFeatures", &mut self.cargo.no_default_features);
-        set(value, "/cargo/allFeatures", &mut self.cargo.all_features);
-        set(value, "/cargo/features", &mut self.cargo.features);
-        set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
-        set(value, "/cargo/target", &mut self.cargo.target);
-        match get(value, "/procMacro/enable") {
-            Some(true) => {
-                if let Ok(path) = std::env::current_exe() {
-                    self.proc_macro_srv = Some((path, vec!["proc-macro".into()]));
-                }
-            }
-            _ => self.proc_macro_srv = None,
        }
-        match get::<Vec<String>>(value, "/rustfmt/overrideCommand") {
+        let data = ConfigData::from_json(json);
+        self.with_sysroot = data.withSysroot;
+        self.publish_diagnostics = data.diagnostics_enable;
+        self.experimental_diagnostics = data.diagnostics_enableExperimental;
+        self.diagnostics = DiagnosticsConfig {
+            warnings_as_info: data.diagnostics_warningsAsInfo,
+            warnings_as_hint: data.diagnostics_warningsAsHint,
+        };
+        self.lru_capacity = data.lruCapacity;
+        self.files.watcher = match data.files_watcher.as_str() {
+            "notify" => FilesWatcher::Notify,
+            "client" | _ => FilesWatcher::Client,
+        };
+        self.notifications =
+            NotificationsConfig { cargo_toml_not_found: data.notifications_cargoTomlNotFound };
+        self.cargo_autoreload = data.cargo_autoreload;
+        self.cargo = CargoConfig {
+            no_default_features: data.cargo_noDefaultFeatures,
+            all_features: data.cargo_allFeatures,
+            features: data.cargo_features.clone(),
+            load_out_dirs_from_check: data.cargo_loadOutDirsFromCheck,
+            target: data.cargo_target.clone(),
+        };
+        self.proc_macro_srv = if data.procMacro_enable {
+            std::env::current_exe().ok().map(|path| (path, vec!["proc-macro".into()]))
+        } else {
+            None
+        };
+        self.rustfmt = match data.rustfmt_overrideCommand {
            Some(mut args) if !args.is_empty() => {
                let command = args.remove(0);
-                self.rustfmt = RustfmtConfig::CustomCommand {
+                RustfmtConfig::CustomCommand { command, args }
-                    command,
-                    args,
-                }
-            }
-            _ => {
-                if let RustfmtConfig::Rustfmt { extra_args } = &mut self.rustfmt {
-                    set(value, "/rustfmt/extraArgs", extra_args);
-                }
            }
+            Some(_) | None => RustfmtConfig::Rustfmt { extra_args: data.rustfmt_extraArgs },
        };
-        if let Some(false) = get(value, "/checkOnSave/enable") {
+        self.flycheck = if data.checkOnSave_enable {
-            // check is disabled
+            let flycheck_config = match data.checkOnSave_overrideCommand {
-            self.flycheck = None;
-        } else {
-            // check is enabled
-            match get::<Vec<String>>(value, "/checkOnSave/overrideCommand") {
-                // first see if the user has completely overridden the command
                Some(mut args) if !args.is_empty() => {
                    let command = args.remove(0);
-                    self.flycheck = Some(FlycheckConfig::CustomCommand {
+                    FlycheckConfig::CustomCommand { command, args }
-                        command,
-                        args,
-                    });
-                }
-                // otherwise configure command customizations
-                _ => {
-                    if let Some(FlycheckConfig::CargoCommand { command, extra_args, all_targets, all_features, features })
-                        = &mut self.flycheck
-                    {
-                        set(value, "/checkOnSave/extraArgs", extra_args);
-                        set(value, "/checkOnSave/command", command);
-                        set(value, "/checkOnSave/allTargets", all_targets);
-                        *all_features = get(value, "/checkOnSave/allFeatures").unwrap_or(self.cargo.all_features);
-                        *features = get(value, "/checkOnSave/features").unwrap_or(self.cargo.features.clone());
-                    }
                }
+                Some(_) | None => FlycheckConfig::CargoCommand {
+                    command: data.checkOnSave_command,
+                    target_triple: data.checkOnSave_target.or(data.cargo_target),
+                    all_targets: data.checkOnSave_allTargets,
+                    no_default_features: data
+                        .checkOnSave_noDefaultFeatures
+                        .unwrap_or(data.cargo_noDefaultFeatures),
+                    all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures),
+                    features: data.checkOnSave_features.unwrap_or(data.cargo_features),
+                    extra_args: data.checkOnSave_extraArgs,
+                },
            };
-        }
+            Some(flycheck_config)
-        set(value, "/inlayHints/typeHints", &mut self.inlay_hints.type_hints);
-        set(value, "/inlayHints/parameterHints", &mut self.inlay_hints.parameter_hints);
-        set(value, "/inlayHints/chainingHints", &mut self.inlay_hints.chaining_hints);
-        set(value, "/inlayHints/maxLength", &mut self.inlay_hints.max_length);
-        set(value, "/completion/postfix/enable", &mut self.completion.enable_postfix_completions);
-        set(value, "/completion/addCallParenthesis", &mut self.completion.add_call_parenthesis);
-        set(value, "/completion/addCallArgumentSnippets", &mut self.completion.add_call_argument_snippets);
-        set(value, "/callInfo/full", &mut self.call_info_full);
-        let mut lens_enabled = true;
-        set(value, "/lens/enable", &mut lens_enabled);
-        if lens_enabled {
-            set(value, "/lens/run", &mut self.lens.run);
-            set(value, "/lens/debug", &mut self.lens.debug);
-            set(value, "/lens/implementations", &mut self.lens.impementations);
        } else {
-            self.lens = LensConfig::NO_LENS;
+            None
-        }
+        };
-        if let Some(linked_projects) = get::<Vec<ManifestOrProjectJson>>(value, "/linkedProjects") {
+        self.inlay_hints = InlayHintsConfig {
-            if !linked_projects.is_empty() {
+            type_hints: data.inlayHints_typeHints,
-                self.linked_projects.clear();
+            parameter_hints: data.inlayHints_parameterHints,
-                for linked_project in linked_projects {
+            chaining_hints: data.inlayHints_chainingHints,
-                    let linked_project = match linked_project {
+            max_length: data.inlayHints_maxLength,
-                        ManifestOrProjectJson::Manifest(it) => {
+        };
-                            let path = self.root_path.join(it);
-                            match ProjectManifest::from_manifest_file(path) {
-                                Ok(it) => it.into(),
-                                Err(_) => continue,
-                            }
-                        }
-                        ManifestOrProjectJson::ProjectJson(it) => ProjectJson::new(&self.root_path, it).into(),
-                    };
-                    self.linked_projects.push(linked_project);
-                }
-            }
-        }
-        let mut use_hover_actions = false;
+        self.completion.enable_postfix_completions = data.completion_postfix_enable;
-        set(value, "/hoverActions/enable", &mut use_hover_actions);
+        self.completion.add_call_parenthesis = data.completion_addCallParenthesis;
-        if use_hover_actions {
+        self.completion.add_call_argument_snippets = data.completion_addCallArgumentSnippets;
-            set(value, "/hoverActions/implementations", &mut self.hover.implementations);
-            set(value, "/hoverActions/run", &mut self.hover.run);
-            set(value, "/hoverActions/debug", &mut self.hover.debug);
-            set(value, "/hoverActions/gotoTypeDef", &mut self.hover.goto_type_def);
-        } else {
-            self.hover = HoverConfig::NO_ACTIONS;
-        }
-        log::info!("Config::update() = {:#?}", self);
+        self.call_info_full = data.callInfo_full;
-        fn get<'a, T: Deserialize<'a>>(value: &'a serde_json::Value, pointer: &str) -> Option<T> {
+        self.lens = LensConfig {
-            value.pointer(pointer).and_then(|it| T::deserialize(it).ok())
+            run: data.lens_enable && data.lens_run,
-        }
+            debug: data.lens_enable && data.lens_debug,
+            implementations: data.lens_enable && data.lens_implementations,
+        };
-        fn set<'a, T: Deserialize<'a>>(value: &'a serde_json::Value, pointer: &str, slot: &mut T) {
+        if !data.linkedProjects.is_empty() {
-            if let Some(new_value) = get(value, pointer) {
+            self.linked_projects.clear();
-                *slot = new_value
+            for linked_project in data.linkedProjects {
+                let linked_project = match linked_project {
+                    ManifestOrProjectJson::Manifest(it) => {
+                        let path = self.root_path.join(it);
+                        match ProjectManifest::from_manifest_file(path) {
+                            Ok(it) => it.into(),
+                            Err(_) => continue,
+                        }
+                    }
+                    ManifestOrProjectJson::ProjectJson(it) => {
+                        ProjectJson::new(&self.root_path, it).into()
+                    }
+                };
+                self.linked_projects.push(linked_project);
            }
        }
+        self.hover = HoverConfig {
+            implementations: data.hoverActions_enable && data.hoverActions_implementations,
+            run: data.hoverActions_enable && data.hoverActions_run,
+            debug: data.hoverActions_enable && data.hoverActions_debug,
+            goto_type_def: data.hoverActions_enable && data.hoverActions_gotoTypeDef,
+        };
+        log::info!("Config::update() = {:#?}", self);
    }
    pub fn update_caps(&mut self, caps: &ClientCapabilities) {
@@ -337,6 +317,15 @@ impl Config {
            {
                self.client_caps.code_action_literals = value;
            }
+            if let Some(value) = doc_caps
+                .signature_help
+                .as_ref()
+                .and_then(|it| it.signature_information.as_ref())
+                .and_then(|it| it.parameter_information.as_ref())
+                .and_then(|it| it.label_offset_support)
+            {
+                self.client_caps.signature_help_label_offsets = value;
+            }
            self.completion.allow_snippets(false);
            if let Some(completion) = &doc_caps.completion {
@@ -365,6 +354,7 @@ impl Config {
            self.client_caps.code_action_group = get_bool("codeActionGroup");
            self.client_caps.resolve_code_action = get_bool("resolveCodeAction");
            self.client_caps.hover_actions = get_bool("hoverActions");
+            self.client_caps.status_notification = get_bool("statusNotification");
        }
    }
 }
@@ -375,3 +365,84 @@ enum ManifestOrProjectJson {
    Manifest(PathBuf),
    ProjectJson(ProjectJsonData),
 }
+macro_rules! config_data {
+    (struct $name:ident { $($field:ident: $ty:ty = $default:expr,)*}) => {
+        #[allow(non_snake_case)]
+        struct $name { $($field: $ty,)* }
+        impl $name {
+            fn from_json(mut json: serde_json::Value) -> $name {
+                $name {$(
+                    $field: {
+                        let pointer = stringify!($field).replace('_', "/");
+                        let pointer = format!("/{}", pointer);
+                        json.pointer_mut(&pointer)
+                            .and_then(|it| serde_json::from_value(it.take()).ok())
+                            .unwrap_or($default)
+                    },
+                )*}
+            }
+        }
+    };
+}
+config_data! {
+    struct ConfigData {
+        callInfo_full: bool = true,
+        cargo_autoreload: bool           = true,
+        cargo_allFeatures: bool          = false,
+        cargo_features: Vec<String>      = Vec::new(),
+        cargo_loadOutDirsFromCheck: bool = false,
+        cargo_noDefaultFeatures: bool    = false,
+        cargo_target: Option<String>     = None,
+        checkOnSave_enable: bool                         = false,
+        checkOnSave_allFeatures: Option<bool>            = None,
+        checkOnSave_allTargets: bool                     = true,
+        checkOnSave_command: String                      = "check".into(),
+        checkOnSave_noDefaultFeatures: Option<bool>      = None,
+        checkOnSave_target: Option<String>               = None,
+        checkOnSave_extraArgs: Vec<String>               = Vec::new(),
+        checkOnSave_features: Option<Vec<String>>        = None,
+        checkOnSave_overrideCommand: Option<Vec<String>> = None,
+        completion_addCallArgumentSnippets: bool = true,
+        completion_addCallParenthesis: bool      = true,
+        completion_postfix_enable: bool          = true,
+        diagnostics_enable: bool                = true,
+        diagnostics_enableExperimental: bool    = true,
+        diagnostics_warningsAsHint: Vec<String> = Vec::new(),
+        diagnostics_warningsAsInfo: Vec<String> = Vec::new(),
+        files_watcher: String = "client".into(),
+        hoverActions_debug: bool           = true,
+        hoverActions_enable: bool          = true,
+        hoverActions_gotoTypeDef: bool     = true,
+        hoverActions_implementations: bool = true,
+        hoverActions_run: bool             = true,
+        inlayHints_chainingHints: bool      = true,
+        inlayHints_maxLength: Option<usize> = None,
+        inlayHints_parameterHints: bool     = true,
+        inlayHints_typeHints: bool          = true,
+        lens_debug: bool           = true,
+        lens_enable: bool          = true,
+        lens_implementations: bool = true,
+        lens_run: bool             = true,
+        linkedProjects: Vec<ManifestOrProjectJson> = Vec::new(),
+        lruCapacity: Option<usize>                 = None,
+        notifications_cargoTomlNotFound: bool      = true,
+        procMacro_enable: bool                     = false,
+        rustfmt_extraArgs: Vec<String>               = Vec::new(),
+        rustfmt_overrideCommand: Option<Vec<String>> = None,
+        withSysroot: bool = true,
+    }
+}
diff --git a/crates/rust-analyzer/src/diagnostics.rs b/crates/rust-analyzer/src/diagnostics.rs
index b46281c98..d24c55cee 100644
--- a/crates/rust-analyzer/src/diagnostics.rs
+++ b/crates/rust-analyzer/src/diagnostics.rs
@@ -18,7 +18,9 @@ pub struct DiagnosticsConfig {
 #[derive(Debug, Default, Clone)]
 pub(crate) struct DiagnosticCollection {
+    // FIXME: should be FxHashMap<FileId, Vec<ra_id::Diagnostic>>
    pub(crate) native: FxHashMap<FileId, Vec<lsp_types::Diagnostic>>,
+    // FIXME: should be Vec<flycheck::Diagnostic>
    pub(crate) check: FxHashMap<FileId, Vec<lsp_types::Diagnostic>>,
    pub(crate) check_fixes: CheckFixes,
    changes: FxHashSet<FileId>,
diff --git a/crates/rust-analyzer/src/diagnostics/to_proto.rs b/crates/rust-analyzer/src/diagnostics/to_proto.rs
index 3eed118a9..97f331352 100644
--- a/crates/rust-analyzer/src/diagnostics/to_proto.rs
+++ b/crates/rust-analyzer/src/diagnostics/to_proto.rs
@@ -2,11 +2,7 @@
 //! `cargo check` json format to the LSP diagnostic format.
 use std::{collections::HashMap, path::Path};
-use flycheck::{Applicability, DiagnosticLevel, DiagnosticSpan, DiagnosticSpanMacroExpansion};
+use flycheck::{Applicability, DiagnosticLevel, DiagnosticSpan};
-use lsp_types::{
-    Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Location,
-    NumberOrString, Position, Range, TextEdit, Url,
-};
 use stdx::format_to;
 use crate::{lsp_ext, to_proto::url_from_abs_path};
@@ -14,22 +10,25 @@ use crate::{lsp_ext, to_proto::url_from_abs_path};
 use super::DiagnosticsConfig;
 /// Determines the LSP severity from a diagnostic
-fn map_diagnostic_to_severity(
+fn diagnostic_severity(
    config: &DiagnosticsConfig,
-    val: &flycheck::Diagnostic,
+    level: flycheck::DiagnosticLevel,
-) -> Option<DiagnosticSeverity> {
+    code: Option<flycheck::DiagnosticCode>,
-    let res = match val.level {
+) -> Option<lsp_types::DiagnosticSeverity> {
-        DiagnosticLevel::Ice => DiagnosticSeverity::Error,
+    let res = match level {
-        DiagnosticLevel::Error => DiagnosticSeverity::Error,
+        DiagnosticLevel::Ice => lsp_types::DiagnosticSeverity::Error,
-        DiagnosticLevel::Warning => match &val.code {
+        DiagnosticLevel::Error => lsp_types::DiagnosticSeverity::Error,
-            Some(code) if config.warnings_as_hint.contains(&code.code) => DiagnosticSeverity::Hint,
+        DiagnosticLevel::Warning => match &code {
+            Some(code) if config.warnings_as_hint.contains(&code.code) => {
+                lsp_types::DiagnosticSeverity::Hint
+            }
            Some(code) if config.warnings_as_info.contains(&code.code) => {
-                DiagnosticSeverity::Information
+                lsp_types::DiagnosticSeverity::Information
            }
-            _ => DiagnosticSeverity::Warning,
+            _ => lsp_types::DiagnosticSeverity::Warning,
        },
-        DiagnosticLevel::Note => DiagnosticSeverity::Information,
+        DiagnosticLevel::Note => lsp_types::DiagnosticSeverity::Information,
-        DiagnosticLevel::Help => DiagnosticSeverity::Hint,
+        DiagnosticLevel::Help => lsp_types::DiagnosticSeverity::Hint,
        DiagnosticLevel::Unknown => return None,
    };
    Some(res)
@@ -40,90 +39,50 @@ fn is_from_macro(file_name: &str) -> bool {
    file_name.starts_with('<') && file_name.ends_with('>')
 }
-/// Converts a Rust macro span to a LSP location recursively
-fn map_macro_span_to_location(
-    span_macro: &DiagnosticSpanMacroExpansion,
-    workspace_root: &Path,
-) -> Option<Location> {
-    if !is_from_macro(&span_macro.span.file_name) {
-        return Some(map_span_to_location(&span_macro.span, workspace_root));
-    }
-    if let Some(expansion) = &span_macro.span.expansion {
-        return map_macro_span_to_location(&expansion, workspace_root);
-    }
-    None
-}
 /// Converts a Rust span to a LSP location, resolving macro expansion site if neccesary
-fn map_span_to_location(span: &DiagnosticSpan, workspace_root: &Path) -> Location {
+fn location(workspace_root: &Path, span: &DiagnosticSpan) -> lsp_types::Location {
-    if span.expansion.is_some() {
+    let mut span = span.clone();
-        let expansion = span.expansion.as_ref().unwrap();
+    while let Some(expansion) = span.expansion {
-        if let Some(macro_range) = map_macro_span_to_location(&expansion, workspace_root) {
+        span = expansion.span;
-            return macro_range;
-        }
    }
+    return location_naive(workspace_root, &span);
-    map_span_to_location_naive(span, workspace_root)
 }
 /// Converts a Rust span to a LSP location
-fn map_span_to_location_naive(span: &DiagnosticSpan, workspace_root: &Path) -> Location {
+fn location_naive(workspace_root: &Path, span: &DiagnosticSpan) -> lsp_types::Location {
-    let mut file_name = workspace_root.to_path_buf();
+    let file_name = workspace_root.join(&span.file_name);
-    file_name.push(&span.file_name);
    let uri = url_from_abs_path(&file_name);
    // FIXME: this doesn't handle UTF16 offsets correctly
-    let range = Range::new(
+    let range = lsp_types::Range::new(
-        Position::new(span.line_start as u64 - 1, span.column_start as u64 - 1),
+        lsp_types::Position::new(span.line_start as u64 - 1, span.column_start as u64 - 1),
-        Position::new(span.line_end as u64 - 1, span.column_end as u64 - 1),
+        lsp_types::Position::new(span.line_end as u64 - 1, span.column_end as u64 - 1),
    );
-    Location { uri, range }
+    lsp_types::Location { uri, range }
 }
-/// Converts a secondary Rust span to a LSP related information
+/// Converts a secondary Rust span to a LSP related inflocation(ormation
 ///
 /// If the span is unlabelled this will return `None`.
-fn map_secondary_span_to_related(
+fn diagnostic_related_information(
-    span: &DiagnosticSpan,
    workspace_root: &Path,
-) -> Option<DiagnosticRelatedInformation> {
+    span: &DiagnosticSpan,
+) -> Option<lsp_types::DiagnosticRelatedInformation> {
    let message = span.label.clone()?;
-    let location = map_span_to_location(span, workspace_root);
+    let location = location(workspace_root, span);
-    Some(DiagnosticRelatedInformation { location, message })
+    Some(lsp_types::DiagnosticRelatedInformation { location, message })
-}
-/// Determines if diagnostic is related to unused code
-fn is_unused_or_unnecessary(rd: &flycheck::Diagnostic) -> bool {
-    match &rd.code {
-        Some(code) => match code.code.as_str() {
-            "dead_code" | "unknown_lints" | "unreachable_code" | "unused_attributes"
-            | "unused_imports" | "unused_macros" | "unused_variables" => true,
-            _ => false,
-        },
-        None => false,
-    }
-}
-/// Determines if diagnostic is related to deprecated code
-fn is_deprecated(rd: &flycheck::Diagnostic) -> bool {
-    match &rd.code {
-        Some(code) => code.code.as_str() == "deprecated",
-        None => false,
-    }
 }
 enum MappedRustChildDiagnostic {
-    Related(DiagnosticRelatedInformation),
+    Related(lsp_types::DiagnosticRelatedInformation),
    SuggestedFix(lsp_ext::CodeAction),
    MessageLine(String),
 }
 fn map_rust_child_diagnostic(
-    rd: &flycheck::Diagnostic,
    workspace_root: &Path,
+    rd: &flycheck::Diagnostic,
 ) -> MappedRustChildDiagnostic {
    let spans: Vec<&DiagnosticSpan> = rd.spans.iter().filter(|s| s.is_primary).collect();
    if spans.is_empty() {
@@ -132,21 +91,20 @@ fn map_rust_child_diagnostic(
        return MappedRustChildDiagnostic::MessageLine(rd.message.clone());
    }
-    let mut edit_map: HashMap<Url, Vec<TextEdit>> = HashMap::new();
+    let mut edit_map: HashMap<lsp_types::Url, Vec<lsp_types::TextEdit>> = HashMap::new();
    for &span in &spans {
-        match (&span.suggestion_applicability, &span.suggested_replacement) {
+        if let (Some(Applicability::MachineApplicable), Some(suggested_replacement)) =
-            (Some(Applicability::MachineApplicable), Some(suggested_replacement)) => {
+            (&span.suggestion_applicability, &span.suggested_replacement)
-                let location = map_span_to_location(span, workspace_root);
+        {
-                let edit = TextEdit::new(location.range, suggested_replacement.clone());
+            let location = location(workspace_root, span);
-                edit_map.entry(location.uri).or_default().push(edit);
+            let edit = lsp_types::TextEdit::new(location.range, suggested_replacement.clone());
-            }
+            edit_map.entry(location.uri).or_default().push(edit);
-            _ => {}
        }
    }
    if edit_map.is_empty() {
-        MappedRustChildDiagnostic::Related(DiagnosticRelatedInformation {
+        MappedRustChildDiagnostic::Related(lsp_types::DiagnosticRelatedInformation {
-            location: map_span_to_location(spans[0], workspace_root),
+            location: location(workspace_root, spans[0]),
            message: rd.message.clone(),
        })
    } else {
@@ -154,21 +112,21 @@ fn map_rust_child_diagnostic(
            title: rd.message.clone(),
            id: None,
            group: None,
-            kind: Some("quickfix".to_string()),
+            kind: Some(lsp_types::CodeActionKind::QUICKFIX),
            edit: Some(lsp_ext::SnippetWorkspaceEdit {
                // FIXME: there's no good reason to use edit_map here....
                changes: Some(edit_map),
                document_changes: None,
            }),
-            command: None,
+            is_preferred: Some(true),
        })
    }
 }
 #[derive(Debug)]
 pub(crate) struct MappedRustDiagnostic {
-    pub(crate) location: Location,
+    pub(crate) url: lsp_types::Url,
-    pub(crate) diagnostic: Diagnostic,
+    pub(crate) diagnostic: lsp_types::Diagnostic,
    pub(crate) fixes: Vec<lsp_ext::CodeAction>,
 }
@@ -192,7 +150,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
        return Vec::new();
    }
-    let severity = map_diagnostic_to_severity(config, rd);
+    let severity = diagnostic_severity(config, rd.level.clone(), rd.code.clone());
    let mut source = String::from("rustc");
    let mut code = rd.code.as_ref().map(|c| c.code.clone());
@@ -210,7 +168,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
    let mut tags = Vec::new();
    for secondary_span in rd.spans.iter().filter(|s| !s.is_primary) {
-        let related = map_secondary_span_to_related(secondary_span, workspace_root);
+        let related = diagnostic_related_information(workspace_root, secondary_span);
        if let Some(related) = related {
            related_information.push(related);
        }
@@ -219,7 +177,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
    let mut fixes = Vec::new();
    let mut message = rd.message.clone();
    for child in &rd.children {
-        let child = map_rust_child_diagnostic(&child, workspace_root);
+        let child = map_rust_child_diagnostic(workspace_root, &child);
        match child {
            MappedRustChildDiagnostic::Related(related) => related_information.push(related),
            MappedRustChildDiagnostic::SuggestedFix(code_action) => fixes.push(code_action),
@@ -233,18 +191,30 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
        }
    }
-    if is_unused_or_unnecessary(rd) {
+    if let Some(code) = &rd.code {
-        tags.push(DiagnosticTag::Unnecessary);
+        let code = code.code.as_str();
-    }
+        if matches!(
+            code,
+            "dead_code"
+                | "unknown_lints"
+                | "unreachable_code"
+                | "unused_attributes"
+                | "unused_imports"
+                | "unused_macros"
+                | "unused_variables"
+        ) {
+            tags.push(lsp_types::DiagnosticTag::Unnecessary);
+        }
-    if is_deprecated(rd) {
+        if matches!(code, "deprecated") {
-        tags.push(DiagnosticTag::Deprecated);
+            tags.push(lsp_types::DiagnosticTag::Deprecated);
+        }
    }
    primary_spans
        .iter()
        .map(|primary_span| {
-            let location = map_span_to_location(&primary_span, workspace_root);
+            let location = location(workspace_root, &primary_span);
            let mut message = message.clone();
            if needs_primary_span_label {
@@ -256,17 +226,16 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
            // If error occurs from macro expansion, add related info pointing to
            // where the error originated
            if !is_from_macro(&primary_span.file_name) && primary_span.expansion.is_some() {
-                let def_loc = map_span_to_location_naive(&primary_span, workspace_root);
+                related_information.push(lsp_types::DiagnosticRelatedInformation {
-                related_information.push(DiagnosticRelatedInformation {
+                    location: location_naive(workspace_root, &primary_span),
-                    location: def_loc,
                    message: "Error originated from macro here".to_string(),
                });
            }
-            let diagnostic = Diagnostic {
+            let diagnostic = lsp_types::Diagnostic {
                range: location.range,
                severity,
-                code: code.clone().map(NumberOrString::String),
+                code: code.clone().map(lsp_types::NumberOrString::String),
                source: Some(source.clone()),
                message,
                related_information: if related_information.is_empty() {
@@ -277,7 +246,7 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
                tags: if tags.is_empty() { None } else { Some(tags.clone()) },
            };
-            MappedRustDiagnostic { location, diagnostic, fixes: fixes.clone() }
+            MappedRustDiagnostic { url: location.uri, diagnostic, fixes: fixes.clone() }
        })
        .collect()
 }
@@ -287,13 +256,22 @@ pub(crate) fn map_rust_diagnostic_to_lsp(
 mod tests {
    use super::*;
-    fn parse_diagnostic(val: &str) -> flycheck::Diagnostic {
+    use expect::{expect_file, ExpectFile};
-        serde_json::from_str::<flycheck::Diagnostic>(val).unwrap()
+    fn check(diagnostics_json: &str, expect: ExpectFile) {
+        check_with_config(DiagnosticsConfig::default(), diagnostics_json, expect)
+    }
+    fn check_with_config(config: DiagnosticsConfig, diagnostics_json: &str, expect: ExpectFile) {
+        let diagnostic: flycheck::Diagnostic = serde_json::from_str(diagnostics_json).unwrap();
+        let workspace_root = Path::new("/test/");
+        let actual = map_rust_diagnostic_to_lsp(&config, &diagnostic, workspace_root);
+        expect.assert_debug_eq(&actual)
    }
    #[test]
-    fn snap_rustc_incompatible_type_for_trait() {
+    fn rustc_incompatible_type_for_trait() {
-        let diag = parse_diagnostic(
+        check(
            r##"{
                "message": "method `next` has an incompatible type for trait",
                "code": {
@@ -337,16 +315,13 @@ mod tests {
                "rendered": "error[E0053]: method `next` has an incompatible type for trait\n  --> compiler/ty/list_iter.rs:52:5\n   |\n52 |     fn next(&self) -> Option<&'list ty::Ref<M>> {\n   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability\n   |\n   = note: expected type `fn(&mut ty::list_iter::ListIterator<'list, M>) -> std::option::Option<&ty::Ref<M>>`\n              found type `fn(&ty::list_iter::ListIterator<'list, M>) -> std::option::Option<&'list ty::Ref<M>>`\n\n"
            }
            "##,
+            expect_file!["crates/rust-analyzer/test_data/rustc_incompatible_type_for_trait.txt"],
        );
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&DiagnosticsConfig::default(), &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
-    fn snap_rustc_unused_variable() {
+    fn rustc_unused_variable() {
-        let diag = parse_diagnostic(
+        check(
            r##"{
    "message": "unused variable: `foo`",
    "code": {
@@ -419,17 +394,18 @@ mod tests {
    ],
    "rendered": "warning: unused variable: `foo`\n   --> driver/subcommand/repl.rs:291:9\n    |\n291 |     let foo = 42;\n    |         ^^^ help: consider prefixing with an underscore: `_foo`\n    |\n    = note: #[warn(unused_variables)] on by default\n\n"
    }"##,
+            expect_file!["crates/rust-analyzer/test_data/rustc_unused_variable.txt"],
        );
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&DiagnosticsConfig::default(), &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
    #[cfg(not(windows))]
-    fn snap_rustc_unused_variable_as_info() {
+    fn rustc_unused_variable_as_info() {
-        let diag = parse_diagnostic(
+        check_with_config(
+            DiagnosticsConfig {
+                warnings_as_info: vec!["unused_variables".to_string()],
+                ..DiagnosticsConfig::default()
+            },
            r##"{
    "message": "unused variable: `foo`",
    "code": {
@@ -502,22 +478,18 @@ mod tests {
    ],
    "rendered": "warning: unused variable: `foo`\n   --> driver/subcommand/repl.rs:291:9\n    |\n291 |     let foo = 42;\n    |         ^^^ help: consider prefixing with an underscore: `_foo`\n    |\n    = note: #[warn(unused_variables)] on by default\n\n"
    }"##,
+            expect_file!["crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt"],
        );
-        let config = DiagnosticsConfig {
-            warnings_as_info: vec!["unused_variables".to_string()],
-            ..DiagnosticsConfig::default()
-        };
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&config, &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
    #[cfg(not(windows))]
-    fn snap_rustc_unused_variable_as_hint() {
+    fn rustc_unused_variable_as_hint() {
-        let diag = parse_diagnostic(
+        check_with_config(
+            DiagnosticsConfig {
+                warnings_as_hint: vec!["unused_variables".to_string()],
+                ..DiagnosticsConfig::default()
+            },
            r##"{
    "message": "unused variable: `foo`",
    "code": {
@@ -590,21 +562,13 @@ mod tests {
    ],
    "rendered": "warning: unused variable: `foo`\n   --> driver/subcommand/repl.rs:291:9\n    |\n291 |     let foo = 42;\n    |         ^^^ help: consider prefixing with an underscore: `_foo`\n    |\n    = note: #[warn(unused_variables)] on by default\n\n"
    }"##,
+            expect_file!["crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt"],
        );
-        let config = DiagnosticsConfig {
-            warnings_as_hint: vec!["unused_variables".to_string()],
-            ..DiagnosticsConfig::default()
-        };
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&config, &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
-    fn snap_rustc_wrong_number_of_parameters() {
+    fn rustc_wrong_number_of_parameters() {
-        let diag = parse_diagnostic(
+        check(
            r##"{
    "message": "this function takes 2 parameters but 3 parameters were supplied",
    "code": {
@@ -719,16 +683,13 @@ mod tests {
    "children": [],
    "rendered": "error[E0061]: this function takes 2 parameters but 3 parameters were supplied\n   --> compiler/ty/select.rs:104:18\n    |\n104 |               self.add_evidence(target_fixed, evidence_fixed, false);\n    |                    ^^^^^^^^^^^^ expected 2 parameters\n...\n219 | /     pub fn add_evidence(\n220 | |         &mut self,\n221 | |         target_poly: &ty::Ref<ty::Poly>,\n222 | |         evidence_poly: &ty::Ref<ty::Poly>,\n...   |\n230 | |         }\n231 | |     }\n    | |_____- defined here\n\n"
    }"##,
+            expect_file!["crates/rust-analyzer/test_data/rustc_wrong_number_of_parameters.txt"],
        );
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&DiagnosticsConfig::default(), &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
-    fn snap_clippy_pass_by_ref() {
+    fn clippy_pass_by_ref() {
-        let diag = parse_diagnostic(
+        check(
            r##"{
    "message": "this argument is passed by reference, but would be more efficient if passed by value",
    "code": {
@@ -839,16 +800,13 @@ mod tests {
    ],
    "rendered": "warning: this argument is passed by reference, but would be more efficient if passed by value\n  --> compiler/mir/tagset.rs:42:24\n   |\n42 |     pub fn is_disjoint(&self, other: Self) -> bool {\n   |                        ^^^^^ help: consider passing by value instead: `self`\n   |\nnote: lint level defined here\n  --> compiler/lib.rs:1:9\n   |\n1  | #![warn(clippy::all)]\n   |         ^^^^^^^^^^^\n   = note: #[warn(clippy::trivially_copy_pass_by_ref)] implied by #[warn(clippy::all)]\n   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#trivially_copy_pass_by_ref\n\n"
    }"##,
+            expect_file!["crates/rust-analyzer/test_data/clippy_pass_by_ref.txt"],
        );
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&DiagnosticsConfig::default(), &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
-    fn snap_rustc_mismatched_type() {
+    fn rustc_mismatched_type() {
-        let diag = parse_diagnostic(
+        check(
            r##"{
    "message": "mismatched types",
    "code": {
@@ -882,16 +840,13 @@ mod tests {
    "children": [],
    "rendered": "error[E0308]: mismatched types\n  --> runtime/compiler_support.rs:48:65\n   |\n48 |     let layout = alloc::Layout::from_size_align_unchecked(size, align);\n   |                                                                 ^^^^^ expected usize, found u32\n\n"
    }"##,
+            expect_file!["crates/rust-analyzer/test_data/rustc_mismatched_type.txt"],
        );
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&DiagnosticsConfig::default(), &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
-    fn snap_handles_macro_location() {
+    fn handles_macro_location() {
-        let diag = parse_diagnostic(
+        check(
            r##"{
    "rendered": "error[E0277]: can't compare `{integer}` with `&str`\n --> src/main.rs:2:5\n  |\n2 |     assert_eq!(1, \"love\");\n  |     ^^^^^^^^^^^^^^^^^^^^^^ no implementation for `{integer} == &str`\n  |\n  = help: the trait `std::cmp::PartialEq<&str>` is not implemented for `{integer}`\n  = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)\n\n",
    "children": [
@@ -1153,16 +1108,13 @@ mod tests {
        }
    ]
    }"##,
+            expect_file!["crates/rust-analyzer/test_data/handles_macro_location.txt"],
        );
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&DiagnosticsConfig::default(), &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
-    fn snap_macro_compiler_error() {
+    fn macro_compiler_error() {
-        let diag = parse_diagnostic(
+        check(
            r##"{
        "rendered": "error: Please register your known path in the path module\n   --> crates/ra_hir_def/src/path.rs:265:9\n    |\n265 |         compile_error!(\"Please register your known path in the path module\")\n    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n    | \n   ::: crates/ra_hir_def/src/data.rs:80:16\n    |\n80  |     let path = path![std::future::Future];\n    |                -------------------------- in this macro invocation\n\n",
        "children": [],
@@ -1382,16 +1334,13 @@ mod tests {
        ]
    }
            "##,
+            expect_file!["crates/rust-analyzer/test_data/macro_compiler_error.txt"],
        );
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&DiagnosticsConfig::default(), &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
    #[test]
    fn snap_multi_line_fix() {
-        let diag = parse_diagnostic(
+        check(
            r##"{
                "rendered": "warning: returning the result of a let binding from a block\n --> src/main.rs:4:5\n  |\n3 |     let a = (0..10).collect();\n  |     -------------------------- unnecessary let binding\n4 |     a\n  |     ^\n  |\n  = note: `#[warn(clippy::let_and_return)]` on by default\n  = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#let_and_return\nhelp: return the expression directly\n  |\n3 |     \n4 |     (0..10).collect()\n  |\n\n",
                "children": [
@@ -1515,10 +1464,7 @@ mod tests {
                ]
            }
            "##,
+            expect_file!["crates/rust-analyzer/test_data/snap_multi_line_fix.txt"],
        );
-        let workspace_root = Path::new("/test/");
-        let diag = map_rust_diagnostic_to_lsp(&DiagnosticsConfig::default(), &diag, workspace_root);
-        insta::assert_debug_snapshot!(diag);
    }
 }
diff --git a/crates/rust-analyzer/src/document.rs b/crates/rust-analyzer/src/document.rs
new file mode 100644
index 000000000..43219e633
--- /dev/null
+++ b/crates/rust-analyzer/src/document.rs
@@ -0,0 +1,16 @@
+//! In-memory document information.
+/// Information about a document that the Language Client
+// knows about.
+// Its lifetime is driven by the textDocument/didOpen and textDocument/didClose
+// client notifications.
+#[derive(Debug, Clone)]
+pub(crate) struct DocumentData {
+    pub version: Option<i64>,
+}
+impl DocumentData {
+    pub fn new(version: i64) -> Self {
+        DocumentData { version: Some(version) }
+    }
+}
diff --git a/crates/rust-analyzer/src/from_proto.rs b/crates/rust-analyzer/src/from_proto.rs
index 15b281103..9f8ce3b99 100644
--- a/crates/rust-analyzer/src/from_proto.rs
+++ b/crates/rust-analyzer/src/from_proto.rs
@@ -2,7 +2,7 @@
 use std::convert::TryFrom;
 use ra_db::{FileId, FilePosition, FileRange};
-use ra_ide::{LineCol, LineIndex};
+use ra_ide::{AssistKind, LineCol, LineIndex};
 use ra_syntax::{TextRange, TextSize};
 use vfs::AbsPathBuf;
@@ -52,3 +52,17 @@ pub(crate) fn file_range(
    let range = text_range(&line_index, range);
    Ok(FileRange { file_id, range })
 }
+pub(crate) fn assist_kind(kind: lsp_types::CodeActionKind) -> Option<AssistKind> {
+    let assist_kind = match &kind {
+        k if k == &lsp_types::CodeActionKind::EMPTY => AssistKind::None,
+        k if k == &lsp_types::CodeActionKind::QUICKFIX => AssistKind::QuickFix,
+        k if k == &lsp_types::CodeActionKind::REFACTOR => AssistKind::Refactor,
+        k if k == &lsp_types::CodeActionKind::REFACTOR_EXTRACT => AssistKind::RefactorExtract,
+        k if k == &lsp_types::CodeActionKind::REFACTOR_INLINE => AssistKind::RefactorInline,
+        k if k == &lsp_types::CodeActionKind::REFACTOR_REWRITE => AssistKind::RefactorRewrite,
+        _ => return None,
+    };
+    Some(assist_kind)
+}
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index b8aa1e5b5..b2d65a6d1 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs
@@ -12,11 +12,12 @@ use parking_lot::RwLock;
 use ra_db::{CrateId, VfsPath};
 use ra_ide::{Analysis, AnalysisChange, AnalysisHost, FileId};
 use ra_project_model::{CargoWorkspace, ProcMacroClient, ProjectWorkspace, Target};
-use rustc_hash::{FxHashMap, FxHashSet};
+use rustc_hash::FxHashMap;
 use crate::{
    config::Config,
    diagnostics::{CheckFixes, DiagnosticCollection},
+    document::DocumentData,
    from_proto,
    line_endings::LineEndings,
    main_loop::Task,
@@ -26,11 +27,14 @@ use crate::{
    to_proto::url_from_abs_path,
    Result,
 };
+use ra_prof::profile;
-#[derive(Eq, PartialEq)]
+#[derive(Eq, PartialEq, Copy, Clone)]
 pub(crate) enum Status {
    Loading,
    Ready,
+    Invalid,
+    NeedsReload,
 }
 impl Default for Status {
@@ -60,11 +64,13 @@ pub(crate) struct GlobalState {
    req_queue: ReqQueue,
    pub(crate) task_pool: Handle<TaskPool<Task>, Receiver<Task>>,
    pub(crate) loader: Handle<Box<dyn vfs::loader::Handle>, Receiver<vfs::loader::Message>>,
-    pub(crate) flycheck: Option<Handle<FlycheckHandle, Receiver<flycheck::Message>>>,
+    pub(crate) flycheck: Option<FlycheckHandle>,
+    pub(crate) flycheck_sender: Sender<flycheck::Message>,
+    pub(crate) flycheck_receiver: Receiver<flycheck::Message>,
    pub(crate) config: Config,
    pub(crate) analysis_host: AnalysisHost,
    pub(crate) diagnostics: DiagnosticCollection,
-    pub(crate) mem_docs: FxHashSet<VfsPath>,
+    pub(crate) mem_docs: FxHashMap<VfsPath, DocumentData>,
    pub(crate) vfs: Arc<RwLock<(vfs::Vfs, FxHashMap<FileId, LineEndings>)>>,
    pub(crate) status: Status,
    pub(crate) source_root_config: SourceRootConfig,
@@ -79,6 +85,7 @@ pub(crate) struct GlobalStateSnapshot {
    pub(crate) analysis: Analysis,
    pub(crate) check_fixes: CheckFixes,
    pub(crate) latest_requests: Arc<RwLock<LatestRequests>>,
+    mem_docs: FxHashMap<VfsPath, DocumentData>,
    vfs: Arc<RwLock<(vfs::Vfs, FxHashMap<FileId, LineEndings>)>>,
    pub(crate) workspaces: Arc<Vec<ProjectWorkspace>>,
 }
@@ -100,16 +107,19 @@ impl GlobalState {
        };
        let analysis_host = AnalysisHost::new(config.lru_capacity);
+        let (flycheck_sender, flycheck_receiver) = unbounded();
        GlobalState {
            sender,
            req_queue: ReqQueue::default(),
            task_pool,
            loader,
            flycheck: None,
+            flycheck_sender,
+            flycheck_receiver,
            config,
            analysis_host,
            diagnostics: Default::default(),
-            mem_docs: FxHashSet::default(),
+            mem_docs: FxHashMap::default(),
            vfs: Arc::new(RwLock::new((vfs::Vfs::default(), FxHashMap::default()))),
            status: Status::default(),
            source_root_config: SourceRootConfig::default(),
@@ -120,6 +130,10 @@ impl GlobalState {
    }
    pub(crate) fn process_changes(&mut self) -> bool {
+        let _p = profile("GlobalState::process_changes");
+        let mut fs_changes = Vec::new();
+        let mut has_fs_changes = false;
        let change = {
            let mut change = AnalysisChange::new();
            let (vfs, line_endings_map) = &mut *self.vfs.write();
@@ -128,13 +142,14 @@ impl GlobalState {
                return false;
            }
-            let fs_op = changed_files.iter().any(|it| it.is_created_or_deleted());
-            if fs_op {
-                let roots = self.source_root_config.partition(&vfs);
-                change.set_roots(roots)
-            }
            for file in changed_files {
+                if file.is_created_or_deleted() {
+                    if let Some(path) = vfs.file_path(file.file_id).as_path() {
+                        fs_changes.push((path.to_path_buf(), file.change_kind));
+                        has_fs_changes = true;
+                    }
+                }
                let text = if file.exists() {
                    let bytes = vfs.file_contents(file.file_id).to_vec();
                    match String::from_utf8(bytes).ok() {
@@ -150,10 +165,15 @@ impl GlobalState {
                };
                change.change_file(file.file_id, text);
            }
+            if has_fs_changes {
+                let roots = self.source_root_config.partition(&vfs);
+                change.set_roots(roots);
+            }
            change
        };
        self.analysis_host.apply_change(change);
+        self.maybe_refresh(&fs_changes);
        true
    }
@@ -165,6 +185,7 @@ impl GlobalState {
            vfs: Arc::clone(&self.vfs),
            latest_requests: Arc::clone(&self.latest_requests),
            check_fixes: Arc::clone(&self.diagnostics.check_fixes),
+            mem_docs: self.mem_docs.clone(),
        }
    }
@@ -202,8 +223,7 @@ impl GlobalState {
        if let Some((method, start)) = self.req_queue.incoming.complete(response.id.clone()) {
            let duration = start.elapsed();
            log::info!("handled req#{} in {:?}", response.id, duration);
-            let metrics =
+            let metrics = RequestMetrics { id: response.id.clone(), method, duration };
-                RequestMetrics { id: response.id.clone(), method: method.to_string(), duration };
            self.latest_requests.write().record(metrics);
            self.send(response.into());
        }
@@ -238,6 +258,11 @@ impl GlobalStateSnapshot {
        self.vfs.read().1[&id]
    }
+    pub(crate) fn url_file_version(&self, url: &Url) -> Option<i64> {
+        let path = from_proto::vfs_path(&url).ok()?;
+        self.mem_docs.get(&path)?.version
+    }
    pub(crate) fn anchored_path(&self, file_id: FileId, path: &str) -> Url {
        let mut base = self.vfs.read().0.file_path(file_id);
        base.pop();
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index e35a5e846..e73b3a211 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -11,11 +11,11 @@ use lsp_server::ErrorCode;
 use lsp_types::{
    CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem,
    CallHierarchyOutgoingCall, CallHierarchyOutgoingCallsParams, CallHierarchyPrepareParams,
-    CodeLens, Command, CompletionItem, Diagnostic, DocumentFormattingParams, DocumentHighlight,
+    CodeActionKind, CodeLens, Command, CompletionItem, Diagnostic, DocumentFormattingParams,
-    DocumentSymbol, FoldingRange, FoldingRangeParams, HoverContents, Location, MarkupContent,
+    DocumentHighlight, DocumentSymbol, FoldingRange, FoldingRangeParams, HoverContents, Location,
-    MarkupKind, Position, PrepareRenameResponse, Range, RenameParams, SemanticTokensParams,
+    Position, PrepareRenameResponse, Range, RenameParams, SemanticTokensParams,
    SemanticTokensRangeParams, SemanticTokensRangeResult, SemanticTokensResult, SymbolInformation,
-    TextDocumentIdentifier, Url, WorkspaceEdit,
+    SymbolTag, TextDocumentIdentifier, Url, WorkspaceEdit,
 };
 use ra_ide::{
    FileId, FilePosition, FileRange, HoverAction, HoverGotoTypeData, NavigationTarget, Query,
@@ -23,16 +23,16 @@ use ra_ide::{
 };
 use ra_prof::profile;
 use ra_project_model::TargetKind;
-use ra_syntax::{AstNode, SyntaxKind, TextRange, TextSize};
+use ra_syntax::{algo, ast, AstNode, SyntaxKind, TextRange, TextSize};
 use serde::{Deserialize, Serialize};
 use serde_json::to_value;
-use stdx::{format_to, split_delim};
+use stdx::{format_to, split_once};
 use crate::{
    cargo_target_spec::CargoTargetSpec,
    config::RustfmtConfig,
    from_json, from_proto,
-    global_state::GlobalStateSnapshot,
+    global_state::{GlobalState, GlobalStateSnapshot},
    lsp_ext::{self, InlayHint, InlayHintsParams},
    to_proto, LspError, Result,
 };
@@ -62,6 +62,17 @@ pub(crate) fn handle_analyzer_status(snap: GlobalStateSnapshot, _: ()) -> Result
    Ok(buf)
 }
+pub(crate) fn handle_memory_usage(state: &mut GlobalState, _: ()) -> Result<String> {
+    let _p = profile("handle_memory_usage");
+    let mem = state.analysis_host.per_query_memory_usage();
+    let mut out = String::new();
+    for (name, bytes) in mem {
+        format_to!(out, "{:>8} {}\n", bytes, name);
+    }
+    Ok(out)
+}
 pub(crate) fn handle_syntax_tree(
    snap: GlobalStateSnapshot,
    params: lsp_ext::SyntaxTreeParams,
@@ -242,10 +253,17 @@ pub(crate) fn handle_document_symbol(
    let mut parents: Vec<(DocumentSymbol, Option<usize>)> = Vec::new();
    for symbol in snap.analysis.file_structure(file_id)? {
+        let mut tags = Vec::new();
+        if symbol.deprecated {
+            tags.push(SymbolTag::Deprecated)
+        };
+        #[allow(deprecated)]
        let doc_symbol = DocumentSymbol {
            name: symbol.label,
            detail: symbol.detail,
            kind: to_proto::symbol_kind(symbol.kind),
+            tags: Some(tags),
            deprecated: Some(symbol.deprecated),
            range: to_proto::range(&line_index, symbol.node_range),
            selection_range: to_proto::range(&line_index, symbol.navigation_range),
@@ -285,9 +303,19 @@ pub(crate) fn handle_document_symbol(
        url: &Url,
        res: &mut Vec<SymbolInformation>,
    ) {
+        let mut tags = Vec::new();
+        #[allow(deprecated)]
+        match symbol.deprecated {
+            Some(true) => tags.push(SymbolTag::Deprecated),
+            _ => {}
+        }
+        #[allow(deprecated)]
        res.push(SymbolInformation {
            name: symbol.name.clone(),
            kind: symbol.kind,
+            tags: Some(tags),
            deprecated: symbol.deprecated,
            location: Location::new(url.clone(), symbol.range),
            container_name,
@@ -330,11 +358,15 @@ pub(crate) fn handle_workspace_symbol(
    fn exec_query(snap: &GlobalStateSnapshot, query: Query) -> Result<Vec<SymbolInformation>> {
        let mut res = Vec::new();
        for nav in snap.analysis.symbol_search(query)? {
+            let container_name = nav.container_name.as_ref().map(|v| v.to_string());
+            #[allow(deprecated)]
            let info = SymbolInformation {
-                name: nav.name().to_string(),
+                name: nav.name.to_string(),
-                kind: to_proto::symbol_kind(nav.kind()),
+                kind: to_proto::symbol_kind(nav.kind),
-                location: to_proto::location(snap, nav.file_range())?,
+                tags: None,
-                container_name: nav.container_name().map(|v| v.to_string()),
+                location: to_proto::location_from_nav(snap, nav)?,
+                container_name,
                deprecated: None,
            };
            res.push(info);
@@ -407,27 +439,42 @@ pub(crate) fn handle_runnables(
    let file_id = from_proto::file_id(&snap, &params.text_document.uri)?;
    let line_index = snap.analysis.file_line_index(file_id)?;
    let offset = params.position.map(|it| from_proto::offset(&line_index, it));
-    let mut res = Vec::new();
    let cargo_spec = CargoTargetSpec::for_file(&snap, file_id)?;
+    let expect_test = match offset {
+        Some(offset) => {
+            let source_file = snap.analysis.parse(file_id)?;
+            algo::find_node_at_offset::<ast::MacroCall>(source_file.syntax(), offset)
+                .and_then(|it| it.path()?.segment()?.name_ref())
+                .map_or(false, |it| it.text() == "expect" || it.text() == "expect_file")
+        }
+        None => false,
+    };
+    let mut res = Vec::new();
    for runnable in snap.analysis.runnables(file_id)? {
        if let Some(offset) = offset {
-            if !runnable.nav.full_range().contains_inclusive(offset) {
+            if !runnable.nav.full_range.contains_inclusive(offset) {
                continue;
            }
        }
        if should_skip_target(&runnable, cargo_spec.as_ref()) {
            continue;
        }
+        let mut runnable = to_proto::runnable(&snap, file_id, runnable)?;
-        res.push(to_proto::runnable(&snap, file_id, runnable)?);
+        if expect_test {
+            runnable.label = format!("{} + expect", runnable.label);
+            runnable.args.expect_test = Some(true);
+        }
+        res.push(runnable);
    }
-    // Add `cargo check` and `cargo test` for the whole package
+    // Add `cargo check` and `cargo test` for all targets of the whole package
    match cargo_spec {
        Some(spec) => {
            for &cmd in ["check", "test"].iter() {
                res.push(lsp_ext::Runnable {
-                    label: format!("cargo {} -p {}", cmd, spec.package),
+                    label: format!("cargo {} -p {} --all-targets", cmd, spec.package),
                    location: None,
                    kind: lsp_ext::RunnableKind::Cargo,
                    args: lsp_ext::CargoRunnable {
@@ -436,8 +483,10 @@ pub(crate) fn handle_runnables(
                            cmd.to_string(),
                            "--package".to_string(),
                            spec.package.clone(),
+                            "--all-targets".to_string(),
                        ],
                        executable_args: Vec::new(),
+                        expect_test: None,
                    },
                })
            }
@@ -451,6 +500,7 @@ pub(crate) fn handle_runnables(
                    workspace_root: None,
                    cargo_args: vec!["check".to_string(), "--workspace".to_string()],
                    executable_args: Vec::new(),
+                    expect_test: None,
                },
            });
        }
@@ -524,21 +574,16 @@ pub(crate) fn handle_signature_help(
    let _p = profile("handle_signature_help");
    let position = from_proto::file_position(&snap, params.text_document_position_params)?;
    let call_info = match snap.analysis.call_info(position)? {
-        None => return Ok(None),
        Some(it) => it,
+        None => return Ok(None),
    };
    let concise = !snap.config.call_info_full;
-    let mut active_parameter = call_info.active_parameter.map(|it| it as i64);
+    let res = to_proto::signature_help(
-    if concise && call_info.signature.has_self_param {
+        call_info,
-        active_parameter = active_parameter.map(|it| it.saturating_sub(1));
+        concise,
-    }
+        snap.config.client_caps.signature_help_label_offsets,
-    let sig_info = to_proto::signature_information(call_info.signature, concise);
+    );
+    Ok(Some(res))
-    Ok(Some(lsp_types::SignatureHelp {
-        signatures: vec![sig_info],
-        active_signature: Some(0),
-        active_parameter,
-    }))
 }
 pub(crate) fn handle_hover(
@@ -555,13 +600,10 @@ pub(crate) fn handle_hover(
    let range = to_proto::range(&line_index, info.range);
    let hover = lsp_ext::Hover {
        hover: lsp_types::Hover {
-            contents: HoverContents::Markup(MarkupContent {
+            contents: HoverContents::Markup(to_proto::markup_content(info.info.markup)),
-                kind: MarkupKind::Markdown,
-                value: crate::markdown::format_docs(&info.info.to_markup()),
-            }),
            range: Some(range),
        },
-        actions: prepare_hover_actions(&snap, position.file_id, info.info.actions()),
+        actions: prepare_hover_actions(&snap, position.file_id, &info.info.actions),
    };
    Ok(Some(hover))
@@ -720,7 +762,20 @@ fn handle_fixes(
    let file_id = from_proto::file_id(&snap, &params.text_document.uri)?;
    let line_index = snap.analysis.file_line_index(file_id)?;
    let range = from_proto::text_range(&line_index, params.range);
-    let diagnostics = snap.analysis.diagnostics(file_id)?;
+    match &params.context.only {
+        Some(v) => {
+            if !v.iter().any(|it| {
+                it == &lsp_types::CodeActionKind::EMPTY
+                    || it == &lsp_types::CodeActionKind::QUICKFIX
+            }) {
+                return Ok(());
+            }
+        }
+        None => {}
+    };
+    let diagnostics = snap.analysis.diagnostics(file_id, snap.config.experimental_diagnostics)?;
    let fixes_from_diagnostics = diagnostics
        .into_iter()
@@ -734,9 +789,9 @@ fn handle_fixes(
            title,
            id: None,
            group: None,
-            kind: Some(lsp_types::code_action_kind::QUICKFIX.into()),
+            kind: Some(CodeActionKind::QUICKFIX),
            edit: Some(edit),
-            command: None,
+            is_preferred: Some(false),
        };
        res.push(action);
    }
@@ -752,7 +807,7 @@ fn handle_fixes(
 }
 pub(crate) fn handle_code_action(
-    snap: GlobalStateSnapshot,
+    mut snap: GlobalStateSnapshot,
    params: lsp_types::CodeActionParams,
 ) -> Result<Option<Vec<lsp_ext::CodeAction>>> {
    let _p = profile("handle_code_action");
@@ -767,6 +822,13 @@ pub(crate) fn handle_code_action(
    let line_index = snap.analysis.file_line_index(file_id)?;
    let range = from_proto::text_range(&line_index, params.range);
    let frange = FileRange { file_id, range };
+    snap.config.assist.allowed = params
+        .clone()
+        .context
+        .only
+        .map(|it| it.into_iter().filter_map(from_proto::assist_kind).collect());
    let mut res: Vec<lsp_ext::CodeAction> = Vec::new();
    handle_fixes(&snap, &params, &mut res)?;
@@ -787,7 +849,7 @@ pub(crate) fn handle_code_action(
 }
 pub(crate) fn handle_resolve_code_action(
-    snap: GlobalStateSnapshot,
+    mut snap: GlobalStateSnapshot,
    params: lsp_ext::ResolveCodeActionParams,
 ) -> Result<Option<lsp_ext::SnippetWorkspaceEdit>> {
    let _p = profile("handle_resolve_code_action");
@@ -796,8 +858,14 @@ pub(crate) fn handle_resolve_code_action(
    let range = from_proto::text_range(&line_index, params.code_action_params.range);
    let frange = FileRange { file_id, range };
+    snap.config.assist.allowed = params
+        .code_action_params
+        .context
+        .only
+        .map(|it| it.into_iter().filter_map(from_proto::assist_kind).collect());
    let assists = snap.analysis.resolved_assists(&snap.config.assist, frange)?;
-    let (id_string, index) = split_delim(&params.id, ':').unwrap();
+    let (id_string, index) = split_once(&params.id, ':').unwrap();
    let index = index.parse::<usize>().unwrap();
    let assist = &assists[index];
    assert!(assist.assist.id.0 == id_string);
@@ -828,7 +896,7 @@ pub(crate) fn handle_code_lens(
            }
            let action = runnable.action();
-            let range = to_proto::range(&line_index, runnable.nav.range());
+            let range = to_proto::range(&line_index, runnable.nav.focus_or_full_range());
            let r = to_proto::runnable(&snap, file_id, runnable)?;
            if snap.config.lens.run {
                let lens = CodeLens {
@@ -847,15 +915,20 @@ pub(crate) fn handle_code_lens(
        }
    }
-    if snap.config.lens.impementations {
+    if snap.config.lens.implementations {
        // Handle impls
        lenses.extend(
            snap.analysis
                .file_structure(file_id)?
                .into_iter()
-                .filter(|it| match it.kind {
+                .filter(|it| {
-                    SyntaxKind::TRAIT_DEF | SyntaxKind::STRUCT_DEF | SyntaxKind::ENUM_DEF => true,
+                    matches!(
-                    _ => false,
+                        it.kind,
+                        SyntaxKind::TRAIT
+                            | SyntaxKind::STRUCT
+                            | SyntaxKind::ENUM
+                            | SyntaxKind::UNION
+                    )
                })
                .map(|it| {
                    let range = to_proto::range(&line_index, it.node_range);
@@ -954,8 +1027,18 @@ pub(crate) fn handle_ssr(
    params: lsp_ext::SsrParams,
 ) -> Result<lsp_types::WorkspaceEdit> {
    let _p = profile("handle_ssr");
-    let source_change =
+    let selections = params
-        snap.analysis.structural_search_replace(&params.query, params.parse_only)??;
+        .selections
+        .iter()
+        .map(|range| from_proto::file_range(&snap, params.position.text_document.clone(), *range))
+        .collect::<Result<Vec<_>, _>>()?;
+    let position = from_proto::file_position(&snap, params.position)?;
+    let source_change = snap.analysis.structural_search_replace(
+        &params.query,
+        params.parse_only,
+        position,
+        selections,
+    )??;
    to_proto::workspace_edit(&snap, source_change)
 }
@@ -967,7 +1050,7 @@ pub(crate) fn publish_diagnostics(
    let line_index = snap.analysis.file_line_index(file_id)?;
    let diagnostics: Vec<Diagnostic> = snap
        .analysis
-        .diagnostics(file_id)?
+        .diagnostics(file_id, snap.config.experimental_diagnostics)?
        .into_iter()
        .map(|d| Diagnostic {
            range: to_proto::range(&line_index, d.range),
@@ -1012,7 +1095,7 @@ pub(crate) fn handle_call_hierarchy_prepare(
    let RangeInfo { range: _, info: navs } = nav_info;
    let res = navs
        .into_iter()
-        .filter(|it| it.kind() == SyntaxKind::FN_DEF)
+        .filter(|it| it.kind == SyntaxKind::FN)
        .map(|it| to_proto::call_hierarchy_item(&snap, it))
        .collect::<Result<Vec<_>>>()?;
@@ -1027,7 +1110,7 @@ pub(crate) fn handle_call_hierarchy_incoming(
    let item = params.item;
    let doc = TextDocumentIdentifier::new(item.uri);
-    let frange = from_proto::file_range(&snap, doc, item.range)?;
+    let frange = from_proto::file_range(&snap, doc, item.selection_range)?;
    let fpos = FilePosition { file_id: frange.file_id, offset: frange.range.start() };
    let call_items = match snap.analysis.incoming_calls(fpos)? {
@@ -1038,7 +1121,7 @@ pub(crate) fn handle_call_hierarchy_incoming(
    let mut res = vec![];
    for call_item in call_items.into_iter() {
-        let file_id = call_item.target.file_id();
+        let file_id = call_item.target.file_id;
        let line_index = snap.analysis.file_line_index(file_id)?;
        let item = to_proto::call_hierarchy_item(&snap, call_item.target)?;
        res.push(CallHierarchyIncomingCall {
@@ -1062,7 +1145,7 @@ pub(crate) fn handle_call_hierarchy_outgoing(
    let item = params.item;
    let doc = TextDocumentIdentifier::new(item.uri);
-    let frange = from_proto::file_range(&snap, doc, item.range)?;
+    let frange = from_proto::file_range(&snap, doc, item.selection_range)?;
    let fpos = FilePosition { file_id: frange.file_id, offset: frange.range.start() };
    let call_items = match snap.analysis.outgoing_calls(fpos)? {
@@ -1073,7 +1156,7 @@ pub(crate) fn handle_call_hierarchy_outgoing(
    let mut res = vec![];
    for call_item in call_items.into_iter() {
-        let file_id = call_item.target.file_id();
+        let file_id = call_item.target.file_id;
        let line_index = snap.analysis.file_line_index(file_id)?;
        let item = to_proto::call_hierarchy_item(&snap, call_item.target)?;
        res.push(CallHierarchyOutgoingCall {
@@ -1169,13 +1252,13 @@ fn goto_location_command(snap: &GlobalStateSnapshot, nav: &NavigationTarget) ->
        let link = to_proto::location_link(snap, None, nav.clone()).ok()?;
        to_value(link).ok()?
    } else {
-        let range = FileRange { file_id: nav.file_id(), range: nav.range() };
+        let range = FileRange { file_id: nav.file_id, range: nav.focus_or_full_range() };
        let location = to_proto::location(snap, range).ok()?;
        to_value(location).ok()?
    };
    Some(Command {
-        title: nav.name().to_string(),
+        title: nav.name.to_string(),
        command: "rust-analyzer.gotoLocation".into(),
        arguments: Some(vec![value]),
    })
@@ -1196,8 +1279,8 @@ fn show_impl_command_link(
            let position = to_proto::position(&line_index, position.offset);
            let locations: Vec<_> = nav_data
                .info
-                .iter()
+                .into_iter()
-                .filter_map(|it| to_proto::location(snap, it.file_range()).ok())
+                .filter_map(|nav| to_proto::location_from_nav(snap, nav).ok())
                .collect();
            let title = implementation_title(locations.len());
            let command = show_references_command(title, &uri, position, locations);
diff --git a/crates/rust-analyzer/src/lib.rs b/crates/rust-analyzer/src/lib.rs
index 407944d85..ed37992cd 100644
--- a/crates/rust-analyzer/src/lib.rs
+++ b/crates/rust-analyzer/src/lib.rs
@@ -33,6 +33,7 @@ mod line_endings;
 mod request_metrics;
 mod lsp_utils;
 mod thread_pool;
+mod document;
 pub mod lsp_ext;
 pub mod config;
@@ -40,7 +41,9 @@ use serde::de::DeserializeOwned;
 pub type Result<T, E = Box<dyn std::error::Error + Send + Sync>> = std::result::Result<T, E>;
 pub use crate::{caps::server_capabilities, main_loop::main_loop};
+use ra_ide::AnalysisHost;
 use std::fmt;
+use vfs::Vfs;
 pub fn from_json<T: DeserializeOwned>(what: &'static str, json: serde_json::Value) -> Result<T> {
    let res = T::deserialize(&json)
@@ -67,3 +70,22 @@ impl fmt::Display for LspError {
 }
 impl std::error::Error for LspError {}
+fn print_memory_usage(mut host: AnalysisHost, vfs: Vfs) {
+    let mut mem = host.per_query_memory_usage();
+    let before = ra_prof::memory_usage();
+    drop(vfs);
+    let vfs = before.allocated - ra_prof::memory_usage().allocated;
+    mem.push(("VFS".into(), vfs));
+    let before = ra_prof::memory_usage();
+    drop(host);
+    mem.push(("Unaccounted".into(), before.allocated - ra_prof::memory_usage().allocated));
+    mem.push(("Remaining".into(), ra_prof::memory_usage().allocated));
+    for (name, bytes) in mem {
+        eprintln!("{:>8} {}", bytes, name);
+    }
+}
diff --git a/crates/rust-analyzer/src/lsp_ext.rs b/crates/rust-analyzer/src/lsp_ext.rs
index 1371f6cb4..3976b6529 100644
--- a/crates/rust-analyzer/src/lsp_ext.rs
+++ b/crates/rust-analyzer/src/lsp_ext.rs
@@ -3,7 +3,9 @@
 use std::{collections::HashMap, path::PathBuf};
 use lsp_types::request::Request;
-use lsp_types::{Position, Range, TextDocumentIdentifier};
+use lsp_types::{
+    notification::Notification, CodeActionKind, Position, Range, TextDocumentIdentifier,
+};
 use serde::{Deserialize, Serialize};
 pub enum AnalyzerStatus {}
@@ -14,12 +16,20 @@ impl Request for AnalyzerStatus {
    const METHOD: &'static str = "rust-analyzer/analyzerStatus";
 }
-pub enum CollectGarbage {}
+pub enum MemoryUsage {}
-impl Request for CollectGarbage {
+impl Request for MemoryUsage {
+    type Params = ();
+    type Result = String;
+    const METHOD: &'static str = "rust-analyzer/memoryUsage";
+}
+pub enum ReloadWorkspace {}
+impl Request for ReloadWorkspace {
    type Params = ();
    type Result = ();
-    const METHOD: &'static str = "rust-analyzer/collectGarbage";
+    const METHOD: &'static str = "rust-analyzer/reloadWorkspace";
 }
 pub enum SyntaxTree {}
@@ -161,6 +171,8 @@ pub struct CargoRunnable {
    pub cargo_args: Vec<String>,
    // stuff after --
    pub executable_args: Vec<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expect_test: Option<bool>,
 }
 pub enum InlayHints {}
@@ -204,6 +216,30 @@ impl Request for Ssr {
 pub struct SsrParams {
    pub query: String,
    pub parse_only: bool,
+    /// File position where SSR was invoked. Paths in `query` will be resolved relative to this
+    /// position.
+    #[serde(flatten)]
+    pub position: lsp_types::TextDocumentPositionParams,
+    /// Current selections. Search/replace will be restricted to these if non-empty.
+    pub selections: Vec<lsp_types::Range>,
+}
+pub enum StatusNotification {}
+#[serde(rename_all = "camelCase")]
+#[derive(Serialize, Deserialize)]
+pub enum Status {
+    Loading,
+    Ready,
+    NeedsReload,
+    Invalid,
+}
+impl Notification for StatusNotification {
+    type Params = Status;
+    const METHOD: &'static str = "rust-analyzer/status";
 }
 pub enum CodeActionRequest {}
@@ -215,6 +251,7 @@ impl Request for CodeActionRequest {
 }
 #[derive(Debug, PartialEq, Clone, Default, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct CodeAction {
    pub title: String,
    #[serde(skip_serializing_if = "Option::is_none")]
@@ -222,11 +259,14 @@ pub struct CodeAction {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub group: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub kind: Option<String>,
+    pub kind: Option<CodeActionKind>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    // We don't handle commands on the client-side
-    pub command: Option<lsp_types::Command>,
+    // #[serde(skip_serializing_if = "Option::is_none")]
+    // pub command: Option<lsp_types::Command>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub edit: Option<SnippetWorkspaceEdit>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_preferred: Option<bool>,
 }
 #[derive(Debug, Eq, PartialEq, Clone, Default, Deserialize, Serialize)]
diff --git a/crates/rust-analyzer/src/lsp_utils.rs b/crates/rust-analyzer/src/lsp_utils.rs
index 0bc3ff115..d4cc9dd04 100644
--- a/crates/rust-analyzer/src/lsp_utils.rs
+++ b/crates/rust-analyzer/src/lsp_utils.rs
@@ -1,5 +1,5 @@
 //! Utilities for LSP-related boilerplate code.
-use std::{error::Error, ops::Range};
+use std::{borrow::Cow, error::Error, ops::Range};
 use lsp_server::Notification;
 use ra_db::Canceled;
@@ -84,8 +84,8 @@ impl GlobalState {
 pub(crate) fn apply_document_changes(
    old_text: &mut String,
    content_changes: Vec<lsp_types::TextDocumentContentChangeEvent>,
+    mut line_index: Cow<'_, LineIndex>,
 ) {
-    let mut line_index = LineIndex::new(old_text);
    // The changes we got must be applied sequentially, but can cross lines so we
    // have to keep our line index updated.
    // Some clients (e.g. Code) sort the ranges in reverse. As an optimization, we
@@ -110,7 +110,7 @@ pub(crate) fn apply_document_changes(
        match change.range {
            Some(range) => {
                if !index_valid.covers(range.end.line) {
-                    line_index = LineIndex::new(&old_text);
+                    line_index = Cow::Owned(LineIndex::new(old_text));
                }
                index_valid = IndexValid::UpToLineExclusive(range.start.line);
                let range = from_proto::text_range(&line_index, range);
@@ -145,10 +145,15 @@ mod tests {
            };
        }
+        fn run(text: &mut String, changes: Vec<TextDocumentContentChangeEvent>) {
+            let line_index = Cow::Owned(LineIndex::new(&text));
+            super::apply_document_changes(text, changes, line_index);
+        }
        let mut text = String::new();
-        apply_document_changes(&mut text, vec![]);
+        run(&mut text, vec![]);
        assert_eq!(text, "");
-        apply_document_changes(
+        run(
            &mut text,
            vec![TextDocumentContentChangeEvent {
                range: None,
@@ -157,39 +162,36 @@ mod tests {
            }],
        );
        assert_eq!(text, "the");
-        apply_document_changes(&mut text, c![0, 3; 0, 3 => " quick"]);
+        run(&mut text, c![0, 3; 0, 3 => " quick"]);
        assert_eq!(text, "the quick");
-        apply_document_changes(&mut text, c![0, 0; 0, 4 => "", 0, 5; 0, 5 => " foxes"]);
+        run(&mut text, c![0, 0; 0, 4 => "", 0, 5; 0, 5 => " foxes"]);
        assert_eq!(text, "quick foxes");
-        apply_document_changes(&mut text, c![0, 11; 0, 11 => "\ndream"]);
+        run(&mut text, c![0, 11; 0, 11 => "\ndream"]);
        assert_eq!(text, "quick foxes\ndream");
-        apply_document_changes(&mut text, c![1, 0; 1, 0 => "have "]);
+        run(&mut text, c![1, 0; 1, 0 => "have "]);
        assert_eq!(text, "quick foxes\nhave dream");
-        apply_document_changes(
+        run(&mut text, c![0, 0; 0, 0 => "the ", 1, 4; 1, 4 => " quiet", 1, 16; 1, 16 => "s\n"]);
-            &mut text,
-            c![0, 0; 0, 0 => "the ", 1, 4; 1, 4 => " quiet", 1, 16; 1, 16 => "s\n"],
-        );
        assert_eq!(text, "the quick foxes\nhave quiet dreams\n");
-        apply_document_changes(&mut text, c![0, 15; 0, 15 => "\n", 2, 17; 2, 17 => "\n"]);
+        run(&mut text, c![0, 15; 0, 15 => "\n", 2, 17; 2, 17 => "\n"]);
        assert_eq!(text, "the quick foxes\n\nhave quiet dreams\n\n");
-        apply_document_changes(
+        run(
            &mut text,
            c![1, 0; 1, 0 => "DREAM", 2, 0; 2, 0 => "they ", 3, 0; 3, 0 => "DON'T THEY?"],
        );
        assert_eq!(text, "the quick foxes\nDREAM\nthey have quiet dreams\nDON'T THEY?\n");
-        apply_document_changes(&mut text, c![0, 10; 1, 5 => "", 2, 0; 2, 12 => ""]);
+        run(&mut text, c![0, 10; 1, 5 => "", 2, 0; 2, 12 => ""]);
        assert_eq!(text, "the quick \nthey have quiet dreams\n");
        text = String::from("❤️");
-        apply_document_changes(&mut text, c![0, 0; 0, 0 => "a"]);
+        run(&mut text, c![0, 0; 0, 0 => "a"]);
        assert_eq!(text, "a❤️");
        text = String::from("a\nb");
-        apply_document_changes(&mut text, c![0, 1; 1, 0 => "\nțc", 0, 1; 1, 1 => "d"]);
+        run(&mut text, c![0, 1; 1, 0 => "\nțc", 0, 1; 1, 1 => "d"]);
        assert_eq!(text, "adcb");
        text = String::from("a\nb");
-        apply_document_changes(&mut text, c![0, 1; 1, 0 => "ț\nc", 0, 2; 0, 2 => "c"]);
+        run(&mut text, c![0, 1; 1, 0 => "ț\nc", 0, 2; 0, 2 => "c"]);
        assert_eq!(text, "ațc\ncb");
    }
 }
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 9fd16ef3b..0ace4cb45 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -1,13 +1,14 @@
 //! The main loop of `rust-analyzer` responsible for dispatching LSP
 //! requests/replies and notifications back to the client.
 use std::{
+    borrow::Cow,
    env, fmt, panic,
    time::{Duration, Instant},
 };
-use crossbeam_channel::{never, select, Receiver};
+use crossbeam_channel::{select, Receiver};
 use lsp_server::{Connection, Notification, Request, Response};
-use lsp_types::notification::Notification as _;
+use lsp_types::{notification::Notification as _, DidChangeTextDocumentParams};
 use ra_db::VfsPath;
 use ra_ide::{Canceled, FileId};
 use ra_prof::profile;
@@ -15,12 +16,15 @@ use ra_prof::profile;
 use crate::{
    config::Config,
    dispatch::{NotificationDispatcher, RequestDispatcher},
+    document::DocumentData,
    from_proto,
    global_state::{file_id_to_url, url_to_file_id, GlobalState, Status},
    handlers, lsp_ext,
    lsp_utils::{apply_document_changes, is_canceled, notification_is, Progress},
    Result,
 };
+use ra_project_model::ProjectWorkspace;
+use vfs::ChangeKind;
 pub fn main_loop(config: Config, connection: Connection) -> Result<()> {
    log::info!("initial config: {:#?}", config);
@@ -58,6 +62,7 @@ enum Event {
 pub(crate) enum Task {
    Response(Response),
    Diagnostics(Vec<(FileId, Vec<lsp_types::Diagnostic>)>),
+    Workspaces(Vec<anyhow::Result<ProjectWorkspace>>),
    Unit,
 }
@@ -94,24 +99,49 @@ impl fmt::Debug for Event {
 }
 impl GlobalState {
-    fn next_event(&self, inbox: &Receiver<lsp_server::Message>) -> Option<Event> {
+    fn run(mut self, inbox: Receiver<lsp_server::Message>) -> Result<()> {
-        select! {
+        if self.config.linked_projects.is_empty() && self.config.notifications.cargo_toml_not_found
-            recv(inbox) -> msg =>
+        {
-                msg.ok().map(Event::Lsp),
+            self.show_message(
+                lsp_types::MessageType::Error,
-            recv(self.task_pool.receiver) -> task =>
+                "rust-analyzer failed to discover workspace".to_string(),
-                Some(Event::Task(task.unwrap())),
+            );
+        };
-            recv(self.loader.receiver) -> task =>
+        let save_registration_options = lsp_types::TextDocumentSaveRegistrationOptions {
-                Some(Event::Vfs(task.unwrap())),
+            include_text: Some(false),
+            text_document_registration_options: lsp_types::TextDocumentRegistrationOptions {
+                document_selector: Some(vec![
+                    lsp_types::DocumentFilter {
+                        language: None,
+                        scheme: None,
+                        pattern: Some("**/*.rs".into()),
+                    },
+                    lsp_types::DocumentFilter {
+                        language: None,
+                        scheme: None,
+                        pattern: Some("**/Cargo.toml".into()),
+                    },
+                    lsp_types::DocumentFilter {
+                        language: None,
+                        scheme: None,
+                        pattern: Some("**/Cargo.lock".into()),
+                    },
+                ]),
+            },
+        };
-            recv(self.flycheck.as_ref().map_or(&never(), |it| &it.receiver)) -> task =>
+        let registration = lsp_types::Registration {
-                Some(Event::Flycheck(task.unwrap())),
+            id: "textDocument/didSave".to_string(),
-        }
+            method: "textDocument/didSave".to_string(),
-    }
+            register_options: Some(serde_json::to_value(save_registration_options).unwrap()),
+        };
+        self.send_request::<lsp_types::request::RegisterCapability>(
+            lsp_types::RegistrationParams { registrations: vec![registration] },
+            |_, _| (),
+        );
-    fn run(mut self, inbox: Receiver<lsp_server::Message>) -> Result<()> {
+        self.fetch_workspaces();
-        self.reload();
        while let Some(event) = self.next_event(&inbox) {
            if let Event::Lsp(lsp_server::Message::Notification(not)) = &event {
@@ -125,6 +155,22 @@ impl GlobalState {
        Err("client exited without proper shutdown sequence")?
    }
+    fn next_event(&self, inbox: &Receiver<lsp_server::Message>) -> Option<Event> {
+        select! {
+            recv(inbox) -> msg =>
+                msg.ok().map(Event::Lsp),
+            recv(self.task_pool.receiver) -> task =>
+                Some(Event::Task(task.unwrap())),
+            recv(self.loader.receiver) -> task =>
+                Some(Event::Vfs(task.unwrap())),
+            recv(self.flycheck_receiver) -> task =>
+                Some(Event::Flycheck(task.unwrap())),
+        }
+    }
    fn handle_event(&mut self, event: Event) -> Result<()> {
        let loop_start = Instant::now();
        // NOTE: don't count blocking select! call as a loop-turn time
@@ -136,7 +182,7 @@ impl GlobalState {
            log::info!("queued count = {}", queue_count);
        }
-        let mut became_ready = false;
+        let prev_status = self.status;
        match event {
            Event::Lsp(msg) => match msg {
                lsp_server::Message::Request(req) => self.on_request(loop_start, req)?,
@@ -153,39 +199,54 @@ impl GlobalState {
                            self.diagnostics.set_native_diagnostics(file_id, diagnostics)
                        }
                    }
+                    Task::Workspaces(workspaces) => self.switch_workspaces(workspaces),
                    Task::Unit => (),
                }
                self.analysis_host.maybe_collect_garbage();
            }
-            Event::Vfs(task) => match task {
+            Event::Vfs(mut task) => {
-                vfs::loader::Message::Loaded { files } => {
+                let _p = profile("GlobalState::handle_event/vfs");
-                    let vfs = &mut self.vfs.write().0;
+                loop {
-                    for (path, contents) in files {
+                    match task {
-                        let path = VfsPath::from(path);
+                        vfs::loader::Message::Loaded { files } => {
-                        if !self.mem_docs.contains(&path) {
+                            let vfs = &mut self.vfs.write().0;
-                            vfs.set_file_contents(path, contents)
+                            for (path, contents) in files {
+                                let path = VfsPath::from(path);
+                                if !self.mem_docs.contains_key(&path) {
+                                    vfs.set_file_contents(path, contents)
+                                }
+                            }
+                        }
+                        vfs::loader::Message::Progress { n_total, n_done } => {
+                            if n_total == 0 {
+                                self.transition(Status::Invalid);
+                            } else {
+                                let state = if n_done == 0 {
+                                    self.transition(Status::Loading);
+                                    Progress::Begin
+                                } else if n_done < n_total {
+                                    Progress::Report
+                                } else {
+                                    assert_eq!(n_done, n_total);
+                                    self.transition(Status::Ready);
+                                    Progress::End
+                                };
+                                self.report_progress(
+                                    "roots scanned",
+                                    state,
+                                    Some(format!("{}/{}", n_done, n_total)),
+                                    Some(Progress::percentage(n_done, n_total)),
+                                )
+                            }
                        }
                    }
+                    // Coalesce many VFS event into a single loop turn
+                    task = match self.loader.receiver.try_recv() {
+                        Ok(task) => task,
+                        Err(_) => break,
+                    }
                }
-                vfs::loader::Message::Progress { n_total, n_done } => {
+            }
-                    let state = if n_done == 0 {
-                        Progress::Begin
-                    } else if n_done < n_total {
-                        Progress::Report
-                    } else {
-                        assert_eq!(n_done, n_total);
-                        self.status = Status::Ready;
-                        became_ready = true;
-                        Progress::End
-                    };
-                    self.report_progress(
-                        "roots scanned",
-                        state,
-                        Some(format!("{}/{}", n_done, n_total)),
-                        Some(Progress::percentage(n_done, n_total)),
-                    )
-                }
-            },
            Event::Flycheck(task) => match task {
                flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => {
                    let diagnostics = crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp(
@@ -194,7 +255,7 @@ impl GlobalState {
                        &workspace_root,
                    );
                    for diag in diagnostics {
-                        match url_to_file_id(&self.vfs.read().0, &diag.location.uri) {
+                        match url_to_file_id(&self.vfs.read().0, &diag.url) {
                            Ok(file_id) => self.diagnostics.add_check_diagnostic(
                                file_id,
                                diag.diagnostic,
@@ -231,16 +292,16 @@ impl GlobalState {
        }
        let state_changed = self.process_changes();
-        if became_ready {
+        if prev_status == Status::Loading && self.status == Status::Ready {
            if let Some(flycheck) = &self.flycheck {
-                flycheck.handle.update();
+                flycheck.update();
            }
        }
-        if self.status == Status::Ready && (state_changed || became_ready) {
+        if self.status == Status::Ready && (state_changed || prev_status == Status::Loading) {
            let subscriptions = self
                .mem_docs
-                .iter()
+                .keys()
                .map(|path| self.vfs.read().0.file_id(&path).unwrap())
                .collect::<Vec<_>>();
@@ -251,8 +312,12 @@ impl GlobalState {
            for file_id in diagnostic_changes {
                let url = file_id_to_url(&self.vfs.read().0, file_id);
                let diagnostics = self.diagnostics.diagnostics_for(file_id).cloned().collect();
+                let version = from_proto::vfs_path(&url)
+                    .map(|path| self.mem_docs.get(&path)?.version)
+                    .unwrap_or_default();
                self.send_notification::<lsp_types::notification::PublishDiagnostics>(
-                    lsp_types::PublishDiagnosticsParams { uri: url, diagnostics, version: None },
+                    lsp_types::PublishDiagnosticsParams { uri: url, diagnostics, version },
                );
            }
        }
@@ -274,7 +339,7 @@ impl GlobalState {
        self.register_request(&req, request_received);
        RequestDispatcher { req: Some(req), global_state: self }
-            .on_sync::<lsp_ext::CollectGarbage>(|s, ()| Ok(s.analysis_host.collect_garbage()))?
+            .on_sync::<lsp_ext::ReloadWorkspace>(|s, ()| Ok(s.fetch_workspaces()))?
            .on_sync::<lsp_ext::JoinLines>(|s, p| handlers::handle_join_lines(s.snapshot(), p))?
            .on_sync::<lsp_ext::OnEnter>(|s, p| handlers::handle_on_enter(s.snapshot(), p))?
            .on_sync::<lsp_types::request::Shutdown>(|_, ()| Ok(()))?
@@ -284,6 +349,7 @@ impl GlobalState {
            .on_sync::<lsp_ext::MatchingBrace>(|s, p| {
                handlers::handle_matching_brace(s.snapshot(), p)
            })?
+            .on_sync::<lsp_ext::MemoryUsage>(|s, p| handlers::handle_memory_usage(s, p))?
            .on::<lsp_ext::AnalyzerStatus>(handlers::handle_analyzer_status)?
            .on::<lsp_ext::SyntaxTree>(handlers::handle_syntax_tree)?
            .on::<lsp_ext::ExpandMacro>(handlers::handle_expand_macro)?
@@ -340,7 +406,11 @@ impl GlobalState {
            })?
            .on::<lsp_types::notification::DidOpenTextDocument>(|this, params| {
                if let Ok(path) = from_proto::vfs_path(&params.text_document.uri) {
-                    if !this.mem_docs.insert(path.clone()) {
+                    if this
+                        .mem_docs
+                        .insert(path.clone(), DocumentData::new(params.text_document.version))
+                        .is_some()
+                    {
                        log::error!("duplicate DidOpenTextDocument: {}", path)
                    }
                    this.vfs
@@ -352,36 +422,56 @@ impl GlobalState {
            })?
            .on::<lsp_types::notification::DidChangeTextDocument>(|this, params| {
                if let Ok(path) = from_proto::vfs_path(&params.text_document.uri) {
-                    assert!(this.mem_docs.contains(&path));
+                    let DidChangeTextDocumentParams { text_document, content_changes } = params;
                    let vfs = &mut this.vfs.write().0;
+                    let world = this.snapshot();
                    let file_id = vfs.file_id(&path).unwrap();
+                    // let file_id = vfs.file_id(&path).unwrap();
                    let mut text = String::from_utf8(vfs.file_contents(file_id).to_vec()).unwrap();
-                    apply_document_changes(&mut text, params.content_changes);
+                    let line_index = world.analysis.file_line_index(file_id)?;
-                    vfs.set_file_contents(path, Some(text.into_bytes()))
+                    apply_document_changes(&mut text, content_changes, Cow::Borrowed(&line_index));
+                    // The version passed in DidChangeTextDocument is the version after all edits are applied
+                    // so we should apply it before the vfs is notified.
+                    let doc = this.mem_docs.get_mut(&path).unwrap();
+                    doc.version = text_document.version;
+                    vfs.set_file_contents(path.clone(), Some(text.into_bytes()));
                }
                Ok(())
            })?
            .on::<lsp_types::notification::DidCloseTextDocument>(|this, params| {
+                let mut version = None;
                if let Ok(path) = from_proto::vfs_path(&params.text_document.uri) {
-                    if !this.mem_docs.remove(&path) {
+                    match this.mem_docs.remove(&path) {
-                        log::error!("orphan DidCloseTextDocument: {}", path)
+                        Some(doc) => version = doc.version,
+                        None => log::error!("orphan DidCloseTextDocument: {}", path),
                    }
                    if let Some(path) = path.as_path() {
                        this.loader.handle.invalidate(path.to_path_buf());
                    }
                }
+                // Clear the diagnostics for the previously known version of the file.
+                // This prevents stale "cargo check" diagnostics if the file is
+                // closed, "cargo check" is run and then the file is reopened.
                this.send_notification::<lsp_types::notification::PublishDiagnostics>(
                    lsp_types::PublishDiagnosticsParams {
                        uri: params.text_document.uri,
                        diagnostics: Vec::new(),
-                        version: None,
+                        version,
                    },
                );
                Ok(())
            })?
-            .on::<lsp_types::notification::DidSaveTextDocument>(|this, _params| {
+            .on::<lsp_types::notification::DidSaveTextDocument>(|this, params| {
                if let Some(flycheck) = &this.flycheck {
-                    flycheck.handle.update();
+                    flycheck.update();
+                }
+                if let Ok(abs_path) = from_proto::abs_path(&params.text_document.uri) {
+                    this.maybe_refresh(&[(abs_path, ChangeKind::Modify)]);
                }
                Ok(())
            })?
@@ -403,10 +493,12 @@ impl GlobalState {
                            (Some(err), _) => {
                                log::error!("failed to fetch the server settings: {:?}", err)
                            }
-                            (None, Some(configs)) => {
+                            (None, Some(mut configs)) => {
-                                if let Some(new_config) = configs.get(0) {
+                                if let Some(json) = configs.get_mut(0) {
+                                    // Note that json can be null according to the spec if the client can't
+                                    // provide a configuration. This is handled in Config::update below.
                                    let mut config = this.config.clone();
-                                    config.update(&new_config);
+                                    config.update(json.take());
                                    this.update_configuration(config);
                                }
                            }
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index ec71f8b29..1907f2f13 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -1,81 +1,163 @@
 //! Project loading & configuration updates
 use std::{mem, sync::Arc};
-use crossbeam_channel::unbounded;
 use flycheck::FlycheckHandle;
 use ra_db::{CrateGraph, SourceRoot, VfsPath};
 use ra_ide::AnalysisChange;
-use ra_project_model::{PackageRoot, ProcMacroClient, ProjectWorkspace};
+use ra_prof::profile;
-use vfs::{file_set::FileSetConfig, AbsPath};
+use ra_project_model::{ProcMacroClient, ProjectWorkspace};
+use vfs::{file_set::FileSetConfig, AbsPath, AbsPathBuf, ChangeKind};
 use crate::{
    config::{Config, FilesWatcher, LinkedProject},
-    global_state::{GlobalState, Handle},
+    global_state::{GlobalState, Status},
+    lsp_ext,
+    main_loop::Task,
 };
 impl GlobalState {
    pub(crate) fn update_configuration(&mut self, config: Config) {
+        let _p = profile("GlobalState::update_configuration");
        let old_config = mem::replace(&mut self.config, config);
        if self.config.lru_capacity != old_config.lru_capacity {
            self.analysis_host.update_lru_capacity(old_config.lru_capacity);
        }
-        if self.config.flycheck != old_config.flycheck {
+        if self.config.linked_projects != old_config.linked_projects {
+            self.fetch_workspaces()
+        } else if self.config.flycheck != old_config.flycheck {
            self.reload_flycheck();
        }
    }
-    pub(crate) fn reload(&mut self) {
+    pub(crate) fn maybe_refresh(&mut self, changes: &[(AbsPathBuf, ChangeKind)]) {
-        let workspaces = {
+        if !changes.iter().any(|(path, kind)| is_interesting(path, *kind)) {
-            if self.config.linked_projects.is_empty()
+            return;
-                && self.config.notifications.cargo_toml_not_found
+        }
-            {
+        match self.status {
-                self.show_message(
+            Status::Loading | Status::NeedsReload => return,
-                    lsp_types::MessageType::Error,
+            Status::Ready | Status::Invalid => (),
-                    "rust-analyzer failed to discover workspace".to_string(),
+        }
-                );
+        if self.config.cargo_autoreload {
+            self.fetch_workspaces();
+        } else {
+            self.transition(Status::NeedsReload);
+        }
+        fn is_interesting(path: &AbsPath, change_kind: ChangeKind) -> bool {
+            const IMPLICIT_TARGET_FILES: &[&str] = &["build.rs", "src/main.rs", "src/lib.rs"];
+            const IMPLICIT_TARGET_DIRS: &[&str] = &["src/bin", "examples", "tests", "benches"];
+            if path.ends_with("Cargo.toml") || path.ends_with("Cargo.lock") {
+                return true;
+            }
+            if change_kind == ChangeKind::Modify {
+                return false;
+            }
+            if path.extension().unwrap_or_default() != "rs" {
+                return false;
+            }
+            if IMPLICIT_TARGET_FILES.iter().any(|it| path.ends_with(it)) {
+                return true;
+            }
+            let parent = match path.parent() {
+                Some(it) => it,
+                None => return false,
+            };
+            if IMPLICIT_TARGET_DIRS.iter().any(|it| parent.ends_with(it)) {
+                return true;
+            }
+            if path.ends_with("main.rs") {
+                let grand_parent = match parent.parent() {
+                    Some(it) => it,
+                    None => return false,
+                };
+                if IMPLICIT_TARGET_DIRS.iter().any(|it| grand_parent.ends_with(it)) {
+                    return true;
+                }
+            }
+            false
+        }
+    }
+    pub(crate) fn transition(&mut self, new_status: Status) {
+        self.status = new_status;
+        if self.config.client_caps.status_notification {
+            let lsp_status = match new_status {
+                Status::Loading => lsp_ext::Status::Loading,
+                Status::Ready => lsp_ext::Status::Ready,
+                Status::Invalid => lsp_ext::Status::Invalid,
+                Status::NeedsReload => lsp_ext::Status::NeedsReload,
            };
+            self.send_notification::<lsp_ext::StatusNotification>(lsp_status);
+        }
+    }
+    pub(crate) fn fetch_workspaces(&mut self) {
+        self.task_pool.handle.spawn({
+            let linked_projects = self.config.linked_projects.clone();
+            let cargo_config = self.config.cargo.clone();
+            let with_sysroot = self.config.with_sysroot.clone();
+            move || {
+                let workspaces = linked_projects
+                    .iter()
+                    .map(|project| match project {
+                        LinkedProject::ProjectManifest(manifest) => {
+                            ra_project_model::ProjectWorkspace::load(
+                                manifest.clone(),
+                                &cargo_config,
+                                with_sysroot,
+                            )
+                        }
+                        LinkedProject::InlineJsonProject(it) => {
+                            Ok(ra_project_model::ProjectWorkspace::Json { project: it.clone() })
+                        }
+                    })
+                    .collect::<Vec<_>>();
+                Task::Workspaces(workspaces)
+            }
+        });
+    }
+    pub(crate) fn switch_workspaces(&mut self, workspaces: Vec<anyhow::Result<ProjectWorkspace>>) {
+        let _p = profile("GlobalState::switch_workspaces");
+        log::info!("reloading projects: {:?}", self.config.linked_projects);
-            self.config
+        let mut has_errors = false;
-                .linked_projects
+        let workspaces = workspaces
-                .iter()
+            .into_iter()
-                .map(|project| match project {
+            .filter_map(|res| {
-                    LinkedProject::ProjectManifest(manifest) => {
+                res.map_err(|err| {
-                        ra_project_model::ProjectWorkspace::load(
+                    has_errors = true;
-                            manifest.clone(),
+                    log::error!("failed to load workspace: {:#}", err);
-                            &self.config.cargo,
+                    if self.workspaces.is_empty() {
-                            self.config.with_sysroot,
-                        )
-                    }
-                    LinkedProject::InlineJsonProject(it) => {
-                        Ok(ra_project_model::ProjectWorkspace::Json { project: it.clone() })
-                    }
-                })
-                .collect::<Vec<_>>()
-                .into_iter()
-                .filter_map(|res| {
-                    res.map_err(|err| {
-                        log::error!("failed to load workspace: {:#}", err);
                        self.show_message(
                            lsp_types::MessageType::Error,
                            format!("rust-analyzer failed to load workspace: {:#}", err),
                        );
-                    })
+                    }
-                    .ok()
                })
-                .collect::<Vec<_>>()
+                .ok()
-        };
+            })
+            .collect::<Vec<_>>();
+        if &*self.workspaces == &workspaces {
+            return;
+        }
+        if !self.workspaces.is_empty() && has_errors {
+            return;
+        }
        if let FilesWatcher::Client = self.config.files.watcher {
            let registration_options = lsp_types::DidChangeWatchedFilesRegistrationOptions {
                watchers: workspaces
                    .iter()
                    .flat_map(ProjectWorkspace::to_roots)
-                    .filter(PackageRoot::is_member)
+                    .filter(|it| it.is_member)
-                    .map(|root| format!("{}/**/*.rs", root.path().display()))
+                    .flat_map(|root| {
+                        root.include.into_iter().map(|it| format!("{}/**/*.rs", it.display()))
+                    })
                    .map(|glob_pattern| lsp_types::FileSystemWatcher { glob_pattern, kind: None })
                    .collect(),
            };
            let registration = lsp_types::Registration {
-                id: "file-watcher".to_string(),
+                id: "workspace/didChangeWatchedFiles".to_string(),
                method: "workspace/didChangeWatchedFiles".to_string(),
                register_options: Some(serde_json::to_value(registration_options).unwrap()),
            };
@@ -103,6 +185,7 @@ impl GlobalState {
                }
            },
        };
        let watch = match self.config.files.watcher {
            FilesWatcher::Client => vec![],
            FilesWatcher::Notify => project_folders.watch,
@@ -149,21 +232,20 @@ impl GlobalState {
            }
        };
-        // FIXME: Figure out the multi-workspace situation
+        let sender = self.flycheck_sender.clone();
-        self.flycheck = self.workspaces.iter().find_map(move |w| match w {
+        let sender = Box::new(move |msg| sender.send(msg).unwrap());
-            ProjectWorkspace::Cargo { cargo, .. } => {
+        self.flycheck = self
-                let (sender, receiver) = unbounded();
+            .workspaces
-                let sender = Box::new(move |msg| sender.send(msg).unwrap());
+            .iter()
+            // FIXME: Figure out the multi-workspace situation
+            .find_map(|w| match w {
+                ProjectWorkspace::Cargo { cargo, sysroot: _ } => Some(cargo),
+                ProjectWorkspace::Json { .. } => None,
+            })
+            .map(move |cargo| {
                let cargo_project_root = cargo.workspace_root().to_path_buf();
-                let handle =
+                FlycheckHandle::spawn(sender, config, cargo_project_root.into())
-                    FlycheckHandle::spawn(sender, config.clone(), cargo_project_root.into());
+            })
-                Some(Handle { handle, receiver })
-            }
-            ProjectWorkspace::Json { .. } => {
-                log::warn!("Cargo check watching only supported for cargo workspaces, disabling");
-                None
-            }
-        })
    }
 }
@@ -181,31 +263,23 @@ impl ProjectFolders {
        let mut local_filesets = vec![];
        for root in workspaces.iter().flat_map(|it| it.to_roots()) {
-            let path = root.path().to_owned();
+            let file_set_roots: Vec<VfsPath> =
+                root.include.iter().cloned().map(VfsPath::from).collect();
-            let mut file_set_roots: Vec<VfsPath> = vec![];
+            let entry = {
+                let mut dirs = vfs::loader::Directories::default();
-            let entry = if root.is_member() {
+                dirs.extensions.push("rs".into());
-                vfs::loader::Entry::local_cargo_package(path.to_path_buf())
+                dirs.include.extend(root.include);
-            } else {
+                dirs.exclude.extend(root.exclude);
-                vfs::loader::Entry::cargo_package_dependency(path.to_path_buf())
+                vfs::loader::Entry::Directories(dirs)
            };
-            res.load.push(entry);
-            if root.is_member() {
-                res.watch.push(res.load.len() - 1);
-            }
-            if let Some(out_dir) = root.out_dir() {
+            if root.is_member {
-                let out_dir = out_dir.to_path_buf();
+                res.watch.push(res.load.len());
-                res.load.push(vfs::loader::Entry::rs_files_recursively(out_dir.clone()));
-                if root.is_member() {
-                    res.watch.push(res.load.len() - 1);
-                }
-                file_set_roots.push(out_dir.into());
            }
-            file_set_roots.push(path.to_path_buf().into());
+            res.load.push(entry);
-            if root.is_member() {
+            if root.is_member {
                local_filesets.push(fsc.len());
            }
            fsc.add_file_set(file_set_roots)
@@ -226,6 +300,7 @@ pub(crate) struct SourceRootConfig {
 impl SourceRootConfig {
    pub(crate) fn partition(&self, vfs: &vfs::Vfs) -> Vec<SourceRoot> {
+        let _p = profile("SourceRootConfig::partition");
        self.fsc
            .partition(vfs)
            .into_iter()
diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs
index 10fe40cb5..576bd8adc 100644
--- a/crates/rust-analyzer/src/semantic_tokens.rs
+++ b/crates/rust-analyzer/src/semantic_tokens.rs
@@ -43,6 +43,7 @@ define_semantic_token_types![
    (FORMAT_SPECIFIER, "formatSpecifier"),
    (GENERIC, "generic"),
    (LIFETIME, "lifetime"),
+    (PUNCTUATION, "punctuation"),
    (SELF_KEYWORD, "selfKeyword"),
    (TYPE_ALIAS, "typeAlias"),
    (UNION, "union"),
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index f6cb8e4bb..fadcc5853 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -4,10 +4,10 @@ use std::path::{self, Path};
 use itertools::Itertools;
 use ra_db::{FileId, FileRange};
 use ra_ide::{
-    Assist, CompletionItem, CompletionItemKind, Documentation, FileSystemEdit, Fold, FoldKind,
+    Assist, AssistKind, CallInfo, CompletionItem, CompletionItemKind, Documentation,
-    FunctionSignature, Highlight, HighlightModifier, HighlightTag, HighlightedRange, Indel,
+    FileSystemEdit, Fold, FoldKind, Highlight, HighlightModifier, HighlightTag, HighlightedRange,
-    InlayHint, InlayKind, InsertTextFormat, LineIndex, NavigationTarget, ReferenceAccess,
+    Indel, InlayHint, InlayKind, InsertTextFormat, LineIndex, Markup, NavigationTarget,
-    ResolvedAssist, Runnable, Severity, SourceChange, SourceFileEdit, TextEdit,
+    ReferenceAccess, ResolvedAssist, Runnable, Severity, SourceChange, SourceFileEdit, TextEdit,
 };
 use ra_syntax::{SyntaxKind, TextRange, TextSize};
@@ -31,18 +31,18 @@ pub(crate) fn range(line_index: &LineIndex, range: TextRange) -> lsp_types::Rang
 pub(crate) fn symbol_kind(syntax_kind: SyntaxKind) -> lsp_types::SymbolKind {
    match syntax_kind {
-        SyntaxKind::FN_DEF => lsp_types::SymbolKind::Function,
+        SyntaxKind::FN => lsp_types::SymbolKind::Function,
-        SyntaxKind::STRUCT_DEF => lsp_types::SymbolKind::Struct,
+        SyntaxKind::STRUCT => lsp_types::SymbolKind::Struct,
-        SyntaxKind::ENUM_DEF => lsp_types::SymbolKind::Enum,
+        SyntaxKind::ENUM => lsp_types::SymbolKind::Enum,
-        SyntaxKind::ENUM_VARIANT => lsp_types::SymbolKind::EnumMember,
+        SyntaxKind::VARIANT => lsp_types::SymbolKind::EnumMember,
-        SyntaxKind::TRAIT_DEF => lsp_types::SymbolKind::Interface,
+        SyntaxKind::TRAIT => lsp_types::SymbolKind::Interface,
        SyntaxKind::MACRO_CALL => lsp_types::SymbolKind::Function,
        SyntaxKind::MODULE => lsp_types::SymbolKind::Module,
-        SyntaxKind::TYPE_ALIAS_DEF => lsp_types::SymbolKind::TypeParameter,
+        SyntaxKind::TYPE_ALIAS => lsp_types::SymbolKind::TypeParameter,
-        SyntaxKind::RECORD_FIELD_DEF => lsp_types::SymbolKind::Field,
+        SyntaxKind::RECORD_FIELD => lsp_types::SymbolKind::Field,
-        SyntaxKind::STATIC_DEF => lsp_types::SymbolKind::Constant,
+        SyntaxKind::STATIC => lsp_types::SymbolKind::Constant,
-        SyntaxKind::CONST_DEF => lsp_types::SymbolKind::Constant,
+        SyntaxKind::CONST => lsp_types::SymbolKind::Constant,
-        SyntaxKind::IMPL_DEF => lsp_types::SymbolKind::Object,
+        SyntaxKind::IMPL => lsp_types::SymbolKind::Object,
        _ => lsp_types::SymbolKind::Variable,
    }
 }
@@ -100,6 +100,7 @@ pub(crate) fn completion_item_kind(
        CompletionItemKind::TypeParam => lsp_types::CompletionItemKind::TypeParameter,
        CompletionItemKind::Macro => lsp_types::CompletionItemKind::Method,
        CompletionItemKind::Attribute => lsp_types::CompletionItemKind::EnumMember,
+        CompletionItemKind::UnresolvedReference => lsp_types::CompletionItemKind::Reference,
    }
 }
@@ -218,29 +219,76 @@ pub(crate) fn completion_item(
    res
 }
-pub(crate) fn signature_information(
+pub(crate) fn signature_help(
-    signature: FunctionSignature,
+    call_info: CallInfo,
    concise: bool,
-) -> lsp_types::SignatureInformation {
+    label_offsets: bool,
-    let (label, documentation, params) = if concise {
+) -> lsp_types::SignatureHelp {
-        let mut params = signature.parameters;
+    let (label, parameters) = match (concise, label_offsets) {
-        if signature.has_self_param {
+        (_, false) => {
-            params.remove(0);
+            let params = call_info
+                .parameter_labels()
+                .map(|label| lsp_types::ParameterInformation {
+                    label: lsp_types::ParameterLabel::Simple(label.to_string()),
+                    documentation: None,
+                })
+                .collect::<Vec<_>>();
+            let label =
+                if concise { call_info.parameter_labels().join(", ") } else { call_info.signature };
+            (label, params)
+        }
+        (false, true) => {
+            let params = call_info
+                .parameter_ranges()
+                .iter()
+                .map(|it| [u32::from(it.start()).into(), u32::from(it.end()).into()])
+                .map(|label_offsets| lsp_types::ParameterInformation {
+                    label: lsp_types::ParameterLabel::LabelOffsets(label_offsets),
+                    documentation: None,
+                })
+                .collect::<Vec<_>>();
+            (call_info.signature, params)
+        }
+        (true, true) => {
+            let mut params = Vec::new();
+            let mut label = String::new();
+            let mut first = true;
+            for param in call_info.parameter_labels() {
+                if !first {
+                    label.push_str(", ");
+                }
+                first = false;
+                let start = label.len() as u64;
+                label.push_str(param);
+                let end = label.len() as u64;
+                params.push(lsp_types::ParameterInformation {
+                    label: lsp_types::ParameterLabel::LabelOffsets([start, end]),
+                    documentation: None,
+                });
+            }
+            (label, params)
        }
-        (params.join(", "), None, params)
-    } else {
-        (signature.to_string(), signature.doc.map(documentation), signature.parameters)
    };
-    let parameters: Vec<lsp_types::ParameterInformation> = params
+    let documentation = if concise {
-        .into_iter()
+        None
-        .map(|param| lsp_types::ParameterInformation {
+    } else {
-            label: lsp_types::ParameterLabel::Simple(param),
+        call_info.doc.map(|doc| {
-            documentation: None,
+            lsp_types::Documentation::MarkupContent(lsp_types::MarkupContent {
+                kind: lsp_types::MarkupKind::Markdown,
+                value: doc,
+            })
        })
-        .collect();
+    };
-    lsp_types::SignatureInformation { label, documentation, parameters: Some(parameters) }
+    let signature =
+        lsp_types::SignatureInformation { label, documentation, parameters: Some(parameters) };
+    lsp_types::SignatureHelp {
+        signatures: vec![signature],
+        active_signature: None,
+        active_parameter: call_info.active_parameter.map(|it| it as i64),
+    }
 }
 pub(crate) fn inlay_int(line_index: &LineIndex, inlay_hint: InlayHint) -> lsp_ext::InlayHint {
@@ -308,6 +356,7 @@ fn semantic_token_type_and_modifiers(
        }
        HighlightTag::EnumVariant => semantic_tokens::ENUM_MEMBER,
        HighlightTag::Macro => lsp_types::SemanticTokenType::MACRO,
+        HighlightTag::ValueParam => lsp_types::SemanticTokenType::PARAMETER,
        HighlightTag::Local => lsp_types::SemanticTokenType::VARIABLE,
        HighlightTag::TypeParam => lsp_types::SemanticTokenType::TYPE_PARAMETER,
        HighlightTag::Lifetime => semantic_tokens::LIFETIME,
@@ -325,6 +374,7 @@ fn semantic_token_type_and_modifiers(
        HighlightTag::FormatSpecifier => semantic_tokens::FORMAT_SPECIFIER,
        HighlightTag::Operator => lsp_types::SemanticTokenType::OPERATOR,
        HighlightTag::EscapeSequence => semantic_tokens::ESCAPE_SEQUENCE,
+        HighlightTag::Punctuation => semantic_tokens::PUNCTUATION,
    };
    for modifier in highlight.modifiers.iter() {
@@ -352,7 +402,7 @@ pub(crate) fn folding_range(
    let kind = match fold.kind {
        FoldKind::Comment => Some(lsp_types::FoldingRangeKind::Comment),
        FoldKind::Imports => Some(lsp_types::FoldingRangeKind::Imports),
-        FoldKind::Mods | FoldKind::Block => None,
+        FoldKind::Mods | FoldKind::Block | FoldKind::ArgList => None,
    };
    let range = range(line_index, fold.range);
@@ -430,9 +480,10 @@ pub(crate) fn url_from_abs_path(path: &Path) -> lsp_types::Url {
 pub(crate) fn versioned_text_document_identifier(
    snap: &GlobalStateSnapshot,
    file_id: FileId,
-    version: Option<i64>,
 ) -> lsp_types::VersionedTextDocumentIdentifier {
-    lsp_types::VersionedTextDocumentIdentifier { uri: url(snap, file_id), version }
+    let url = url(snap, file_id);
+    let version = snap.url_file_version(&url);
+    lsp_types::VersionedTextDocumentIdentifier { uri: url, version }
 }
 pub(crate) fn location(
@@ -446,6 +497,18 @@ pub(crate) fn location(
    Ok(loc)
 }
+/// Perefer using `location_link`, if the client has the cap.
+pub(crate) fn location_from_nav(
+    snap: &GlobalStateSnapshot,
+    nav: NavigationTarget,
+) -> Result<lsp_types::Location> {
+    let url = url(snap, nav.file_id);
+    let line_index = snap.analysis.file_line_index(nav.file_id)?;
+    let range = range(&line_index, nav.full_range);
+    let loc = lsp_types::Location::new(url, range);
+    Ok(loc)
+}
 pub(crate) fn location_link(
    snap: &GlobalStateSnapshot,
    src: Option<FileRange>,
@@ -473,12 +536,12 @@ fn location_info(
    snap: &GlobalStateSnapshot,
    target: NavigationTarget,
 ) -> Result<(lsp_types::Url, lsp_types::Range, lsp_types::Range)> {
-    let line_index = snap.analysis.file_line_index(target.file_id())?;
+    let line_index = snap.analysis.file_line_index(target.file_id)?;
-    let target_uri = url(snap, target.file_id());
+    let target_uri = url(snap, target.file_id);
-    let target_range = range(&line_index, target.full_range());
+    let target_range = range(&line_index, target.full_range);
    let target_selection_range =
-        target.focus_range().map(|it| range(&line_index, it)).unwrap_or(target_range);
+        target.focus_range.map(|it| range(&line_index, it)).unwrap_or(target_range);
    Ok((target_uri, target_range, target_selection_range))
 }
@@ -497,13 +560,7 @@ pub(crate) fn goto_definition_response(
        let locations = targets
            .into_iter()
            .map(|nav| {
-                location(
+                location(snap, FileRange { file_id: nav.file_id, range: nav.focus_or_full_range() })
-                    snap,
-                    FileRange {
-                        file_id: nav.file_id(),
-                        range: nav.focus_range().unwrap_or(nav.range()),
-                    },
-                )
            })
            .collect::<Result<Vec<_>>>()?;
        Ok(locations.into())
@@ -515,7 +572,7 @@ pub(crate) fn snippet_text_document_edit(
    is_snippet: bool,
    source_file_edit: SourceFileEdit,
 ) -> Result<lsp_ext::SnippetTextDocumentEdit> {
-    let text_document = versioned_text_document_identifier(snap, source_file_edit.file_id, None);
+    let text_document = versioned_text_document_identifier(snap, source_file_edit.file_id);
    let line_index = snap.analysis.file_line_index(source_file_edit.file_id)?;
    let line_endings = snap.file_line_endings(source_file_edit.file_id);
    let edits = source_file_edit
@@ -608,13 +665,24 @@ pub(crate) fn call_hierarchy_item(
    snap: &GlobalStateSnapshot,
    target: NavigationTarget,
 ) -> Result<lsp_types::CallHierarchyItem> {
-    let name = target.name().to_string();
+    let name = target.name.to_string();
-    let detail = target.description().map(|it| it.to_string());
+    let detail = target.description.clone();
-    let kind = symbol_kind(target.kind());
+    let kind = symbol_kind(target.kind);
    let (uri, range, selection_range) = location_info(snap, target)?;
    Ok(lsp_types::CallHierarchyItem { name, kind, tags: None, detail, uri, range, selection_range })
 }
+pub(crate) fn code_action_kind(kind: AssistKind) -> lsp_types::CodeActionKind {
+    match kind {
+        AssistKind::None | AssistKind::Generate => lsp_types::CodeActionKind::EMPTY,
+        AssistKind::QuickFix => lsp_types::CodeActionKind::QUICKFIX,
+        AssistKind::Refactor => lsp_types::CodeActionKind::REFACTOR,
+        AssistKind::RefactorExtract => lsp_types::CodeActionKind::REFACTOR_EXTRACT,
+        AssistKind::RefactorInline => lsp_types::CodeActionKind::REFACTOR_INLINE,
+        AssistKind::RefactorRewrite => lsp_types::CodeActionKind::REFACTOR_REWRITE,
+    }
+}
 pub(crate) fn unresolved_code_action(
    snap: &GlobalStateSnapshot,
    assist: Assist,
@@ -624,9 +692,9 @@ pub(crate) fn unresolved_code_action(
        title: assist.label,
        id: Some(format!("{}:{}", assist.id.0.to_owned(), index.to_string())),
        group: assist.group.filter(|_| snap.config.client_caps.code_action_group).map(|gr| gr.0),
-        kind: Some(String::new()),
+        kind: Some(code_action_kind(assist.id.1)),
        edit: None,
-        command: None,
+        is_preferred: None,
    };
    Ok(res)
 }
@@ -654,7 +722,7 @@ pub(crate) fn runnable(
    let workspace_root = spec.as_ref().map(|it| it.workspace_root.clone());
    let target = spec.as_ref().map(|s| s.target.clone());
    let (cargo_args, executable_args) =
-        CargoTargetSpec::runnable_args(spec, &runnable.kind, &runnable.cfg_exprs)?;
+        CargoTargetSpec::runnable_args(snap, spec, &runnable.kind, &runnable.cfg_exprs)?;
    let label = runnable.label(target);
    let location = location_link(snap, None, runnable.nav)?;
@@ -666,38 +734,38 @@ pub(crate) fn runnable(
            workspace_root: workspace_root.map(|it| it.into()),
            cargo_args,
            executable_args,
+            expect_test: None,
        },
    })
 }
+pub(crate) fn markup_content(markup: Markup) -> lsp_types::MarkupContent {
+    lsp_types::MarkupContent { kind: lsp_types::MarkupKind::Markdown, value: markup.into() }
+}
 #[cfg(test)]
 mod tests {
-    use test_utils::extract_ranges;
+    use ra_ide::Analysis;
    use super::*;
    #[test]
    fn conv_fold_line_folding_only_fixup() {
-        let text = r#"<fold>mod a;
+        let text = r#"mod a;
 mod b;
-mod c;</fold>
+mod c;
-fn main() <fold>{
+fn main() {
-    if cond <fold>{
+    if cond {
        a::do_a();
-    }</fold> else <fold>{
+    } else {
        b::do_b();
-    }</fold>
+    }
-}</fold>"#;
+}"#;
-        let (ranges, text) = extract_ranges(text, "fold");
+        let (analysis, file_id) = Analysis::from_single_file(text.to_string());
-        assert_eq!(ranges.len(), 4);
+        let folds = analysis.folding_ranges(file_id).unwrap();
-        let folds = vec![
+        assert_eq!(folds.len(), 4);
-            Fold { range: ranges[0], kind: FoldKind::Mods },
-            Fold { range: ranges[1], kind: FoldKind::Block },
-            Fold { range: ranges[2], kind: FoldKind::Block },
-            Fold { range: ranges[3], kind: FoldKind::Block },
-        ];
        let line_index = LineIndex::new(&text);
        let converted: Vec<lsp_types::FoldingRange> =
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_clippy_pass_by_ref.snap b/crates/rust-analyzer/test_data/clippy_pass_by_ref.txt
index d7f9ec049..d06517126 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_clippy_pass_by_ref.snap
+++ b/crates/rust-analyzer/test_data/clippy_pass_by_ref.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/compiler/mir/tagset.rs",
-            uri: "file:///test/compiler/mir/tagset.rs",
-            range: Range {
-                start: Position {
-                    line: 41,
-                    character: 23,
-                },
-                end: Position {
-                    line: 41,
-                    character: 28,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_handles_macro_location.snap b/crates/rust-analyzer/test_data/handles_macro_location.txt
index a59faf254..f5de2f07f 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_handles_macro_location.snap
+++ b/crates/rust-analyzer/test_data/handles_macro_location.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/src/main.rs",
-            uri: "file:///test/src/main.rs",
-            range: Range {
-                start: Position {
-                    line: 1,
-                    character: 4,
-                },
-                end: Position {
-                    line: 1,
-                    character: 26,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_macro_compiler_error.snap b/crates/rust-analyzer/test_data/macro_compiler_error.txt
index 3c78e7f36..f695db73c 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_macro_compiler_error.snap
+++ b/crates/rust-analyzer/test_data/macro_compiler_error.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/crates/ra_hir_def/src/data.rs",
-            uri: "file:///test/crates/ra_hir_def/src/data.rs",
-            range: Range {
-                start: Position {
-                    line: 79,
-                    character: 15,
-                },
-                end: Position {
-                    line: 79,
-                    character: 41,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_incompatible_type_for_trait.snap b/crates/rust-analyzer/test_data/rustc_incompatible_type_for_trait.txt
index 46d0c56d2..fc54440be 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_incompatible_type_for_trait.snap
+++ b/crates/rust-analyzer/test_data/rustc_incompatible_type_for_trait.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/compiler/ty/list_iter.rs",
-            uri: "file:///test/compiler/ty/list_iter.rs",
-            range: Range {
-                start: Position {
-                    line: 51,
-                    character: 4,
-                },
-                end: Position {
-                    line: 51,
-                    character: 47,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_mismatched_type.snap b/crates/rust-analyzer/test_data/rustc_mismatched_type.txt
index 4182929ba..c269af218 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_mismatched_type.snap
+++ b/crates/rust-analyzer/test_data/rustc_mismatched_type.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/runtime/compiler_support.rs",
-            uri: "file:///test/runtime/compiler_support.rs",
-            range: Range {
-                start: Position {
-                    line: 47,
-                    character: 64,
-                },
-                end: Position {
-                    line: 47,
-                    character: 69,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_unused_variable.snap b/crates/rust-analyzer/test_data/rustc_unused_variable.txt
index 9a7972ff5..74d91bc77 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_unused_variable.snap
+++ b/crates/rust-analyzer/test_data/rustc_unused_variable.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/driver/subcommand/repl.rs",
-            uri: "file:///test/driver/subcommand/repl.rs",
-            range: Range {
-                start: Position {
-                    line: 290,
-                    character: 8,
-                },
-                end: Position {
-                    line: 290,
-                    character: 11,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
@@ -53,9 +37,10 @@ expression: diag
                id: None,
                group: None,
                kind: Some(
-                    "quickfix",
+                    CodeActionKind(
+                        "quickfix",
+                    ),
                ),
-                command: None,
                edit: Some(
                    SnippetWorkspaceEdit {
                        changes: Some(
@@ -80,6 +65,9 @@ expression: diag
                        document_changes: None,
                    },
                ),
+                is_preferred: Some(
+                    true,
+                ),
            },
        ],
    },
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_unused_variable_as_hint.snap b/crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt
index f0273315e..8a420c949 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_unused_variable_as_hint.snap
+++ b/crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/driver/subcommand/repl.rs",
-            uri: "file:///test/driver/subcommand/repl.rs",
-            range: Range {
-                start: Position {
-                    line: 290,
-                    character: 8,
-                },
-                end: Position {
-                    line: 290,
-                    character: 11,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
@@ -53,9 +37,10 @@ expression: diag
                id: None,
                group: None,
                kind: Some(
-                    "quickfix",
+                    CodeActionKind(
+                        "quickfix",
+                    ),
                ),
-                command: None,
                edit: Some(
                    SnippetWorkspaceEdit {
                        changes: Some(
@@ -80,6 +65,9 @@ expression: diag
                        document_changes: None,
                    },
                ),
+                is_preferred: Some(
+                    true,
+                ),
            },
        ],
    },
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_unused_variable_as_info.snap b/crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt
index 85fd050fd..79910660b 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_unused_variable_as_info.snap
+++ b/crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/driver/subcommand/repl.rs",
-            uri: "file:///test/driver/subcommand/repl.rs",
-            range: Range {
-                start: Position {
-                    line: 290,
-                    character: 8,
-                },
-                end: Position {
-                    line: 290,
-                    character: 11,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
@@ -53,9 +37,10 @@ expression: diag
                id: None,
                group: None,
                kind: Some(
-                    "quickfix",
+                    CodeActionKind(
+                        "quickfix",
+                    ),
                ),
-                command: None,
                edit: Some(
                    SnippetWorkspaceEdit {
                        changes: Some(
@@ -80,6 +65,9 @@ expression: diag
                        document_changes: None,
                    },
                ),
+                is_preferred: Some(
+                    true,
+                ),
            },
        ],
    },
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_wrong_number_of_parameters.snap b/crates/rust-analyzer/test_data/rustc_wrong_number_of_parameters.txt
index f6ab05004..efe37261d 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_rustc_wrong_number_of_parameters.snap
+++ b/crates/rust-analyzer/test_data/rustc_wrong_number_of_parameters.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/compiler/ty/select.rs",
-            uri: "file:///test/compiler/ty/select.rs",
-            range: Range {
-                start: Position {
-                    line: 103,
-                    character: 17,
-                },
-                end: Position {
-                    line: 103,
-                    character: 29,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
diff --git a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_multi_line_fix.snap b/crates/rust-analyzer/test_data/snap_multi_line_fix.txt
index 272057b47..4f811ab64 100644
--- a/crates/rust-analyzer/src/diagnostics/snapshots/rust_analyzer__diagnostics__to_proto__tests__snap_multi_line_fix.snap
+++ b/crates/rust-analyzer/test_data/snap_multi_line_fix.txt
@@ -1,22 +1,6 @@
---
-source: crates/rust-analyzer/src/diagnostics/to_proto.rs
-expression: diag
---
 [
    MappedRustDiagnostic {
-        location: Location {
+        url: "file:///test/src/main.rs",
-            uri: "file:///test/src/main.rs",
-            range: Range {
-                start: Position {
-                    line: 3,
-                    character: 4,
-                },
-                end: Position {
-                    line: 3,
-                    character: 5,
-                },
-            },
-        },
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
@@ -68,9 +52,10 @@ expression: diag
                id: None,
                group: None,
                kind: Some(
-                    "quickfix",
+                    CodeActionKind(
+                        "quickfix",
+                    ),
                ),
-                command: None,
                edit: Some(
                    SnippetWorkspaceEdit {
                        changes: Some(
@@ -108,6 +93,9 @@ expression: diag
                        document_changes: None,
                    },
                ),
+                is_preferred: Some(
+                    true,
+                ),
            },
        ],
    },
diff --git a/crates/rust-analyzer/tests/heavy_tests/main.rs b/crates/rust-analyzer/tests/heavy_tests/main.rs
index ea80705aa..91ce04731 100644
--- a/crates/rust-analyzer/tests/heavy_tests/main.rs
+++ b/crates/rust-analyzer/tests/heavy_tests/main.rs
@@ -1,3 +1,4 @@
+mod testdir;
 mod support;
 use std::{collections::HashMap, path::PathBuf, time::Instant};
@@ -12,10 +13,12 @@ use lsp_types::{
 };
 use rust_analyzer::lsp_ext::{OnEnter, Runnables, RunnablesParams};
 use serde_json::json;
-use tempfile::TempDir;
 use test_utils::skip_slow_tests;
-use crate::support::{project, Project};
+use crate::{
+    support::{project, Project},
+    testdir::TestDir,
+};
 const PROFILE: &str = "";
 // const PROFILE: &'static str = "*@3>100";
@@ -112,21 +115,21 @@ fn main() {}
          },
          {
            "args": {
-              "cargoArgs": ["check", "--package", "foo"],
+              "cargoArgs": ["check", "--package", "foo", "--all-targets"],
              "executableArgs": [],
              "workspaceRoot": server.path().join("foo")
            },
            "kind": "cargo",
-            "label": "cargo check -p foo"
+            "label": "cargo check -p foo --all-targets"
          },
          {
            "args": {
-              "cargoArgs": ["test", "--package", "foo"],
+              "cargoArgs": ["test", "--package", "foo", "--all-targets"],
              "executableArgs": [],
              "workspaceRoot": server.path().join("foo")
            },
            "kind": "cargo",
-            "label": "cargo test -p foo"
+            "label": "cargo test -p foo --all-targets"
          }
        ]),
    );
@@ -284,6 +287,7 @@ fn main() {}
                }
              ]
            },
+            "isPreferred": false,
            "kind": "quickfix",
            "title": "Create module"
        }]),
@@ -307,7 +311,7 @@ fn test_missing_module_code_action_in_json_project() {
        return;
    }
-    let tmp_dir = TempDir::new().unwrap();
+    let tmp_dir = TestDir::new();
    let path = tmp_dir.path();
@@ -317,7 +321,7 @@ fn test_missing_module_code_action_in_json_project() {
            "root_module": path.join("src/lib.rs"),
            "deps": [],
            "edition": "2015",
-            "cfg": [ "cfg_atom_1", "feature=cfg_1"],
+            "cfg": [ "cfg_atom_1", "feature=\"cfg_1\""],
        } ]
    });
@@ -355,6 +359,7 @@ fn main() {{}}
                }
              ]
            },
+            "isPreferred": false,
            "kind": "quickfix",
            "title": "Create module"
        }]),
@@ -447,6 +452,7 @@ version = \"0.0.0\"
 ",
    )
    .server();
+    server.wait_until_workspace_is_loaded();
    server.request::<OnEnter>(
        TextDocumentPositionParams {
diff --git a/crates/rust-analyzer/tests/heavy_tests/support.rs b/crates/rust-analyzer/tests/heavy_tests/support.rs
index 49f194f7e..f242c8165 100644
--- a/crates/rust-analyzer/tests/heavy_tests/support.rs
+++ b/crates/rust-analyzer/tests/heavy_tests/support.rs
@@ -12,22 +12,22 @@ use lsp_types::{
    notification::Exit, request::Shutdown, TextDocumentIdentifier, Url, WorkDoneProgress,
 };
 use lsp_types::{ProgressParams, ProgressParamsValue};
-use serde::Serialize;
-use serde_json::{to_string_pretty, Value};
-use tempfile::TempDir;
-use test_utils::{find_mismatch, Fixture};
-use ra_db::AbsPathBuf;
 use ra_project_model::ProjectManifest;
 use rust_analyzer::{
    config::{ClientCapsConfig, Config, FilesConfig, FilesWatcher, LinkedProject},
    main_loop,
 };
+use serde::Serialize;
+use serde_json::{to_string_pretty, Value};
+use test_utils::{find_mismatch, Fixture};
+use vfs::AbsPathBuf;
+use crate::testdir::TestDir;
 pub struct Project<'a> {
    fixture: &'a str,
    with_sysroot: bool,
-    tmp_dir: Option<TempDir>,
+    tmp_dir: Option<TestDir>,
    roots: Vec<PathBuf>,
    config: Option<Box<dyn Fn(&mut Config)>>,
 }
@@ -37,7 +37,7 @@ impl<'a> Project<'a> {
        Project { fixture, tmp_dir: None, roots: vec![], with_sysroot: false, config: None }
    }
-    pub fn tmp_dir(mut self, tmp_dir: TempDir) -> Project<'a> {
+    pub fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> {
        self.tmp_dir = Some(tmp_dir);
        self
    }
@@ -58,7 +58,7 @@ impl<'a> Project<'a> {
    }
    pub fn server(self) -> Server {
-        let tmp_dir = self.tmp_dir.unwrap_or_else(|| TempDir::new().unwrap());
+        let tmp_dir = self.tmp_dir.unwrap_or_else(|| TestDir::new());
        static INIT: Once = Once::new();
        INIT.call_once(|| {
            env_logger::builder().is_test(true).try_init().unwrap();
@@ -113,11 +113,11 @@ pub struct Server {
    _thread: jod_thread::JoinHandle<()>,
    client: Connection,
    /// XXX: remove the tempdir last
-    dir: TempDir,
+    dir: TestDir,
 }
 impl Server {
-    fn new(dir: TempDir, config: Config) -> Server {
+    fn new(dir: TestDir, config: Config) -> Server {
        let (connection, client) = Connection::memory();
        let _thread = jod_thread::Builder::new()
@@ -176,12 +176,19 @@ impl Server {
        while let Some(msg) = self.recv() {
            match msg {
                Message::Request(req) => {
-                    if req.method != "window/workDoneProgress/create"
+                    if req.method == "window/workDoneProgress/create" {
-                        && !(req.method == "client/registerCapability"
+                        continue;
-                            && req.params.to_string().contains("workspace/didChangeWatchedFiles"))
+                    }
-                    {
+                    if req.method == "client/registerCapability" {
-                        panic!("unexpected request: {:?}", req)
+                        let params = req.params.to_string();
+                        if ["workspace/didChangeWatchedFiles", "textDocument/didSave"]
+                            .iter()
+                            .any(|&it| params.contains(it))
+                        {
+                            continue;
+                        }
                    }
+                    panic!("unexpected request: {:?}", req)
                }
                Message::Notification(_) => (),
                Message::Response(res) => {
@@ -246,7 +253,8 @@ impl Drop for Server {
 }
 fn recv_timeout(receiver: &Receiver<Message>) -> Option<Message> {
-    let timeout = Duration::from_secs(120);
+    let timeout =
+        if cfg!(target_os = "macos") { Duration::from_secs(300) } else { Duration::from_secs(120) };
    select! {
        recv(receiver) -> msg => msg.ok(),
        recv(after(timeout)) -> _ => panic!("timed out"),
diff --git a/crates/rust-analyzer/tests/heavy_tests/testdir.rs b/crates/rust-analyzer/tests/heavy_tests/testdir.rs
new file mode 100644
index 000000000..7487e7429
--- /dev/null
+++ b/crates/rust-analyzer/tests/heavy_tests/testdir.rs
@@ -0,0 +1,62 @@
+use std::{
+    fs, io,
+    path::{Path, PathBuf},
+    sync::atomic::{AtomicUsize, Ordering},
+};
+pub struct TestDir {
+    path: PathBuf,
+    keep: bool,
+}
+impl TestDir {
+    pub fn new() -> TestDir {
+        let base = std::env::temp_dir().join("testdir");
+        let pid = std::process::id();
+        static CNT: AtomicUsize = AtomicUsize::new(0);
+        for _ in 0..100 {
+            let cnt = CNT.fetch_add(1, Ordering::Relaxed);
+            let path = base.join(format!("{}_{}", pid, cnt));
+            if path.is_dir() {
+                continue;
+            }
+            fs::create_dir_all(&path).unwrap();
+            return TestDir { path, keep: false };
+        }
+        panic!("Failed to create a temporary directory")
+    }
+    #[allow(unused)]
+    pub fn keep(mut self) -> TestDir {
+        self.keep = true;
+        self
+    }
+    pub fn path(&self) -> &Path {
+        &self.path
+    }
+}
+impl Drop for TestDir {
+    fn drop(&mut self) {
+        if self.keep {
+            return;
+        }
+        remove_dir_all(&self.path).unwrap()
+    }
+}
+#[cfg(not(windows))]
+fn remove_dir_all(path: &Path) -> io::Result<()> {
+    fs::remove_dir_all(path)
+}
+#[cfg(windows)]
+fn remove_dir_all(path: &Path) -> io::Result<()> {
+    for _ in 0..99 {
+        if fs::remove_dir_all(path).is_ok() {
+            return Ok(());
+        }
+        std::thread::sleep(std::time::Duration::from_millis(10))
+    }
+    fs::remove_dir_all(path)
+}
diff --git a/crates/stdx/Cargo.toml b/crates/stdx/Cargo.toml
index f9e380c10..4c0b85861 100644
--- a/crates/stdx/Cargo.toml
+++ b/crates/stdx/Cargo.toml
@@ -3,6 +3,7 @@ name = "stdx"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 edition = "2018"
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs
index 08ac6f70f..b65875c96 100644
--- a/crates/stdx/src/lib.rs
+++ b/crates/stdx/src/lib.rs
@@ -1,30 +1,13 @@
 //! Missing batteries for standard libraries.
 use std::{cell::Cell, fmt, time::Instant};
+mod macros;
 #[inline(always)]
 pub fn is_ci() -> bool {
    option_env!("CI").is_some()
 }
-#[macro_export]
-macro_rules! eprintln {
-    ($($tt:tt)*) => {{
-        if $crate::is_ci() {
-            panic!("Forgot to remove debug-print?")
-        }
-        std::eprintln!($($tt)*)
-    }}
-}
-/// Appends formatted string to a `String`.
-#[macro_export]
-macro_rules! format_to {
-    ($buf:expr) => ();
-    ($buf:expr, $lit:literal $($arg:tt)*) => {
-        { use ::std::fmt::Write as _; let _ = ::std::write!($buf, $lit $($arg)*); }
-    };
-}
 pub trait SepBy: Sized {
    /// Returns an `impl fmt::Display`, which joins elements via a separator.
    fn sep_by<'a>(self, sep: &'a str) -> SepByBuilder<'a, Self>;
@@ -87,6 +70,8 @@ where
        Ok(())
    }
 }
+#[must_use]
 pub fn timeit(label: &'static str) -> impl Drop {
    struct Guard {
        label: &'static str,
@@ -124,9 +109,18 @@ pub fn replace(buf: &mut String, from: char, to: &str) {
    *buf = buf.replace(from, to)
 }
-pub fn split_delim(haystack: &str, delim: char) -> Option<(&str, &str)> {
+// https://github.com/rust-lang/rust/issues/74773
-    let idx = haystack.find(delim)?;
+pub fn split_once(haystack: &str, delim: char) -> Option<(&str, &str)> {
-    Some((&haystack[..idx], &haystack[idx + delim.len_utf8()..]))
+    let mut split = haystack.splitn(2, delim);
+    let prefix = split.next()?;
+    let suffix = split.next()?;
+    Some((prefix, suffix))
+}
+pub fn rsplit_once(haystack: &str, delim: char) -> Option<(&str, &str)> {
+    let mut split = haystack.rsplitn(2, delim);
+    let suffix = split.next()?;
+    let prefix = split.next()?;
+    Some((prefix, suffix))
 }
 pub fn trim_indent(mut text: &str) -> String {
@@ -173,6 +167,36 @@ impl<'a> Iterator for LinesWithEnds<'a> {
    }
 }
+// https://github.com/rust-lang/rust/issues/73831
+pub fn partition_point<T, P>(slice: &[T], mut pred: P) -> usize
+where
+    P: FnMut(&T) -> bool,
+{
+    let mut left = 0;
+    let mut right = slice.len();
+    while left != right {
+        let mid = left + (right - left) / 2;
+        // SAFETY:
+        // When left < right, left <= mid < right.
+        // Therefore left always increases and right always decreases,
+        // and either of them is selected.
+        // In both cases left <= right is satisfied.
+        // Therefore if left < right in a step,
+        // left <= right is satisfied in the next step.
+        // Therefore as long as left != right, 0 <= left < right <= len is satisfied
+        // and if this case 0 <= mid < len is satisfied too.
+        let value = unsafe { slice.get_unchecked(mid) };
+        if pred(value) {
+            left = mid + 1;
+        } else {
+            right = mid;
+        }
+    }
+    left
+}
 #[cfg(test)]
 mod tests {
    use super::*;
diff --git a/crates/stdx/src/macros.rs b/crates/stdx/src/macros.rs
new file mode 100644
index 000000000..bf298460f
--- /dev/null
+++ b/crates/stdx/src/macros.rs
@@ -0,0 +1,40 @@
+//! Convenience macros.
+#[macro_export]
+macro_rules! eprintln {
+    ($($tt:tt)*) => {{
+        if $crate::is_ci() {
+            panic!("Forgot to remove debug-print?")
+        }
+        std::eprintln!($($tt)*)
+    }}
+}
+/// Appends formatted string to a `String`.
+#[macro_export]
+macro_rules! format_to {
+    ($buf:expr) => ();
+    ($buf:expr, $lit:literal $($arg:tt)*) => {
+        { use ::std::fmt::Write as _; let _ = ::std::write!($buf, $lit $($arg)*); }
+    };
+}
+// Generates `From` impls for `Enum E { Foo(Foo), Bar(Bar) }` enums
+#[macro_export]
+macro_rules! impl_from {
+    ($($variant:ident $(($($sub_variant:ident),*))?),* for $enum:ident) => {
+        $(
+            impl From<$variant> for $enum {
+                fn from(it: $variant) -> $enum {
+                    $enum::$variant(it)
+                }
+            }
+            $($(
+                impl From<$sub_variant> for $enum {
+                    fn from(it: $sub_variant) -> $enum {
+                        $enum::$variant($variant::$sub_variant(it))
+                    }
+                }
+            )*)?
+        )*
+    }
+}
diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml
index 6821db1e8..e719f4f7c 100644
--- a/crates/test_utils/Cargo.toml
+++ b/crates/test_utils/Cargo.toml
@@ -3,6 +3,7 @@ edition = "2018"
 name = "test_utils"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
diff --git a/crates/test_utils/src/fixture.rs b/crates/test_utils/src/fixture.rs
index fad8f7e2c..e40b61a94 100644
--- a/crates/test_utils/src/fixture.rs
+++ b/crates/test_utils/src/fixture.rs
@@ -2,7 +2,7 @@
 //! rust-analyzer database from a single string.
 use rustc_hash::FxHashMap;
-use stdx::{lines_with_ends, split_delim, trim_indent};
+use stdx::{lines_with_ends, split_once, trim_indent};
 #[derive(Debug, Eq, PartialEq)]
 pub struct Fixture {
@@ -62,7 +62,7 @@ impl Fixture {
        let components = meta.split_ascii_whitespace().collect::<Vec<_>>();
        let path = components[0].to_string();
-        assert!(path.starts_with("/"));
+        assert!(path.starts_with('/'));
        let mut krate = None;
        let mut deps = Vec::new();
@@ -71,14 +71,14 @@ impl Fixture {
        let mut cfg_key_values = Vec::new();
        let mut env = FxHashMap::default();
        for component in components[1..].iter() {
-            let (key, value) = split_delim(component, ':').unwrap();
+            let (key, value) = split_once(component, ':').unwrap();
            match key {
                "crate" => krate = Some(value.to_string()),
                "deps" => deps = value.split(',').map(|it| it.to_string()).collect(),
                "edition" => edition = Some(value.to_string()),
                "cfg" => {
                    for entry in value.split(',') {
-                        match split_delim(entry, '=') {
+                        match split_once(entry, '=') {
                            Some((k, v)) => cfg_key_values.push((k.to_string(), v.to_string())),
                            None => cfg_atoms.push(entry.to_string()),
                        }
@@ -86,7 +86,7 @@ impl Fixture {
                }
                "env" => {
                    for key in value.split(',') {
-                        if let Some((k, v)) = split_delim(key, '=') {
+                        if let Some((k, v)) = split_once(key, '=') {
                            env.insert(k.into(), v.into());
                        }
                    }
diff --git a/crates/test_utils/src/lib.rs b/crates/test_utils/src/lib.rs
index caf847273..ad586c882 100644
--- a/crates/test_utils/src/lib.rs
+++ b/crates/test_utils/src/lib.rs
@@ -11,8 +11,9 @@ pub mod mark;
 mod fixture;
 use std::{
+    convert::{TryFrom, TryInto},
    env, fs,
-    path::{Path, PathBuf},
+    path::PathBuf,
 };
 use serde_json::Value;
@@ -117,8 +118,8 @@ pub fn extract_range_or_offset(text: &str) -> (RangeOrOffset, String) {
 }
 /// Extracts ranges, marked with `<tag> </tag>` pairs from the `text`
-pub fn extract_ranges(mut text: &str, tag: &str) -> (Vec<TextRange>, String) {
+pub fn extract_tags(mut text: &str, tag: &str) -> (Vec<(TextRange, Option<String>)>, String) {
-    let open = format!("<{}>", tag);
+    let open = format!("<{}", tag);
    let close = format!("</{}>", tag);
    let mut ranges = Vec::new();
    let mut res = String::new();
@@ -133,22 +134,35 @@ pub fn extract_ranges(mut text: &str, tag: &str) -> (Vec<TextRange>, String) {
                res.push_str(&text[..i]);
                text = &text[i..];
                if text.starts_with(&open) {
-                    text = &text[open.len()..];
+                    let close_open = text.find('>').unwrap();
+                    let attr = text[open.len()..close_open].trim();
+                    let attr = if attr.is_empty() { None } else { Some(attr.to_string()) };
+                    text = &text[close_open + '>'.len_utf8()..];
                    let from = TextSize::of(&res);
-                    stack.push(from);
+                    stack.push((from, attr));
                } else if text.starts_with(&close) {
                    text = &text[close.len()..];
-                    let from = stack.pop().unwrap_or_else(|| panic!("unmatched </{}>", tag));
+                    let (from, attr) =
+                        stack.pop().unwrap_or_else(|| panic!("unmatched </{}>", tag));
                    let to = TextSize::of(&res);
-                    ranges.push(TextRange::new(from, to));
+                    ranges.push((TextRange::new(from, to), attr));
+                } else {
+                    res.push('<');
+                    text = &text['<'.len_utf8()..];
                }
            }
        }
    }
    assert!(stack.is_empty(), "unmatched <{}>", tag);
-    ranges.sort_by_key(|r| (r.start(), r.end()));
+    ranges.sort_by_key(|r| (r.0.start(), r.0.end()));
    (ranges, res)
 }
+#[test]
+fn test_extract_tags() {
+    let (tags, text) = extract_tags(r#"<tag fn>fn <tag>main</tag>() {}</tag>"#, "tag");
+    let actual = tags.into_iter().map(|(range, attr)| (&text[range], attr)).collect::<Vec<_>>();
+    assert_eq!(actual, vec![("fn main() {}", Some("fn".into())), ("main", None),]);
+}
 /// Inserts `<|>` marker into the `text` at `offset`.
 pub fn add_cursor(text: &str, offset: TextSize) -> String {
@@ -165,15 +179,80 @@ pub fn extract_annotations(text: &str) -> Vec<(TextRange, String)> {
    let mut res = Vec::new();
    let mut prev_line_start: Option<TextSize> = None;
    let mut line_start: TextSize = 0.into();
+    let mut prev_line_annotations: Vec<(TextSize, usize)> = Vec::new();
    for line in lines_with_ends(text) {
-        if let Some(idx) = line.find("//^") {
+        let mut this_line_annotations = Vec::new();
-            let offset = prev_line_start.unwrap() + TextSize::of(&line[..idx + "//".len()]);
+        if let Some(idx) = line.find("//") {
-            let data = line[idx + "//^".len()..].trim().to_string();
+            let annotation_offset = TextSize::of(&line[..idx + "//".len()]);
-            res.push((TextRange::at(offset, 1.into()), data))
+            for annotation in extract_line_annotations(&line[idx + "//".len()..]) {
+                match annotation {
+                    LineAnnotation::Annotation { mut range, content } => {
+                        range += annotation_offset;
+                        this_line_annotations.push((range.end(), res.len()));
+                        res.push((range + prev_line_start.unwrap(), content))
+                    }
+                    LineAnnotation::Continuation { mut offset, content } => {
+                        offset += annotation_offset;
+                        let &(_, idx) = prev_line_annotations
+                            .iter()
+                            .find(|&&(off, _idx)| off == offset)
+                            .unwrap();
+                        res[idx].1.push('\n');
+                        res[idx].1.push_str(&content);
+                        res[idx].1.push('\n');
+                    }
+                }
+            }
        }
        prev_line_start = Some(line_start);
        line_start += TextSize::of(line);
+        prev_line_annotations = this_line_annotations;
+    }
+    res
+}
+enum LineAnnotation {
+    Annotation { range: TextRange, content: String },
+    Continuation { offset: TextSize, content: String },
+}
+fn extract_line_annotations(mut line: &str) -> Vec<LineAnnotation> {
+    let mut res = Vec::new();
+    let mut offset: TextSize = 0.into();
+    let marker: fn(char) -> bool = if line.contains('^') { |c| c == '^' } else { |c| c == '|' };
+    loop {
+        match line.find(marker) {
+            Some(idx) => {
+                offset += TextSize::try_from(idx).unwrap();
+                line = &line[idx..];
+            }
+            None => break,
+        };
+        let mut len = line.chars().take_while(|&it| it == '^').count();
+        let mut continuation = false;
+        if len == 0 {
+            assert!(line.starts_with('|'));
+            continuation = true;
+            len = 1;
+        }
+        let range = TextRange::at(offset, len.try_into().unwrap());
+        let next = line[len..].find(marker).map_or(line.len(), |it| it + len);
+        let content = line[len..][..next - len].trim().to_string();
+        let annotation = if continuation {
+            LineAnnotation::Continuation { offset: range.end(), content }
+        } else {
+            LineAnnotation::Annotation { range, content }
+        };
+        res.push(annotation);
+        line = &line[next..];
+        offset += TextSize::try_from(next).unwrap();
    }
    res
 }
@@ -182,17 +261,21 @@ fn test_extract_annotations() {
    let text = stdx::trim_indent(
        r#"
 fn main() {
-    let x = 92;
+    let (x,     y) = (9, 2);
-      //^ def
+       //^ def  ^ def
-    z + 1
+    zoo + 1
-} //^ i32
+} //^^^ type:
+  //  | i32
    "#,
    );
    let res = extract_annotations(&text)
        .into_iter()
        .map(|(range, ann)| (&text[range], ann))
        .collect::<Vec<_>>();
-    assert_eq!(res, vec![("x", "def".into()), ("z", "i32".into()),]);
+    assert_eq!(
+        res,
+        vec![("x", "def".into()), ("y", "def".into()), ("zoo", "type:\ni32\n".into()),]
+    );
 }
 // Comparison functionality borrowed from cargo:
@@ -282,85 +365,6 @@ pub fn find_mismatch<'a>(expected: &'a Value, actual: &'a Value) -> Option<(&'a
    }
 }
-/// Calls callback `f` with input code and file paths for each `.rs` file in `test_data_dir`
-/// subdirectories defined by `paths`.
-///
-/// If the content of the matching output file differs from the output of `f()`
-/// the test will fail.
-///
-/// If there is no matching output file it will be created and filled with the
-/// output of `f()`, but the test will fail.
-pub fn dir_tests<F>(test_data_dir: &Path, paths: &[&str], outfile_extension: &str, f: F)
-where
-    F: Fn(&str, &Path) -> String,
-{
-    for (path, input_code) in collect_rust_files(test_data_dir, paths) {
-        let actual = f(&input_code, &path);
-        let path = path.with_extension(outfile_extension);
-        if !path.exists() {
-            println!("\nfile: {}", path.display());
-            println!("No .txt file with expected result, creating...\n");
-            println!("{}\n{}", input_code, actual);
-            fs::write(&path, &actual).unwrap();
-            panic!("No expected result");
-        }
-        let expected = read_text(&path);
-        assert_equal_text(&expected, &actual, &path);
-    }
-}
-/// Collects all `.rs` files from `dir` subdirectories defined by `paths`.
-pub fn collect_rust_files(root_dir: &Path, paths: &[&str]) -> Vec<(PathBuf, String)> {
-    paths
-        .iter()
-        .flat_map(|path| {
-            let path = root_dir.to_owned().join(path);
-            rust_files_in_dir(&path).into_iter()
-        })
-        .map(|path| {
-            let text = read_text(&path);
-            (path, text)
-        })
-        .collect()
-}
-/// Collects paths to all `.rs` files from `dir` in a sorted `Vec<PathBuf>`.
-fn rust_files_in_dir(dir: &Path) -> Vec<PathBuf> {
-    let mut acc = Vec::new();
-    for file in fs::read_dir(&dir).unwrap() {
-        let file = file.unwrap();
-        let path = file.path();
-        if path.extension().unwrap_or_default() == "rs" {
-            acc.push(path);
-        }
-    }
-    acc.sort();
-    acc
-}
-/// Returns the path to the root directory of `rust-analyzer` project.
-pub fn project_dir() -> PathBuf {
-    let dir = env!("CARGO_MANIFEST_DIR");
-    PathBuf::from(dir).parent().unwrap().parent().unwrap().to_owned()
-}
-/// Read file and normalize newlines.
-///
-/// `rustc` seems to always normalize `\r\n` newlines to `\n`:
-///
-/// ```
-/// let s = "
-/// ";
-/// assert_eq!(s.as_bytes(), &[10]);
-/// ```
-///
-/// so this should always be correct.
-pub fn read_text(path: &Path) -> String {
-    fs::read_to_string(path)
-        .unwrap_or_else(|_| panic!("File at {:?} should be valid", path))
-        .replace("\r\n", "\n")
-}
 /// Returns `false` if slow tests should not run, otherwise returns `true` and
 /// also creates a file at `./target/.slow_tests_cookie` which serves as a flag
 /// that slow tests did run.
@@ -375,25 +379,8 @@ pub fn skip_slow_tests() -> bool {
    should_skip
 }
-/// Asserts that `expected` and `actual` strings are equal. If they differ only
+/// Returns the path to the root directory of `rust-analyzer` project.
-/// in trailing or leading whitespace the test won't fail and
+pub fn project_dir() -> PathBuf {
-/// the contents of `actual` will be written to the file located at `path`.
+    let dir = env!("CARGO_MANIFEST_DIR");
-fn assert_equal_text(expected: &str, actual: &str, path: &Path) {
+    PathBuf::from(dir).parent().unwrap().parent().unwrap().to_owned()
-    if expected == actual {
-        return;
-    }
-    let dir = project_dir();
-    let pretty_path = path.strip_prefix(&dir).unwrap_or_else(|_| path);
-    if expected.trim() == actual.trim() {
-        println!("whitespace difference, rewriting");
-        println!("file: {}\n", pretty_path.display());
-        fs::write(path, actual).unwrap();
-        return;
-    }
-    if env::var("UPDATE_EXPECTATIONS").is_ok() {
-        println!("rewriting {}", pretty_path.display());
-        fs::write(path, actual).unwrap();
-        return;
-    }
-    assert_eq_text!(expected, actual, "file: {}", pretty_path.display());
 }
diff --git a/crates/test_utils/src/mark.rs b/crates/test_utils/src/mark.rs
index 7c309a894..97f5a93ad 100644
--- a/crates/test_utils/src/mark.rs
+++ b/crates/test_utils/src/mark.rs
@@ -62,7 +62,7 @@ pub struct MarkChecker {
 impl MarkChecker {
    pub fn new(mark: &'static AtomicUsize) -> MarkChecker {
-        let value_on_entry = mark.load(Ordering::SeqCst);
+        let value_on_entry = mark.load(Ordering::Relaxed);
        MarkChecker { mark, value_on_entry }
    }
 }
@@ -72,7 +72,7 @@ impl Drop for MarkChecker {
        if std::thread::panicking() {
            return;
        }
-        let value_on_exit = self.mark.load(Ordering::SeqCst);
+        let value_on_exit = self.mark.load(Ordering::Relaxed);
        assert!(value_on_exit > self.value_on_entry, "mark was not hit")
    }
 }
diff --git a/crates/vfs-notify/Cargo.toml b/crates/vfs-notify/Cargo.toml
index 4737a52a7..fce7bae3a 100644
--- a/crates/vfs-notify/Cargo.toml
+++ b/crates/vfs-notify/Cargo.toml
@@ -3,13 +3,16 @@ name = "vfs-notify"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 edition = "2018"
+license = "MIT OR Apache-2.0"
+[lib]
+doctest = false
 [dependencies]
 log = "0.4.8"
 rustc-hash = "1.0"
 jod-thread = "0.1.0"
 walkdir = "2.3.1"
-globset = "0.4.5"
 crossbeam-channel = "0.4.0"
 notify = "5.0.0-pre.3"
diff --git a/crates/vfs-notify/src/include.rs b/crates/vfs-notify/src/include.rs
deleted file mode 100644
index 7378766f5..000000000
--- a/crates/vfs-notify/src/include.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-//! See `Include`.
-use std::convert::TryFrom;
-use globset::{Glob, GlobSet, GlobSetBuilder};
-use paths::{RelPath, RelPathBuf};
-/// `Include` is the opposite of .gitignore.
-///
-/// It describes the set of files inside some directory.
-///
-/// The current implementation is very limited, it allows white-listing file
-/// globs and black-listing directories.
-#[derive(Debug, Clone)]
-pub(crate) struct Include {
-    include_files: GlobSet,
-    exclude_dirs: Vec<RelPathBuf>,
-}
-impl Include {
-    pub(crate) fn new(include: Vec<String>) -> Include {
-        let mut include_files = GlobSetBuilder::new();
-        let mut exclude_dirs = Vec::new();
-        for glob in include {
-            if glob.starts_with("!/") {
-                if let Ok(path) = RelPathBuf::try_from(&glob["!/".len()..]) {
-                    exclude_dirs.push(path)
-                }
-            } else {
-                include_files.add(Glob::new(&glob).unwrap());
-            }
-        }
-        let include_files = include_files.build().unwrap();
-        Include { include_files, exclude_dirs }
-    }
-    pub(crate) fn include_file(&self, path: &RelPath) -> bool {
-        self.include_files.is_match(path)
-    }
-    pub(crate) fn exclude_dir(&self, path: &RelPath) -> bool {
-        self.exclude_dirs.iter().any(|excluded| path.starts_with(excluded))
-    }
-}
diff --git a/crates/vfs-notify/src/lib.rs b/crates/vfs-notify/src/lib.rs
index b1ea298ae..e1e36612a 100644
--- a/crates/vfs-notify/src/lib.rs
+++ b/crates/vfs-notify/src/lib.rs
@@ -6,19 +6,14 @@
 //!
 //! Hopefully, one day a reliable file watching/walking crate appears on
 //! crates.io, and we can reduce this to trivial glue code.
-mod include;
+use std::convert::TryFrom;
-use std::convert::{TryFrom, TryInto};
+use crossbeam_channel::{never, select, unbounded, Receiver, Sender};
-use crossbeam_channel::{select, unbounded, Receiver, Sender};
 use notify::{RecommendedWatcher, RecursiveMode, Watcher};
 use paths::{AbsPath, AbsPathBuf};
-use rustc_hash::FxHashSet;
 use vfs::loader;
 use walkdir::WalkDir;
-use crate::include::Include;
 #[derive(Debug)]
 pub struct NotifyHandle {
    // Relative order of fields below is significant.
@@ -54,11 +49,9 @@ type NotifyEvent = notify::Result<notify::Event>;
 struct NotifyActor {
    sender: loader::Sender,
-    config: Vec<(AbsPathBuf, Include, bool)>,
+    watched_entries: Vec<loader::Entry>,
-    watched_paths: FxHashSet<AbsPathBuf>,
+    // Drop order is significant.
-    // Drop order of fields bellow is significant,
+    watcher: Option<(RecommendedWatcher, Receiver<NotifyEvent>)>,
-    watcher: Option<RecommendedWatcher>,
-    watcher_receiver: Receiver<NotifyEvent>,
 }
 #[derive(Debug)]
@@ -69,23 +62,13 @@ enum Event {
 impl NotifyActor {
    fn new(sender: loader::Sender) -> NotifyActor {
-        let (watcher_sender, watcher_receiver) = unbounded();
+        NotifyActor { sender, watched_entries: Vec::new(), watcher: None }
-        let watcher = log_notify_error(Watcher::new_immediate(move |event| {
-            watcher_sender.send(event).unwrap()
-        }));
-        NotifyActor {
-            sender,
-            config: Vec::new(),
-            watched_paths: FxHashSet::default(),
-            watcher,
-            watcher_receiver,
-        }
    }
    fn next_event(&self, receiver: &Receiver<Message>) -> Option<Event> {
+        let watcher_receiver = self.watcher.as_ref().map(|(_, receiver)| receiver);
        select! {
            recv(receiver) -> it => it.ok().map(Event::Message),
-            recv(&self.watcher_receiver) -> it => Some(Event::NotifyEvent(it.unwrap())),
+            recv(watcher_receiver.unwrap_or(&never())) -> it => Some(Event::NotifyEvent(it.unwrap())),
        }
    }
    fn run(mut self, inbox: Receiver<Message>) {
@@ -94,19 +77,29 @@ impl NotifyActor {
            match event {
                Event::Message(msg) => match msg {
                    Message::Config(config) => {
+                        self.watcher = None;
+                        if !config.watch.is_empty() {
+                            let (watcher_sender, watcher_receiver) = unbounded();
+                            let watcher = log_notify_error(Watcher::new_immediate(move |event| {
+                                watcher_sender.send(event).unwrap()
+                            }));
+                            self.watcher = watcher.map(|it| (it, watcher_receiver));
+                        }
                        let n_total = config.load.len();
                        self.send(loader::Message::Progress { n_total, n_done: 0 });
-                        self.unwatch_all();
+                        self.watched_entries.clear();
-                        self.config.clear();
                        for (i, entry) in config.load.into_iter().enumerate() {
                            let watch = config.watch.contains(&i);
+                            if watch {
+                                self.watched_entries.push(entry.clone())
+                            }
                            let files = self.load_entry(entry, watch);
                            self.send(loader::Message::Loaded { files });
                            self.send(loader::Message::Progress { n_total, n_done: i + 1 });
                        }
-                        self.config.sort_by(|x, y| x.0.cmp(&y.0));
                    }
                    Message::Invalidate(path) => {
                        let contents = read(path.as_path());
@@ -121,34 +114,27 @@ impl NotifyActor {
                            .into_iter()
                            .map(|path| AbsPathBuf::try_from(path).unwrap())
                            .filter_map(|path| {
-                                let is_dir = path.is_dir();
+                                if path.is_dir()
-                                let is_file = path.is_file();
+                                    && self
+                                        .watched_entries
-                                let config_idx =
+                                        .iter()
-                                    match self.config.binary_search_by(|it| it.0.cmp(&path)) {
+                                        .any(|entry| entry.contains_dir(&path))
-                                        Ok(it) => it,
+                                {
-                                        Err(it) => it.saturating_sub(1),
+                                    self.watch(path);
-                                    };
+                                    return None;
-                                let include = self.config.get(config_idx).and_then(|it| {
-                                    let rel_path = path.strip_prefix(&it.0)?;
-                                    Some((rel_path, &it.1))
-                                });
-                                if let Some((rel_path, include)) = include {
-                                    if is_dir && include.exclude_dir(&rel_path)
-                                        || is_file && !include.include_file(&rel_path)
-                                    {
-                                        return None;
-                                    }
                                }
-                                if is_dir {
+                                if !path.is_file() {
-                                    self.watch(path);
                                    return None;
                                }
-                                if !is_file {
+                                if !self
+                                    .watched_entries
+                                    .iter()
+                                    .any(|entry| entry.contains_file(&path))
+                                {
                                    return None;
                                }
                                let contents = read(&path);
                                Some((path, contents))
                            })
@@ -175,58 +161,49 @@ impl NotifyActor {
                    (file, contents)
                })
                .collect::<Vec<_>>(),
-            loader::Entry::Directory { path, include } => {
+            loader::Entry::Directories(dirs) => {
-                let include = Include::new(include);
+                let mut res = Vec::new();
-                self.config.push((path.clone(), include.clone(), watch));
+                for root in dirs.include.iter() {
-                let files = WalkDir::new(&path)
+                    let walkdir = WalkDir::new(root).into_iter().filter_entry(|entry| {
-                    .into_iter()
+                        if !entry.file_type().is_dir() {
-                    .filter_entry(|entry| {
+                            return true;
-                        let abs_path: &AbsPath = entry.path().try_into().unwrap();
-                        match abs_path.strip_prefix(&path) {
-                            Some(rel_path) => {
-                                !(entry.file_type().is_dir() && include.exclude_dir(rel_path))
-                            }
-                            None => false,
                        }
-                    })
+                        let path = AbsPath::assert(entry.path());
-                    .filter_map(|entry| entry.ok())
+                        root == path
-                    .filter_map(|entry| {
+                            || dirs.exclude.iter().chain(&dirs.include).all(|it| it != path)
+                    });
+                    let files = walkdir.filter_map(|it| it.ok()).filter_map(|entry| {
                        let is_dir = entry.file_type().is_dir();
                        let is_file = entry.file_type().is_file();
-                        let abs_path = AbsPathBuf::try_from(entry.into_path()).unwrap();
+                        let abs_path = AbsPathBuf::assert(entry.into_path());
                        if is_dir && watch {
                            self.watch(abs_path.clone());
                        }
-                        let rel_path = abs_path.strip_prefix(&path)?;
+                        if !is_file {
-                        if is_file && include.include_file(&rel_path) {
+                            return None;
-                            Some(abs_path)
+                        }
-                        } else {
+                        let ext = abs_path.extension().unwrap_or_default();
-                            None
+                        if dirs.extensions.iter().all(|it| it.as_str() != ext) {
+                            return None;
                        }
+                        Some(abs_path)
                    });
-                files
+                    res.extend(files.map(|file| {
-                    .map(|file| {
                        let contents = read(file.as_path());
                        (file, contents)
-                    })
+                    }));
-                    .collect()
+                }
+                res
            }
        }
    }
    fn watch(&mut self, path: AbsPathBuf) {
-        if let Some(watcher) = &mut self.watcher {
+        if let Some((watcher, _)) = &mut self.watcher {
            log_notify_error(watcher.watch(&path, RecursiveMode::NonRecursive));
-            self.watched_paths.insert(path);
-        }
-    }
-    fn unwatch_all(&mut self) {
-        if let Some(watcher) = &mut self.watcher {
-            for path in self.watched_paths.drain() {
-                log_notify_error(watcher.unwatch(path));
-            }
        }
    }
    fn send(&mut self, msg: loader::Message) {
diff --git a/crates/vfs/Cargo.toml b/crates/vfs/Cargo.toml
index 263069002..b74cdb7ff 100644
--- a/crates/vfs/Cargo.toml
+++ b/crates/vfs/Cargo.toml
@@ -3,8 +3,13 @@ name = "vfs"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 edition = "2018"
+license = "MIT OR Apache-2.0"
+[lib]
+doctest = false
 [dependencies]
 rustc-hash = "1.0"
+fst = "0.4"
 paths = { path = "../paths" }
diff --git a/crates/vfs/src/file_set.rs b/crates/vfs/src/file_set.rs
index d0ddeafe7..e9196fcd2 100644
--- a/crates/vfs/src/file_set.rs
+++ b/crates/vfs/src/file_set.rs
@@ -2,8 +2,9 @@
 //!
 //! Files which do not belong to any explicitly configured `FileSet` belong to
 //! the default `FileSet`.
-use std::{fmt, iter};
+use std::fmt;
+use fst::{IntoStreamer, Streamer};
 use rustc_hash::FxHashMap;
 use crate::{FileId, Vfs, VfsPath};
@@ -15,6 +16,9 @@ pub struct FileSet {
 }
 impl FileSet {
+    pub fn len(&self) -> usize {
+        self.files.len()
+    }
    pub fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
        let mut base = self.paths[&anchor].clone();
        base.pop();
@@ -40,7 +44,7 @@ impl fmt::Debug for FileSet {
 #[derive(Debug)]
 pub struct FileSetConfig {
    n_file_sets: usize,
-    roots: Vec<(VfsPath, usize)>,
+    map: fst::Map<Vec<u8>>,
 }
 impl Default for FileSetConfig {
@@ -54,26 +58,27 @@ impl FileSetConfig {
        FileSetConfigBuilder::default()
    }
    pub fn partition(&self, vfs: &Vfs) -> Vec<FileSet> {
+        let mut scratch_space = Vec::new();
        let mut res = vec![FileSet::default(); self.len()];
        for (file_id, path) in vfs.iter() {
-            let root = self.classify(&path);
+            let root = self.classify(&path, &mut scratch_space);
-            res[root].insert(file_id, path)
+            res[root].insert(file_id, path.clone())
        }
        res
    }
    fn len(&self) -> usize {
        self.n_file_sets
    }
-    fn classify(&self, path: &VfsPath) -> usize {
+    fn classify(&self, path: &VfsPath, scratch_space: &mut Vec<u8>) -> usize {
-        let idx = match self.roots.binary_search_by(|(p, _)| p.cmp(path)) {
+        scratch_space.clear();
-            Ok(it) => it,
+        path.encode(scratch_space);
-            Err(it) => it.saturating_sub(1),
+        let automaton = PrefixOf::new(scratch_space.as_slice());
-        };
+        let mut longest_prefix = self.len() - 1;
-        if path.starts_with(&self.roots[idx].0) {
+        let mut stream = self.map.search(automaton).into_stream();
-            self.roots[idx].1
+        while let Some((_, v)) = stream.next() {
-        } else {
+            longest_prefix = v as usize;
-            self.len() - 1
        }
+        longest_prefix
    }
 }
@@ -96,13 +101,101 @@ impl FileSetConfigBuilder {
    }
    pub fn build(self) -> FileSetConfig {
        let n_file_sets = self.roots.len() + 1;
-        let mut roots: Vec<(VfsPath, usize)> = self
+        let map = {
-            .roots
+            let mut entries = Vec::new();
-            .into_iter()
+            for (i, paths) in self.roots.into_iter().enumerate() {
-            .enumerate()
+                for p in paths {
-            .flat_map(|(i, paths)| paths.into_iter().zip(iter::repeat(i)))
+                    let mut buf = Vec::new();
-            .collect();
+                    p.encode(&mut buf);
-        roots.sort();
+                    entries.push((buf, i as u64));
-        FileSetConfig { n_file_sets, roots }
+                }
+            }
+            entries.sort();
+            entries.dedup_by(|(a, _), (b, _)| a == b);
+            fst::Map::from_iter(entries).unwrap()
+        };
+        FileSetConfig { n_file_sets, map }
+    }
+}
+struct PrefixOf<'a> {
+    prefix_of: &'a [u8],
+}
+impl<'a> PrefixOf<'a> {
+    fn new(prefix_of: &'a [u8]) -> Self {
+        Self { prefix_of }
+    }
+}
+impl fst::Automaton for PrefixOf<'_> {
+    type State = usize;
+    fn start(&self) -> usize {
+        0
+    }
+    fn is_match(&self, &state: &usize) -> bool {
+        state != !0
+    }
+    fn can_match(&self, &state: &usize) -> bool {
+        state != !0
+    }
+    fn accept(&self, &state: &usize, byte: u8) -> usize {
+        if self.prefix_of.get(state) == Some(&byte) {
+            state + 1
+        } else {
+            !0
+        }
+    }
+}
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn path_prefix() {
+        let mut file_set = FileSetConfig::builder();
+        file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo".into())]);
+        file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo/bar/baz".into())]);
+        let file_set = file_set.build();
+        let mut vfs = Vfs::default();
+        vfs.set_file_contents(
+            VfsPath::new_virtual_path("/foo/src/lib.rs".into()),
+            Some(Vec::new()),
+        );
+        vfs.set_file_contents(
+            VfsPath::new_virtual_path("/foo/src/bar/baz/lib.rs".into()),
+            Some(Vec::new()),
+        );
+        vfs.set_file_contents(
+            VfsPath::new_virtual_path("/foo/bar/baz/lib.rs".into()),
+            Some(Vec::new()),
+        );
+        vfs.set_file_contents(VfsPath::new_virtual_path("/quux/lib.rs".into()), Some(Vec::new()));
+        let partition = file_set.partition(&vfs).into_iter().map(|it| it.len()).collect::<Vec<_>>();
+        assert_eq!(partition, vec![2, 1, 1]);
+    }
+    #[test]
+    fn name_prefix() {
+        let mut file_set = FileSetConfig::builder();
+        file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo".into())]);
+        file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo-things".into())]);
+        let file_set = file_set.build();
+        let mut vfs = Vfs::default();
+        vfs.set_file_contents(
+            VfsPath::new_virtual_path("/foo/src/lib.rs".into()),
+            Some(Vec::new()),
+        );
+        vfs.set_file_contents(
+            VfsPath::new_virtual_path("/foo-things/src/lib.rs".into()),
+            Some(Vec::new()),
+        );
+        let partition = file_set.partition(&vfs).into_iter().map(|it| it.len()).collect::<Vec<_>>();
+        assert_eq!(partition, vec![1, 1, 0]);
    }
 }
diff --git a/crates/vfs/src/lib.rs b/crates/vfs/src/lib.rs
index 024e58018..cdf6f1fd0 100644
--- a/crates/vfs/src/lib.rs
+++ b/crates/vfs/src/lib.rs
@@ -70,7 +70,7 @@ impl ChangedFile {
    }
 }
-#[derive(Eq, PartialEq)]
+#[derive(Eq, PartialEq, Copy, Clone, Debug)]
 pub enum ChangeKind {
    Create,
    Modify,
@@ -90,12 +90,12 @@ impl Vfs {
    pub fn file_contents(&self, file_id: FileId) -> &[u8] {
        self.get(file_id).as_deref().unwrap()
    }
-    pub fn iter(&self) -> impl Iterator<Item = (FileId, VfsPath)> + '_ {
+    pub fn iter(&self) -> impl Iterator<Item = (FileId, &VfsPath)> + '_ {
        (0..self.data.len())
            .map(|it| FileId(it as u32))
            .filter(move |&file_id| self.get(file_id).is_some())
            .map(move |file_id| {
-                let path = self.interner.lookup(file_id).clone();
+                let path = self.interner.lookup(file_id);
                (file_id, path)
            })
    }
diff --git a/crates/vfs/src/loader.rs b/crates/vfs/src/loader.rs
index 6de2e5b3f..40cf96020 100644
--- a/crates/vfs/src/loader.rs
+++ b/crates/vfs/src/loader.rs
@@ -3,10 +3,25 @@ use std::fmt;
 use paths::{AbsPath, AbsPathBuf};
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum Entry {
    Files(Vec<AbsPathBuf>),
-    Directory { path: AbsPathBuf, include: Vec<String> },
+    Directories(Directories),
+}
+/// Specifies a set of files on the file system.
+///
+/// A file is included if:
+///   * it has included extension
+///   * it is under an `include` path
+///   * it is not under `exclude` path
+///
+/// If many include/exclude paths match, the longest one wins.
+#[derive(Debug, Clone, Default)]
+pub struct Directories {
+    pub extensions: Vec<String>,
+    pub include: Vec<AbsPathBuf>,
+    pub exclude: Vec<AbsPathBuf>,
 }
 #[derive(Debug)]
@@ -33,21 +48,66 @@ pub trait Handle: fmt::Debug {
 impl Entry {
    pub fn rs_files_recursively(base: AbsPathBuf) -> Entry {
-        Entry::Directory { path: base, include: globs(&["*.rs", "!/.git/"]) }
+        Entry::Directories(dirs(base, &[".git"]))
    }
    pub fn local_cargo_package(base: AbsPathBuf) -> Entry {
-        Entry::Directory { path: base, include: globs(&["*.rs", "!/target/", "!/.git/"]) }
+        Entry::Directories(dirs(base, &[".git", "target"]))
    }
    pub fn cargo_package_dependency(base: AbsPathBuf) -> Entry {
-        Entry::Directory {
+        Entry::Directories(dirs(base, &[".git", "/tests", "/examples", "/benches"]))
-            path: base,
+    }
-            include: globs(&["*.rs", "!/tests/", "!/examples/", "!/benches/", "!/.git/"]),
+    pub fn contains_file(&self, path: &AbsPath) -> bool {
+        match self {
+            Entry::Files(files) => files.iter().any(|it| it == path),
+            Entry::Directories(dirs) => dirs.contains_file(path),
+        }
+    }
+    pub fn contains_dir(&self, path: &AbsPath) -> bool {
+        match self {
+            Entry::Files(_) => false,
+            Entry::Directories(dirs) => dirs.contains_dir(path),
+        }
+    }
+}
+impl Directories {
+    pub fn contains_file(&self, path: &AbsPath) -> bool {
+        let ext = path.extension().unwrap_or_default();
+        if self.extensions.iter().all(|it| it.as_str() != ext) {
+            return false;
+        }
+        self.includes_path(path)
+    }
+    pub fn contains_dir(&self, path: &AbsPath) -> bool {
+        self.includes_path(path)
+    }
+    fn includes_path(&self, path: &AbsPath) -> bool {
+        let mut include: Option<&AbsPathBuf> = None;
+        for incl in &self.include {
+            if path.starts_with(incl) {
+                include = Some(match include {
+                    Some(prev) if prev.starts_with(incl) => prev,
+                    _ => incl,
+                })
+            }
+        }
+        let include = match include {
+            Some(it) => it,
+            None => return false,
+        };
+        for excl in &self.exclude {
+            if path.starts_with(excl) && excl.starts_with(include) {
+                return false;
+            }
        }
+        true
    }
 }
-fn globs(globs: &[&str]) -> Vec<String> {
+fn dirs(base: AbsPathBuf, exclude: &[&str]) -> Directories {
-    globs.iter().map(|it| it.to_string()).collect()
+    let exclude = exclude.iter().map(|it| base.join(it)).collect::<Vec<_>>();
+    Directories { extensions: vec!["rs".to_string()], include: vec![base], exclude }
 }
 impl fmt::Debug for Message {
diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs
index dc3031ada..04a42264e 100644
--- a/crates/vfs/src/vfs_path.rs
+++ b/crates/vfs/src/vfs_path.rs
@@ -48,6 +48,37 @@ impl VfsPath {
            (VfsPathRepr::VirtualPath(_), _) => false,
        }
    }
+    // Don't make this `pub`
+    pub(crate) fn encode(&self, buf: &mut Vec<u8>) {
+        let tag = match &self.0 {
+            VfsPathRepr::PathBuf(_) => 0,
+            VfsPathRepr::VirtualPath(_) => 1,
+        };
+        buf.push(tag);
+        match &self.0 {
+            VfsPathRepr::PathBuf(it) => {
+                let path: &std::ffi::OsStr = it.as_os_str();
+                #[cfg(windows)]
+                {
+                    use std::os::windows::ffi::OsStrExt;
+                    for wchar in path.encode_wide() {
+                        buf.extend(wchar.to_le_bytes().iter().copied());
+                    }
+                }
+                #[cfg(unix)]
+                {
+                    use std::os::unix::ffi::OsStrExt;
+                    buf.extend(path.as_bytes());
+                }
+                #[cfg(not(any(windows, unix)))]
+                {
+                    buf.extend(path.to_string_lossy().as_bytes());
+                }
+            }
+            VfsPathRepr::VirtualPath(VirtualPath(s)) => buf.extend(s.as_bytes()),
+        }
+    }
 }
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
diff --git a/docs/dev/README.md b/docs/dev/README.md
index 6b6824ded..417352c9d 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -177,6 +177,9 @@ There are many benefits to this:
 * less stuff printed during printf-debugging
 * less time to run test
+It also makes sense to format snippets more compactly (for example, by placing enum defitions like `enum E { Foo, Bar }` on a single line),
+as long as they are still readable.
 ## Order of Imports
 We separate import groups with blank lines
@@ -311,7 +314,7 @@ We don't have specific rules around git history hygiene.
 Maintaining clean git history is encouraged, but not enforced.
 We use rebase workflow, it's OK to rewrite history during PR review process.
-Avoid @mentioning people in commit messages, as such messages create a lot of duplicate notification traffic during rebases.
+Avoid @mentioning people in commit messages and pull request descriptions (they are added to commit message by bors), as such messages create a lot of duplicate notification traffic during rebases.
 # Architecture Invariants
@@ -358,14 +361,24 @@ There are two kinds of tests:
 The purpose of inline tests is not to achieve full coverage by test cases, but to explain to the reader of the code what each particular `if` and `match` is responsible for.
 If you are tempted to add a large inline test, it might be a good idea to leave only the simplest example in place, and move the test to a manual `parser/ok` test.
-To update test data, run with `UPDATE_EXPECTATIONS` variable:
+To update test data, run with `UPDATE_EXPECT` variable:
 ```bash
-env UPDATE_EXPECTATIONS=1 cargo qt
+env UPDATE_EXPECT=1 cargo qt
 ```
 After adding a new inline test you need to run `cargo xtest codegen` and also update the test data as described above.
+## TypeScript Tests
+If you change files under `editors/code` and would like to run the tests and linter, install npm and run:
+```bash
+cd editors/code
+npm ci
+npm run lint
+```
 # Logging
 Logging is done by both rust-analyzer and VS Code, so it might be tricky to
@@ -394,13 +407,7 @@ To log all communication between the server and the client, there are two choice
 There are also two VS Code commands which might be of interest:
-* `Rust Analyzer: Status` shows some memory-usage statistics. To take full
+* `Rust Analyzer: Status` shows some memory-usage statistics.
-  advantage of it, you need to compile rust-analyzer with jemalloc support:
-  ```
-  $ cargo install --path crates/rust-analyzer --force --features jemalloc
-  ```
-  There's an alias for this: `cargo xtask install --server --jemalloc`.
 * `Rust Analyzer: Syntax Tree` shows syntax tree of the current file/selection.
diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index cee916c09..d0c6eea61 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md
@@ -170,8 +170,7 @@ The innermost and most elaborate boundary is `hir`. It has a much richer
 vocabulary of types than `ide`, but the basic testing setup is the same: we
 create a database, run some queries, assert result.
-For comparisons, we use [insta](https://github.com/mitsuhiko/insta/) library for
+For comparisons, we use the `expect` crate for snapshot testing.
-snapshot testing.
 To test various analysis corner cases and avoid forgetting about old tests, we
 use so-called marks. See the `marks` module in the `test_utils` crate for more.
diff --git a/docs/dev/lsp-extensions.md b/docs/dev/lsp-extensions.md
index a0847dad3..1be01fd88 100644
--- a/docs/dev/lsp-extensions.md
+++ b/docs/dev/lsp-extensions.md
@@ -11,11 +11,13 @@ If you want to be notified about the changes to this document, subscribe to [#46
 ## `initializationOptions`
-As `initializationOptions`, `rust-analyzer` expects `"rust-analyzer"` section of the configuration.
+For `initializationOptions`, `rust-analyzer` expects `"rust-analyzer"` section of the configuration.
 That is, `rust-analyzer` usually sends `"workspace/configuration"` request with `{ "items": ["rust-analyzer"] }` payload.
 `initializationOptions` should contain the same data that would be in the first item of the result.
-It's OK to not send anything, then all the settings would take their default values.
+If a language client does not know about `rust-analyzer`'s configuration options it can get sensible defaults by doing any of the following:
-However, some settings can not be changed after startup at the moment.
+ * Not sending `initializationOptions`
+ * Send `"initializationOptions": null`
+ * Send `"initializationOptions": {}`
 ## Snippet `TextEdit`
@@ -272,6 +274,11 @@ interface SsrParams {
    query: string,
    /// If true, only check the syntax of the query and don't compute the actual edit.
    parseOnly: bool,
+    /// The current text document. This and `position` will be used to determine in what scope
+    /// paths in `query` should be resolved.
+    textDocument: lc.TextDocumentIdentifier;
+    /// Position where SSR was invoked.
+    position: lc.Position;
 }
 ```
@@ -283,7 +290,7 @@ WorkspaceEdit
 ### Example
-SSR with query `foo($a:expr, $b:expr) ==>> ($a).foo($b)` will transform, eg `foo(y + 5, z)` into `(y + 5).foo(z)`.
+SSR with query `foo($a, $b) ==>> ($a).foo($b)` will transform, eg `foo(y + 5, z)` into `(y + 5).foo(z)`.
 ### Unresolved Question
@@ -389,15 +396,27 @@ rust-analyzer supports only one `kind`, `"cargo"`. The `args` for `"cargo"` look
 Returns internal status message, mostly for debugging purposes.
-## Collect Garbage
+## Reload Workspace
-**Method:** `rust-analyzer/collectGarbage`
+**Method:** `rust-analyzer/reloadWorkspace`
 **Request:** `null`
 **Response:** `null`
-Frees some caches. For internal use, and is mostly broken at the moment.
+Reloads project information (that is, re-executes `cargo metadata`).
+## Status Notification
+**Client Capability:** `{ "statusNotification": boolean }`
+**Method:** `rust-analyzer/status`
+**Notification:** `"loading" | "ready" | "invalid" | "needsReload"`
+This notification is sent from server to client.
+The client can use it to display persistent status to the user (in modline).
+For `needsReload` state, the client can provide a context-menu action to run `rust-analyzer/reloadWorkspace` request.
 ## Syntax Tree
@@ -504,4 +523,4 @@ Such actions on the client side are appended to a hover bottom as command links:
  | TITLE _Action1_ | _Action2_ |  <- second group
  +-----------------------------+
  ...
-```
-\ No newline at end of file
+```
diff --git a/docs/dev/syntax.md b/docs/dev/syntax.md
index c2864bbbc..d4bc4b07c 100644
--- a/docs/dev/syntax.md
+++ b/docs/dev/syntax.md
@@ -82,7 +82,7 @@ Points of note:
 An input like `fn f() { 90 + 2 }` might be parsed as
 ```
-FN_DEF@0..17
+[email protected]
  [email protected] "fn"
  [email protected] " "
  [email protected]
@@ -342,7 +342,7 @@ pub struct FnDef {
 impl AstNode for FnDef {
    fn cast(syntax: SyntaxNode) -> Option<Self> {
        match kind {
-            FN_DEF => Some(FnDef { syntax }),
+            FN => Some(FnDef { syntax }),
            _ => None,
        }
    }
diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc
index b763958fe..cfc0ad81c 100644
--- a/docs/user/manual.adoc
+++ b/docs/user/manual.adoc
@@ -13,8 +13,12 @@ This manual focuses on a specific usage of the library -- running it as part of
 https://microsoft.github.io/language-server-protocol/[Language Server Protocol] (LSP).
 The LSP allows various code editors, like VS Code, Emacs or Vim, to implement semantic features like completion or goto definition by talking to an external language server process.
-To improve this document, send a pull request against
+[TIP]
-https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/manual.adoc[this file].
+====
+[.lead]
+To improve this document, send a pull request: +
+https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/manual.adoc[https://github.com/rust-analyzer/.../manual.adoc]
+====
 If you have questions about using rust-analyzer, please ask them in the https://users.rust-lang.org/c/ide/14["`IDEs and Editors`"] topic of Rust users forum.
@@ -106,20 +110,8 @@ Here are some useful self-diagnostic commands:
 * **Rust Analyzer: Show RA Version** shows the version of `rust-analyzer` binary
 * **Rust Analyzer: Status** prints some statistics about the server, like the few latest LSP requests
 * To enable server-side logging, run with `env RA_LOG=info` and see `Output > Rust Analyzer Language Server` in VS Code's panel.
-* To log all LSP requests, add `"rust-analyzer.trace.server": "verbose"` to the settings and look for `Server Trace` in the panel.
+* To log all LSP requests, add `"rust-analyzer.trace.server": "verbose"` to the settings and look for `Rust Analyzer Language Server Trace` in the panel.
-* To enable client-side logging, add `"rust-analyzer.trace.extension": true` to the settings and open the `Console` tab of VS Code developer tools.
+* To enable client-side logging, add `"rust-analyzer.trace.extension": true` to the settings and open `Output > Rust Analyzer Client` in the panel.
-==== Special `when` clause context for keybindings.
-You may use `inRustProject` context to configure keybindings for rust projects only. For example:
-[source,json]
----
-{
-  "key": "ctrl+i",
-  "command": "rust-analyzer.toggleInlayHints",
-  "when": "inRustProject"
-}
----
-More about `when` clause contexts https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts[here].
 === rust-analyzer Language Server Binary
@@ -281,9 +273,6 @@ However, if you use some other build system, you'll have to describe the structu
 [source,TypeScript]
 ----
 interface JsonProject {
-   /// The set of paths containing the crates for this project.
-   /// Any `Crate` must be nested inside some `root`.
-   roots: string[];
   /// The set of crates comprising the current project.
   /// Must include all transitive dependencies as well as sysroot crate (libstd, libcore and such).
   crates: Crate[];
@@ -296,11 +285,37 @@ interface Crate {
    edition: "2015" | "2018";
    /// Dependencies
    deps: Dep[];
+    /// Should this crate be treated as a member of current "workspace".
+    ///
+    /// By default, inferred from the `root_module` (members are the crates which reside
+    /// inside the directory opened in the editor).
+    ///
+    /// Set this to `false` for things like standard library and 3rd party crates to
+    /// enable performance optimizations (rust-analyzer assumes that non-member crates
+    /// don't change).
+    is_workspace_member?: boolean;
+    /// Optionally specify the (super)set of `.rs` files comprising this crate.
+    ///
+    /// By default, rust-analyzer assumes that only files under `root_module.parent` can belong to a crate.
+    /// `include_dirs` are included recursively, unless a subdirectory is in `exclude_dirs`.
+    ///
+    /// Different crates can share the same `source`.
+    ///
+    /// If two crates share an `.rs` file in common, they *must* have the same `source`.
+    /// rust-analyzer assumes that files from one source can't refer to files in another source.
+    source?: {
+        include_dirs: string[],
+        exclude_dirs: string[],
+    },
    /// The set of cfgs activated for a given crate, like `["unix", "feature=foo", "feature=bar"]`.
    cfg: string[];
+    /// Target triple for this Crate.
+    ///
+    /// Used when running `rustc --print cfg` to get target-specific cfgs.
+    target?: string;
+    /// Environment variables, used for the `env!` macro
+    env: : { [key: string]: string; },
-    /// value of the OUT_DIR env variable.
-    out_dir?: string;
    /// For proc-macro crates, path to compiles proc-macro (.so file).
    proc_macro_dylib_path?: string;
 }
@@ -337,3 +352,66 @@ They are usually triggered by a shortcut or by clicking a light bulb icon in the
 Cursor position or selection is signified by `┃` character.
 include::./generated_assists.adoc[]
+== Editor Features
+=== VS Code
+==== Special `when` clause context for keybindings.
+You may use `inRustProject` context to configure keybindings for rust projects only. For example:
+[source,json]
+----
+{
+  "key": "ctrl+i",
+  "command": "rust-analyzer.toggleInlayHints",
+  "when": "inRustProject"
+}
+----
+More about `when` clause contexts https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts[here].
+==== Setting runnable environment variables
+You can use "rust-analyzer.runnableEnv" setting to define runnable environment-specific substitution variables.
+The simplest way for all runnables in a bunch:
+```jsonc
+"rust-analyzer.runnableEnv": {
+    "RUN_SLOW_TESTS": "1"
+}
+```
+Or it is possible to specify vars more granularly:
+```jsonc
+"rust-analyzer.runnableEnv": [
+    {
+        // "mask": null, // null mask means that this rule will be applied for all runnables
+        env: {
+             "APP_ID": "1",
+             "APP_DATA": "asdf"
+        }
+    },
+    {
+        "mask": "test_name",
+        "env": {
+             "APP_ID": "2", // overwrites only APP_ID
+        }
+    }
+]
+```
+You can use any valid RegExp as a mask. Also note that a full runnable name is something like *run bin_or_example_name*, *test some::mod::test_name* or *test-mod some::mod*, so it is possible to distinguish binaries, single tests, and test modules with this masks: `"^run"`, `"^test "` (the trailing space matters!), and `"^test-mod"` respectively.
+==== Compiler feedback from external commands
+Instead of relying on the built-in `cargo check`, you can configure Code to run a command in the background and use the `$rustc-watch` problem matcher to generate inline error markers from its output.
+To do this you need to create a new https://code.visualstudio.com/docs/editor/tasks[VS Code Task] and set `rust-analyzer.checkOnSave.enable: false` in preferences.
+For example, if you want to run https://crates.io/crates/cargo-watch[`cargo watch`] instead, you might add the following to `.vscode/tasks.json`:
+```json
+{
+    "label": "Watch",
+    "group": "build",
+    "type": "shell",
+    "command": "cargo watch",
+    "problemMatcher": "$rustc-watch",
+    "isBackground": true
+}
+```
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 3b4a31682..b0f24b10a 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -5,35 +5,35 @@
    "requires": true,
    "dependencies": {
        "@babel/code-frame": {
-            "version": "7.8.3",
+            "version": "7.10.3",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz",
-            "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+            "integrity": "sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==",
            "dev": true,
            "requires": {
-                "@babel/highlight": "^7.8.3"
+                "@babel/highlight": "^7.10.3"
            }
        },
        "@babel/helper-validator-identifier": {
-            "version": "7.9.5",
+            "version": "7.10.3",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz",
-            "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+            "integrity": "sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==",
            "dev": true
        },
        "@babel/highlight": {
-            "version": "7.9.0",
+            "version": "7.10.3",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz",
-            "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+            "integrity": "sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==",
            "dev": true,
            "requires": {
-                "@babel/helper-validator-identifier": "^7.9.0",
+                "@babel/helper-validator-identifier": "^7.10.3",
                "chalk": "^2.0.0",
                "js-tokens": "^4.0.0"
            }
        },
        "@rollup/plugin-commonjs": {
-            "version": "12.0.0",
+            "version": "13.0.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-12.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-13.0.0.tgz",
-            "integrity": "sha512-8+mDQt1QUmN+4Y9D3yCG8AJNewuTSLYPJVzKKUZ+lGeQrI+bV12Tc5HCyt2WdlnG6ihIL/DPbKRJlB40DX40mw==",
+            "integrity": "sha512-Anxc3qgkAi7peAyesTqGYidG5GRim9jtg8xhmykNaZkImtvjA7Wsqep08D2mYsqw1IF7rA3lYfciLgzUSgRoqw==",
            "dev": true,
            "requires": {
                "@rollup/pluginutils": "^3.0.8",
@@ -46,9 +46,9 @@
            }
        },
        "@rollup/plugin-node-resolve": {
-            "version": "8.0.0",
+            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.1.0.tgz",
-            "integrity": "sha512-5poJCChrkVggXXND/sQ7yNqwjUNT4fP31gpRWCnSNnlXuUXTCMHT33xZrTGxgjm5Rl18MHj7iEzlCT8rYWwQSA==",
+            "integrity": "sha512-ovq7ZM3JJYUUmEjjO+H8tnUdmQmdQudJB7xruX8LFZ1W2q8jXdPUS6SsIYip8ByOApu4RR7729Am9WhCeCMiHA==",
            "dev": true,
            "requires": {
                "@rollup/pluginutils": "^3.0.8",
@@ -89,19 +89,12 @@
            "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
            "dev": true
        },
-        "@types/events": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-            "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-            "dev": true
-        },
        "@types/glob": {
-            "version": "7.1.1",
+            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz",
-            "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+            "integrity": "sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==",
            "dev": true,
            "requires": {
-                "@types/events": "*",
                "@types/minimatch": "*",
                "@types/node": "*"
            }
@@ -125,9 +118,9 @@
            "dev": true
        },
        "@types/node": {
-            "version": "14.0.5",
+            "version": "12.7.12",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.5.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.12.tgz",
-            "integrity": "sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==",
+            "integrity": "sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==",
            "dev": true
        },
        "@types/node-fetch": {
@@ -156,18 +149,46 @@
            "dev": true
        },
        "@typescript-eslint/eslint-plugin": {
-            "version": "3.0.0",
+            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.4.0.tgz",
-            "integrity": "sha512-lcZ0M6jD4cqGccYOERKdMtg+VWpoq3NSnWVxpc/AwAy0zhkUYVioOUZmfNqiNH8/eBNGhCn6HXd6mKIGRgNc1Q==",
+            "integrity": "sha512-wfkpiqaEVhZIuQRmudDszc01jC/YR7gMSxa6ulhggAe/Hs0KVIuo9wzvFiDbG3JD5pRFQoqnf4m7REDsUvBnMQ==",
            "dev": true,
            "requires": {
-                "@typescript-eslint/experimental-utils": "3.0.0",
+                "@typescript-eslint/experimental-utils": "3.4.0",
+                "debug": "^4.1.1",
                "functional-red-black-tree": "^1.0.1",
                "regexpp": "^3.0.0",
                "semver": "^7.3.2",
                "tsutils": "^3.17.1"
            },
            "dependencies": {
+                "@typescript-eslint/experimental-utils": {
+                    "version": "3.4.0",
+                    "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.4.0.tgz",
+                    "integrity": "sha512-rHPOjL43lOH1Opte4+dhC0a/+ks+8gOBwxXnyrZ/K4OTAChpSjP76fbI8Cglj7V5GouwVAGaK+xVwzqTyE/TPw==",
+                    "dev": true,
+                    "requires": {
+                        "@types/json-schema": "^7.0.3",
+                        "@typescript-eslint/typescript-estree": "3.4.0",
+                        "eslint-scope": "^5.0.0",
+                        "eslint-utils": "^2.0.0"
+                    }
+                },
+                "@typescript-eslint/typescript-estree": {
+                    "version": "3.4.0",
+                    "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.4.0.tgz",
+                    "integrity": "sha512-zKwLiybtt4uJb4mkG5q2t6+W7BuYx2IISiDNV+IY68VfoGwErDx/RfVI7SWL4gnZ2t1A1ytQQwZ+YOJbHHJ2rw==",
+                    "dev": true,
+                    "requires": {
+                        "debug": "^4.1.1",
+                        "eslint-visitor-keys": "^1.1.0",
+                        "glob": "^7.1.6",
+                        "is-glob": "^4.0.1",
+                        "lodash": "^4.17.15",
+                        "semver": "^7.3.2",
+                        "tsutils": "^3.17.1"
+                    }
+                },
                "semver": {
                    "version": "7.3.2",
                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
@@ -177,33 +198,33 @@
            }
        },
        "@typescript-eslint/experimental-utils": {
-            "version": "3.0.0",
+            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.4.0.tgz",
-            "integrity": "sha512-BN0vmr9N79M9s2ctITtChRuP1+Dls0x/wlg0RXW1yQ7WJKPurg6X3Xirv61J2sjPif4F8SLsFMs5Nzte0WYoTQ==",
+            "integrity": "sha512-rHPOjL43lOH1Opte4+dhC0a/+ks+8gOBwxXnyrZ/K4OTAChpSjP76fbI8Cglj7V5GouwVAGaK+xVwzqTyE/TPw==",
            "dev": true,
            "requires": {
                "@types/json-schema": "^7.0.3",
-                "@typescript-eslint/typescript-estree": "3.0.0",
+                "@typescript-eslint/typescript-estree": "3.4.0",
                "eslint-scope": "^5.0.0",
                "eslint-utils": "^2.0.0"
            }
        },
        "@typescript-eslint/parser": {
-            "version": "3.0.0",
+            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.4.0.tgz",
-            "integrity": "sha512-8RRCA9KLxoFNO0mQlrLZA0reGPd/MsobxZS/yPFj+0/XgMdS8+mO8mF3BDj2ZYQj03rkayhSJtF1HAohQ3iylw==",
+            "integrity": "sha512-ZUGI/de44L5x87uX5zM14UYcbn79HSXUR+kzcqU42gH0AgpdB/TjuJy3m4ezI7Q/jk3wTQd755mxSDLhQP79KA==",
            "dev": true,
            "requires": {
                "@types/eslint-visitor-keys": "^1.0.0",
-                "@typescript-eslint/experimental-utils": "3.0.0",
+                "@typescript-eslint/experimental-utils": "3.4.0",
-                "@typescript-eslint/typescript-estree": "3.0.0",
+                "@typescript-eslint/typescript-estree": "3.4.0",
                "eslint-visitor-keys": "^1.1.0"
            }
        },
        "@typescript-eslint/typescript-estree": {
-            "version": "3.0.0",
+            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.4.0.tgz",
-            "integrity": "sha512-nevQvHyNghsfLrrByzVIH4ZG3NROgJ8LZlfh3ddwPPH4CH7W4GAiSx5qu+xHuX5pWsq6q/eqMc1io840ZhAnUg==",
+            "integrity": "sha512-zKwLiybtt4uJb4mkG5q2t6+W7BuYx2IISiDNV+IY68VfoGwErDx/RfVI7SWL4gnZ2t1A1ytQQwZ+YOJbHHJ2rw==",
            "dev": true,
            "requires": {
                "debug": "^4.1.1",
@@ -224,9 +245,9 @@
            }
        },
        "acorn": {
-            "version": "7.2.0",
+            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-            "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
+            "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
            "dev": true
        },
        "acorn-jsx": {
@@ -262,23 +283,6 @@
            "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
            "dev": true
        },
-        "ansi-escapes": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-            "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-            "dev": true,
-            "requires": {
-                "type-fest": "^0.11.0"
-            },
-            "dependencies": {
-                "type-fest": {
-                    "version": "0.11.0",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-                    "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-                    "dev": true
-                }
-            }
-        },
        "ansi-regex": {
            "version": "5.0.0",
            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -313,6 +317,18 @@
                "sprintf-js": "~1.0.2"
            }
        },
+        "array.prototype.map": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz",
+            "integrity": "sha512-Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw==",
+            "dev": true,
+            "requires": {
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.0-next.1",
+                "es-array-method-boxes-properly": "^1.0.0",
+                "is-string": "^1.0.4"
+            }
+        },
        "astral-regex": {
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
@@ -344,9 +360,9 @@
            "dev": true
        },
        "binary-extensions": {
-            "version": "2.0.0",
+            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-            "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+            "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
            "dev": true
        },
        "boolbase": {
@@ -415,12 +431,6 @@
                "supports-color": "^5.3.0"
            }
        },
-        "chardet": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-            "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-            "dev": true
-        },
        "cheerio": {
            "version": "1.0.0-rc.3",
            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
@@ -436,36 +446,21 @@
            }
        },
        "chokidar": {
-            "version": "3.3.0",
+            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
-            "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+            "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
            "dev": true,
            "requires": {
                "anymatch": "~3.1.1",
                "braces": "~3.0.2",
-                "fsevents": "~2.1.1",
+                "fsevents": "~2.1.2",
                "glob-parent": "~5.1.0",
                "is-binary-path": "~2.1.0",
                "is-glob": "~4.0.1",
                "normalize-path": "~3.0.0",
-                "readdirp": "~3.2.0"
+                "readdirp": "~3.3.0"
            }
        },
-        "cli-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-            "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-            "dev": true,
-            "requires": {
-                "restore-cursor": "^3.1.0"
-            }
-        },
-        "cli-width": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-            "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-            "dev": true
-        },
        "cliui": {
            "version": "5.0.0",
            "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -483,29 +478,6 @@
                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
                    "dev": true
                },
-                "emoji-regex": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    }
-                },
                "strip-ansi": {
                    "version": "5.2.0",
                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -566,9 +538,9 @@
            "dev": true
        },
        "cross-spawn": {
-            "version": "7.0.2",
+            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
+            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
            "dev": true,
            "requires": {
                "path-key": "^3.1.0",
@@ -649,9 +621,9 @@
            "dev": true
        },
        "diff": {
-            "version": "3.5.0",
+            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-            "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+            "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
            "dev": true
        },
        "doctrine": {
@@ -719,11 +691,20 @@
            }
        },
        "emoji-regex": {
-            "version": "8.0.0",
+            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
            "dev": true
        },
+        "enquirer": {
+            "version": "2.3.5",
+            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.5.tgz",
+            "integrity": "sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==",
+            "dev": true,
+            "requires": {
+                "ansi-colors": "^3.2.1"
+            }
+        },
        "entities": {
            "version": "1.1.2",
            "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
@@ -731,22 +712,43 @@
            "dev": true
        },
        "es-abstract": {
-            "version": "1.17.5",
+            "version": "1.17.6",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-            "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+            "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
            "dev": true,
            "requires": {
                "es-to-primitive": "^1.2.1",
                "function-bind": "^1.1.1",
                "has": "^1.0.3",
                "has-symbols": "^1.0.1",
-                "is-callable": "^1.1.5",
+                "is-callable": "^1.2.0",
-                "is-regex": "^1.0.5",
+                "is-regex": "^1.1.0",
                "object-inspect": "^1.7.0",
                "object-keys": "^1.1.1",
                "object.assign": "^4.1.0",
-                "string.prototype.trimleft": "^2.1.1",
+                "string.prototype.trimend": "^1.0.1",
-                "string.prototype.trimright": "^2.1.1"
+                "string.prototype.trimstart": "^1.0.1"
+            }
+        },
+        "es-array-method-boxes-properly": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+            "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+            "dev": true
+        },
+        "es-get-iterator": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz",
+            "integrity": "sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==",
+            "dev": true,
+            "requires": {
+                "es-abstract": "^1.17.4",
+                "has-symbols": "^1.0.1",
+                "is-arguments": "^1.0.4",
+                "is-map": "^2.0.1",
+                "is-set": "^2.0.1",
+                "is-string": "^1.0.5",
+                "isarray": "^2.0.5"
            }
        },
        "es-to-primitive": {
@@ -782,9 +784,9 @@
            "dev": true
        },
        "eslint": {
-            "version": "7.1.0",
+            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.3.1.tgz",
-            "integrity": "sha512-DfS3b8iHMK5z/YLSme8K5cge168I8j8o1uiVmFCgnnjxZQbCGyraF8bMl7Ju4yfBmCuxD7shOF7eqGkcuIHfsA==",
+            "integrity": "sha512-cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA==",
            "dev": true,
            "requires": {
                "@babel/code-frame": "^7.0.0",
@@ -793,10 +795,11 @@
                "cross-spawn": "^7.0.2",
                "debug": "^4.0.1",
                "doctrine": "^3.0.0",
-                "eslint-scope": "^5.0.0",
+                "enquirer": "^2.3.5",
+                "eslint-scope": "^5.1.0",
                "eslint-utils": "^2.0.0",
-                "eslint-visitor-keys": "^1.1.0",
+                "eslint-visitor-keys": "^1.2.0",
-                "espree": "^7.0.0",
+                "espree": "^7.1.0",
                "esquery": "^1.2.0",
                "esutils": "^2.0.2",
                "file-entry-cache": "^5.0.1",
@@ -806,7 +809,6 @@
                "ignore": "^4.0.6",
                "import-fresh": "^3.0.0",
                "imurmurhash": "^0.1.4",
-                "inquirer": "^7.0.0",
                "is-glob": "^4.0.0",
                "js-yaml": "^3.13.1",
                "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -836,9 +838,9 @@
                    }
                },
                "chalk": {
-                    "version": "4.0.0",
+                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-                    "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+                    "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
                    "dev": true,
                    "requires": {
                        "ansi-styles": "^4.1.0",
@@ -860,6 +862,22 @@
                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
                    "dev": true
                },
+                "eslint-scope": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
+                    "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
+                    "dev": true,
+                    "requires": {
+                        "esrecurse": "^4.1.0",
+                        "estraverse": "^4.1.1"
+                    }
+                },
+                "eslint-visitor-keys": {
+                    "version": "1.3.0",
+                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+                    "dev": true
+                },
                "has-flag": {
                    "version": "4.0.0",
                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -909,14 +927,22 @@
            "dev": true
        },
        "espree": {
-            "version": "7.0.0",
+            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-7.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz",
-            "integrity": "sha512-/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw==",
+            "integrity": "sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw==",
            "dev": true,
            "requires": {
-                "acorn": "^7.1.1",
+                "acorn": "^7.2.0",
                "acorn-jsx": "^5.2.0",
-                "eslint-visitor-keys": "^1.1.0"
+                "eslint-visitor-keys": "^1.2.0"
+            },
+            "dependencies": {
+                "eslint-visitor-keys": {
+                    "version": "1.3.0",
+                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+                    "dev": true
+                }
            }
        },
        "esprima": {
@@ -969,21 +995,10 @@
            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
            "dev": true
        },
-        "external-editor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-            "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-            "dev": true,
-            "requires": {
-                "chardet": "^0.7.0",
-                "iconv-lite": "^0.4.24",
-                "tmp": "^0.0.33"
-            }
-        },
        "fast-deep-equal": {
-            "version": "3.1.1",
+            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
            "dev": true
        },
        "fast-json-stable-stringify": {
@@ -1007,15 +1022,6 @@
                "pend": "~1.2.0"
            }
        },
-        "figures": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-            "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-            "dev": true,
-            "requires": {
-                "escape-string-regexp": "^1.0.5"
-            }
-        },
        "file-entry-cache": {
            "version": "5.0.1",
            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -1035,12 +1041,13 @@
            }
        },
        "find-up": {
-            "version": "3.0.0",
+            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
            "dev": true,
            "requires": {
-                "locate-path": "^3.0.0"
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
            }
        },
        "flat": {
@@ -1238,15 +1245,6 @@
                }
            }
        },
-        "iconv-lite": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-            "dev": true,
-            "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
-            }
-        },
        "ignore": {
            "version": "4.0.6",
            "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -1285,78 +1283,11 @@
            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
            "dev": true
        },
-        "inquirer": {
+        "is-arguments": {
-            "version": "7.1.0",
+            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-            "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+            "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-            "dev": true,
+            "dev": true
-            "requires": {
-                "ansi-escapes": "^4.2.1",
-                "chalk": "^3.0.0",
-                "cli-cursor": "^3.1.0",
-                "cli-width": "^2.0.0",
-                "external-editor": "^3.0.3",
-                "figures": "^3.0.0",
-                "lodash": "^4.17.15",
-                "mute-stream": "0.0.8",
-                "run-async": "^2.4.0",
-                "rxjs": "^6.5.3",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0",
-                "through": "^2.3.6"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-                    "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-                    "dev": true,
-                    "requires": {
-                        "@types/color-name": "^1.1.1",
-                        "color-convert": "^2.0.1"
-                    }
-                },
-                "chalk": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "~1.1.4"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.4",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
        },
        "is-binary-path": {
            "version": "2.1.0",
@@ -1374,9 +1305,9 @@
            "dev": true
        },
        "is-callable": {
-            "version": "1.1.5",
+            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-            "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+            "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
            "dev": true
        },
        "is-date-object": {
@@ -1392,9 +1323,9 @@
            "dev": true
        },
        "is-fullwidth-code-point": {
-            "version": "3.0.0",
+            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
            "dev": true
        },
        "is-glob": {
@@ -1406,6 +1337,12 @@
                "is-extglob": "^2.1.1"
            }
        },
+        "is-map": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz",
+            "integrity": "sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==",
+            "dev": true
+        },
        "is-module": {
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
@@ -1419,23 +1356,35 @@
            "dev": true
        },
        "is-reference": {
-            "version": "1.1.4",
+            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz",
+            "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
-            "integrity": "sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==",
+            "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
            "dev": true,
            "requires": {
-                "@types/estree": "0.0.39"
+                "@types/estree": "*"
            }
        },
        "is-regex": {
-            "version": "1.0.5",
+            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-            "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+            "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
            "dev": true,
            "requires": {
-                "has": "^1.0.3"
+                "has-symbols": "^1.0.1"
            }
        },
+        "is-set": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz",
+            "integrity": "sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==",
+            "dev": true
+        },
+        "is-string": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+            "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+            "dev": true
+        },
        "is-symbol": {
            "version": "1.0.3",
            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -1445,12 +1394,34 @@
                "has-symbols": "^1.0.1"
            }
        },
+        "isarray": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+            "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+            "dev": true
+        },
        "isexe": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
            "dev": true
        },
+        "iterate-iterator": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz",
+            "integrity": "sha512-3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw==",
+            "dev": true
+        },
+        "iterate-value": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz",
+            "integrity": "sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==",
+            "dev": true,
+            "requires": {
+                "es-get-iterator": "^1.0.2",
+                "iterate-iterator": "^1.0.1"
+            }
+        },
        "js-tokens": {
            "version": "4.0.0",
            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1505,19 +1476,18 @@
            }
        },
        "locate-path": {
-            "version": "3.0.0",
+            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
            "dev": true,
            "requires": {
-                "p-locate": "^3.0.0",
+                "p-locate": "^4.1.0"
-                "path-exists": "^3.0.0"
            }
        },
        "lodash": {
-            "version": "4.17.15",
+            "version": "4.17.19",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-            "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+            "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
            "dev": true
        },
        "log-symbols": {
@@ -1596,12 +1566,6 @@
                "mime-db": "1.44.0"
            }
        },
-        "mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "dev": true
-        },
        "minimatch": {
            "version": "3.0.4",
            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -1627,37 +1591,44 @@
            }
        },
        "mocha": {
-            "version": "7.2.0",
+            "version": "8.0.1",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.0.1.tgz",
-            "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+            "integrity": "sha512-vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg==",
            "dev": true,
            "requires": {
-                "ansi-colors": "3.2.3",
+                "ansi-colors": "4.1.1",
                "browser-stdout": "1.3.1",
-                "chokidar": "3.3.0",
+                "chokidar": "3.3.1",
                "debug": "3.2.6",
-                "diff": "3.5.0",
+                "diff": "4.0.2",
                "escape-string-regexp": "1.0.5",
-                "find-up": "3.0.0",
+                "find-up": "4.1.0",
-                "glob": "7.1.3",
+                "glob": "7.1.6",
                "growl": "1.10.5",
                "he": "1.2.0",
                "js-yaml": "3.13.1",
                "log-symbols": "3.0.0",
                "minimatch": "3.0.4",
-                "mkdirp": "0.5.5",
+                "ms": "2.1.2",
-                "ms": "2.1.1",
-                "node-environment-flags": "1.0.6",
                "object.assign": "4.1.0",
-                "strip-json-comments": "2.0.1",
+                "promise.allsettled": "1.0.2",
-                "supports-color": "6.0.0",
+                "serialize-javascript": "3.0.0",
-                "which": "1.3.1",
+                "strip-json-comments": "3.0.1",
+                "supports-color": "7.1.0",
+                "which": "2.0.2",
                "wide-align": "1.1.3",
+                "workerpool": "6.0.0",
                "yargs": "13.3.2",
                "yargs-parser": "13.1.2",
                "yargs-unparser": "1.6.0"
            },
            "dependencies": {
+                "ansi-colors": {
+                    "version": "4.1.1",
+                    "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+                    "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+                    "dev": true
+                },
                "debug": {
                    "version": "3.2.6",
                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -1667,19 +1638,11 @@
                        "ms": "^2.1.1"
                    }
                },
-                "glob": {
+                "has-flag": {
-                    "version": "7.1.3",
+                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true,
+                    "dev": true
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.0.4",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
                },
                "js-yaml": {
                    "version": "3.13.1",
@@ -1691,34 +1654,19 @@
                        "esprima": "^4.0.0"
                    }
                },
-                "ms": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-                    "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-                    "dev": true
-                },
                "strip-json-comments": {
-                    "version": "2.0.1",
+                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+                    "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-                    "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+                    "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
                    "dev": true
                },
                "supports-color": {
-                    "version": "6.0.0",
+                    "version": "7.1.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-                    "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                },
-                "which": {
-                    "version": "1.3.1",
-                    "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-                    "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
                    "dev": true,
                    "requires": {
-                        "isexe": "^2.0.0"
+                        "has-flag": "^4.0.0"
                    }
                }
            }
@@ -1741,24 +1689,6 @@
            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
            "dev": true
        },
-        "node-environment-flags": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
-            "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
-            "dev": true,
-            "requires": {
-                "object.getownpropertydescriptors": "^2.0.3",
-                "semver": "^5.7.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                }
-            }
-        },
        "node-fetch": {
            "version": "2.6.0",
            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
@@ -1780,9 +1710,9 @@
            }
        },
        "object-inspect": {
-            "version": "1.7.0",
+            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-            "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+            "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
            "dev": true
        },
        "object-keys": {
@@ -1803,16 +1733,6 @@
                "object-keys": "^1.0.11"
            }
        },
-        "object.getownpropertydescriptors": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-            "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.0-next.1"
-            }
-        },
        "once": {
            "version": "1.4.0",
            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1822,15 +1742,6 @@
                "wrappy": "1"
            }
        },
-        "onetime": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-            "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-            "dev": true,
-            "requires": {
-                "mimic-fn": "^2.1.0"
-            }
-        },
        "optionator": {
            "version": "0.9.1",
            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -1883,12 +1794,12 @@
            }
        },
        "p-locate": {
-            "version": "3.0.0",
+            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
            "dev": true,
            "requires": {
-                "p-limit": "^2.0.0"
+                "p-limit": "^2.2.0"
            }
        },
        "p-try": {
@@ -1933,9 +1844,9 @@
            }
        },
        "path-exists": {
-            "version": "3.0.0",
+            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
            "dev": true
        },
        "path-is-absolute": {
@@ -1980,6 +1891,19 @@
            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
            "dev": true
        },
+        "promise.allsettled": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz",
+            "integrity": "sha512-UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg==",
+            "dev": true,
+            "requires": {
+                "array.prototype.map": "^1.0.1",
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.17.0-next.1",
+                "function-bind": "^1.1.1",
+                "iterate-value": "^1.0.0"
+            }
+        },
        "pseudomap": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -2013,12 +1937,12 @@
            }
        },
        "readdirp": {
-            "version": "3.2.0",
+            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
-            "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+            "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
            "dev": true,
            "requires": {
-                "picomatch": "^2.0.4"
+                "picomatch": "^2.0.7"
            }
        },
        "regexpp": {
@@ -2054,16 +1978,6 @@
            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
            "dev": true
        },
-        "restore-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-            "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-            "dev": true,
-            "requires": {
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2"
-            }
-        },
        "rimraf": {
            "version": "2.6.3",
            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -2074,54 +1988,31 @@
            }
        },
        "rollup": {
-            "version": "2.10.9",
+            "version": "2.18.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.10.9.tgz",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.18.1.tgz",
-            "integrity": "sha512-dY/EbjiWC17ZCUSyk14hkxATAMAShkMsD43XmZGWjLrgFj15M3Dw2kEkA9ns64BiLFm9PKN6vTQw8neHwK74eg==",
+            "integrity": "sha512-w4X77ADA+WTGlapC8Z6yggdJtODw3SBl6R2LSkA7ZW5MtdkgcB7sfaSD1UWyx8diXbMcGIb0eI9gCx/dyqOgNQ==",
            "dev": true,
            "requires": {
                "fsevents": "~2.1.2"
            }
        },
-        "run-async": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-            "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-            "dev": true
-        },
-        "rxjs": {
-            "version": "6.5.5",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-            "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-            "dev": true,
-            "requires": {
-                "tslib": "^1.9.0"
-            },
-            "dependencies": {
-                "tslib": {
-                    "version": "1.13.0",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-                    "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-                    "dev": true
-                }
-            }
-        },
        "safe-buffer": {
            "version": "5.2.0",
            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
            "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
            "dev": true
        },
-        "safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true
-        },
        "semver": {
            "version": "6.3.0",
            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
        },
+        "serialize-javascript": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz",
+            "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==",
+            "dev": true
+        },
        "set-blocking": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -2149,12 +2040,6 @@
            "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
            "dev": true
        },
-        "signal-exit": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-            "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-            "dev": true
-        },
        "slice-ansi": {
            "version": "2.1.0",
            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
@@ -2164,14 +2049,6 @@
                "ansi-styles": "^3.2.0",
                "astral-regex": "^1.0.0",
                "is-fullwidth-code-point": "^2.0.0"
-            },
-            "dependencies": {
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
-                }
            }
        },
        "sourcemap-codec": {
@@ -2187,14 +2064,31 @@
            "dev": true
        },
        "string-width": {
-            "version": "4.2.0",
+            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-            "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+            "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
            "dev": true,
            "requires": {
-                "emoji-regex": "^8.0.0",
+                "emoji-regex": "^7.0.1",
-                "is-fullwidth-code-point": "^3.0.0",
+                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^6.0.0"
+                "strip-ansi": "^5.1.0"
+            },
+            "dependencies": {
+                "ansi-regex": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+                    "dev": true
+                },
+                "strip-ansi": {
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "^4.1.0"
+                    }
+                }
            }
        },
        "string.prototype.trimend": {
@@ -2207,28 +2101,6 @@
                "es-abstract": "^1.17.5"
            }
        },
-        "string.prototype.trimleft": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
-            "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.5",
-                "string.prototype.trimstart": "^1.0.0"
-            }
-        },
-        "string.prototype.trimright": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
-            "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.5",
-                "string.prototype.trimend": "^1.0.0"
-            }
-        },
        "string.prototype.trimstart": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
@@ -2282,46 +2154,6 @@
                "lodash": "^4.17.14",
                "slice-ansi": "^2.1.0",
                "string-width": "^3.0.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-                    "dev": true
-                },
-                "emoji-regex": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^4.1.0"
-                    }
-                }
            }
        },
        "text-table": {
@@ -2330,21 +2162,6 @@
            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
            "dev": true
        },
-        "through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-            "dev": true
-        },
-        "tmp": {
-            "version": "0.0.33",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-            "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-            "dev": true,
-            "requires": {
-                "os-tmpdir": "~1.0.2"
-            }
-        },
        "to-regex-range": {
            "version": "5.0.1",
            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2409,9 +2226,9 @@
            }
        },
        "typescript": {
-            "version": "3.9.3",
+            "version": "3.9.5",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz",
-            "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==",
+            "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==",
            "dev": true
        },
        "typescript-formatter": {
@@ -2458,9 +2275,9 @@
            "dev": true
        },
        "v8-compile-cache": {
-            "version": "2.1.0",
+            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-            "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
+            "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
            "dev": true
        },
        "vsce": {
@@ -2537,9 +2354,9 @@
            "integrity": "sha512-tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="
        },
        "vscode-test": {
-            "version": "1.3.0",
+            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-1.4.0.tgz",
-            "integrity": "sha512-LddukcBiSU2FVTDr3c1D8lwkiOvwlJdDL2hqVbn6gIz+rpTqUCkMZSKYm94Y1v0WXlHSDQBsXyY+tchWQgGVsw==",
+            "integrity": "sha512-Jt7HNGvSE0+++Tvtq5wc4hiXLIr2OjDShz/gbAfM/mahQpy4rKBnmOK33D+MR67ATWviQhl+vpmU3p/qwSH/Pg==",
            "dev": true,
            "requires": {
                "http-proxy-agent": "^2.1.0",
@@ -2577,12 +2394,6 @@
                    "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
                    "dev": true
                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
-                },
                "string-width": {
                    "version": "2.1.1",
                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -2610,6 +2421,12 @@
            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
            "dev": true
        },
+        "workerpool": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz",
+            "integrity": "sha512-fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA==",
+            "dev": true
+        },
        "wrap-ansi": {
            "version": "5.1.0",
            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
@@ -2627,29 +2444,6 @@
                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
                    "dev": true
                },
-                "emoji-regex": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    }
-                },
                "strip-ansi": {
                    "version": "5.2.0",
                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -2706,43 +2500,39 @@
                "yargs-parser": "^13.1.2"
            },
            "dependencies": {
-                "ansi-regex": {
+                "find-up": {
-                    "version": "4.1.0",
+                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-                    "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+                    "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-                    "dev": true
+                    "dev": true,
-                },
+                    "requires": {
-                "emoji-regex": {
+                        "locate-path": "^3.0.0"
-                    "version": "7.0.3",
+                    }
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
                },
-                "string-width": {
+                "locate-path": {
-                    "version": "3.1.0",
+                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+                    "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
                    "dev": true,
                    "requires": {
-                        "emoji-regex": "^7.0.1",
+                        "p-locate": "^3.0.0",
-                        "is-fullwidth-code-point": "^2.0.0",
+                        "path-exists": "^3.0.0"
-                        "strip-ansi": "^5.1.0"
                    }
                },
-                "strip-ansi": {
+                "p-locate": {
-                    "version": "5.2.0",
+                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-                    "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+                    "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
                    "dev": true,
                    "requires": {
-                        "ansi-regex": "^4.1.0"
+                        "p-limit": "^2.0.0"
                    }
+                },
+                "path-exists": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+                    "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+                    "dev": true
                }
            }
        },
diff --git a/editors/code/package.json b/editors/code/package.json
index f542a490a..1adf055d0 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -39,29 +39,30 @@
        "vscode-languageclient": "7.0.0-next.1"
    },
    "devDependencies": {
-        "@rollup/plugin-commonjs": "^12.0.0",
+        "@rollup/plugin-commonjs": "^13.0.0",
-        "@rollup/plugin-node-resolve": "^8.0.0",
+        "@rollup/plugin-node-resolve": "^8.1.0",
-        "@types/glob": "^7.1.1",
+        "@types/glob": "^7.1.2",
        "@types/mocha": "^7.0.2",
-        "@types/node": "^14.0.5",
+        "@types/node": "~12.7.0",
        "@types/node-fetch": "^2.5.7",
        "@types/vscode": "^1.44.1",
-        "@typescript-eslint/eslint-plugin": "^3.0.0",
+        "@typescript-eslint/eslint-plugin": "^3.4.0",
-        "@typescript-eslint/parser": "^3.0.0",
+        "@typescript-eslint/parser": "^3.4.0",
-        "eslint": "^7.0.0",
+        "eslint": "^7.3.1",
        "glob": "^7.1.6",
-        "mocha": "^7.1.2",
+        "mocha": "^8.0.1",
-        "rollup": "^2.10.7",
+        "rollup": "^2.18.1",
        "tslib": "^2.0.0",
-        "typescript": "^3.9.3",
+        "typescript": "^3.9.5",
        "typescript-formatter": "^7.2.2",
        "vsce": "^1.75.0",
-        "vscode-test": "^1.3.0"
+        "vscode-test": "^1.4.0"
    },
    "activationEvents": [
        "onLanguage:rust",
        "onCommand:rust-analyzer.analyzerStatus",
-        "onCommand:rust-analyzer.collectGarbage",
+        "onCommand:rust-analyzer.memoryUsage",
+        "onCommand:rust-analyzer.reloadWorkspace",
        "workspaceContains:**/Cargo.toml"
    ],
    "main": "./out/src/main",
@@ -143,8 +144,13 @@
                "category": "Rust Analyzer"
            },
            {
-                "command": "rust-analyzer.collectGarbage",
+                "command": "rust-analyzer.memoryUsage",
-                "title": "Run garbage collection",
+                "title": "Memory Usage (Clears Database)",
+                "category": "Rust Analyzer"
+            },
+            {
+                "command": "rust-analyzer.reloadWorkspace",
+                "title": "Reload workspace",
                "category": "Rust Analyzer"
            },
            {
@@ -194,11 +200,6 @@
            "type": "object",
            "title": "Rust Analyzer",
            "properties": {
-                "rust-analyzer.diagnostics.enable": {
-                    "type": "boolean",
-                    "default": true,
-                    "markdownDescription": "Whether to show native rust-analyzer diagnostics."
-                },
                "rust-analyzer.lruCapacity": {
                    "type": [
                        "null",
@@ -231,6 +232,11 @@
                    "default": true,
                    "markdownDescription": "Whether to show `can't find Cargo.toml` error message"
                },
+                "rust-analyzer.cargo.autoreload": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "Automatically refresh project info via `cargo metadata` on Cargo.toml changes"
+                },
                "rust-analyzer.cargo.noDefaultFeatures": {
                    "type": "boolean",
                    "default": false,
@@ -317,6 +323,14 @@
                    "default": true,
                    "markdownDescription": "Check all targets and tests (will be passed as `--all-targets`)"
                },
+                "rust-analyzer.checkOnSave.noDefaultFeatures": {
+                    "type": [
+                        "null",
+                        "boolean"
+                    ],
+                    "default": null,
+                    "markdownDescription": "Do not activate the `default` feature"
+                },
                "rust-analyzer.checkOnSave.allFeatures": {
                    "type": [
                        "null",
@@ -344,6 +358,35 @@
                    "default": null,
                    "description": "Custom cargo runner extension ID."
                },
+                "rust-analyzer.runnableEnv": {
+                    "anyOf": [
+                        {
+                            "type": "null"
+                        },
+                        {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "mask": {
+                                        "type": "string",
+                                        "description": "Runnable name mask"
+                                    },
+                                    "env": {
+                                        "type": "object",
+                                        "description": "Variables in form of { \"key\": \"value\"}"
+                                    }
+                                }
+                            }
+                        },
+                        {
+                            "type": "object",
+                            "description": "Variables in form of { \"key\": \"value\"}"
+                        }
+                    ],
+                    "default": null,
+                    "description": "Environment variables passed to the runnable launched using `Test ` or `Debug` lens or `rust-analyzer.run` command."
+                },
                "rust-analyzer.inlayHints.enable": {
                    "type": "boolean",
                    "default": true,
@@ -539,6 +582,16 @@
                    "type": "boolean",
                    "default": true
                },
+                "rust-analyzer.diagnostics.enable": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "Whether to show native rust-analyzer diagnostics."
+                },
+                "rust-analyzer.diagnostics.enableExperimental": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "Whether to show experimental rust-analyzer diagnostics that might have more false positives than usual."
+                },
                "rust-analyzer.diagnostics.warningsAsInfo": {
                    "type": "array",
                    "uniqueItems": true,
@@ -554,7 +607,7 @@
                    "items": {
                        "type": "string"
                    },
-                    "description": "List of warnings warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in te problems panel.",
+                    "description": "List of warnings warnings that should be displayed with hint severity.\nThe warnings will be indicated by faded text or three dots in code and will not show up in the problems panel.",
                    "default": []
                }
            }
@@ -615,24 +668,30 @@
        "problemMatchers": [
            {
                "name": "rustc",
+                "owner": "rustc",
+                "source": "rustc",
                "fileLocation": [
-                    "relative",
+                    "autoDetect",
                    "${workspaceRoot}"
                ],
                "pattern": "$rustc"
            },
            {
                "name": "rustc-json",
+                "owner": "rustc",
+                "source": "rustc",
                "fileLocation": [
-                    "relative",
+                    "autoDetect",
                    "${workspaceRoot}"
                ],
                "pattern": "$rustc-json"
            },
            {
                "name": "rustc-watch",
+                "owner": "rustc",
+                "source": "rustc",
                "fileLocation": [
-                    "relative",
+                    "autoDetect",
                    "${workspaceRoot}"
                ],
                "background": {
@@ -815,7 +874,11 @@
                    "when": "inRustProject"
                },
                {
-                    "command": "rust-analyzer.collectGarbage",
+                    "command": "rust-analyzer.memoryUsage",
+                    "when": "inRustProject"
+                },
+                {
+                    "command": "rust-analyzer.reloadWorkspace",
                    "when": "inRustProject"
                },
                {
diff --git a/editors/code/rollup.config.js b/editors/code/rollup.config.js
index 4b4c47f4a..27abf75ac 100644
--- a/editors/code/rollup.config.js
+++ b/editors/code/rollup.config.js
@@ -16,7 +16,6 @@ export default {
    external: [...nodeBuiltins, 'vscode'],
    output: {
        file: './out/src/main.js',
-        format: 'cjs',
+        format: 'cjs'
-        exports: 'named'
    }
 };
diff --git a/editors/code/rust.tmGrammar.json b/editors/code/rust.tmGrammar.json
index ab87cd39f..0be2583db 100644
--- a/editors/code/rust.tmGrammar.json
+++ b/editors/code/rust.tmGrammar.json
@@ -268,7 +268,7 @@
                        "match": "\\b(log|error|warn|info|debug|trace|log_enabled)!"
                },
                {
-                        "comment": "Invokation of a macro",
+                        "comment": "Invocation of a macro",
                        "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*\\!)\\s*[({\\[]",
                        "captures": {
                                "1": {
@@ -683,4 +683,4 @@
                        ]
                }
        }
-}
-\ No newline at end of file
+}
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 65ad573d8..18948cb3c 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -41,6 +41,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
    const clientOptions: lc.LanguageClientOptions = {
        documentSelector: [{ scheme: 'file', language: 'rust' }],
        initializationOptions: vscode.workspace.getConfiguration("rust-analyzer"),
+        diagnosticCollectionName: "rustc",
        traceOutputChannel,
        middleware: {
            // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576
@@ -66,7 +67,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                        return Promise.resolve(null);
                    });
            },
-            // Using custom handling of CodeActions where each code action is resloved lazily
+            // Using custom handling of CodeActions where each code action is resolved lazily
            // That's why we are not waiting for any command or edits
            async provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken, _next: lc.ProvideCodeActionsSignature) {
                const params: lc.CodeActionParams = {
@@ -87,7 +88,8 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                            continue;
                        }
                        assert(isCodeActionWithoutEditsAndCommands(item), "We don't expect edits or commands here");
-                        const action = new vscode.CodeAction(item.title);
+                        const kind = client.protocol2CodeConverter.asCodeActionKind((item as any).kind);
+                        const action = new vscode.CodeAction(item.title, kind);
                        const group = (item as any).group;
                        const id = (item as any).id;
                        const resolveParams: ra.ResolveCodeActionParams = {
@@ -116,6 +118,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
                            result[index] = items[0];
                        } else {
                            const action = new vscode.CodeAction(group);
+                            action.kind = items[0].kind;
                            action.command = {
                                command: "rust-analyzer.applyActionGroup",
                                title: "",
@@ -161,6 +164,7 @@ class ExperimentalFeatures implements lc.StaticFeature {
        caps.codeActionGroup = true;
        caps.resolveCodeAction = true;
        caps.hoverActions = true;
+        caps.statusNotification = true;
        capabilities.experimental = caps;
    }
    initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void {
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index 0e78f5101..d0faf4745 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -55,6 +55,38 @@ export function analyzerStatus(ctx: Ctx): Cmd {
    };
 }
+export function memoryUsage(ctx: Ctx): Cmd {
+    const tdcp = new class implements vscode.TextDocumentContentProvider {
+        readonly uri = vscode.Uri.parse('rust-analyzer-memory://memory');
+        readonly eventEmitter = new vscode.EventEmitter<vscode.Uri>();
+        provideTextDocumentContent(_uri: vscode.Uri): vscode.ProviderResult<string> {
+            if (!vscode.window.activeTextEditor) return '';
+            return ctx.client.sendRequest(ra.memoryUsage, null).then((mem) => {
+                return 'Per-query memory usage:\n' + mem + '\n(note: database has been cleared)';
+            });
+        }
+        get onDidChange(): vscode.Event<vscode.Uri> {
+            return this.eventEmitter.event;
+        }
+    }();
+    ctx.pushCleanup(
+        vscode.workspace.registerTextDocumentContentProvider(
+            'rust-analyzer-memory',
+            tdcp,
+        ),
+    );
+    return async () => {
+        tdcp.eventEmitter.fire(tdcp.uri);
+        const document = await vscode.workspace.openTextDocument(tdcp.uri);
+        return vscode.window.showTextDocument(document, vscode.ViewColumn.Two, true);
+    };
+}
 export function matchingBrace(ctx: Ctx): Cmd {
    return async () => {
        const editor = ctx.activeRustEditor;
@@ -153,15 +185,22 @@ export function parentModule(ctx: Ctx): Cmd {
 export function ssr(ctx: Ctx): Cmd {
    return async () => {
+        const editor = vscode.window.activeTextEditor;
        const client = ctx.client;
-        if (!client) return;
+        if (!editor || !client) return;
+        const position = editor.selection.active;
+        const selections = editor.selections;
+        const textDocument = { uri: editor.document.uri.toString() };
        const options: vscode.InputBoxOptions = {
            value: "() ==>> ()",
            prompt: "Enter request, for example 'Foo($a) ==> Foo::new($a)' ",
            validateInput: async (x: string) => {
                try {
-                    await client.sendRequest(ra.ssr, { query: x, parseOnly: true });
+                    await client.sendRequest(ra.ssr, {
+                        query: x, parseOnly: true, textDocument, position, selections,
+                    });
                } catch (e) {
                    return e.toString();
                }
@@ -176,7 +215,9 @@ export function ssr(ctx: Ctx): Cmd {
            title: "Structured search replace in progress...",
            cancellable: false,
        }, async (_progress, _token) => {
-            const edit = await client.sendRequest(ra.ssr, { query: request, parseOnly: false });
+            const edit = await client.sendRequest(ra.ssr, {
+                query: request, parseOnly: false, textDocument, position, selections,
+            });
            await vscode.workspace.applyEdit(client.protocol2CodeConverter.asWorkspaceEdit(edit));
        });
@@ -330,8 +371,8 @@ export function expandMacro(ctx: Ctx): Cmd {
    };
 }
-export function collectGarbage(ctx: Ctx): Cmd {
+export function reloadWorkspace(ctx: Ctx): Cmd {
-    return async () => ctx.client.sendRequest(ra.collectGarbage, null);
+    return async () => ctx.client.sendRequest(ra.reloadWorkspace, null);
 }
 export function showReferences(ctx: Ctx): Cmd {
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index fc95a7de6..033b04b60 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -5,6 +5,8 @@ export type UpdatesChannel = "stable" | "nightly";
 export const NIGHTLY_TAG = "nightly";
+export type RunnableEnvCfg = undefined | Record<string, string> | { mask?: string; env: Record<string, string> }[];
 export class Config {
    readonly extensionId = "matklad.rust-analyzer";
@@ -37,10 +39,10 @@ export class Config {
    private refreshLogging() {
        log.setEnabled(this.traceExtension);
-        log.debug(
+        log.info("Extension version:", this.package.version);
-            "Extension version:", this.package.version,
-            "using configuration:", this.cfg
+        const cfg = Object.entries(this.cfg).filter(([_, val]) => !(val instanceof Function));
-        );
+        log.info("Using configuration", Object.fromEntries(cfg));
    }
    private async onDidChangeConfiguration(event: vscode.ConfigurationChangeEvent) {
@@ -114,6 +116,10 @@ export class Config {
        return this.get<string | undefined>("cargoRunner");
    }
+    get runnableEnv() {
+        return this.get<RunnableEnvCfg>("runnableEnv");
+    }
    get debug() {
        // "/rustc/<id>" used by suggestions only.
        const { ["/rustc/<id>"]: _, ...sourceFileMap } = this.get<Record<string, string>>("debug.sourceFileMap");
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 41df11991..6e767babf 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -1,9 +1,11 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
+import * as ra from './lsp_ext';
 import { Config } from './config';
 import { createClient } from './client';
 import { isRustEditor, RustEditor } from './util';
+import { Status } from './lsp_ext';
 export class Ctx {
    private constructor(
@@ -11,6 +13,7 @@ export class Ctx {
        private readonly extCtx: vscode.ExtensionContext,
        readonly client: lc.LanguageClient,
        readonly serverPath: string,
+        readonly statusBar: vscode.StatusBarItem,
    ) {
    }
@@ -22,9 +25,18 @@ export class Ctx {
        cwd: string,
    ): Promise<Ctx> {
        const client = createClient(serverPath, cwd);
-        const res = new Ctx(config, extCtx, client, serverPath);
+        const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+        extCtx.subscriptions.push(statusBar);
+        statusBar.text = "rust-analyzer";
+        statusBar.tooltip = "ready";
+        statusBar.show();
+        const res = new Ctx(config, extCtx, client, serverPath, statusBar);
        res.pushCleanup(client.start());
        await client.onReady();
+        client.onNotification(ra.status, (status) => res.setStatus(status));
        return res;
    }
@@ -54,6 +66,35 @@ export class Ctx {
        return this.extCtx.subscriptions;
    }
+    setStatus(status: Status) {
+        switch (status) {
+            case "loading":
+                this.statusBar.text = "$(sync~spin) rust-analyzer";
+                this.statusBar.tooltip = "Loading the project";
+                this.statusBar.command = undefined;
+                this.statusBar.color = undefined;
+                break;
+            case "ready":
+                this.statusBar.text = "rust-analyzer";
+                this.statusBar.tooltip = "Ready";
+                this.statusBar.command = undefined;
+                this.statusBar.color = undefined;
+                break;
+            case "invalid":
+                this.statusBar.text = "$(error) rust-analyzer";
+                this.statusBar.tooltip = "Failed to load the project";
+                this.statusBar.command = undefined;
+                this.statusBar.color = new vscode.ThemeColor("notificationsErrorIcon.foreground");
+                break;
+            case "needsReload":
+                this.statusBar.text = "$(warning) rust-analyzer";
+                this.statusBar.tooltip = "Click to reload";
+                this.statusBar.command = "rust-analyzer.reloadWorkspace";
+                this.statusBar.color = new vscode.ThemeColor("notificationsWarningIcon.foreground");
+                break;
+        }
+    }
    pushCleanup(d: Disposable) {
        this.extCtx.subscriptions.push(d);
    }
diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts
index 61c12dbe0..bd92c5b6d 100644
--- a/editors/code/src/debug.ts
+++ b/editors/code/src/debug.ts
@@ -5,9 +5,10 @@ import * as ra from './lsp_ext';
 import { Cargo } from './toolchain';
 import { Ctx } from "./ctx";
+import { prepareEnv } from "./run";
 const debugOutput = vscode.window.createOutputChannel("Debug");
-type DebugConfigProvider = (config: ra.Runnable, executable: string, sourceFileMap?: Record<string, string>) => vscode.DebugConfiguration;
+type DebugConfigProvider = (config: ra.Runnable, executable: string, env: Record<string, string>, sourceFileMap?: Record<string, string>) => vscode.DebugConfiguration;
 export async function makeDebugConfig(ctx: Ctx, runnable: ra.Runnable): Promise<void> {
    const scope = ctx.activeRustEditor?.document.uri;
@@ -92,7 +93,8 @@ async function getDebugConfiguration(ctx: Ctx, runnable: ra.Runnable): Promise<v
    }
    const executable = await getDebugExecutable(runnable);
-    const debugConfig = knownEngines[debugEngine.id](runnable, simplifyPath(executable), debugOptions.sourceFileMap);
+    const env = prepareEnv(runnable, ctx.config.runnableEnv);
+    const debugConfig = knownEngines[debugEngine.id](runnable, simplifyPath(executable), env, debugOptions.sourceFileMap);
    if (debugConfig.type in debugOptions.engineSettings) {
        const settingsMap = (debugOptions.engineSettings as any)[debugConfig.type];
        for (var key in settingsMap) {
@@ -121,7 +123,7 @@ async function getDebugExecutable(runnable: ra.Runnable): Promise<string> {
    return executable;
 }
-function getLldbDebugConfig(runnable: ra.Runnable, executable: string, sourceFileMap?: Record<string, string>): vscode.DebugConfiguration {
+function getLldbDebugConfig(runnable: ra.Runnable, executable: string, env: Record<string, string>, sourceFileMap?: Record<string, string>): vscode.DebugConfiguration {
    return {
        type: "lldb",
        request: "launch",
@@ -130,11 +132,12 @@ function getLldbDebugConfig(runnable: ra.Runnable, executable: string, sourceFil
        args: runnable.args.executableArgs,
        cwd: runnable.args.workspaceRoot,
        sourceMap: sourceFileMap,
-        sourceLanguages: ["rust"]
+        sourceLanguages: ["rust"],
+        env
    };
 }
-function getCppvsDebugConfig(runnable: ra.Runnable, executable: string, sourceFileMap?: Record<string, string>): vscode.DebugConfiguration {
+function getCppvsDebugConfig(runnable: ra.Runnable, executable: string, env: Record<string, string>, sourceFileMap?: Record<string, string>): vscode.DebugConfiguration {
    return {
        type: (os.platform() === "win32") ? "cppvsdbg" : "cppdbg",
        request: "launch",
@@ -142,6 +145,7 @@ function getCppvsDebugConfig(runnable: ra.Runnable, executable: string, sourceFi
        program: executable,
        args: runnable.args.executableArgs,
        cwd: runnable.args.workspaceRoot,
-        sourceFileMap: sourceFileMap,
+        sourceFileMap,
+        env,
    };
 }
diff --git a/editors/code/src/lsp_ext.ts b/editors/code/src/lsp_ext.ts
index e16ea799c..494d51c83 100644
--- a/editors/code/src/lsp_ext.ts
+++ b/editors/code/src/lsp_ext.ts
@@ -5,8 +5,12 @@
 import * as lc from "vscode-languageclient";
 export const analyzerStatus = new lc.RequestType<null, string, void>("rust-analyzer/analyzerStatus");
+export const memoryUsage = new lc.RequestType<null, string, void>("rust-analyzer/memoryUsage");
-export const collectGarbage = new lc.RequestType<null, null, void>("rust-analyzer/collectGarbage");
+export type Status = "loading" | "ready" | "invalid" | "needsReload";
+export const status = new lc.NotificationType<Status>("rust-analyzer/status");
+export const reloadWorkspace = new lc.RequestType<null, null, void>("rust-analyzer/reloadWorkspace");
 export interface SyntaxTreeParams {
    textDocument: lc.TextDocumentIdentifier;
@@ -60,6 +64,7 @@ export interface Runnable {
        workspaceRoot?: string;
        cargoArgs: string[];
        executableArgs: string[];
+        expectTest?: boolean;
    };
 }
 export const runnables = new lc.RequestType<RunnablesParams, Runnable[], void>("experimental/runnables");
@@ -88,6 +93,9 @@ export const inlayHints = new lc.RequestType<InlayHintsParams, InlayHint[], void
 export interface SsrParams {
    query: string;
    parseOnly: boolean;
+    textDocument: lc.TextDocumentIdentifier;
+    position: lc.Position;
+    selections: lc.Range[];
 }
 export const ssr = new lc.RequestType<SsrParams, lc.WorkspaceEdit, void>('experimental/ssr');
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 5ceab8b44..bd99d696a 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -19,6 +19,16 @@ let ctx: Ctx | undefined;
 const RUST_PROJECT_CONTEXT_NAME = "inRustProject";
 export async function activate(context: vscode.ExtensionContext) {
+    // For some reason vscode not always shows pop-up error notifications
+    // when an extension fails to activate, so we do it explicitly by ourselves.
+    // FIXME: remove this bit of code once vscode fixes this issue: https://github.com/microsoft/vscode/issues/101242
+    await tryActivate(context).catch(err => {
+        void vscode.window.showErrorMessage(`Cannot activate rust-analyzer: ${err.message}`);
+        throw err;
+    });
+}
+async function tryActivate(context: vscode.ExtensionContext) {
    // Register a "dumb" onEnter command for the case where server fails to
    // start.
    //
@@ -44,13 +54,13 @@ export async function activate(context: vscode.ExtensionContext) {
    const serverPath = await bootstrap(config, state).catch(err => {
        let message = "bootstrap error. ";
-        if (err.code === "EBUSY" || err.code === "ETXTBSY") {
+        if (err.code === "EBUSY" || err.code === "ETXTBSY" || err.code === "EPERM") {
            message += "Other vscode windows might be using rust-analyzer, ";
            message += "you should close them and reload this window to retry. ";
        }
-        message += 'Open "Help > Toggle Developer Tools > Console" to see the logs ';
+        message += 'See the logs in "OUTPUT > Rust Analyzer Client" (should open automatically). ';
-        message += '(enable verbose logs with "rust-analyzer.trace.extension")';
+        message += 'To enable verbose logs use { "rust-analyzer.trace.extension": true }';
        log.error("Bootstrap error", err);
        throw new Error(message);
@@ -58,9 +68,7 @@ export async function activate(context: vscode.ExtensionContext) {
    const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
    if (workspaceFolder === undefined) {
-        const err = "Cannot activate rust-analyzer when no folder is opened";
+        throw new Error("no folder is opened");
-        void vscode.window.showErrorMessage(err);
-        throw new Error(err);
    }
    // Note: we try to start the server before we activate type hints so that it
@@ -88,7 +96,8 @@ export async function activate(context: vscode.ExtensionContext) {
    });
    ctx.registerCommand('analyzerStatus', commands.analyzerStatus);
-    ctx.registerCommand('collectGarbage', commands.collectGarbage);
+    ctx.registerCommand('memoryUsage', commands.memoryUsage);
+    ctx.registerCommand('reloadWorkspace', commands.reloadWorkspace);
    ctx.registerCommand('matchingBrace', commands.matchingBrace);
    ctx.registerCommand('joinLines', commands.joinLines);
    ctx.registerCommand('parentModule', commands.parentModule);
@@ -152,13 +161,17 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
        return;
    };
-    const lastCheck = state.lastCheck;
    const now = Date.now();
+    if (config.package.releaseTag === NIGHTLY_TAG) {
+        // Check if we should poll github api for the new nightly version
+        // if we haven't done it during the past hour
+        const lastCheck = state.lastCheck;
-    const anHour = 60 * 60 * 1000;
+        const anHour = 60 * 60 * 1000;
-    const shouldDownloadNightly = state.releaseId === undefined || (now - (lastCheck ?? 0)) > anHour;
+        const shouldCheckForNewNightly = state.releaseId === undefined || (now - (lastCheck ?? 0)) > anHour;
-    if (!shouldDownloadNightly) return;
+        if (!shouldCheckForNewNightly) return;
+    }
    const release = await fetchRelease("nightly").catch((e) => {
        log.error(e);
@@ -202,7 +215,7 @@ async function bootstrapServer(config: Config, state: PersistentState): Promise<
        );
    }
-    log.debug("Using server binary at", path);
+    log.info("Using server binary at", path);
    if (!isValidExecutable(path)) {
        throw new Error(`Failed to execute ${path} --version`);
@@ -261,13 +274,13 @@ async function getServer(config: Config, state: PersistentState): Promise<string
    };
    if (config.package.releaseTag === null) return "rust-analyzer";
-    let binaryName: string | undefined = undefined;
+    let platform: string | undefined;
    if (process.arch === "x64" || process.arch === "ia32") {
-        if (process.platform === "linux") binaryName = "rust-analyzer-linux";
+        if (process.platform === "linux") platform = "linux";
-        if (process.platform === "darwin") binaryName = "rust-analyzer-mac";
+        if (process.platform === "darwin") platform = "mac";
-        if (process.platform === "win32") binaryName = "rust-analyzer-windows.exe";
+        if (process.platform === "win32") platform = "windows";
    }
-    if (binaryName === undefined) {
+    if (platform === undefined) {
        vscode.window.showErrorMessage(
            "Unfortunately we don't ship binaries for your platform yet. " +
            "You need to manually clone rust-analyzer repository and " +
@@ -278,8 +291,8 @@ async function getServer(config: Config, state: PersistentState): Promise<string
        );
        return undefined;
    }
+    const ext = platform === "windows" ? ".exe" : "";
-    const dest = path.join(config.globalStoragePath, binaryName);
+    const dest = path.join(config.globalStoragePath, `rust-analyzer-${platform}${ext}`);
    const exists = await fs.stat(dest).then(() => true, () => false);
    if (!exists) {
        await state.updateServerVersion(undefined);
@@ -296,7 +309,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
    }
    const release = await fetchRelease(config.package.releaseTag);
-    const artifact = release.assets.find(artifact => artifact.name === binaryName);
+    const artifact = release.assets.find(artifact => artifact.name === `rust-analyzer-${platform}.gz`);
    assert(!!artifact, `Bad release: ${JSON.stringify(release)}`);
    // Unlinking the exe file before moving new one on its place should prevent ETXTBSY error.
@@ -308,6 +321,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
        url: artifact.browser_download_url,
        dest,
        progressTitle: "Downloading rust-analyzer server",
+        gunzip: true,
        mode: 0o755
    });
diff --git a/editors/code/src/net.ts b/editors/code/src/net.ts
index 866092882..681eaa9c9 100644
--- a/editors/code/src/net.ts
+++ b/editors/code/src/net.ts
@@ -1,8 +1,12 @@
-import fetch from "node-fetch";
+// Replace with `import fetch from "node-fetch"` once this is fixed in rollup:
+// https://github.com/rollup/plugins/issues/491
+const fetch = require("node-fetch") as typeof import("node-fetch")["default"];
 import * as vscode from "vscode";
 import * as stream from "stream";
 import * as crypto from "crypto";
 import * as fs from "fs";
+import * as zlib from "zlib";
 import * as util from "util";
 import * as path from "path";
 import { log, assert } from "./util";
@@ -65,6 +69,7 @@ interface DownloadOpts {
    url: string;
    dest: string;
    mode?: number;
+    gunzip?: boolean;
 }
 export async function download(opts: DownloadOpts) {
@@ -82,7 +87,7 @@ export async function download(opts: DownloadOpts) {
        },
        async (progress, _cancellationToken) => {
            let lastPercentage = 0;
-            await downloadFile(opts.url, tempFile, opts.mode, (readBytes, totalBytes) => {
+            await downloadFile(opts.url, tempFile, opts.mode, !!opts.gunzip, (readBytes, totalBytes) => {
                const newPercentage = (readBytes / totalBytes) * 100;
                progress.report({
                    message: newPercentage.toFixed(0) + "%",
@@ -97,16 +102,11 @@ export async function download(opts: DownloadOpts) {
    await fs.promises.rename(tempFile, opts.dest);
 }
-/**
- * Downloads file from `url` and stores it at `destFilePath` with `mode` (unix permissions).
- * `onProgress` callback is called on recieveing each chunk of bytes
- * to track the progress of downloading, it gets the already read and total
- * amount of bytes to read as its parameters.
- */
 async function downloadFile(
    url: string,
    destFilePath: fs.PathLike,
    mode: number | undefined,
+    gunzip: boolean,
    onProgress: (readBytes: number, totalBytes: number) => void
 ): Promise<void> {
    const res = await fetch(url);
@@ -130,7 +130,10 @@ async function downloadFile(
    });
    const destFileStream = fs.createWriteStream(destFilePath, { mode });
-    await pipeline(res.body, destFileStream);
+    const srcStream = gunzip ? res.body.pipe(zlib.createGunzip()) : res.body;
+    await pipeline(srcStream, destFileStream);
    await new Promise<void>(resolve => {
        destFileStream.on("close", resolve);
        destFileStream.destroy();
diff --git a/editors/code/src/persistent_state.ts b/editors/code/src/persistent_state.ts
index 138d11b89..5705eed81 100644
--- a/editors/code/src/persistent_state.ts
+++ b/editors/code/src/persistent_state.ts
@@ -4,7 +4,7 @@ import { log } from './util';
 export class PersistentState {
    constructor(private readonly globalState: vscode.Memento) {
        const { lastCheck, releaseId, serverVersion } = this;
-        log.debug("PersistentState: ", { lastCheck, releaseId, serverVersion });
+        log.info("PersistentState:", { lastCheck, releaseId, serverVersion });
    }
    /**
diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts
index 766b05112..de68f27ae 100644
--- a/editors/code/src/run.ts
+++ b/editors/code/src/run.ts
@@ -5,7 +5,7 @@ import * as tasks from './tasks';
 import { Ctx } from './ctx';
 import { makeDebugConfig } from './debug';
-import { Config } from './config';
+import { Config, RunnableEnvCfg } from './config';
 const quickPickButtons = [{ iconPath: new vscode.ThemeIcon("save"), tooltip: "Save as a launch.json configurtation." }];
@@ -96,6 +96,30 @@ export class RunnableQuickPick implements vscode.QuickPickItem {
    }
 }
+export function prepareEnv(runnable: ra.Runnable, runnableEnvCfg: RunnableEnvCfg): Record<string, string> {
+    const env: Record<string, string> = { "RUST_BACKTRACE": "short" };
+    if (runnable.args.expectTest) {
+        env["UPDATE_EXPECT"] = "1";
+    }
+    Object.assign(env, process.env as { [key: string]: string });
+    if (runnableEnvCfg) {
+        if (Array.isArray(runnableEnvCfg)) {
+            for (const it of runnableEnvCfg) {
+                if (!it.mask || new RegExp(it.mask).test(runnable.label)) {
+                    Object.assign(env, it.env);
+                }
+            }
+        } else {
+            Object.assign(env, runnableEnvCfg);
+        }
+    }
+    return env;
+}
 export async function createTask(runnable: ra.Runnable, config: Config): Promise<vscode.Task> {
    if (runnable.kind !== "cargo") {
        // rust-analyzer supports only one kind, "cargo"
@@ -108,12 +132,13 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise
    if (runnable.args.executableArgs.length > 0) {
        args.push('--', ...runnable.args.executableArgs);
    }
    const definition: tasks.CargoTaskDefinition = {
        type: tasks.TASK_TYPE,
        command: args[0], // run, test, etc...
        args: args.slice(1),
-        cwd: runnable.args.workspaceRoot,
+        cwd: runnable.args.workspaceRoot || ".",
-        env: Object.assign({}, process.env as { [key: string]: string }, { "RUST_BACKTRACE": "short" }),
+        env: prepareEnv(runnable, config.runnableEnv),
    };
    const target = vscode.workspace.workspaceFolders![0]; // safe, see main activate()
diff --git a/editors/code/src/snippets.ts b/editors/code/src/snippets.ts
index bcb3f2cc7..258b49982 100644
--- a/editors/code/src/snippets.ts
+++ b/editors/code/src/snippets.ts
@@ -6,6 +6,10 @@ export async function applySnippetWorkspaceEdit(edit: vscode.WorkspaceEdit) {
    assert(edit.entries().length === 1, `bad ws edit: ${JSON.stringify(edit)}`);
    const [uri, edits] = edit.entries()[0];
+    if (vscode.window.activeTextEditor?.document.uri !== uri) {
+        // `vscode.window.visibleTextEditors` only contains editors whose contents are being displayed
+        await vscode.window.showTextDocument(uri, {});
+    }
    const editor = vscode.window.visibleTextEditors.find((it) => it.document.uri.toString() === uri.toString());
    if (!editor) return;
    await applySnippetTextEdits(editor, edits);
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts
index fec4c3295..970fedb37 100644
--- a/editors/code/src/util.ts
+++ b/editors/code/src/util.ts
@@ -2,6 +2,7 @@ import * as lc from "vscode-languageclient";
 import * as vscode from "vscode";
 import { strict as nativeAssert } from "assert";
 import { spawnSync } from "child_process";
+import { inspect } from "util";
 export function assert(condition: boolean, explanation: string): asserts condition {
    try {
@@ -14,21 +15,46 @@ export function assert(condition: boolean, explanation: string): asserts conditi
 export const log = new class {
    private enabled = true;
+    private readonly output = vscode.window.createOutputChannel("Rust Analyzer Client");
    setEnabled(yes: boolean): void {
        log.enabled = yes;
    }
-    debug(message?: any, ...optionalParams: any[]): void {
+    // Hint: the type [T, ...T[]] means a non-empty array
+    debug(...msg: [unknown, ...unknown[]]): void {
        if (!log.enabled) return;
-        // eslint-disable-next-line no-console
+        log.write("DEBUG", ...msg);
-        console.log(message, ...optionalParams);
+        log.output.toString();
    }
-    error(message?: any, ...optionalParams: any[]): void {
+    info(...msg: [unknown, ...unknown[]]): void {
+        log.write("INFO", ...msg);
+    }
+    warn(...msg: [unknown, ...unknown[]]): void {
+        debugger;
+        log.write("WARN", ...msg);
+    }
+    error(...msg: [unknown, ...unknown[]]): void {
        debugger;
-        // eslint-disable-next-line no-console
+        log.write("ERROR", ...msg);
-        console.error(message, ...optionalParams);
+        log.output.show(true);
+    }
+    private write(label: string, ...messageParts: unknown[]): void {
+        const message = messageParts.map(log.stringify).join(" ");
+        const dateTime = new Date().toLocaleString();
+        log.output.appendLine(`${label} [${dateTime}]: ${message}`);
+    }
+    private stringify(val: unknown): string {
+        if (typeof val === "string") return val;
+        return inspect(val, {
+            colors: false,
+            depth: 6, // heuristic
+        });
    }
 };
@@ -46,7 +72,7 @@ export async function sendRequestWithRetry<TParam, TRet>(
            );
        } catch (error) {
            if (delay === null) {
-                log.error("LSP request timed out", { method: reqType.method, param, error });
+                log.warn("LSP request timed out", { method: reqType.method, param, error });
                throw error;
            }
@@ -55,7 +81,7 @@ export async function sendRequestWithRetry<TParam, TRet>(
            }
            if (error.code !== lc.ErrorCodes.ContentModified) {
-                log.error("LSP request failed", { method: reqType.method, param, error });
+                log.warn("LSP request failed", { method: reqType.method, param, error });
                throw error;
            }
@@ -89,7 +115,8 @@ export function isValidExecutable(path: string): boolean {
    const res = spawnSync(path, ["--version"], { encoding: 'utf8' });
-    log.debug(res, "--version output:", res.output);
+    const printOutput = res.error && (res.error as any).code !== 'ENOENT' ? log.warn : log.debug;
+    printOutput(path, "--version:", res);
    return res.status === 0;
 }
diff --git a/editors/code/tests/unit/index.ts b/editors/code/tests/unit/index.ts
index 5165720b4..b7d8d2144 100644
--- a/editors/code/tests/unit/index.ts
+++ b/editors/code/tests/unit/index.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
-import Mocha from 'mocha';
+import * as Mocha from 'mocha';
-import glob from 'glob';
+import * as glob from 'glob';
 export function run(): Promise<void> {
    // Create the mocha test
diff --git a/editors/code/tests/unit/runnable_env.test.ts b/editors/code/tests/unit/runnable_env.test.ts
new file mode 100644
index 000000000..f2f53e91a
--- /dev/null
+++ b/editors/code/tests/unit/runnable_env.test.ts
@@ -0,0 +1,118 @@
+import * as assert from 'assert';
+import { prepareEnv } from '../../src/run';
+import { RunnableEnvCfg } from '../../src/config';
+import * as ra from '../../src/lsp_ext';
+function makeRunnable(label: string): ra.Runnable {
+    return {
+        label,
+        kind: "cargo",
+        args: {
+            cargoArgs: [],
+            executableArgs: []
+        }
+    };
+}
+function fakePrepareEnv(runnableName: string, config: RunnableEnvCfg): Record<string, string> {
+    const runnable = makeRunnable(runnableName);
+    return prepareEnv(runnable, config);
+}
+suite('Runnable env', () => {
+    test('Global config works', () => {
+        const binEnv = fakePrepareEnv("run project_name", { "GLOBAL": "g" });
+        assert.equal(binEnv["GLOBAL"], "g");
+        const testEnv = fakePrepareEnv("test some::mod::test_name", { "GLOBAL": "g" });
+        assert.equal(testEnv["GLOBAL"], "g");
+    });
+    test('null mask works', () => {
+        const config = [
+            {
+                env: { DATA: "data" }
+            }
+        ];
+        const binEnv = fakePrepareEnv("run project_name", config);
+        assert.equal(binEnv["DATA"], "data");
+        const testEnv = fakePrepareEnv("test some::mod::test_name", config);
+        assert.equal(testEnv["DATA"], "data");
+    });
+    test('order works', () => {
+        const config = [
+            {
+                env: { DATA: "data" }
+            },
+            {
+                env: { DATA: "newdata" }
+            }
+        ];
+        const binEnv = fakePrepareEnv("run project_name", config);
+        assert.equal(binEnv["DATA"], "newdata");
+        const testEnv = fakePrepareEnv("test some::mod::test_name", config);
+        assert.equal(testEnv["DATA"], "newdata");
+    });
+    test('mask works', () => {
+        const config = [
+            {
+                env: { DATA: "data" }
+            },
+            {
+                mask: "^run",
+                env: { DATA: "rundata" }
+            },
+            {
+                mask: "special_test$",
+                env: { DATA: "special_test" }
+            }
+        ];
+        const binEnv = fakePrepareEnv("run project_name", config);
+        assert.equal(binEnv["DATA"], "rundata");
+        const testEnv = fakePrepareEnv("test some::mod::test_name", config);
+        assert.equal(testEnv["DATA"], "data");
+        const specialTestEnv = fakePrepareEnv("test some::mod::special_test", config);
+        assert.equal(specialTestEnv["DATA"], "special_test");
+    });
+    test('exact test name works', () => {
+        const config = [
+            {
+                env: { DATA: "data" }
+            },
+            {
+                mask: "some::mod::test_name",
+                env: { DATA: "test special" }
+            }
+        ];
+        const testEnv = fakePrepareEnv("test some::mod::test_name", config);
+        assert.equal(testEnv["DATA"], "test special");
+        const specialTestEnv = fakePrepareEnv("test some::mod::another_test", config);
+        assert.equal(specialTestEnv["DATA"], "data");
+    });
+    test('test mod name works', () => {
+        const config = [
+            {
+                env: { DATA: "data" }
+            },
+            {
+                mask: "some::mod",
+                env: { DATA: "mod special" }
+            }
+        ];
+        const testEnv = fakePrepareEnv("test some::mod::test_name", config);
+        assert.equal(testEnv["DATA"], "mod special");
+        const specialTestEnv = fakePrepareEnv("test some::mod::another_test", config);
+        assert.equal(specialTestEnv["DATA"], "mod special");
+    });
+});
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json
index 32d1a865f..c9f348241 100644
--- a/editors/code/tsconfig.json
+++ b/editors/code/tsconfig.json
@@ -6,8 +6,6 @@
        "lib": [
            "es2019"
        ],
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
        "sourceMap": true,
        "rootDir": ".",
        "strict": true,
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index a8b9b010d..8140da87f 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -4,13 +4,16 @@ name = "xtask"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
+license = "MIT OR Apache-2.0"
 [lib]
 doctest = false
 [dependencies]
-walkdir = "2.3.1"
+anyhow = "1.0.26"
+flate2 = "1.0"
 pico-args = "0.3.1"
-quote = "1.0.2"
 proc-macro2 = "1.0.8"
-anyhow = "1.0.26"
+quote = "1.0.2"
+ungrammar = "0.1.0"
+walkdir = "2.3.1"
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 392648d71..114898e38 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -93,19 +93,19 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
    ],
    nodes: &[
        "SOURCE_FILE",
-        "STRUCT_DEF",
+        "STRUCT",
-        "UNION_DEF",
+        "UNION",
-        "ENUM_DEF",
+        "ENUM",
-        "FN_DEF",
+        "FN",
        "RET_TYPE",
-        "EXTERN_CRATE_ITEM",
+        "EXTERN_CRATE",
        "MODULE",
-        "USE_ITEM",
+        "USE",
-        "STATIC_DEF",
+        "STATIC",
-        "CONST_DEF",
+        "CONST",
-        "TRAIT_DEF",
+        "TRAIT",
-        "IMPL_DEF",
+        "IMPL",
-        "TYPE_ALIAS_DEF",
+        "TYPE_ALIAS",
        "MACRO_CALL",
        "TOKEN_TREE",
        "MACRO_DEF",
@@ -159,9 +159,9 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
        "MATCH_ARM_LIST",
        "MATCH_ARM",
        "MATCH_GUARD",
-        "RECORD_LIT",
+        "RECORD_EXPR",
-        "RECORD_FIELD_LIST",
+        "RECORD_EXPR_FIELD_LIST",
-        "RECORD_FIELD",
+        "RECORD_EXPR_FIELD",
        "EFFECT_EXPR",
        "BOX_EXPR",
        // postfix
@@ -179,13 +179,14 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
        "BIN_EXPR",
        "EXTERN_BLOCK",
        "EXTERN_ITEM_LIST",
-        "ENUM_VARIANT",
+        "VARIANT",
-        "RECORD_FIELD_DEF_LIST",
+        "RECORD_FIELD_LIST",
-        "RECORD_FIELD_DEF",
+        "RECORD_FIELD",
-        "TUPLE_FIELD_DEF_LIST",
+        "TUPLE_FIELD_LIST",
-        "TUPLE_FIELD_DEF",
+        "TUPLE_FIELD",
-        "ENUM_VARIANT_LIST",
+        "VARIANT_LIST",
        "ITEM_LIST",
+        "ASSOC_ITEM_LIST",
        "ATTR",
        "META_ITEM", // not an item actually
        "USE_TREE",
@@ -193,7 +194,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
        "PATH",
        "PATH_SEGMENT",
        "LITERAL",
-        "ALIAS",
+        "RENAME",
        "VISIBILITY",
        "WHERE_CLAUSE",
        "WHERE_PRED",
@@ -202,7 +203,8 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
        "NAME_REF",
        "LET_STMT",
        "EXPR_STMT",
-        "TYPE_PARAM_LIST",
+        "GENERIC_PARAM_LIST",
+        "GENERIC_PARAM",
        "LIFETIME_PARAM",
        "TYPE_PARAM",
        "CONST_PARAM",
@@ -223,2021 +225,37 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
    ],
 };
-pub(crate) struct AstSrc<'a> {
+#[derive(Default, Debug)]
-    pub(crate) tokens: &'a [&'a str],
+pub(crate) struct AstSrc {
-    pub(crate) nodes: &'a [AstNodeSrc<'a>],
+    pub(crate) tokens: Vec<String>,
-    pub(crate) enums: &'a [AstEnumSrc<'a>],
+    pub(crate) nodes: Vec<AstNodeSrc>,
-}
+    pub(crate) enums: Vec<AstEnumSrc>,
-pub(crate) struct AstNodeSrc<'a> {
-    pub(crate) doc: &'a [&'a str],
-    pub(crate) name: &'a str,
-    pub(crate) traits: &'a [&'a str],
-    pub(crate) fields: &'a [Field<'a>],
-}
-pub(crate) enum Field<'a> {
-    Token(&'a str),
-    Node { name: &'a str, src: FieldSrc<'a> },
-}
-pub(crate) enum FieldSrc<'a> {
-    Shorthand,
-    Optional(&'a str),
-    Many(&'a str),
 }
-pub(crate) struct AstEnumSrc<'a> {
+#[derive(Debug)]
-    pub(crate) doc: &'a [&'a str],
+pub(crate) struct AstNodeSrc {
-    pub(crate) name: &'a str,
+    pub(crate) doc: Vec<String>,
-    pub(crate) traits: &'a [&'a str],
+    pub(crate) name: String,
-    pub(crate) variants: &'a [&'a str],
+    pub(crate) traits: Vec<String>,
+    pub(crate) fields: Vec<Field>,
 }
-macro_rules! ast_nodes {
+#[derive(Debug, Eq, PartialEq)]
-    ($(
+pub(crate) enum Field {
-        $(#[doc = $doc:expr])+
+    Token(String),
-        struct $name:ident$(: $($trait:ident),*)? {
+    Node { name: String, ty: String, cardinality: Cardinality },
-            $($field_name:ident $(![$token:tt])? $(: $ty:tt)?),*$(,)?
-        }
-    )*) => {
-        [$(
-            AstNodeSrc {
-                doc: &[$($doc),*],
-                name: stringify!($name),
-                traits: &[$($(stringify!($trait)),*)?],
-                fields: &[
-                    $(field!($(T![$token])? $field_name $($ty)?)),*
-                ],
-            }
-        ),*]
-    };
 }
-macro_rules! field {
+#[derive(Debug, Eq, PartialEq)]
-    (T![$token:tt] T) => {
+pub(crate) enum Cardinality {
-        Field::Token(stringify!($token))
+    Optional,
-    };
+    Many,
-    ($field_name:ident) => {
-        Field::Node { name: stringify!($field_name), src: FieldSrc::Shorthand }
-    };
-    ($field_name:ident [$ty:ident]) => {
-        Field::Node { name: stringify!($field_name), src: FieldSrc::Many(stringify!($ty)) }
-    };
-    ($field_name:ident $ty:ident) => {
-        Field::Node { name: stringify!($field_name), src: FieldSrc::Optional(stringify!($ty)) }
-    };
 }
-macro_rules! ast_enums {
+#[derive(Debug)]
-    ($(
+pub(crate) struct AstEnumSrc {
-        $(#[doc = $doc:expr])+
+    pub(crate) doc: Vec<String>,
-        enum $name:ident $(: $($trait:ident),*)? {
+    pub(crate) name: String,
-            $($variant:ident),*$(,)?
+    pub(crate) traits: Vec<String>,
-        }
+    pub(crate) variants: Vec<String>,
-    )*) => {
-        [$(
-            AstEnumSrc {
-                doc: &[$($doc),*],
-                name: stringify!($name),
-                traits: &[$($(stringify!($trait)),*)?],
-                variants: &[$(stringify!($variant)),*],
-            }
-        ),*]
-    };
 }
-pub(crate) const AST_SRC: AstSrc = AstSrc {
-    tokens: &["Whitespace", "Comment", "String", "RawString"],
-    nodes: &ast_nodes! {
-        /// The entire Rust source file. Includes all top-level inner attributes and module items.
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/crates-and-source-files.html)
-        struct SourceFile: ModuleItemOwner, AttrsOwner, DocCommentsOwner {
-            modules: [Module],
-        }
-        /// Function definition either with body or not.
-        /// Includes all of its attributes and doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub extern "C" fn foo<T>(#[attr] Patern {p}: Pattern) -> u32
-        ///     where
-        ///         T: Debug
-        ///     {
-        ///         42
-        ///     }
-        /// ❱
-        ///
-        /// extern "C" {
-        ///     ❰ fn fn_decl(also_variadic_ffi: u32, ...) -> u32; ❱
-        /// }
-        /// ```
-        ///
-        /// - [Reference](https://doc.rust-lang.org/reference/items/functions.html)
-        /// - [Nomicon](https://doc.rust-lang.org/nomicon/ffi.html#variadic-functions)
-        struct FnDef: VisibilityOwner, NameOwner, TypeParamsOwner, DocCommentsOwner, AttrsOwner {
-            Abi,
-            T![const],
-            T![default],
-            T![async],
-            T![unsafe],
-            T![fn],
-            ParamList,
-            RetType,
-            body: BlockExpr,
-            T![;]
-        }
-        /// Return type annotation.
-        ///
-        /// ```
-        /// fn foo(a: u32) ❰ -> Option<u32> ❱ { Some(a) }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/functions.html)
-        struct RetType { T![->], TypeRef }
-        /// Struct definition.
-        /// Includes all of its attributes and doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     struct Foo<T> where T: Debug {
-        ///         /// Docs
-        ///         #[attr]
-        ///         pub a: u32,
-        ///         b: T,
-        ///     }
-        /// ❱
-        ///
-        /// ❰ struct Foo; ❱
-        /// ❰ struct Foo<T>(#[attr] T) where T: Debug; ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
-        struct StructDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
-            T![struct],
-            FieldDefList,
-            T![;]
-        }
-        /// Union definition.
-        /// Includes all of its attributes and doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub union Foo<T> where T: Debug {
-        ///         /// Docs
-        ///         #[attr]
-        ///         a: T,
-        ///         b: u32,
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/unions.html)
-        struct UnionDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
-            T![union],
-            RecordFieldDefList,
-        }
-        /// Record field definition list including enclosing curly braces.
-        ///
-        /// ```
-        /// struct Foo // same for union
-        /// ❰
-        ///     {
-        ///         a: u32,
-        ///         b: bool,
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
-        struct RecordFieldDefList { T!['{'], fields: [RecordFieldDef], T!['}'] }
-        /// Record field definition including its attributes and doc comments.
-        ///
-        /// ` ``
-        /// same for union
-        /// struct Foo {
-        ///      ❰
-        ///          /// Docs
-        ///          #[attr]
-        ///          pub a: u32
-        ///      ❱
-        ///
-        ///      ❰ b: bool ❱
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
-        struct RecordFieldDef: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner { }
-        /// Tuple field definition list including enclosing parens.
-        ///
-        /// ```
-        /// struct Foo ❰ (u32, String, Vec<u32>) ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
-        struct TupleFieldDefList { T!['('], fields: [TupleFieldDef], T![')'] }
-        /// Tuple field definition including its attributes.
-        ///
-        /// ```
-        /// struct Foo(❰ #[attr] u32 ❱);
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/structs.html)
-        struct TupleFieldDef: VisibilityOwner, AttrsOwner {
-            TypeRef,
-        }
-        /// Enum definition.
-        /// Includes all of its attributes and doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub enum Foo<T> where T: Debug {
-        ///         /// Docs
-        ///         #[attr]
-        ///         Bar,
-        ///         Baz(#[attr] u32),
-        ///         Bruh {
-        ///             a: u32,
-        ///             /// Docs
-        ///             #[attr]
-        ///             b: T,
-        ///         }
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html)
-        struct EnumDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner {
-            T![enum],
-            variant_list: EnumVariantList,
-        }
-        /// Enum variant definition list including enclosing curly braces.
-        ///
-        /// ```
-        /// enum Foo
-        /// ❰
-        ///     {
-        ///         Bar,
-        ///         Baz(u32),
-        ///         Bruh {
-        ///             a: u32
-        ///         }
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html)
-        struct EnumVariantList {
-            T!['{'],
-            variants: [EnumVariant],
-            T!['}']
-        }
-        /// Enum variant definition including its attributes and discriminant value definition.
-        ///
-        /// ```
-        /// enum Foo {
-        ///     ❰
-        ///         /// Docs
-        ///         #[attr]
-        ///         Bar
-        ///     ❱
-        ///
-        ///     // same for tuple and record variants
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/enumerations.html)
-        struct EnumVariant: VisibilityOwner, NameOwner, DocCommentsOwner, AttrsOwner {
-            FieldDefList,
-            T![=],
-            Expr
-        }
-        /// Trait definition.
-        /// Includes all of its attributes and doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub unsafe trait Foo<T>: Debug where T: Debug {
-        ///         // ...
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/traits.html)
-        struct TraitDef: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner, TypeParamsOwner, TypeBoundsOwner {
-            T![unsafe],
-            T![auto],
-            T![trait],
-            ItemList,
-        }
-        /// Module definition either with body or not.
-        /// Includes all of its inner and outer attributes, module items, doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub mod foo;
-        /// ❱
-        ///
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub mod bar {
-        ///        //! Inner docs
-        ///        #![inner_attr]
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/modules.html)
-        struct Module: VisibilityOwner, NameOwner, AttrsOwner, DocCommentsOwner {
-            T![mod],
-            ItemList,
-            T![;]
-        }
-        /// Item defintion list.
-        /// This is used for both top-level items and impl block items.
-        ///
-        /// ```
-        /// ❰
-        ///     fn foo {}
-        ///     struct Bar;
-        ///     enum Baz;
-        ///     trait Bruh;
-        ///     const BRUUH: u32 = 42;
-        /// ❱
-        ///
-        /// impl Foo
-        /// ❰
-        ///     {
-        ///         fn bar() {}
-        ///         const BAZ: u32 = 42;
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items.html)
-        struct ItemList: ModuleItemOwner {
-            T!['{'],
-            assoc_items: [AssocItem],
-            T!['}']
-        }
-        /// Constant variable definition.
-        /// Includes all of its attributes and doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub const FOO: u32 = 42;
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/constant-items.html)
-        struct ConstDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner {
-            T![default],
-            T![const],
-            T![=],
-            body: Expr,
-            T![;]
-        }
-        /// Static variable definition.
-        /// Includes all of its attributes and doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub static mut FOO: u32 = 42;
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/static-items.html)
-        struct StaticDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeAscriptionOwner {
-            T![static],
-            T![mut],
-            T![=],
-            body: Expr,
-            T![;]
-        }
-        /// Type alias definition.
-        /// Includes associated type clauses with type bounds.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     pub type Foo<T> where T: Debug = T;
-        /// ❱
-        ///
-        /// trait Bar {
-        ///     ❰ type Baz: Debug; ❱
-        ///     ❰ type Bruh = String; ❱
-        ///     ❰ type Bruuh: Debug = u32; ❱
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/type-aliases.html)
-        struct TypeAliasDef: VisibilityOwner, NameOwner, TypeParamsOwner, AttrsOwner, DocCommentsOwner, TypeBoundsOwner {
-            T![default],
-            T![type],
-            T![=],
-            TypeRef,
-            T![;]
-        }
-        /// Inherent and trait impl definition.
-        /// Includes all of its inner and outer attributes.
-        ///
-        /// ```
-        /// ❰
-        ///     #[attr]
-        ///     unsafe impl<T> const !Foo for Bar where T: Debug {
-        ///         #![inner_attr]
-        ///         // ...
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/implementations.html)
-        struct ImplDef: TypeParamsOwner, AttrsOwner, DocCommentsOwner {
-            T![default],
-            T![const],
-            T![unsafe],
-            T![impl],
-            T![!],
-            T![for],
-            ItemList,
-        }
-        /// Parenthesized type reference.
-        /// Note: parens are only used for grouping, this is not a tuple type.
-        ///
-        /// ```
-        /// // This is effectively just `u32`.
-        /// // Single-item tuple must be defined with a trailing comma: `(u32,)`
-        /// type Foo = ❰ (u32) ❱;
-        ///
-        /// let bar: &'static ❰ (dyn Debug) ❱ = "bruh";
-        /// ```
-        struct ParenType { T!['('], TypeRef, T![')'] }
-        /// Unnamed tuple type.
-        ///
-        /// ```
-        /// let foo: ❰ (u32, bool) ❱ = (42, true);
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/tuple.html)
-        struct TupleType { T!['('], fields: [TypeRef], T![')'] }
-        /// The never type (i.e. the exclamation point).
-        ///
-        /// ```
-        /// type T = ❰ ! ❱;
-        ///
-        /// fn no_return() -> ❰ ! ❱ {
-        ///     loop {}
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/never.html)
-        struct NeverType { T![!] }
-        /// Path to a type.
-        /// Includes single identifier type names and elaborate paths with
-        /// generic parameters.
-        ///
-        /// ```
-        /// type Foo = ❰ String ❱;
-        /// type Bar = ❰ std::vec::Vec<T> ❱;
-        /// type Baz = ❰ ::bruh::<Bruuh as Iterator>::Item ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/paths.html)
-        struct PathType { Path }
-        /// Raw pointer type.
-        ///
-        /// ```
-        /// type Foo = ❰ *const u32 ❱;
-        /// type Bar = ❰ *mut u32 ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/pointer.html#raw-pointers-const-and-mut)
-        struct PointerType { T![*], T![const], T![mut], TypeRef }
-        /// Array type.
-        ///
-        /// ```
-        /// type Foo = ❰ [u32; 24 - 3] ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/array.html)
-        struct ArrayType { T!['['], TypeRef, T![;], Expr, T![']'] }
-        /// Slice type.
-        ///
-        /// ```
-        /// type Foo = ❰ [u8] ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/slice.html)
-        struct SliceType { T!['['], TypeRef, T![']'] }
-        /// Reference type.
-        ///
-        /// ```
-        /// type Foo = ❰ &'static str ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/pointer.html)
-        struct ReferenceType { T![&], T![lifetime], T![mut], TypeRef }
-        /// Placeholder type (i.e. the underscore).
-        ///
-        /// ```
-        /// let foo: ❰ _ ❱ = 42_u32;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/inferred.html)
-        struct PlaceholderType { T![_] }
-        /// Function pointer type (not to be confused with `Fn*` family of traits).
-        ///
-        /// ```
-        /// type Foo = ❰ async fn(#[attr] u32, named: bool) -> u32 ❱;
-        ///
-        /// type Bar = ❰ extern "C" fn(variadic: u32, #[attr] ...) ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/function-pointer.html)
-        struct FnPointerType { Abi, T![unsafe], T![fn], ParamList, RetType }
-        /// Higher order type.
-        ///
-        /// ```
-        /// type Foo = ❰ for<'a> fn(&'a str) ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/nomicon/hrtb.html)
-        struct ForType { T![for], TypeParamList, TypeRef }
-        /// Opaque `impl Trait` type.
-        ///
-        /// ```
-        /// fn foo(bar: ❰ impl Debug + Eq ❱) {}
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/impl-trait.html)
-        struct ImplTraitType: TypeBoundsOwner { T![impl] }
-        /// Trait object type.
-        ///
-        /// ```
-        /// type Foo = ❰ dyn Debug ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/types/trait-object.html)
-        struct DynTraitType: TypeBoundsOwner { T![dyn] }
-        /// Tuple literal.
-        ///
-        /// ```
-        /// ❰ (42, true) ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/tuple-expr.html)
-        struct TupleExpr: AttrsOwner { T!['('], exprs: [Expr], T![')'] }
-        /// Array literal.
-        ///
-        /// ```
-        /// ❰ [#![inner_attr] true, false, true] ❱;
-        ///
-        /// ❰ ["baz"; 24] ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/array-expr.html)
-        struct ArrayExpr: AttrsOwner { T!['['], exprs: [Expr], T![;], T![']'] }
-        /// Parenthesized expression.
-        /// Note: parens are only used for grouping, this is not a tuple literal.
-        ///
-        /// ```
-        /// ❰ (#![inner_attr] 2 + 2) ❱ * 2;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/grouped-expr.html)
-        struct ParenExpr: AttrsOwner { T!['('], Expr, T![')'] }
-        /// Path to a symbol in expression context.
-        /// Includes single identifier variable names and elaborate paths with
-        /// generic parameters.
-        ///
-        /// ```
-        /// ❰ Some::<i32> ❱;
-        /// ❰ foo ❱ + 42;
-        /// ❰ Vec::<i32>::push ❱;
-        /// ❰ <[i32]>::reverse ❱;
-        /// ❰ <String as std::borrow::Borrow<str>>::borrow ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/path-expr.html)
-        struct PathExpr { Path }
-        /// Anonymous callable object literal a.k.a. closure, lambda or functor.
-        ///
-        /// ```
-        /// ❰ || 42 ❱;
-        /// ❰ |a: u32| val + 1 ❱;
-        /// ❰ async |#[attr] Pattern(_): Pattern| { bar } ❱;
-        /// ❰ move || baz ❱;
-        /// ❰ || -> u32 { closure_with_ret_type_annotation_requires_block_expr } ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/closure-expr.html)
-        struct LambdaExpr: AttrsOwner {
-            T![static], // Note(@matklad): I belive this is (used to be?) syntax for generators
-            T![async],
-            T![move],
-            ParamList,
-            RetType,
-            body: Expr,
-        }
-        /// If expression. Includes both regular `if` and `if let` forms.
-        /// Beware that `else if` is a special case syntax sugar, because in general
-        /// there has to be block expression after `else`.
-        ///
-        /// ```
-        /// ❰ if bool_cond { 42 } ❱
-        /// ❰ if bool_cond { 42 } else { 24 } ❱
-        /// ❰ if bool_cond { 42 } else if bool_cond2 { 42 } ❱
-        ///
-        /// ❰
-        ///     if let Pattern(foo) = bar {
-        ///         foo
-        ///     } else {
-        ///         panic!();
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/if-expr.html)
-        struct IfExpr: AttrsOwner { T![if], Condition }
-        /// Unconditional loop expression.
-        ///
-        /// ```
-        /// ❰
-        ///     loop {
-        ///         // yeah, it's that simple...
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html)
-        struct LoopExpr: AttrsOwner, LoopBodyOwner { T![loop] }
-        /// Block expression with an optional prefix (label, try ketword,
-        /// unsafe keyword, async keyword...).
-        ///
-        /// ```
-        /// ❰
-        ///     'label: try {
-        ///         None?
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// - [try block](https://doc.rust-lang.org/unstable-book/language-features/try-blocks.html)
-        /// - [unsafe block](https://doc.rust-lang.org/reference/expressions/block-expr.html#unsafe-blocks)
-        /// - [async block](https://doc.rust-lang.org/reference/expressions/block-expr.html#async-blocks)
-        struct EffectExpr: AttrsOwner { Label, T![try], T![unsafe], T![async], BlockExpr }
-        /// For loop expression.
-        /// Note: record struct literals are not valid as iterable expression
-        /// due to ambiguity.
-        ///
-        /// ```
-        /// ❰
-        /// for i in (0..4) {
-        ///     dbg!(i);
-        /// }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#iterator-loops)
-        struct ForExpr: AttrsOwner, LoopBodyOwner {
-            T![for],
-            Pat,
-            T![in],
-            iterable: Expr,
-        }
-        /// While loop expression. Includes both regular `while` and `while let` forms.
-        ///
-        /// ```
-        /// ❰
-        ///     while bool_cond {
-        ///         42;
-        ///     }
-        /// ❱
-        /// ❰
-        ///     while let Pattern(foo) = bar {
-        ///         bar += 1;
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#predicate-loops)
-        struct WhileExpr: AttrsOwner, LoopBodyOwner { T![while], Condition }
-        /// Continue expression.
-        ///
-        /// ```
-        /// while bool_cond {
-        ///     ❰ continue ❱;
-        /// }
-        ///
-        /// 'outer: loop {
-        ///     loop {
-        ///         ❰ continue 'outer ❱;
-        ///     }
-        /// }
-        ///
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#continue-expressions)
-        struct ContinueExpr: AttrsOwner { T![continue], T![lifetime] }
-        /// Break expression.
-        ///
-        /// ```
-        /// while bool_cond {
-        ///     ❰ break ❱;
-        /// }
-        /// 'outer: loop {
-        ///     for foo in bar {
-        ///         ❰ break 'outer ❱;
-        ///     }
-        /// }
-        /// 'outer: loop {
-        ///     loop {
-        ///         ❰ break 'outer 42 ❱;
-        ///     }
-        /// }
-        /// ```
-        ///
-        /// [Refernce](https://doc.rust-lang.org/reference/expressions/loop-expr.html#break-expressions)
-        struct BreakExpr: AttrsOwner { T![break], T![lifetime], Expr }
-        /// Label.
-        ///
-        /// ```
-        /// ❰ 'outer: ❱ loop {}
-        ///
-        /// let foo = ❰ 'bar: ❱ loop {}
-        ///
-        /// ❰ 'baz: ❱ {
-        ///     break 'baz;
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html?highlight=label#loop-labels)
-        /// [Labels for blocks RFC](https://github.com/rust-lang/rfcs/blob/master/text/2046-label-break-value.md)
-        struct Label { T![lifetime] }
-        /// Block expression. Includes unsafe blocks and block labels.
-        ///
-        /// ```
-        ///     let foo = ❰
-        ///         {
-        ///             #![inner_attr]
-        ///             ❰ { } ❱
-        ///
-        ///             ❰ 'label: { break 'label } ❱
-        ///         }
-        ///     ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/block-expr.html)
-        /// [Labels for blocks RFC](https://github.com/rust-lang/rfcs/blob/master/text/2046-label-break-value.md)
-        struct BlockExpr: AttrsOwner, ModuleItemOwner {
-            Label, T!['{'], statements: [Stmt], Expr, T!['}'],
-        }
-        /// Return expression.
-        ///
-        /// ```
-        /// || ❰ return 42 ❱;
-        ///
-        /// fn bar() {
-        ///     ❰ return ❱;
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/return-expr.html)
-        struct ReturnExpr: AttrsOwner { Expr }
-        /// Call expression (not to be confused with method call expression, it is
-        /// a separate ast node).
-        ///
-        /// ```
-        /// ❰ foo() ❱;
-        /// ❰ &str::len("bar") ❱;
-        /// ❰ <&str as PartialEq<&str>>::eq(&"", &"") ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/call-expr.html)
-        struct CallExpr: ArgListOwner { Expr }
-        /// Method call expression.
-        ///
-        /// ```
-        /// ❰ receiver_expr.method() ❱;
-        /// ❰ receiver_expr.method::<T>(42, true) ❱;
-        ///
-        /// ❰ ❰ ❰ foo.bar() ❱ .baz() ❱ .bruh() ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/method-call-expr.html)
-        struct MethodCallExpr: AttrsOwner, ArgListOwner {
-            Expr, T![.], NameRef, TypeArgList,
-        }
-        /// Index expression a.k.a. subscript operator call.
-        ///
-        /// ```
-        /// ❰ foo[42] ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/array-expr.html)
-        struct IndexExpr: AttrsOwner { T!['['], T![']'] }
-        /// Field access expression.
-        ///
-        /// ```
-        /// ❰ expr.bar ❱;
-        ///
-        /// ❰ ❰ ❰ foo.bar ❱ .baz ❱ .bruh ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/field-expr.html)
-        struct FieldExpr: AttrsOwner { Expr, T![.], NameRef }
-        /// Await operator call expression.
-        ///
-        /// ```
-        /// ❰ expr.await ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/await-expr.html)
-        struct AwaitExpr: AttrsOwner { Expr, T![.], T![await] }
-        /// The question mark operator call.
-        ///
-        /// ```
-        /// ❰ expr? ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#the-question-mark-operator)
-        struct TryExpr: AttrsOwner { Expr, T![?] }
-        /// Type cast expression.
-        ///
-        /// ```
-        /// ❰ expr as T ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#type-cast-expressions)
-        struct CastExpr: AttrsOwner { Expr, T![as], TypeRef }
-        /// Borrow operator call.
-        ///
-        /// ```
-        /// ❰ &foo ❱;
-        /// ❰ &mut bar ❱;
-        /// ❰ &raw const bar ❱;
-        /// ❰ &raw mut bar ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#borrow-operators)
-        struct RefExpr: AttrsOwner { T![&], T![raw], T![mut], T![const], Expr }
-        /// Prefix operator call. This is either `!` or `*` or `-`.
-        ///
-        /// ```
-        /// ❰ !foo ❱;
-        /// ❰ *bar ❱;
-        /// ❰ -42 ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html)
-        struct PrefixExpr: AttrsOwner { /*PrefixOp,*/ Expr }
-        /// Box operator call.
-        ///
-        /// ```
-        /// ❰ box 42 ❱;
-        /// ```
-        ///
-        /// [RFC](https://github.com/rust-lang/rfcs/blob/0806be4f282144cfcd55b1d20284b43f87cbe1c6/text/0809-box-and-in-for-stdlib.md)
-        struct BoxExpr: AttrsOwner { T![box], Expr }
-        /// Range operator call.
-        ///
-        /// ```
-        /// ❰ 0..42 ❱;
-        /// ❰ ..42 ❱;
-        /// ❰ 0.. ❱;
-        /// ❰ .. ❱;
-        /// ❰ 0..=42 ❱;
-        /// ❰ ..=42 ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/range-expr.html)
-        struct RangeExpr: AttrsOwner { /*RangeOp*/ }
-        /// Binary operator call.
-        /// Includes all arithmetic, logic, bitwise and assignment operators.
-        ///
-        /// ```
-        /// ❰ 2 + ❰ 2 * 2 ❱ ❱;
-        /// ❰ ❰ true && false ❱ || true ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#arithmetic-and-logical-binary-operators)
-        struct BinExpr: AttrsOwner { /*BinOp*/ }
-        /// [Raw] string, [raw] byte string, char, byte, integer, float or bool literal.
-        ///
-        /// ```
-        /// ❰ "str" ❱;
-        /// ❰ br##"raw byte str"## ❱;
-        /// ❰ 'c' ❱;
-        /// ❰ b'c' ❱;
-        /// ❰ 42 ❱;
-        /// ❰ 1e9 ❱;
-        /// ❰ true ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/literal-expr.html)
-        struct Literal { /*LiteralToken*/ }
-        /// Match expression.
-        ///
-        /// ```
-        /// ❰
-        ///     match expr {
-        ///         Pat1 => {}
-        ///         Pat2(_) => 42,
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html)
-        struct MatchExpr: AttrsOwner { T![match], Expr, MatchArmList }
-        /// Match arm list part of match expression. Includes its inner attributes.
-        ///
-        /// ```
-        /// match expr
-        /// ❰
-        ///     {
-        ///         #![inner_attr]
-        ///         Pat1 => {}
-        ///         Pat2(_) => 42,
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html)
-        struct MatchArmList: AttrsOwner { T!['{'], arms: [MatchArm], T!['}'] }
-        /// Match arm.
-        /// Note: record struct literals are not valid as target match expression
-        /// due to ambiguity.
-        /// ```
-        /// match expr {
-        ///     ❰ #[attr] Pattern(it) if bool_cond => it ❱,
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html)
-        struct MatchArm: AttrsOwner {
-            pat: Pat,
-            guard: MatchGuard,
-            T![=>],
-            Expr,
-        }
-        /// Match guard.
-        ///
-        /// ```
-        /// match expr {
-        ///     Pattern(it) ❰ if bool_cond ❱ => it,
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/match-expr.html#match-guards)
-        struct MatchGuard { T![if], Expr }
-        /// Record literal expression. The same syntax is used for structs,
-        /// unions and record enum variants.
-        ///
-        /// ```
-        /// ❰
-        ///     foo::Bar {
-        ///         #![inner_attr]
-        ///         baz: 42,
-        ///         bruh: true,
-        ///         ..spread
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html)
-        struct RecordLit { Path, RecordFieldList}
-        /// Record field list including enclosing curly braces.
-        ///
-        /// foo::Bar ❰
-        ///     {
-        ///         baz: 42,
-        ///         ..spread
-        ///     }
-        /// ❱
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html)
-        struct RecordFieldList {
-            T!['{'],
-            fields: [RecordField],
-            T![..],
-            spread: Expr,
-            T!['}']
-        }
-        /// Record field.
-        ///
-        /// ```
-        /// foo::Bar {
-        ///     ❰ #[attr] baz: 42 ❱
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/struct-expr.html)
-        struct RecordField: AttrsOwner { NameRef, T![:], Expr }
-        /// Disjunction of patterns.
-        ///
-        /// ```
-        /// let ❰ Foo(it) | Bar(it) | Baz(it) ❱ = bruh;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html)
-        struct OrPat { pats: [Pat] }
-        /// Parenthesized pattern.
-        /// Note: parens are only used for grouping, this is not a tuple pattern.
-        ///
-        /// ```
-        /// if let ❰ &(0..=42) ❱ = foo {}
-        /// ```
-        ///
-        /// https://doc.rust-lang.org/reference/patterns.html#grouped-patterns
-        struct ParenPat { T!['('], Pat, T![')'] }
-        /// Reference pattern.
-        /// Note: this has nothing to do with `ref` keyword, the latter is used in bind patterns.
-        ///
-        /// ```
-        /// let ❰ &mut foo ❱ = bar;
-        ///
-        /// let ❰ & ❰ &mut ❰ &_ ❱ ❱ ❱ = baz;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#reference-patterns)
-        struct RefPat { T![&], T![mut], Pat }
-        /// Box pattern.
-        ///
-        /// ```
-        /// let ❰ box foo ❱ = box 42;
-        /// ```
-        ///
-        /// [Unstable book](https://doc.rust-lang.org/unstable-book/language-features/box-patterns.html)
-        struct BoxPat { T![box], Pat }
-        /// Bind pattern.
-        ///
-        /// ```
-        /// match foo {
-        ///     Some(❰ ref mut bar ❱) => {}
-        ///     ❰ baz @ None ❱ => {}
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#identifier-patterns)
-        struct BindPat: AttrsOwner, NameOwner { T![ref], T![mut], T![@], Pat }
-        /// Placeholder pattern a.k.a. the wildcard pattern or the underscore.
-        ///
-        /// ```
-        /// let ❰ _ ❱ = foo;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#wildcard-pattern)
-        struct PlaceholderPat { T![_] }
-        /// Rest-of-the record/tuple pattern.
-        /// Note: this is not the unbonded range pattern (even more: it doesn't exist).
-        ///
-        /// ```
-        /// let Foo { bar, ❰ .. ❱ } = baz;
-        /// let (❰ .. ❱, bruh) = (42, 24, 42);
-        /// let Bruuh(❰ .. ❱) = bruuuh;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns)
-        struct DotDotPat { T![..] }
-        /// Path pattern.
-        /// Doesn't include the underscore pattern (it is a special case, namely `PlaceholderPat`).
-        ///
-        /// ```
-        /// let ❰ foo::bar::Baz ❱ { .. } = bruh;
-        /// if let ❰ CONST ❱ = 42 {}
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#path-patterns)
-        struct PathPat { Path }
-        /// Slice pattern.
-        ///
-        /// ```
-        /// let ❰ [foo, bar, baz] ❱ = [1, 2, 3];
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#slice-patterns)
-        struct SlicePat { T!['['], args: [Pat], T![']'] }
-        /// Range pattern.
-        ///
-        /// ```
-        /// match foo {
-        ///     ❰ 0..42 ❱ => {}
-        ///     ❰ 0..=42 ❱ => {}
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#range-patterns)
-        struct RangePat { } // FIXME(@matklad): here should be T![..], T![..=] I think, if we don't already have an accessor in expresions_ext
-        /// Literal pattern.
-        /// Includes only bool, number, char, and string literals.
-        ///
-        /// ```
-        /// match foo {
-        ///     Number(❰ 42 ❱) => {}
-        ///     String(❰ "42" ❱) => {}
-        ///     Bool(❰ true ❱) => {}
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#literal-patterns)
-        struct LiteralPat { Literal }
-        /// Macro invocation in pattern position.
-        ///
-        /// ```
-        /// let ❰ foo!(my custom syntax) ❱ = baz;
-        ///
-        /// ```
-        /// [Reference](https://doc.rust-lang.org/reference/macros.html#macro-invocation)
-        struct MacroPat { MacroCall }
-        /// Record literal pattern.
-        ///
-        /// ```
-        /// let ❰ foo::Bar { baz, .. } ❱ = bruh;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns)
-        struct RecordPat { RecordFieldPatList, Path }
-        /// Record literal's field patterns list including enclosing curly braces.
-        ///
-        /// ```
-        /// let foo::Bar ❰ { baz, bind @ bruh, .. } ❱ = bruuh;
-        /// ``
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns)
-        struct RecordFieldPatList {
-            T!['{'],
-            pats: [RecordInnerPat],
-            record_field_pats: [RecordFieldPat],
-            bind_pats: [BindPat],
-            T![..],
-            T!['}']
-        }
-        /// Record literal's field pattern.
-        /// Note: record literal can also match tuple structs.
-        ///
-        /// ```
-        /// let Foo { ❰ bar: _ ❱ } = baz;
-        /// let TupleStruct { ❰ 0: _ ❱ } = bruh;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#struct-patterns)
-        struct RecordFieldPat: AttrsOwner { NameRef, T![:], Pat }
-        /// Tuple struct literal pattern.
-        ///
-        /// ```
-        /// let ❰ foo::Bar(baz, bruh) ❱ = bruuh;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#tuple-struct-patterns)
-        struct TupleStructPat { Path, T!['('], args: [Pat], T![')'] }
-        /// Tuple pattern.
-        /// Note: this doesn't include tuple structs (see `TupleStructPat`)
-        ///
-        /// ```
-        /// let ❰ (foo, bar, .., baz) ❱ = bruh;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/patterns.html#tuple-patterns)
-        struct TuplePat { T!['('], args: [Pat], T![')'] }
-        /// Visibility.
-        ///
-        /// ```
-        /// ❰ pub mod ❱ foo;
-        /// ❰ pub(crate) ❱ struct Bar;
-        /// ❰ pub(self) ❱ enum Baz {}
-        /// ❰ pub(super) ❱ fn bruh() {}
-        /// ❰ pub(in bruuh::bruuuh) ❱ type T = u64;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/visibility-and-privacy.html)
-        struct Visibility { T![pub], T![super], T![self], T![crate] }
-        /// Single identifier.
-        /// Note(@matklad): `Name` is for things that install a new name into the scope,
-        /// `NameRef` is a usage of a name. Most of the time, this definition/reference
-        /// distinction can be determined purely syntactically, ie in
-        /// ```
-        /// fn foo() { foo() }
-        /// ```
-        /// the first foo is `Name`, the second one is `NameRef`.
-        /// The notable exception are patterns, where in
-        /// ``
-        /// let x = 92
-        /// ```
-        /// `x` can be semantically either a name or a name ref, depeding on
-        /// wether there's an `x` constant in scope.
-        /// We use `Name` for patterns, and disambiguate semantically (see `NameClass` in ide_db).
-        ///
-        /// ```
-        /// let ❰ foo ❱ = bar;
-        /// struct ❰ Baz ❱;
-        /// fn ❰ bruh ❱() {}
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/identifiers.html)
-        struct Name { T![ident] }
-        /// Reference to a name.
-        /// See the explanation on the difference between `Name` and `NameRef`
-        /// in `Name` ast node docs.
-        ///
-        /// ```
-        /// let foo = ❰ bar ❱(❰ Baz(❰ bruh ❱) ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/identifiers.html)
-        struct NameRef { }
-        /// Macro call.
-        /// Includes all of its attributes and doc comments.
-        ///
-        /// ```
-        /// ❰
-        ///     /// Docs
-        ///     #[attr]
-        ///     macro_rules! foo {   // macro rules is also a macro call
-        ///         ($bar: tt) => {}
-        ///     }
-        /// ❱
-        ///
-        /// // semicolon is a part of `MacroCall` when it is used in item positions
-        /// ❰ foo!(); ❱
-        ///
-        /// fn main() {
-        ///     ❰ foo!() ❱; // macro call in expression positions doesn't include the semi
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/macros.html)
-        struct MacroCall: NameOwner, AttrsOwner, DocCommentsOwner {
-            Path, T![!], TokenTree, T![;]
-        }
-        /// Attribute.
-        ///
-        /// ```
-        /// ❰ #![inner_attr] ❱
-        ///
-        /// ❰ #[attr] ❱
-        /// ❰ #[foo = "bar"] ❱
-        /// ❰ #[baz(bruh::bruuh = "42")] ❱
-        /// struct Foo;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/attributes.html)
-        struct Attr { T![#], T![!], T!['['], Path, T![=], input: AttrInput, T![']'] }
-        /// Stores a list of lexer tokens and other `TokenTree`s.
-        /// It appears in attributes, macro_rules and macro call (foo!)
-        ///
-        /// ```
-        /// macro_call! ❰ { my syntax here } ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/macros.html)
-        struct TokenTree {}
-        /// Generic lifetime, type and constants parameters list **declaration**.
-        ///
-        /// ```
-        /// fn foo❰ <'a, 'b, T, U, const BAR: u64> ❱() {}
-        ///
-        /// struct Baz❰ <T> ❱(T);
-        ///
-        /// impl❰ <T> ❱ Bruh<T> {}
-        ///
-        /// type Bruuh = for❰ <'a> ❱ fn(&'a str) -> &'a str;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/generics.html)
-        struct TypeParamList {
-            T![<],
-            generic_params: [GenericParam],
-            type_params: [TypeParam],
-            lifetime_params: [LifetimeParam],
-            const_params: [ConstParam],
-            T![>]
-        }
-        /// Single type parameter **declaration**.
-        ///
-        /// ```
-        /// fn foo<❰ K ❱, ❰ I ❱, ❰ E: Debug ❱, ❰ V = DefaultType ❱>() {}
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/generics.html)
-        struct TypeParam: NameOwner, AttrsOwner, TypeBoundsOwner {
-            T![=],
-            default_type: TypeRef,
-        }
-        /// Const generic parameter **declaration**.
-        /// ```
-        /// fn foo<T, U, ❰ const BAR: usize ❱, ❰ const BAZ: bool ❱>() {}
-        /// ```
-        ///
-        /// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/2000-const-generics.md#declaring-a-const-parameter)
-        struct ConstParam: NameOwner, AttrsOwner, TypeAscriptionOwner {
-            T![=],
-            default_val: Expr,
-        }
-        /// Lifetime parameter **declaration**.
-        ///
-        /// ```
-        /// fn foo<❰ 'a ❱, ❰ 'b ❱, V, G, D>(bar: &'a str, baz: &'b mut str) {}
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/generics.html)
-        struct LifetimeParam: AttrsOwner { T![lifetime] }
-        /// Type bound declaration clause.
-        ///
-        /// ```
-        /// fn foo<T: ❰ ?Sized ❱ + ❰ Debug ❱>() {}
-        ///
-        /// trait Bar<T>
-        /// where
-        ///     T: ❰ Send ❱ + ❰ Sync ❱
-        /// {
-        ///     type Baz: ❰ !Sync ❱ + ❰ Debug ❱ + ❰ ?const Add ❱;
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/trait-bounds.html)
-        struct TypeBound { T![lifetime], /* Question,  */ T![const], /* Question, */ TypeRef }
-        /// Type bounds list.
-        ///
-        /// ```
-        ///
-        /// fn foo<T: ❰ ?Sized + Debug ❱>() {}
-        ///
-        /// trait Bar<T>
-        /// where
-        ///     T: ❰ Send + Sync ❱
-        /// {
-        ///     type Baz: ❰ !Sync + Debug ❱;
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/trait-bounds.html)
-        struct TypeBoundList { bounds: [TypeBound] }
-        /// Single where predicate.
-        ///
-        /// ```
-        /// trait Foo<'a, 'b, T>
-        /// where
-        ///     ❰ 'a: 'b ❱,
-        ///     ❰ T: IntoIterator ❱,
-        ///     ❰ for<'c> <T as IntoIterator>::Item: Bar<'c> ❱
-        /// {}
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/generics.html#where-clauses)
-        struct WherePred: TypeBoundsOwner { T![for], TypeParamList, T![lifetime], TypeRef }
-        /// Where clause.
-        ///
-        /// ```
-        /// trait Foo<'a, T> ❰ where 'a: 'static, T: Debug ❱ {}
-        ///
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/generics.html#where-clauses)
-        struct WhereClause { T![where], predicates: [WherePred] }
-        /// Abi declaration.
-        /// Note: the abi string is optional.
-        ///
-        /// ```
-        /// ❰ extern "C" ❱ {
-        ///     fn foo() {}
-        /// }
-        ///
-        /// type Bar = ❰ extern ❱ fn() -> u32;
-        ///
-        /// type Baz = ❰ extern r#"stdcall"# ❱ fn() -> bool;
-        /// ```
-        ///
-        /// - [Extern blocks reference](https://doc.rust-lang.org/reference/items/external-blocks.html)
-        /// - [FFI function pointers reference](https://doc.rust-lang.org/reference/items/functions.html#functions)
-        struct Abi { /*String*/ }
-        /// Expression statement.
-        ///
-        /// ```
-        /// ❰ 42; ❱
-        /// ❰ foo(); ❱
-        /// ❰ (); ❱
-        /// ❰ {}; ❱
-        ///
-        /// // constructions with trailing curly brace can omit the semicolon
-        /// // but only when there are satements immediately after them (this is important!)
-        /// ❰ if bool_cond { } ❱
-        /// ❰ loop {} ❱
-        /// ❰ somestatment; ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/statements.html)
-        struct ExprStmt: AttrsOwner { Expr, T![;] }
-        /// Let statement.
-        ///
-        /// ```
-        /// ❰ #[attr] let foo; ❱
-        /// ❰ let bar: u64; ❱
-        /// ❰ let baz = 42; ❱
-        /// ❰ let bruh: bool = true; ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/statements.html#let-statements)
-        struct LetStmt: AttrsOwner, TypeAscriptionOwner {
-            T![let],
-            Pat,
-            T![=],
-            initializer: Expr,
-            T![;],
-        }
-        /// Condition of `if` or `while` expression.
-        ///
-        /// ```
-        /// if ❰ true ❱ {}
-        /// if ❰ let Pat(foo) = bar ❱ {}
-        ///
-        /// while ❰ true ❱ {}
-        /// while ❰ let Pat(baz) = bruh ❱ {}
-        /// ```
-        ///
-        /// [If expression reference](https://doc.rust-lang.org/reference/expressions/if-expr.html)
-        /// [While expression reference](https://doc.rust-lang.org/reference/expressions/loop-expr.html#predicate-loops)
-        struct Condition { T![let], Pat, T![=], Expr }
-        /// Parameter list **declaration**.
-        ///
-        /// ```
-        /// fn foo❰ (a: u32, b: bool) ❱ -> u32 {}
-        /// let bar = ❰ |a, b| ❱ {};
-        ///
-        /// impl Baz {
-        ///     fn bruh❰ (&self, a: u32) ❱ {}
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/functions.html)ocs to codegen script
-        struct ParamList { // FIXME: this node is used by closure expressions too, but hey use pipes instead of parens...
-            T!['('],
-            SelfParam,
-            params: [Param],
-            T![')']
-        }
-        /// Self parameter **declaration**.
-        ///
-        /// ```
-        /// impl Bruh {
-        ///     fn foo(❰ self ❱) {}
-        ///     fn bar(❰ &self ❱) {}
-        ///     fn baz(❰ &mut self ❱) {}
-        ///     fn blah<'a>(❰ &'a self ❱) {}
-        ///     fn blin(❰ self: Box<Self> ❱) {}
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/functions.html)
-        struct SelfParam: TypeAscriptionOwner, AttrsOwner { T![&], T![mut], T![lifetime], T![self] }
-        /// Parameter **declaration**.
-        ///
-        /// ```
-        /// fn foo(❰ #[attr] Pat(bar): Pat(u32) ❱, ❰ #[attr] _: bool ❱) {}
-        ///
-        /// extern "C" {
-        ///     fn bar(❰ baz: u32 ❱, ❰ ... ❱) -> u32;
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/functions.html)
-        struct Param: TypeAscriptionOwner, AttrsOwner {
-            Pat,
-            T![...]
-        }
-        /// Use declaration.
-        ///
-        /// ```
-        /// ❰ #[attr] pub use foo; ❱
-        /// ❰ use bar as baz; ❱
-        /// ❰ use bruh::{self, bruuh}; ❱
-        /// ❰ use { blin::blen, blah::* };
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html)
-        struct UseItem: AttrsOwner, VisibilityOwner {
-            T![use],
-            UseTree,
-        }
-        /// Use tree.
-        ///
-        /// ```
-        /// pub use ❰ foo::❰ * ❱ ❱;
-        /// use ❰ bar as baz ❱;
-        /// use ❰ bruh::bruuh::{ ❰ self ❱, ❰ blin ❱ } ❱;
-        /// use ❰ { ❰ blin::blen ❱ } ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html)
-        struct UseTree {
-            Path, T![*], UseTreeList, Alias
-        }
-        /// Item alias.
-        /// Note: this is not the type alias.
-        ///
-        /// ```
-        /// use foo ❰ as bar ❱;
-        /// use baz::{bruh ❰ as _ ❱};
-        /// extern crate bruuh ❰ as blin ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html)
-        struct Alias: NameOwner { T![as] }
-        /// Sublist of use trees.
-        ///
-        /// ```
-        /// use bruh::bruuh::❰ { ❰ self ❱, ❰ blin ❱ } ❱;
-        /// use ❰ { blin::blen::❰ {} ❱ } ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/use-declarations.html)
-        struct UseTreeList { T!['{'], use_trees: [UseTree], T!['}'] }
-        /// Extern crate item.
-        ///
-        /// ```
-        /// ❰ #[attr] pub extern crate foo; ❱
-        /// ❰ extern crate self as bar; ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/extern-crates.html)
-        struct ExternCrateItem: AttrsOwner, VisibilityOwner {
-            T![extern], T![crate], NameRef, Alias,
-        }
-        /// Call site arguments list.
-        ///
-        /// ```
-        /// foo::<T, U>❰ (42, true) ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/expressions/call-expr.html)
-        struct ArgList {
-            T!['('],
-            args: [Expr],
-            T![')']
-        }
-        /// Path to a symbol. Includes single identifier names and elaborate paths with
-        /// generic parameters.
-        ///
-        /// ```
-        /// (0..10).❰ ❰ collect ❱ ::<Vec<_>> ❱();
-        /// ❰ ❰ ❰ Vec ❱ ::<u8> ❱ ::with_capacity ❱(1024);
-        /// ❰ ❰ <❰ Foo ❱ as ❰ ❰ bar ❱ ::Bar ❱> ❱ ::baz ❱();
-        /// ❰ ❰ <❰ bruh ❱> ❱ ::bruuh ❱();
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/paths.html)
-        struct Path {
-            segment: PathSegment,
-            T![::],
-            qualifier: Path,
-        }
-        /// Segment of the path to a symbol.
-        /// Only path segment of an absolute path holds the `::` token,
-        /// all other `::` tokens that connect path segments reside under `Path` itself.`
-        ///
-        /// ```
-        /// (0..10).❰ collect ❱ :: ❰ <Vec<_>> ❱();
-        /// ❰ Vec ❱ :: ❰ <u8> ❱ :: ❰ with_capacity ❱(1024);
-        /// ❰ <❰ Foo ❱ as ❰ bar ❱ :: ❰ Bar ❱> ❱ :: ❰ baz ❱();
-        /// ❰ <❰ bruh ❱> ❱ :: ❰ bruuh ❱();
-        ///
-        /// // Note that only in this case `::` token is inlcuded:
-        /// ❰ ::foo ❱;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/paths.html)
-        struct PathSegment {
-            T![::], T![crate], T![self], T![super], T![<], NameRef, TypeArgList, ParamList, RetType, PathType, T![>]
-        }
-        /// List of type arguments that are passed at generic instantiation site.
-        ///
-        /// ```
-        /// type _ = Foo ❰ ::<'a, u64, Item = Bar, 42, {true}> ❱::Bar;
-        ///
-        /// Vec❰ ::<bool> ❱::();
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions)
-        struct TypeArgList {
-            T![::],
-            T![<],
-            generic_args: [GenericArg],
-            type_args: [TypeArg],
-            lifetime_args: [LifetimeArg],
-            assoc_type_args: [AssocTypeArg],
-            const_args: [ConstArg],
-            T![>]
-        }
-        /// Type argument that is passed at generic instantiation site.
-        ///
-        /// ```
-        /// type _ = Foo::<'a, ❰ u64 ❱, ❰ bool ❱, Item = Bar, 42>::Baz;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions)
-        struct TypeArg { TypeRef }
-        /// Associated type argument that is passed at generic instantiation site.
-        /// ```
-        /// type Foo = Bar::<'a, u64, bool, ❰ Item = Baz ❱, 42>::Bruh;
-        ///
-        /// trait Bruh<T>: Iterator<❰ Item: Debug ❱> {}
-        /// ```
-        ///
-        struct AssocTypeArg : TypeBoundsOwner { NameRef, T![=], TypeRef }
-        /// Lifetime argument that is passed at generic instantiation site.
-        ///
-        /// ```
-        /// fn foo<'a>(s: &'a str) {
-        ///     bar::<❰ 'a ❱>(s);
-        /// }
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/paths.html#paths-in-expressions)
-        struct LifetimeArg { T![lifetime] }
-        /// Constant value argument that is passed at generic instantiation site.
-        ///
-        /// ```
-        /// foo::<u32, ❰ { true } ❱>();
-        ///
-        /// bar::<❰ { 2 + 2} ❱>();
-        /// ```
-        ///
-        /// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/2000-const-generics.md#declaring-a-const-parameter)
-        struct ConstArg { Literal, BlockExpr }
-        /// FIXME: (@edwin0cheng) Remove it to use ItemList instead
-        /// https://github.com/rust-analyzer/rust-analyzer/pull/4083#discussion_r422666243
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/macros.html)
-        struct MacroItems: ModuleItemOwner { }
-        /// FIXME: (@edwin0cheng) add some documentation here. As per the writing
-        /// of this comment this ast node is not used.
-        ///
-        /// ```
-        /// // FIXME: example here
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/macros.html)
-        struct MacroStmts {
-            statements: [Stmt],
-            Expr,
-        }
-        /// List of items in an extern block.
-        ///
-        /// ```
-        /// extern "C" ❰
-        ///     {
-        ///         fn foo();
-        ///         static var: u32;
-        ///     }
-        /// ❱
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/external-blocks.html)
-        struct ExternItemList: ModuleItemOwner {
-            T!['{'],
-            extern_items: [ExternItem],
-            T!['}']
-        }
-        /// Extern block.
-        ///
-        /// ```
-        /// ❰
-        ///     extern "C" {
-        ///         fn foo();
-        ///     }
-        /// ❱
-        ///
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/items/external-blocks.html)
-        struct ExternBlock {
-            Abi,
-            ExternItemList
-        }
-        /// Meta item in an attribute.
-        ///
-        /// ```
-        /// #[❰ bar::baz = "42" ❱]
-        /// #[❰ bruh(bruuh("true")) ❱]
-        /// struct Foo;
-        /// ```
-        ///
-        /// [Reference](https://doc.rust-lang.org/reference/attributes.html?highlight=meta,item#meta-item-attribute-syntax)
-        struct MetaItem {
-            Path, T![=], AttrInput, nested_meta_items: [MetaItem]
-        }
-        /// Macro 2.0 definition.
-        /// Their syntax is still WIP by rustc team...
-        /// ```
-        /// ❰
-        ///     macro foo { }
-        /// ❱
-        /// ```
-        ///
-        /// [RFC](https://github.com/rust-lang/rfcs/blob/master/text/1584-macros.md)
-        struct MacroDef {
-            Name, TokenTree
-        }
-    },
-    enums: &ast_enums! {
-        /// Any kind of nominal type definition.
-        enum NominalDef: NameOwner, TypeParamsOwner, AttrsOwner {
-            StructDef, EnumDef, UnionDef,
-        }
-        /// Any kind of **declared** generic parameter
-        enum GenericParam {
-            LifetimeParam,
-            TypeParam,
-            ConstParam
-        }
-        /// Any kind of generic argument passed at instantiation site
-        enum GenericArg {
-            LifetimeArg,
-            TypeArg,
-            ConstArg,
-            AssocTypeArg
-        }
-        /// Any kind of construct valid in type context
-        enum TypeRef {
-            ParenType,
-            TupleType,
-            NeverType,
-            PathType,
-            PointerType,
-            ArrayType,
-            SliceType,
-            ReferenceType,
-            PlaceholderType,
-            FnPointerType,
-            ForType,
-            ImplTraitType,
-            DynTraitType,
-        }
-        /// Any kind of top-level item that may appear in a module
-        enum ModuleItem: NameOwner, AttrsOwner, VisibilityOwner {
-            StructDef,
-            UnionDef,
-            EnumDef,
-            FnDef,
-            TraitDef,
-            TypeAliasDef,
-            ImplDef,
-            UseItem,
-            ExternCrateItem,
-            ConstDef,
-            StaticDef,
-            Module,
-            MacroCall,
-            ExternBlock
-        }
-        /// Any kind of item that may appear in an impl block
-        ///
-        /// // FIXME: impl blocks can also contain MacroCall
-        enum AssocItem: NameOwner, AttrsOwner {
-            FnDef, TypeAliasDef, ConstDef
-        }
-        /// Any kind of item that may appear in an extern block
-        ///
-        /// // FIXME: extern blocks can also contain MacroCall
-        enum ExternItem: NameOwner, AttrsOwner, VisibilityOwner {
-            FnDef, StaticDef
-        }
-        /// Any kind of expression
-        enum Expr: AttrsOwner {
-            TupleExpr,
-            ArrayExpr,
-            ParenExpr,
-            PathExpr,
-            LambdaExpr,
-            IfExpr,
-            LoopExpr,
-            ForExpr,
-            WhileExpr,
-            ContinueExpr,
-            BreakExpr,
-            Label,
-            BlockExpr,
-            ReturnExpr,
-            MatchExpr,
-            RecordLit,
-            CallExpr,
-            IndexExpr,
-            MethodCallExpr,
-            FieldExpr,
-            AwaitExpr,
-            TryExpr,
-            EffectExpr,
-            CastExpr,
-            RefExpr,
-            PrefixExpr,
-            RangeExpr,
-            BinExpr,
-            Literal,
-            MacroCall,
-            BoxExpr,
-        }
-        /// Any kind of pattern
-        enum Pat {
-            OrPat,
-            ParenPat,
-            RefPat,
-            BoxPat,
-            BindPat,
-            PlaceholderPat,
-            DotDotPat,
-            PathPat,
-            RecordPat,
-            TupleStructPat,
-            TuplePat,
-            SlicePat,
-            RangePat,
-            LiteralPat,
-            MacroPat,
-        }
-        /// Any kind of pattern that appears directly inside of the curly
-        /// braces of a record pattern
-        enum RecordInnerPat {
-            RecordFieldPat,
-            BindPat
-        }
-        /// Any kind of input to an attribute
-        enum AttrInput { Literal, TokenTree }
-        /// Any kind of statement
-        /// Note: there are no empty statements, these are just represented as
-        /// bare semicolons without a dedicated statement ast node.
-        enum Stmt {
-            LetStmt,
-            ExprStmt,
-            // macro calls are parsed as expression statements
-        }
-        /// Any kind of fields list (record or tuple field lists)
-        enum FieldDefList {
-            RecordFieldDefList,
-            TupleFieldDefList,
-        }
-    },
-};
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index 745a25862..45b788bdb 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -3,34 +3,43 @@
 //! Specifically, it generates the `SyntaxKind` enum and a number of newtype
 //! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`.
-use std::{collections::HashSet, fmt::Write};
+use std::{
+    collections::{BTreeSet, HashSet},
+    fmt::Write,
+};
 use proc_macro2::{Punct, Spacing};
 use quote::{format_ident, quote};
+use ungrammar::{Grammar, Rule};
 use crate::{
-    ast_src::{AstSrc, Field, FieldSrc, KindsSrc, AST_SRC, KINDS_SRC},
+    ast_src::{AstEnumSrc, AstNodeSrc, AstSrc, Cardinality, Field, KindsSrc, KINDS_SRC},
    codegen::{self, update, Mode},
    project_root, Result,
 };
 pub fn generate_syntax(mode: Mode) -> Result<()> {
+    let grammar = include_str!("rust.ungram")
+        .parse::<Grammar>()
+        .unwrap_or_else(|err| panic!("\n    \x1b[91merror\x1b[0m: {}\n", err));
+    let ast = lower(&grammar);
    let syntax_kinds_file = project_root().join(codegen::SYNTAX_KINDS);
    let syntax_kinds = generate_syntax_kinds(KINDS_SRC)?;
    update(syntax_kinds_file.as_path(), &syntax_kinds, mode)?;
    let ast_tokens_file = project_root().join(codegen::AST_TOKENS);
-    let contents = generate_tokens(AST_SRC)?;
+    let contents = generate_tokens(&ast)?;
    update(ast_tokens_file.as_path(), &contents, mode)?;
    let ast_nodes_file = project_root().join(codegen::AST_NODES);
-    let contents = generate_nodes(KINDS_SRC, AST_SRC)?;
+    let contents = generate_nodes(KINDS_SRC, &ast)?;
    update(ast_nodes_file.as_path(), &contents, mode)?;
    Ok(())
 }
-fn generate_tokens(grammar: AstSrc<'_>) -> Result<String> {
+fn generate_tokens(grammar: &AstSrc) -> Result<String> {
    let tokens = grammar.tokens.iter().map(|token| {
        let name = format_ident!("{}", token);
        let kind = format_ident!("{}", to_upper_snake_case(token));
@@ -62,13 +71,13 @@ fn generate_tokens(grammar: AstSrc<'_>) -> Result<String> {
    Ok(pretty)
 }
-fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
+fn generate_nodes(kinds: KindsSrc<'_>, grammar: &AstSrc) -> Result<String> {
    let (node_defs, node_boilerplate_impls): (Vec<_>, Vec<_>) = grammar
        .nodes
        .iter()
        .map(|node| {
            let name = format_ident!("{}", node.name);
-            let kind = format_ident!("{}", to_upper_snake_case(node.name));
+            let kind = format_ident!("{}", to_upper_snake_case(&node.name));
            let traits = node.traits.iter().map(|trait_name| {
                let trait_name = format_ident!("{}", trait_name);
                quote!(impl ast::#trait_name for #name {})
@@ -192,8 +201,8 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
        })
        .unzip();
-    let enum_names = grammar.enums.iter().map(|it| it.name);
+    let enum_names = grammar.enums.iter().map(|it| &it.name);
-    let node_names = grammar.nodes.iter().map(|it| it.name);
+    let node_names = grammar.nodes.iter().map(|it| &it.name);
    let display_impls =
        enum_names.chain(node_names.clone()).map(|it| format_ident!("{}", it)).map(|name| {
@@ -212,9 +221,11 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
        .nodes
        .iter()
        .map(|kind| to_pascal_case(kind))
-        .filter(|name| !defined_nodes.contains(name.as_str()))
+        .filter(|name| !defined_nodes.iter().any(|&it| it == name))
    {
-        eprintln!("Warning: node {} not defined in ast source", node);
+        drop(node)
+        // TODO: restore this
+        // eprintln!("Warning: node {} not defined in ast source", node);
    }
    let ast = quote! {
@@ -236,12 +247,12 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
    let mut res = String::with_capacity(ast.len() * 2);
    let mut docs =
-        grammar.nodes.iter().map(|it| it.doc).chain(grammar.enums.iter().map(|it| it.doc));
+        grammar.nodes.iter().map(|it| &it.doc).chain(grammar.enums.iter().map(|it| &it.doc));
    for chunk in ast.split("# [ pretty_doc_comment_placeholder_workaround ]") {
        res.push_str(chunk);
        if let Some(doc) = docs.next() {
-            write_doc_comment(doc, &mut res);
+            write_doc_comment(&doc, &mut res);
        }
    }
@@ -249,7 +260,7 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
    Ok(pretty)
 }
-fn write_doc_comment(contents: &[&str], dest: &mut String) {
+fn write_doc_comment(contents: &[String], dest: &mut String) {
    for line in contents {
        writeln!(dest, "///{}", line).unwrap();
    }
@@ -296,7 +307,7 @@ fn generate_syntax_kinds(grammar: KindsSrc<'_>) -> Result<String> {
    let ast = quote! {
        #![allow(bad_style, missing_docs, unreachable_pub)]
-        /// The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT_DEF`.
+        /// The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT`.
        #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
        #[repr(u16)]
        pub enum SyntaxKind {
@@ -363,6 +374,7 @@ fn generate_syntax_kinds(grammar: KindsSrc<'_>) -> Result<String> {
            #([#all_keywords_idents] => { $crate::SyntaxKind::#all_keywords };)*
            [lifetime] => { $crate::SyntaxKind::LIFETIME };
            [ident] => { $crate::SyntaxKind::IDENT };
+            [shebang] => { $crate::SyntaxKind::SHEBANG };
        }
    };
@@ -413,9 +425,13 @@ fn to_pascal_case(s: &str) -> String {
    buf
 }
-impl Field<'_> {
+fn pluralize(s: &str) -> String {
+    format!("{}s", s)
+}
+impl Field {
    fn is_many(&self) -> bool {
-        matches!(self, Field::Node { src: FieldSrc::Many(_), .. })
+        matches!(self, Field::Node { cardinality: Cardinality::Many, .. })
    }
    fn token_kind(&self) -> Option<proc_macro2::TokenStream> {
        match self {
@@ -429,7 +445,7 @@ impl Field<'_> {
    fn method_name(&self) -> proc_macro2::Ident {
        match self {
            Field::Token(name) => {
-                let name = match *name {
+                let name = match name.as_str() {
                    ";" => "semicolon",
                    "->" => "thin_arrow",
                    "'{'" => "l_curly",
@@ -448,29 +464,251 @@ impl Field<'_> {
                    "." => "dot",
                    ".." => "dotdot",
                    "..." => "dotdotdot",
+                    "..=" => "dotdoteq",
                    "=>" => "fat_arrow",
                    "@" => "at",
                    ":" => "colon",
                    "::" => "coloncolon",
                    "#" => "pound",
                    "?" => "question_mark",
+                    "," => "comma",
                    _ => name,
                };
                format_ident!("{}_token", name)
            }
-            Field::Node { name, src } => match src {
+            Field::Node { name, .. } => format_ident!("{}", name),
-                FieldSrc::Shorthand => format_ident!("{}", to_lower_snake_case(name)),
-                _ => format_ident!("{}", name),
-            },
        }
    }
    fn ty(&self) -> proc_macro2::Ident {
        match self {
            Field::Token(_) => format_ident!("SyntaxToken"),
-            Field::Node { name, src } => match src {
+            Field::Node { ty, .. } => format_ident!("{}", ty),
-                FieldSrc::Optional(ty) | FieldSrc::Many(ty) => format_ident!("{}", ty),
-                FieldSrc::Shorthand => format_ident!("{}", name),
-            },
        }
    }
 }
+fn lower(grammar: &Grammar) -> AstSrc {
+    let mut res = AstSrc::default();
+    res.tokens = vec!["Whitespace".into(), "Comment".into(), "String".into(), "RawString".into()];
+    let nodes = grammar
+        .iter()
+        .filter(|&node| match grammar[node].rule {
+            Rule::Node(it) if it == node => false,
+            _ => true,
+        })
+        .collect::<Vec<_>>();
+    for &node in &nodes {
+        let name = grammar[node].name.clone();
+        let rule = &grammar[node].rule;
+        match lower_enum(grammar, rule) {
+            Some(variants) => {
+                let enum_src = AstEnumSrc { doc: Vec::new(), name, traits: Vec::new(), variants };
+                res.enums.push(enum_src);
+            }
+            None => {
+                let mut fields = Vec::new();
+                lower_rule(&mut fields, grammar, None, rule);
+                res.nodes.push(AstNodeSrc { doc: Vec::new(), name, traits: Vec::new(), fields });
+            }
+        }
+    }
+    deduplicate_fields(&mut res);
+    extract_enums(&mut res);
+    extract_struct_traits(&mut res);
+    extract_enum_traits(&mut res);
+    res
+}
+fn lower_enum(grammar: &Grammar, rule: &Rule) -> Option<Vec<String>> {
+    let alternatives = match rule {
+        Rule::Alt(it) => it,
+        _ => return None,
+    };
+    let mut variants = Vec::new();
+    for alternative in alternatives {
+        match alternative {
+            Rule::Node(it) => variants.push(grammar[*it].name.clone()),
+            _ => return None,
+        }
+    }
+    Some(variants)
+}
+fn lower_rule(acc: &mut Vec<Field>, grammar: &Grammar, label: Option<&String>, rule: &Rule) {
+    if lower_comma_list(acc, grammar, label, rule) {
+        return;
+    }
+    match rule {
+        Rule::Node(node) => {
+            let ty = grammar[*node].name.clone();
+            let name = label.cloned().unwrap_or_else(|| to_lower_snake_case(&ty));
+            let field = Field::Node { name, ty, cardinality: Cardinality::Optional };
+            acc.push(field);
+        }
+        Rule::Token(token) => {
+            assert!(label.is_none());
+            let mut name = grammar[*token].name.clone();
+            if name != "int_number" && name != "string" {
+                if "[]{}()".contains(&name) {
+                    name = format!("'{}'", name);
+                }
+                let field = Field::Token(name);
+                acc.push(field);
+            }
+        }
+        Rule::Rep(inner) => {
+            if let Rule::Node(node) = &**inner {
+                let ty = grammar[*node].name.clone();
+                let name = label.cloned().unwrap_or_else(|| pluralize(&to_lower_snake_case(&ty)));
+                let field = Field::Node { name, ty, cardinality: Cardinality::Many };
+                acc.push(field);
+                return;
+            }
+            todo!("{:?}", rule)
+        }
+        Rule::Labeled { label: l, rule } => {
+            assert!(label.is_none());
+            lower_rule(acc, grammar, Some(l), rule);
+        }
+        Rule::Seq(rules) | Rule::Alt(rules) => {
+            for rule in rules {
+                lower_rule(acc, grammar, label, rule)
+            }
+        }
+        Rule::Opt(rule) => lower_rule(acc, grammar, label, rule),
+    }
+}
+// (T (',' T)* ','?)
+fn lower_comma_list(
+    acc: &mut Vec<Field>,
+    grammar: &Grammar,
+    label: Option<&String>,
+    rule: &Rule,
+) -> bool {
+    let rule = match rule {
+        Rule::Seq(it) => it,
+        _ => return false,
+    };
+    let (node, repeat, trailing_comma) = match rule.as_slice() {
+        [Rule::Node(node), Rule::Rep(repeat), Rule::Opt(trailing_comma)] => {
+            (node, repeat, trailing_comma)
+        }
+        _ => return false,
+    };
+    let repeat = match &**repeat {
+        Rule::Seq(it) => it,
+        _ => return false,
+    };
+    match repeat.as_slice() {
+        [comma, Rule::Node(n)] if comma == &**trailing_comma && n == node => (),
+        _ => return false,
+    }
+    let ty = grammar[*node].name.clone();
+    let name = label.cloned().unwrap_or_else(|| pluralize(&to_lower_snake_case(&ty)));
+    let field = Field::Node { name, ty, cardinality: Cardinality::Many };
+    acc.push(field);
+    true
+}
+fn deduplicate_fields(ast: &mut AstSrc) {
+    for node in &mut ast.nodes {
+        let mut i = 0;
+        'outer: while i < node.fields.len() {
+            for j in 0..i {
+                let f1 = &node.fields[i];
+                let f2 = &node.fields[j];
+                if f1 == f2 {
+                    node.fields.remove(i);
+                    continue 'outer;
+                }
+            }
+            i += 1;
+        }
+    }
+}
+fn extract_enums(ast: &mut AstSrc) {
+    for node in &mut ast.nodes {
+        for enm in &ast.enums {
+            let mut to_remove = Vec::new();
+            for (i, field) in node.fields.iter().enumerate() {
+                let ty = field.ty().to_string();
+                if enm.variants.iter().any(|it| it == &ty) {
+                    to_remove.push(i);
+                }
+            }
+            if to_remove.len() == enm.variants.len() {
+                node.remove_field(to_remove);
+                let ty = enm.name.clone();
+                let name = to_lower_snake_case(&ty);
+                node.fields.push(Field::Node { name, ty, cardinality: Cardinality::Optional });
+            }
+        }
+    }
+}
+fn extract_struct_traits(ast: &mut AstSrc) {
+    let traits: &[(&str, &[&str])] = &[
+        ("AttrsOwner", &["attrs"]),
+        ("NameOwner", &["name"]),
+        ("VisibilityOwner", &["visibility"]),
+        ("GenericParamsOwner", &["generic_param_list", "where_clause"]),
+        ("TypeBoundsOwner", &["type_bound_list", "colon_token"]),
+        ("ModuleItemOwner", &["items"]),
+        ("LoopBodyOwner", &["label", "loop_body"]),
+        ("ArgListOwner", &["arg_list"]),
+    ];
+    for node in &mut ast.nodes {
+        for (name, methods) in traits {
+            extract_struct_trait(node, name, methods);
+        }
+    }
+}
+fn extract_struct_trait(node: &mut AstNodeSrc, trait_name: &str, methods: &[&str]) {
+    let mut to_remove = Vec::new();
+    for (i, field) in node.fields.iter().enumerate() {
+        let method_name = field.method_name().to_string();
+        if methods.iter().any(|&it| it == &method_name) {
+            to_remove.push(i);
+        }
+    }
+    if to_remove.len() == methods.len() {
+        node.traits.push(trait_name.to_string());
+        node.remove_field(to_remove);
+    }
+}
+fn extract_enum_traits(ast: &mut AstSrc) {
+    for enm in &mut ast.enums {
+        let nodes = &ast.nodes;
+        let mut variant_traits = enm
+            .variants
+            .iter()
+            .map(|var| nodes.iter().find(|it| &it.name == var).unwrap())
+            .map(|node| node.traits.iter().cloned().collect::<BTreeSet<_>>());
+        let mut enum_traits = match variant_traits.next() {
+            Some(it) => it,
+            None => continue,
+        };
+        for traits in variant_traits {
+            enum_traits = enum_traits.intersection(&traits).cloned().collect();
+        }
+        enm.traits = enum_traits.into_iter().collect();
+    }
+}
+impl AstNodeSrc {
+    fn remove_field(&mut self, to_remove: Vec<usize>) {
+        to_remove.into_iter().rev().for_each(|idx| {
+            self.fields.remove(idx);
+        });
+    }
+}
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram
new file mode 100644
index 000000000..375df301f
--- /dev/null
+++ b/xtask/src/codegen/rust.ungram
@@ -0,0 +1,544 @@
+SourceFile =
+  'shebang'?
+  Attr*
+  Item*
+Item =
+  Const
+| Enum
+| ExternBlock
+| ExternCrate
+| Fn
+| Impl
+| MacroCall
+| Module
+| Static
+| Struct
+| Trait
+| TypeAlias
+| Union
+| Use
+Module =
+  Attr* Visibility? 'mod' Name
+  (ItemList | ';')
+ItemList =
+  '{' Attr* Item* '}'
+ExternCrate =
+  Attr* Visibility? 'extern' 'crate' (NameRef | 'self') Rename? ';'
+Rename =
+  'as' (Name | '_')
+Use =
+  Attr* Visibility? 'use' UseTree ';'
+UseTree =
+  (Path? '::')? ('*' | UseTreeList )
+| Path Rename?
+UseTreeList =
+  '{' (UseTree (',' UseTree)* ','?)? '}'
+Fn =
+ Attr* Visibility?
+ 'default'? ('async' | 'const')? 'unsafe'? Abi?
+ 'fn' Name GenericParamList? ParamList RetType?
+ WhereClause?
+ (body:BlockExpr | ';')
+Abi =
+  'extern' 'string'?
+ParamList =
+  '('(
+    SelfParam
+  | (SelfParam ',')? (Param (',' Param)* ','?)?
+  )')'
+SelfParam =
+  Attr* (
+    ('&' 'lifetime'?)? 'mut'? 'self'
+  | 'mut'? 'self' ':' ty:TypeRef
+  )
+Param =
+  Attr* (
+    Pat (':' ty:TypeRef)
+  | ty:TypeRef
+  | '...'
+  )
+RetType =
+  '->' ty:TypeRef
+TypeAlias =
+  Attr* Visibility? 'default'? 'type' Name GenericParamList? (':' TypeBoundList?)? WhereClause?
+  '=' ty:TypeRef ';'
+Struct =
+  Attr* Visibility? 'struct' Name GenericParamList? (
+    WhereClause?  (RecordFieldList | ';')
+  | TupleFieldList WhereClause? ';'
+  )
+RecordFieldList =
+ '{' fields:(RecordField (',' RecordField)* ','?)? '}'
+RecordField =
+  Attr* Visibility? Name ':' ty:TypeRef
+TupleFieldList =
+  '(' fields:(TupleField (',' TupleField)* ','?)? ')'
+TupleField =
+  Attr* Visibility? ty:TypeRef
+FieldList =
+  RecordFieldList
+| TupleFieldList
+Enum =
+  Attr* Visibility? 'enum' Name GenericParamList? WhereClause?
+  VariantList
+VariantList =
+ '{' (Variant (',' Variant)* ','?)? '}'
+Variant =
+  Attr* Visibility? Name FieldList ('=' Expr)?
+Union =
+  Attr* Visibility? 'union' Name GenericParamList? WhereClause?
+  RecordFieldList
+Const =
+  Attr* Visibility? 'default'? 'const' (Name | '_') ':' ty:TypeRef
+  '=' body:Expr ';'
+Static =
+  Attr* Visibility? 'static'? 'mut'? Name ':' ty:TypeRef
+  '=' body:Expr ';'
+Trait =
+  Attr* Visibility? 'unsafe'? 'auto'? 'trait' Name GenericParamList
+  (':' TypeBoundList?)? WhereClause
+  AssocItemList
+AssocItemList =
+  '{' Attr* AssocItem* '}'
+AssocItem =
+  Fn
+| TypeAlias
+| Const
+| MacroCall
+Impl =
+ Attr* Visibility?
+ 'default'? 'unsafe'? 'impl' 'const'? GenericParamList? (
+   TypeRef
+ | '!'? TypeRef 'for' TypeRef
+ ) WhereClause?
+ AssocItemList
+ExternBlock =
+  Attr* Abi ExternItemList
+ExternItemList =
+  '{' Attr* ExternItem* '}'
+ExternItem =
+  Fn | Static | MacroCall
+GenericParamList =
+  '<' (GenericParam (',' GenericParam)* ','?)? '>'
+GenericParam =
+  LifetimeParam
+| TypeParam
+| ConstParam
+TypeParam =
+  Attr* Name (':' TypeBoundList?)?
+  ('=' default_type:TypeRef)?
+ConstParam =
+  Attr* 'const' Name ':' ty:TypeRef
+  ('=' default_val:Expr)?
+LifetimeParam =
+  Attr* 'lifetime'
+Visibility =
+  'pub' ('('
+    'super'
+  | 'self'
+  | 'crate'
+  | 'in' Path
+  ')')?
+Attr =
+  '#' '!'? '[' Path ('=' Literal | TokenTree)? ']'
+ParenType =
+  '(' ty:TypeRef ')'
+TupleType =
+  '(' fields:TypeRef* ')'
+NeverType =
+  '!'
+PathType =
+  Path
+PointerType =
+  '*' ('const' | 'mut') ty:TypeRef
+ArrayType =
+  '[' ty:TypeRef ';' Expr ']'
+SliceType =
+  '[' ty:TypeRef ']'
+ReferenceType =
+  '&' 'lifetime'? 'mut'? ty:TypeRef
+PlaceholderType =
+   '_'
+FnPointerType =
+   Abi 'unsafe'? 'fn' ParamList RetType?
+ForType =
+   'for' GenericParamList ty:TypeRef
+ImplTraitType =
+  'impl' TypeBoundList
+DynTraitType =
+  'dyn' TypeBoundList
+TupleExpr =
+  Attr* '(' Expr* ')'
+ArrayExpr =
+  Attr* '[' (Expr* | Expr ';' Expr) ']'
+ParenExpr =
+  Attr* '(' Expr ')'
+PathExpr =
+  Path
+LambdaExpr =
+  Attr* 'static'? 'async'? 'move'?  ParamList RetType?
+  body:Expr
+IfExpr =
+  Attr* 'if' Condition
+Condition =
+  'let' Pat '=' Expr
+| Expr
+EffectExpr =
+  Attr* Label? ('try' | 'unsafe' | 'async') BlockExpr
+LoopExpr =
+  Attr* Label? 'loop'
+  loop_body:BlockExpr?
+ForExpr =
+  Attr* Label? 'for' Pat 'in' iterable:Expr
+  loop_body:BlockExpr?
+WhileExpr =
+  Attr* Label? 'while' Condition
+  loop_body:BlockExpr?
+ContinueExpr =
+  Attr* 'continue' 'lifetime'?
+BreakExpr =
+  Attr* 'break' 'lifetime'? Expr?
+Label =
+  'lifetime'
+BlockExpr =
+  Attr* Label
+  '{'
+    Item*
+    statements:Stmt*
+    Expr?
+  '}'
+ReturnExpr =
+  Attr* 'return' Expr
+CallExpr =
+  Attr* Expr ArgList
+MethodCallExpr =
+  Attr* Expr '.' NameRef TypeArgList? ArgList
+ArgList =
+  '(' args:Expr* ')'
+FieldExpr =
+  Attr* Expr '.' NameRef
+IndexExpr =
+  Attr* '[' ']'
+AwaitExpr =
+  Attr* Expr '.' 'await'
+TryExpr =
+  Attr* Expr '?'
+CastExpr =
+  Attr* Expr 'as' ty:TypeRef
+RefExpr =
+  Attr* '&' ('raw' | 'mut' | 'const') Expr
+PrefixExpr =
+  Attr* Expr
+BoxExpr =
+  Attr* 'box' Expr
+RangeExpr =
+  Attr*
+BinExpr =
+  Attr*
+Literal =
+  'int_number'
+MatchExpr =
+  Attr* 'match' Expr MatchArmList
+MatchArmList =
+  '{' arms:MatchArm* '}'
+MatchArm =
+  Attr* Pat guard:MatchGuard? '=>' Expr
+MatchGuard =
+  'if' Expr
+RecordExpr =
+ Path RecordExprFieldList
+RecordExprFieldList =
+  '{'
+    fields:RecordExprField*
+    ('..' spread:Expr)?
+  '}'
+RecordExprField =
+  Attr* NameRef (':' Expr)?
+OrPat =
+  Pat*
+ParenPat =
+  '(' Pat ')'
+RefPat =
+  '&' 'mut'? Pat
+BoxPat =
+  'box' Path
+BindPat =
+  Attr* 'ref'? 'mut'? Name ('@' Pat)?
+PlaceholderPat =
+  '_'
+DotDotPat =
+  '..'
+PathPat =
+  Path
+SlicePat =
+  '[' args:Pat* ']'
+RangePat =
+  '..' | '..='
+LiteralPat =
+  Literal
+MacroPat =
+  MacroCall
+RecordPat =
+  Path RecordFieldPatList
+RecordFieldPatList =
+  '{'
+    record_field_pats:RecordFieldPat*
+    BindPat*
+    '..'?
+  '}'
+RecordFieldPat =
+  Attr* NameRef ':' Pat
+TupleStructPat =
+   Path '(' args:Pat* ')'
+TuplePat =
+   '(' args:Pat* ')'
+Name =
+  'ident'
+NameRef =
+  'ident' | 'int_number'
+MacroCall =
+  Attr* Path '!' Name? TokenTree ';'?
+MacroDef =
+  Name TokenTree
+TokenTree =
+  '(' ')' | '{' '}' | '[' ']'
+MacroItems =
+  Item*
+MacroStmts =
+  statements:Stmt*
+  Expr?
+TypeBound =
+  'lifetime' | 'const'? TypeRef
+TypeBoundList =
+   bounds:TypeBound*
+WherePred =
+  ('for' GenericParamList)?  ('lifetime' | TypeRef) ':' TypeBoundList
+WhereClause =
+  'where' predicates:WherePred*
+ExprStmt =
+  Attr* Expr ';'
+LetStmt =
+  Attr* 'let' Pat (':' ty:TypeRef)
+  '=' initializer:Expr ';'
+Path =
+  (qualifier:Path '::')? segment:PathSegment
+PathSegment =
+  '::' | 'crate' | 'self' | 'super'
+| '<' NameRef TypeArgList ParamList RetType PathType '>'
+TypeArgList =
+  '::'? '<'
+    TypeArg*
+    LifetimeArg*
+    AssocTypeArg*
+    ConstArg*
+  '>'
+TypeArg =
+  TypeRef
+AssocTypeArg =
+  NameRef (':' TypeBoundList | '=' TypeRef)
+LifetimeArg =
+  'lifetime'
+ConstArg =
+  Literal | BlockExpr BlockExpr
+AdtDef =
+  Struct
+| Enum
+| Union
+TypeRef =
+  ParenType
+| TupleType
+| NeverType
+| PathType
+| PointerType
+| ArrayType
+| SliceType
+| ReferenceType
+| PlaceholderType
+| FnPointerType
+| ForType
+| ImplTraitType
+| DynTraitType
+Stmt =
+  LetStmt
+| ExprStmt
+Pat =
+  OrPat
+| ParenPat
+| RefPat
+| BoxPat
+| BindPat
+| PlaceholderPat
+| DotDotPat
+| PathPat
+| RecordPat
+| TupleStructPat
+| TuplePat
+| SlicePat
+| RangePat
+| LiteralPat
+| MacroPat
+Expr =
+  TupleExpr
+| ArrayExpr
+| ParenExpr
+| PathExpr
+| LambdaExpr
+| IfExpr
+| LoopExpr
+| ForExpr
+| WhileExpr
+| ContinueExpr
+| BreakExpr
+| Label
+| BlockExpr
+| ReturnExpr
+| MatchExpr
+| RecordExpr
+| CallExpr
+| IndexExpr
+| MethodCallExpr
+| FieldExpr
+| AwaitExpr
+| TryExpr
+| EffectExpr
+| CastExpr
+| RefExpr
+| PrefixExpr
+| RangeExpr
+| BinExpr
+| Literal
+| MacroCall
+| BoxExpr
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs
index aef68089e..01d903cde 100644
--- a/xtask/src/dist.rs
+++ b/xtask/src/dist.rs
@@ -1,4 +1,10 @@
-use std::path::PathBuf;
+use flate2::{write::GzEncoder, Compression};
+use std::{
+    env,
+    fs::File,
+    io,
+    path::{Path, PathBuf},
+};
 use anyhow::Result;
@@ -7,17 +13,24 @@ use crate::{
    project_root,
 };
-pub fn run_dist(nightly: bool, client_version: Option<String>) -> Result<()> {
+pub struct DistCmd {
-    let dist = project_root().join("dist");
+    pub nightly: bool,
-    rm_rf(&dist)?;
+    pub client_version: Option<String>,
-    fs2::create_dir_all(&dist)?;
+}
+impl DistCmd {
+    pub fn run(self) -> Result<()> {
+        let dist = project_root().join("dist");
+        rm_rf(&dist)?;
+        fs2::create_dir_all(&dist)?;
-    if let Some(version) = client_version {
+        if let Some(version) = self.client_version {
-        let release_tag = if nightly { "nightly".to_string() } else { date_iso()? };
+            let release_tag = if self.nightly { "nightly".to_string() } else { date_iso()? };
-        dist_client(&version, &release_tag)?;
+            dist_client(&version, &release_tag)?;
+        }
+        dist_server()?;
+        Ok(())
    }
-    dist_server(nightly)?;
-    Ok(())
 }
 fn dist_client(version: &str, release_tag: &str) -> Result<()> {
@@ -46,17 +59,12 @@ fn dist_client(version: &str, release_tag: &str) -> Result<()> {
    Ok(())
 }
-fn dist_server(nightly: bool) -> Result<()> {
+fn dist_server() -> Result<()> {
    if cfg!(target_os = "linux") {
-        std::env::set_var("CC", "clang");
+        env::set_var("CC", "clang");
        run!(
            "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release"
-            // We'd want to add, but that requires setting the right linker somehow
-            // --features=jemalloc
        )?;
-        if !nightly {
-            run!("strip ./target/release/rust-analyzer")?;
-        }
    } else {
        run!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release")?;
    }
@@ -71,8 +79,20 @@ fn dist_server(nightly: bool) -> Result<()> {
        panic!("Unsupported OS")
    };
-    fs2::copy(src, dst)?;
+    let src = Path::new(src);
+    let dst = Path::new(dst);
+    fs2::copy(&src, &dst)?;
+    gzip(&src, &dst.with_extension("gz"))?;
+    Ok(())
+}
+fn gzip(src_path: &Path, dest_path: &Path) -> Result<()> {
+    let mut encoder = GzEncoder::new(File::create(dest_path)?, Compression::best());
+    let mut input = io::BufReader::new(File::open(src_path)?);
+    io::copy(&mut input, &mut encoder)?;
+    encoder.finish()?;
    Ok(())
 }
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index 9ba77a3aa..b25a6e301 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -19,7 +19,12 @@ pub enum ClientOpt {
 }
 pub struct ServerOpt {
-    pub jemalloc: bool,
+    pub malloc: Malloc,
+}
+pub enum Malloc {
+    System,
+    Mimalloc,
 }
 impl InstallCmd {
@@ -130,8 +135,11 @@ fn install_server(opts: ServerOpt) -> Result<()> {
        )
    }
-    let jemalloc = if opts.jemalloc { "--features jemalloc" } else { "" };
+    let malloc_feature = match opts.malloc {
-    let res = run!("cargo install --path crates/rust-analyzer --locked --force {}", jemalloc);
+        Malloc::System => "",
+        Malloc::Mimalloc => "--features mimalloc",
+    };
+    let res = run!("cargo install --path crates/rust-analyzer --locked --force {}", malloc_feature);
    if res.is_err() && old_rust {
        eprintln!(
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 747654c1f..2fdb08f2e 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -7,6 +7,7 @@ pub mod install;
 pub mod release;
 pub mod dist;
 pub mod pre_commit;
+pub mod metrics;
 pub mod codegen;
 mod ast_src;
@@ -20,7 +21,7 @@ use walkdir::{DirEntry, WalkDir};
 use crate::{
    codegen::Mode,
-    not_bash::{fs2, pushd, pushenv, rm_rf, run},
+    not_bash::{fs2, pushd, pushenv, rm_rf},
 };
 pub use anyhow::{bail, Context as _, Result};
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index f7a79362d..b69b884e5 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -13,11 +13,12 @@ use std::env;
 use pico_args::Arguments;
 use xtask::{
    codegen::{self, Mode},
-    dist::run_dist,
+    dist::DistCmd,
-    install::{ClientOpt, InstallCmd, ServerOpt},
+    install::{ClientOpt, InstallCmd, Malloc, ServerOpt},
+    metrics::MetricsCmd,
    not_bash::pushd,
    pre_commit, project_root,
-    release::ReleaseCmd,
+    release::{PromoteCmd, ReleaseCmd},
    run_clippy, run_fuzzer, run_pre_cache, run_rustfmt, Result,
 };
@@ -45,7 +46,7 @@ USAGE:
 FLAGS:
        --client-code    Install only VS Code plugin
        --server         Install only the language server
-        --jemalloc       Use jemalloc for server
+        --mimalloc       Use mimalloc for server
    -h, --help           Prints help information
        "
                );
@@ -61,13 +62,14 @@ FLAGS:
                return Ok(());
            }
-            let jemalloc = args.contains("--jemalloc");
+            let malloc =
+                if args.contains("--mimalloc") { Malloc::Mimalloc } else { Malloc::System };
            args.finish()?;
            InstallCmd {
                client: if server { None } else { Some(ClientOpt::VsCode) },
-                server: if client_code { None } else { Some(ServerOpt { jemalloc }) },
+                server: if client_code { None } else { Some(ServerOpt { malloc }) },
            }
            .run()
        }
@@ -105,11 +107,21 @@ FLAGS:
            args.finish()?;
            ReleaseCmd { dry_run }.run()
        }
+        "promote" => {
+            let dry_run = args.contains("--dry-run");
+            args.finish()?;
+            PromoteCmd { dry_run }.run()
+        }
        "dist" => {
            let nightly = args.contains("--nightly");
            let client_version: Option<String> = args.opt_value_from_str("--client")?;
            args.finish()?;
-            run_dist(nightly, client_version)
+            DistCmd { nightly, client_version }.run()
+        }
+        "metrics" => {
+            let dry_run = args.contains("--dry-run");
+            args.finish()?;
+            MetricsCmd { dry_run }.run()
        }
        _ => {
            eprintln!(
@@ -127,7 +139,8 @@ SUBCOMMANDS:
    codegen
    install
    lint
-    dist"
+    dist
+    promote"
            );
            Ok(())
        }
diff --git a/xtask/src/metrics.rs b/xtask/src/metrics.rs
new file mode 100644
index 000000000..9ac3fa51d
--- /dev/null
+++ b/xtask/src/metrics.rs
@@ -0,0 +1,279 @@
+use std::{
+    collections::BTreeMap,
+    env,
+    fmt::{self, Write as _},
+    io::Write as _,
+    path::Path,
+    time::{Instant, SystemTime, UNIX_EPOCH},
+};
+use anyhow::{bail, format_err, Result};
+use crate::not_bash::{fs2, pushd, pushenv, rm_rf, run};
+type Unit = String;
+pub struct MetricsCmd {
+    pub dry_run: bool,
+}
+impl MetricsCmd {
+    pub fn run(self) -> Result<()> {
+        let mut metrics = Metrics::new()?;
+        if !self.dry_run {
+            rm_rf("./target/release")?;
+        }
+        if !Path::new("./target/rustc-perf").exists() {
+            fs2::create_dir_all("./target/rustc-perf")?;
+            run!("git clone https://github.com/rust-lang/rustc-perf.git ./target/rustc-perf")?;
+        }
+        {
+            let _d = pushd("./target/rustc-perf");
+            run!("git reset --hard 1d9288b0da7febf2599917da1b57dc241a1af033")?;
+        }
+        let _env = pushenv("RA_METRICS", "1");
+        metrics.measure_build()?;
+        metrics.measure_analysis_stats_self()?;
+        metrics.measure_analysis_stats("ripgrep")?;
+        metrics.measure_analysis_stats("webrender")?;
+        if !self.dry_run {
+            let _d = pushd("target");
+            let metrics_token = env::var("METRICS_TOKEN").unwrap();
+            let repo = format!("https://{}@github.com/rust-analyzer/metrics.git", metrics_token);
+            run!("git clone --depth 1 {}", repo)?;
+            let _d = pushd("metrics");
+            let mut file = std::fs::OpenOptions::new().append(true).open("metrics.json")?;
+            writeln!(file, "{}", metrics.json())?;
+            run!("git add .")?;
+            run!("git -c user.name=Bot -c [email protected] commit --message 📈")?;
+            run!("git push origin master")?;
+        }
+        eprintln!("{:#?}", metrics);
+        Ok(())
+    }
+}
+impl Metrics {
+    fn measure_build(&mut self) -> Result<()> {
+        eprintln!("\nMeasuring build");
+        run!("cargo fetch")?;
+        let time = Instant::now();
+        run!("cargo build --release --package rust-analyzer --bin rust-analyzer")?;
+        let time = time.elapsed();
+        self.report("build", time.as_millis() as u64, "ms".into());
+        Ok(())
+    }
+    fn measure_analysis_stats_self(&mut self) -> Result<()> {
+        self.measure_analysis_stats_path("self", &".")
+    }
+    fn measure_analysis_stats(&mut self, bench: &str) -> Result<()> {
+        self.measure_analysis_stats_path(
+            bench,
+            &format!("./target/rustc-perf/collector/benchmarks/{}", bench),
+        )
+    }
+    fn measure_analysis_stats_path(&mut self, name: &str, path: &str) -> Result<()> {
+        eprintln!("\nMeasuring analysis-stats/{}", name);
+        let output = run!("./target/release/rust-analyzer analysis-stats --quiet {}", path)?;
+        for (metric, value, unit) in parse_metrics(&output) {
+            self.report(&format!("analysis-stats/{}/{}", name, metric), value, unit.into());
+        }
+        Ok(())
+    }
+}
+fn parse_metrics(output: &str) -> Vec<(&str, u64, &str)> {
+    output
+        .lines()
+        .filter_map(|it| {
+            let entry = it.split(':').collect::<Vec<_>>();
+            match entry.as_slice() {
+                ["METRIC", name, value, unit] => Some((*name, value.parse().unwrap(), *unit)),
+                _ => None,
+            }
+        })
+        .collect()
+}
+#[derive(Debug)]
+struct Metrics {
+    host: Host,
+    timestamp: SystemTime,
+    revision: String,
+    metrics: BTreeMap<String, (u64, Unit)>,
+}
+#[derive(Debug)]
+struct Host {
+    os: String,
+    cpu: String,
+    mem: String,
+}
+impl Metrics {
+    fn new() -> Result<Metrics> {
+        let host = Host::new()?;
+        let timestamp = SystemTime::now();
+        let revision = run!("git rev-parse HEAD")?;
+        Ok(Metrics { host, timestamp, revision, metrics: BTreeMap::new() })
+    }
+    fn report(&mut self, name: &str, value: u64, unit: Unit) {
+        self.metrics.insert(name.into(), (value, unit));
+    }
+    fn json(&self) -> Json {
+        let mut json = Json::default();
+        self.to_json(&mut json);
+        json
+    }
+    fn to_json(&self, json: &mut Json) {
+        json.begin_object();
+        {
+            json.field("host");
+            self.host.to_json(json);
+            json.field("timestamp");
+            let timestamp = self.timestamp.duration_since(UNIX_EPOCH).unwrap();
+            json.number(timestamp.as_secs() as f64);
+            json.field("revision");
+            json.string(&self.revision);
+            json.field("metrics");
+            json.begin_object();
+            {
+                for (k, (value, unit)) in &self.metrics {
+                    json.field(k);
+                    json.begin_array();
+                    {
+                        json.number(*value as f64);
+                        json.string(unit);
+                    }
+                    json.end_array();
+                }
+            }
+            json.end_object()
+        }
+        json.end_object();
+    }
+}
+impl Host {
+    fn new() -> Result<Host> {
+        if cfg!(not(target_os = "linux")) {
+            bail!("can only collect metrics on Linux ");
+        }
+        let os = read_field("/etc/os-release", "PRETTY_NAME=")?.trim_matches('"').to_string();
+        let cpu =
+            read_field("/proc/cpuinfo", "model name")?.trim_start_matches(':').trim().to_string();
+        let mem = read_field("/proc/meminfo", "MemTotal:")?;
+        return Ok(Host { os, cpu, mem });
+        fn read_field<'a>(path: &str, field: &str) -> Result<String> {
+            let text = fs2::read_to_string(path)?;
+            let line = text
+                .lines()
+                .find(|it| it.starts_with(field))
+                .ok_or_else(|| format_err!("can't parse {}", path))?;
+            Ok(line[field.len()..].trim().to_string())
+        }
+    }
+    fn to_json(&self, json: &mut Json) {
+        json.begin_object();
+        {
+            json.field("os");
+            json.string(&self.os);
+            json.field("cpu");
+            json.string(&self.cpu);
+            json.field("mem");
+            json.string(&self.mem);
+        }
+        json.end_object();
+    }
+}
+struct State {
+    obj: bool,
+    first: bool,
+}
+#[derive(Default)]
+struct Json {
+    stack: Vec<State>,
+    buf: String,
+}
+impl Json {
+    fn begin_object(&mut self) {
+        self.stack.push(State { obj: true, first: true });
+        self.buf.push('{');
+    }
+    fn end_object(&mut self) {
+        self.stack.pop();
+        self.buf.push('}')
+    }
+    fn begin_array(&mut self) {
+        self.stack.push(State { obj: false, first: true });
+        self.buf.push('[');
+    }
+    fn end_array(&mut self) {
+        self.stack.pop();
+        self.buf.push(']')
+    }
+    fn field(&mut self, name: &str) {
+        self.object_comma();
+        self.string_token(name);
+        self.buf.push(':');
+    }
+    fn string(&mut self, value: &str) {
+        self.array_comma();
+        self.string_token(value);
+    }
+    fn string_token(&mut self, value: &str) {
+        self.buf.push('"');
+        self.buf.extend(value.escape_default());
+        self.buf.push('"');
+    }
+    fn number(&mut self, value: f64) {
+        self.array_comma();
+        write!(self.buf, "{}", value).unwrap();
+    }
+    fn array_comma(&mut self) {
+        let state = self.stack.last_mut().unwrap();
+        if state.obj {
+            return;
+        }
+        if !state.first {
+            self.buf.push(',');
+        }
+        state.first = false;
+    }
+    fn object_comma(&mut self) {
+        let state = self.stack.last_mut().unwrap();
+        if !state.first {
+            self.buf.push(',');
+        }
+        state.first = false;
+    }
+}
+impl fmt::Display for Json {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.buf)
+    }
+}
diff --git a/xtask/src/not_bash.rs b/xtask/src/not_bash.rs
index a6431e586..ef811e5bf 100644
--- a/xtask/src/not_bash.rs
+++ b/xtask/src/not_bash.rs
@@ -54,7 +54,8 @@ pub mod fs2 {
    }
 }
-macro_rules! _run {
+#[macro_export]
+macro_rules! run {
    ($($expr:expr),*) => {
        run!($($expr),*; echo = true)
    };
@@ -65,7 +66,7 @@ macro_rules! _run {
        $crate::not_bash::run_process(format!($($expr),*), false, Some($stdin))
    };
 }
-pub(crate) use _run as run;
+pub use crate::run;
 pub struct Pushd {
    _p: (),
@@ -153,7 +154,17 @@ fn run_process_inner(cmd: &str, echo: bool, stdin: Option<&[u8]>) -> Result<Stri
 // FIXME: some real shell lexing here
 fn shelx(cmd: &str) -> Vec<String> {
-    cmd.split_whitespace().map(|it| it.to_string()).collect()
+    let mut res = Vec::new();
+    for (string_piece, in_quotes) in cmd.split('\'').zip([false, true].iter().copied().cycle()) {
+        if in_quotes {
+            res.push(string_piece.to_string())
+        } else {
+            if !string_piece.is_empty() {
+                res.extend(string_piece.split_ascii_whitespace().map(|it| it.to_string()))
+            }
+        }
+    }
+    res
 }
 struct Env {
@@ -175,7 +186,8 @@ impl Env {
    fn pushd(&mut self, dir: PathBuf) {
        let dir = self.cwd().join(dir);
        self.pushd_stack.push(dir);
-        env::set_current_dir(self.cwd()).unwrap();
+        env::set_current_dir(self.cwd())
+            .unwrap_or_else(|err| panic!("Failed to set cwd to {}: {}", self.cwd().display(), err));
    }
    fn popd(&mut self) {
        self.pushd_stack.pop().unwrap();
diff --git a/xtask/src/release.rs b/xtask/src/release.rs
index b6502b952..7fa0966aa 100644
--- a/xtask/src/release.rs
+++ b/xtask/src/release.rs
@@ -1,6 +1,6 @@
 use crate::{
    codegen, is_release_tag,
-    not_bash::{date_iso, fs2, run},
+    not_bash::{date_iso, fs2, pushd, run},
    project_root, Mode, Result,
 };
@@ -37,6 +37,8 @@ Release: release:{}[]
 == Sponsors
+**Become a sponsor:** https://opencollective.com/rust-analyzer/[opencollective.com/rust-analyzer]
 == New Features
 * pr:[] .
@@ -67,3 +69,35 @@ Release: release:{}[]
        Ok(())
    }
 }
+pub struct PromoteCmd {
+    pub dry_run: bool,
+}
+impl PromoteCmd {
+    pub fn run(self) -> Result<()> {
+        let _dir = pushd("../rust-rust-analyzer");
+        run!("git switch master")?;
+        run!("git fetch upstream")?;
+        run!("git reset --hard upstream/master")?;
+        run!("git submodule update --recursive")?;
+        let branch = format!("rust-analyzer-{}", date_iso()?);
+        run!("git switch -c {}", branch)?;
+        {
+            let _dir = pushd("src/tools/rust-analyzer");
+            run!("git fetch origin")?;
+            run!("git reset --hard origin/release")?;
+        }
+        run!("git add src/tools/rust-analyzer")?;
+        run!("git commit -m':arrow_up: rust-analyzer'")?;
+        if !self.dry_run {
+            run!("git push")?;
+            run!(
+                "xdg-open https://github.com/matklad/rust/pull/new/{}?body=r%3F%20%40ghost",
+                branch
+            )?;
+        }
+        Ok(())
+    }
+}
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index d38ac7f17..d65a2acbc 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -5,7 +5,7 @@ use std::{
 use xtask::{
    codegen::{self, Mode},
-    not_bash::fs2,
+    not_bash::{fs2, run},
    project_root, run_rustfmt, rust_files,
 };
@@ -49,19 +49,56 @@ fn rust_files_are_tidy() {
    tidy_docs.finish();
 }
+#[test]
+fn check_licenses() {
+    let expected = "
+0BSD OR MIT OR Apache-2.0
+Apache-2.0 OR BSL-1.0
+Apache-2.0 OR MIT
+Apache-2.0/MIT
+BSD-2-Clause
+BSD-3-Clause
+CC0-1.0
+ISC
+MIT
+MIT / Apache-2.0
+MIT OR Apache-2.0
+MIT/Apache-2.0
+MIT/Apache-2.0 AND BSD-2-Clause
+Unlicense OR MIT
+Unlicense/MIT
+Zlib
+"
+    .lines()
+    .filter(|it| !it.is_empty())
+    .collect::<Vec<_>>();
+    let meta = run!("cargo metadata --format-version 1"; echo = false).unwrap();
+    let mut licenses = meta
+        .split(|c| c == ',' || c == '{' || c == '}')
+        .filter(|it| it.contains(r#""license""#))
+        .map(|it| it.trim())
+        .map(|it| it[r#""license":"#.len()..].trim_matches('"'))
+        .collect::<Vec<_>>();
+    licenses.sort();
+    licenses.dedup();
+    assert_eq!(licenses, expected);
+}
 fn check_todo(path: &Path, text: &str) {
-    let whitelist = &[
+    let need_todo = &[
-        // This file itself is whitelisted since this test itself contains matches.
+        // This file itself obviously needs to use todo (<- like this!).
        "tests/cli.rs",
-        // Some of our assists generate `todo!()` so those files are whitelisted.
+        // Some of our assists generate `todo!()`.
        "tests/generated.rs",
        "handlers/add_missing_impl_members.rs",
-        "handlers/add_function.rs",
        "handlers/add_turbo_fish.rs",
-        // To support generating `todo!()` in assists, we have `expr_todo()` in ast::make.
+        "handlers/generate_function.rs",
+        // To support generating `todo!()` in assists, we have `expr_todo()` in
+        // `ast::make`.
        "ast/make.rs",
    ];
-    if whitelist.iter().any(|p| path.ends_with(p)) {
+    if need_todo.iter().any(|p| path.ends_with(p)) {
        return;
    }
    if text.contains("TODO") || text.contains("TOOD") || text.contains("todo!") {
@@ -139,7 +176,7 @@ impl TidyDocs {
            )
        }
-        let whitelist = [
+        let poorly_documented = [
            "ra_hir",
            "ra_hir_expand",
            "ra_ide",
@@ -153,9 +190,9 @@ impl TidyDocs {
        ];
        let mut has_fixmes =
-            whitelist.iter().map(|it| (*it, false)).collect::<HashMap<&str, bool>>();
+            poorly_documented.iter().map(|it| (*it, false)).collect::<HashMap<&str, bool>>();
        'outer: for path in self.contains_fixme {
-            for krate in whitelist.iter() {
+            for krate in poorly_documented.iter() {
                if path.components().any(|it| it.as_os_str() == *krate) {
                    has_fixmes.insert(krate, true);
                    continue 'outer;
@@ -166,7 +203,7 @@ impl TidyDocs {
        for (krate, has_fixme) in has_fixmes.iter() {
            if !has_fixme {
-                panic!("crate {} is fully documented, remove it from the white list", krate)
+                panic!("crate {} is fully documented :tada:, remove it from the list of poorly documented crates", krate)
            }
        }
    }