582 files changed, 2248 insertions, 2102 deletions
diff --git a/.cargo/config b/.cargo/config
index 3ac2ce336..92a3acfd0 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,23 +1,23 @@
 [alias]
 # Automatically generates the ast and syntax kinds files
 gen-syntax   = "run --package ra_tools --bin ra_tools -- gen-syntax"
 # Extracts the tests from
 gen-tests    = "run --package ra_tools --bin ra_tools -- gen-tests"
-# Installs ra_lsp_server
-install-lsp = "install --path crates/ra_lsp_server --force"
-# Installs ra_lsp_server with the jemalloc feature
-jinstall-lsp = "install --path crates/ra_lsp_server --force --features jemalloc"
 # Installs the visual studio code extension
-install-code = "run --package ra_tools --bin ra_tools -- install-code"
+install-ra   = "run --package ra_tools --bin ra_tools -- install-ra"
+install-code = "run --package ra_tools --bin ra_tools -- install-ra" # just an alias
 # Formats the full repository or installs the git hook to do it automatically.
 format       = "run --package ra_tools --bin ra_tools -- format"
 format-hook  = "run --package ra_tools --bin ra_tools -- format-hook"
 # Run clippy
 lint         = "run --package ra_tools --bin ra_tools -- lint"
 # Runs the fuzzing test suite (currently only parser)
 fuzz-tests   = "run --package ra_tools --bin ra_tools -- fuzz-tests"
-render-test  = "run --package ra_cli -- render-test"
 # Parse a file. This should be piped the file contents
 parse        = "run --package ra_cli -- parse"
diff --git a/.travis.yml b/.travis.yml
index e151cc8f0..87b546442 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,7 @@
 cache: cargo
 before_cache:
-    # ask Cargo to clean up artifacts for workspace crates
+    - find ./target/debug -maxdepth 1 -type f -delete
-    - cargo clean $(printf -- '--package %s ' $(cd crates; ls))
+    - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*heavy_test*,*gen_lsp*,*thread_worker*}
-    # Cargo doesn't clean up depinfo itself, do it manually
-    - find ./target/debug -maxdepth 2 -iname '*.d' -delete
    - rm -f  ./target/.rustc_info.json
 matrix:
@@ -43,10 +41,9 @@ matrix:
            - xvfb
          before_install: cd editors/code
          install:
-            - npm install
+            - npm ci
            - npm run vscode:prepublish
          script:
-            - npm ci
            - npm run travis
          env:
            - CXX="g++-4.9", CC="gcc-4.9"
diff --git a/Cargo.lock b/Cargo.lock
index 7c7836a13..fd4d876de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@ name = "backtrace-sys"
 version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -150,7 +150,7 @@ dependencies = [
 [[package]]
 name = "cc"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -291,11 +291,10 @@ dependencies = [
 [[package]]
 name = "crossbeam-channel"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -303,21 +302,21 @@ name = "crossbeam-deque"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-epoch"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -325,12 +324,12 @@ name = "crossbeam-queue"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "crossbeam-utils"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -353,7 +352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -443,7 +442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -537,7 +536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "gen_lsp_server"
 version = "0.2.0"
 dependencies = [
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "flexi_logger 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "lsp-types 0.59.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -687,7 +686,7 @@ name = "jemalloc-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -804,8 +803,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memoffset"
-version = "0.2.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 [[package]]
 name = "mio"
@@ -886,7 +888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1006,7 +1008,7 @@ dependencies = [
 "proc-macro-hack 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1040,7 +1042,7 @@ dependencies = [
 "pest_meta 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1074,7 +1076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1239,7 +1241,7 @@ dependencies = [
 name = "ra_lsp_server"
 version = "0.1.0"
 dependencies = [
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "flexi_logger 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "gen_lsp_server 0.2.0",
 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1310,7 +1312,7 @@ dependencies = [
 [[package]]
 name = "ra_rustc_lexer"
-version = "0.1.0-pre.1"
+version = "0.1.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1322,9 +1324,9 @@ version = "0.1.0"
 dependencies = [
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_parser 0.1.0",
- "ra_rustc_lexer 0.1.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ra_rustc_lexer 0.1.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_text_edit 0.1.0",
- "rowan 0.6.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rowan 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "smol_str 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "test_utils 0.1.0",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1362,7 +1364,7 @@ name = "ra_vfs"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1396,7 +1398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1413,10 +1415,9 @@ dependencies = [
 [[package]]
 name = "rand_chacha"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1532,7 +1533,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1595,7 +1596,7 @@ dependencies = [
 [[package]]
 name = "rowan"
-version = "0.6.0-pre.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1653,7 +1654,7 @@ dependencies = [
 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1666,11 +1667,6 @@ dependencies = [
 [[package]]
 name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "scopeguard"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1703,7 +1699,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1774,7 +1770,7 @@ name = "stacker"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1792,7 +1788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "syn"
-version = "0.15.40"
+version = "0.15.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1807,7 +1803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1896,7 +1892,7 @@ dependencies = [
 name = "thread_worker"
 version = "0.1.0"
 dependencies = [
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2147,7 +2143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
 "checksum cargo_metadata 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e904f164f39cae0c3a4f2713eb97a47ba64676a071e99a69ddfef4994694d2c"
-"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
+"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46"
 "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
 "checksum chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
 "checksum chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)" = "<none>"
@@ -2161,11 +2157,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum console 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ca57c2c14b8a2bf3105bc9d15574aad80babf6a9c44b1058034cdf8bd169628"
 "checksum cpuprofiler 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "33f07976bb6821459632d7a18d97ccca005cb5c552f251f822c7c1781c1d7035"
-"checksum crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
+"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
-"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
+"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
 "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
-"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
 "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
 "checksum derive-new 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c3fd04571b29c91cfbe1e7c9a228e069ac8635f180ffb4ccd6a6907617ee8bb0"
 "checksum deunicode 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690"
@@ -2226,7 +2222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
 "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
@@ -2259,12 +2255,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum ra_rustc_lexer 0.1.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e8d92772f822978a6c9c4657aa61af439e4e635180628b3354049b283b749f1e"
+"checksum ra_rustc_lexer 0.1.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6baccda91574dfadd7f8a0bc8f9f110f874b6b484289b2536d3dbf4f0d5d97bb"
 "checksum ra_vfs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb7cd4e302032c5ab514f1c01c89727cd96fd950dd36f9ebee9252df45d9fb1a"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 "checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e193067942ef6f485a349a113329140d0ab9e2168ce92274499bb0e9a4190d9d"
+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
 "checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca"
@@ -2285,7 +2281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum ron 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "17f52a24414403f81528b67488cf8edc4eda977d3af1646bb6b106a600ead78f"
-"checksum rowan 0.6.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0eeee40f1a2724b7d0d9fa5f73a7804cd2f4c91b37ba9f785d429f31819d60df"
+"checksum rowan 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a796c0517d6969224c42e9ef01356363b0a7c57d10ec986c9a600d075666a5ff"
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
@@ -2293,7 +2289,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum salsa 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2891cd628406e8a0ca714b827511de1bff76f796e3382cc72a3de732ccad5aea"
 "checksum salsa-macros 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7f1e25ca2b995bdf032946174929d62156ffd57abd7ff88dc6f9bdeb5ac0c59"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
-"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
@@ -2310,7 +2305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb79482f57cf598af52094ec4cc3b3c42499d3ce5bd426f2ac41515b7e57404b"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
-"checksum syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)" = "bc945221ccf4a7e8c31222b9d1fc77aefdd6638eb901a6ce457a3dc29d4c31e8"
+"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e"
 "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
diff --git a/README.md b/README.md
index eabe004c7..5e9537ef1 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,10 @@ For setup for other editors, see [./docs/user](./docs/user).
 $ git clone https://github.com/rust-analyzer/rust-analyzer && cd rust-analyzer
 # install both the language server and VS Code extension
-$ cargo install-code
+$ cargo install-ra
 # alternatively, install only the server. Binary name is `ra_lsp_server`.
-$ cargo install-lsp
+$ cargo install-ra --server
 ```
 ## Documentation
diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index a12c3ed54..c45262efa 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -129,10 +129,13 @@ pub(crate) struct AssistBuilder {
 }
 impl AssistBuilder {
+    /// Replaces specified `range` of text with a given string.
    pub(crate) fn replace(&mut self, range: TextRange, replace_with: impl Into<String>) {
        self.edit.replace(range, replace_with.into())
    }
+    /// Replaces specified `node` of text with a given string, reindenting the
+    /// string to maintain `node`'s existing indent.
    pub(crate) fn replace_node_and_indent(
        &mut self,
        node: &SyntaxNode,
@@ -145,27 +148,31 @@ impl AssistBuilder {
        self.replace(node.text_range(), replace_with)
    }
-    pub(crate) fn set_edit_builder(&mut self, edit: TextEditBuilder) {
+    /// Remove specified `range` of text.
-        self.edit = edit;
-    }
    #[allow(unused)]
    pub(crate) fn delete(&mut self, range: TextRange) {
        self.edit.delete(range)
    }
+    /// Append specified `text` at the given `offset`
    pub(crate) fn insert(&mut self, offset: TextUnit, text: impl Into<String>) {
        self.edit.insert(offset, text.into())
    }
+    /// Specify desired position of the cursor after the assist is applied.
    pub(crate) fn set_cursor(&mut self, offset: TextUnit) {
        self.cursor_position = Some(offset)
    }
+    /// Specify that the assist should be active withing the `target` range.
+    ///
+    /// Target ranges are used to sort assists: the smaller the target range,
+    /// the more specific assist is, and so it should be sorted first.
    pub(crate) fn target(&mut self, target: TextRange) {
        self.target = Some(target)
    }
+    /// Get access to the raw `TextEditBuilder`.
    pub(crate) fn text_edit_builder(&mut self) -> &mut TextEditBuilder {
        &mut self.edit
    }
diff --git a/crates/ra_assists/src/auto_import.rs b/crates/ra_assists/src/auto_import.rs
index 43e75eee1..a32e2f9b6 100644
--- a/crates/ra_assists/src/auto_import.rs
+++ b/crates/ra_assists/src/auto_import.rs
@@ -562,9 +562,12 @@ pub(crate) fn auto_import(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist
                AssistId("auto_import"),
                format!("import {} in mod {}", fmt_segments(&segments), name.text()),
                |edit| {
-                    let mut text_edit = TextEditBuilder::default();
+                    apply_auto_import(
-                    apply_auto_import(item_list.syntax(), &path, &segments, &mut text_edit);
+                        item_list.syntax(),
-                    edit.set_edit_builder(text_edit);
+                        &path,
+                        &segments,
+                        edit.text_edit_builder(),
+                    );
                },
            );
        }
@@ -574,9 +577,12 @@ pub(crate) fn auto_import(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist
            AssistId("auto_import"),
            format!("import {} in the current file", fmt_segments(&segments)),
            |edit| {
-                let mut text_edit = TextEditBuilder::default();
+                apply_auto_import(
-                apply_auto_import(current_file.syntax(), &path, &segments, &mut text_edit);
+                    current_file.syntax(),
-                edit.set_edit_builder(text_edit);
+                    &path,
+                    &segments,
+                    edit.text_edit_builder(),
+                );
            },
        );
    }
diff --git a/crates/ra_cli/src/analysis_bench.rs b/crates/ra_cli/src/analysis_bench.rs
index 639ac763e..5e9d0c16d 100644
--- a/crates/ra_cli/src/analysis_bench.rs
+++ b/crates/ra_cli/src/analysis_bench.rs
@@ -55,7 +55,7 @@ pub(crate) fn run(verbose: bool, path: &Path, op: Op) -> Result<()> {
        Op::Complete { line, column, .. } => {
            let offset = host
                .analysis()
-                .file_line_index(file_id)
+                .file_line_index(file_id)?
                .offset(LineCol { line, col_utf16: column });
            let file_postion = FilePosition { file_id, offset };
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs
index 7f765caf3..06b732215 100644
--- a/crates/ra_hir/src/nameres/collector.rs
+++ b/crates/ra_hir/src/nameres/collector.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
+use std::sync::Arc;
-use arrayvec::ArrayVec;
+use ra_db::{FileId, SourceRoot};
-use ra_db::FileId;
 use ra_syntax::{ast, SmolStr};
 use relative_path::RelativePathBuf;
 use rustc_hash::FxHashMap;
@@ -105,6 +105,7 @@ where
            module_id,
            file_id: file_id.into(),
            raw_items: &raw_items,
+            parent_module: None,
        }
        .collect(raw_items.items());
@@ -455,8 +456,14 @@ where
        if !self.macro_stack_monitor.is_poison(macro_def_id) {
            let file_id: HirFileId = macro_call_id.as_file(MacroFileKind::Items);
            let raw_items = self.db.raw_items(file_id);
-            ModCollector { def_collector: &mut *self, file_id, module_id, raw_items: &raw_items }
+            ModCollector {
-                .collect(raw_items.items());
+                def_collector: &mut *self,
+                file_id,
+                module_id,
+                raw_items: &raw_items,
+                parent_module: None,
+            }
+            .collect(raw_items.items());
        } else {
            log::error!("Too deep macro expansion: {:?}", macro_call_id);
            self.def_map.poison_macros.insert(macro_def_id);
@@ -476,6 +483,7 @@ struct ModCollector<'a, D> {
    module_id: CrateModuleId,
    file_id: HirFileId,
    raw_items: &'a raw::RawItems,
+    parent_module: Option<&'a Name>,
 }
 impl<DB> ModCollector<'_, &'_ mut DefCollector<&'_ DB>>
@@ -508,6 +516,7 @@ where
                    module_id,
                    file_id: self.file_id,
                    raw_items: self.raw_items,
+                    parent_module: Some(name),
                }
                .collect(&*items);
            }
@@ -521,6 +530,7 @@ where
                    name,
                    is_root,
                    attr_path.as_ref(),
+                    self.parent_module,
                ) {
                    Ok(file_id) => {
                        let module_id = self.push_child_module(name.clone(), ast_id, Some(file_id));
@@ -530,6 +540,7 @@ where
                            module_id,
                            file_id: file_id.into(),
                            raw_items: &raw_items,
+                            parent_module: None,
                        }
                        .collect(raw_items.items())
                    }
@@ -636,46 +647,47 @@ fn resolve_submodule(
    name: &Name,
    is_root: bool,
    attr_path: Option<&SmolStr>,
+    parent_module: Option<&Name>,
 ) -> Result<FileId, RelativePathBuf> {
-    // FIXME: handle submodules of inline modules properly
    let file_id = file_id.original_file(db);
    let source_root_id = db.file_source_root(file_id);
    let path = db.file_relative_path(file_id);
    let root = RelativePathBuf::default();
    let dir_path = path.parent().unwrap_or(&root);
    let mod_name = path.file_stem().unwrap_or("unknown");
-    let is_dir_owner = is_root || mod_name == "mod";
+    let resolve_mode = match (attr_path.filter(|p| !p.is_empty()), parent_module) {
-    let file_mod = dir_path.join(format!("{}.rs", name));
+        (Some(file_path), Some(parent_name)) => {
-    let dir_mod = dir_path.join(format!("{}/mod.rs", name));
+            let file_path = normalize_attribute_path(file_path);
-    let file_dir_mod = dir_path.join(format!("{}/{}.rs", mod_name, name));
+            let path = dir_path.join(format!("{}/{}", parent_name, file_path)).normalize();
-    let mut candidates = ArrayVec::<[_; 3]>::new();
+            ResolutionMode::InsideInlineModule(InsideInlineModuleMode::WithAttributePath(path))
-    let file_attr_mod = attr_path.map(|file_path| {
+        }
-        let file_path = normalize_attribute_path(file_path);
+        (Some(file_path), None) => {
-        let file_attr_mod = dir_path.join(file_path.as_ref()).normalize();
+            let file_path = normalize_attribute_path(file_path);
-        candidates.push(file_attr_mod.clone());
+            let path = dir_path.join(file_path.as_ref()).normalize();
+            ResolutionMode::OutOfLine(OutOfLineMode::WithAttributePath(path))
-        file_attr_mod
+        }
-    });
+        (None, Some(parent_name)) => {
-    if is_dir_owner {
+            let path = dir_path.join(format!("{}/{}.rs", parent_name, name));
-        candidates.push(file_mod.clone());
+            ResolutionMode::InsideInlineModule(InsideInlineModuleMode::File(path))
-        candidates.push(dir_mod);
+        }
-    } else {
+        _ => {
-        candidates.push(file_dir_mod.clone());
+            let is_dir_owner = is_root || mod_name == "mod";
-    };
+            if is_dir_owner {
-    let sr = db.source_root(source_root_id);
+                let file_mod = dir_path.join(format!("{}.rs", name));
-    let mut points_to = candidates.into_iter().filter_map(|path| sr.files.get(&path)).copied();
+                let dir_mod = dir_path.join(format!("{}/mod.rs", name));
-    // FIXME: handle ambiguity
+                ResolutionMode::OutOfLine(OutOfLineMode::RootOrModRs {
-    match points_to.next() {
+                    file: file_mod,
-        Some(file_id) => Ok(file_id),
+                    directory: dir_mod,
-        None => {
+                })
-            if let Some(file_attr_mod) = file_attr_mod {
-                Err(file_attr_mod)
            } else {
-                Err(if is_dir_owner { file_mod } else { file_dir_mod })
+                let path = dir_path.join(format!("{}/{}.rs", mod_name, name));
+                ResolutionMode::OutOfLine(OutOfLineMode::FileInDirectory(path))
            }
        }
-    }
+    };
+    resolve_mode.resolve(db.source_root(source_root_id))
 }
 fn normalize_attribute_path(file_path: &SmolStr) -> Cow<str> {
@@ -693,6 +705,74 @@ fn normalize_attribute_path(file_path: &SmolStr) -> Cow<str> {
    }
 }
+enum OutOfLineMode {
+    RootOrModRs { file: RelativePathBuf, directory: RelativePathBuf },
+    FileInDirectory(RelativePathBuf),
+    WithAttributePath(RelativePathBuf),
+}
+impl OutOfLineMode {
+    pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
+        match self {
+            OutOfLineMode::RootOrModRs { file, directory } => match source_root.files.get(file) {
+                None => resolve_simple_path(source_root, directory).map_err(|_| file.clone()),
+                file_id => resolve_find_result(file_id, file),
+            },
+            OutOfLineMode::FileInDirectory(path) => resolve_simple_path(source_root, path),
+            OutOfLineMode::WithAttributePath(path) => resolve_simple_path(source_root, path),
+        }
+    }
+}
+enum InsideInlineModuleMode {
+    File(RelativePathBuf),
+    WithAttributePath(RelativePathBuf),
+}
+impl InsideInlineModuleMode {
+    pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
+        match self {
+            InsideInlineModuleMode::File(path) => resolve_simple_path(source_root, path),
+            InsideInlineModuleMode::WithAttributePath(path) => {
+                resolve_simple_path(source_root, path)
+            }
+        }
+    }
+}
+enum ResolutionMode {
+    OutOfLine(OutOfLineMode),
+    InsideInlineModule(InsideInlineModuleMode),
+}
+impl ResolutionMode {
+    pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
+        use self::ResolutionMode::*;
+        match self {
+            OutOfLine(mode) => mode.resolve(source_root),
+            InsideInlineModule(mode) => mode.resolve(source_root),
+        }
+    }
+}
+fn resolve_simple_path(
+    source_root: Arc<SourceRoot>,
+    path: &RelativePathBuf,
+) -> Result<FileId, RelativePathBuf> {
+    resolve_find_result(source_root.files.get(path), path)
+}
+fn resolve_find_result(
+    file_id: Option<&FileId>,
+    path: &RelativePathBuf,
+) -> Result<FileId, RelativePathBuf> {
+    match file_id {
+        Some(file_id) => Ok(file_id.clone()),
+        None => Err(path.clone()),
+    }
+}
 #[cfg(test)]
 mod tests {
    use ra_db::SourceDatabase;
diff --git a/crates/ra_hir/src/nameres/tests/mods.rs b/crates/ra_hir/src/nameres/tests/mods.rs
index d714a3276..382728149 100644
--- a/crates/ra_hir/src/nameres/tests/mods.rs
+++ b/crates/ra_hir/src/nameres/tests/mods.rs
@@ -336,10 +336,10 @@ fn module_resolution_explicit_path_mod_rs_with_win_separator() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
-fn module_resolution_decl_inside_inline_module() {
+fn module_resolution_decl_inside_inline_module_with_path_attribute() {
    let map = def_map_with_crate_graph(
        r###"
        //- /main.rs
@@ -368,10 +368,39 @@ fn module_resolution_decl_inside_inline_module() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+#[test]
+fn module_resolution_decl_inside_inline_module() {
+    let map = def_map_with_crate_graph(
+        r###"
+        //- /main.rs
+        mod foo {
+            mod bar;
+        }
+        //- /foo/bar.rs
+        pub struct Baz;
+        "###,
+        crate_graph! {
+            "main": ("/main.rs", []),
+        },
+    );
+    assert_snapshot_matches!(map, @r###"
+        ⋮crate
+        ⋮foo: t
+        ⋮
+        ⋮crate::foo
+        ⋮bar: t
+        ⋮
+        ⋮crate::foo::bar
+        ⋮Baz: t v
+    "###);
+}
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
-fn module_resolution_decl_inside_inline_module_2() {
+fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
    let map = def_map_with_crate_graph(
        r###"
        //- /main.rs
@@ -400,7 +429,7 @@ fn module_resolution_decl_inside_inline_module_2() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
 fn module_resolution_decl_inside_inline_module_3() {
@@ -433,7 +462,7 @@ fn module_resolution_decl_inside_inline_module_3() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
 fn module_resolution_decl_inside_inline_module_empty_path() {
@@ -491,7 +520,7 @@ fn module_resolution_decl_empty_path() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
 fn module_resolution_decl_inside_inline_module_relative_path() {
@@ -523,9 +552,7 @@ fn module_resolution_decl_inside_inline_module_relative_path() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
 #[test]
-#[ignore]
 fn module_resolution_decl_inside_inline_module_in_crate_root() {
    let map = def_map_with_crate_graph(
        r###"
@@ -557,9 +584,7 @@ fn module_resolution_decl_inside_inline_module_in_crate_root() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
 #[test]
-#[ignore]
 fn module_resolution_decl_inside_inline_module_in_mod_rs() {
    let map = def_map_with_crate_graph(
        r###"
@@ -597,9 +622,7 @@ fn module_resolution_decl_inside_inline_module_in_mod_rs() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
 #[test]
-#[ignore]
 fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
    let map = def_map_with_crate_graph(
        r###"
@@ -613,7 +636,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
        }
        use self::bar::baz::Baz;
-        //- /foo/bar/qwe.rs
+        //- /bar/qwe.rs
        pub struct Baz;
        "###,
        crate_graph! {
@@ -637,7 +660,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
    "###);
 }
-// FIXME: issue #1510. not support out-of-line modules inside inline.
+// FIXME: issue #1529. not support out-of-line modules inside inline.
 #[test]
 #[ignore]
 fn module_resolution_decl_inside_inline_module_in_non_crate_root_2() {
diff --git a/crates/ra_ide_api/src/completion.rs b/crates/ra_ide_api/src/completion.rs
index 85160358a..a6b68be75 100644
--- a/crates/ra_ide_api/src/completion.rs
+++ b/crates/ra_ide_api/src/completion.rs
@@ -16,7 +16,7 @@ mod complete_postfix;
 use ra_db::SourceDatabase;
 #[cfg(test)]
-use crate::completion::completion_item::{check_completion, do_completion};
+use crate::completion::completion_item::do_completion;
 use crate::{
    completion::{
        completion_context::CompletionContext,
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index f92034055..2000d953a 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -121,172 +121,413 @@ impl ImportResolver {
 #[cfg(test)]
 mod tests {
-    use crate::completion::{check_completion, CompletionKind};
+    use crate::completion::{do_completion, CompletionItem, CompletionKind};
+    use insta::assert_debug_snapshot_matches;
-    fn check_reference_completion(name: &str, code: &str) {
+    fn do_reference_completion(code: &str) -> Vec<CompletionItem> {
-        check_completion(name, code, CompletionKind::Reference);
+        do_completion(code, CompletionKind::Reference)
    }
    #[test]
    fn completes_bindings_from_let() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "bindings_from_let",
+            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 = ();
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "quux",
+        source_range: [91; 91),
+        delete: [91; 91),
+        insert: "quux($0)",
+        kind: Function,
+        detail: "fn quux(x: i32)",
+    },
+    CompletionItem {
+        label: "x",
+        source_range: [91; 91),
+        delete: [91; 91),
+        insert: "x",
+        kind: Binding,
+        detail: "i32",
+    },
+    CompletionItem {
+        label: "y",
+        source_range: [91; 91),
+        delete: [91; 91),
+        insert: "y",
+        kind: Binding,
+        detail: "i32",
+    },
+]"###
        );
    }
    #[test]
    fn completes_bindings_from_if_let() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "bindings_from_if_let",
+            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 + <|>
+                    }
                }
-            }
+                "
-            ",
+            ),
+            @r###"[
+    CompletionItem {
+        label: "a",
+        source_range: [242; 242),
+        delete: [242; 242),
+        insert: "a",
+        kind: Binding,
+    },
+    CompletionItem {
+        label: "b",
+        source_range: [242; 242),
+        delete: [242; 242),
+        insert: "b",
+        kind: Binding,
+        detail: "i32",
+    },
+    CompletionItem {
+        label: "quux",
+        source_range: [242; 242),
+        delete: [242; 242),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux()",
+    },
+]"###
        );
    }
    #[test]
    fn completes_bindings_from_for() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "bindings_from_for",
+            do_reference_completion(
-            r"
+                r"
-            fn quux() {
+                fn quux() {
-                for x in &[1, 2, 3] {
+                    for x in &[1, 2, 3] {
-                    <|>
+                        <|>
+                    }
                }
-            }
+                "
-            ",
+            ),
+            @r###"[
+    CompletionItem {
+        label: "quux",
+        source_range: [95; 95),
+        delete: [95; 95),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux()",
+    },
+    CompletionItem {
+        label: "x",
+        source_range: [95; 95),
+        delete: [95; 95),
+        insert: "x",
+        kind: Binding,
+    },
+]"###
        );
    }
    #[test]
    fn completes_generic_params() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "generic_params",
+            do_reference_completion(
-            r"
+                r"
-            fn quux<T>() {
+                fn quux<T>() {
-                <|>
+                    <|>
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "T",
+        source_range: [52; 52),
+        delete: [52; 52),
+        insert: "T",
+        kind: TypeParam,
+    },
+    CompletionItem {
+        label: "quux",
+        source_range: [52; 52),
+        delete: [52; 52),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux<T>()",
+    },
+]"###
        );
    }
    #[test]
    fn completes_generic_params_in_struct() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "generic_params_in_struct",
+            do_reference_completion(
-            r"
+                r"
-            struct X<T> {
+                struct X<T> {
-                x: <|>
+                    x: <|>
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "T",
+        source_range: [54; 54),
+        delete: [54; 54),
+        insert: "T",
+        kind: TypeParam,
+    },
+    CompletionItem {
+        label: "X",
+        source_range: [54; 54),
+        delete: [54; 54),
+        insert: "X",
+        kind: Struct,
+    },
+]"###
        );
    }
    #[test]
    fn completes_module_items() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "module_items",
+        do_reference_completion(
            r"
-            struct Foo;
+                struct Foo;
-            enum Baz {}
+                enum Baz {}
-            fn quux() {
+                fn quux() {
-                <|>
+                    <|>
-            }
+                }
-            ",
+                "
-        );
+        ),
+        @r###"[
+    CompletionItem {
+        label: "Baz",
+        source_range: [105; 105),
+        delete: [105; 105),
+        insert: "Baz",
+        kind: Enum,
+    },
+    CompletionItem {
+        label: "Foo",
+        source_range: [105; 105),
+        delete: [105; 105),
+        insert: "Foo",
+        kind: Struct,
+    },
+    CompletionItem {
+        label: "quux",
+        source_range: [105; 105),
+        delete: [105; 105),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux()",
+    },
+]"###
+            );
    }
    #[test]
    fn completes_extern_prelude() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "extern_prelude",
+            do_reference_completion(
-            r"
+                r"
-            //- /lib.rs
+                //- /lib.rs
-            use <|>;
+                use <|>;
-            //- /other_crate/lib.rs
+                //- /other_crate/lib.rs
-            // nothing here
+                // nothing here
-            ",
+                "
+            ),
+            @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() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "module_items_in_nested_modules",
+            do_reference_completion(
-            r"
+                r"
-            struct Foo;
+                struct Foo;
-            mod m {
+                mod m {
-                struct Bar;
+                    struct Bar;
-                fn quux() { <|> }
+                    fn quux() { <|> }
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "Bar",
+        source_range: [117; 117),
+        delete: [117; 117),
+        insert: "Bar",
+        kind: Struct,
+    },
+    CompletionItem {
+        label: "quux",
+        source_range: [117; 117),
+        delete: [117; 117),
+        insert: "quux()$0",
+        kind: Function,
+        detail: "fn quux()",
+    },
+]"###
        );
    }
    #[test]
    fn completes_return_type() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "return_type",
+            do_reference_completion(
-            r"
+                r"
-            struct Foo;
+                struct Foo;
-            fn x() -> <|>
+                fn x() -> <|>
-            ",
+                "
-        )
+            ),
+            @r###"[
+    CompletionItem {
+        label: "Foo",
+        source_range: [55; 55),
+        delete: [55; 55),
+        insert: "Foo",
+        kind: Struct,
+    },
+    CompletionItem {
+        label: "x",
+        source_range: [55; 55),
+        delete: [55; 55),
+        insert: "x()$0",
+        kind: Function,
+        detail: "fn x()",
+    },
+]"###
+        );
    }
    #[test]
    fn dont_show_both_completions_for_shadowing() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "dont_show_both_completions_for_shadowing",
+            do_reference_completion(
-            r"
+                r"
-            fn foo() {
+                fn foo() {
-                let bar = 92;
+                    let bar = 92;
-                {
+                    {
-                    let bar = 62;
+                        let bar = 62;
-                    <|>
+                        <|>
+                    }
                }
-            }
+                "
-            ",
+            ),
-        )
+            @r###"[
+    CompletionItem {
+        label: "bar",
+        source_range: [146; 146),
+        delete: [146; 146),
+        insert: "bar",
+        kind: Binding,
+        detail: "i32",
+    },
+    CompletionItem {
+        label: "foo",
+        source_range: [146; 146),
+        delete: [146; 146),
+        insert: "foo()$0",
+        kind: Function,
+        detail: "fn foo()",
+    },
+]"###
+        );
    }
    #[test]
    fn completes_self_in_methods() {
-        check_reference_completion("self_in_methods", r"impl S { fn foo(&self) { <|> } }")
+        assert_debug_snapshot_matches!(
+            do_reference_completion(r"impl S { fn foo(&self) { <|> } }"),
+            @r#"[
+    CompletionItem {
+        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() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "completes_prelude",
+            do_reference_completion(
-            "
+                "
-            //- /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 {
+                mod prelude {
-                struct Option;
+                    struct Option;
-            }
+                }
-            ",
+                "
+            ),
+            @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,
+        detail: "fn foo()",
+    },
+    CompletionItem {
+        label: "std",
+        source_range: [18; 18),
+        delete: [18; 18),
+        insert: "std",
+        kind: Module,
+    },
+]"#
        );
    }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_snippet.rs b/crates/ra_ide_api/src/completion/complete_snippet.rs
index d2d364b57..a35f31511 100644
--- a/crates/ra_ide_api/src/completion/complete_snippet.rs
+++ b/crates/ra_ide_api/src/completion/complete_snippet.rs
@@ -39,39 +39,76 @@ fn ${1:feature}() {
 #[cfg(test)]
 mod tests {
-    use crate::completion::{check_completion, CompletionKind};
+    use crate::completion::{do_completion, CompletionItem, CompletionKind};
+    use insta::assert_debug_snapshot_matches;
-    fn check_snippet_completion(name: &str, code: &str) {
+    fn do_snippet_completion(code: &str) -> Vec<CompletionItem> {
-        check_completion(name, code, CompletionKind::Snippet);
+        do_completion(code, CompletionKind::Snippet)
    }
    #[test]
    fn completes_snippets_in_expressions() {
-        check_snippet_completion("snippets_in_expressions", r"fn foo(x: i32) { <|> }");
+        assert_debug_snapshot_matches!(
+                    do_snippet_completion(r"fn foo(x: i32) { <|> }"),
+        @r#"[
+    CompletionItem {
+        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() {
-        check_snippet_completion(
+        assert_debug_snapshot_matches!(
-            "should_not_complete_snippets_in_path",
+                    do_snippet_completion(r"fn foo(x: i32) { ::foo<|> }"),
-            r"fn foo(x: i32) { ::foo<|> }",
+        @r#"[]"#
-        );
+                );
-        check_snippet_completion(
+        assert_debug_snapshot_matches!(
-            "should_not_complete_snippets_in_path2",
+                    do_snippet_completion(r"fn foo(x: i32) { ::<|> }"),
-            r"fn foo(x: i32) { ::<|> }",
+        @r#"[]"#
-        );
+                );
    }
    #[test]
    fn completes_snippets_in_items() {
-        check_snippet_completion(
+        assert_debug_snapshot_matches!(
-            "snippets_in_items",
+            do_snippet_completion(
-            r"
+                r"
-            #[cfg(test)]
+                #[cfg(test)]
-            mod tests {
+                mod tests {
-                <|>
+                    <|>
-            }
+                }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "Test function",
+        source_range: [78; 78),
+        delete: [78; 78),
+        insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
+        kind: Snippet,
+        lookup: "tfn",
+    },
+    CompletionItem {
+        label: "pub(crate)",
+        source_range: [78; 78),
+        delete: [78; 78),
+        insert: "pub(crate) $0",
+        kind: Snippet,
+    },
+]"###
        );
    }
 }
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index f78c4c877..d787bb69e 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -299,10 +299,3 @@ pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionI
    kind_completions.sort_by_key(|c| c.label.clone());
    kind_completions
 }
-#[cfg(test)]
-pub(crate) fn check_completion(test_name: &str, code: &str, kind: CompletionKind) {
-    use insta::assert_debug_snapshot_matches;
-    let kind_completions = do_completion(code, kind);
-    assert_debug_snapshot_matches!(test_name, kind_completions);
-}
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 5cf55a496..6878008d3 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -182,80 +182,169 @@ impl Completions {
 #[cfg(test)]
 mod tests {
+    use crate::completion::{do_completion, CompletionItem, CompletionKind};
+    use insta::assert_debug_snapshot_matches;
    use test_utils::covers;
-    use crate::completion::{check_completion, CompletionKind};
+    fn do_reference_completion(code: &str) -> Vec<CompletionItem> {
+        do_completion(code, CompletionKind::Reference)
-    fn check_reference_completion(code: &str, expected_completions: &str) {
-        check_completion(code, expected_completions, CompletionKind::Reference);
    }
    #[test]
    fn inserts_parens_for_function_calls() {
        covers!(inserts_parens_for_function_calls);
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "inserts_parens_for_function_calls1",
+            do_reference_completion(
-            r"
+                r"
-            fn no_args() {}
+                fn no_args() {}
-            fn main() { no_<|> }
+                fn main() { no_<|> }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "main",
+        source_range: [61; 64),
+        delete: [61; 64),
+        insert: "main()$0",
+        kind: Function,
+        detail: "fn main()",
+    },
+    CompletionItem {
+        label: "no_args",
+        source_range: [61; 64),
+        delete: [61; 64),
+        insert: "no_args()$0",
+        kind: Function,
+        detail: "fn no_args()",
+    },
+]"###
        );
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "inserts_parens_for_function_calls2",
+            do_reference_completion(
-            r"
+                r"
-            fn with_args(x: i32, y: String) {}
+                fn with_args(x: i32, y: String) {}
-            fn main() { with_<|> }
+                fn main() { with_<|> }
-            ",
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "main",
+        source_range: [80; 85),
+        delete: [80; 85),
+        insert: "main()$0",
+        kind: Function,
+        detail: "fn main()",
+    },
+    CompletionItem {
+        label: "with_args",
+        source_range: [80; 85),
+        delete: [80; 85),
+        insert: "with_args($0)",
+        kind: Function,
+        detail: "fn with_args(x: i32, y: String)",
+    },
+]"###
+        );
+        assert_debug_snapshot_matches!(
+            do_reference_completion(
+                r"
+                struct S {}
+                impl S {
+                    fn foo(&self) {}
+                }
+                fn bar(s: &S) {
+                    s.f<|>
+                }
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "foo",
+        source_range: [163; 164),
+        delete: [163; 164),
+        insert: "foo()$0",
+        kind: Method,
+        detail: "fn foo(&self)",
+    },
+]"###
        );
-        check_reference_completion(
-            "inserts_parens_for_function_calls3",
-            r"
-            struct S {}
-            impl S {
-                fn foo(&self) {}
-            }
-            fn bar(s: &S) {
-                s.f<|>
-            }
-            ",
-        )
    }
    #[test]
    fn dont_render_function_parens_in_use_item() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "dont_render_function_parens_in_use_item",
+            do_reference_completion(
-            "
+                "
-            //- /lib.rs
+                //- /lib.rs
-            mod m { pub fn foo() {} }
+                mod m { pub fn foo() {} }
-            use crate::m::f<|>;
+                use crate::m::f<|>;
-            ",
+                "
-        )
+            ),
+            @r#"[
+    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() {
-        check_reference_completion(
+        assert_debug_snapshot_matches!(
-            "dont_render_function_parens_if_already_call",
+            do_reference_completion(
-            "
+                "
-            //- /lib.rs
+                //- /lib.rs
-            fn frobnicate() {}
+                fn frobnicate() {}
-            fn main() {
+                fn main() {
-                frob<|>();
+                    frob<|>();
-            }
+                }
-            ",
+                "
+            ),
+            @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_matches!(
+            do_reference_completion(
+                "
+                //- /lib.rs
+                struct Foo {}
+                impl Foo { fn new() -> Foo {} }
+                fn main() {
+                    Foo::ne<|>();
+                }
+                "
+            ),
+            @r#"[
+    CompletionItem {
+        label: "new",
+        source_range: [67; 69),
+        delete: [67; 69),
+        insert: "new",
+        kind: Function,
+        detail: "fn new() -> Foo",
+    },
+]"#
        );
-        check_reference_completion(
-            "dont_render_function_parens_if_already_call_assoc_fn",
-            "
-            //- /lib.rs
-            struct Foo {}
-            impl Foo { fn new() -> Foo {} }
-            fn main() {
-                Foo::ne<|>();
-            }
-            ",
-        )
    }
 }
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
deleted file mode 100644
index e9b717a45..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_for.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.119822026Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "quux",
-        source_range: [83; 83),
-        delete: [83; 83),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux()",
-    },
-    CompletionItem {
-        label: "x",
-        source_range: [83; 83),
-        delete: [83; 83),
-        insert: "x",
-        kind: Binding,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
deleted file mode 100644
index f94477b43..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_if_let.snap
+++ /dev/null
@@ -1,31 +0,0 @@
---
-created: "2019-07-23T16:11:48.828805910Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "a",
-        source_range: [214; 214),
-        delete: [214; 214),
-        insert: "a",
-        kind: Binding,
-    },
-    CompletionItem {
-        label: "b",
-        source_range: [214; 214),
-        delete: [214; 214),
-        insert: "b",
-        kind: Binding,
-        detail: "i32",
-    },
-    CompletionItem {
-        label: "quux",
-        source_range: [214; 214),
-        delete: [214; 214),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
deleted file mode 100644
index 590e2a820..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__bindings_from_let.snap
+++ /dev/null
@@ -1,32 +0,0 @@
---
-created: "2019-07-23T16:11:48.828811567Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "quux",
-        source_range: [79; 79),
-        delete: [79; 79),
-        insert: "quux($0)",
-        kind: Function,
-        detail: "fn quux(x: i32)",
-    },
-    CompletionItem {
-        label: "x",
-        source_range: [79; 79),
-        delete: [79; 79),
-        insert: "x",
-        kind: Binding,
-        detail: "i32",
-    },
-    CompletionItem {
-        label: "y",
-        source_range: [79; 79),
-        delete: [79; 79),
-        insert: "y",
-        kind: Binding,
-        detail: "i32",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
deleted file mode 100644
index b339c6c5f..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__completes_prelude.snap
+++ /dev/null
@@ -1,30 +0,0 @@
---
-created: "2019-05-23T22:23:35.139262926Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    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,
-        detail: "fn foo()",
-    },
-    CompletionItem {
-        label: "std",
-        source_range: [18; 18),
-        delete: [18; 18),
-        insert: "std",
-        kind: Module,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
deleted file mode 100644
index 46bea2ccd..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-05-23T22:23:35.158296242Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    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()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap
deleted file mode 100644
index b09a6745e..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_if_already_call_assoc_fn.snap
+++ /dev/null
@@ -1,16 +0,0 @@
---
-created: "2019-05-23T22:44:10.920136527Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "new",
-        source_range: [67; 69),
-        delete: [67; 69),
-        insert: "new",
-        kind: Function,
-        detail: "fn new() -> Foo",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
deleted file mode 100644
index 84ccc8160..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_render_function_parens_in_use_item.snap
+++ /dev/null
@@ -1,16 +0,0 @@
---
-created: "2019-05-23T22:23:35.154795561Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "foo",
-        source_range: [40; 41),
-        delete: [40; 41),
-        insert: "foo",
-        kind: Function,
-        detail: "pub fn foo()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
deleted file mode 100644
index 158a2e5b9..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__dont_show_both_completions_for_shadowing.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-07-23T16:11:48.860949870Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "bar",
-        source_range: [126; 126),
-        delete: [126; 126),
-        insert: "bar",
-        kind: Binding,
-        detail: "i32",
-    },
-    CompletionItem {
-        label: "foo",
-        source_range: [126; 126),
-        delete: [126; 126),
-        insert: "foo()$0",
-        kind: Function,
-        detail: "fn foo()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
deleted file mode 100644
index b9449a76c..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__extern_prelude.snap
+++ /dev/null
@@ -1,15 +0,0 @@
---
-created: "2019-05-23T22:23:35.123197049Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "other_crate",
-        source_range: [4; 4),
-        delete: [4; 4),
-        insert: "other_crate",
-        kind: Module,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap
deleted file mode 100644
index eb1a4151a..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.123825399Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "T",
-        source_range: [44; 44),
-        delete: [44; 44),
-        insert: "T",
-        kind: TypeParam,
-    },
-    CompletionItem {
-        label: "quux",
-        source_range: [44; 44),
-        delete: [44; 44),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux<T>()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap
deleted file mode 100644
index 52f08267f..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__generic_params_in_struct.snap
+++ /dev/null
@@ -1,22 +0,0 @@
---
-created: "2019-05-23T22:23:35.130778739Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "T",
-        source_range: [46; 46),
-        delete: [46; 46),
-        insert: "T",
-        kind: TypeParam,
-    },
-    CompletionItem {
-        label: "X",
-        source_range: [46; 46),
-        delete: [46; 46),
-        insert: "X",
-        kind: Struct,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
deleted file mode 100644
index c795b9aae..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls1.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-05-23T22:23:35.156115632Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "main",
-        source_range: [53; 56),
-        delete: [53; 56),
-        insert: "main()$0",
-        kind: Function,
-        detail: "fn main()",
-    },
-    CompletionItem {
-        label: "no_args",
-        source_range: [53; 56),
-        delete: [53; 56),
-        insert: "no_args()$0",
-        kind: Function,
-        detail: "fn no_args()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
deleted file mode 100644
index b49a838e0..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls2.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-05-23T22:44:10.916806744Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "main",
-        source_range: [72; 77),
-        delete: [72; 77),
-        insert: "main()$0",
-        kind: Function,
-        detail: "fn main()",
-    },
-    CompletionItem {
-        label: "with_args",
-        source_range: [72; 77),
-        delete: [72; 77),
-        insert: "with_args($0)",
-        kind: Function,
-        detail: "fn with_args(x: i32, y: String)",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap
deleted file mode 100644
index b62cb7aa1..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__inserts_parens_for_function_calls3.snap
+++ /dev/null
@@ -1,16 +0,0 @@
---
-created: "2019-05-23T22:44:40.543731193Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "foo",
-        source_range: [139; 140),
-        delete: [139; 140),
-        insert: "foo()$0",
-        kind: Method,
-        detail: "fn foo(&self)",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
deleted file mode 100644
index cee4898c3..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items.snap
+++ /dev/null
@@ -1,30 +0,0 @@
---
-created: "2019-05-23T22:23:35.133106898Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Baz",
-        source_range: [89; 89),
-        delete: [89; 89),
-        insert: "Baz",
-        kind: Enum,
-    },
-    CompletionItem {
-        label: "Foo",
-        source_range: [89; 89),
-        delete: [89; 89),
-        insert: "Foo",
-        kind: Struct,
-    },
-    CompletionItem {
-        label: "quux",
-        source_range: [89; 89),
-        delete: [89; 89),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
deleted file mode 100644
index ce18e5bb7..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__module_items_in_nested_modules.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.134417551Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Bar",
-        source_range: [101; 101),
-        delete: [101; 101),
-        insert: "Bar",
-        kind: Struct,
-    },
-    CompletionItem {
-        label: "quux",
-        source_range: [101; 101),
-        delete: [101; 101),
-        insert: "quux()$0",
-        kind: Function,
-        detail: "fn quux()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
deleted file mode 100644
index 16dd18431..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__return_type.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.140648630Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Foo",
-        source_range: [47; 47),
-        delete: [47; 47),
-        insert: "Foo",
-        kind: Struct,
-    },
-    CompletionItem {
-        label: "x",
-        source_range: [47; 47),
-        delete: [47; 47),
-        insert: "x()$0",
-        kind: Function,
-        detail: "fn x()",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
deleted file mode 100644
index b7bcbe864..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__self_in_methods.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-07-23T16:11:48.859812318Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        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}",
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap
deleted file mode 100644
index cb3278edf..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-Created: 2019-01-23T05:19:36.475253+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-[]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap
deleted file mode 100644
index 62c8e3de9..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__should_not_complete_snippets_in_path2.snap
+++ /dev/null
@@ -1,5 +0,0 @@
-Created: 2019-01-23T05:19:36.476869+00:00
-Creator: [email protected]
-Source: crates/ra_ide_api/src/completion/completion_item.rs
-[]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
deleted file mode 100644
index 6f41bf76f..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_expressions.snap
+++ /dev/null
@@ -1,22 +0,0 @@
---
-created: "2019-05-23T22:23:35.141901047Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        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,
-    },
-]
diff --git a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap b/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
deleted file mode 100644
index 1eb0adebe..000000000
--- a/crates/ra_ide_api/src/completion/snapshots/completion_item__snippets_in_items.snap
+++ /dev/null
@@ -1,23 +0,0 @@
---
-created: "2019-05-23T22:23:35.149234118Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/completion/completion_item.rs
-expression: kind_completions
---
-[
-    CompletionItem {
-        label: "Test function",
-        source_range: [66; 66),
-        delete: [66; 66),
-        insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
-        kind: Snippet,
-        lookup: "tfn",
-    },
-    CompletionItem {
-        label: "pub(crate)",
-        source_range: [66; 66),
-        delete: [66; 66),
-        insert: "pub(crate) $0",
-        kind: Snippet,
-    },
-]
diff --git a/crates/ra_ide_api/src/display/snapshots/tests__file_structure.snap b/crates/ra_ide_api/src/display/snapshots/tests__file_structure.snap
deleted file mode 100644
index 102efc026..000000000
--- a/crates/ra_ide_api/src/display/snapshots/tests__file_structure.snap
+++ /dev/null
@@ -1,191 +0,0 @@
---
-created: "2019-06-28T20:46:18.274464142Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/display/structure.rs
-expression: structure
---
-[
-    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: NAMED_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_BLOCK,
-        detail: None,
-        deprecated: false,
-    },
-    StructureNode {
-        parent: None,
-        label: "impl fmt::Debug for E",
-        navigation_range: [265; 266),
-        node_range: [245; 269),
-        kind: IMPL_BLOCK,
-        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: "obsolete",
-        navigation_range: [322; 330),
-        node_range: [305; 335),
-        kind: FN_DEF,
-        detail: Some(
-            "fn()",
-        ),
-        deprecated: true,
-    },
-    StructureNode {
-        parent: None,
-        label: "very_obsolete",
-        navigation_range: [375; 388),
-        node_range: [337; 393),
-        kind: FN_DEF,
-        detail: Some(
-            "fn()",
-        ),
-        deprecated: true,
-    },
-]
diff --git a/crates/ra_ide_api/src/display/structure.rs b/crates/ra_ide_api/src/display/structure.rs
index 2ba10b2ef..b026dfa59 100644
--- a/crates/ra_ide_api/src/display/structure.rs
+++ b/crates/ra_ide_api/src/display/structure.rs
@@ -204,6 +204,192 @@ fn very_obsolete() {}
        .ok()
        .unwrap();
        let structure = file_structure(&file);
-        assert_debug_snapshot_matches!("file_structure", structure);
+        assert_debug_snapshot_matches!(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: NAMED_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_BLOCK,
+        detail: None,
+        deprecated: false,
+    },
+    StructureNode {
+        parent: None,
+        label: "impl fmt::Debug for E",
+        navigation_range: [265; 266),
+        node_range: [245; 269),
+        kind: IMPL_BLOCK,
+        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: "obsolete",
+        navigation_range: [322; 330),
+        node_range: [305; 335),
+        kind: FN_DEF,
+        detail: Some(
+            "fn()",
+        ),
+        deprecated: true,
+    },
+    StructureNode {
+        parent: None,
+        label: "very_obsolete",
+        navigation_range: [375; 388),
+        node_range: [337; 393),
+        kind: FN_DEF,
+        detail: Some(
+            "fn()",
+        ),
+        deprecated: true,
+    },
+]"#
+                );
    }
 }
diff --git a/crates/ra_ide_api/src/inlay_hints.rs b/crates/ra_ide_api/src/inlay_hints.rs
index 174662beb..a524e014f 100644
--- a/crates/ra_ide_api/src/inlay_hints.rs
+++ b/crates/ra_ide_api/src/inlay_hints.rs
@@ -1,16 +1,22 @@
 use crate::{db::RootDatabase, FileId};
-use hir::{HirDisplay, Ty};
+use hir::{HirDisplay, SourceAnalyzer, Ty};
-use ra_syntax::ast::Pat;
 use ra_syntax::{
    algo::visit::{visitor, Visitor},
-    ast::{self, PatKind, TypeAscriptionOwner},
+    ast::{
-    AstNode, SmolStr, SourceFile, SyntaxNode, TextRange,
+        AstNode, ForExpr, IfExpr, LambdaExpr, LetStmt, MatchArmList, Pat, PatKind, SourceFile,
+        TypeAscriptionOwner, WhileExpr,
+    },
+    SmolStr, SyntaxKind, SyntaxNode, TextRange,
 };
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum InlayKind {
    LetBindingType,
    ClosureParameterType,
+    ForExpressionBindingType,
+    IfExpressionType,
+    WhileLetExpressionType,
+    MatchArmType,
 }
 #[derive(Debug)]
@@ -34,68 +40,142 @@ fn get_inlay_hints(
    node: &SyntaxNode,
 ) -> Option<Vec<InlayHint>> {
    visitor()
-        .visit(|let_statement: ast::LetStmt| {
+        .visit(|let_statement: LetStmt| {
-            let let_syntax = let_statement.syntax();
            if let_statement.ascribed_type().is_some() {
                return None;
            }
+            let pat = let_statement.pat()?;
-            let let_pat = let_statement.pat()?;
+            let analyzer = SourceAnalyzer::new(db, file_id, let_statement.syntax(), None);
-            let inlay_type_string = get_node_displayable_type(db, file_id, let_syntax, &let_pat)?
+            Some(get_pat_hints(db, &analyzer, pat, InlayKind::LetBindingType, false))
-                .display(db)
-                .to_string()
-                .into();
-            let pat_range = match let_pat.kind() {
-                PatKind::BindPat(bind_pat) => bind_pat.syntax().text_range(),
-                PatKind::TuplePat(tuple_pat) => tuple_pat.syntax().text_range(),
-                _ => return None,
-            };
-            Some(vec![InlayHint {
-                range: pat_range,
-                kind: InlayKind::LetBindingType,
-                label: inlay_type_string,
-            }])
        })
-        .visit(|closure_parameter: ast::LambdaExpr| match closure_parameter.param_list() {
+        .visit(|closure_parameter: LambdaExpr| {
-            Some(param_list) => Some(
+            let analyzer = SourceAnalyzer::new(db, file_id, closure_parameter.syntax(), None);
+            closure_parameter.param_list().map(|param_list| {
                param_list
                    .params()
                    .filter(|closure_param| closure_param.ascribed_type().is_none())
-                    .filter_map(|closure_param| {
+                    .filter_map(|closure_param| closure_param.pat())
-                        let closure_param_syntax = closure_param.syntax();
+                    .map(|root_pat| {
-                        let inlay_type_string = get_node_displayable_type(
+                        get_pat_hints(
                            db,
-                            file_id,
+                            &analyzer,
-                            closure_param_syntax,
+                            root_pat,
-                            &closure_param.pat()?,
+                            InlayKind::ClosureParameterType,
-                        )?
+                            false,
-                        .display(db)
+                        )
-                        .to_string()
-                        .into();
-                        Some(InlayHint {
-                            range: closure_param_syntax.text_range(),
-                            kind: InlayKind::ClosureParameterType,
-                            label: inlay_type_string,
-                        })
                    })
+                    .flatten()
+                    .collect()
+            })
+        })
+        .visit(|for_expression: ForExpr| {
+            let pat = for_expression.pat()?;
+            let analyzer = SourceAnalyzer::new(db, file_id, for_expression.syntax(), None);
+            Some(get_pat_hints(db, &analyzer, pat, InlayKind::ForExpressionBindingType, false))
+        })
+        .visit(|if_expr: IfExpr| {
+            let pat = if_expr.condition()?.pat()?;
+            let analyzer = SourceAnalyzer::new(db, file_id, if_expr.syntax(), None);
+            Some(get_pat_hints(db, &analyzer, pat, InlayKind::IfExpressionType, true))
+        })
+        .visit(|while_expr: WhileExpr| {
+            let pat = while_expr.condition()?.pat()?;
+            let analyzer = SourceAnalyzer::new(db, file_id, while_expr.syntax(), None);
+            Some(get_pat_hints(db, &analyzer, pat, InlayKind::WhileLetExpressionType, true))
+        })
+        .visit(|match_arm_list: MatchArmList| {
+            let analyzer = SourceAnalyzer::new(db, file_id, match_arm_list.syntax(), None);
+            Some(
+                match_arm_list
+                    .arms()
+                    .map(|match_arm| match_arm.pats())
+                    .flatten()
+                    .map(|root_pat| {
+                        get_pat_hints(db, &analyzer, root_pat, InlayKind::MatchArmType, true)
+                    })
+                    .flatten()
                    .collect(),
-            ),
+            )
-            None => None,
        })
        .accept(&node)?
 }
+fn get_pat_hints(
+    db: &RootDatabase,
+    analyzer: &SourceAnalyzer,
+    root_pat: Pat,
+    kind: InlayKind,
+    skip_root_pat_hint: bool,
+) -> Vec<InlayHint> {
+    let original_pat = &root_pat.clone();
+    get_leaf_pats(root_pat)
+        .into_iter()
+        .filter(|pat| !skip_root_pat_hint || pat != original_pat)
+        .filter_map(|pat| {
+            get_node_displayable_type(db, &analyzer, &pat)
+                .map(|pat_type| (pat.syntax().text_range(), pat_type))
+        })
+        .map(|(range, pat_type)| InlayHint {
+            range,
+            kind: kind.clone(),
+            label: pat_type.display(db).to_string().into(),
+        })
+        .collect()
+}
+fn get_leaf_pats(root_pat: Pat) -> Vec<Pat> {
+    let mut pats_to_process = std::collections::VecDeque::<Pat>::new();
+    pats_to_process.push_back(root_pat);
+    let mut leaf_pats = Vec::new();
+    while let Some(maybe_leaf_pat) = pats_to_process.pop_front() {
+        match maybe_leaf_pat.kind() {
+            PatKind::BindPat(bind_pat) => {
+                if let Some(pat) = bind_pat.pat() {
+                    pats_to_process.push_back(pat);
+                } else {
+                    leaf_pats.push(maybe_leaf_pat);
+                }
+            }
+            PatKind::TuplePat(tuple_pat) => {
+                for arg_pat in tuple_pat.args() {
+                    pats_to_process.push_back(arg_pat);
+                }
+            }
+            PatKind::StructPat(struct_pat) => {
+                if let Some(pat_list) = struct_pat.field_pat_list() {
+                    pats_to_process.extend(
+                        pat_list
+                            .field_pats()
+                            .filter_map(|field_pat| {
+                                field_pat
+                                    .pat()
+                                    .filter(|pat| pat.syntax().kind() != SyntaxKind::BIND_PAT)
+                            })
+                            .chain(pat_list.bind_pats().map(|bind_pat| {
+                                bind_pat.pat().unwrap_or_else(|| Pat::from(bind_pat))
+                            })),
+                    );
+                }
+            }
+            PatKind::TupleStructPat(tuple_struct_pat) => {
+                for arg_pat in tuple_struct_pat.args() {
+                    pats_to_process.push_back(arg_pat);
+                }
+            }
+            _ => (),
+        }
+    }
+    leaf_pats
+}
 fn get_node_displayable_type(
    db: &RootDatabase,
-    file_id: FileId,
+    analyzer: &SourceAnalyzer,
-    node_syntax: &SyntaxNode,
    node_pat: &Pat,
 ) -> Option<Ty> {
-    let analyzer = hir::SourceAnalyzer::new(db, file_id, node_syntax, None);
    analyzer.type_of_pat(db, node_pat).and_then(|resolved_type| {
        if let Ty::Apply(_) = resolved_type {
            Some(resolved_type)
@@ -111,68 +191,306 @@ mod tests {
    use insta::assert_debug_snapshot_matches;
    #[test]
-    fn test_inlay_hints() {
+    fn let_statement() {
        let (analysis, file_id) = single_file(
            r#"
-struct OuterStruct {}
+#[derive(PartialEq)]
+enum CustomOption<T> {
+    None,
+    Some(T),
+}
+#[derive(PartialEq)]
+struct Test {
+    a: CustomOption<u32>,
+    b: u8,
+}
 fn main() {
    struct InnerStruct {}
    let test = 54;
-    let test = InnerStruct {};
+    let test: i32 = 33;
-    let test = OuterStruct {};
-    let test = vec![222];
-    let mut test = Vec::new();
-    test.push(333);
-    let test = test.into_iter().map(|i| i * i).collect::<Vec<_>>();
    let mut test = 33;
    let _ = 22;
-    let test: Vec<_> = (0..3).collect();
+    let test = "test";
+    let test = InnerStruct {};
-    let _ = (0..23).map(|i: u32| {
+    let test = vec![222];
-        let i_squared = i * i;
+    let test: Vec<_> = (0..3).collect();
-        i_squared
+    let test = (0..3).collect::<Vec<i128>>();
-    });
+    let test = (0..3).collect::<Vec<_>>();
-    let test: i32 = 33;
+    let mut test = Vec::new();
+    test.push(333);
-    let (x, c) = (42, 'a');
    let test = (42, 'a');
-}
+    let (a, (b, c, (d, e), f)) = (2, (3, 4, (6.6, 7.7), 5));
-"#,
+}"#,
        );
        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
    InlayHint {
-        range: [71; 75),
+        range: [193; 197),
        kind: LetBindingType,
        label: "i32",
    },
    InlayHint {
-        range: [121; 125),
+        range: [236; 244),
        kind: LetBindingType,
-        label: "OuterStruct",
+        label: "i32",
    },
    InlayHint {
-        range: [297; 305),
+        range: [275; 279),
+        kind: LetBindingType,
+        label: "&str",
+    },
+    InlayHint {
+        range: [539; 543),
+        kind: LetBindingType,
+        label: "(i32, char)",
+    },
+    InlayHint {
+        range: [566; 567),
        kind: LetBindingType,
        label: "i32",
    },
    InlayHint {
-        range: [417; 426),
+        range: [570; 571),
        kind: LetBindingType,
-        label: "u32",
+        label: "i32",
    },
    InlayHint {
-        range: [496; 502),
+        range: [573; 574),
        kind: LetBindingType,
-        label: "(i32, char)",
+        label: "i32",
    },
    InlayHint {
-        range: [524; 528),
+        range: [584; 585),
        kind: LetBindingType,
-        label: "(i32, char)",
+        label: "i32",
+    },
+    InlayHint {
+        range: [577; 578),
+        kind: LetBindingType,
+        label: "f64",
+    },
+    InlayHint {
+        range: [580; 581),
+        kind: LetBindingType,
+        label: "f64",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn closure_parameter() {
+        let (analysis, file_id) = single_file(
+            r#"
+fn main() {
+    let mut start = 0;
+    (0..2).for_each(|increment| {
+        start += increment;
+    })
+}"#,
+        );
+        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
+    InlayHint {
+        range: [21; 30),
+        kind: LetBindingType,
+        label: "i32",
+    },
+    InlayHint {
+        range: [57; 66),
+        kind: ClosureParameterType,
+        label: "i32",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn for_expression() {
+        let (analysis, file_id) = single_file(
+            r#"
+fn main() {
+    let mut start = 0;
+    for increment in 0..2 {
+        start += increment;
+    }
+}"#,
+        );
+        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
+    InlayHint {
+        range: [21; 30),
+        kind: LetBindingType,
+        label: "i32",
+    },
+    InlayHint {
+        range: [44; 53),
+        kind: ForExpressionBindingType,
+        label: "i32",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn if_expr() {
+        let (analysis, file_id) = single_file(
+            r#"
+#[derive(PartialEq)]
+enum CustomOption<T> {
+    None,
+    Some(T),
+}
+#[derive(PartialEq)]
+struct Test {
+    a: CustomOption<u32>,
+    b: u8,
+}
+fn main() {
+    let test = CustomOption::Some(Test { a: CustomOption::Some(3), b: 1 });
+    if let CustomOption::None = &test {};
+    if let test = &test {};
+    if let CustomOption::Some(test) = &test {};
+    if let CustomOption::Some(Test { a, b }) = &test {};
+    if let CustomOption::Some(Test { a: x, b: y }) = &test {};
+    if let CustomOption::Some(Test { a: CustomOption::Some(x), b: y }) = &test {};
+    if let CustomOption::Some(Test { a: CustomOption::None, b: y }) = &test {};
+    if let CustomOption::Some(Test { b: y, .. }) = &test {};
+    
+    if test == CustomOption::None {}
+}"#,
+        );
+        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
+    InlayHint {
+        range: [166; 170),
+        kind: LetBindingType,
+        label: "CustomOption<Test>",
+    },
+    InlayHint {
+        range: [334; 338),
+        kind: IfExpressionType,
+        label: "&Test",
+    },
+    InlayHint {
+        range: [389; 390),
+        kind: IfExpressionType,
+        label: "&CustomOption<u32>",
+    },
+    InlayHint {
+        range: [392; 393),
+        kind: IfExpressionType,
+        label: "&u8",
+    },
+    InlayHint {
+        range: [531; 532),
+        kind: IfExpressionType,
+        label: "&u32",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn while_expr() {
+        let (analysis, file_id) = single_file(
+            r#"
+#[derive(PartialEq)]
+enum CustomOption<T> {
+    None,
+    Some(T),
+}
+#[derive(PartialEq)]
+struct Test {
+    a: CustomOption<u32>,
+    b: u8,
+}
+fn main() {
+    let test = CustomOption::Some(Test { a: CustomOption::Some(3), b: 1 });
+    while let CustomOption::None = &test {};
+    while let test = &test {};
+    while let CustomOption::Some(test) = &test {};
+    while let CustomOption::Some(Test { a, b }) = &test {};
+    while let CustomOption::Some(Test { a: x, b: y }) = &test {};
+    while let CustomOption::Some(Test { a: CustomOption::Some(x), b: y }) = &test {};
+    while let CustomOption::Some(Test { a: CustomOption::None, b: y }) = &test {};
+    while let CustomOption::Some(Test { b: y, .. }) = &test {};
+    
+    while test == CustomOption::None {}
+}"#,
+        );
+        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
+    InlayHint {
+        range: [166; 170),
+        kind: LetBindingType,
+        label: "CustomOption<Test>",
+    },
+]"#
+        );
+    }
+    #[test]
+    fn match_arm_list() {
+        let (analysis, file_id) = single_file(
+            r#"
+#[derive(PartialEq)]
+enum CustomOption<T> { 
+    None,
+    Some(T),
+}
+#[derive(PartialEq)]
+struct Test {
+    a: CustomOption<u32>,
+    b: u8,
+}
+fn main() {
+    match CustomOption::Some(Test { a: CustomOption::Some(3), b: 1 }) {
+        CustomOption::None => (),
+        test => (),
+        CustomOption::Some(test) => (),
+        CustomOption::Some(Test { a, b }) => (),
+        CustomOption::Some(Test { a: x, b: y }) => (),
+        CustomOption::Some(Test { a: CustomOption::Some(x), b: y }) => (),
+        CustomOption::Some(Test { a: CustomOption::None, b: y }) => (),
+        CustomOption::Some(Test { b: y, .. }) => (),
+        _ => {}
+    }
+}"#,
+        );
+        assert_debug_snapshot_matches!(analysis.inlay_hints(file_id).unwrap(), @r#"[
+    InlayHint {
+        range: [312; 316),
+        kind: MatchArmType,
+        label: "Test",
+    },
+    InlayHint {
+        range: [359; 360),
+        kind: MatchArmType,
+        label: "CustomOption<u32>",
+    },
+    InlayHint {
+        range: [362; 363),
+        kind: MatchArmType,
+        label: "u8",
+    },
+    InlayHint {
+        range: [485; 486),
+        kind: MatchArmType,
+        label: "u32",
    },
 ]"#
        );
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 16ffb03ce..edb646c11 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -317,24 +317,24 @@ impl Analysis {
    }
    /// Debug info about the current state of the analysis
-    pub fn status(&self) -> String {
+    pub fn status(&self) -> Cancelable<String> {
-        status::status(&*self.db)
+        self.with_db(|db| status::status(&*db))
    }
    /// Gets the text of the source file.
-    pub fn file_text(&self, file_id: FileId) -> Arc<String> {
+    pub fn file_text(&self, file_id: FileId) -> Cancelable<Arc<String>> {
-        self.db.file_text(file_id)
+        self.with_db(|db| db.file_text(file_id))
    }
    /// Gets the syntax tree of the file.
-    pub fn parse(&self, file_id: FileId) -> SourceFile {
+    pub fn parse(&self, file_id: FileId) -> Cancelable<SourceFile> {
-        self.db.parse(file_id).tree()
+        self.with_db(|db| db.parse(file_id).tree())
    }
    /// Gets the file's `LineIndex`: data structure to convert between absolute
    /// offsets and line/column representation.
-    pub fn file_line_index(&self, file_id: FileId) -> Arc<LineIndex> {
+    pub fn file_line_index(&self, file_id: FileId) -> Cancelable<Arc<LineIndex>> {
-        self.db.line_index(file_id)
+        self.with_db(|db| db.line_index(file_id))
    }
    /// Selects the next syntactic nodes encompassing the range.
@@ -344,58 +344,67 @@ impl Analysis {
    /// Returns position of the matching brace (all types of braces are
    /// supported).
-    pub fn matching_brace(&self, position: FilePosition) -> Option<TextUnit> {
+    pub fn matching_brace(&self, position: FilePosition) -> Cancelable<Option<TextUnit>> {
-        let parse = self.db.parse(position.file_id);
+        self.with_db(|db| {
-        let file = parse.tree();
+            let parse = db.parse(position.file_id);
-        matching_brace::matching_brace(&file, position.offset)
+            let file = parse.tree();
+            matching_brace::matching_brace(&file, position.offset)
+        })
    }
    /// Returns a syntax tree represented as `String`, for debug purposes.
    // FIXME: use a better name here.
-    pub fn syntax_tree(&self, file_id: FileId, text_range: Option<TextRange>) -> String {
+    pub fn syntax_tree(
-        syntax_tree::syntax_tree(&self.db, file_id, text_range)
+        &self,
+        file_id: FileId,
+        text_range: Option<TextRange>,
+    ) -> Cancelable<String> {
+        self.with_db(|db| syntax_tree::syntax_tree(&db, file_id, text_range))
    }
    /// Returns an edit to remove all newlines in the range, cleaning up minor
    /// stuff like trailing commas.
-    pub fn join_lines(&self, frange: FileRange) -> SourceChange {
+    pub fn join_lines(&self, frange: FileRange) -> Cancelable<SourceChange> {
-        let parse = self.db.parse(frange.file_id);
+        self.with_db(|db| {
-        let file_edit = SourceFileEdit {
+            let parse = db.parse(frange.file_id);
-            file_id: frange.file_id,
+            let file_edit = SourceFileEdit {
-            edit: join_lines::join_lines(&parse.tree(), frange.range),
+                file_id: frange.file_id,
-        };
+                edit: join_lines::join_lines(&parse.tree(), frange.range),
-        SourceChange::source_file_edit("join lines", file_edit)
+            };
+            SourceChange::source_file_edit("join lines", file_edit)
+        })
    }
    /// Returns an edit which should be applied when opening a new line, fixing
    /// up minor stuff like continuing the comment.
-    pub fn on_enter(&self, position: FilePosition) -> Option<SourceChange> {
+    pub fn on_enter(&self, position: FilePosition) -> Cancelable<Option<SourceChange>> {
-        typing::on_enter(&self.db, position)
+        self.with_db(|db| typing::on_enter(&db, position))
    }
    /// Returns an edit which should be applied after `=` was typed. Primarily,
    /// this works when adding `let =`.
    // FIXME: use a snippet completion instead of this hack here.
-    pub fn on_eq_typed(&self, position: FilePosition) -> Option<SourceChange> {
+    pub fn on_eq_typed(&self, position: FilePosition) -> Cancelable<Option<SourceChange>> {
-        let parse = self.db.parse(position.file_id);
+        self.with_db(|db| {
-        let file = parse.tree();
+            let parse = db.parse(position.file_id);
-        let edit = typing::on_eq_typed(&file, position.offset)?;
+            let file = parse.tree();
-        Some(SourceChange::source_file_edit(
+            let edit = typing::on_eq_typed(&file, position.offset)?;
-            "add semicolon",
+            Some(SourceChange::source_file_edit(
-            SourceFileEdit { edit, file_id: position.file_id },
+                "add semicolon",
-        ))
+                SourceFileEdit { edit, file_id: position.file_id },
+            ))
+        })
    }
    /// Returns an edit which should be applied when a dot ('.') is typed on a blank line, indenting the line appropriately.
-    pub fn on_dot_typed(&self, position: FilePosition) -> Option<SourceChange> {
+    pub fn on_dot_typed(&self, position: FilePosition) -> Cancelable<Option<SourceChange>> {
-        typing::on_dot_typed(&self.db, position)
+        self.with_db(|db| typing::on_dot_typed(&db, position))
    }
    /// Returns a tree representation of symbols in the file. Useful to draw a
    /// file outline.
-    pub fn file_structure(&self, file_id: FileId) -> Vec<StructureNode> {
+    pub fn file_structure(&self, file_id: FileId) -> Cancelable<Vec<StructureNode>> {
-        let parse = self.db.parse(file_id);
+        self.with_db(|db| file_structure(&db.parse(file_id).tree()))
-        file_structure(&parse.tree())
    }
    /// Returns a list of the places in the file where type hints can be displayed.
@@ -404,9 +413,8 @@ impl Analysis {
    }
    /// Returns the set of folding ranges.
-    pub fn folding_ranges(&self, file_id: FileId) -> Vec<Fold> {
+    pub fn folding_ranges(&self, file_id: FileId) -> Cancelable<Vec<Fold>> {
-        let parse = self.db.parse(file_id);
+        self.with_db(|db| folding_ranges::folding_ranges(&db.parse(file_id).tree()))
-        folding_ranges::folding_ranges(&parse.tree())
    }
    /// Fuzzy searches for a symbol.
diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs
index 5c74d3e36..2118e7ad3 100644
--- a/crates/ra_ide_api/src/references.rs
+++ b/crates/ra_ide_api/src/references.rs
@@ -341,7 +341,39 @@ mod tests {
        );
        let new_name = "foo2";
        let source_change = analysis.rename(position, new_name).unwrap();
-        assert_debug_snapshot_matches!("rename_mod", &source_change);
+        assert_debug_snapshot_matches!(&source_change,
+@r#"Some(
+    SourceChange {
+        label: "rename",
+        source_file_edits: [
+            SourceFileEdit {
+                file_id: FileId(
+                    2,
+                ),
+                edit: TextEdit {
+                    atoms: [
+                        AtomTextEdit {
+                            delete: [4; 7),
+                            insert: "foo2",
+                        },
+                    ],
+                },
+            },
+        ],
+        file_system_edits: [
+            MoveFile {
+                src: FileId(
+                    3,
+                ),
+                dst_source_root: SourceRootId(
+                    0,
+                ),
+                dst_path: "bar/foo2.rs",
+            },
+        ],
+        cursor_position: None,
+    },
+)"#);
    }
    #[test]
@@ -356,7 +388,40 @@ mod tests {
        );
        let new_name = "foo2";
        let source_change = analysis.rename(position, new_name).unwrap();
-        assert_debug_snapshot_matches!("rename_mod_in_dir", &source_change);
+        assert_debug_snapshot_matches!(&source_change,
+        @r###"Some(
+    SourceChange {
+        label: "rename",
+        source_file_edits: [
+            SourceFileEdit {
+                file_id: FileId(
+                    1,
+                ),
+                edit: TextEdit {
+                    atoms: [
+                        AtomTextEdit {
+                            delete: [4; 7),
+                            insert: "foo2",
+                        },
+                    ],
+                },
+            },
+        ],
+        file_system_edits: [
+            MoveFile {
+                src: FileId(
+                    2,
+                ),
+                dst_source_root: SourceRootId(
+                    0,
+                ),
+                dst_path: "foo2/mod.rs",
+            },
+        ],
+        cursor_position: None,
+    },
+)"###
+               );
    }
    fn test_rename(text: &str, new_name: &str, expected: &str) {
@@ -372,7 +437,8 @@ mod tests {
                }
            }
        }
-        let result = text_edit_builder.finish().apply(&*analysis.file_text(file_id.unwrap()));
+        let result =
+            text_edit_builder.finish().apply(&*analysis.file_text(file_id.unwrap()).unwrap());
        assert_eq_text!(expected, &*result);
    }
 }
diff --git a/crates/ra_ide_api/src/runnables.rs b/crates/ra_ide_api/src/runnables.rs
index 07412a9ef..09c082de9 100644
--- a/crates/ra_ide_api/src/runnables.rs
+++ b/crates/ra_ide_api/src/runnables.rs
@@ -92,7 +92,26 @@ mod tests {
        "#,
        );
        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert_debug_snapshot_matches!("runnables", &runnables)
+        assert_debug_snapshot_matches!(&runnables,
+        @r#"[
+    Runnable {
+        range: [1; 21),
+        kind: Bin,
+    },
+    Runnable {
+        range: [22; 46),
+        kind: Test {
+            name: "test_foo",
+        },
+    },
+    Runnable {
+        range: [47; 81),
+        kind: Test {
+            name: "test_foo",
+        },
+    },
+]"#
+                );
    }
    #[test]
@@ -108,7 +127,22 @@ mod tests {
        "#,
        );
        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert_debug_snapshot_matches!("runnables_module", &runnables)
+        assert_debug_snapshot_matches!(&runnables,
+        @r#"[
+    Runnable {
+        range: [1; 59),
+        kind: TestMod {
+            path: "test_mod",
+        },
+    },
+    Runnable {
+        range: [28; 57),
+        kind: Test {
+            name: "test_foo1",
+        },
+    },
+]"#
+                );
    }
    #[test]
@@ -126,7 +160,22 @@ mod tests {
        "#,
        );
        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert_debug_snapshot_matches!("runnables_one_depth_layer_module", &runnables)
+        assert_debug_snapshot_matches!(&runnables,
+        @r#"[
+    Runnable {
+        range: [23; 85),
+        kind: TestMod {
+            path: "foo::test_mod",
+        },
+    },
+    Runnable {
+        range: [46; 79),
+        kind: Test {
+            name: "test_foo1",
+        },
+    },
+]"#
+                );
    }
    #[test]
@@ -146,7 +195,22 @@ mod tests {
        "#,
        );
        let runnables = analysis.runnables(pos.file_id).unwrap();
-        assert_debug_snapshot_matches!("runnables_multiple_depth_module", &runnables)
+        assert_debug_snapshot_matches!(&runnables,
+        @r#"[
+    Runnable {
+        range: [41; 115),
+        kind: TestMod {
+            path: "foo::bar::test_mod",
+        },
+    },
+    Runnable {
+        range: [68; 105),
+        kind: Test {
+            name: "test_foo1",
+        },
+    },
+]"#
+                );
    }
    #[test]
diff --git a/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap b/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap
deleted file mode 100644
index ae8923e75..000000000
--- a/crates/ra_ide_api/src/snapshots/tests__highlights_code_inside_macros.snap
+++ /dev/null
@@ -1,44 +0,0 @@
---
-created: "2019-02-01T07:46:59.130146403+00:00"
-creator: [email protected]
-expression: "&highlights"
-source: crates/ra_ide_api/src/syntax_highlighting.rs
---
-[
-    HighlightedRange {
-        range: [13; 15),
-        tag: "keyword"
-    },
-    HighlightedRange {
-        range: [16; 20),
-        tag: "function"
-    },
-    HighlightedRange {
-        range: [41; 45),
-        tag: "macro"
-    },
-    HighlightedRange {
-        range: [48; 51),
-        tag: "keyword"
-    },
-    HighlightedRange {
-        range: [56; 58),
-        tag: "literal"
-    },
-    HighlightedRange {
-        range: [48; 51),
-        tag: "keyword"
-    },
-    HighlightedRange {
-        range: [52; 53),
-        tag: "function"
-    },
-    HighlightedRange {
-        range: [56; 58),
-        tag: "literal"
-    },
-    HighlightedRange {
-        range: [60; 61),
-        tag: "text"
-    }
-]
diff --git a/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap b/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap
deleted file mode 100644
index 431de5c55..000000000
--- a/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap
+++ /dev/null
@@ -1,38 +0,0 @@
---
-created: "2019-05-23T22:23:35.215905447Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/references.rs
-expression: "&source_change"
---
-Some(
-    SourceChange {
-        label: "rename",
-        source_file_edits: [
-            SourceFileEdit {
-                file_id: FileId(
-                    2,
-                ),
-                edit: TextEdit {
-                    atoms: [
-                        AtomTextEdit {
-                            delete: [4; 7),
-                            insert: "foo2",
-                        },
-                    ],
-                },
-            },
-        ],
-        file_system_edits: [
-            MoveFile {
-                src: FileId(
-                    3,
-                ),
-                dst_source_root: SourceRootId(
-                    0,
-                ),
-                dst_path: "bar/foo2.rs",
-            },
-        ],
-        cursor_position: None,
-    },
-)
diff --git a/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap b/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap
deleted file mode 100644
index aaff9b4b5..000000000
--- a/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap
+++ /dev/null
@@ -1,38 +0,0 @@
---
-created: "2019-05-23T22:23:35.213830371Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/references.rs
-expression: "&source_change"
---
-Some(
-    SourceChange {
-        label: "rename",
-        source_file_edits: [
-            SourceFileEdit {
-                file_id: FileId(
-                    1,
-                ),
-                edit: TextEdit {
-                    atoms: [
-                        AtomTextEdit {
-                            delete: [4; 7),
-                            insert: "foo2",
-                        },
-                    ],
-                },
-            },
-        ],
-        file_system_edits: [
-            MoveFile {
-                src: FileId(
-                    2,
-                ),
-                dst_source_root: SourceRootId(
-                    0,
-                ),
-                dst_path: "foo2/mod.rs",
-            },
-        ],
-        cursor_position: None,
-    },
-)
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables.snap b/crates/ra_ide_api/src/snapshots/tests__runnables.snap
deleted file mode 100644
index de2fadd7f..000000000
--- a/crates/ra_ide_api/src/snapshots/tests__runnables.snap
+++ /dev/null
@@ -1,24 +0,0 @@
---
-created: "2019-05-23T22:23:35.217100106Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/runnables.rs
-expression: "&runnables"
---
-[
-    Runnable {
-        range: [1; 21),
-        kind: Bin,
-    },
-    Runnable {
-        range: [22; 46),
-        kind: Test {
-            name: "test_foo",
-        },
-    },
-    Runnable {
-        range: [47; 81),
-        kind: Test {
-            name: "test_foo",
-        },
-    },
-]
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap
deleted file mode 100644
index 23993a97f..000000000
--- a/crates/ra_ide_api/src/snapshots/tests__runnables_module.snap
+++ /dev/null
@@ -1,20 +0,0 @@
---
-created: "2019-05-23T22:23:35.219258850Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/runnables.rs
-expression: "&runnables"
---
-[
-    Runnable {
-        range: [1; 59),
-        kind: TestMod {
-            path: "test_mod",
-        },
-    },
-    Runnable {
-        range: [28; 57),
-        kind: Test {
-            name: "test_foo1",
-        },
-    },
-]
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap
deleted file mode 100644
index c516a61df..000000000
--- a/crates/ra_ide_api/src/snapshots/tests__runnables_multiple_depth_module.snap
+++ /dev/null
@@ -1,20 +0,0 @@
---
-created: "2019-05-23T22:23:35.219671663Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/runnables.rs
-expression: "&runnables"
---
-[
-    Runnable {
-        range: [41; 115),
-        kind: TestMod {
-            path: "foo::bar::test_mod",
-        },
-    },
-    Runnable {
-        range: [68; 105),
-        kind: Test {
-            name: "test_foo1",
-        },
-    },
-]
diff --git a/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap b/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap
deleted file mode 100644
index b02e6707e..000000000
--- a/crates/ra_ide_api/src/snapshots/tests__runnables_one_depth_layer_module.snap
+++ /dev/null
@@ -1,20 +0,0 @@
---
-created: "2019-05-23T22:23:35.224315047Z"
-creator: [email protected]
-source: crates/ra_ide_api/src/runnables.rs
-expression: "&runnables"
---
-[
-    Runnable {
-        range: [23; 85),
-        kind: TestMod {
-            path: "foo::test_mod",
-        },
-    },
-    Runnable {
-        range: [46; 79),
-        kind: Test {
-            name: "test_foo1",
-        },
-    },
-]
diff --git a/crates/ra_ide_api/src/syntax_tree.rs b/crates/ra_ide_api/src/syntax_tree.rs
index a07e670fa..dd31b9093 100644
--- a/crates/ra_ide_api/src/syntax_tree.rs
+++ b/crates/ra_ide_api/src/syntax_tree.rs
@@ -101,7 +101,7 @@ mod tests {
    fn test_syntax_tree_without_range() {
        // Basic syntax
        let (analysis, file_id) = single_file(r#"fn foo() {}"#);
-        let syn = analysis.syntax_tree(file_id, None);
+        let syn = analysis.syntax_tree(file_id, None).unwrap();
        assert_eq_text!(
            syn.trim(),
@@ -133,7 +133,7 @@ fn test() {
 }"#
            .trim(),
        );
-        let syn = analysis.syntax_tree(file_id, None);
+        let syn = analysis.syntax_tree(file_id, None).unwrap();
        assert_eq_text!(
            syn.trim(),
@@ -176,7 +176,7 @@ SOURCE_FILE@[0; 60)
    #[test]
    fn test_syntax_tree_with_range() {
        let (analysis, range) = single_file_with_range(r#"<|>fn foo() {}<|>"#.trim());
-        let syn = analysis.syntax_tree(range.file_id, Some(range.range));
+        let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
        assert_eq_text!(
            syn.trim(),
@@ -206,7 +206,7 @@ FN_DEF@[0; 11)
 }"#
            .trim(),
        );
-        let syn = analysis.syntax_tree(range.file_id, Some(range.range));
+        let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
        assert_eq_text!(
            syn.trim(),
@@ -244,7 +244,7 @@ fn bar() {
 }"#
            .trim(),
        );
-        let syn = analysis.syntax_tree(range.file_id, Some(range.range));
+        let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
        assert_eq_text!(
            syn.trim(),
            r#"
@@ -278,7 +278,7 @@ fn bar() {
 }"###
                .trim(),
        );
-        let syn = analysis.syntax_tree(range.file_id, Some(range.range));
+        let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
        assert_eq_text!(
            syn.trim(),
            r#"
@@ -311,7 +311,7 @@ fn bar() {
 }"###
                .trim(),
        );
-        let syn = analysis.syntax_tree(range.file_id, Some(range.range));
+        let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
        assert_eq_text!(
            syn.trim(),
            r#"
diff --git a/crates/ra_ide_api/src/typing.rs b/crates/ra_ide_api/src/typing.rs
index 6b3fd5904..2d4491442 100644
--- a/crates/ra_ide_api/src/typing.rs
+++ b/crates/ra_ide_api/src/typing.rs
@@ -195,7 +195,7 @@ fn foo() {
        edit.insert(offset, ".".to_string());
        let before = edit.finish().apply(&before);
        let (analysis, file_id) = single_file(&before);
-        if let Some(result) = analysis.on_dot_typed(FilePosition { offset, file_id }) {
+        if let Some(result) = analysis.on_dot_typed(FilePosition { offset, file_id }).unwrap() {
            assert_eq!(result.source_file_edits.len(), 1);
            let actual = result.source_file_edits[0].edit.apply(&before);
            assert_eq_text!(after, &actual);
@@ -377,7 +377,7 @@ fn foo() {
        fn apply_on_enter(before: &str) -> Option<String> {
            let (offset, before) = extract_offset(before);
            let (analysis, file_id) = single_file(&before);
-            let result = analysis.on_enter(FilePosition { offset, file_id })?;
+            let result = analysis.on_enter(FilePosition { offset, file_id }).unwrap()?;
            assert_eq!(result.source_file_edits.len(), 1);
            let actual = result.source_file_edits[0].edit.apply(&before);
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index 82c7e757f..6b3be444f 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -272,7 +272,7 @@ impl<'a> TryConvWith for &'a TextDocumentPositionParams {
    type Output = FilePosition;
    fn try_conv_with(self, world: &WorldSnapshot) -> Result<FilePosition> {
        let file_id = self.text_document.try_conv_with(world)?;
-        let line_index = world.analysis().file_line_index(file_id);
+        let line_index = world.analysis().file_line_index(file_id)?;
        let offset = self.position.conv_with(&line_index);
        Ok(FilePosition { file_id, offset })
    }
@@ -283,7 +283,7 @@ impl<'a> TryConvWith for (&'a TextDocumentIdentifier, Range) {
    type Output = FileRange;
    fn try_conv_with(self, world: &WorldSnapshot) -> Result<FileRange> {
        let file_id = self.0.try_conv_with(world)?;
-        let line_index = world.analysis().file_line_index(file_id);
+        let line_index = world.analysis().file_line_index(file_id)?;
        let range = self.1.conv_with(&line_index);
        Ok(FileRange { file_id, range })
    }
@@ -308,7 +308,7 @@ impl TryConvWith for SourceChange {
        let cursor_position = match self.cursor_position {
            None => None,
            Some(pos) => {
-                let line_index = world.analysis().file_line_index(pos.file_id);
+                let line_index = world.analysis().file_line_index(pos.file_id)?;
                let edit = self
                    .source_file_edits
                    .iter()
@@ -349,7 +349,7 @@ impl TryConvWith for SourceFileEdit {
            uri: self.file_id.try_conv_with(world)?,
            version: None,
        };
-        let line_index = world.analysis().file_line_index(self.file_id);
+        let line_index = world.analysis().file_line_index(self.file_id)?;
        let edits = self.edit.as_atoms().iter().map_conv_with(&line_index).collect();
        Ok(TextDocumentEdit { text_document, edits })
    }
@@ -378,7 +378,7 @@ impl TryConvWith for &NavigationTarget {
    type Ctx = WorldSnapshot;
    type Output = Location;
    fn try_conv_with(self, world: &WorldSnapshot) -> Result<Location> {
-        let line_index = world.analysis().file_line_index(self.file_id());
+        let line_index = world.analysis().file_line_index(self.file_id())?;
        let range = self.range();
        to_location(self.file_id(), range, &world, &line_index)
    }
@@ -391,8 +391,8 @@ impl TryConvWith for (FileId, RangeInfo<NavigationTarget>) {
        let (src_file_id, target) = self;
        let target_uri = target.info.file_id().try_conv_with(world)?;
-        let src_line_index = world.analysis().file_line_index(src_file_id);
+        let src_line_index = world.analysis().file_line_index(src_file_id)?;
-        let tgt_line_index = world.analysis().file_line_index(target.info.file_id());
+        let tgt_line_index = world.analysis().file_line_index(target.info.file_id())?;
        let target_range = target.info.full_range().conv_with(&tgt_line_index);
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 5bf950a53..9006aa316 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -39,9 +39,9 @@ pub fn handle_analyzer_status(world: WorldSnapshot, _: ()) -> Result<String> {
 pub fn handle_syntax_tree(world: WorldSnapshot, params: req::SyntaxTreeParams) -> Result<String> {
    let id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(id);
+    let line_index = world.analysis().file_line_index(id)?;
    let text_range = params.range.map(|p| p.conv_with(&line_index));
-    let res = world.analysis().syntax_tree(id, text_range);
+    let res = world.analysis().syntax_tree(id, text_range)?;
    Ok(res)
 }
@@ -55,7 +55,7 @@ pub fn handle_extend_selection(
         use the new selection range API in LSP",
    );
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let selections = params
        .selections
        .into_iter()
@@ -72,7 +72,7 @@ pub fn handle_selection_range(
 ) -> Result<Vec<req::SelectionRange>> {
    let _p = profile("handle_selection_range");
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    params
        .positions
        .into_iter()
@@ -113,13 +113,19 @@ pub fn handle_find_matching_brace(
 ) -> Result<Vec<Position>> {
    let _p = profile("handle_find_matching_brace");
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let res = params
        .offsets
        .into_iter()
        .map_conv_with(&line_index)
        .map(|offset| {
-            world.analysis().matching_brace(FilePosition { file_id, offset }).unwrap_or(offset)
+            if let Ok(Some(matching_brace_offset)) =
+                world.analysis().matching_brace(FilePosition { file_id, offset })
+            {
+                matching_brace_offset
+            } else {
+                offset
+            }
        })
        .map_conv_with(&line_index)
        .collect();
@@ -132,7 +138,7 @@ pub fn handle_join_lines(
 ) -> Result<req::SourceChange> {
    let _p = profile("handle_join_lines");
    let frange = (&params.text_document, params.range).try_conv_with(&world)?;
-    world.analysis().join_lines(frange).try_conv_with(&world)
+    world.analysis().join_lines(frange)?.try_conv_with(&world)
 }
 pub fn handle_on_enter(
@@ -141,7 +147,7 @@ pub fn handle_on_enter(
 ) -> Result<Option<req::SourceChange>> {
    let _p = profile("handle_on_enter");
    let position = params.try_conv_with(&world)?;
-    match world.analysis().on_enter(position) {
+    match world.analysis().on_enter(position)? {
        None => Ok(None),
        Some(edit) => Ok(Some(edit.try_conv_with(&world)?)),
    }
@@ -153,7 +159,7 @@ pub fn handle_on_type_formatting(
 ) -> Result<Option<Vec<TextEdit>>> {
    let _p = profile("handle_on_type_formatting");
    let mut position = params.text_document_position.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(position.file_id);
+    let line_index = world.analysis().file_line_index(position.file_id)?;
    // in `ra_ide_api`, the `on_type` invariant is that
    // `text.char_at(position) == typed_char`.
@@ -163,7 +169,7 @@ pub fn handle_on_type_formatting(
        "=" => world.analysis().on_eq_typed(position),
        "." => world.analysis().on_dot_typed(position),
        _ => return Ok(None),
-    };
+    }?;
    let mut edit = match edit {
        Some(it) => it,
        None => return Ok(None),
@@ -181,11 +187,11 @@ pub fn handle_document_symbol(
    params: req::DocumentSymbolParams,
 ) -> Result<Option<req::DocumentSymbolResponse>> {
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let mut parents: Vec<(DocumentSymbol, Option<usize>)> = Vec::new();
-    for symbol in world.analysis().file_structure(file_id) {
+    for symbol in world.analysis().file_structure(file_id)? {
        let doc_symbol = DocumentSymbol {
            name: symbol.label,
            detail: symbol.detail,
@@ -309,7 +315,7 @@ pub fn handle_runnables(
    params: req::RunnablesParams,
 ) -> Result<Vec<req::Runnable>> {
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let offset = params.position.map(|it| it.conv_with(&line_index));
    let mut res = Vec::new();
    let workspace_root = world.workspace_root_for(file_id);
@@ -383,7 +389,7 @@ pub fn handle_completion(
        let mut res = false;
        if let Some(ctx) = params.context {
            if ctx.trigger_character.unwrap_or_default() == ":" {
-                let source_file = world.analysis().parse(position.file_id);
+                let source_file = world.analysis().parse(position.file_id)?;
                let syntax = source_file.syntax();
                let text = syntax.text();
                if let Some(next_char) = text.char_at(position.offset) {
@@ -405,7 +411,7 @@ pub fn handle_completion(
        None => return Ok(None),
        Some(items) => items,
    };
-    let line_index = world.analysis().file_line_index(position.file_id);
+    let line_index = world.analysis().file_line_index(position.file_id)?;
    let items: Vec<CompletionItem> =
        items.into_iter().map(|item| item.conv_with(&line_index)).collect();
@@ -417,12 +423,12 @@ pub fn handle_folding_range(
    params: FoldingRangeParams,
 ) -> Result<Option<Vec<FoldingRange>>> {
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let res = Some(
        world
            .analysis()
-            .folding_ranges(file_id)
+            .folding_ranges(file_id)?
            .into_iter()
            .map(|fold| {
                let kind = match fold.kind {
@@ -474,7 +480,7 @@ pub fn handle_hover(
        None => return Ok(None),
        Some(info) => info,
    };
-    let line_index = world.analysis.file_line_index(position.file_id);
+    let line_index = world.analysis.file_line_index(position.file_id)?;
    let range = info.range.conv_with(&line_index);
    let res = Hover {
        contents: HoverContents::Markup(MarkupContent {
@@ -503,7 +509,7 @@ pub fn handle_prepare_rename(
    // Refs should always have a declaration
    let r = refs.declaration();
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let loc = to_location(r.file_id(), r.range(), &world, &line_index)?;
    Ok(Some(PrepareRenameResponse::Range(loc.range)))
@@ -536,7 +542,7 @@ pub fn handle_references(
    params: req::ReferenceParams,
 ) -> Result<Option<Vec<Location>>> {
    let position = params.text_document_position.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(position.file_id);
+    let line_index = world.analysis().file_line_index(position.file_id)?;
    let refs = match world.analysis().find_all_refs(position)? {
        None => return Ok(None),
@@ -563,9 +569,9 @@ pub fn handle_formatting(
    params: DocumentFormattingParams,
 ) -> Result<Option<Vec<TextEdit>>> {
    let file_id = params.text_document.try_conv_with(&world)?;
-    let file = world.analysis().file_text(file_id);
+    let file = world.analysis().file_text(file_id)?;
-    let file_line_index = world.analysis().file_line_index(file_id);
+    let file_line_index = world.analysis().file_line_index(file_id)?;
    let end_position = TextUnit::of_str(&file).conv_with(&file_line_index);
    use std::process;
@@ -623,7 +629,7 @@ pub fn handle_code_action(
 ) -> Result<Option<CodeActionResponse>> {
    let _p = profile("handle_code_action");
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let range = params.range.conv_with(&line_index);
    let assists = world.analysis().assists(FileRange { file_id, range })?.into_iter();
@@ -685,7 +691,7 @@ pub fn handle_code_lens(
    params: req::CodeLensParams,
 ) -> Result<Option<Vec<CodeLens>>> {
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let mut lenses: Vec<CodeLens> = Default::default();
    let workspace_root = world.workspace_root_for(file_id);
@@ -730,7 +736,7 @@ pub fn handle_code_lens(
    lenses.extend(
        world
            .analysis()
-            .file_structure(file_id)
+            .file_structure(file_id)?
            .into_iter()
            .filter(|it| match it.kind {
                SyntaxKind::TRAIT_DEF | SyntaxKind::STRUCT_DEF | SyntaxKind::ENUM_DEF => true,
@@ -807,7 +813,7 @@ pub fn handle_document_highlight(
    params: req::TextDocumentPositionParams,
 ) -> Result<Option<Vec<DocumentHighlight>>> {
    let file_id = params.text_document.try_conv_with(&world)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let refs = match world.analysis().find_all_refs(params.try_conv_with(&world)?)? {
        None => return Ok(None),
@@ -826,7 +832,7 @@ pub fn publish_diagnostics(
    file_id: FileId,
 ) -> Result<req::PublishDiagnosticsParams> {
    let uri = world.file_id_to_uri(file_id)?;
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let diagnostics = world
        .analysis()
        .diagnostics(file_id)?
@@ -852,7 +858,7 @@ pub fn publish_decorations(
 }
 fn highlight(world: &WorldSnapshot, file_id: FileId) -> Result<Vec<Decoration>> {
-    let line_index = world.analysis().file_line_index(file_id);
+    let line_index = world.analysis().file_line_index(file_id)?;
    let res = world
        .analysis()
        .highlight(file_id)?
@@ -881,7 +887,7 @@ pub fn handle_inlay_hints(
 ) -> Result<Vec<InlayHint>> {
    let file_id = params.text_document.try_conv_with(&world)?;
    let analysis = world.analysis();
-    let line_index = analysis.file_line_index(file_id);
+    let line_index = analysis.file_line_index(file_id)?;
    Ok(analysis
        .inlay_hints(file_id)?
        .into_iter()
@@ -891,6 +897,12 @@ pub fn handle_inlay_hints(
            kind: match api_type.kind {
                ra_ide_api::InlayKind::LetBindingType => InlayKind::LetBindingType,
                ra_ide_api::InlayKind::ClosureParameterType => InlayKind::ClosureParameterType,
+                ra_ide_api::InlayKind::ForExpressionBindingType => {
+                    InlayKind::ForExpressionBindingType
+                }
+                ra_ide_api::InlayKind::IfExpressionType => InlayKind::IfExpressionType,
+                ra_ide_api::InlayKind::WhileLetExpressionType => InlayKind::WhileLetExpressionType,
+                ra_ide_api::InlayKind::MatchArmType => InlayKind::MatchArmType,
            },
        })
        .collect())
diff --git a/crates/ra_lsp_server/src/req.rs b/crates/ra_lsp_server/src/req.rs
index 916185f99..570438643 100644
--- a/crates/ra_lsp_server/src/req.rs
+++ b/crates/ra_lsp_server/src/req.rs
@@ -215,6 +215,10 @@ pub struct InlayHintsParams {
 pub enum InlayKind {
    LetBindingType,
    ClosureParameterType,
+    ForExpressionBindingType,
+    IfExpressionType,
+    WhileLetExpressionType,
+    MatchArmType,
 }
 #[derive(Debug, Deserialize, Serialize)]
diff --git a/crates/ra_lsp_server/src/world.rs b/crates/ra_lsp_server/src/world.rs
index 9fd654305..1d7755910 100644
--- a/crates/ra_lsp_server/src/world.rs
+++ b/crates/ra_lsp_server/src/world.rs
@@ -215,7 +215,12 @@ impl WorldSnapshot {
            }
        }
        res.push_str("\nanalysis:\n");
-        res.push_str(&self.analysis.status());
+        res.push_str(
+            &self
+                .analysis
+                .status()
+                .unwrap_or_else(|_| "Analysis retrieval was cancelled".to_owned()),
+        );
        res
    }
diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 6bda04141..d98953a7e 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -43,6 +43,7 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet =
        L_BRACK,
        PIPE,
        MOVE_KW,
+        BOX_KW,
        IF_KW,
        WHILE_KW,
        MATCH_KW,
@@ -529,6 +530,8 @@ fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
 // test box_expr
 // fn foo() {
 //     let x = box 1i32;
+//     let y = (box 1i32, box 2i32);
+//     let z = Foo(box 1i32, box 2i32);
 // }
 fn box_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
    assert!(p.at(T![box]));
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 9ef8dee5d..40d63ef7a 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -10,8 +10,8 @@ repository = "https://github.com/rust-analyzer/rust-analyzer"
 [dependencies]
 unicode-xid = "0.1.0"
 itertools = "0.8.0"
-rowan = "0.6.0-pre.1"
+rowan = "0.6.0"
-ra_rustc_lexer = { version = "0.1.0-pre.1", features = [ "unicode-xid" ] }
+ra_rustc_lexer = { version = "0.1.0-pre.2" }
 # ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here
 # to reduce number of compilations
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 7f69b86e1..4c4e0580a 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -24,6 +24,8 @@ mod syntax_error;
 mod parsing;
 mod validation;
 mod ptr;
+#[cfg(test)]
+mod tests;
 pub mod algo;
 pub mod ast;
diff --git a/crates/ra_syntax/tests/test.rs b/crates/ra_syntax/src/tests.rs
index cabd3e9bd..fa5d2d5d8 100644
--- a/crates/ra_syntax/tests/test.rs
+++ b/crates/ra_syntax/src/tests.rs
@@ -1,19 +1,16 @@
-extern crate ra_syntax;
-extern crate test_utils;
-extern crate walkdir;
 use std::{
    fmt::Write,
    path::{Component, PathBuf},
 };
-use ra_syntax::{fuzz, SourceFile};
 use test_utils::{collect_tests, dir_tests, project_dir, read_text};
+use crate::{fuzz, SourceFile};
 #[test]
 fn lexer_tests() {
    dir_tests(&test_data_dir(), &["lexer"], |text, _| {
-        let tokens = ra_syntax::tokenize(text);
+        let tokens = crate::tokenize(text);
        dump_tokens(&tokens, text)
    })
 }
@@ -25,7 +22,7 @@ fn parser_tests() {
        let errors = parse.errors();
        assert_eq!(
            errors,
-            &[] as &[ra_syntax::SyntaxError],
+            &[] as &[crate::SyntaxError],
            "There should be no errors in the file {:?}",
            path.display(),
        );
@@ -67,7 +64,7 @@ fn self_hosting_parsing() {
        .filter_entry(|entry| {
            !entry.path().components().any(|component| {
                // Get all files which are not in the crates/ra_syntax/tests/data folder
-                component == Component::Normal(OsStr::new("data"))
+                component == Component::Normal(OsStr::new("test_data"))
            })
        })
        .map(|e| e.unwrap())
@@ -87,10 +84,10 @@ fn self_hosting_parsing() {
 }
 fn test_data_dir() -> PathBuf {
-    project_dir().join("crates/ra_syntax/tests/data")
+    project_dir().join("crates/ra_syntax/test_data")
 }
-fn dump_tokens(tokens: &[ra_syntax::Token], text: &str) -> String {
+fn dump_tokens(tokens: &[crate::Token], text: &str) -> String {
    let mut acc = String::new();
    let mut offset = 0;
    for token in tokens {
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index e03c02d1b..1f904434e 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -1,16 +1,99 @@
-mod unescape;
 mod block;
 mod field_expr;
+use ra_rustc_lexer::unescape;
 use crate::{
    algo::visit::{visitor_ctx, VisitorCtx},
-    ast, SyntaxError,
+    ast, SyntaxError, SyntaxErrorKind,
    SyntaxKind::{BYTE, BYTE_STRING, CHAR, STRING},
    SyntaxNode, TextUnit, T,
 };
-pub(crate) use unescape::EscapeError;
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum EscapeError {
+    ZeroChars,
+    MoreThanOneChar,
+    LoneSlash,
+    InvalidEscape,
+    BareCarriageReturn,
+    EscapeOnlyChar,
+    TooShortHexEscape,
+    InvalidCharInHexEscape,
+    OutOfRangeHexEscape,
+    NoBraceInUnicodeEscape,
+    InvalidCharInUnicodeEscape,
+    EmptyUnicodeEscape,
+    UnclosedUnicodeEscape,
+    LeadingUnderscoreUnicodeEscape,
+    OverlongUnicodeEscape,
+    LoneSurrogateUnicodeEscape,
+    OutOfRangeUnicodeEscape,
+    UnicodeEscapeInByte,
+    NonAsciiCharInByte,
+}
+impl From<ra_rustc_lexer::unescape::EscapeError> for EscapeError {
+    fn from(err: ra_rustc_lexer::unescape::EscapeError) -> Self {
+        match err {
+            ra_rustc_lexer::unescape::EscapeError::ZeroChars => EscapeError::ZeroChars,
+            ra_rustc_lexer::unescape::EscapeError::MoreThanOneChar => EscapeError::MoreThanOneChar,
+            ra_rustc_lexer::unescape::EscapeError::LoneSlash => EscapeError::LoneSlash,
+            ra_rustc_lexer::unescape::EscapeError::InvalidEscape => EscapeError::InvalidEscape,
+            ra_rustc_lexer::unescape::EscapeError::BareCarriageReturn
+            | ra_rustc_lexer::unescape::EscapeError::BareCarriageReturnInRawString => {
+                EscapeError::BareCarriageReturn
+            }
+            ra_rustc_lexer::unescape::EscapeError::EscapeOnlyChar => EscapeError::EscapeOnlyChar,
+            ra_rustc_lexer::unescape::EscapeError::TooShortHexEscape => {
+                EscapeError::TooShortHexEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::InvalidCharInHexEscape => {
+                EscapeError::InvalidCharInHexEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::OutOfRangeHexEscape => {
+                EscapeError::OutOfRangeHexEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::NoBraceInUnicodeEscape => {
+                EscapeError::NoBraceInUnicodeEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::InvalidCharInUnicodeEscape => {
+                EscapeError::InvalidCharInUnicodeEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::EmptyUnicodeEscape => {
+                EscapeError::EmptyUnicodeEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::UnclosedUnicodeEscape => {
+                EscapeError::UnclosedUnicodeEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::LeadingUnderscoreUnicodeEscape => {
+                EscapeError::LeadingUnderscoreUnicodeEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::OverlongUnicodeEscape => {
+                EscapeError::OverlongUnicodeEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::LoneSurrogateUnicodeEscape => {
+                EscapeError::LoneSurrogateUnicodeEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::OutOfRangeUnicodeEscape => {
+                EscapeError::OutOfRangeUnicodeEscape
+            }
+            ra_rustc_lexer::unescape::EscapeError::UnicodeEscapeInByte => {
+                EscapeError::UnicodeEscapeInByte
+            }
+            ra_rustc_lexer::unescape::EscapeError::NonAsciiCharInByte
+            | ra_rustc_lexer::unescape::EscapeError::NonAsciiCharInByteString => {
+                EscapeError::NonAsciiCharInByte
+            }
+        }
+    }
+}
+impl From<ra_rustc_lexer::unescape::EscapeError> for SyntaxErrorKind {
+    fn from(err: ra_rustc_lexer::unescape::EscapeError) -> Self {
+        SyntaxErrorKind::EscapeError(err.into())
+    }
+}
 pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
    let mut errors = Vec::new();
diff --git a/crates/ra_syntax/src/validation/unescape.rs b/crates/ra_syntax/src/validation/unescape.rs
deleted file mode 100644
index 7eed6c663..000000000
--- a/crates/ra_syntax/src/validation/unescape.rs
+++ /dev/null
@@ -1,521 +0,0 @@
-//! Utilities for validating  string and char literals and turning them into
-//! values they represent.
-//!
-//! This file is copy-pasted from the compiler
-//!
-//! https://github.com/rust-lang/rust/blob/c6ac57564852cb6e2d0db60f7b46d9eb98d4b449/src/libsyntax/parse/unescape.rs
-//!
-//! Hopefully, we'll share this code in a proper way some day
-use std::ops::Range;
-use std::str::Chars;
-#[derive(Debug, PartialEq, Eq, Clone, Hash)]
-pub enum EscapeError {
-    ZeroChars,
-    MoreThanOneChar,
-    LoneSlash,
-    InvalidEscape,
-    BareCarriageReturn,
-    EscapeOnlyChar,
-    TooShortHexEscape,
-    InvalidCharInHexEscape,
-    OutOfRangeHexEscape,
-    NoBraceInUnicodeEscape,
-    InvalidCharInUnicodeEscape,
-    EmptyUnicodeEscape,
-    UnclosedUnicodeEscape,
-    LeadingUnderscoreUnicodeEscape,
-    OverlongUnicodeEscape,
-    LoneSurrogateUnicodeEscape,
-    OutOfRangeUnicodeEscape,
-    UnicodeEscapeInByte,
-    NonAsciiCharInByte,
-}
-/// Takes a contents of a char literal (without quotes), and returns an
-/// unescaped char or an error
-pub(crate) fn unescape_char(literal_text: &str) -> Result<char, (usize, EscapeError)> {
-    let mut chars = literal_text.chars();
-    unescape_char_or_byte(&mut chars, Mode::Char)
-        .map_err(|err| (literal_text.len() - chars.as_str().len(), err))
-}
-/// Takes a contents of a string literal (without quotes) and produces a
-/// sequence of escaped characters or errors.
-pub(crate) fn unescape_str<F>(literal_text: &str, callback: &mut F)
-where
-    F: FnMut(Range<usize>, Result<char, EscapeError>),
-{
-    unescape_str_or_byte_str(literal_text, Mode::Str, callback)
-}
-pub(crate) fn unescape_byte(literal_text: &str) -> Result<u8, (usize, EscapeError)> {
-    let mut chars = literal_text.chars();
-    unescape_char_or_byte(&mut chars, Mode::Byte)
-        .map(byte_from_char)
-        .map_err(|err| (literal_text.len() - chars.as_str().len(), err))
-}
-/// Takes a contents of a string literal (without quotes) and produces a
-/// sequence of escaped characters or errors.
-pub(crate) fn unescape_byte_str<F>(literal_text: &str, callback: &mut F)
-where
-    F: FnMut(Range<usize>, Result<u8, EscapeError>),
-{
-    unescape_str_or_byte_str(literal_text, Mode::ByteStr, &mut |range, char| {
-        callback(range, char.map(byte_from_char))
-    })
-}
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum Mode {
-    Char,
-    Str,
-    Byte,
-    ByteStr,
-}
-impl Mode {
-    fn in_single_quotes(self) -> bool {
-        match self {
-            Mode::Char | Mode::Byte => true,
-            Mode::Str | Mode::ByteStr => false,
-        }
-    }
-    pub(crate) fn in_double_quotes(self) -> bool {
-        !self.in_single_quotes()
-    }
-    pub(crate) fn is_bytes(self) -> bool {
-        match self {
-            Mode::Byte | Mode::ByteStr => true,
-            Mode::Char | Mode::Str => false,
-        }
-    }
-}
-fn scan_escape(first_char: char, chars: &mut Chars<'_>, mode: Mode) -> Result<char, EscapeError> {
-    if first_char != '\\' {
-        return match first_char {
-            '\t' | '\n' => Err(EscapeError::EscapeOnlyChar),
-            '\r' => Err(if chars.clone().next() == Some('\n') {
-                EscapeError::EscapeOnlyChar
-            } else {
-                EscapeError::BareCarriageReturn
-            }),
-            '\'' if mode.in_single_quotes() => Err(EscapeError::EscapeOnlyChar),
-            '"' if mode.in_double_quotes() => Err(EscapeError::EscapeOnlyChar),
-            _ => {
-                if mode.is_bytes() && !first_char.is_ascii() {
-                    return Err(EscapeError::NonAsciiCharInByte);
-                }
-                Ok(first_char)
-            }
-        };
-    }
-    let second_char = chars.next().ok_or(EscapeError::LoneSlash)?;
-    let res = match second_char {
-        '"' => '"',
-        'n' => '\n',
-        'r' => '\r',
-        't' => '\t',
-        '\\' => '\\',
-        '\'' => '\'',
-        '0' => '\0',
-        'x' => {
-            let hi = chars.next().ok_or(EscapeError::TooShortHexEscape)?;
-            let hi = hi.to_digit(16).ok_or(EscapeError::InvalidCharInHexEscape)?;
-            let lo = chars.next().ok_or(EscapeError::TooShortHexEscape)?;
-            let lo = lo.to_digit(16).ok_or(EscapeError::InvalidCharInHexEscape)?;
-            let value = hi * 16 + lo;
-            if !mode.is_bytes() && !is_ascii(value) {
-                return Err(EscapeError::OutOfRangeHexEscape);
-            }
-            let value = value as u8;
-            value as char
-        }
-        'u' => {
-            if chars.next() != Some('{') {
-                return Err(EscapeError::NoBraceInUnicodeEscape);
-            }
-            let mut n_digits = 1;
-            let mut value: u32 = match chars.next().ok_or(EscapeError::UnclosedUnicodeEscape)? {
-                '_' => return Err(EscapeError::LeadingUnderscoreUnicodeEscape),
-                '}' => return Err(EscapeError::EmptyUnicodeEscape),
-                c => c.to_digit(16).ok_or(EscapeError::InvalidCharInUnicodeEscape)?,
-            };
-            loop {
-                match chars.next() {
-                    None => return Err(EscapeError::UnclosedUnicodeEscape),
-                    Some('_') => continue,
-                    Some('}') => {
-                        if n_digits > 6 {
-                            return Err(EscapeError::OverlongUnicodeEscape);
-                        }
-                        if mode.is_bytes() {
-                            return Err(EscapeError::UnicodeEscapeInByte);
-                        }
-                        break std::char::from_u32(value).ok_or_else(|| {
-                            if value > 0x0010_FFFF {
-                                EscapeError::OutOfRangeUnicodeEscape
-                            } else {
-                                EscapeError::LoneSurrogateUnicodeEscape
-                            }
-                        })?;
-                    }
-                    Some(c) => {
-                        let digit =
-                            c.to_digit(16).ok_or(EscapeError::InvalidCharInUnicodeEscape)?;
-                        n_digits += 1;
-                        if n_digits > 6 {
-                            continue;
-                        }
-                        let digit = digit as u32;
-                        value = value * 16 + digit;
-                    }
-                };
-            }
-        }
-        _ => return Err(EscapeError::InvalidEscape),
-    };
-    Ok(res)
-}
-fn unescape_char_or_byte(chars: &mut Chars<'_>, mode: Mode) -> Result<char, EscapeError> {
-    let first_char = chars.next().ok_or(EscapeError::ZeroChars)?;
-    let res = scan_escape(first_char, chars, mode)?;
-    if chars.next().is_some() {
-        return Err(EscapeError::MoreThanOneChar);
-    }
-    Ok(res)
-}
-/// Takes a contents of a string literal (without quotes) and produces a
-/// sequence of escaped characters or errors.
-fn unescape_str_or_byte_str<F>(src: &str, mode: Mode, callback: &mut F)
-where
-    F: FnMut(Range<usize>, Result<char, EscapeError>),
-{
-    assert!(mode.in_double_quotes());
-    let initial_len = src.len();
-    let mut chars = src.chars();
-    while let Some(first_char) = chars.next() {
-        let start = initial_len - chars.as_str().len() - first_char.len_utf8();
-        let unescaped_char = match first_char {
-            '\\' => {
-                let (second_char, third_char) = {
-                    let mut chars = chars.clone();
-                    (chars.next(), chars.next())
-                };
-                match (second_char, third_char) {
-                    (Some('\n'), _) | (Some('\r'), Some('\n')) => {
-                        skip_ascii_whitespace(&mut chars);
-                        continue;
-                    }
-                    _ => scan_escape(first_char, &mut chars, mode),
-                }
-            }
-            '\r' => {
-                let second_char = chars.clone().next();
-                if second_char == Some('\n') {
-                    chars.next();
-                    Ok('\n')
-                } else {
-                    scan_escape(first_char, &mut chars, mode)
-                }
-            }
-            '\n' => Ok('\n'),
-            '\t' => Ok('\t'),
-            _ => scan_escape(first_char, &mut chars, mode),
-        };
-        let end = initial_len - chars.as_str().len();
-        callback(start..end, unescaped_char);
-    }
-    fn skip_ascii_whitespace(chars: &mut Chars<'_>) {
-        let str = chars.as_str();
-        let first_non_space = str
-            .bytes()
-            .position(|b| b != b' ' && b != b'\t' && b != b'\n' && b != b'\r')
-            .unwrap_or_else(|| str.len());
-        *chars = str[first_non_space..].chars()
-    }
-}
-fn byte_from_char(c: char) -> u8 {
-    let res = c as u32;
-    assert!(res <= u32::from(u8::max_value()), "guaranteed because of Mode::Byte");
-    res as u8
-}
-fn is_ascii(x: u32) -> bool {
-    x <= 0x7F
-}
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn test_unescape_char_bad() {
-        fn check(literal_text: &str, expected_error: EscapeError) {
-            let actual_result = unescape_char(literal_text).map_err(|(_offset, err)| err);
-            assert_eq!(actual_result, Err(expected_error));
-        }
-        check("", EscapeError::ZeroChars);
-        check(r"\", EscapeError::LoneSlash);
-        check("\n", EscapeError::EscapeOnlyChar);
-        check("\r\n", EscapeError::EscapeOnlyChar);
-        check("\t", EscapeError::EscapeOnlyChar);
-        check("'", EscapeError::EscapeOnlyChar);
-        check("\r", EscapeError::BareCarriageReturn);
-        check("spam", EscapeError::MoreThanOneChar);
-        check(r"\x0ff", EscapeError::MoreThanOneChar);
-        check(r#"\"a"#, EscapeError::MoreThanOneChar);
-        check(r"\na", EscapeError::MoreThanOneChar);
-        check(r"\ra", EscapeError::MoreThanOneChar);
-        check(r"\ta", EscapeError::MoreThanOneChar);
-        check(r"\\a", EscapeError::MoreThanOneChar);
-        check(r"\'a", EscapeError::MoreThanOneChar);
-        check(r"\0a", EscapeError::MoreThanOneChar);
-        check(r"\u{0}x", EscapeError::MoreThanOneChar);
-        check(r"\u{1F63b}}", EscapeError::MoreThanOneChar);
-        check(r"\v", EscapeError::InvalidEscape);
-        check(r"\💩", EscapeError::InvalidEscape);
-        check(r"\●", EscapeError::InvalidEscape);
-        check(r"\x", EscapeError::TooShortHexEscape);
-        check(r"\x0", EscapeError::TooShortHexEscape);
-        check(r"\xf", EscapeError::TooShortHexEscape);
-        check(r"\xa", EscapeError::TooShortHexEscape);
-        check(r"\xx", EscapeError::InvalidCharInHexEscape);
-        check(r"\xы", EscapeError::InvalidCharInHexEscape);
-        check(r"\x🦀", EscapeError::InvalidCharInHexEscape);
-        check(r"\xtt", EscapeError::InvalidCharInHexEscape);
-        check(r"\xff", EscapeError::OutOfRangeHexEscape);
-        check(r"\xFF", EscapeError::OutOfRangeHexEscape);
-        check(r"\x80", EscapeError::OutOfRangeHexEscape);
-        check(r"\u", EscapeError::NoBraceInUnicodeEscape);
-        check(r"\u[0123]", EscapeError::NoBraceInUnicodeEscape);
-        check(r"\u{0x}", EscapeError::InvalidCharInUnicodeEscape);
-        check(r"\u{", EscapeError::UnclosedUnicodeEscape);
-        check(r"\u{0000", EscapeError::UnclosedUnicodeEscape);
-        check(r"\u{}", EscapeError::EmptyUnicodeEscape);
-        check(r"\u{_0000}", EscapeError::LeadingUnderscoreUnicodeEscape);
-        check(r"\u{0000000}", EscapeError::OverlongUnicodeEscape);
-        check(r"\u{FFFFFF}", EscapeError::OutOfRangeUnicodeEscape);
-        check(r"\u{ffffff}", EscapeError::OutOfRangeUnicodeEscape);
-        check(r"\u{ffffff}", EscapeError::OutOfRangeUnicodeEscape);
-        check(r"\u{DC00}", EscapeError::LoneSurrogateUnicodeEscape);
-        check(r"\u{DDDD}", EscapeError::LoneSurrogateUnicodeEscape);
-        check(r"\u{DFFF}", EscapeError::LoneSurrogateUnicodeEscape);
-        check(r"\u{D800}", EscapeError::LoneSurrogateUnicodeEscape);
-        check(r"\u{DAAA}", EscapeError::LoneSurrogateUnicodeEscape);
-        check(r"\u{DBFF}", EscapeError::LoneSurrogateUnicodeEscape);
-    }
-    #[test]
-    fn test_unescape_char_good() {
-        fn check(literal_text: &str, expected_char: char) {
-            let actual_result = unescape_char(literal_text);
-            assert_eq!(actual_result, Ok(expected_char));
-        }
-        check("a", 'a');
-        check("ы", 'ы');
-        check("🦀", '🦀');
-        check(r#"\""#, '"');
-        check(r"\n", '\n');
-        check(r"\r", '\r');
-        check(r"\t", '\t');
-        check(r"\\", '\\');
-        check(r"\'", '\'');
-        check(r"\0", '\0');
-        check(r"\x00", '\0');
-        check(r"\x5a", 'Z');
-        check(r"\x5A", 'Z');
-        check(r"\x7f", 127 as char);
-        check(r"\u{0}", '\0');
-        check(r"\u{000000}", '\0');
-        check(r"\u{41}", 'A');
-        check(r"\u{0041}", 'A');
-        check(r"\u{00_41}", 'A');
-        check(r"\u{4__1__}", 'A');
-        check(r"\u{1F63b}", '😻');
-    }
-    #[test]
-    fn test_unescape_str_good() {
-        fn check(literal_text: &str, expected: &str) {
-            let mut buf = Ok(String::with_capacity(literal_text.len()));
-            unescape_str(literal_text, &mut |range, c| {
-                if let Ok(b) = &mut buf {
-                    match c {
-                        Ok(c) => b.push(c),
-                        Err(e) => buf = Err((range, e)),
-                    }
-                }
-            });
-            let buf = buf.as_ref().map(|it| it.as_ref());
-            assert_eq!(buf, Ok(expected))
-        }
-        check("foo", "foo");
-        check("", "");
-        check(" \t\n\r\n", " \t\n\n");
-        check("hello \\\n     world", "hello world");
-        check("hello \\\r\n     world", "hello world");
-        check("thread's", "thread's")
-    }
-    #[test]
-    fn test_unescape_byte_bad() {
-        fn check(literal_text: &str, expected_error: EscapeError) {
-            let actual_result = unescape_byte(literal_text).map_err(|(_offset, err)| err);
-            assert_eq!(actual_result, Err(expected_error));
-        }
-        check("", EscapeError::ZeroChars);
-        check(r"\", EscapeError::LoneSlash);
-        check("\n", EscapeError::EscapeOnlyChar);
-        check("\r\n", EscapeError::EscapeOnlyChar);
-        check("\t", EscapeError::EscapeOnlyChar);
-        check("'", EscapeError::EscapeOnlyChar);
-        check("\r", EscapeError::BareCarriageReturn);
-        check("spam", EscapeError::MoreThanOneChar);
-        check(r"\x0ff", EscapeError::MoreThanOneChar);
-        check(r#"\"a"#, EscapeError::MoreThanOneChar);
-        check(r"\na", EscapeError::MoreThanOneChar);
-        check(r"\ra", EscapeError::MoreThanOneChar);
-        check(r"\ta", EscapeError::MoreThanOneChar);
-        check(r"\\a", EscapeError::MoreThanOneChar);
-        check(r"\'a", EscapeError::MoreThanOneChar);
-        check(r"\0a", EscapeError::MoreThanOneChar);
-        check(r"\v", EscapeError::InvalidEscape);
-        check(r"\💩", EscapeError::InvalidEscape);
-        check(r"\●", EscapeError::InvalidEscape);
-        check(r"\x", EscapeError::TooShortHexEscape);
-        check(r"\x0", EscapeError::TooShortHexEscape);
-        check(r"\xa", EscapeError::TooShortHexEscape);
-        check(r"\xf", EscapeError::TooShortHexEscape);
-        check(r"\xx", EscapeError::InvalidCharInHexEscape);
-        check(r"\xы", EscapeError::InvalidCharInHexEscape);
-        check(r"\x🦀", EscapeError::InvalidCharInHexEscape);
-        check(r"\xtt", EscapeError::InvalidCharInHexEscape);
-        check(r"\u", EscapeError::NoBraceInUnicodeEscape);
-        check(r"\u[0123]", EscapeError::NoBraceInUnicodeEscape);
-        check(r"\u{0x}", EscapeError::InvalidCharInUnicodeEscape);
-        check(r"\u{", EscapeError::UnclosedUnicodeEscape);
-        check(r"\u{0000", EscapeError::UnclosedUnicodeEscape);
-        check(r"\u{}", EscapeError::EmptyUnicodeEscape);
-        check(r"\u{_0000}", EscapeError::LeadingUnderscoreUnicodeEscape);
-        check(r"\u{0000000}", EscapeError::OverlongUnicodeEscape);
-        check("ы", EscapeError::NonAsciiCharInByte);
-        check("🦀", EscapeError::NonAsciiCharInByte);
-        check(r"\u{0}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{000000}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{41}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{0041}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{00_41}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{4__1__}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{1F63b}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{0}x", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{1F63b}}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{FFFFFF}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{ffffff}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{ffffff}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{DC00}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{DDDD}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{DFFF}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{D800}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{DAAA}", EscapeError::UnicodeEscapeInByte);
-        check(r"\u{DBFF}", EscapeError::UnicodeEscapeInByte);
-    }
-    #[test]
-    fn test_unescape_byte_good() {
-        fn check(literal_text: &str, expected_byte: u8) {
-            let actual_result = unescape_byte(literal_text);
-            assert_eq!(actual_result, Ok(expected_byte));
-        }
-        check("a", b'a');
-        check(r#"\""#, b'"');
-        check(r"\n", b'\n');
-        check(r"\r", b'\r');
-        check(r"\t", b'\t');
-        check(r"\\", b'\\');
-        check(r"\'", b'\'');
-        check(r"\0", b'\0');
-        check(r"\x00", b'\0');
-        check(r"\x5a", b'Z');
-        check(r"\x5A", b'Z');
-        check(r"\x7f", 127);
-        check(r"\x80", 128);
-        check(r"\xff", 255);
-        check(r"\xFF", 255);
-    }
-    #[test]
-    fn test_unescape_byte_str_good() {
-        fn check(literal_text: &str, expected: &[u8]) {
-            let mut buf = Ok(Vec::with_capacity(literal_text.len()));
-            unescape_byte_str(literal_text, &mut |range, c| {
-                if let Ok(b) = &mut buf {
-                    match c {
-                        Ok(c) => b.push(c),
-                        Err(e) => buf = Err((range, e)),
-                    }
-                }
-            });
-            let buf = buf.as_ref().map(|it| it.as_ref());
-            assert_eq!(buf, Ok(expected))
-        }
-        check("foo", b"foo");
-        check("", b"");
-        check(" \t\n\r\n", b" \t\n\n");
-        check("hello \\\n     world", b"hello world");
-        check("hello \\\r\n     world", b"hello world");
-        check("thread's", b"thread's")
-    }
-}
diff --git a/crates/ra_syntax/tests/data/lexer/00012_block_comment.rs b/crates/ra_syntax/test_data/lexer/00012_block_comment.rs
index 708aac197..708aac197 100644
--- a/crates/ra_syntax/tests/data/lexer/00012_block_comment.rs
+++ b/crates/ra_syntax/test_data/lexer/00012_block_comment.rs
diff --git a/crates/ra_syntax/tests/data/lexer/00012_block_comment.txt b/crates/ra_syntax/test_data/lexer/00012_block_comment.txt
index 9958b2518..9958b2518 100644
--- a/crates/ra_syntax/tests/data/lexer/00012_block_comment.txt
+++ b/crates/ra_syntax/test_data/lexer/00012_block_comment.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0001_hello.rs b/crates/ra_syntax/test_data/lexer/0001_hello.rs
index 95d09f2b1..95d09f2b1 100644
--- a/crates/ra_syntax/tests/data/lexer/0001_hello.rs
+++ b/crates/ra_syntax/test_data/lexer/0001_hello.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0001_hello.txt b/crates/ra_syntax/test_data/lexer/0001_hello.txt
index 27a5940a9..27a5940a9 100644
--- a/crates/ra_syntax/tests/data/lexer/0001_hello.txt
+++ b/crates/ra_syntax/test_data/lexer/0001_hello.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0002_whitespace.rs b/crates/ra_syntax/test_data/lexer/0002_whitespace.rs
index 08fce1418..08fce1418 100644
--- a/crates/ra_syntax/tests/data/lexer/0002_whitespace.rs
+++ b/crates/ra_syntax/test_data/lexer/0002_whitespace.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0002_whitespace.txt b/crates/ra_syntax/test_data/lexer/0002_whitespace.txt
index 01d260918..01d260918 100644
--- a/crates/ra_syntax/tests/data/lexer/0002_whitespace.txt
+++ b/crates/ra_syntax/test_data/lexer/0002_whitespace.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0003_ident.rs b/crates/ra_syntax/test_data/lexer/0003_ident.rs
index c05c9c009..c05c9c009 100644
--- a/crates/ra_syntax/tests/data/lexer/0003_ident.rs
+++ b/crates/ra_syntax/test_data/lexer/0003_ident.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0003_ident.txt b/crates/ra_syntax/test_data/lexer/0003_ident.txt
index 4a0d5c053..4a0d5c053 100644
--- a/crates/ra_syntax/tests/data/lexer/0003_ident.txt
+++ b/crates/ra_syntax/test_data/lexer/0003_ident.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0004_numbers.rs b/crates/ra_syntax/test_data/lexer/0004_numbers.rs
index dc974b553..dc974b553 100644
--- a/crates/ra_syntax/tests/data/lexer/0004_numbers.rs
+++ b/crates/ra_syntax/test_data/lexer/0004_numbers.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0004_numbers.txt b/crates/ra_syntax/test_data/lexer/0004_numbers.txt
index 7bb89b8ae..7bb89b8ae 100644
--- a/crates/ra_syntax/tests/data/lexer/0004_numbers.txt
+++ b/crates/ra_syntax/test_data/lexer/0004_numbers.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0005_symbols.rs b/crates/ra_syntax/test_data/lexer/0005_symbols.rs
index 487569b5a..487569b5a 100644
--- a/crates/ra_syntax/tests/data/lexer/0005_symbols.rs
+++ b/crates/ra_syntax/test_data/lexer/0005_symbols.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0005_symbols.txt b/crates/ra_syntax/test_data/lexer/0005_symbols.txt
index 469a90e42..469a90e42 100644
--- a/crates/ra_syntax/tests/data/lexer/0005_symbols.txt
+++ b/crates/ra_syntax/test_data/lexer/0005_symbols.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0006_chars.rs b/crates/ra_syntax/test_data/lexer/0006_chars.rs
index 454ee0a5f..454ee0a5f 100644
--- a/crates/ra_syntax/tests/data/lexer/0006_chars.rs
+++ b/crates/ra_syntax/test_data/lexer/0006_chars.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0006_chars.txt b/crates/ra_syntax/test_data/lexer/0006_chars.txt
index 950954fbc..950954fbc 100644
--- a/crates/ra_syntax/tests/data/lexer/0006_chars.txt
+++ b/crates/ra_syntax/test_data/lexer/0006_chars.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0007_lifetimes.rs b/crates/ra_syntax/test_data/lexer/0007_lifetimes.rs
index b764f1dce..b764f1dce 100644
--- a/crates/ra_syntax/tests/data/lexer/0007_lifetimes.rs
+++ b/crates/ra_syntax/test_data/lexer/0007_lifetimes.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0007_lifetimes.txt b/crates/ra_syntax/test_data/lexer/0007_lifetimes.txt
index 005c29100..005c29100 100644
--- a/crates/ra_syntax/tests/data/lexer/0007_lifetimes.txt
+++ b/crates/ra_syntax/test_data/lexer/0007_lifetimes.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0008_byte_strings.rs b/crates/ra_syntax/test_data/lexer/0008_byte_strings.rs
index b54930f5e..b54930f5e 100644
--- a/crates/ra_syntax/tests/data/lexer/0008_byte_strings.rs
+++ b/crates/ra_syntax/test_data/lexer/0008_byte_strings.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0008_byte_strings.txt b/crates/ra_syntax/test_data/lexer/0008_byte_strings.txt
index bc03b51a8..bc03b51a8 100644
--- a/crates/ra_syntax/tests/data/lexer/0008_byte_strings.txt
+++ b/crates/ra_syntax/test_data/lexer/0008_byte_strings.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0009_strings.rs b/crates/ra_syntax/test_data/lexer/0009_strings.rs
index 4ddb5bffc..4ddb5bffc 100644
--- a/crates/ra_syntax/tests/data/lexer/0009_strings.rs
+++ b/crates/ra_syntax/test_data/lexer/0009_strings.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0009_strings.txt b/crates/ra_syntax/test_data/lexer/0009_strings.txt
index 4cb4d711d..4cb4d711d 100644
--- a/crates/ra_syntax/tests/data/lexer/0009_strings.txt
+++ b/crates/ra_syntax/test_data/lexer/0009_strings.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0010_comments.rs b/crates/ra_syntax/test_data/lexer/0010_comments.rs
index 71bdd1f9c..71bdd1f9c 100644
--- a/crates/ra_syntax/tests/data/lexer/0010_comments.rs
+++ b/crates/ra_syntax/test_data/lexer/0010_comments.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0010_comments.txt b/crates/ra_syntax/test_data/lexer/0010_comments.txt
index 3c997de3f..3c997de3f 100644
--- a/crates/ra_syntax/tests/data/lexer/0010_comments.txt
+++ b/crates/ra_syntax/test_data/lexer/0010_comments.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0011_keywords.rs b/crates/ra_syntax/test_data/lexer/0011_keywords.rs
index 1e91bff4e..1e91bff4e 100644
--- a/crates/ra_syntax/tests/data/lexer/0011_keywords.rs
+++ b/crates/ra_syntax/test_data/lexer/0011_keywords.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0011_keywords.txt b/crates/ra_syntax/test_data/lexer/0011_keywords.txt
index 22c00eefb..22c00eefb 100644
--- a/crates/ra_syntax/tests/data/lexer/0011_keywords.txt
+++ b/crates/ra_syntax/test_data/lexer/0011_keywords.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0013_raw_strings.rs b/crates/ra_syntax/test_data/lexer/0013_raw_strings.rs
index e5ed0b693..e5ed0b693 100644
--- a/crates/ra_syntax/tests/data/lexer/0013_raw_strings.rs
+++ b/crates/ra_syntax/test_data/lexer/0013_raw_strings.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0013_raw_strings.txt b/crates/ra_syntax/test_data/lexer/0013_raw_strings.txt
index 9cf0957d1..9cf0957d1 100644
--- a/crates/ra_syntax/tests/data/lexer/0013_raw_strings.txt
+++ b/crates/ra_syntax/test_data/lexer/0013_raw_strings.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0014_unclosed_char.rs b/crates/ra_syntax/test_data/lexer/0014_unclosed_char.rs
index 9c0007077..9c0007077 100644
--- a/crates/ra_syntax/tests/data/lexer/0014_unclosed_char.rs
+++ b/crates/ra_syntax/test_data/lexer/0014_unclosed_char.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0014_unclosed_char.txt b/crates/ra_syntax/test_data/lexer/0014_unclosed_char.txt
index 737a300ee..737a300ee 100644
--- a/crates/ra_syntax/tests/data/lexer/0014_unclosed_char.txt
+++ b/crates/ra_syntax/test_data/lexer/0014_unclosed_char.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0015_unclosed_string.rs b/crates/ra_syntax/test_data/lexer/0015_unclosed_string.rs
index d771a26d4..d771a26d4 100644
--- a/crates/ra_syntax/tests/data/lexer/0015_unclosed_string.rs
+++ b/crates/ra_syntax/test_data/lexer/0015_unclosed_string.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0015_unclosed_string.txt b/crates/ra_syntax/test_data/lexer/0015_unclosed_string.txt
index 728c40b66..728c40b66 100644
--- a/crates/ra_syntax/tests/data/lexer/0015_unclosed_string.txt
+++ b/crates/ra_syntax/test_data/lexer/0015_unclosed_string.txt
diff --git a/crates/ra_syntax/tests/data/lexer/0016_raw_ident.rs b/crates/ra_syntax/test_data/lexer/0016_raw_ident.rs
index b40a1b6a2..b40a1b6a2 100644
--- a/crates/ra_syntax/tests/data/lexer/0016_raw_ident.rs
+++ b/crates/ra_syntax/test_data/lexer/0016_raw_ident.rs
diff --git a/crates/ra_syntax/tests/data/lexer/0016_raw_ident.txt b/crates/ra_syntax/test_data/lexer/0016_raw_ident.txt
index 484689693..484689693 100644
--- a/crates/ra_syntax/tests/data/lexer/0016_raw_ident.txt
+++ b/crates/ra_syntax/test_data/lexer/0016_raw_ident.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.rs b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rs
index fe5030d89..fe5030d89 100644
--- a/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.rs
+++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.txt b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt
index 0dbbfe853..0dbbfe853 100644
--- a/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.txt
+++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.rs b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rs
index 98f23de1f..98f23de1f 100644
--- a/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.rs
+++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.txt b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt
index 7cfb54ef8..7cfb54ef8 100644
--- a/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.txt
+++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.rs b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rs
index 48a3a3980..48a3a3980 100644
--- a/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.rs
+++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.txt b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt
index 84867026f..84867026f 100644
--- a/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.txt
+++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.rs b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rs
index 009312270..009312270 100644
--- a/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.rs
+++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt
index 857826037..857826037 100644
--- a/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt
+++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.rs b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rs
index 060e65d06..060e65d06 100644
--- a/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.rs
+++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.txt b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.txt
index 5210a884d..5210a884d 100644
--- a/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.txt
+++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.rs b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rs
index de7f81628..de7f81628 100644
--- a/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.rs
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.txt b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.txt
index 6d5199a56..6d5199a56 100644
--- a/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.txt
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.rs b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rs
index 8069c111b..8069c111b 100644
--- a/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.rs
+++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.txt b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt
index 6143e68f1..6143e68f1 100644
--- a/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.txt
+++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.rs b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rs
index dc869fb78..dc869fb78 100644
--- a/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.rs
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.txt b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.txt
index b79e01238..b79e01238 100644
--- a/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.txt
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.rs b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rs
index 9fcac19b5..9fcac19b5 100644
--- a/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.rs
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.txt b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt
index 9a8871579..9a8871579 100644
--- a/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.txt
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.rs b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs
index 0dd30d0bd..0dd30d0bd 100644
--- a/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.rs
+++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.txt b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.txt
index e147d6424..e147d6424 100644
--- a/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.txt
+++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.rs b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rs
index 985775282..985775282 100644
--- a/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.rs
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.txt b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.txt
index c46809f81..c46809f81 100644
--- a/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.txt
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.rs b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rs
index c1bd0a2d1..c1bd0a2d1 100644
--- a/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.rs
+++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.txt b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.txt
index 381147dc0..381147dc0 100644
--- a/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.txt
+++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0012_broken_lambda.txt b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.txt
index 12ebc2a3a..12ebc2a3a 100644
--- a/crates/ra_syntax/tests/data/parser/err/0012_broken_lambda.txt
+++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.rs b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rs
index 20dde3bc3..20dde3bc3 100644
--- a/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.rs
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt
index bef286b37..bef286b37 100644
--- a/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt
+++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.rs b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rs
index 75c1d2f98..75c1d2f98 100644
--- a/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.rs
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.txt b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.txt
index 2f0878572..2f0878572 100644
--- a/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.txt
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.rs b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rs
index 156e70251..156e70251 100644
--- a/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.rs
+++ b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.txt b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.txt
index 23ca0c446..23ca0c446 100644
--- a/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.txt
+++ b/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.rs b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rs
index 9ae857686..9ae857686 100644
--- a/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.rs
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.txt b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.txt
index 97e64dea9..97e64dea9 100644
--- a/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.txt
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.rs b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rs
index 17bd49777..17bd49777 100644
--- a/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.rs
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.txt b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.txt
index c18e20900..c18e20900 100644
--- a/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.txt
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.rs b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rs
index fe604006c..fe604006c 100644
--- a/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.rs
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt
index 51def2d8f..51def2d8f 100644
--- a/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0019_let_recover.rs b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rs
index 48bf3d68b..48bf3d68b 100644
--- a/crates/ra_syntax/tests/data/parser/err/0019_let_recover.rs
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0019_let_recover.txt b/crates/ra_syntax/test_data/parser/err/0019_let_recover.txt
index b6710241e..b6710241e 100644
--- a/crates/ra_syntax/tests/data/parser/err/0019_let_recover.txt
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.rs b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rs
index 3393b668b..3393b668b 100644
--- a/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.rs
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.txt b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.txt
index 71c014028..71c014028 100644
--- a/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.txt
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.rs b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rs
index 7a6c264f6..7a6c264f6 100644
--- a/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.rs
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.txt b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.txt
index c125a0bc9..c125a0bc9 100644
--- a/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.txt
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.rs b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rs
index cd2d493a1..cd2d493a1 100644
--- a/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.rs
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.txt
index 32b53bba7..32b53bba7 100644
--- a/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.rs b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rs
index 0206d563e..0206d563e 100644
--- a/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.rs
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.txt b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.txt
index f2515faa7..f2515faa7 100644
--- a/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.txt
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.rs b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rs
index 6c2e95c02..6c2e95c02 100644
--- a/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.rs
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.txt b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.txt
index faf0fe462..faf0fe462 100644
--- a/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.txt
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0025_nope.rs b/crates/ra_syntax/test_data/parser/err/0025_nope.rs
index 28726ed51..28726ed51 100644
--- a/crates/ra_syntax/tests/data/parser/err/0025_nope.rs
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0025_nope.txt b/crates/ra_syntax/test_data/parser/err/0025_nope.txt
index 0a3952dc9..0a3952dc9 100644
--- a/crates/ra_syntax/tests/data/parser/err/0025_nope.txt
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.rs b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rs
index 829ca1c4b..829ca1c4b 100644
--- a/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.rs
+++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.txt
index d3da2f54f..d3da2f54f 100644
--- a/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt
+++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0027_incomplere_where_for.rs b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rs
index 2792c2084..2792c2084 100644
--- a/crates/ra_syntax/tests/data/parser/err/0027_incomplere_where_for.rs
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0027_incomplere_where_for.txt b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.txt
index 061e6fb31..061e6fb31 100644
--- a/crates/ra_syntax/tests/data/parser/err/0027_incomplere_where_for.txt
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.rs b/crates/ra_syntax/test_data/parser/err/0028_macro_2.0.rs
index 781047ba1..781047ba1 100644
--- a/crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.rs
+++ b/crates/ra_syntax/test_data/parser/err/0028_macro_2.0.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.txt b/crates/ra_syntax/test_data/parser/err/0028_macro_2.0.txt
index 98bc562a3..98bc562a3 100644
--- a/crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.txt
+++ b/crates/ra_syntax/test_data/parser/err/0028_macro_2.0.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0029_field_completion.rs b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rs
index a7cdc17bb..a7cdc17bb 100644
--- a/crates/ra_syntax/tests/data/parser/err/0029_field_completion.rs
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0029_field_completion.txt b/crates/ra_syntax/test_data/parser/err/0029_field_completion.txt
index fb50a12fc..fb50a12fc 100644
--- a/crates/ra_syntax/tests/data/parser/err/0029_field_completion.txt
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0031_block_inner_attrs.rs b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rs
index 6a04f2d0a..6a04f2d0a 100644
--- a/crates/ra_syntax/tests/data/parser/err/0031_block_inner_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0031_block_inner_attrs.txt b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.txt
index c205cf147..c205cf147 100644
--- a/crates/ra_syntax/tests/data/parser/err/0031_block_inner_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0032_match_arms_inner_attrs.rs b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs
index 06aa47770..06aa47770 100644
--- a/crates/ra_syntax/tests/data/parser/err/0032_match_arms_inner_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0032_match_arms_inner_attrs.txt b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.txt
index 4e8c4143b..4e8c4143b 100644
--- a/crates/ra_syntax/tests/data/parser/err/0032_match_arms_inner_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.txt
diff --git a/crates/ra_syntax/tests/data/parser/err/0033_match_arms_outer_attrs.rs b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs
index 4635222da..4635222da 100644
--- a/crates/ra_syntax/tests/data/parser/err/0033_match_arms_outer_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs
diff --git a/crates/ra_syntax/tests/data/parser/err/0033_match_arms_outer_attrs.txt b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.txt
index e4f1f6337..e4f1f6337 100644
--- a/crates/ra_syntax/tests/data/parser/err/0033_match_arms_outer_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.txt
diff --git a/crates/ra_syntax/tests/data/parser/fuzz-failures/0000.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
index e0437d163..e0437d163 100644
--- a/crates/ra_syntax/tests/data/parser/fuzz-failures/0000.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
diff --git a/crates/ra_syntax/tests/data/parser/fuzz-failures/0001.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0001.rs
index 099cc5f84..099cc5f84 100644
--- a/crates/ra_syntax/tests/data/parser/fuzz-failures/0001.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0001.rs
diff --git a/crates/ra_syntax/tests/data/parser/fuzz-failures/0002.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0002.rs
index f35dc7289..f35dc7289 100644
--- a/crates/ra_syntax/tests/data/parser/fuzz-failures/0002.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0002.rs
diff --git a/crates/ra_syntax/tests/data/parser/fuzz-failures/0003.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0003.rs
index 0f59c4722..0f59c4722 100644
--- a/crates/ra_syntax/tests/data/parser/fuzz-failures/0003.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0003.rs
diff --git a/crates/ra_syntax/tests/data/parser/fuzz-failures/0004.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0004.rs
index 003290f52..003290f52 100644
--- a/crates/ra_syntax/tests/data/parser/fuzz-failures/0004.rs
+++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0004.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.rs b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs
index a94851443..a94851443 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.txt
index 3f0f1b480..3f0f1b480 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.rs b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs
index a2164c510..a2164c510 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.txt
index 7abc49d5e..7abc49d5e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.rs b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs
index fae705131..fae705131 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.txt
index b97e339bb..b97e339bb 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.rs b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rs
index b8c7b65e3..b8c7b65e3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.txt
index 43321b1ed..43321b1ed 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
index f014914ff..f014914ff 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
index 451f29d39..451f29d39 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.rs b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs
index 26141e904..26141e904 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.txt
index a1871ec08..a1871ec08 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.rs b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs
index 9a423248c..9a423248c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.txt
index f70adc25d..f70adc25d 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.rs b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rs
index 2976f6862..2976f6862 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.txt
index 1dbfca698..1dbfca698 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.rs b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs
index d725a07ce..d725a07ce 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.txt
index 338776a72..338776a72 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.rs b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs
index 30cc49138..30cc49138 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.txt
index a21b29c80..a21b29c80 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.rs b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rs
index 16edee95d..16edee95d 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt
index b1ef210d3..b1ef210d3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0014_default_fn_type.rs b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rs
index 15ba8f4a8..15ba8f4a8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0014_default_fn_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0014_default_fn_type.txt b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.txt
index 7da4e243f..7da4e243f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/err/0014_default_fn_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0001_trait_item_list.rs b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rs
index a5ec3239f..a5ec3239f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0001_trait_item_list.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0001_trait_item_list.txt b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.txt
index 18f02bb22..18f02bb22 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0001_trait_item_list.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0002_use_tree_list.rs b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
index 06c387cee..06c387cee 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0002_use_tree_list.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0002_use_tree_list.txt b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.txt
index 1b318dfb9..1b318dfb9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0002_use_tree_list.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0003_where_pred_for.rs b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rs
index b448c6178..b448c6178 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0003_where_pred_for.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0003_where_pred_for.txt b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.txt
index 8a21ee968..8a21ee968 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0003_where_pred_for.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0004_value_parameters_no_patterns.rs b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs
index d8c23c76a..d8c23c76a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0004_value_parameters_no_patterns.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0004_value_parameters_no_patterns.txt b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.txt
index 8cfba8420..8cfba8420 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0004_value_parameters_no_patterns.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0005_function_type_params.rs b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rs
index 9df40ed39..9df40ed39 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0005_function_type_params.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0005_function_type_params.txt b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.txt
index c1a70d566..c1a70d566 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0005_function_type_params.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0006_self_param.rs b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rs
index 80c0a43f5..80c0a43f5 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0006_self_param.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0006_self_param.txt b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.txt
index 8e210a6ca..8e210a6ca 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0006_self_param.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0007_type_param_bounds.rs b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs
index 919bde0ee..919bde0ee 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0007_type_param_bounds.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0007_type_param_bounds.txt b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.txt
index a7186c7a8..a7186c7a8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0007_type_param_bounds.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0008_path_part.rs b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rs
index f6e32c7c1..f6e32c7c1 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0008_path_part.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0008_path_part.txt b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt
index 0c6be485e..0c6be485e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0008_path_part.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0009_loop_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rs
index 9f078fa48..9f078fa48 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0009_loop_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0009_loop_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.txt
index 8240aba15..8240aba15 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0009_loop_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0010_extern_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rs
index 26a9ccd1e..26a9ccd1e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0010_extern_block.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0010_extern_block.txt b/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.txt
index 506f56fff..506f56fff 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0010_extern_block.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0011_field_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rs
index b8da2ddc3..b8da2ddc3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0011_field_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0011_field_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.txt
index 78054ec5a..78054ec5a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0011_field_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0012_type_item_where_clause.rs b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs
index a602d07f0..a602d07f0 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0012_type_item_where_clause.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0012_type_item_where_clause.txt b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.txt
index da04dac5c..da04dac5c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0012_type_item_where_clause.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0013_pointer_type_mut.rs b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs
index 04b2bb9ba..04b2bb9ba 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0013_pointer_type_mut.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0013_pointer_type_mut.txt b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.txt
index c05f873d6..c05f873d6 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0013_pointer_type_mut.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0014_never_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rs
index de399fcf4..de399fcf4 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0014_never_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0014_never_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.txt
index ac53e4fd3..ac53e4fd3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0014_never_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0015_continue_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rs
index 474cc3f0e..474cc3f0e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0015_continue_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0015_continue_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.txt
index e8cc32f2c..e8cc32f2c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0015_continue_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0016_unsafe_trait.rs b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rs
index 04e021550..04e021550 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0016_unsafe_trait.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0016_unsafe_trait.txt b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.txt
index 7b43f1294..7b43f1294 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0016_unsafe_trait.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0016_unsafe_trait.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0017_array_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rs
index 27eb22f22..27eb22f22 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0017_array_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0017_array_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.txt
index b4055c9f0..b4055c9f0 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0017_array_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0018_arb_self_types.rs b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rs
index 6a170d5ac..6a170d5ac 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0018_arb_self_types.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0018_arb_self_types.txt b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.txt
index 67d0de0f0..67d0de0f0 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0018_arb_self_types.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0019_unary_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rs
index f1c3f7118..f1c3f7118 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0019_unary_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0019_unary_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.txt
index 42032f56c..42032f56c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0019_unary_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0020_use_star.rs b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rs
index 6f15769a8..6f15769a8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0020_use_star.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0020_use_star.txt b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.txt
index dd2095d90..dd2095d90 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0020_use_star.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0021_impl_item_list.rs b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rs
index f10851487..f10851487 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0021_impl_item_list.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0021_impl_item_list.txt b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.txt
index a893833e1..a893833e1 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0021_impl_item_list.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0022_crate_visibility.rs b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rs
index faeefde94..faeefde94 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0022_crate_visibility.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0022_crate_visibility.txt b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.txt
index 891943f6e..891943f6e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0022_crate_visibility.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0023_placeholder_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rs
index 7952dbd57..7952dbd57 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0023_placeholder_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0023_placeholder_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.txt
index 0f32aec9e..0f32aec9e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0023_placeholder_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0024_slice_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rs
index 7955973b9..7955973b9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0024_slice_pat.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0024_slice_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.txt
index 40ddbfbf6..40ddbfbf6 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0024_slice_pat.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0025_slice_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rs
index 4da1af827..4da1af827 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0025_slice_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0025_slice_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.txt
index b3a24281e..b3a24281e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0025_slice_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0026_tuple_pat_fields.rs b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs
index 0dfe63629..0dfe63629 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0026_tuple_pat_fields.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0026_tuple_pat_fields.txt b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.txt
index 0ff936471..0ff936471 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0026_tuple_pat_fields.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0027_ref_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rs
index de41f5cae..de41f5cae 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0027_ref_pat.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0027_ref_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.txt
index a833b1b96..a833b1b96 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0027_ref_pat.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0028_impl_trait_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs
index 54c5a7c46..54c5a7c46 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0028_impl_trait_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0028_impl_trait_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.txt
index f07027fa7..f07027fa7 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0028_impl_trait_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0029_cast_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rs
index bfe8e4b36..bfe8e4b36 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0029_cast_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0029_cast_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.txt
index 11c14e3b4..11c14e3b4 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0029_cast_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0030_cond.rs b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rs
index 2552a2621..2552a2621 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0030_cond.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0030_cond.txt b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.txt
index 1c9414b21..1c9414b21 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0030_cond.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0031_while_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rs
index 293046a04..293046a04 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0031_while_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0031_while_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.txt
index a772117a1..a772117a1 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0031_while_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0032_fn_pointer_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs
index 9493da83d..9493da83d 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0032_fn_pointer_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0032_fn_pointer_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.txt
index a0a8aea76..a0a8aea76 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0032_fn_pointer_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0033_reference_type;.rs b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rs
index 3ac0badab..3ac0badab 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0033_reference_type;.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0033_reference_type;.txt b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.txt
index 7642ea659..7642ea659 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0033_reference_type;.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0034_break_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rs
index 1b4094636..1b4094636 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0034_break_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0034_break_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.txt
index 4ece7cd7e..4ece7cd7e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0034_break_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0036_unsafe_extern_fn.rs b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rs
index 1295c2cd2..1295c2cd2 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0036_unsafe_extern_fn.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0036_unsafe_extern_fn.txt b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.txt
index b5b09b2e5..b5b09b2e5 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0036_unsafe_extern_fn.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0037_qual_paths.rs b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rs
index d140692e2..d140692e2 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0037_qual_paths.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0037_qual_paths.txt b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.txt
index 9bfddf5d2..9bfddf5d2 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0037_qual_paths.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0038_full_range_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rs
index ae21ad94c..ae21ad94c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0038_full_range_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0038_full_range_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.txt
index 477c645d1..477c645d1 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0038_full_range_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0039_type_arg.rs b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs
index 385c43131..385c43131 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0039_type_arg.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0039_type_arg.txt b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.txt
index 4786bf77a..4786bf77a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0039_type_arg.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0040_crate_keyword_vis.rs b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs
index e2b5f2161..e2b5f2161 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0040_crate_keyword_vis.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0040_crate_keyword_vis.txt b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt
index fb8246174..fb8246174 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0040_crate_keyword_vis.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0041_trait_item.rs b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rs
index 32761dd03..32761dd03 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0041_trait_item.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0041_trait_item.txt b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.txt
index 578361715..578361715 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0041_trait_item.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0042_call_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rs
index ffbf46d6d..ffbf46d6d 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0042_call_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0042_call_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.txt
index dd8946ad2..dd8946ad2 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0042_call_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.rs b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rs
index 9be50f877..9be50f877 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.txt b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.txt
index 18d8a151f..18d8a151f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0043_use_alias.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0044_block_items.rs b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rs
index d9868718c..d9868718c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0044_block_items.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0044_block_items.txt b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.txt
index d1a8c560a..d1a8c560a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0044_block_items.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0045_param_list_opt_patterns.rs b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs
index 9b93442c0..9b93442c0 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0045_param_list_opt_patterns.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0045_param_list_opt_patterns.txt b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.txt
index f85d6a4bc..f85d6a4bc 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0045_param_list_opt_patterns.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0046_singleton_tuple_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs
index cb66bad24..cb66bad24 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0046_singleton_tuple_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0046_singleton_tuple_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.txt
index c7b4e614d..c7b4e614d 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0046_singleton_tuple_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0047_unsafe_default_impl.rs b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rs
index 9cd6c57bd..9cd6c57bd 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0047_unsafe_default_impl.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0047_unsafe_default_impl.txt b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.txt
index 8f3dcaf88..8f3dcaf88 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0047_unsafe_default_impl.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0047_unsafe_default_impl.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0048_path_type_with_bounds.rs b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs
index 4bb0f63b7..4bb0f63b7 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0048_path_type_with_bounds.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0048_path_type_with_bounds.txt b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.txt
index bb948c8d8..bb948c8d8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0048_path_type_with_bounds.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0050_fn_decl.rs b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rs
index c9f74f7f5..c9f74f7f5 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0050_fn_decl.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0050_fn_decl.txt b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.txt
index 19f961e29..19f961e29 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0050_fn_decl.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0051_unit_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rs
index c039cf7d3..c039cf7d3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0051_unit_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0051_unit_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.txt
index 6a469f8aa..6a469f8aa 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0051_unit_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0052_path_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rs
index bf94f32e1..bf94f32e1 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0052_path_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0052_path_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.txt
index ee55ee219..ee55ee219 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0052_path_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0053_path_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rs
index 333ebabef..333ebabef 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0053_path_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0053_path_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.txt
index bc4b97c9f..bc4b97c9f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0053_path_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0054_field_attrs.rs b/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.rs
index 4744d8ac0..4744d8ac0 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0054_field_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0054_field_attrs.txt b/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.txt
index f214d1d47..f214d1d47 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0054_field_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0055_literal_pattern.rs b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rs
index 6dfd67b4c..6dfd67b4c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0055_literal_pattern.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0055_literal_pattern.txt b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.txt
index ab5dad438..ab5dad438 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0055_literal_pattern.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0056_where_clause.rs b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rs
index 19d7e571b..19d7e571b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0056_where_clause.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0056_where_clause.txt b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.txt
index c86a0db3f..c86a0db3f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0056_where_clause.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0057_const_fn.rs b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rs
index 8c84d9cd7..8c84d9cd7 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0057_const_fn.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0057_const_fn.txt b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.txt
index 7a8b81983..7a8b81983 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0057_const_fn.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0058_range_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rs
index c12ab6fce..c12ab6fce 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0058_range_pat.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0058_range_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.txt
index 1b7e9b905..1b7e9b905 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0058_range_pat.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0059_match_arms_commas.rs b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs
index 1f25d577a..1f25d577a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0059_match_arms_commas.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0059_match_arms_commas.txt b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.txt
index 949117134..949117134 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0059_match_arms_commas.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0060_extern_crate.rs b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rs
index 49af74e1b..49af74e1b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0060_extern_crate.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0060_extern_crate.txt b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.txt
index 7667201ba..7667201ba 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0060_extern_crate.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0061_struct_lit.rs b/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.rs
index eb711f68a..eb711f68a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0061_struct_lit.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0061_struct_lit.txt b/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.txt
index 94d1bfe2e..94d1bfe2e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0061_struct_lit.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0062_mod_contents.rs b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rs
index 24a15c5c5..24a15c5c5 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0062_mod_contents.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0062_mod_contents.txt b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.txt
index db2b9a582..db2b9a582 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0062_mod_contents.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.rs b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_block_neg.rs
index b7527c870..b7527c870 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_block_neg.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.txt b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_block_neg.txt
index dfff947fe..dfff947fe 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0063_impl_block_neg.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_block_neg.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0064_if_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rs
index 4b0d9af89..4b0d9af89 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0064_if_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0064_if_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.txt
index 554bda6fb..554bda6fb 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0064_if_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs
index c3ecabb99..c3ecabb99 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.txt
index 2ee0dc199..2ee0dc199 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0065_dyn_trait_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0066_match_arm.rs b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs
index 9e009e24f..9e009e24f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0066_match_arm.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0066_match_arm.txt b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt
index 041e7179e..041e7179e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0066_match_arm.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0067_crate_path.rs b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rs
index 1bbb5930b..1bbb5930b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0067_crate_path.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0067_crate_path.txt b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.txt
index f2ba4e909..f2ba4e909 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0067_crate_path.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0068_union_items.rs b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rs
index b7dd610d8..b7dd610d8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0068_union_items.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0068_union_items.txt b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt
index 4b653317b..4b653317b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0068_union_items.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0069_use_tree_list_after_path.rs b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs
index c0a3d634e..c0a3d634e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0069_use_tree_list_after_path.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0069_use_tree_list_after_path.txt b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.txt
index 86afc9362..86afc9362 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0069_use_tree_list_after_path.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs
index 37b843742..37b843742 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.txt b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.txt
index 40333d565..40333d565 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0071_match_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rs
index c9205dfa3..c9205dfa3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0071_match_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0071_match_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.txt
index 658948c66..658948c66 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0071_match_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0072_return_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rs
index 5733666b6..5733666b6 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0072_return_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0072_return_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.txt
index cd9e10bed..cd9e10bed 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0072_return_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0073_type_item_type_params.rs b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs
index defd110c4..defd110c4 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0073_type_item_type_params.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0073_type_item_type_params.txt b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.txt
index 2dd6db28f..2dd6db28f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0073_type_item_type_params.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs
index 2edd578f9..2edd578f9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.txt b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.txt
index 48af2f350..48af2f350 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0075_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rs
index 81f44c533..81f44c533 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0075_block.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0075_block.txt b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.txt
index 36983590f..36983590f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0075_block.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0076_function_where_clause.rs b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rs
index f0920b2a8..f0920b2a8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0076_function_where_clause.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0076_function_where_clause.txt b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.txt
index 32979c523..32979c523 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0076_function_where_clause.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0077_try_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rs
index 8b74f7bc8..8b74f7bc8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0077_try_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0077_try_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.txt
index 72de14b98..72de14b98 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0077_try_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0078_type_item.rs b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rs
index 04c0344fa..04c0344fa 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0078_type_item.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0078_type_item.txt b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.txt
index 4bc0b1858..4bc0b1858 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0078_type_item.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_block.rs
index d6337f6b3..d6337f6b3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.txt b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_block.txt
index bda3435e8..bda3435e8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0079_impl_block.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0080_postfix_range.rs b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rs
index c39fe8e68..c39fe8e68 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0080_postfix_range.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0080_postfix_range.txt b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.txt
index 541add812..541add812 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0080_postfix_range.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rs
index 7cde5c532..7cde5c532 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.txt
index 599cf9452..599cf9452 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0082_ref_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rs
index 2dac6be95..2dac6be95 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0082_ref_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0082_ref_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.txt
index 87a56d8ce..87a56d8ce 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0082_ref_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0083_struct_items.rs b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rs
index 693e3f3ee..693e3f3ee 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0083_struct_items.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0083_struct_items.txt b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt
index 62d93512b..62d93512b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0083_struct_items.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0084_paren_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rs
index 6e1b25101..6e1b25101 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0084_paren_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0084_paren_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.txt
index c0cf48af5..c0cf48af5 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0084_paren_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0085_expr_literals.rs b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rs
index 2e11a5a6e..2e11a5a6e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0085_expr_literals.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0085_expr_literals.txt b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.txt
index 2f2be32b9..2f2be32b9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0085_expr_literals.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0086_function_ret_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rs
index d22d8cada..d22d8cada 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0086_function_ret_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0086_function_ret_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.txt
index ac793c95c..ac793c95c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0086_function_ret_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0087_unsafe_impl.rs b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rs
index 41055f41d..41055f41d 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0087_unsafe_impl.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0087_unsafe_impl.txt b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.txt
index 590e2a88f..590e2a88f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0087_unsafe_impl.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0087_unsafe_impl.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0088_break_ambiguity.rs b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs
index 560eb05b9..560eb05b9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0088_break_ambiguity.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0088_break_ambiguity.txt b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.txt
index b93a10c5b..b93a10c5b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0088_break_ambiguity.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0089_extern_fn.rs b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rs
index 394a049f0..394a049f0 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0089_extern_fn.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0089_extern_fn.txt b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.txt
index ed5339e64..ed5339e64 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0089_extern_fn.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0090_type_param_default.rs b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rs
index 540eacb02..540eacb02 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0090_type_param_default.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0090_type_param_default.txt b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.txt
index 8d2579cd6..8d2579cd6 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0090_type_param_default.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0091_auto_trait.rs b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rs
index 72adf6035..72adf6035 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0091_auto_trait.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0091_auto_trait.txt b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.txt
index 7093c2b1f..7093c2b1f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0091_auto_trait.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0091_auto_trait.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs
index e3ba5e87f..e3ba5e87f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0092_fn_pointer_type_with_ret.txt b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.txt
index fae822367..fae822367 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0092_fn_pointer_type_with_ret.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0093_index_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rs
index b9ba78a6c..b9ba78a6c 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0093_index_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0093_index_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.txt
index b4a71f925..b4a71f925 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0093_index_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0094_unsafe_auto_trait.rs b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rs
index 03d29f324..03d29f324 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0094_unsafe_auto_trait.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0094_unsafe_auto_trait.txt b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.txt
index 3da3beaf4..3da3beaf4 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0094_unsafe_auto_trait.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0094_unsafe_auto_trait.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0095_placeholder_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs
index 4d719c433..4d719c433 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0095_placeholder_pat.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0095_placeholder_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.txt
index f11bc1fc8..f11bc1fc8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0095_placeholder_pat.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0096_no_semi_after_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs
index 4919665cb..4919665cb 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0096_no_semi_after_block.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0096_no_semi_after_block.txt b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.txt
index 6d24f214e..6d24f214e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0096_no_semi_after_block.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0097_default_impl.rs b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rs
index ef6aa84a2..ef6aa84a2 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0097_default_impl.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0097_default_impl.txt b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.txt
index ada94a824..ada94a824 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0097_default_impl.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0097_default_impl.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0098_const_unsafe_fn.rs b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rs
index 31a1e435f..31a1e435f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0098_const_unsafe_fn.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0098_const_unsafe_fn.txt b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.txt
index 0dd42ab8e..0dd42ab8e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0098_const_unsafe_fn.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0099_param_list.rs b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rs
index 9d55bedbb..9d55bedbb 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0099_param_list.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0099_param_list.txt b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.txt
index 80d636819..80d636819 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0099_param_list.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0100_for_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rs
index 972197d2a..972197d2a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0100_for_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0100_for_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.txt
index 09e108570..09e108570 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0100_for_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0101_unsafe_fn.rs b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rs
index 33cfc4cd7..33cfc4cd7 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0101_unsafe_fn.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0101_unsafe_fn.txt b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.txt
index 1a60f6ffe..1a60f6ffe 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0101_unsafe_fn.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0102_field_pat_list.rs b/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.rs
index da3412fa8..da3412fa8 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0102_field_pat_list.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0102_field_pat_list.txt b/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.txt
index a2af4fc60..a2af4fc60 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0102_field_pat_list.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0103_array_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rs
index 4dc1999d1..4dc1999d1 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0103_array_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0103_array_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.txt
index e74e231b3..e74e231b3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0103_array_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0104_path_fn_trait_args.rs b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs
index aef45e561..aef45e561 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0104_path_fn_trait_args.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0104_path_fn_trait_args.txt b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.txt
index d6f196811..d6f196811 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0104_path_fn_trait_args.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0105_block_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
index 2fed74c5e..2fed74c5e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0105_block_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0105_block_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.txt
index 4bc446a55..4bc446a55 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0105_block_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0106_lambda_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rs
index 075717823..075717823 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0106_lambda_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0106_lambda_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.txt
index a05218118..a05218118 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0106_lambda_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0107_method_call_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rs
index 1a3aa35ae..1a3aa35ae 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0107_method_call_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0107_method_call_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.txt
index bc28b293e..bc28b293e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0107_method_call_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0108_tuple_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rs
index e4f774280..e4f774280 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0108_tuple_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0108_tuple_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.txt
index 32be7a849..32be7a849 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0108_tuple_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0109_label.rs b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rs
index 48e83f263..48e83f263 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0109_label.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0109_label.txt b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.txt
index 39e4f4b3e..39e4f4b3e 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0109_label.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0110_use_path.rs b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rs
index 328e94736..328e94736 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0110_use_path.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0110_use_path.txt b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.txt
index 7dbcd3927..7dbcd3927 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0110_use_path.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0111_tuple_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rs
index f785acd36..f785acd36 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0111_tuple_pat.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0111_tuple_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.txt
index aef3f7e0f..aef3f7e0f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0111_tuple_pat.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0112_bind_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs
index 5a93469af..5a93469af 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0112_bind_pat.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0112_bind_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.txt
index 189254a19..189254a19 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0112_bind_pat.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0113_nocontentexpr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs
index bbf09e367..bbf09e367 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0113_nocontentexpr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0113_nocontentexpr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.txt
index 601a5bae9..601a5bae9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0113_nocontentexpr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0114_tuple_struct_where.rs b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs
index ddd59016d..ddd59016d 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0114_tuple_struct_where.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0114_tuple_struct_where.txt b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt
index 8534592b9..8534592b9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0114_tuple_struct_where.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.rs b/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.rs
index 635b9ac21..635b9ac21 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt b/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.txt
index 6dd3a9b93..6dd3a9b93 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0115_pos_field_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.rs b/crates/ra_syntax/test_data/parser/inline/ok/0116_trait_fn_placeholder_parameter.rs
index 472cb8803..472cb8803 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0116_trait_fn_placeholder_parameter.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.txt b/crates/ra_syntax/test_data/parser/inline/ok/0116_trait_fn_placeholder_parameter.txt
index 158236c5a..158236c5a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0116_trait_fn_placeholder_parameter.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0116_trait_fn_placeholder_parameter.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0117_macro_call_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rs
index edb470c89..edb470c89 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0117_macro_call_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0117_macro_call_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.txt
index 892dc813a..892dc813a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0117_macro_call_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0118_impl_inner_attributes.rs b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs
index 4d68cceb7..4d68cceb7 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0118_impl_inner_attributes.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0118_impl_inner_attributes.txt b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.txt
index 0ef3eeb75..0ef3eeb75 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0118_impl_inner_attributes.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0118_match_guard.rs b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rs
index f1bd72fc4..f1bd72fc4 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0118_match_guard.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0118_match_guard.txt b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.txt
index d53e10e86..d53e10e86 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0118_match_guard.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0120_match_arms_inner_attribute.rs b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs
index 54a67c9d7..54a67c9d7 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0120_match_arms_inner_attribute.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0120_match_arms_inner_attribute.txt b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.txt
index 17c296327..17c296327 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0120_match_arms_inner_attribute.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0121_match_arms_outer_attributes.rs b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs
index 676db42d1..676db42d1 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0121_match_arms_outer_attributes.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0121_match_arms_outer_attributes.txt b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt
index 9c238e869..9c238e869 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0121_match_arms_outer_attributes.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs
index e8fdf741f..e8fdf741f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0122_generic_lifetime_type_attribute.txt b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.txt
index a45995236..a45995236 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0122_generic_lifetime_type_attribute.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0123_param_list_vararg.rs b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs
index c59addaf4..c59addaf4 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0123_param_list_vararg.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0123_param_list_vararg.txt b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.txt
index 836e8e55b..836e8e55b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0123_param_list_vararg.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0124_async_fn.rs b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rs
index f4adcb62b..f4adcb62b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0124_async_fn.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0124_async_fn.txt b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.txt
index f0610e781..f0610e781 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0124_async_fn.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0125_crate_keyword_path.rs b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs
index 0f454d121..0f454d121 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0125_crate_keyword_path.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0125_crate_keyword_path.txt b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.txt
index 4afe9c555..4afe9c555 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0125_crate_keyword_path.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0125_struct_literal_field_with_attr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.rs
index a6c7760c7..a6c7760c7 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0125_struct_literal_field_with_attr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0125_struct_literal_field_with_attr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.txt
index f9c5ec124..f9c5ec124 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0125_struct_literal_field_with_attr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0126_attr_on_expr_stmt.rs b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs
index b28c078f9..b28c078f9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0126_attr_on_expr_stmt.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0126_attr_on_expr_stmt.txt b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.txt
index c15c7573a..c15c7573a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0126_attr_on_expr_stmt.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs
index 9c5c8eb36..9c5c8eb36 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0127_attr_on_last_expr_in_block.txt b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.txt
index 62a6a7bc0..62a6a7bc0 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0127_attr_on_last_expr_in_block.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0128_combined_fns.rs b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rs
index 46af91b82..46af91b82 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0128_combined_fns.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0128_combined_fns.txt b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.txt
index 2a16aeb61..2a16aeb61 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0128_combined_fns.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0129_marco_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rs
index 811181d9b..811181d9b 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0129_marco_pat.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0129_marco_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.txt
index 50b4ab2e7..50b4ab2e7 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0129_marco_pat.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0130_let_stmt.rs b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
index 86803fe08..86803fe08 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0130_let_stmt.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0130_let_stmt.txt b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt
index 82c1eb009..82c1eb009 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0130_let_stmt.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0130_try_block_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rs
index 0f1b41eb6..0f1b41eb6 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0130_try_block_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0130_try_block_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.txt
index 53f49b9b5..53f49b9b5 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0130_try_block_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0131_existential_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rs
index 23baf7145..23baf7145 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0131_existential_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0131_existential_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.txt
index 6bfac985a..6bfac985a 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0131_existential_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.txt
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rs
new file mode 100644
index 000000000..fc9923b71
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rs
@@ -0,0 +1,5 @@
+fn foo() {
+    let x = box 1i32;
+    let y = (box 1i32, box 2i32);
+    let z = Foo(box 1i32, box 2i32);
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.txt
new file mode 100644
index 000000000..3d22002a1
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.txt
@@ -0,0 +1,89 @@
+SOURCE_FILE@[0; 106)
+  FN_DEF@[0; 105)
+    FN_KW@[0; 2) "fn"
+    WHITESPACE@[2; 3) " "
+    NAME@[3; 6)
+      IDENT@[3; 6) "foo"
+    PARAM_LIST@[6; 8)
+      L_PAREN@[6; 7) "("
+      R_PAREN@[7; 8) ")"
+    WHITESPACE@[8; 9) " "
+    BLOCK@[9; 105)
+      L_CURLY@[9; 10) "{"
+      WHITESPACE@[10; 15) "\n    "
+      LET_STMT@[15; 32)
+        LET_KW@[15; 18) "let"
+        WHITESPACE@[18; 19) " "
+        BIND_PAT@[19; 20)
+          NAME@[19; 20)
+            IDENT@[19; 20) "x"
+        WHITESPACE@[20; 21) " "
+        EQ@[21; 22) "="
+        WHITESPACE@[22; 23) " "
+        BOX_EXPR@[23; 31)
+          BOX_KW@[23; 26) "box"
+          WHITESPACE@[26; 27) " "
+          LITERAL@[27; 31)
+            INT_NUMBER@[27; 31) "1i32"
+        SEMI@[31; 32) ";"
+      WHITESPACE@[32; 37) "\n    "
+      LET_STMT@[37; 66)
+        LET_KW@[37; 40) "let"
+        WHITESPACE@[40; 41) " "
+        BIND_PAT@[41; 42)
+          NAME@[41; 42)
+            IDENT@[41; 42) "y"
+        WHITESPACE@[42; 43) " "
+        EQ@[43; 44) "="
+        WHITESPACE@[44; 45) " "
+        TUPLE_EXPR@[45; 65)
+          L_PAREN@[45; 46) "("
+          BOX_EXPR@[46; 54)
+            BOX_KW@[46; 49) "box"
+            WHITESPACE@[49; 50) " "
+            LITERAL@[50; 54)
+              INT_NUMBER@[50; 54) "1i32"
+          COMMA@[54; 55) ","
+          WHITESPACE@[55; 56) " "
+          BOX_EXPR@[56; 64)
+            BOX_KW@[56; 59) "box"
+            WHITESPACE@[59; 60) " "
+            LITERAL@[60; 64)
+              INT_NUMBER@[60; 64) "2i32"
+          R_PAREN@[64; 65) ")"
+        SEMI@[65; 66) ";"
+      WHITESPACE@[66; 71) "\n    "
+      LET_STMT@[71; 103)
+        LET_KW@[71; 74) "let"
+        WHITESPACE@[74; 75) " "
+        BIND_PAT@[75; 76)
+          NAME@[75; 76)
+            IDENT@[75; 76) "z"
+        WHITESPACE@[76; 77) " "
+        EQ@[77; 78) "="
+        WHITESPACE@[78; 79) " "
+        CALL_EXPR@[79; 102)
+          PATH_EXPR@[79; 82)
+            PATH@[79; 82)
+              PATH_SEGMENT@[79; 82)
+                NAME_REF@[79; 82)
+                  IDENT@[79; 82) "Foo"
+          ARG_LIST@[82; 102)
+            L_PAREN@[82; 83) "("
+            BOX_EXPR@[83; 91)
+              BOX_KW@[83; 86) "box"
+              WHITESPACE@[86; 87) " "
+              LITERAL@[87; 91)
+                INT_NUMBER@[87; 91) "1i32"
+            COMMA@[91; 92) ","
+            WHITESPACE@[92; 93) " "
+            BOX_EXPR@[93; 101)
+              BOX_KW@[93; 96) "box"
+              WHITESPACE@[96; 97) " "
+              LITERAL@[97; 101)
+                INT_NUMBER@[97; 101) "2i32"
+            R_PAREN@[101; 102) ")"
+        SEMI@[102; 103) ";"
+      WHITESPACE@[103; 104) "\n"
+      R_CURLY@[104; 105) "}"
+  WHITESPACE@[105; 106) "\n"
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0132_default_fn_type.rs b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rs
index 8f5d61113..8f5d61113 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0132_default_fn_type.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0132_default_fn_type.txt b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.txt
index 384b203d3..384b203d3 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0132_default_fn_type.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0134_nocontentexpr_after_item.rs b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs
index eadc7fffb..eadc7fffb 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0134_nocontentexpr_after_item.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0134_nocontentexpr_after_item.txt b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt
index 50d3b5def..50d3b5def 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0134_nocontentexpr_after_item.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0135_first_array_member_attributes.rs b/crates/ra_syntax/test_data/parser/inline/ok/0135_first_array_member_attributes.rs
index f59e13771..f59e13771 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0135_first_array_member_attributes.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0135_first_array_member_attributes.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0135_first_array_member_attributes.txt b/crates/ra_syntax/test_data/parser/inline/ok/0135_first_array_member_attributes.txt
index eac4f6f30..eac4f6f30 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0135_first_array_member_attributes.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0135_first_array_member_attributes.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0136_subsequent_array_member_attributes.rs b/crates/ra_syntax/test_data/parser/inline/ok/0136_subsequent_array_member_attributes.rs
index 1324acb3f..1324acb3f 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0136_subsequent_array_member_attributes.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0136_subsequent_array_member_attributes.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0136_subsequent_array_member_attributes.txt b/crates/ra_syntax/test_data/parser/inline/ok/0136_subsequent_array_member_attributes.txt
index 6fa1b42d9..6fa1b42d9 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0136_subsequent_array_member_attributes.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0136_subsequent_array_member_attributes.txt
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0137_await_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rs
index d2ba89ca6..d2ba89ca6 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0137_await_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0137_await_expr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.txt
index 99bd76ace..99bd76ace 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0137_await_expr.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0000_empty.rs b/crates/ra_syntax/test_data/parser/ok/0000_empty.rs
index e69de29bb..e69de29bb 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0000_empty.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0000_empty.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0000_empty.txt b/crates/ra_syntax/test_data/parser/ok/0000_empty.txt
index 08f5a942f..08f5a942f 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0000_empty.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0000_empty.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0001_struct_item.rs b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rs
index 512aeb3e7..512aeb3e7 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0001_struct_item.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0001_struct_item.txt b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt
index c6653cf25..c6653cf25 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0001_struct_item.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0002_struct_item_field.rs b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rs
index cc3866d25..cc3866d25 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0002_struct_item_field.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0002_struct_item_field.txt b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt
index d0565ea83..d0565ea83 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0002_struct_item_field.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0004_file_shebang.rs b/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rs
index 53dc9e617..53dc9e617 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0004_file_shebang.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0004_file_shebang.txt b/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.txt
index e3915c2df..e3915c2df 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0004_file_shebang.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0005_fn_item.rs b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rs
index 03210551c..03210551c 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0005_fn_item.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0005_fn_item.txt b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.txt
index 9b63a24e4..9b63a24e4 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0005_fn_item.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0006_inner_attributes.rs b/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rs
index e81f8b1e8..e81f8b1e8 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0006_inner_attributes.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0006_inner_attributes.txt b/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.txt
index d8cabc9af..d8cabc9af 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0006_inner_attributes.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.rs b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rs
index ab81a608c..ab81a608c 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.txt b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.txt
index 1ffa36c7e..1ffa36c7e 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0007_extern_crate.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0008_mod_item.rs b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rs
index d22993bc1..d22993bc1 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0008_mod_item.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0008_mod_item.txt b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt
index 9152d6eb6..9152d6eb6 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0008_mod_item.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0009_use_item.rs b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rs
index 05a6aff83..05a6aff83 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0009_use_item.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0009_use_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0009_use_item.txt b/crates/ra_syntax/test_data/parser/ok/0009_use_item.txt
index 41db9dbb7..41db9dbb7 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0009_use_item.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0009_use_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0010_use_path_segments.rs b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rs
index 1e71b7a6c..1e71b7a6c 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0010_use_path_segments.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0010_use_path_segments.txt b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.txt
index 09871b84d..09871b84d 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0010_use_path_segments.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0011_outer_attribute.rs b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rs
index 8b80c0d90..8b80c0d90 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0011_outer_attribute.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0011_outer_attribute.txt b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.txt
index 2a0dc7bad..2a0dc7bad 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0011_outer_attribute.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0012_visibility.rs b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rs
index 75b1db121..75b1db121 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0012_visibility.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0012_visibility.txt b/crates/ra_syntax/test_data/parser/ok/0012_visibility.txt
index c9d038c19..c9d038c19 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0012_visibility.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0013_use_path_self_super.rs b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
index faf6a42c7..faf6a42c7 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0013_use_path_self_super.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0013_use_path_self_super.txt b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.txt
index 50730e958..50730e958 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0013_use_path_self_super.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0014_use_tree.rs b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rs
index 5e4aa3a33..5e4aa3a33 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0014_use_tree.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0014_use_tree.txt b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.txt
index 3fe34d001..3fe34d001 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0014_use_tree.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0014_use_tree.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0015_use_tree.rs b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rs
index 46a0783a2..46a0783a2 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0015_use_tree.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0015_use_tree.txt b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.txt
index e63f14253..e63f14253 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0015_use_tree.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0015_use_tree.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.rs b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rs
index 69638350c..69638350c 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.txt b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt
index ac44093e8..ac44093e8 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0016_struct_flavors.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0017_attr_trailing_comma.rs b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rs
index fe0a7bb97..fe0a7bb97 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0017_attr_trailing_comma.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0017_attr_trailing_comma.txt b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.txt
index cd8f038de..cd8f038de 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0017_attr_trailing_comma.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.rs b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rs
index 88c544923..88c544923 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.txt b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt
index 3f06f20f9..3f06f20f9 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0018_struct_type_params.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0019_enums.rs b/crates/ra_syntax/test_data/parser/ok/0019_enums.rs
index 7a1afa0e6..7a1afa0e6 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0019_enums.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0019_enums.txt b/crates/ra_syntax/test_data/parser/ok/0019_enums.txt
index 37753a7d0..37753a7d0 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0019_enums.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0020_type_param_bounds.rs b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rs
index 712898978..712898978 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0020_type_param_bounds.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0020_type_param_bounds.txt b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.txt
index 18a5fd784..18a5fd784 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0020_type_param_bounds.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0021_extern_fn.rs b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rs
index e929eef74..e929eef74 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0021_extern_fn.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0021_extern_fn.txt b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.txt
index a4e75ec75..a4e75ec75 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0021_extern_fn.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0022_empty_extern_block.rs b/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rs
index f5fe0e6ef..f5fe0e6ef 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0022_empty_extern_block.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0022_empty_extern_block.txt b/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.txt
index bbbd95fd9..bbbd95fd9 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0022_empty_extern_block.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0023_static_items.rs b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rs
index 5fb92ce33..5fb92ce33 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0023_static_items.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0023_static_items.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0023_static_items.txt b/crates/ra_syntax/test_data/parser/ok/0023_static_items.txt
index 5591f95eb..5591f95eb 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0023_static_items.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0023_static_items.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0024_const_item.rs b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rs
index 7446859b5..7446859b5 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0024_const_item.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0024_const_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0024_const_item.txt b/crates/ra_syntax/test_data/parser/ok/0024_const_item.txt
index dea8a3a97..dea8a3a97 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0024_const_item.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0024_const_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0025_extern_fn_in_block.rs b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rs
index 289809809..289809809 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0025_extern_fn_in_block.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0025_extern_fn_in_block.txt b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.txt
index a345f4bc2..a345f4bc2 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0025_extern_fn_in_block.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0026_const_fn_in_block.rs b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rs
index 7641a3d28..7641a3d28 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0026_const_fn_in_block.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0026_const_fn_in_block.txt b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.txt
index cbcd15a00..cbcd15a00 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0026_const_fn_in_block.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0027_unsafe_fn_in_block.rs b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs
index f3c5ff938..f3c5ff938 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0027_unsafe_fn_in_block.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0027_unsafe_fn_in_block.txt b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.txt
index f86375983..f86375983 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0027_unsafe_fn_in_block.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0028_operator_binding_power.rs b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rs
index cc9598470..cc9598470 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0028_operator_binding_power.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0028_operator_binding_power.txt b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.txt
index b0667643b..b0667643b 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0028_operator_binding_power.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0029_range_forms.rs b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rs
index f9ff444d4..f9ff444d4 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0029_range_forms.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0029_range_forms.txt b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.txt
index e4db98c88..e4db98c88 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0029_range_forms.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0030_string_suffixes.rs b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rs
index 261aad1fb..261aad1fb 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0030_string_suffixes.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0030_string_suffixes.txt b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.txt
index 4f7e809c5..4f7e809c5 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0030_string_suffixes.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0030_traits.rs b/crates/ra_syntax/test_data/parser/ok/0030_traits.rs
index 23c4be0e1..23c4be0e1 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0030_traits.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0030_traits.txt b/crates/ra_syntax/test_data/parser/ok/0030_traits.txt
index b656c1a81..b656c1a81 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0030_traits.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0030_traits.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0031_extern.rs b/crates/ra_syntax/test_data/parser/ok/0031_extern.rs
index b33ac273c..b33ac273c 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0031_extern.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0031_extern.txt b/crates/ra_syntax/test_data/parser/ok/0031_extern.txt
index badbf76c5..badbf76c5 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0031_extern.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0031_extern.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0032_where_for.rs b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rs
index 588170fbe..588170fbe 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0032_where_for.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0032_where_for.txt b/crates/ra_syntax/test_data/parser/ok/0032_where_for.txt
index 9b1d0e84a..9b1d0e84a 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0032_where_for.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0033_label_break.rs b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rs
index 728d78137..728d78137 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0033_label_break.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0033_label_break.txt b/crates/ra_syntax/test_data/parser/ok/0033_label_break.txt
index 845a8d7af..845a8d7af 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0033_label_break.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0034_crate_path_in_call.rs b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rs
index f1ed30220..f1ed30220 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0034_crate_path_in_call.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0034_crate_path_in_call.txt b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.txt
index a77d4aabe..a77d4aabe 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0034_crate_path_in_call.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0035_weird_exprs.rs b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rs
index 8c1323163..8c1323163 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0035_weird_exprs.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0035_weird_exprs.txt b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt
index c89b591e9..c89b591e9 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0035_weird_exprs.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.rs b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rs
index 6da27933e..6da27933e 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.txt
index 86263c0bb..86263c0bb 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0037_mod.rs b/crates/ra_syntax/test_data/parser/ok/0037_mod.rs
index 7e5a1b835..7e5a1b835 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0037_mod.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0037_mod.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0037_mod.txt b/crates/ra_syntax/test_data/parser/ok/0037_mod.txt
index 3af40a104..3af40a104 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0037_mod.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0037_mod.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0038_where_pred_type.rs b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rs
index 8bfc341a5..8bfc341a5 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0038_where_pred_type.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0038_where_pred_type.txt b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.txt
index 7a5507473..7a5507473 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0038_where_pred_type.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.rs b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rs
index 8380d1e79..8380d1e79 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.txt b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.txt
index 69fac87e3..69fac87e3 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.rs b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rs
index 098a60a72..098a60a72 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.txt b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt
index 3c717555d..3c717555d 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.rs b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rs
index d59a6d347..d59a6d347 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.txt b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.txt
index 554b52f85..554b52f85 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0042_ufcs_call_list.rs b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rs
index 6c02e65ed..6c02e65ed 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0042_ufcs_call_list.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0042_ufcs_call_list.txt b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.txt
index 19951011e..19951011e 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0042_ufcs_call_list.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0043_complex_assignment.rs b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rs
index 7e4a28bf7..7e4a28bf7 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0043_complex_assignment.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0043_complex_assignment.txt b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt
index ef47521bf..ef47521bf 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0043_complex_assignment.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.rs b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rs
index 325a97aeb..325a97aeb 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.txt b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.txt
index b928adaad..b928adaad 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0044_let_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0045_block_inner_attrs.rs b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rs
index 88df8138e..88df8138e 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0045_block_inner_attrs.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0045_block_inner_attrs.txt b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.txt
index f6d3bf302..f6d3bf302 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0045_block_inner_attrs.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0046_extern_inner_attributes.rs b/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rs
index fe67e2df4..fe67e2df4 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0046_extern_inner_attributes.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0046_extern_inner_attributes.txt b/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.txt
index 4487a6e2e..4487a6e2e 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0046_extern_inner_attributes.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0047_minus_in_inner_pattern.rs b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs
index bbd6b0f6e..bbd6b0f6e 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0047_minus_in_inner_pattern.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0047_minus_in_inner_pattern.txt b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt
index 917b50ddf..917b50ddf 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0047_minus_in_inner_pattern.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0048_compound_assignment.rs b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rs
index 871720a49..871720a49 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0048_compound_assignment.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0048_compound_assignment.txt b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.txt
index 3fca4993a..3fca4993a 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0048_compound_assignment.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0049_async_block.rs b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rs
index 4781b3225..4781b3225 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0049_async_block.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0049_async_block.txt b/crates/ra_syntax/test_data/parser/ok/0049_async_block.txt
index 517982ddc..517982ddc 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0049_async_block.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.txt
diff --git a/crates/ra_syntax/tests/data/parser/ok/0050_async_block_as_argument.rs b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rs
index ec4612cff..ec4612cff 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0050_async_block_as_argument.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rs
diff --git a/crates/ra_syntax/tests/data/parser/ok/0050_async_block_as_argument.txt b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.txt
index 64da5878b..64da5878b 100644
--- a/crates/ra_syntax/tests/data/parser/ok/0050_async_block_as_argument.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.txt
diff --git a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0000.rs b/crates/ra_syntax/test_data/reparse/fuzz-failures/0000.rs
index 388eb74ed..388eb74ed 100644
--- a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0000.rs
+++ b/crates/ra_syntax/test_data/reparse/fuzz-failures/0000.rs
diff --git a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0001.rs b/crates/ra_syntax/test_data/reparse/fuzz-failures/0001.rs
index d2d42c6f9..d2d42c6f9 100644
--- a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0001.rs
+++ b/crates/ra_syntax/test_data/reparse/fuzz-failures/0001.rs
diff --git a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0002.rs b/crates/ra_syntax/test_data/reparse/fuzz-failures/0002.rs
index 3fbee1548..3fbee1548 100644
--- a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0002.rs
+++ b/crates/ra_syntax/test_data/reparse/fuzz-failures/0002.rs
diff --git a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0003.rs b/crates/ra_syntax/test_data/reparse/fuzz-failures/0003.rs
index d2757cd08..d2757cd08 100644
--- a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0003.rs
+++ b/crates/ra_syntax/test_data/reparse/fuzz-failures/0003.rs
Binary files differ
diff --git a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0004.rs b/crates/ra_syntax/test_data/reparse/fuzz-failures/0004.rs
index 481617a70..481617a70 100644
--- a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0004.rs
+++ b/crates/ra_syntax/test_data/reparse/fuzz-failures/0004.rs
diff --git a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0005.rs b/crates/ra_syntax/test_data/reparse/fuzz-failures/0005.rs
index 074d761c7..074d761c7 100644
--- a/crates/ra_syntax/tests/data/reparse/fuzz-failures/0005.rs
+++ b/crates/ra_syntax/test_data/reparse/fuzz-failures/0005.rs
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0132_box_expr.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0132_box_expr.rs
deleted file mode 100644
index e69c81e22..000000000
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0132_box_expr.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn foo() {
-    let x = box 1i32;
-}
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0132_box_expr.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0132_box_expr.txt
deleted file mode 100644
index f4eeb7e24..000000000
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0132_box_expr.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-SOURCE_FILE@[0; 35)
-  FN_DEF@[0; 34)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    PARAM_LIST@[6; 8)
-      L_PAREN@[6; 7) "("
-      R_PAREN@[7; 8) ")"
-    WHITESPACE@[8; 9) " "
-    BLOCK@[9; 34)
-      L_CURLY@[9; 10) "{"
-      WHITESPACE@[10; 15) "\n    "
-      LET_STMT@[15; 32)
-        LET_KW@[15; 18) "let"
-        WHITESPACE@[18; 19) " "
-        BIND_PAT@[19; 20)
-          NAME@[19; 20)
-            IDENT@[19; 20) "x"
-        WHITESPACE@[20; 21) " "
-        EQ@[21; 22) "="
-        WHITESPACE@[22; 23) " "
-        BOX_EXPR@[23; 31)
-          BOX_KW@[23; 26) "box"
-          WHITESPACE@[26; 27) " "
-          LITERAL@[27; 31)
-            INT_NUMBER@[27; 31) "1i32"
-        SEMI@[31; 32) ";"
-      WHITESPACE@[32; 33) "\n"
-      R_CURLY@[33; 34) "}"
-  WHITESPACE@[34; 35) "\n"
diff --git a/crates/ra_tools/src/lib.rs b/crates/ra_tools/src/lib.rs
index d56e0d2ef..bb7845f7d 100644
--- a/crates/ra_tools/src/lib.rs
+++ b/crates/ra_tools/src/lib.rs
@@ -15,8 +15,8 @@ pub type Result<T> = std::result::Result<T, Box<dyn Error>>;
 pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron";
 const GRAMMAR_DIR: &str = "crates/ra_parser/src/grammar";
-const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/tests/data/parser/inline/ok";
+const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok";
-const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/tests/data/parser/inline/err";
+const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/err";
 pub const SYNTAX_KINDS: &str = "crates/ra_parser/src/syntax_kind/generated.rs.tera";
 pub const AST: &str = "crates/ra_syntax/src/ast/generated.rs.tera";
@@ -79,6 +79,29 @@ pub fn project_root() -> PathBuf {
    Path::new(&env!("CARGO_MANIFEST_DIR")).ancestors().nth(2).unwrap().to_path_buf()
 }
+pub struct Cmd {
+    pub unix: &'static str,
+    pub windows: &'static str,
+    pub work_dir: &'static str,
+}
+impl Cmd {
+    pub fn run(self) -> Result<()> {
+        if cfg!(windows) {
+            run(self.windows, self.work_dir)
+        } else {
+            run(self.unix, self.work_dir)
+        }
+    }
+    pub fn run_with_output(self) -> Result<Output> {
+        if cfg!(windows) {
+            run_with_output(self.windows, self.work_dir)
+        } else {
+            run_with_output(self.unix, self.work_dir)
+        }
+    }
+}
 pub fn run(cmdline: &str, dir: &str) -> Result<()> {
    do_run(cmdline, dir, |c| {
        c.stdout(Stdio::inherit());
diff --git a/crates/ra_tools/src/main.rs b/crates/ra_tools/src/main.rs
index 7ed592f71..4fcb2adeb 100644
--- a/crates/ra_tools/src/main.rs
+++ b/crates/ra_tools/src/main.rs
@@ -1,70 +1,73 @@
-use clap::{App, SubCommand};
+use clap::{App, Arg, SubCommand};
 use core::str;
 use ra_tools::{
-    gen_tests, generate, install_format_hook, run, run_clippy, run_fuzzer, run_rustfmt,
+    gen_tests, generate, install_format_hook, run, run_clippy, run_fuzzer, run_rustfmt, Cmd,
-    run_with_output, Overwrite, Result,
+    Overwrite, Result,
 };
 use std::{env, path::PathBuf};
+struct InstallOpt {
+    client: Option<ClientOpt>,
+    server: Option<ServerOpt>,
+}
+enum ClientOpt {
+    VsCode,
+}
+struct ServerOpt {
+    jemalloc: bool,
+}
 fn main() -> Result<()> {
    let matches = App::new("tasks")
        .setting(clap::AppSettings::SubcommandRequiredElseHelp)
        .subcommand(SubCommand::with_name("gen-syntax"))
        .subcommand(SubCommand::with_name("gen-tests"))
-        .subcommand(SubCommand::with_name("install-code"))
+        .subcommand(
+            SubCommand::with_name("install-ra")
+                .arg(Arg::with_name("server").long("--server"))
+                .arg(Arg::with_name("jemalloc").long("jemalloc"))
+                .arg(Arg::with_name("client-code").long("client-code").conflicts_with("server")),
+        )
+        .alias("install-code")
        .subcommand(SubCommand::with_name("format"))
        .subcommand(SubCommand::with_name("format-hook"))
        .subcommand(SubCommand::with_name("fuzz-tests"))
        .subcommand(SubCommand::with_name("lint"))
        .get_matches();
-    match matches.subcommand_name().expect("Subcommand must be specified") {
+    match matches.subcommand() {
-        "install-code" => {
+        ("install-ra", Some(matches)) => {
-            if cfg!(target_os = "macos") {
+            let opts = InstallOpt {
-                fix_path_for_mac()?;
+                client: if matches.is_present("server") { None } else { Some(ClientOpt::VsCode) },
-            }
+                server: if matches.is_present("client-code") {
-            install_code_extension()?;
+                    None
+                } else {
+                    Some(ServerOpt { jemalloc: matches.is_present("jemalloc") })
+                },
+            };
+            install(opts)?
        }
-        "gen-tests" => gen_tests(Overwrite)?,
+        ("gen-tests", _) => gen_tests(Overwrite)?,
-        "gen-syntax" => generate(Overwrite)?,
+        ("gen-syntax", _) => generate(Overwrite)?,
-        "format" => run_rustfmt(Overwrite)?,
+        ("format", _) => run_rustfmt(Overwrite)?,
-        "format-hook" => install_format_hook()?,
+        ("format-hook", _) => install_format_hook()?,
-        "lint" => run_clippy()?,
+        ("lint", _) => run_clippy()?,
-        "fuzz-tests" => run_fuzzer()?,
+        ("fuzz-tests", _) => run_fuzzer()?,
        _ => unreachable!(),
    }
    Ok(())
 }
-fn install_code_extension() -> Result<()> {
+fn install(opts: InstallOpt) -> Result<()> {
-    run("cargo install --path crates/ra_lsp_server --force", ".")?;
+    if cfg!(target_os = "macos") {
-    if cfg!(windows) {
+        fix_path_for_mac()?
-        run(r"cmd.exe /c npm.cmd ci", "./editors/code")?;
-        run(r"cmd.exe /c npm.cmd run package", "./editors/code")?;
-    } else {
-        run(r"npm ci", "./editors/code")?;
-        run(r"npm run package", "./editors/code")?;
    }
-    if cfg!(windows) {
+    if let Some(client) = opts.client {
-        run(
+        install_client(client)?;
-            r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix --force",
-            "./editors/code",
-        )?;
-    } else {
-        run(r"code --install-extension ./ra-lsp-0.0.1.vsix --force", "./editors/code")?;
    }
-    verify_installed_extensions()?;
+    if let Some(server) = opts.server {
-    Ok(())
+        install_server(server)?;
-}
-fn verify_installed_extensions() -> Result<()> {
-    let exts = if cfg!(windows) {
-        run_with_output(r"cmd.exe /c code.cmd --list-extensions", ".")?
-    } else {
-        run_with_output(r"code --list-extensions", ".")?
-    };
-    if !str::from_utf8(&exts.stdout)?.contains("ra-lsp") {
-        Err("Could not install the Visual Studio Code extension. Please make sure you \
-             have at least NodeJS 10.x installed and try again.")?;
    }
    Ok(())
 }
@@ -101,3 +104,53 @@ fn fix_path_for_mac() -> Result<()> {
    Ok(())
 }
+fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
+    Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm.cmd ci", work_dir: "./editors/code" }.run()?;
+    Cmd {
+        unix: r"npm run package",
+        windows: r"cmd.exe /c npm.cmd run package",
+        work_dir: "./editors/code",
+    }
+    .run()?;
+    let code_in_path = Cmd {
+        unix: r"code --version",
+        windows: r"cmd.exe /c code.cmd --version",
+        work_dir: "./editors/code",
+    }
+    .run()
+    .is_ok();
+    if !code_in_path {
+        Err("Can't execute `code --version`. Perhaps it is not in $PATH?")?;
+    }
+    Cmd {
+        unix: r"code --install-extension ./ra-lsp-0.0.1.vsix --force",
+        windows: r"cmd.exe /c code.cmd --install-extension ./ra-lsp-0.0.1.vsix --force",
+        work_dir: "./editors/code",
+    }
+    .run()?;
+    let output = Cmd {
+        unix: r"code --list-extensions",
+        windows: r"cmd.exe /c code.cmd --list-extensions",
+        work_dir: ".",
+    }
+    .run_with_output()?;
+    if !str::from_utf8(&output.stdout)?.contains("ra-lsp") {
+        Err("Could not install the Visual Studio Code extension. \
+             Please make sure you have at least NodeJS 10.x installed and try again.")?;
+    }
+    Ok(())
+}
+fn install_server(opts: ServerOpt) -> Result<()> {
+    if opts.jemalloc {
+        run("cargo install --path crates/ra_lsp_server --force --features jemalloc", ".")
+    } else {
+        run("cargo install --path crates/ra_lsp_server --force", ".")
+    }
+}
diff --git a/docs/dev/README.md b/docs/dev/README.md
index 0a148ed32..0db3e731e 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -66,7 +66,7 @@ typescript) and Emacs (in elisp). The `docs` top-level directory contains both
 developer and user documentation.
 We have some automation infra in Rust in the `crates/tool` package. It contains
-stuff like formatting checking, code generation and powers `cargo install-code`.
+stuff like formatting checking, code generation and powers `cargo install-ra`.
 The latter syntax is achieved with the help of cargo aliases (see `.cargo`
 directory).
@@ -84,7 +84,7 @@ However, launching a VS Code instance with locally build language server is
 possible. There's even a VS Code task for this, so just <kbd>F5</kbd> should
 work (thanks, [@andrew-w-ross](https://github.com/andrew-w-ross)!).
-I often just install development version with `cargo jinstall-lsp` and
+I often just install development version with `cargo install-ra --server --jemalloc` and
 restart the host VS Code.
 See [./debugging.md](./debugging.md) for how to attach to rust-analyzer with
@@ -110,12 +110,14 @@ ways:
 2. Run `npm test` from the command line. Although this is initiated from the
   command line it is not headless; it will also launch a temporary instance of
-   VS Code. 
+   VS Code.
 Due to the requirements of running the tests inside VS Code they are **not run
 on CI**. When making changes to the extension please ensure the tests are not
 broken locally before opening a Pull Request.
+To install **only** the VS Code extension, use `cargo install-ra --client-code`.
 # Logging
 Logging is done by both rust-analyzer and VS Code, so it might be tricky to
@@ -151,7 +153,7 @@ There's also two VS Code commands which might be of interest:
  $ cargo install --path crates/ra_lsp_server --force --features jemalloc
  ```
-  There's an alias for this: `cargo jinstall-lsp`.
+  There's an alias for this: `cargo install-ra --server --jemalloc`.
 * `Rust Analyzer: Syntax Tree` shows syntax tree of the current file/selection.
diff --git a/docs/user/README.md b/docs/user/README.md
index d56330192..a5e17f604 100644
--- a/docs/user/README.md
+++ b/docs/user/README.md
@@ -1,6 +1,6 @@
 The main interface to rust-analyzer is the
 [LSP](https://microsoft.github.io/language-server-protocol/) implementation. To
-install lsp server, use `cargo install-lsp`, which is a shorthand for `cargo
+install lsp server, use `cargo install-ra --server`, which is a shorthand for `cargo
 install --package ra_lsp_server`. The binary is named `ra_lsp_server`, you
 should be able to use it with any LSP-compatible editor. We use custom
 extensions to LSP, so special client-side support is required to take full
@@ -33,7 +33,7 @@ following commands:
 ```
 $ git clone https://github.com/rust-analyzer/rust-analyzer.git --depth 1
 $ cd rust-analyzer
-$ cargo install-code
+$ cargo install-ra
 ```
 The automatic installation is expected to *just work* for common cases, if it
@@ -58,6 +58,9 @@ Beyond basic LSP features, there are some extension commands which you can
 invoke via <kbd>Ctrl+Shift+P</kbd> or bind to a shortcut. See [./features.md](./features.md)
 for details.
+For updates, pull the latest changes from the master branch, run `cargo install-ra` again, and **restart** VS Code instance.
+See https://github.com/microsoft/vscode/issues/72308[microsoft/vscode#72308] for why a full restart is needed.
 ### Settings
 * `rust-analyzer.highlightingOn`: enables experimental syntax highlighting
@@ -86,7 +89,7 @@ Installation:
 [ra-emacs-lsp.el](https://github.com/rust-analyzer/rust-analyzer/blob/69ee5c9c5ef212f7911028c9ddf581559e6565c3/editors/emacs/ra-emacs-lsp.el)
 to load path and require it in `init.el`
 * run `lsp` in a rust buffer
-* (Optionally) bind commands like `rust-analyzer-join-lines` or `rust-analyzer-extend-selection` to keys
+* (Optionally) bind commands like `rust-analyzer-join-lines` or `rust-analyzer-extend-selection` to keys, and enable `rust-analyzer-inlay-hints-mode` to get inline type hints
 ## Vim and NeoVim
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index b924b2471..56cac1b49 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -5,18 +5,18 @@
    "requires": true,
    "dependencies": {
        "@babel/code-frame": {
-            "version": "7.0.0",
+            "version": "7.5.5",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-            "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+            "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
            "dev": true,
            "requires": {
                "@babel/highlight": "^7.0.0"
            }
        },
        "@babel/highlight": {
-            "version": "7.0.0",
+            "version": "7.5.0",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-            "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+            "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
            "dev": true,
            "requires": {
                "chalk": "^2.0.0",
@@ -25,15 +25,15 @@
            }
        },
        "@types/mocha": {
-            "version": "5.2.6",
+            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.6.tgz",
+            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
-            "integrity": "sha512-1axi39YdtBI7z957vdqXI4Ac25e7YihYQtJa+Clnxg1zTJEaIRbndt71O3sP4GAMgiAm0pY26/b9BrY4MR/PMw==",
+            "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
            "dev": true
        },
        "@types/node": {
-            "version": "10.14.5",
+            "version": "10.14.13",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.5.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.13.tgz",
-            "integrity": "sha512-Ja7d4s0qyGFxjGeDq5S7Si25OFibSAHUi6i17UWnwNnpitADN7hah9q0Tl25gxuV5R1u2Bx+np6w4LHXfHyj/g==",
+            "integrity": "sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==",
            "dev": true
        },
        "@types/seedrandom": {
@@ -43,18 +43,18 @@
            "dev": true
        },
        "agent-base": {
-            "version": "4.2.1",
+            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-            "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+            "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
            "dev": true,
            "requires": {
                "es6-promisify": "^5.0.0"
            }
        },
        "ajv": {
-            "version": "6.10.0",
+            "version": "6.10.2",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-            "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+            "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
            "dev": true,
            "requires": {
                "fast-deep-equal": "^2.0.1",
@@ -158,9 +158,9 @@
            }
        },
        "browser-stdout": {
-            "version": "1.3.0",
+            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-            "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+            "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
            "dev": true
        },
        "buffer-crc32": {
@@ -228,9 +228,9 @@
            "dev": true
        },
        "combined-stream": {
-            "version": "1.0.7",
+            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
            "dev": true,
            "requires": {
                "delayed-stream": "~1.0.0"
@@ -372,9 +372,9 @@
            "dev": true
        },
        "es6-promise": {
-            "version": "4.2.6",
+            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
+            "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-            "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==",
+            "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
            "dev": true
        },
        "es6-promisify": {
@@ -484,9 +484,9 @@
            }
        },
        "growl": {
-            "version": "1.10.3",
+            "version": "1.10.5",
-            "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
+            "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-            "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
+            "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
            "dev": true
        },
        "har-schema": {
@@ -553,12 +553,12 @@
            }
        },
        "https-proxy-agent": {
-            "version": "2.2.1",
+            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
-            "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
+            "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
            "dev": true,
            "requires": {
-                "agent-base": "^4.1.0",
+                "agent-base": "^4.3.0",
                "debug": "^3.1.0"
            }
        },
@@ -649,18 +649,18 @@
            }
        },
        "linkify-it": {
-            "version": "2.1.0",
+            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
-            "integrity": "sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==",
+            "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
            "dev": true,
            "requires": {
                "uc.micro": "^1.0.1"
            }
        },
        "lodash": {
-            "version": "4.17.14",
+            "version": "4.17.15",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-            "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
+            "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
            "dev": true
        },
        "markdown-it": {
@@ -728,33 +728,28 @@
            }
        },
        "mocha": {
-            "version": "4.1.0",
+            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-            "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==",
+            "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
            "dev": true,
            "requires": {
-                "browser-stdout": "1.3.0",
+                "browser-stdout": "1.3.1",
-                "commander": "2.11.0",
+                "commander": "2.15.1",
                "debug": "3.1.0",
-                "diff": "3.3.1",
+                "diff": "3.5.0",
                "escape-string-regexp": "1.0.5",
                "glob": "7.1.2",
-                "growl": "1.10.3",
+                "growl": "1.10.5",
                "he": "1.1.1",
+                "minimatch": "3.0.4",
                "mkdirp": "0.5.1",
-                "supports-color": "4.4.0"
+                "supports-color": "5.4.0"
            },
            "dependencies": {
                "commander": {
-                    "version": "2.11.0",
+                    "version": "2.15.1",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-                    "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+                    "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-                    "dev": true
-                },
-                "diff": {
-                    "version": "3.3.1",
-                    "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
-                    "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
                    "dev": true
                },
                "glob": {
@@ -771,19 +766,13 @@
                        "path-is-absolute": "^1.0.0"
                    }
                },
-                "has-flag": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-                    "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-                    "dev": true
-                },
                "supports-color": {
-                    "version": "4.4.0",
+                    "version": "5.4.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-                    "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
                    "dev": true,
                    "requires": {
-                        "has-flag": "^2.0.0"
+                        "has-flag": "^3.0.0"
                    }
                }
            }
@@ -895,15 +884,15 @@
            "dev": true
        },
        "prettier": {
-            "version": "1.17.0",
+            "version": "1.18.2",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.17.0.tgz",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
-            "integrity": "sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw==",
+            "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==",
            "dev": true
        },
        "psl": {
-            "version": "1.1.31",
+            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+            "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
-            "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+            "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==",
            "dev": true
        },
        "punycode": {
@@ -1133,15 +1122,15 @@
            }
        },
        "tslib": {
-            "version": "1.9.3",
+            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-            "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+            "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
            "dev": true
        },
        "tslint": {
-            "version": "5.16.0",
+            "version": "5.18.0",
-            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.16.0.tgz",
+            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.18.0.tgz",
-            "integrity": "sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==",
+            "integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==",
            "dev": true,
            "requires": {
                "@babel/code-frame": "^7.0.0",
@@ -1150,7 +1139,7 @@
                "commander": "^2.12.1",
                "diff": "^3.2.0",
                "glob": "^7.1.1",
-                "js-yaml": "^3.13.0",
+                "js-yaml": "^3.13.1",
                "minimatch": "^3.0.4",
                "mkdirp": "^0.5.1",
                "resolve": "^1.3.2",
@@ -1206,9 +1195,9 @@
            }
        },
        "typescript": {
-            "version": "3.4.4",
+            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.4.tgz",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
-            "integrity": "sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==",
+            "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
            "dev": true
        },
        "uc.micro": {
@@ -1239,12 +1228,12 @@
            "dev": true
        },
        "url-parse": {
-            "version": "1.4.6",
+            "version": "1.4.7",
-            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.6.tgz",
+            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-            "integrity": "sha512-/B8AD9iQ01seoXmXf9z/MjLZQIdOoYl/+gvsQF6+mpnxaTfG9P7srYaiqaDMyKkR36XMXfhqSHss5MyFAO8lew==",
+            "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
            "dev": true,
            "requires": {
-                "querystringify": "^2.0.0",
+                "querystringify": "^2.1.1",
                "requires-port": "^1.0.0"
            }
        },
@@ -1272,9 +1261,9 @@
            }
        },
        "vsce": {
-            "version": "1.64.0",
+            "version": "1.66.0",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.64.0.tgz",
+            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.66.0.tgz",
-            "integrity": "sha512-t3R7QTe2nAXQZs2kD+nA8GjdlX8pAQlnzxaNTG2976i5cyQ8r+ZsMNa/f9PDt7bhjcQM+u/fL+LkNuw+hwoy2A==",
+            "integrity": "sha512-Zf4+WD4PhEcOr7jkU08SI9lwFqDhmhk73YOCGQ/tNLaBy+PnnX4eSdqj9LdzDLuI2dsyomJLXzDSNgxuaInxCQ==",
            "dev": true,
            "requires": {
                "azure-devops-node-api": "^7.2.0",
@@ -1300,52 +1289,52 @@
            }
        },
        "vscode": {
-            "version": "1.1.33",
+            "version": "1.1.35",
-            "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.33.tgz",
+            "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.35.tgz",
-            "integrity": "sha512-sXedp2oF6y4ZvqrrFiZpeMzaCLSWV+PpYkIxjG/iYquNZ9KrLL2LujltGxPLvzn49xu2sZkyC+avVNFgcJD1Iw==",
+            "integrity": "sha512-xPnxzQU40LOS2yPyzWW+WKpTV6qA3z16TcgpZ9O38UWLA157Zz4GxUx5H7Gd07pxzw0GqvusbF4D+5GBgNxvEQ==",
            "dev": true,
            "requires": {
                "glob": "^7.1.2",
-                "mocha": "^4.0.1",
+                "mocha": "^5.2.0",
                "request": "^2.88.0",
                "semver": "^5.4.1",
                "source-map-support": "^0.5.0",
                "url-parse": "^1.4.4",
-                "vscode-test": "^0.1.4"
+                "vscode-test": "^0.4.1"
            }
        },
        "vscode-jsonrpc": {
-            "version": "4.1.0-next.1",
+            "version": "4.1.0-next.2",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.1.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.2.tgz",
-            "integrity": "sha512-FzNkvHmg3GXpzZAlnGnpdRbQQX6LDRb0bvc+oxxjMUwIJ66kTO/DyeE2bwU0fsiOEGfsJTCzvjESVl368jZ0/g=="
+            "integrity": "sha512-GsBLjP9DxQ42yl1mW9GEIlnSc0+R8mfzhaebwmmTPEJjezD5SPoAo3DFrIAFZha9yvQ1nzZfZlhtVpGQmgxtXg=="
        },
        "vscode-languageclient": {
-            "version": "5.3.0-next.4",
+            "version": "5.3.0-next.6",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.3.0-next.4.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.3.0-next.6.tgz",
-            "integrity": "sha512-RODuzXErVpJRSgHv+Xei8fwQtZ/iZOWPCqlLl07NTtkzgTAepJf9r4EioZVuTviGJ5DEJ9xs0bjrit8shKtW6Q==",
+            "integrity": "sha512-DxT8+gkenjCjJV6ArcP75/AQfx6HP6m6kHIbacPCpffMeoE1YMLKj6ZixA9J87yr0fMtBmqumLmDeGe7MIF2bw==",
            "requires": {
                "semver": "^5.5.0",
-                "vscode-languageserver-protocol": "3.15.0-next.4"
+                "vscode-languageserver-protocol": "^3.15.0-next.6"
            }
        },
        "vscode-languageserver-protocol": {
-            "version": "3.15.0-next.4",
+            "version": "3.15.0-next.6",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.4.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.6.tgz",
-            "integrity": "sha512-4AgisQ8GWa3irdRu3/UNr3brcSSm0oobmoV1eSOnV7JM32lYyXDnSKB7RuTTXvaAjD/0xQJLEGhkyGHS5gbywA==",
+            "integrity": "sha512-/yDpYlWyNs26mM23mT73xmOFsh1iRfgZfBdHmfAxwDKwpQKLoOSqVidtYfxlK/pD3IEKGcAVnT4WXTsguxxAMQ==",
            "requires": {
-                "vscode-jsonrpc": "^4.1.0-next.1",
+                "vscode-jsonrpc": "^4.1.0-next.2",
-                "vscode-languageserver-types": "3.15.0-next.1"
+                "vscode-languageserver-types": "^3.15.0-next.2"
            }
        },
        "vscode-languageserver-types": {
-            "version": "3.15.0-next.1",
+            "version": "3.15.0-next.2",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.1.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.2.tgz",
-            "integrity": "sha512-R0kzmaI8gOGEoU7b9huYQAzgZzRQ/5Q8HKjsIUdfz0MjXcBZ4tr1ik1So1p1O5kGrI1VTCd22Fw/wI7ECGoIPw=="
+            "integrity": "sha512-2JkrMWWUi2rlVLSo9OFR2PIGUzdiowEM8NgNYiwLKnXTjpwpjjIrJbNNxDik7Rv4oo9KtikcFQZKXbrKilL/MQ=="
        },
        "vscode-test": {
-            "version": "0.1.5",
+            "version": "0.4.3",
-            "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-0.1.5.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-0.4.3.tgz",
-            "integrity": "sha512-s+lbF1Dtasc0yXVB9iQTexBe2JK6HJAUJe3fWezHKIjq+xRw5ZwCMEMBaonFIPy7s95qg2HPTRDR5W4h4kbxGw==",
+            "integrity": "sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==",
            "dev": true,
            "requires": {
                "http-proxy-agent": "^2.1.0",
diff --git a/editors/code/package.json b/editors/code/package.json
index ea74ab85a..808dc5dc1 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -25,7 +25,7 @@
        "lint": "tslint --project .",
        "test": "node node_modules/vscode/bin/test",
        "prettier": "prettier **/*.{json,ts}",
-        "travis": "npm run compile && npm run test && npm run lint && npm run prettier -- --list-different"
+        "travis": "npm run compile && npm run test && npm run lint && npm run prettier -- --write && git diff --exit-code"
    },
    "prettier": {
        "tabWidth": 4,
@@ -36,16 +36,16 @@
        "vscode-languageclient": "^5.3.0-next.4"
    },
    "devDependencies": {
-        "@types/mocha": "^5.2.6",
+        "@types/mocha": "^5.2.7",
-        "@types/node": "^10.14.5",
+        "@types/node": "^10.14.13",
        "@types/seedrandom": "^2.4.28",
-        "prettier": "^1.17.0",
+        "prettier": "^1.18.2",
        "shx": "^0.3.1",
-        "tslint": "^5.16.0",
+        "tslint": "^5.18.0",
        "tslint-config-prettier": "^1.18.0",
-        "typescript": "^3.4.4",
+        "typescript": "^3.5.3",
-        "vsce": "^1.64.0",
+        "vsce": "^1.66.0",
-        "vscode": "^1.1.33"
+        "vscode": "^1.1.35"
    },
    "activationEvents": [
        "onLanguage:rust",
@@ -238,6 +238,11 @@
                    "type": "number",
                    "default": null,
                    "description": "Number of syntax trees rust-analyzer keeps in memory"
+                },
+                "rust-analyzer.displayInlayHints": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Display additional type information in the editor"
                }
            }
        },
@@ -444,6 +449,15 @@
                    "light": "#000000",
                    "highContrast": "#FFFFFF"
                }
+            },
+            {
+                "id": "ralsp.inlayHint",
+                "description": "Color for inlay hints",
+                "defaults": {
+                    "dark": "#A0A0A0F0",
+                    "light": "#747474",
+                    "highContrast": "#BEBEBE"
+                }
            }
        ]
    }
diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index 194658497..c194bd2ea 100644
--- a/editors/code/src/commands/index.ts
+++ b/editors/code/src/commands/index.ts
@@ -1,5 +1,6 @@
 import * as analyzerStatus from './analyzer_status';
 import * as applySourceChange from './apply_source_change';
+import * as inlayHints from './inlay_hints';
 import * as joinLines from './join_lines';
 import * as matchingBrace from './matching_brace';
 import * as onEnter from './on_enter';
@@ -15,5 +16,6 @@ export {
    parentModule,
    runnables,
    syntaxTree,
-    onEnter
+    onEnter,
+    inlayHints
 };
diff --git a/editors/code/src/commands/inlay_hints.ts b/editors/code/src/commands/inlay_hints.ts
new file mode 100644
index 000000000..3ba9da48b
--- /dev/null
+++ b/editors/code/src/commands/inlay_hints.ts
@@ -0,0 +1,109 @@
+import * as vscode from 'vscode';
+import { Range, TextDocumentChangeEvent, TextEditor } from 'vscode';
+import { TextDocumentIdentifier } from 'vscode-languageclient';
+import { Server } from '../server';
+interface InlayHintsParams {
+    textDocument: TextDocumentIdentifier;
+}
+interface InlayHint {
+    range: Range;
+    kind: string;
+    label: string;
+}
+const typeHintDecorationType = vscode.window.createTextEditorDecorationType({
+    after: {
+        color: new vscode.ThemeColor('ralsp.inlayHint')
+    }
+});
+export class HintsUpdater {
+    private displayHints = true;
+    public async loadHints(
+        editor: vscode.TextEditor | undefined
+    ): Promise<void> {
+        if (
+            this.displayHints &&
+            editor !== undefined &&
+            this.isRustDocument(editor.document)
+        ) {
+            await this.updateDecorationsFromServer(
+                editor.document.uri.toString(),
+                editor
+            );
+        }
+    }
+    public async toggleHintsDisplay(displayHints: boolean): Promise<void> {
+        if (this.displayHints !== displayHints) {
+            this.displayHints = displayHints;
+            if (displayHints) {
+                return this.updateHints();
+            } else {
+                const editor = vscode.window.activeTextEditor;
+                if (editor != null) {
+                    return editor.setDecorations(typeHintDecorationType, []);
+                }
+            }
+        }
+    }
+    public async updateHints(cause?: TextDocumentChangeEvent): Promise<void> {
+        if (!this.displayHints) {
+            return;
+        }
+        const editor = vscode.window.activeTextEditor;
+        if (editor == null) {
+            return;
+        }
+        const document = cause == null ? editor.document : cause.document;
+        if (!this.isRustDocument(document)) {
+            return;
+        }
+        return await this.updateDecorationsFromServer(
+            document.uri.toString(),
+            editor
+        );
+    }
+    private isRustDocument(document: vscode.TextDocument): boolean {
+        return document && document.languageId === 'rust';
+    }
+    private async updateDecorationsFromServer(
+        documentUri: string,
+        editor: TextEditor
+    ): Promise<void> {
+        const newHints = await this.queryHints(documentUri);
+        if (newHints != null) {
+            const newDecorations = newHints.map(hint => ({
+                range: hint.range,
+                renderOptions: { after: { contentText: `: ${hint.label}` } }
+            }));
+            return editor.setDecorations(
+                typeHintDecorationType,
+                newDecorations
+            );
+        }
+    }
+    private async queryHints(documentUri: string): Promise<InlayHint[] | null> {
+        const request: InlayHintsParams = {
+            textDocument: { uri: documentUri }
+        };
+        const client = Server.client;
+        return client
+            .onReady()
+            .then(() =>
+                client.sendRequest<InlayHint[] | null>(
+                    'rust-analyzer/inlayHints',
+                    request
+                )
+            );
+    }
+}
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 3f1b482e3..4d58a1a93 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -21,6 +21,7 @@ export class Config {
    public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server';
    public showWorkspaceLoadedNotification = true;
    public lruCapacity: null | number = null;
+    public displayInlayHints = true;
    public cargoWatchOptions: CargoWatchOptions = {
        enableOnStartup: 'ask',
        trace: 'off',
@@ -123,5 +124,9 @@ export class Config {
        if (config.has('lruCapacity')) {
            this.lruCapacity = config.get('lruCapacity') as number;
        }
+        if (config.has('displayInlayHints')) {
+            this.displayInlayHints = config.get('displayInlayHints') as boolean;
+        }
    }
 }
diff --git a/editors/code/src/extension.ts b/editors/code/src/extension.ts
index c8c3004a7..c6efc2e7e 100644
--- a/editors/code/src/extension.ts
+++ b/editors/code/src/extension.ts
@@ -3,6 +3,7 @@ import * as lc from 'vscode-languageclient';
 import * as commands from './commands';
 import { CargoWatchProvider } from './commands/cargo_watch';
+import { HintsUpdater } from './commands/inlay_hints';
 import {
    interactivelyStartCargoWatch,
    startCargoWatch
@@ -147,6 +148,29 @@ export function activate(context: vscode.ExtensionContext) {
    // Start the language server, finally!
    startServer();
+    if (Server.config.displayInlayHints) {
+        const hintsUpdater = new HintsUpdater();
+        hintsUpdater.loadHints(vscode.window.activeTextEditor).then(() => {
+            disposeOnDeactivation(
+                vscode.window.onDidChangeActiveTextEditor(editor =>
+                    hintsUpdater.loadHints(editor)
+                )
+            );
+            disposeOnDeactivation(
+                vscode.workspace.onDidChangeTextDocument(e =>
+                    hintsUpdater.updateHints(e)
+                )
+            );
+            disposeOnDeactivation(
+                vscode.workspace.onDidChangeConfiguration(_ =>
+                    hintsUpdater.toggleHintsDisplay(
+                        Server.config.displayInlayHints
+                    )
+                )
+            );
+        });
+    }
 }
 export function deactivate(): Thenable<void> {
diff --git a/editors/emacs/ra-emacs-lsp.el b/editors/emacs/ra-emacs-lsp.el
index 21a90c86b..d7656476e 100644
--- a/editors/emacs/ra-emacs-lsp.el
+++ b/editors/emacs/ra-emacs-lsp.el
@@ -15,6 +15,7 @@
 ;;  - implements source changes (for code actions etc.), except for file system changes
 ;;  - implements joinLines (you need to bind rust-analyzer-join-lines to a key)
 ;;  - implements extendSelection (either bind rust-analyzer-extend-selection to a key, or use expand-region)
+;;  - provides rust-analyzer-inlay-hints-mode for inline type hints
 ;; What's missing:
 ;;  - file system changes in apply-source-change
@@ -22,7 +23,6 @@
 ;;  - onEnter, parentModule, findMatchingBrace
 ;;  - runnables
 ;;  - the debugging commands (syntaxTree and analyzerStatus)
-;;  - lsp-ui doesn't interpret the markdown we return currently and instead displays it raw (https://github.com/emacs-lsp/lsp-ui/issues/220 )
 ;;  - more
 ;; Also, there's a problem with company-lsp's caching being too eager, sometimes
@@ -225,10 +225,46 @@
          (with-current-buffer buf
            (let ((inhibit-read-only t))
              (erase-buffer)
-              (insert parse-result)) 
+              (insert parse-result)))
-            )
          (pop-to-buffer buf))))))
+;; inlay hints
+(defun rust-analyzer--update-inlay-hints ()
+  (lsp-send-request-async
+   (lsp-make-request "rust-analyzer/inlayHints"
+                     (list :textDocument (lsp--text-document-identifier)))
+   (lambda (res)
+     (remove-overlays (point-min) (point-max) 'rust-analyzer--inlay-hint t)
+     (dolist (hint res)
+       (-let* (((&hash "range" "label" "kind") hint)
+               ((beg . end) (lsp--range-to-region range))
+               (overlay (make-overlay beg end)))
+         (overlay-put overlay 'rust-analyzer--inlay-hint t)
+         (overlay-put overlay 'evaporate t)
+         (overlay-put overlay 'after-string (propertize (concat ": " label)
+                                                        'font-lock-face 'font-lock-comment-face)))))
+   'tick)
+  nil)
+(defvar-local rust-analyzer--inlay-hints-timer nil)
+(defun rust-analyzer--inlay-hints-change-handler (&rest rest)
+  (when rust-analyzer--inlay-hints-timer
+    (cancel-timer rust-analyzer--inlay-hints-timer))
+  (setq rust-analyzer--inlay-hints-timer
+        (run-with-idle-timer 0.1 nil #'rust-analyzer--update-inlay-hints)))
+(define-minor-mode rust-analyzer-inlay-hints-mode
+  "Mode for showing inlay hints."
+  nil nil nil
+  (cond
+   (rust-analyzer-inlay-hints-mode
+    (rust-analyzer--update-inlay-hints)
+    (add-hook 'after-change-functions #'rust-analyzer--inlay-hints-change-handler nil t))
+   (t
+    (remove-overlays (point-min) (point-max) 'rust-analyzer--inlay-hint t)
+    (remove-hook 'after-change-functions #'rust-analyzer--inlay-hints-change-handler t))))
 (provide 'ra-emacs-lsp)
 ;;; ra-emacs-lsp.el ends here