122 files changed, 5209 insertions, 3276 deletions
diff --git a/.cargo/config b/.cargo/config
index 9f9b24a49..3812e1e2d 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,25 +1,4 @@
 [alias]
-# Automatically generates the ast and syntax kinds files
+xtask = "run --package xtask --bin xtask --"
-gen-syntax   = "run --package ra_tools --bin ra_tools -- gen-syntax"
-# Extracts the tests from
+install-ra = "run --package xtask --bin xtask -- install" # for backwards compat
-gen-tests    = "run --package ra_tools --bin ra_tools -- gen-tests"
-build-website = "run --package website-gen"
-# Installs the visual studio code extension
-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"
-# 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 d4cf71ab5..7d66f72d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ matrix:
          script:
              - rustup component add rustfmt
              - rustup component add rust-src
-              - printf "\n\n[profile.dev]\ndebug = false\n" >> Cargo.toml
+              - sed -i "s/debug = 1/debug = false/g" Cargo.toml
              - cargo test --no-run  # let's measure compile time separately
              - cargo test
          env:
@@ -28,7 +28,7 @@ matrix:
          language: rust
          rust: stable
          script:
-              - cargo build-website
+              - cargo doc --all --no-deps
          env:
              - RUSTFLAGS="-D warnings", CARGO_INCREMENTAL=0
@@ -59,7 +59,7 @@ deploy:
    skip-cleanup: true
    github-token: $DOCS_TOKEN  # Set in the settings page of your repository, as a secure variable
    keep-history: false
-    local-dir: target/website/
+    local-dir: target/doc
    on:
        branch: master
        condition: $DEPLOY_DOCS = 1
diff --git a/Cargo.lock b/Cargo.lock
index a5a43cffc..634480e5f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,44 +10,49 @@ dependencies = [
 [[package]]
 name = "arrayvec"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
+name = "arrayvec"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+[[package]]
 name = "atty"
 version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "autocfg"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "backtrace"
-version = "0.3.38"
+version = "0.3.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "backtrace-sys"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -73,7 +78,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "bitflags"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -91,27 +96,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "c2-chacha"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "cargo_metadata"
-version = "0.8.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "cc"
-version = "1.0.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -122,17 +126,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "chalk-engine"
 version = "0.9.0"
-source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc"
+source = "git+https://github.com/rust-lang/chalk.git#13303bb0067c6ed0572322080ae367ee38f9e7c9"
 dependencies = [
 "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "chalk-ir"
 version = "0.1.0"
-source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc"
+source = "git+https://github.com/rust-lang/chalk.git#13303bb0067c6ed0572322080ae367ee38f9e7c9"
 dependencies = [
 "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
 "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
@@ -142,7 +146,7 @@ dependencies = [
 [[package]]
 name = "chalk-macros"
 version = "0.1.1"
-source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc"
+source = "git+https://github.com/rust-lang/chalk.git#13303bb0067c6ed0572322080ae367ee38f9e7c9"
 dependencies = [
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -150,7 +154,7 @@ dependencies = [
 [[package]]
 name = "chalk-rust-ir"
 version = "0.1.0"
-source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc"
+source = "git+https://github.com/rust-lang/chalk.git#13303bb0067c6ed0572322080ae367ee38f9e7c9"
 dependencies = [
 "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
 "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
@@ -160,14 +164,13 @@ dependencies = [
 [[package]]
 name = "chalk-solve"
 version = "0.1.0"
-source = "git+https://github.com/rust-lang/chalk.git#df09cc603c0cff9ed95e5554055d483fdd756fbc"
+source = "git+https://github.com/rust-lang/chalk.git#13303bb0067c6ed0572322080ae367ee38f9e7c9"
 dependencies = [
 "chalk-engine 0.9.0 (git+https://github.com/rust-lang/chalk.git)",
 "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
 "chalk-macros 0.1.1 (git+https://github.com/rust-lang/chalk.git)",
 "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
- "derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -178,7 +181,7 @@ name = "chrono"
 version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -191,7 +194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -200,7 +203,7 @@ name = "cloudabi"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -211,7 +214,22 @@ dependencies = [
 "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+[[package]]
+name = "console"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -253,7 +271,7 @@ name = "crossbeam-epoch"
 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)",
+ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.10 (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.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -283,7 +301,7 @@ name = "derive-new"
 version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -310,7 +328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "ena"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -327,7 +345,7 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -369,7 +387,7 @@ name = "fsevent"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -378,7 +396,7 @@ name = "fsevent-sys"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -399,7 +417,7 @@ name = "fuchsia-zircon"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -414,7 +432,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -455,18 +473,20 @@ dependencies = [
 [[package]]
 name = "indexmap"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 [[package]]
 name = "indicatif"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "console 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -475,9 +495,9 @@ name = "inotify"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -485,7 +505,7 @@ name = "inotify-sys"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -497,18 +517,17 @@ dependencies = [
 "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "iovec"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -530,7 +549,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -539,9 +558,9 @@ name = "jemalloc-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.46 (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.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -550,7 +569,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -589,7 +608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libc"
-version = "0.2.62"
+version = "0.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -621,7 +640,7 @@ dependencies = [
 "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -629,9 +648,9 @@ name = "lsp-types"
 version = "0.61.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -661,9 +680,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -699,27 +718,27 @@ version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "nodrop"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "notify"
-version = "4.0.13"
+version = "4.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -731,7 +750,7 @@ name = "num-integer"
 version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -740,7 +759,7 @@ name = "num-traits"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -748,16 +767,13 @@ name = "num_cpus"
 version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "number_prefix"
-version = "0.2.8"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 [[package]]
 name = "once_cell"
@@ -786,7 +802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -799,7 +815,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -807,8 +823,8 @@ name = "paste-impl"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -834,22 +850,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "ppv-lite86"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.9"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "proc-macro2"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -861,7 +877,7 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -873,6 +889,14 @@ dependencies = [
 ]
 [[package]]
+name = "psm"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+[[package]]
 name = "quick-error"
 version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -882,7 +906,7 @@ name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -893,17 +917,15 @@ version = "0.1.0"
 name = "ra_assists"
 version = "0.1.0"
 dependencies = [
- "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_db 0.1.0",
 "ra_fmt 0.1.0",
 "ra_hir 0.1.0",
 "ra_syntax 0.1.0",
 "ra_text_edit 0.1.0",
- "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_lexer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "test_utils 0.1.0",
 ]
@@ -917,7 +939,7 @@ dependencies = [
 "ra_hir 0.1.0",
 "ra_ide_api 0.1.0",
 "ra_project_model 0.1.0",
- "ra_vfs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ra_vfs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_vfs_glob 0.1.0",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -937,7 +959,7 @@ name = "ra_cli"
 version = "0.1.0"
 dependencies = [
 "flexi_logger 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indicatif 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_batch 0.1.0",
 "ra_db 0.1.0",
@@ -954,9 +976,9 @@ dependencies = [
 "ra_cfg 0.1.0",
 "ra_prof 0.1.0",
 "ra_syntax 0.1.0",
- "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "salsa 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "salsa 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -971,11 +993,11 @@ dependencies = [
 name = "ra_hir"
 version = "0.1.0"
 dependencies = [
- "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "chalk-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
 "chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
 "chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git)",
- "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "insta 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -988,7 +1010,7 @@ dependencies = [
 "ra_prof 0.1.0",
 "ra_syntax 0.1.0",
 "ra_tt 0.1.0",
- "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "test_utils 0.1.0",
 ]
@@ -1003,6 +1025,7 @@ dependencies = [
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_assists 0.1.0",
 "ra_cfg 0.1.0",
@@ -1014,7 +1037,7 @@ dependencies = [
 "ra_text_edit 0.1.0",
 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "test_utils 0.1.0",
@@ -1032,19 +1055,17 @@ dependencies = [
 "lsp-server 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "lsp-types 0.61.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ra_cfg 0.1.0",
- "ra_db 0.1.0",
 "ra_ide_api 0.1.0",
 "ra_prof 0.1.0",
 "ra_project_model 0.1.0",
 "ra_syntax 0.1.0",
 "ra_text_edit 0.1.0",
- "ra_vfs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ra_vfs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_vfs_glob 0.1.0",
- "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "test_utils 0.1.0",
 "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1054,7 +1075,6 @@ dependencies = [
 name = "ra_mbe"
 version = "0.1.0"
 dependencies = [
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_parser 0.1.0",
 "ra_syntax 0.1.0",
@@ -1075,7 +1095,7 @@ dependencies = [
 name = "ra_prof"
 version = "0.1.0"
 dependencies = [
- "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "jemalloc-ctl 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1086,21 +1106,21 @@ dependencies = [
 name = "ra_project_model"
 version = "0.1.0"
 dependencies = [
- "cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_arena 0.1.0",
 "ra_cfg 0.1.0",
 "ra_db 0.1.0",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "ra_syntax"
 version = "0.1.0"
 dependencies = [
- "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ra_parser 0.1.0",
@@ -1108,7 +1128,7 @@ dependencies = [
 "rowan 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_lexer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smol_str 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "test_utils 0.1.0",
 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1123,36 +1143,23 @@ dependencies = [
 ]
 [[package]]
-name = "ra_tools"
-version = "0.1.0"
-dependencies = [
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-[[package]]
 name = "ra_tt"
 version = "0.1.0"
 dependencies = [
- "smol_str 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "ra_vfs"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "notify 4.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1162,7 +1169,7 @@ name = "ra_vfs_glob"
 version = "0.1.0"
 dependencies = [
 "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ra_vfs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ra_vfs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1170,8 +1177,8 @@ name = "rand"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1189,7 +1196,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1201,7 +1208,7 @@ name = "rand_chacha"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1210,7 +1217,7 @@ name = "rand_chacha"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1264,7 +1271,7 @@ name = "rand_jitter"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1276,7 +1283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1287,7 +1294,7 @@ name = "rand_pcg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1296,7 +1303,7 @@ name = "rand_pcg"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1361,7 +1368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "relative-path"
-version = "0.4.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
@@ -1378,7 +1385,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1388,7 +1395,7 @@ version = "0.6.2"
 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)",
- "smol_str 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 "text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1423,32 +1430,32 @@ dependencies = [
 [[package]]
 name = "ryu"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "salsa"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "salsa-macros 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "salsa-macros 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "salsa-macros"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1493,18 +1500,18 @@ name = "serde_derive"
 version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_json"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1513,14 +1520,14 @@ name = "serde_repr"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
 name = "serde_yaml"
-version = "0.8.9"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1541,7 +1548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "smol_str"
-version = "0.1.13"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1549,12 +1556,13 @@ dependencies = [
 [[package]]
 name = "stacker"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "psm 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1568,7 +1576,7 @@ name = "syn"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1579,7 +1587,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1591,7 +1599,7 @@ name = "termios"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 [[package]]
@@ -1599,7 +1607,7 @@ name = "test_utils"
 version = "0.1.0"
 dependencies = [
 "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
 "text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1629,7 +1637,7 @@ name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1714,13 +1722,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
-name = "website-gen"
-version = "0.0.0"
-dependencies = [
- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-[[package]]
 name = "winapi"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1767,6 +1768,19 @@ dependencies = [
 ]
 [[package]]
+name = "xtask"
+version = "0.1.0"
+dependencies = [
+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+[[package]]
 name = "yaml-rust"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1781,20 +1795,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [metadata]
 "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
+"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-"checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5"
+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 "checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80"
 "checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb"
-"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "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 c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-"checksum cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426"
+"checksum cargo_metadata 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8d2d1617e838936c0d2323a65cc151e03ae19a7678dd24f72bccf27119b90a5d"
-"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
+"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 "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>"
@@ -1805,6 +1820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum console 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b147390a412132d75d10dd3b7b175a69cf5fd95032f7503c7091b8831ba10242"
+"checksum console 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62828f51cfa18f8c31d3d55a43c6ce6af3f87f754cba9fbba7ff38089b9f5612"
 "checksum crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2d818a4990769aac0c7ff1360e233ef3a41adcb009ebb2036bf6915eb0f6b23c"
 "checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
 "checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
@@ -1816,7 +1832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-"checksum ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc01d68e08ca384955a3aeba9217102ca1aa85b6e168639bf27739f1d749d87"
+"checksum ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36"
 "checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 "checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469"
 "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
@@ -1835,12 +1851,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-"checksum indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a61202fbe46c4a951e9404a720a0180bcf3212c750d735cb5c4ba4dc551299f3"
+"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
-"checksum indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c60da1c9abea75996b70a931bba6c750730399005b61ccd853cee50ef3d0d0c"
+"checksum indicatif 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8d596a9576eaa1446996092642d72bfef35cf47243129b7ab883baf5faec31e"
 "checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718"
 "checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
 "checksum insta 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23f83ab4ee86f38b292f0420c27fd412690a4baa9ea0ad4e3fa624bf34379b76"
-"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
+"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
 "checksum jemalloc-ctl 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7"
@@ -1852,7 +1868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4fd87be4a815fd373e02773983940f0d75fb26fde8c098e9e45f7af03154c0"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
+"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
@@ -1865,12 +1881,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
-"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-"checksum notify 4.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1191efa2b8fe041decb55c238a125b7a1aeb6fad7a525133a02be5ec949ff3cb"
+"checksum notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "199628fc33b21bc767baa057490b00b382ecbae030803a7b36292422d15b778b"
 "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
 "checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
 "checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
-"checksum number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee"
+"checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
 "checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed"
 "checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063"
 "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
@@ -1880,13 +1896,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 "checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
 "checksum pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "22e32b0f3771287ebb436130477eabf0f11f934ed036099ad548bc885e708667"
-"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-"checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8"
+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
-"checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0"
+"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
 "checksum proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf147e022eacf0c8a054ab864914a7602618adba841d800a9a9868a5237a529f"
+"checksum psm 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "54639efee26275dfadc49644039c31c73673edde0ef2815acf25a8db526ee193"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum ra_vfs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdf6a0926414eb0c00866eb9274894182302f879cd06b5459c1d8ee7f1234aed"
+"checksum ra_vfs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc8f508bc7a9871b81b6ee75e15d0bbc9f81a96698364a090a8d10b0f8b970b7"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 "checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
@@ -1908,7 +1925,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-"checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"
+"checksum relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bedde000f40f2921ce439ea165c9c53fd629bfa115140c72e22aceacb4a21954"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
 "checksum rowan 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dc2b79612dedc9004083a61448eb669d336d56690aab29fbd7249e8c8ab41d8c"
@@ -1916,22 +1933,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
 "checksum rustc_lexer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-"checksum salsa 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "df34c3a66ef408c3219c11dee2c928d52e679390d3ee6e0b87e96cc758d85377"
+"checksum salsa 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ec0865bdd9d8e614686a0cbb76979c735810131d287eb1683e91e4e64a58c387"
-"checksum salsa-macros 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c15f36e5c85b3f40b84283321f97ef2ceafa6f9996cffad06793a9e096ab695"
+"checksum salsa-macros 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cac182212d3a1db75ddc42399ff1461b258a694b8318ee7e0baf6c976e39efee"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
 "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"
 "checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
 "checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
-"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
+"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2"
 "checksum serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573"
-"checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582"
+"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
-"checksum smol_str 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "378286eaa0fa9e6bbc351c9bfcc2320391c347e014f10cb177c26be18142e596"
+"checksum smol_str 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34836c9a295c62c2ce3514471117c5cb269891e8421b2aafdd910050576c4d8b"
-"checksum stacker 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb79482f57cf598af52094ec4cc3b3c42499d3ce5bd426f2ac41515b7e57404b"
+"checksum stacker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d96fc4f13a0ac088e9a3cd9af1cc8c5cc1ab5deb2145cef661267dfc9c542f8a"
 "checksum superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
 "checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
diff --git a/Cargo.toml b/Cargo.toml
index 317c63795..97c02b40f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,8 @@
 [workspace]
-members = [ "crates/*", "website/website-gen" ]
+members = [ "crates/*", "xtask/" ]
+[profile.dev]
+debug = 1 # only line info
 [profile.release]
 incremental = true
diff --git a/README.md b/README.md
index e249c6486..f5ee4263d 100644
--- a/README.md
+++ b/README.md
@@ -33,10 +33,10 @@ To quickly install rust-analyzer with VS Code extension with standard setup
 $ git clone https://github.com/rust-analyzer/rust-analyzer && cd rust-analyzer
 # install both the language server and VS Code extension
-$ cargo install-ra
+$ cargo xtask install
 # alternatively, install only the server. Binary name is `ra_lsp_server`.
-$ cargo install-ra --server
+$ cargo xtask install --server
 ```
 For non-standard setup of VS Code and other editors, see [./docs/user](./docs/user).
@@ -59,7 +59,7 @@ https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frls-2.2E0
 ## Quick Links
 * Work List: https://paper.dropbox.com/doc/RLS-2.0-work-list--AZ3BgHKKCtqszbsi3gi6sjchAQ-42vbnxzuKq2lKwW0mkn8Y
-* API docs: https://rust-analyzer.github.io/rust-analyzer/api-docs/ra_ide_api/
+* API docs: https://rust-analyzer.github.io/rust-analyzer/ra_ide_api/
 * CI: https://travis-ci.org/rust-analyzer/rust-analyzer
 ## License
diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml
index 02966bbda..beebccbd9 100644
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/ra_assists/Cargo.toml
@@ -6,11 +6,9 @@ authors = ["rust-analyzer developers"]
 [dependencies]
 format-buf = "1.0.0"
-once_cell = "1.0.1"
 join_to_string = "0.1.3"
 itertools = "0.8.0"
-arrayvec = "0.4.10"
+rustc_lexer = "0.1.0"
-rustc-hash = "1.0.1"
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index 189cad7d0..e270c5d60 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -138,6 +138,7 @@ impl AssistBuilder {
    /// Replaces specified `node` of text with a given string, reindenting the
    /// string to maintain `node`'s existing indent.
+    // FIXME: remove in favor of ra_syntax::edit::IndentLevel::increase_indent
    pub(crate) fn replace_node_and_indent(
        &mut self,
        node: &SyntaxNode,
diff --git a/crates/ra_assists/src/assists/early_return.rs b/crates/ra_assists/src/assists/early_return.rs
new file mode 100644
index 000000000..8c975714c
--- /dev/null
+++ b/crates/ra_assists/src/assists/early_return.rs
@@ -0,0 +1,276 @@
+//! FIXME: write short doc here
+use crate::{
+    assist_ctx::{Assist, AssistCtx},
+    AssistId,
+};
+use hir::db::HirDatabase;
+use ra_syntax::{
+    algo::replace_children,
+    ast::edit::IndentLevel,
+    ast::make,
+    ast::Block,
+    ast::ContinueExpr,
+    ast::IfExpr,
+    ast::ReturnExpr,
+    AstNode,
+    SyntaxKind::{FN_DEF, LOOP_EXPR, L_CURLY, R_CURLY, WHILE_EXPR, WHITESPACE},
+};
+use std::ops::RangeInclusive;
+pub(crate) fn convert_to_guarded_return(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
+    let if_expr: IfExpr = ctx.node_at_offset()?;
+    let expr = if_expr.condition()?.expr()?;
+    let then_block = if_expr.then_branch()?.block()?;
+    if if_expr.else_branch().is_some() {
+        return None;
+    }
+    let parent_block = if_expr.syntax().parent()?.ancestors().find_map(Block::cast)?;
+    if parent_block.expr()? != if_expr.clone().into() {
+        return None;
+    }
+    // check for early return and continue
+    let first_in_then_block = then_block.syntax().first_child()?.clone();
+    if ReturnExpr::can_cast(first_in_then_block.kind())
+        || ContinueExpr::can_cast(first_in_then_block.kind())
+        || first_in_then_block
+            .children()
+            .any(|x| ReturnExpr::can_cast(x.kind()) || ContinueExpr::can_cast(x.kind()))
+    {
+        return None;
+    }
+    let parent_container = parent_block.syntax().parent()?.parent()?;
+    let early_expression = match parent_container.kind() {
+        WHILE_EXPR | LOOP_EXPR => Some("continue;"),
+        FN_DEF => Some("return;"),
+        _ => None,
+    }?;
+    if then_block.syntax().first_child_or_token().map(|t| t.kind() == L_CURLY).is_none() {
+        return None;
+    }
+    then_block.syntax().last_child_or_token().filter(|t| t.kind() == R_CURLY)?;
+    let cursor_position = ctx.frange.range.start();
+    ctx.add_action(AssistId("convert_to_guarded_return"), "convert to guarded return", |edit| {
+        let if_indent_level = IndentLevel::from_node(&if_expr.syntax());
+        let new_if_expr =
+            if_indent_level.increase_indent(make::if_expression(&expr, early_expression));
+        let then_block_items = IndentLevel::from(1).decrease_indent(then_block.clone());
+        let end_of_then = then_block_items.syntax().last_child_or_token().unwrap();
+        let end_of_then =
+            if end_of_then.prev_sibling_or_token().map(|n| n.kind()) == Some(WHITESPACE) {
+                end_of_then.prev_sibling_or_token().unwrap()
+            } else {
+                end_of_then
+            };
+        let mut new_if_and_then_statements = new_if_expr.syntax().children_with_tokens().chain(
+            then_block_items
+                .syntax()
+                .children_with_tokens()
+                .skip(1)
+                .take_while(|i| *i != end_of_then),
+        );
+        let new_block = replace_children(
+            &parent_block.syntax(),
+            RangeInclusive::new(
+                if_expr.clone().syntax().clone().into(),
+                if_expr.syntax().clone().into(),
+            ),
+            &mut new_if_and_then_statements,
+        );
+        edit.target(if_expr.syntax().text_range());
+        edit.replace_ast(parent_block, Block::cast(new_block).unwrap());
+        edit.set_cursor(cursor_position);
+    });
+    ctx.build()
+}
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::helpers::{check_assist, check_assist_not_applicable};
+    #[test]
+    fn convert_inside_fn() {
+        check_assist(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                bar();
+                if<|> true {
+                    foo();
+                    //comment
+                    bar();
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                bar();
+                if<|> !true {
+                    return;
+                }
+                foo();
+                //comment
+                bar();
+            }
+            "#,
+        );
+    }
+    #[test]
+    fn convert_inside_while() {
+        check_assist(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                while true {
+                    if<|> true {
+                        foo();
+                        bar();
+                    }
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                while true {
+                    if<|> !true {
+                        continue;
+                    }
+                    foo();
+                    bar();
+                }
+            }
+            "#,
+        );
+    }
+    #[test]
+    fn convert_inside_loop() {
+        check_assist(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                loop {
+                    if<|> true {
+                        foo();
+                        bar();
+                    }
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                loop {
+                    if<|> !true {
+                        continue;
+                    }
+                    foo();
+                    bar();
+                }
+            }
+            "#,
+        );
+    }
+    #[test]
+    fn ignore_already_converted_if() {
+        check_assist_not_applicable(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                if<|> true {
+                    return;
+                }
+            }
+            "#,
+        );
+    }
+    #[test]
+    fn ignore_already_converted_loop() {
+        check_assist_not_applicable(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                loop {
+                    if<|> true {
+                        continue;
+                    }
+                }
+            }
+            "#,
+        );
+    }
+    #[test]
+    fn ignore_return() {
+        check_assist_not_applicable(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                if<|> true {
+                    return
+                }
+            }
+            "#,
+        );
+    }
+    #[test]
+    fn ignore_else_branch() {
+        check_assist_not_applicable(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                if<|> true {
+                    foo();
+                } else {
+                    bar()
+                }
+            }
+            "#,
+        );
+    }
+    #[test]
+    fn ignore_statements_aftert_if() {
+        check_assist_not_applicable(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                if<|> true {
+                    foo();
+                }
+                bar();
+            }
+            "#,
+        );
+    }
+    #[test]
+    fn ignore_statements_inside_if() {
+        check_assist_not_applicable(
+            convert_to_guarded_return,
+            r#"
+            fn main() {
+                if false {
+                    if<|> true {
+                        foo();
+                    }
+                }
+            }
+            "#,
+        );
+    }
+}
diff --git a/crates/ra_assists/src/assists/fill_match_arms.rs b/crates/ra_assists/src/assists/fill_match_arms.rs
index 7335cce09..e3f30b5de 100644
--- a/crates/ra_assists/src/assists/fill_match_arms.rs
+++ b/crates/ra_assists/src/assists/fill_match_arms.rs
@@ -3,7 +3,7 @@
 use std::iter;
 use hir::{db::HirDatabase, Adt, HasSource};
-use ra_syntax::ast::{self, make, AstNode, NameOwner};
+use ra_syntax::ast::{self, edit::IndentLevel, make, AstNode, NameOwner};
 use crate::{Assist, AssistCtx, AssistId};
@@ -30,15 +30,19 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As
    let variant_list = enum_def.variant_list()?;
    ctx.add_action(AssistId("fill_match_arms"), "fill match arms", |edit| {
-        let variants = variant_list.variants();
+        let indent_level = IndentLevel::from_node(match_arm_list.syntax());
-        let arms = variants
-            .filter_map(build_pat)
+        let new_arm_list = {
-            .map(|pat| make::match_arm(iter::once(pat), make::expr_unit()));
+            let variants = variant_list.variants();
-        let new_arm_list = make::match_arm_list(arms);
+            let arms = variants
+                .filter_map(build_pat)
+                .map(|pat| make::match_arm(iter::once(pat), make::expr_unit()));
+            indent_level.increase_indent(make::match_arm_list(arms))
+        };
        edit.target(match_expr.syntax().text_range());
        edit.set_cursor(expr.syntax().text_range().start());
-        edit.replace_node_and_indent(match_arm_list.syntax(), new_arm_list.syntax().text());
+        edit.replace_ast(match_arm_list, new_arm_list);
    });
    ctx.build()
diff --git a/crates/ra_assists/src/assists/move_bounds.rs b/crates/ra_assists/src/assists/move_bounds.rs
index f791d22b0..d2444b6b9 100644
--- a/crates/ra_assists/src/assists/move_bounds.rs
+++ b/crates/ra_assists/src/assists/move_bounds.rs
@@ -18,7 +18,7 @@ pub(crate) fn move_bounds_to_where_clause(mut ctx: AssistCtx<impl HirDatabase>)
    }
    let parent = type_param_list.syntax().parent()?;
-    if parent.children_with_tokens().find(|it| it.kind() == WHERE_CLAUSE).is_some() {
+    if parent.children_with_tokens().any(|it| it.kind() == WHERE_CLAUSE) {
        return None;
    }
diff --git a/crates/ra_assists/src/assists/raw_string.rs b/crates/ra_assists/src/assists/raw_string.rs
index 388ee7e97..2d2e31e51 100644
--- a/crates/ra_assists/src/assists/raw_string.rs
+++ b/crates/ra_assists/src/assists/raw_string.rs
@@ -2,6 +2,7 @@
 use hir::db::HirDatabase;
 use ra_syntax::{ast::AstNode, ast::Literal, TextRange, TextUnit};
+use rustc_lexer;
 use crate::{Assist, AssistCtx, AssistId};
@@ -10,13 +11,51 @@ pub(crate) fn make_raw_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As
    if literal.token().kind() != ra_syntax::SyntaxKind::STRING {
        return None;
    }
+    let token = literal.token();
+    let text = token.text().as_str();
+    let usual_string_range = find_usual_string_range(text)?;
+    let start_of_inside = usual_string_range.start().to_usize() + 1;
+    let end_of_inside = usual_string_range.end().to_usize();
+    let inside_str = &text[start_of_inside..end_of_inside];
+    let mut unescaped = String::with_capacity(inside_str.len());
+    let mut error = Ok(());
+    rustc_lexer::unescape::unescape_str(
+        inside_str,
+        &mut |_, unescaped_char| match unescaped_char {
+            Ok(c) => unescaped.push(c),
+            Err(_) => error = Err(()),
+        },
+    );
+    if error.is_err() {
+        return None;
+    }
    ctx.add_action(AssistId("make_raw_string"), "make raw string", |edit| {
        edit.target(literal.syntax().text_range());
-        edit.insert(literal.syntax().text_range().start(), "r");
+        let max_hash_streak = count_hashes(&unescaped);
+        let mut hashes = String::with_capacity(max_hash_streak + 1);
+        for _ in 0..hashes.capacity() {
+            hashes.push('#');
+        }
+        edit.replace(
+            literal.syntax().text_range(),
+            format!("r{}\"{}\"{}", hashes, unescaped, hashes),
+        );
    });
    ctx.build()
 }
+fn count_hashes(s: &str) -> usize {
+    let mut max_hash_streak = 0usize;
+    for idx in s.match_indices("\"#").map(|(i, _)| i) {
+        let (_, sub) = s.split_at(idx + 1);
+        let nb_hash = sub.chars().take_while(|c| *c == '#').count();
+        if nb_hash > max_hash_streak {
+            max_hash_streak = nb_hash;
+        }
+    }
+    max_hash_streak
+}
 fn find_usual_string_range(s: &str) -> Option<TextRange> {
    Some(TextRange::from_to(
        TextUnit::from(s.find('"')? as u32),
@@ -94,10 +133,10 @@ mod test {
            make_raw_string,
            r#"
            fn f() {
-                let s = <|>"random string";
+                let s = <|>"random\nstring";
            }
            "#,
-            r#""random string""#,
+            r#""random\nstring""#,
        );
    }
@@ -107,44 +146,69 @@ mod test {
            make_raw_string,
            r#"
            fn f() {
-                let s = <|>"random string";
+                let s = <|>"random\nstring";
            }
            "#,
-            r#"
+            r##"
            fn f() {
-                let s = <|>r"random string";
+                let s = <|>r#"random
+string"#;
            }
-            "#,
+            "##,
        )
    }
    #[test]
-    fn make_raw_string_with_escaped_works() {
+    fn make_raw_string_hashes_inside_works() {
        check_assist(
            make_raw_string,
-            r#"
+            r###"
            fn f() {
-                let s = <|>"random\nstring";
+                let s = <|>"#random##\nstring";
            }
-            "#,
+            "###,
-            r#"
+            r####"
            fn f() {
-                let s = <|>r"random\nstring";
+                let s = <|>r#"#random##
+string"#;
            }
-            "#,
+            "####,
        )
    }
    #[test]
-    fn make_raw_string_not_works() {
+    fn make_raw_string_closing_hashes_inside_works() {
-        check_assist_not_applicable(
+        check_assist(
+            make_raw_string,
+            r###"
+            fn f() {
+                let s = <|>"#random\"##\nstring";
+            }
+            "###,
+            r####"
+            fn f() {
+                let s = <|>r###"#random"##
+string"###;
+            }
+            "####,
+        )
+    }
+    #[test]
+    fn make_raw_string_nothing_to_unescape_works() {
+        check_assist(
            make_raw_string,
            r#"
            fn f() {
-                let s = <|>r"random string";
+                let s = <|>"random string";
            }
            "#,
-        );
+            r##"
+            fn f() {
+                let s = <|>r#"random string"#;
+            }
+            "##,
+        )
    }
    #[test]
@@ -369,4 +433,14 @@ mod test {
            "#,
        );
    }
+    #[test]
+    fn count_hashes_test() {
+        assert_eq!(0, count_hashes("abc"));
+        assert_eq!(0, count_hashes("###"));
+        assert_eq!(1, count_hashes("\"#abc"));
+        assert_eq!(0, count_hashes("#abc"));
+        assert_eq!(2, count_hashes("#ab\"##c"));
+        assert_eq!(4, count_hashes("#ab\"##\"####c"));
+    }
 }
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index d2376c475..ab77b46a9 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -108,6 +108,7 @@ mod assists {
    mod add_missing_impl_members;
    mod move_guard;
    mod move_bounds;
+    mod early_return;
    pub(crate) fn all<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assist>] {
        &[
@@ -135,6 +136,7 @@ mod assists {
            raw_string::make_raw_string,
            raw_string::make_usual_string,
            raw_string::remove_hash,
+            early_return::convert_to_guarded_return,
        ]
    }
 }
diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml
index 62850746f..c85da7a2c 100644
--- a/crates/ra_batch/Cargo.toml
+++ b/crates/ra_batch/Cargo.toml
@@ -9,7 +9,7 @@ log = "0.4.5"
 rustc-hash = "1.0"
 crossbeam-channel = "0.3.5"
-ra_vfs = "0.4.0"
+ra_vfs = "0.5.0"
 ra_vfs_glob = { path = "../ra_vfs_glob" }
 ra_db = { path = "../ra_db" }
 ra_ide_api = { path = "../ra_ide_api" }
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs
index a5fc2a23e..df49eb13d 100644
--- a/crates/ra_batch/src/lib.rs
+++ b/crates/ra_batch/src/lib.rs
@@ -43,8 +43,12 @@ pub fn load_cargo(root: &Path) -> Result<(AnalysisHost, FxHashMap<SourceRootId,
    );
    // FIXME: cfg options?
-    let default_cfg_options =
+    let default_cfg_options = {
-        get_rustc_cfg_options().atom("test".into()).atom("debug_assertion".into());
+        let mut opts = get_rustc_cfg_options();
+        opts.insert_atom("test".into());
+        opts.insert_atom("debug_assertion".into());
+        opts
+    };
    let (crate_graph, _crate_names) =
        ws.to_crate_graph(&default_cfg_options, &mut |path: &Path| {
@@ -137,14 +141,8 @@ mod tests {
    #[test]
    fn test_loading_rust_analyzer() {
        let path = Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap().parent().unwrap();
-        let (host, roots) = load_cargo(path).unwrap();
+        let (host, _roots) = load_cargo(path).unwrap();
-        let mut n_crates = 0;
+        let n_crates = Crate::all(host.raw_database()).len();
-        for (root, _) in roots {
-            for _krate in Crate::source_root_crates(host.raw_database(), root) {
-                n_crates += 1;
-            }
-        }
        // RA has quite a few crates, but the exact count doesn't matter
        assert!(n_crates > 20);
    }
diff --git a/crates/ra_cfg/src/lib.rs b/crates/ra_cfg/src/lib.rs
index e1c92fbba..1bee3eb99 100644
--- a/crates/ra_cfg/src/lib.rs
+++ b/crates/ra_cfg/src/lib.rs
@@ -36,26 +36,20 @@ impl CfgOptions {
        self.check(&parse_cfg(attr))
    }
-    pub fn atom(mut self, name: SmolStr) -> CfgOptions {
+    pub fn insert_atom(&mut self, key: SmolStr) {
-        self.atoms.insert(name);
+        self.atoms.insert(key);
-        self
    }
-    pub fn key_value(mut self, key: SmolStr, value: SmolStr) -> CfgOptions {
+    pub fn remove_atom(&mut self, name: &str) {
-        self.key_values.insert((key, value));
+        self.atoms.remove(name);
-        self
    }
-    /// Shortcut to set features
+    pub fn insert_key_value(&mut self, key: SmolStr, value: SmolStr) {
-    pub fn features(mut self, iter: impl IntoIterator<Item = SmolStr>) -> CfgOptions {
+        self.key_values.insert((key, value));
-        for feat in iter {
-            self = self.key_value("feature".into(), feat);
-        }
-        self
    }
-    pub fn remove_atom(mut self, name: &SmolStr) -> CfgOptions {
+    /// Shortcut to set features
-        self.atoms.remove(name);
+    pub fn insert_features(&mut self, iter: impl IntoIterator<Item = SmolStr>) {
-        self
+        iter.into_iter().for_each(|feat| self.insert_key_value("feature".into(), feat));
    }
 }
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 67e727a88..fcd102e8b 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 pico-args = "0.3.0"
 flexi_logger = "0.14.0"
-indicatif = "0.11.0"
+indicatif = "0.12.0"
 ra_syntax = { path = "../ra_syntax" }
 ra_ide_api = { path = "../ra_ide_api" }
diff --git a/crates/ra_cli/src/analysis_bench.rs b/crates/ra_cli/src/analysis_bench.rs
index 727f1e62b..8bbe5d9e8 100644
--- a/crates/ra_cli/src/analysis_bench.rs
+++ b/crates/ra_cli/src/analysis_bench.rs
@@ -8,7 +8,7 @@ use std::{
 use ra_db::{
    salsa::{Database, Durability},
-    FileId, SourceDatabase,
+    FileId, SourceDatabaseExt,
 };
 use ra_ide_api::{Analysis, AnalysisChange, AnalysisHost, FilePosition, LineCol};
diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs
index a8a110bd9..cda5cafb8 100644
--- a/crates/ra_cli/src/analysis_stats.rs
+++ b/crates/ra_cli/src/analysis_stats.rs
@@ -2,7 +2,7 @@
 use std::{collections::HashSet, fmt::Write, path::Path, time::Instant};
-use ra_db::SourceDatabase;
+use ra_db::SourceDatabaseExt;
 use ra_hir::{AssocItem, Crate, HasBodySource, HasSource, HirDisplay, ModuleDef, Ty, TypeWalk};
 use ra_syntax::AstNode;
@@ -22,16 +22,29 @@ pub fn run(
    let mut num_crates = 0;
    let mut visited_modules = HashSet::new();
    let mut visit_queue = Vec::new();
-    for (source_root_id, project_root) in roots {
-        if project_root.is_member() {
+    let members = roots
-            for krate in Crate::source_root_crates(db, source_root_id) {
+        .into_iter()
-                num_crates += 1;
+        .filter_map(
-                let module =
+            |(source_root_id, project_root)| {
-                    krate.root_module(db).expect("crate in source root without root module");
+                if project_root.is_member() {
-                visit_queue.push(module);
+                    Some(source_root_id)
-            }
+                } else {
+                    None
+                }
+            },
+        )
+        .collect::<HashSet<_>>();
+    for krate in Crate::all(db) {
+        let module = krate.root_module(db).expect("crate without root module");
+        let file_id = module.definition_source(db).file_id;
+        if members.contains(&db.file_source_root(file_id.original_file(db))) {
+            num_crates += 1;
+            visit_queue.push(module);
        }
    }
    println!("Crates in this dir: {}", num_crates);
    let mut num_decls = 0;
    let mut funcs = Vec::new();
@@ -130,7 +143,7 @@ pub fn run(
                        );
                        bar.println(format!(
                            "{} {}:{}-{}:{}: Expected {}, got {}",
-                            path.display(),
+                            path,
                            start.line + 1,
                            start.col_utf16,
                            end.line + 1,
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index c141f1a88..3394ae8ce 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"]
 [dependencies]
 salsa = "0.13.0"
-relative-path = "0.4.0"
+relative-path = "1.0.0"
 rustc-hash = "1.0"
 ra_syntax = { path = "../ra_syntax" }
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 23148096c..eafa95921 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -48,9 +48,6 @@ impl SourceRoot {
    pub fn new_library() -> SourceRoot {
        SourceRoot { is_library: true, ..SourceRoot::new() }
    }
-    pub fn file_by_relative_path(&self, path: &RelativePath) -> Option<FileId> {
-        self.files.get(path).copied()
-    }
    pub fn insert_file(&mut self, path: RelativePathBuf, file_id: FileId) {
        self.files.insert(path, file_id);
    }
@@ -60,6 +57,9 @@ impl SourceRoot {
    pub fn walk(&self) -> impl Iterator<Item = FileId> + '_ {
        self.files.values().copied()
    }
+    pub fn file_by_relative_path(&self, path: &RelativePath) -> Option<FileId> {
+        self.files.get(path).copied()
+    }
 }
 /// `CrateGraph` is a bit of information which turns a set of text files into a
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 603daed37..fc5d6d396 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -6,7 +6,7 @@ use std::{panic, sync::Arc};
 use ra_prof::profile;
 use ra_syntax::{ast, Parse, SourceFile, TextRange, TextUnit};
-use relative_path::RelativePathBuf;
+use relative_path::{RelativePath, RelativePathBuf};
 pub use crate::{
    cancellation::Canceled,
@@ -64,16 +64,39 @@ pub struct FileRange {
 pub const DEFAULT_LRU_CAP: usize = 128;
+pub trait FileLoader {
+    /// Text of the file.
+    fn file_text(&self, file_id: FileId) -> Arc<String>;
+    fn resolve_relative_path(&self, anchor: FileId, relative_path: &RelativePath)
+        -> Option<FileId>;
+    fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>>;
+}
 /// Database which stores all significant input facts: source code and project
 /// model. Everything else in rust-analyzer is derived from these queries.
 #[salsa::query_group(SourceDatabaseStorage)]
-pub trait SourceDatabase: CheckCanceled + std::fmt::Debug {
+pub trait SourceDatabase: CheckCanceled + FileLoader + std::fmt::Debug {
-    /// Text of the file.
-    #[salsa::input]
-    fn file_text(&self, file_id: FileId) -> Arc<String>;
    // Parses the file into the syntax tree.
    #[salsa::invoke(parse_query)]
    fn parse(&self, file_id: FileId) -> Parse<ast::SourceFile>;
+    /// The crate graph.
+    #[salsa::input]
+    fn crate_graph(&self) -> Arc<CrateGraph>;
+}
+fn parse_query(db: &impl SourceDatabase, file_id: FileId) -> Parse<ast::SourceFile> {
+    let _p = profile("parse_query");
+    let text = db.file_text(file_id);
+    SourceFile::parse(&*text)
+}
+/// We don't want to give HIR knowledge of source roots, hence we extract these
+/// methods into a separate DB.
+#[salsa::query_group(SourceDatabaseExtStorage)]
+pub trait SourceDatabaseExt: SourceDatabase {
+    #[salsa::input]
+    fn file_text(&self, file_id: FileId) -> Arc<String>;
    /// Path to a file, relative to the root of its source root.
    #[salsa::input]
    fn file_relative_path(&self, file_id: FileId) -> RelativePathBuf;
@@ -83,21 +106,48 @@ pub trait SourceDatabase: CheckCanceled + std::fmt::Debug {
    /// Contents of the source root.
    #[salsa::input]
    fn source_root(&self, id: SourceRootId) -> Arc<SourceRoot>;
    fn source_root_crates(&self, id: SourceRootId) -> Arc<Vec<CrateId>>;
-    /// The crate graph.
-    #[salsa::input]
-    fn crate_graph(&self) -> Arc<CrateGraph>;
 }
-fn source_root_crates(db: &impl SourceDatabase, id: SourceRootId) -> Arc<Vec<CrateId>> {
+fn source_root_crates(
+    db: &(impl SourceDatabaseExt + SourceDatabase),
+    id: SourceRootId,
+) -> Arc<Vec<CrateId>> {
    let root = db.source_root(id);
    let graph = db.crate_graph();
    let res = root.walk().filter_map(|it| graph.crate_id_for_crate_root(it)).collect::<Vec<_>>();
    Arc::new(res)
 }
-fn parse_query(db: &impl SourceDatabase, file_id: FileId) -> Parse<ast::SourceFile> {
+/// Silly workaround for cyclic deps between the traits
-    let _p = profile("parse_query");
+pub struct FileLoaderDelegate<T>(pub T);
-    let text = db.file_text(file_id);
-    SourceFile::parse(&*text)
+impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
+    fn file_text(&self, file_id: FileId) -> Arc<String> {
+        SourceDatabaseExt::file_text(self.0, file_id)
+    }
+    fn resolve_relative_path(
+        &self,
+        anchor: FileId,
+        relative_path: &RelativePath,
+    ) -> Option<FileId> {
+        let path = {
+            let mut path = self.0.file_relative_path(anchor);
+            // Workaround for relative path API: turn `lib.rs` into ``.
+            if !path.pop() {
+                path = RelativePathBuf::default();
+            }
+            path.push(relative_path);
+            path.normalize()
+        };
+        let source_root = self.0.file_source_root(anchor);
+        let source_root = self.0.source_root(source_root);
+        source_root.file_by_relative_path(&path)
+    }
+    fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
+        let source_root = self.0.file_source_root(file_id);
+        self.0.source_root_crates(source_root)
+    }
 }
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index cc117f84d..edf1fa49b 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -5,9 +5,9 @@ version = "0.1.0"
 authors = ["rust-analyzer developers"]
 [dependencies]
-arrayvec = "0.4.10"
+arrayvec = "0.5.1"
 log = "0.4.5"
-relative-path = "0.4.0"
+relative-path = "1.0.0"
 rustc-hash = "1.0"
 parking_lot = "0.9.0"
 ena = "0.13"
diff --git a/crates/ra_hir/src/adt.rs b/crates/ra_hir/src/adt.rs
index 99d286215..3e9cd3c63 100644
--- a/crates/ra_hir/src/adt.rs
+++ b/crates/ra_hir/src/adt.rs
@@ -9,7 +9,7 @@ use ra_syntax::ast::{self, NameOwner, StructKind, TypeAscriptionOwner};
 use crate::{
    db::{AstDatabase, DefDatabase, HirDatabase},
    type_ref::TypeRef,
-    AsName, Enum, EnumVariant, FieldSource, HasSource, Name, Source, Struct, StructField,
+    AsName, Enum, EnumVariant, FieldSource, HasSource, Module, Name, Source, Struct, StructField,
 };
 impl Struct {
@@ -170,12 +170,20 @@ impl VariantDef {
        }
    }
-    pub(crate) fn field(self, db: &impl HirDatabase, name: &Name) -> Option<StructField> {
+    pub fn field(self, db: &impl HirDatabase, name: &Name) -> Option<StructField> {
        match self {
            VariantDef::Struct(it) => it.field(db, name),
            VariantDef::EnumVariant(it) => it.field(db, name),
        }
    }
+    pub fn module(self, db: &impl HirDatabase) -> Module {
+        match self {
+            VariantDef::Struct(it) => it.module(db),
+            VariantDef::EnumVariant(it) => it.module(db),
+        }
+    }
    pub(crate) fn variant_data(self, db: &impl DefDatabase) -> Arc<VariantData> {
        match self {
            VariantDef::Struct(it) => it.variant_data(db),
diff --git a/crates/ra_hir/src/attr.rs b/crates/ra_hir/src/attr.rs
index f67e80bfd..bd159a566 100644
--- a/crates/ra_hir/src/attr.rs
+++ b/crates/ra_hir/src/attr.rs
@@ -63,14 +63,24 @@ impl Attr {
        self.path.as_ident().map_or(false, |s| s.to_string() == name)
    }
+    // FIXME: handle cfg_attr :-)
    pub(crate) fn as_cfg(&self) -> Option<&Subtree> {
-        if self.is_simple_atom("cfg") {
+        if !self.is_simple_atom("cfg") {
-            match &self.input {
+            return None;
-                Some(AttrInput::TokenTree(subtree)) => Some(subtree),
+        }
-                _ => None,
+        match &self.input {
-            }
+            Some(AttrInput::TokenTree(subtree)) => Some(subtree),
-        } else {
+            _ => None,
-            None
+        }
+    }
+    pub(crate) fn as_path(&self) -> Option<&SmolStr> {
+        if !self.is_simple_atom("path") {
+            return None;
+        }
+        match &self.input {
+            Some(AttrInput::Literal(it)) => Some(it),
+            _ => None,
        }
    }
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index e3a7e8e3c..8eb3c577d 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -5,7 +5,7 @@ pub(crate) mod docs;
 use std::sync::Arc;
-use ra_db::{CrateId, Edition, FileId, SourceRootId};
+use ra_db::{CrateId, Edition, FileId};
 use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
 use crate::{
@@ -24,7 +24,7 @@ use crate::{
        U8, USIZE,
    },
    nameres::{CrateModuleId, ImportId, ModuleScope, Namespace},
-    resolve::{Resolver, TypeNs},
+    resolve::{Resolver, Scope, TypeNs},
    traits::TraitData,
    ty::{
        primitive::{FloatBitness, FloatTy, IntBitness, IntTy, Signedness},
@@ -76,10 +76,8 @@ impl Crate {
        crate_graph.edition(self.crate_id)
    }
-    // FIXME: should this be in source_binder?
+    pub fn all(db: &impl DefDatabase) -> Vec<Crate> {
-    pub fn source_root_crates(db: &impl DefDatabase, source_root: SourceRootId) -> Vec<Crate> {
+        db.crate_graph().iter().map(|crate_id| Crate { crate_id }).collect()
-        let crate_ids = db.source_root_crates(source_root);
-        crate_ids.iter().map(|&crate_id| Crate { crate_id }).collect()
    }
 }
@@ -465,7 +463,7 @@ impl Enum {
        // ...and add generic params, if present
        let p = self.generic_params(db);
        let r = if !p.params.is_empty() { r.push_generic_params_scope(p) } else { r };
-        r
+        r.push_scope(Scope::AdtScope(self.into()))
    }
 }
@@ -569,6 +567,14 @@ impl DefWithBody {
            DefWithBody::Static(s) => s.krate(db),
        }
    }
+    pub fn module(self, db: &impl HirDatabase) -> Module {
+        match self {
+            DefWithBody::Const(c) => c.module(db),
+            DefWithBody::Function(f) => f.module(db),
+            DefWithBody::Static(s) => s.module(db),
+        }
+    }
 }
 pub trait HasBody: Copy {
@@ -789,6 +795,20 @@ impl Const {
        ImplBlock::containing(module_impls, self.into())
    }
+    pub fn parent_trait(self, db: &impl DefDatabase) -> Option<Trait> {
+        db.trait_items_index(self.module(db)).get_parent_trait(self.into())
+    }
+    pub fn container(self, db: &impl DefDatabase) -> Option<Container> {
+        if let Some(impl_block) = self.impl_block(db) {
+            Some(impl_block.into())
+        } else if let Some(trait_) = self.parent_trait(db) {
+            Some(trait_.into())
+        } else {
+            None
+        }
+    }
    // FIXME: move to a more general type for 'body-having' items
    /// Builds a resolver for code inside this item.
    pub(crate) fn resolver(self, db: &impl HirDatabase) -> Resolver {
@@ -1075,3 +1095,13 @@ impl From<AssocItem> for crate::generics::GenericDef {
        }
    }
 }
+impl AssocItem {
+    pub fn module(self, db: &impl DefDatabase) -> Module {
+        match self {
+            AssocItem::Function(f) => f.module(db),
+            AssocItem::Const(c) => c.module(db),
+            AssocItem::TypeAlias(t) => t.module(db),
+        }
+    }
+}
diff --git a/crates/ra_hir/src/code_model/docs.rs b/crates/ra_hir/src/code_model/docs.rs
index 9675e397f..8533b4f5e 100644
--- a/crates/ra_hir/src/code_model/docs.rs
+++ b/crates/ra_hir/src/code_model/docs.rs
@@ -6,21 +6,19 @@ use ra_syntax::ast;
 use crate::{
    db::{AstDatabase, DefDatabase, HirDatabase},
-    Const, Enum, EnumVariant, FieldSource, Function, HasSource, MacroDef, Module, Static, Struct,
+    Adt, Const, Enum, EnumVariant, FieldSource, Function, HasSource, MacroDef, Module, Static,
-    StructField, Trait, TypeAlias, Union,
+    Struct, StructField, Trait, TypeAlias, Union,
 };
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum DocDef {
    Module(Module),
    StructField(StructField),
-    Struct(Struct),
+    Adt(Adt),
-    Enum(Enum),
    EnumVariant(EnumVariant),
    Static(Static),
    Const(Const),
    Function(Function),
-    Union(Union),
    Trait(Trait),
    TypeAlias(TypeAlias),
    MacroDef(MacroDef),
@@ -29,13 +27,11 @@ pub enum DocDef {
 impl_froms!(
    DocDef: Module,
    StructField,
-    Struct,
+    Adt(Struct, Enum, Union),
-    Enum,
    EnumVariant,
    Static,
    Const,
    Function,
-    Union,
    Trait,
    TypeAlias,
    MacroDef
@@ -79,13 +75,15 @@ pub(crate) fn documentation_query(
            FieldSource::Named(named) => docs_from_ast(&named),
            FieldSource::Pos(..) => None,
        },
-        DocDef::Struct(it) => docs_from_ast(&it.source(db).ast),
+        DocDef::Adt(it) => match it {
-        DocDef::Enum(it) => docs_from_ast(&it.source(db).ast),
+            Adt::Struct(it) => docs_from_ast(&it.source(db).ast),
+            Adt::Enum(it) => docs_from_ast(&it.source(db).ast),
+            Adt::Union(it) => docs_from_ast(&it.source(db).ast),
+        },
        DocDef::EnumVariant(it) => docs_from_ast(&it.source(db).ast),
        DocDef::Static(it) => docs_from_ast(&it.source(db).ast),
        DocDef::Const(it) => docs_from_ast(&it.source(db).ast),
        DocDef::Function(it) => docs_from_ast(&it.source(db).ast),
-        DocDef::Union(it) => docs_from_ast(&it.source(db).ast),
        DocDef::Trait(it) => docs_from_ast(&it.source(db).ast),
        DocDef::TypeAlias(it) => docs_from_ast(&it.source(db).ast),
        DocDef::MacroDef(it) => docs_from_ast(&it.source(db).ast),
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 73d7d6fb6..489a3b19c 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -111,37 +111,37 @@ pub trait DefDatabase: InternDatabase + HirDebugDatabase {
    #[salsa::invoke(CrateDefMap::crate_def_map_query)]
    fn crate_def_map(&self, krate: Crate) -> Arc<CrateDefMap>;
-    #[salsa::invoke(crate::impl_block::impls_in_module_with_source_map_query)]
+    #[salsa::invoke(ModuleImplBlocks::impls_in_module_with_source_map_query)]
    fn impls_in_module_with_source_map(
        &self,
        module: Module,
    ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>);
-    #[salsa::invoke(crate::impl_block::impls_in_module)]
+    #[salsa::invoke(ModuleImplBlocks::impls_in_module_query)]
    fn impls_in_module(&self, module: Module) -> Arc<ModuleImplBlocks>;
    #[salsa::invoke(crate::generics::GenericParams::generic_params_query)]
    fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>;
-    #[salsa::invoke(crate::FnData::fn_data_query)]
+    #[salsa::invoke(FnData::fn_data_query)]
    fn fn_data(&self, func: Function) -> Arc<FnData>;
-    #[salsa::invoke(crate::type_alias::type_alias_data_query)]
+    #[salsa::invoke(TypeAliasData::type_alias_data_query)]
    fn type_alias_data(&self, typ: TypeAlias) -> Arc<TypeAliasData>;
-    #[salsa::invoke(crate::ConstData::const_data_query)]
+    #[salsa::invoke(ConstData::const_data_query)]
    fn const_data(&self, konst: Const) -> Arc<ConstData>;
-    #[salsa::invoke(crate::ConstData::static_data_query)]
+    #[salsa::invoke(ConstData::static_data_query)]
    fn static_data(&self, konst: Static) -> Arc<ConstData>;
-    #[salsa::invoke(crate::lang_item::LangItems::module_lang_items_query)]
+    #[salsa::invoke(LangItems::module_lang_items_query)]
    fn module_lang_items(&self, module: Module) -> Option<Arc<LangItems>>;
-    #[salsa::invoke(crate::lang_item::LangItems::crate_lang_items_query)]
+    #[salsa::invoke(LangItems::crate_lang_items_query)]
    fn crate_lang_items(&self, krate: Crate) -> Arc<LangItems>;
-    #[salsa::invoke(crate::lang_item::LangItems::lang_item_query)]
+    #[salsa::invoke(LangItems::lang_item_query)]
    fn lang_item(&self, start_crate: Crate, item: SmolStr) -> Option<LangItemTarget>;
    #[salsa::invoke(crate::code_model::docs::documentation_query)]
diff --git a/crates/ra_hir/src/debug.rs b/crates/ra_hir/src/debug.rs
index 87f3180c3..48b69000b 100644
--- a/crates/ra_hir/src/debug.rs
+++ b/crates/ra_hir/src/debug.rs
@@ -22,7 +22,7 @@ use std::fmt;
 use ra_db::{CrateId, FileId};
-use crate::{db::HirDatabase, Crate, Module, Name};
+use crate::{db::HirDatabase, Crate, HirFileId, Module, Name};
 impl Crate {
    pub fn debug(self, db: &impl HirDebugDatabase) -> impl fmt::Debug + '_ {
@@ -36,6 +36,12 @@ impl Module {
    }
 }
+impl HirFileId {
+    pub fn debug(self, db: &impl HirDebugDatabase) -> impl fmt::Debug + '_ {
+        debug_fn(move |fmt| db.debug_hir_file_id(self, fmt))
+    }
+}
 pub trait HirDebugHelper: HirDatabase {
    fn crate_name(&self, _krate: CrateId) -> Option<String> {
        None
@@ -48,6 +54,7 @@ pub trait HirDebugHelper: HirDatabase {
 pub trait HirDebugDatabase {
    fn debug_crate(&self, krate: Crate, fmt: &mut fmt::Formatter<'_>) -> fmt::Result;
    fn debug_module(&self, module: Module, fmt: &mut fmt::Formatter<'_>) -> fmt::Result;
+    fn debug_hir_file_id(&self, file_id: HirFileId, fmt: &mut fmt::Formatter<'_>) -> fmt::Result;
 }
 impl<DB: HirDebugHelper> HirDebugDatabase for DB {
@@ -62,12 +69,19 @@ impl<DB: HirDebugHelper> HirDebugDatabase for DB {
    fn debug_module(&self, module: Module, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
        let file_id = module.definition_source(self).file_id.original_file(self);
-        let path = self.file_path(file_id);
+        let path = self.file_path(file_id).unwrap_or_else(|| "N/A".to_string());
        fmt.debug_struct("Module")
            .field("name", &module.name(self).unwrap_or_else(Name::missing))
-            .field("path", &path.unwrap_or_else(|| "N/A".to_string()))
+            .field("path", &path)
            .finish()
    }
+    fn debug_hir_file_id(&self, file_id: HirFileId, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let original = file_id.original_file(self);
+        let path = self.file_path(original).unwrap_or_else(|| "N/A".to_string());
+        let is_macro = file_id != original.into();
+        fmt.debug_struct("HirFileId").field("path", &path).field("macro", &is_macro).finish()
+    }
 }
 fn debug_fn(f: impl Fn(&mut fmt::Formatter<'_>) -> fmt::Result) -> impl fmt::Debug {
diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs
index a012f33f7..f80d8eb5f 100644
--- a/crates/ra_hir/src/from_source.rs
+++ b/crates/ra_hir/src/from_source.rs
@@ -189,14 +189,14 @@ impl Module {
            ModuleSource::SourceFile(_) => None,
        };
-        let source_root_id = db.file_source_root(src.file_id.original_file(db));
+        db.relevant_crates(src.file_id.original_file(db))
-        db.source_root_crates(source_root_id).iter().map(|&crate_id| Crate { crate_id }).find_map(
+            .iter()
-            |krate| {
+            .map(|&crate_id| Crate { crate_id })
+            .find_map(|krate| {
                let def_map = db.crate_def_map(krate);
                let module_id = def_map.find_module_by_source(src.file_id, decl_id)?;
                Some(Module { krate, module_id })
-            },
+            })
-        )
    }
 }
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index a3b65cc79..499dcafea 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -50,16 +50,6 @@ impl HirFileId {
        }
    }
-    /// XXX: this is a temporary function, which should go away when we implement the
-    /// nameresolution+macro expansion combo. Prefer using `original_file` if
-    /// possible.
-    pub fn as_original_file(self) -> FileId {
-        match self.0 {
-            HirFileIdRepr::File(file_id) => file_id,
-            HirFileIdRepr::Macro(_r) => panic!("macro generated file: {:?}", self),
-        }
-    }
    /// Get the crate which the macro lives in, if it is a macro file.
    pub(crate) fn macro_crate(self, db: &impl AstDatabase) -> Option<Crate> {
        match self.0 {
@@ -95,11 +85,7 @@ impl HirFileId {
                // Note:
                // The final goal we would like to make all parse_macro success,
                // such that the following log will not call anyway.
-                log::warn!(
+                log::warn!("fail on macro_parse: (reason: {})", err,);
-                    "fail on macro_parse: (reason: {}) {}",
-                    err,
-                    macro_call_id.debug_dump(db)
-                );
            })
            .ok()?;
        match macro_file.macro_file_kind {
@@ -377,35 +363,6 @@ impl AstItemDef<ast::TypeAliasDef> for TypeAliasId {
    }
 }
-impl MacroCallId {
-    pub fn debug_dump(self, db: &impl AstDatabase) -> String {
-        let loc = self.loc(db);
-        let node = loc.ast_id.to_node(db);
-        let syntax_str = {
-            let mut res = String::new();
-            node.syntax().text().for_each_chunk(|chunk| {
-                if !res.is_empty() {
-                    res.push(' ')
-                }
-                res.push_str(chunk)
-            });
-            res
-        };
-        // dump the file name
-        let file_id: HirFileId = self.loc(db).ast_id.file_id();
-        let original = file_id.original_file(db);
-        let macro_rules = db.macro_def(loc.def);
-        format!(
-            "macro call [file: {:?}] : {}\nhas rules: {}",
-            db.file_relative_path(original),
-            syntax_str,
-            macro_rules.is_some()
-        )
-    }
-}
 /// This exists just for Chalk, because Chalk just has a single `StructId` where
 /// we have different kinds of ADTs, primitive types and special type
 /// constructors like tuples and function pointers.
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index 55dfc393b..33ef87563 100644
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -176,6 +176,25 @@ pub struct ModuleImplBlocks {
 }
 impl ModuleImplBlocks {
+    pub(crate) fn impls_in_module_with_source_map_query(
+        db: &(impl DefDatabase + AstDatabase),
+        module: Module,
+    ) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>) {
+        let mut source_map = ImplSourceMap::default();
+        let crate_graph = db.crate_graph();
+        let cfg_options = crate_graph.cfg_options(module.krate.crate_id());
+        let result = ModuleImplBlocks::collect(db, cfg_options, module, &mut source_map);
+        (Arc::new(result), Arc::new(source_map))
+    }
+    pub(crate) fn impls_in_module_query(
+        db: &impl DefDatabase,
+        module: Module,
+    ) -> Arc<ModuleImplBlocks> {
+        db.impls_in_module_with_source_map(module).0
+    }
    fn collect(
        db: &(impl DefDatabase + AstDatabase),
        cfg_options: &CfgOptions,
@@ -264,19 +283,3 @@ impl ModuleImplBlocks {
        }
    }
 }
-pub(crate) fn impls_in_module_with_source_map_query(
-    db: &(impl DefDatabase + AstDatabase),
-    module: Module,
-) -> (Arc<ModuleImplBlocks>, Arc<ImplSourceMap>) {
-    let mut source_map = ImplSourceMap::default();
-    let crate_graph = db.crate_graph();
-    let cfg_options = crate_graph.cfg_options(module.krate.crate_id());
-    let result = ModuleImplBlocks::collect(db, cfg_options, module, &mut source_map);
-    (Arc::new(result), Arc::new(source_map))
-}
-pub(crate) fn impls_in_module(db: &impl DefDatabase, module: Module) -> Arc<ModuleImplBlocks> {
-    db.impls_in_module_with_source_map(module).0
-}
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 4340e9d34..ca261e8f5 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -51,6 +51,7 @@ mod lang_item;
 mod generics;
 mod resolve;
 pub mod diagnostics;
+mod util;
 mod code_model;
@@ -71,7 +72,7 @@ pub use self::{
    either::Either,
    expr::ExprScopes,
    from_source::FromSource,
-    generics::{GenericParam, GenericParams, HasGenericParams},
+    generics::{GenericDef, GenericParam, GenericParams, HasGenericParams},
    ids::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile},
    impl_block::ImplBlock,
    name::Name,
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index f750986b8..0b278deb3 100644
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -5,10 +5,10 @@ use std::{panic, sync::Arc};
 use parking_lot::Mutex;
 use ra_cfg::CfgOptions;
 use ra_db::{
-    salsa, CrateGraph, CrateId, Edition, FileId, FilePosition, SourceDatabase, SourceRoot,
+    salsa, CrateGraph, CrateId, Edition, FileId, FileLoader, FileLoaderDelegate, FilePosition,
-    SourceRootId,
+    SourceDatabase, SourceDatabaseExt, SourceRoot, SourceRootId,
 };
-use relative_path::RelativePathBuf;
+use relative_path::{RelativePath, RelativePathBuf};
 use rustc_hash::FxHashMap;
 use test_utils::{extract_offset, parse_fixture, CURSOR_MARKER};
@@ -17,6 +17,7 @@ use crate::{db, debug::HirDebugHelper, diagnostics::DiagnosticSink};
 pub const WORKSPACE: SourceRootId = SourceRootId(0);
 #[salsa::database(
+    ra_db::SourceDatabaseExtStorage,
    ra_db::SourceDatabaseStorage,
    db::InternDatabaseStorage,
    db::AstDatabaseStorage,
@@ -34,6 +35,22 @@ pub struct MockDatabase {
 impl panic::RefUnwindSafe for MockDatabase {}
+impl FileLoader for MockDatabase {
+    fn file_text(&self, file_id: FileId) -> Arc<String> {
+        FileLoaderDelegate(self).file_text(file_id)
+    }
+    fn resolve_relative_path(
+        &self,
+        anchor: FileId,
+        relative_path: &RelativePath,
+    ) -> Option<FileId> {
+        FileLoaderDelegate(self).resolve_relative_path(anchor, relative_path)
+    }
+    fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
+        FileLoaderDelegate(self).relevant_crates(file_id)
+    }
+}
 impl HirDebugHelper for MockDatabase {
    fn crate_name(&self, krate: CrateId) -> Option<String> {
        self.crate_names.get(&krate).cloned()
@@ -278,7 +295,10 @@ macro_rules! crate_graph {
            $crate_path:literal,
            $($edition:literal,)?
            [$($dep:literal),*]
-            $(,$cfg:expr)?
+            $(, cfg = {
+                $($key:literal $(= $value:literal)?),*
+                $(,)?
+            })?
        ),
    )*) => {{
        let mut res = $crate::mock::CrateGraphFixture::default();
@@ -286,7 +306,19 @@ macro_rules! crate_graph {
            #[allow(unused_mut, unused_assignments)]
            let mut edition = ra_db::Edition::Edition2018;
            $(edition = ra_db::Edition::from_string($edition);)?
-            let cfg_options = { ::ra_cfg::CfgOptions::default() $(; $cfg)? };
+            let cfg_options = {
+                #[allow(unused_mut)]
+                let mut cfg = ::ra_cfg::CfgOptions::default();
+                $(
+                    $(
+                        if 0 == 0 $(+ { drop($value); 1})? {
+                            cfg.insert_atom($key.into());
+                        }
+                        $(cfg.insert_key_value($key.into(), $value.into());)?
+                    )*
+                )?
+                cfg
+            };
            res.0.push((
                $crate_name.to_string(),
                ($crate_path.to_string(), edition, cfg_options, vec![$($dep.to_string()),*])
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs
index cef2dc9d2..b5fe16bfa 100644
--- a/crates/ra_hir/src/nameres/collector.rs
+++ b/crates/ra_hir/src/nameres/collector.rs
@@ -7,14 +7,13 @@ use rustc_hash::FxHashMap;
 use test_utils::tested_by;
 use crate::{
+    attr::Attr,
    db::DefDatabase,
    ids::{AstItemDef, LocationCtx, MacroCallId, MacroCallLoc, MacroDefId, MacroFileKind},
    name::MACRO_RULES,
    nameres::{
-        diagnostics::DefDiagnostic,
+        diagnostics::DefDiagnostic, mod_resolution::ModDir, raw, Crate, CrateDefMap, CrateModuleId,
-        mod_resolution::{resolve_submodule, ParentModule},
+        ModuleData, ModuleDef, PerNs, ReachedFixedPoint, Resolution, ResolveMode,
-        raw, Crate, CrateDefMap, CrateModuleId, ModuleData, ModuleDef, PerNs, ReachedFixedPoint,
-        Resolution, ResolveMode,
    },
    Adt, AstId, Const, Enum, Function, HirFileId, MacroDef, Module, Name, Path, PathKind, Static,
    Struct, Trait, TypeAlias, Union,
@@ -45,6 +44,7 @@ pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> C
        glob_imports: FxHashMap::default(),
        unresolved_imports: Vec::new(),
        unexpanded_macros: Vec::new(),
+        mod_dirs: FxHashMap::default(),
        macro_stack_monitor: MacroStackMonitor::default(),
        cfg_options,
    };
@@ -87,6 +87,7 @@ struct DefCollector<'a, DB> {
    glob_imports: FxHashMap<CrateModuleId, Vec<(CrateModuleId, raw::ImportId)>>,
    unresolved_imports: Vec<(CrateModuleId, raw::ImportId, raw::ImportData)>,
    unexpanded_macros: Vec<(CrateModuleId, AstId<ast::MacroCall>, Path)>,
+    mod_dirs: FxHashMap<CrateModuleId, ModDir>,
    /// Some macro use `$tt:tt which mean we have to handle the macro perfectly
    /// To prevent stack overflow, we add a deep counter here for prevent that.
@@ -107,11 +108,10 @@ where
        self.def_map.modules[module_id].definition = Some(file_id);
        ModCollector {
            def_collector: &mut *self,
-            attr_path: None,
            module_id,
            file_id: file_id.into(),
            raw_items: &raw_items,
-            parent_module: None,
+            mod_dir: ModDir::root(),
        }
        .collect(raw_items.items());
@@ -481,13 +481,13 @@ 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);
+            let mod_dir = self.mod_dirs[&module_id].clone();
            ModCollector {
                def_collector: &mut *self,
                file_id,
-                attr_path: None,
                module_id,
                raw_items: &raw_items,
-                parent_module: None,
+                mod_dir,
            }
            .collect(raw_items.items());
        } else {
@@ -508,9 +508,8 @@ struct ModCollector<'a, D> {
    def_collector: D,
    module_id: CrateModuleId,
    file_id: HirFileId,
-    attr_path: Option<&'a SmolStr>,
    raw_items: &'a raw::RawItems,
-    parent_module: Option<ParentModule<'a>>,
+    mod_dir: ModDir,
 }
 impl<DB> ModCollector<'_, &'_ mut DefCollector<'_, DB>>
@@ -518,6 +517,10 @@ where
    DB: DefDatabase,
 {
    fn collect(&mut self, items: &[raw::RawItem]) {
+        // Note: don't assert that inserted value is fresh: it's simply not true
+        // for macros.
+        self.def_collector.mod_dirs.insert(self.module_id, self.mod_dir.clone());
        // Prelude module is always considered to be `#[macro_use]`.
        if let Some(prelude_module) = self.def_collector.def_map.prelude {
            if prelude_module.krate != self.def_collector.def_map.krate {
@@ -530,7 +533,7 @@ where
        // `#[macro_use] extern crate` is hoisted to imports macros before collecting
        // any other items.
        for item in items {
-            if self.is_cfg_enabled(&item.attrs) {
+            if self.is_cfg_enabled(item.attrs()) {
                if let raw::RawItemKind::Import(import_id) = item.kind {
                    let import = self.raw_items[import_id].clone();
                    if import.is_extern_crate && import.is_macro_use {
@@ -541,9 +544,11 @@ where
        }
        for item in items {
-            if self.is_cfg_enabled(&item.attrs) {
+            if self.is_cfg_enabled(item.attrs()) {
                match item.kind {
-                    raw::RawItemKind::Module(m) => self.collect_module(&self.raw_items[m]),
+                    raw::RawItemKind::Module(m) => {
+                        self.collect_module(&self.raw_items[m], item.attrs())
+                    }
                    raw::RawItemKind::Import(import_id) => self
                        .def_collector
                        .unresolved_imports
@@ -555,53 +560,48 @@ where
        }
    }
-    fn collect_module(&mut self, module: &raw::ModuleData) {
+    fn collect_module(&mut self, module: &raw::ModuleData, attrs: &[Attr]) {
+        let path_attr = self.path_attr(attrs);
+        let is_macro_use = self.is_macro_use(attrs);
        match module {
            // inline module, just recurse
-            raw::ModuleData::Definition { name, items, ast_id, attr_path, is_macro_use } => {
+            raw::ModuleData::Definition { name, items, ast_id } => {
                let module_id =
                    self.push_child_module(name.clone(), ast_id.with_file_id(self.file_id), None);
-                let parent_module = ParentModule { name, attr_path: attr_path.as_ref() };
                ModCollector {
                    def_collector: &mut *self.def_collector,
                    module_id,
-                    attr_path: attr_path.as_ref(),
                    file_id: self.file_id,
                    raw_items: self.raw_items,
-                    parent_module: Some(parent_module),
+                    mod_dir: self.mod_dir.descend_into_definition(name, path_attr),
                }
                .collect(&*items);
-                if *is_macro_use {
+                if is_macro_use {
                    self.import_all_legacy_macros(module_id);
                }
            }
            // out of line module, resolve, parse and recurse
-            raw::ModuleData::Declaration { name, ast_id, attr_path, is_macro_use } => {
+            raw::ModuleData::Declaration { name, ast_id } => {
                let ast_id = ast_id.with_file_id(self.file_id);
-                let is_root = self.def_collector.def_map.modules[self.module_id].parent.is_none();
+                match self.mod_dir.resolve_declaration(
-                match resolve_submodule(
                    self.def_collector.db,
                    self.file_id,
-                    self.attr_path,
                    name,
-                    is_root,
+                    path_attr,
-                    attr_path.as_ref(),
-                    self.parent_module,
                ) {
-                    Ok(file_id) => {
+                    Ok((file_id, mod_dir)) => {
                        let module_id = self.push_child_module(name.clone(), ast_id, Some(file_id));
                        let raw_items = self.def_collector.db.raw_items(file_id.into());
                        ModCollector {
                            def_collector: &mut *self.def_collector,
                            module_id,
-                            attr_path: attr_path.as_ref(),
                            file_id: file_id.into(),
                            raw_items: &raw_items,
-                            parent_module: None,
+                            mod_dir,
                        }
                        .collect(raw_items.items());
-                        if *is_macro_use {
+                        if is_macro_use {
                            self.import_all_legacy_macros(module_id);
                        }
                    }
@@ -714,12 +714,16 @@ where
        }
    }
-    fn is_cfg_enabled(&self, attrs: &raw::Attrs) -> bool {
+    fn is_cfg_enabled(&self, attrs: &[Attr]) -> bool {
-        attrs.as_ref().map_or(true, |attrs| {
+        attrs.iter().all(|attr| attr.is_cfg_enabled(&self.def_collector.cfg_options) != Some(false))
-            attrs
+    }
-                .iter()
-                .all(|attr| attr.is_cfg_enabled(&self.def_collector.cfg_options) != Some(false))
+    fn path_attr<'a>(&self, attrs: &'a [Attr]) -> Option<&'a SmolStr> {
-        })
+        attrs.iter().find_map(|attr| attr.as_path())
+    }
+    fn is_macro_use<'a>(&self, attrs: &'a [Attr]) -> bool {
+        attrs.iter().any(|attr| attr.is_simple_atom("macro_use"))
    }
 }
@@ -747,6 +751,7 @@ mod tests {
            glob_imports: FxHashMap::default(),
            unresolved_imports: Vec::new(),
            unexpanded_macros: Vec::new(),
+            mod_dirs: FxHashMap::default(),
            macro_stack_monitor: monitor,
            cfg_options: &CfgOptions::default(),
        };
diff --git a/crates/ra_hir/src/nameres/mod_resolution.rs b/crates/ra_hir/src/nameres/mod_resolution.rs
index 3aa32bd66..e8b808514 100644
--- a/crates/ra_hir/src/nameres/mod_resolution.rs
+++ b/crates/ra_hir/src/nameres/mod_resolution.rs
@@ -1,187 +1,87 @@
 //! This module resolves `mod foo;` declaration to file.
+use ra_db::FileId;
-use std::{borrow::Cow, sync::Arc};
-use ra_db::{FileId, SourceRoot};
 use ra_syntax::SmolStr;
 use relative_path::RelativePathBuf;
 use crate::{db::DefDatabase, HirFileId, Name};
-#[derive(Clone, Copy)]
+#[derive(Clone, Debug)]
-pub(super) struct ParentModule<'a> {
+pub(super) struct ModDir {
-    pub(super) name: &'a Name,
+    /// `.` for `mod.rs`, `lib.rs`
-    pub(super) attr_path: Option<&'a SmolStr>,
+    /// `./foo` for `foo.rs`
+    /// `./foo/bar` for `mod bar { mod x; }` nested in `foo.rs`
+    path: RelativePathBuf,
+    /// inside `./foo.rs`, mods with `#[path]` should *not* be relative to `./foo/`
+    root_non_dir_owner: bool,
 }
-impl<'a> ParentModule<'a> {
+impl ModDir {
-    fn attribute_path(&self) -> Option<&SmolStr> {
+    pub(super) fn root() -> ModDir {
-        self.attr_path.filter(|p| !p.is_empty())
+        ModDir { path: RelativePathBuf::default(), root_non_dir_owner: false }
    }
-}
-pub(super) fn resolve_submodule(
+    pub(super) fn descend_into_definition(
-    db: &impl DefDatabase,
+        &self,
-    file_id: HirFileId,
+        name: &Name,
-    mod_attr_path: Option<&SmolStr>,
+        attr_path: Option<&SmolStr>,
-    name: &Name,
+    ) -> ModDir {
-    is_root: bool,
+        let mut path = self.path.clone();
-    attr_path: Option<&SmolStr>,
+        match attr_to_path(attr_path) {
-    parent_module: Option<ParentModule<'_>>,
+            None => path.push(&name.to_string()),
-) -> Result<FileId, RelativePathBuf> {
+            Some(attr_path) => {
-    let file_id = file_id.original_file(db);
+                if self.root_non_dir_owner {
-    let source_root_id = db.file_source_root(file_id);
+                    // Workaround for relative path API: turn `lib.rs` into ``.
-    let path = db.file_relative_path(file_id);
+                    if !path.pop() {
-    let root = RelativePathBuf::default();
+                        path = RelativePathBuf::default();
-    let dir_path = path.parent().unwrap_or(&root);
+                    }
-    let mod_name = path.file_stem().unwrap_or("unknown");
-    let resolve_mode = match (attr_path.filter(|p| !p.is_empty()), parent_module) {
-        (Some(file_path), Some(parent_module)) => {
-            let file_path = normalize_attribute_path(file_path);
-            match parent_module.attribute_path() {
-                Some(parent_module_attr_path) => {
-                    let path = dir_path
-                        .join(format!(
-                            "{}/{}",
-                            normalize_attribute_path(parent_module_attr_path),
-                            file_path
-                        ))
-                        .normalize();
-                    ResolutionMode::InlineModuleWithAttributePath(
-                        InsideInlineModuleMode::WithAttributePath(path),
-                    )
-                }
-                None => {
-                    let path =
-                        dir_path.join(format!("{}/{}", parent_module.name, file_path)).normalize();
-                    ResolutionMode::InsideInlineModule(InsideInlineModuleMode::WithAttributePath(
-                        path,
-                    ))
                }
+                path.push(attr_path);
            }
        }
-        (None, Some(parent_module)) => match parent_module.attribute_path() {
+        ModDir { path, root_non_dir_owner: false }
-            Some(parent_module_attr_path) => {
+    }
-                let path = dir_path.join(format!(
-                    "{}/{}.rs",
+    pub(super) fn resolve_declaration(
-                    normalize_attribute_path(parent_module_attr_path),
+        &self,
-                    name
+        db: &impl DefDatabase,
-                ));
+        file_id: HirFileId,
-                ResolutionMode::InlineModuleWithAttributePath(InsideInlineModuleMode::File(path))
+        name: &Name,
+        attr_path: Option<&SmolStr>,
+    ) -> Result<(FileId, ModDir), RelativePathBuf> {
+        let empty_path = RelativePathBuf::default();
+        let file_id = file_id.original_file(db);
+        let mut candidate_files = Vec::new();
+        match attr_to_path(attr_path) {
+            Some(attr_path) => {
+                let base = if self.root_non_dir_owner {
+                    self.path.parent().unwrap_or(&empty_path)
+                } else {
+                    &self.path
+                };
+                candidate_files.push(base.join(attr_path))
            }
            None => {
-                let path = dir_path.join(format!("{}/{}.rs", parent_module.name, name));
+                candidate_files.push(self.path.join(&format!("{}.rs", name)));
-                ResolutionMode::InsideInlineModule(InsideInlineModuleMode::File(path))
+                candidate_files.push(self.path.join(&format!("{}/mod.rs", name)));
-            }
-        },
-        (Some(file_path), None) => {
-            let file_path = normalize_attribute_path(file_path);
-            let path = dir_path.join(file_path.as_ref()).normalize();
-            ResolutionMode::OutOfLine(OutOfLineMode::WithAttributePath(path))
-        }
-        (None, None) => {
-            let is_dir_owner = is_root || mod_name == "mod" || mod_attr_path.is_some();
-            if is_dir_owner {
-                let file_mod = dir_path.join(format!("{}.rs", name));
-                let dir_mod = dir_path.join(format!("{}/mod.rs", name));
-                ResolutionMode::OutOfLine(OutOfLineMode::RootOrModRs {
-                    file: file_mod,
-                    directory: dir_mod,
-                })
-            } else {
-                let path = dir_path.join(format!("{}/{}.rs", mod_name, name));
-                ResolutionMode::OutOfLine(OutOfLineMode::FileInDirectory(path))
            }
-        }
+        };
-    };
+        for candidate in candidate_files.iter() {
-    resolve_mode.resolve(db.source_root(source_root_id))
+            if let Some(file_id) = db.resolve_relative_path(file_id, candidate) {
-}
+                let mut root_non_dir_owner = false;
+                let mut mod_path = RelativePathBuf::new();
-fn normalize_attribute_path(file_path: &SmolStr) -> Cow<str> {
+                if !(candidate.ends_with("mod.rs") || attr_path.is_some()) {
-    let current_dir = "./";
+                    root_non_dir_owner = true;
-    let windows_path_separator = r#"\"#;
+                    mod_path.push(&name.to_string());
-    let current_dir_normalize = if file_path.starts_with(current_dir) {
-        &file_path[current_dir.len()..]
-    } else {
-        file_path.as_str()
-    };
-    if current_dir_normalize.contains(windows_path_separator) {
-        Cow::Owned(current_dir_normalize.replace(windows_path_separator, "/"))
-    } else {
-        Cow::Borrowed(current_dir_normalize)
-    }
-}
-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.file_by_relative_path(file) {
-                    None => resolve_simple_path(source_root, directory).map_err(|_| file.clone()),
-                    file_id => resolve_find_result(file_id, file),
                }
+                return Ok((file_id, ModDir { path: mod_path, root_non_dir_owner }));
            }
-            OutOfLineMode::FileInDirectory(path) => resolve_simple_path(source_root, path),
-            OutOfLineMode::WithAttributePath(path) => resolve_simple_path(source_root, path),
        }
+        Err(candidate_files.remove(0))
    }
 }
-enum InsideInlineModuleMode {
+fn attr_to_path(attr: Option<&SmolStr>) -> Option<RelativePathBuf> {
-    File(RelativePathBuf),
+    attr.and_then(|it| RelativePathBuf::from_path(&it.replace("\\", "/")).ok())
-    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),
-    InlineModuleWithAttributePath(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),
-            InlineModuleWithAttributePath(mode) => mode.resolve(source_root),
-        }
-    }
-}
-fn resolve_simple_path(
-    source_root: Arc<SourceRoot>,
-    path: &RelativePathBuf,
-) -> Result<FileId, RelativePathBuf> {
-    resolve_find_result(source_root.file_by_relative_path(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()),
-    }
 }
diff --git a/crates/ra_hir/src/nameres/raw.rs b/crates/ra_hir/src/nameres/raw.rs
index 623b343c4..57f2929c3 100644
--- a/crates/ra_hir/src/nameres/raw.rs
+++ b/crates/ra_hir/src/nameres/raw.rs
@@ -5,7 +5,7 @@ use std::{ops::Index, sync::Arc};
 use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
 use ra_syntax::{
    ast::{self, AttrsOwner, NameOwner},
-    AstNode, AstPtr, SmolStr, SourceFile,
+    AstNode, AstPtr, SourceFile,
 };
 use test_utils::tested_by;
@@ -121,14 +121,20 @@ impl Index<Macro> for RawItems {
 }
 // Avoid heap allocation on items without attributes.
-pub(super) type Attrs = Option<Arc<[Attr]>>;
+type Attrs = Option<Arc<[Attr]>>;
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub(super) struct RawItem {
-    pub(super) attrs: Attrs,
+    attrs: Attrs,
    pub(super) kind: RawItemKind,
 }
+impl RawItem {
+    pub(super) fn attrs(&self) -> &[Attr] {
+        self.attrs.as_ref().map_or(&[], |it| &*it)
+    }
+}
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub(super) enum RawItemKind {
    Module(Module),
@@ -143,19 +149,8 @@ impl_arena_id!(Module);
 #[derive(Debug, PartialEq, Eq)]
 pub(super) enum ModuleData {
-    Declaration {
+    Declaration { name: Name, ast_id: FileAstId<ast::Module> },
-        name: Name,
+    Definition { name: Name, ast_id: FileAstId<ast::Module>, items: Vec<RawItem> },
-        ast_id: FileAstId<ast::Module>,
-        attr_path: Option<SmolStr>,
-        is_macro_use: bool,
-    },
-    Definition {
-        name: Name,
-        ast_id: FileAstId<ast::Module>,
-        items: Vec<RawItem>,
-        attr_path: Option<SmolStr>,
-        is_macro_use: bool,
-    },
 }
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -286,28 +281,17 @@ impl<DB: AstDatabase> RawItemsCollector<&DB> {
        let attrs = self.parse_attrs(&module);
        let ast_id = self.source_ast_id_map.ast_id(&module);
-        // FIXME: cfg_attr
-        let is_macro_use = module.has_atom_attr("macro_use");
        if module.has_semi() {
-            let attr_path = extract_mod_path_attribute(&module);
+            let item = self.raw_items.modules.alloc(ModuleData::Declaration { name, ast_id });
-            let item = self.raw_items.modules.alloc(ModuleData::Declaration {
-                name,
-                ast_id,
-                attr_path,
-                is_macro_use,
-            });
            self.push_item(current_module, attrs, RawItemKind::Module(item));
            return;
        }
        if let Some(item_list) = module.item_list() {
-            let attr_path = extract_mod_path_attribute(&module);
            let item = self.raw_items.modules.alloc(ModuleData::Definition {
                name,
                ast_id,
                items: Vec::new(),
-                attr_path,
-                is_macro_use,
            });
            self.process_module(Some(item), item_list);
            self.push_item(current_module, attrs, RawItemKind::Module(item));
@@ -417,16 +401,3 @@ impl<DB: AstDatabase> RawItemsCollector<&DB> {
        Attr::from_attrs_owner(self.file_id, item, self.db)
    }
 }
-fn extract_mod_path_attribute(module: &ast::Module) -> Option<SmolStr> {
-    module.attrs().into_iter().find_map(|attr| {
-        attr.as_simple_key_value().and_then(|(name, value)| {
-            let is_path = name == "path";
-            if is_path {
-                Some(value)
-            } else {
-                None
-            }
-        })
-    })
-}
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 34dd79574..8c6b40aaf 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -7,7 +7,6 @@ mod mod_resolution;
 use std::sync::Arc;
 use insta::assert_snapshot;
-use ra_cfg::CfgOptions;
 use ra_db::SourceDatabase;
 use test_utils::covers;
@@ -561,12 +560,12 @@ fn cfg_test() {
        "#,
        crate_graph! {
            "main": ("/main.rs", ["std"]),
-            "std": ("/lib.rs", [], CfgOptions::default()
+            "std": ("/lib.rs", [], cfg = {
-                .atom("test".into())
+                "test",
-                .key_value("feature".into(), "foo".into())
+                "feature" = "foo",
-                .key_value("feature".into(), "bar".into())
+                "feature" = "bar",
-                .key_value("opt".into(), "42".into())
+                "opt" = "42",
-            ),
+            }),
        },
    );
diff --git a/crates/ra_hir/src/nameres/tests/incremental.rs b/crates/ra_hir/src/nameres/tests/incremental.rs
index c41862a0b..af9c39760 100644
--- a/crates/ra_hir/src/nameres/tests/incremental.rs
+++ b/crates/ra_hir/src/nameres/tests/incremental.rs
@@ -2,7 +2,7 @@ use super::*;
 use std::sync::Arc;
-use ra_db::SourceDatabase;
+use ra_db::{SourceDatabase, SourceDatabaseExt};
 fn check_def_map_is_not_recomputed(initial: &str, file_change: &str) {
    let (mut db, pos) = MockDatabase::with_position(initial);
diff --git a/crates/ra_hir/src/nameres/tests/macros.rs b/crates/ra_hir/src/nameres/tests/macros.rs
index e4b408394..4f52ad2c5 100644
--- a/crates/ra_hir/src/nameres/tests/macros.rs
+++ b/crates/ra_hir/src/nameres/tests/macros.rs
@@ -38,21 +38,34 @@ fn macro_rules_can_define_modules() {
        }
        m!(n1);
+        mod m {
+            m!(n3)
+        }
        //- /n1.rs
        m!(n2)
        //- /n1/n2.rs
        struct X;
+        //- /m/n3.rs
+        struct Y;
        ",
    );
    assert_snapshot!(map, @r###"
-   ⋮crate
+    crate
-   ⋮n1: t
+    m: t
-   ⋮
+    n1: t
-   ⋮crate::n1
+    
-   ⋮n2: t
+    crate::m
-   ⋮
+    n3: t
-   ⋮crate::n1::n2
+    
-   ⋮X: t v
+    crate::m::n3
+    Y: t v
+    
+    crate::n1
+    n2: t
+    
+    crate::n1::n2
+    X: t v
    "###);
 }
diff --git a/crates/ra_hir/src/nameres/tests/mod_resolution.rs b/crates/ra_hir/src/nameres/tests/mod_resolution.rs
index e3e6f1e95..f569aacdc 100644
--- a/crates/ra_hir/src/nameres/tests/mod_resolution.rs
+++ b/crates/ra_hir/src/nameres/tests/mod_resolution.rs
@@ -26,6 +26,33 @@ fn name_res_works_for_broken_modules() {
 }
 #[test]
+fn nested_module_resolution() {
+    let map = def_map(
+        "
+        //- /lib.rs
+        mod n1;
+        //- /n1.rs
+        mod n2;
+        //- /n1/n2.rs
+        struct X;
+        ",
+    );
+    assert_snapshot!(map, @r###"
+        ⋮crate
+        ⋮n1: t
+        ⋮
+        ⋮crate::n1
+        ⋮n2: t
+        ⋮
+        ⋮crate::n1::n2
+        ⋮X: t v
+    "###);
+}
+#[test]
 fn module_resolution_works_for_non_standard_filenames() {
    let map = def_map_with_crate_graph(
        "
@@ -53,18 +80,15 @@ fn module_resolution_works_for_non_standard_filenames() {
 #[test]
 fn module_resolution_works_for_raw_modules() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        "
-        //- /library.rs
+        //- /lib.rs
        mod r#async;
        use self::r#async::Bar;
        //- /async.rs
        pub struct Bar;
        ",
-        crate_graph! {
-            "library": ("/library.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -79,9 +103,9 @@ fn module_resolution_works_for_raw_modules() {
 #[test]
 fn module_resolution_decl_path() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
-        //- /library.rs
+        //- /lib.rs
        #[path = "bar/baz/foo.rs"]
        mod foo;
        use self::foo::Bar;
@@ -89,9 +113,6 @@ fn module_resolution_decl_path() {
        //- /bar/baz/foo.rs
        pub struct Bar;
        "###,
-        crate_graph! {
-            "library": ("/library.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -106,7 +127,7 @@ fn module_resolution_decl_path() {
 #[test]
 fn module_resolution_module_with_path_in_mod_rs() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo;
@@ -120,9 +141,6 @@ fn module_resolution_module_with_path_in_mod_rs() {
        //- /foo/baz.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -140,7 +158,7 @@ fn module_resolution_module_with_path_in_mod_rs() {
 #[test]
 fn module_resolution_module_with_path_non_crate_root() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo;
@@ -154,9 +172,6 @@ fn module_resolution_module_with_path_non_crate_root() {
        //- /baz.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -174,7 +189,7 @@ fn module_resolution_module_with_path_non_crate_root() {
 #[test]
 fn module_resolution_module_decl_path_super() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = "bar/baz/module.rs"]
@@ -184,9 +199,6 @@ fn module_resolution_module_decl_path_super() {
        //- /bar/baz/module.rs
        use super::Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -201,7 +213,7 @@ fn module_resolution_module_decl_path_super() {
 #[test]
 fn module_resolution_explicit_path_mod_rs() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = "module/mod.rs"]
@@ -210,9 +222,6 @@ fn module_resolution_explicit_path_mod_rs() {
        //- /module/mod.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -226,7 +235,7 @@ fn module_resolution_explicit_path_mod_rs() {
 #[test]
 fn module_resolution_relative_path() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo;
@@ -238,9 +247,6 @@ fn module_resolution_relative_path() {
        //- /sub.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -257,7 +263,7 @@ fn module_resolution_relative_path() {
 #[test]
 fn module_resolution_relative_path_2() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo;
@@ -269,9 +275,6 @@ fn module_resolution_relative_path_2() {
        //- /sub.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -288,7 +291,7 @@ fn module_resolution_relative_path_2() {
 #[test]
 fn module_resolution_explicit_path_mod_rs_2() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = "module/bar/mod.rs"]
@@ -297,9 +300,6 @@ fn module_resolution_explicit_path_mod_rs_2() {
        //- /module/bar/mod.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -313,7 +313,7 @@ fn module_resolution_explicit_path_mod_rs_2() {
 #[test]
 fn module_resolution_explicit_path_mod_rs_with_win_separator() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = "module\bar\mod.rs"]
@@ -322,9 +322,6 @@ fn module_resolution_explicit_path_mod_rs_with_win_separator() {
        //- /module/bar/mod.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -338,7 +335,7 @@ fn module_resolution_explicit_path_mod_rs_with_win_separator() {
 #[test]
 fn module_resolution_decl_inside_inline_module_with_path_attribute() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = "models"]
@@ -349,9 +346,6 @@ fn module_resolution_decl_inside_inline_module_with_path_attribute() {
        //- /models/bar.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -368,7 +362,7 @@ fn module_resolution_decl_inside_inline_module_with_path_attribute() {
 #[test]
 fn module_resolution_decl_inside_inline_module() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo {
@@ -378,9 +372,6 @@ fn module_resolution_decl_inside_inline_module() {
        //- /foo/bar.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -397,7 +388,7 @@ fn module_resolution_decl_inside_inline_module() {
 #[test]
 fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = "models/db"]
@@ -408,9 +399,6 @@ fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
        //- /models/db/bar.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -427,7 +415,7 @@ fn module_resolution_decl_inside_inline_module_2_with_path_attribute() {
 #[test]
 fn module_resolution_decl_inside_inline_module_3() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = "models/db"]
@@ -439,9 +427,6 @@ fn module_resolution_decl_inside_inline_module_3() {
        //- /models/db/users.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -458,7 +443,7 @@ fn module_resolution_decl_inside_inline_module_3() {
 #[test]
 fn module_resolution_decl_inside_inline_module_empty_path() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = ""]
@@ -467,12 +452,9 @@ fn module_resolution_decl_inside_inline_module_empty_path() {
            mod bar;
        }
-        //- /foo/users.rs
+        //- /users.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -489,32 +471,25 @@ fn module_resolution_decl_inside_inline_module_empty_path() {
 #[test]
 fn module_resolution_decl_empty_path() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
-        #[path = ""]
+        #[path = ""] // Should try to read `/` (a directory)
        mod foo;
        //- /foo.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
        ⋮crate
-        ⋮foo: t
-        ⋮
-        ⋮crate::foo
-        ⋮Baz: t v
    "###);
 }
 #[test]
 fn module_resolution_decl_inside_inline_module_relative_path() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path = "./models"]
@@ -525,9 +500,6 @@ fn module_resolution_decl_inside_inline_module_relative_path() {
        //- /models/bar.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -544,7 +516,7 @@ fn module_resolution_decl_inside_inline_module_relative_path() {
 #[test]
 fn module_resolution_decl_inside_inline_module_in_crate_root() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo {
@@ -556,9 +528,6 @@ fn module_resolution_decl_inside_inline_module_in_crate_root() {
        //- /foo/baz.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -576,7 +545,7 @@ fn module_resolution_decl_inside_inline_module_in_crate_root() {
 #[test]
 fn module_resolution_decl_inside_inline_module_in_mod_rs() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo;
@@ -591,9 +560,6 @@ fn module_resolution_decl_inside_inline_module_in_mod_rs() {
        //- /foo/bar/qwe.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -614,7 +580,7 @@ fn module_resolution_decl_inside_inline_module_in_mod_rs() {
 #[test]
 fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo;
@@ -626,12 +592,9 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
        }
        use self::bar::baz::Baz;
-        //- /bar/qwe.rs
+        //- /foo/bar/qwe.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -652,7 +615,7 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root() {
 #[test]
 fn module_resolution_decl_inside_inline_module_in_non_crate_root_2() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        mod foo;
@@ -667,9 +630,6 @@ fn module_resolution_decl_inside_inline_module_in_non_crate_root_2() {
        //- /bar/baz.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -709,7 +669,7 @@ fn unresolved_module_diagnostics() {
 #[test]
 fn module_resolution_decl_inside_module_in_non_crate_root_2() {
-    let map = def_map_with_crate_graph(
+    let map = def_map(
        r###"
        //- /main.rs
        #[path="module/m2.rs"]
@@ -721,9 +681,6 @@ fn module_resolution_decl_inside_module_in_non_crate_root_2() {
        //- /module/submod.rs
        pub struct Baz;
        "###,
-        crate_graph! {
-            "main": ("/main.rs", []),
-        },
    );
    assert_snapshot!(map, @r###"
@@ -737,3 +694,66 @@ fn module_resolution_decl_inside_module_in_non_crate_root_2() {
        ⋮Baz: t v
    "###);
 }
+#[test]
+fn nested_out_of_line_module() {
+    let map = def_map(
+        r###"
+        //- /lib.rs
+        mod a {
+            mod b {
+                mod c;
+            }
+        }
+        //- /a/b/c.rs
+        struct X;
+        "###,
+    );
+    assert_snapshot!(map, @r###"
+    crate
+    a: t
+    
+    crate::a
+    b: t
+    
+    crate::a::b
+    c: t
+    
+    crate::a::b::c
+    X: t v
+    "###);
+}
+#[test]
+fn nested_out_of_line_module_with_path() {
+    let map = def_map(
+        r###"
+        //- /lib.rs
+        mod a {
+            #[path = "d/e"]
+            mod b {
+                mod c;
+            }
+        }
+        //- /a/d/e/c.rs
+        struct X;
+        "###,
+    );
+    assert_snapshot!(map, @r###"
+    crate
+    a: t
+    
+    crate::a
+    b: t
+    
+    crate::a::b
+    c: t
+    
+    crate::a::b::c
+    X: t v
+    "###);
+}
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 39f8e1d8a..3c797c0c3 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -43,8 +43,10 @@ pub(crate) enum Scope {
    ModuleScope(ModuleItemMap),
    /// Brings the generic parameters of an item into scope
    GenericParams(Arc<GenericParams>),
-    /// Brings `Self` into scope
+    /// Brings `Self` in `impl` block into scope
    ImplBlockScope(ImplBlock),
+    /// Brings `Self` in enum, struct and union definitions into scope
+    AdtScope(Adt),
    /// Local bindings
    ExprScope(ExprScope),
 }
@@ -54,6 +56,7 @@ pub enum TypeNs {
    SelfType(ImplBlock),
    GenericParam(u32),
    Adt(Adt),
+    AdtSelfType(Adt),
    EnumVariant(EnumVariant),
    TypeAlias(TypeAlias),
    BuiltinType(BuiltinType),
@@ -151,6 +154,12 @@ impl Resolver {
                        return Some((TypeNs::SelfType(*impl_), idx));
                    }
                }
+                Scope::AdtScope(adt) => {
+                    if first_name == &SELF_TYPE {
+                        let idx = if path.segments.len() == 1 { None } else { Some(1) };
+                        return Some((TypeNs::AdtSelfType(*adt), idx));
+                    }
+                }
                Scope::ModuleScope(m) => {
                    let (module_def, idx) = m.crate_def_map.resolve_path(db, m.module_id, path);
                    let res = match module_def.take_types()? {
@@ -200,7 +209,10 @@ impl Resolver {
        let skip_to_mod = path.kind != PathKind::Plain && !path.is_self();
        for scope in self.scopes.iter().rev() {
            match scope {
-                Scope::ExprScope(_) | Scope::GenericParams(_) | Scope::ImplBlockScope(_)
+                Scope::AdtScope(_)
+                | Scope::ExprScope(_)
+                | Scope::GenericParams(_)
+                | Scope::ImplBlockScope(_)
                    if skip_to_mod =>
                {
                    continue
@@ -233,7 +245,13 @@ impl Resolver {
                        return Some(ResolveValueResult::Partial(ty, 1));
                    }
                }
-                Scope::ImplBlockScope(_) => continue,
+                Scope::AdtScope(adt) if n_segments > 1 => {
+                    if first_name == &SELF_TYPE {
+                        let ty = TypeNs::AdtSelfType(*adt);
+                        return Some(ResolveValueResult::Partial(ty, 1));
+                    }
+                }
+                Scope::ImplBlockScope(_) | Scope::AdtScope(_) => continue,
                Scope::ModuleScope(m) => {
                    let (module_def, idx) = m.crate_def_map.resolve_path(db, m.module_id, path);
@@ -389,7 +407,8 @@ pub enum ScopeDef {
    ModuleDef(ModuleDef),
    MacroDef(MacroDef),
    GenericParam(u32),
-    SelfType(ImplBlock),
+    ImplSelfType(ImplBlock),
+    AdtSelfType(Adt),
    LocalBinding(PatId),
    Unknown,
 }
@@ -437,7 +456,10 @@ impl Scope {
                }
            }
            Scope::ImplBlockScope(i) => {
-                f(SELF_TYPE, ScopeDef::SelfType(*i));
+                f(SELF_TYPE, ScopeDef::ImplSelfType(*i));
+            }
+            Scope::AdtScope(i) => {
+                f(SELF_TYPE, ScopeDef::AdtSelfType(*i));
            }
            Scope::ExprScope(e) => {
                e.expr_scopes.entries(e.scope_id).iter().for_each(|e| {
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 088335e66..a907d6a9f 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -216,7 +216,7 @@ impl SourceAnalyzer {
        let types = self.resolver.resolve_path_in_type_ns_fully(db, &path).map(|ty| match ty {
            TypeNs::SelfType(it) => PathResolution::SelfType(it),
            TypeNs::GenericParam(it) => PathResolution::GenericParam(it),
-            TypeNs::Adt(it) => PathResolution::Def(it.into()),
+            TypeNs::AdtSelfType(it) | TypeNs::Adt(it) => PathResolution::Def(it.into()),
            TypeNs::EnumVariant(it) => PathResolution::Def(it.into()),
            TypeNs::TypeAlias(it) => PathResolution::Def(it.into()),
            TypeNs::BuiltinType(it) => PathResolution::Def(it.into()),
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index d161735e8..cc9746f6d 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -17,8 +17,8 @@ use std::sync::Arc;
 use std::{fmt, iter, mem};
 use crate::{
-    db::HirDatabase, expr::ExprId, type_ref::Mutability, Adt, Crate, DefWithBody, GenericParams,
+    db::HirDatabase, expr::ExprId, type_ref::Mutability, util::make_mut_slice, Adt, Crate,
-    HasGenericParams, Name, Trait, TypeAlias,
+    DefWithBody, GenericParams, HasGenericParams, Name, Trait, TypeAlias,
 };
 use display::{HirDisplay, HirFormatter};
@@ -308,12 +308,9 @@ impl Substs {
    }
    pub fn walk_mut(&mut self, f: &mut impl FnMut(&mut Ty)) {
-        // Without an Arc::make_mut_slice, we can't avoid the clone here:
+        for t in make_mut_slice(&mut self.0) {
-        let mut v: Vec<_> = self.0.iter().cloned().collect();
-        for t in &mut v {
            t.walk_mut(f);
        }
-        self.0 = v.into();
    }
    pub fn as_single(&self) -> &Ty {
@@ -330,8 +327,7 @@ impl Substs {
                .params_including_parent()
                .into_iter()
                .map(|p| Ty::Param { idx: p.idx, name: p.name.clone() })
-                .collect::<Vec<_>>()
+                .collect(),
-                .into(),
        )
    }
@@ -342,8 +338,7 @@ impl Substs {
                .params_including_parent()
                .into_iter()
                .map(|p| Ty::Bound(p.idx))
-                .collect::<Vec<_>>()
+                .collect(),
-                .into(),
        )
    }
@@ -541,12 +536,9 @@ impl TypeWalk for FnSig {
    }
    fn walk_mut(&mut self, f: &mut impl FnMut(&mut Ty)) {
-        // Without an Arc::make_mut_slice, we can't avoid the clone here:
+        for t in make_mut_slice(&mut self.params_and_return) {
-        let mut v: Vec<_> = self.params_and_return.iter().cloned().collect();
-        for t in &mut v {
            t.walk_mut(f);
        }
-        self.params_and_return = v.into();
    }
 }
@@ -756,11 +748,9 @@ impl TypeWalk for Ty {
                p_ty.parameters.walk_mut(f);
            }
            Ty::Dyn(predicates) | Ty::Opaque(predicates) => {
-                let mut v: Vec<_> = predicates.iter().cloned().collect();
+                for p in make_mut_slice(predicates) {
-                for p in &mut v {
                    p.walk_mut(f);
                }
-                *predicates = v.into();
            }
            Ty::Param { .. } | Ty::Bound(_) | Ty::Infer(_) | Ty::Unknown => {}
        }
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index ca9aefc42..ebaff998e 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -14,7 +14,6 @@
 //! the `ena` crate, which is extracted from rustc.
 use std::borrow::Cow;
-use std::iter::{repeat, repeat_with};
 use std::mem;
 use std::ops::Index;
 use std::sync::Arc;
@@ -27,33 +26,39 @@ use ra_prof::profile;
 use test_utils::tested_by;
 use super::{
-    autoderef, lower, method_resolution, op, primitive,
+    lower, primitive,
    traits::{Guidance, Obligation, ProjectionPredicate, Solution},
-    ApplicationTy, CallableDef, InEnvironment, ProjectionTy, Substs, TraitEnvironment, TraitRef,
+    ApplicationTy, InEnvironment, ProjectionTy, Substs, TraitEnvironment, TraitRef, Ty, TypableDef,
-    Ty, TypableDef, TypeCtor, TypeWalk,
+    TypeCtor, TypeWalk,
 };
 use crate::{
    adt::VariantDef,
    code_model::TypeAlias,
    db::HirDatabase,
    diagnostics::DiagnosticSink,
-    expr::{
+    expr::{BindingAnnotation, Body, ExprId, PatId},
-        self, Array, BinaryOp, BindingAnnotation, Body, Expr, ExprId, Literal, Pat, PatId,
-        RecordFieldPat, Statement, UnaryOp,
-    },
-    generics::{GenericParams, HasGenericParams},
-    lang_item::LangItemTarget,
    name,
-    nameres::Namespace,
+    path::known,
-    path::{known, GenericArg, GenericArgs},
    resolve::{Resolver, TypeNs},
    ty::infer::diagnostics::InferenceDiagnostic,
    type_ref::{Mutability, TypeRef},
-    Adt, AssocItem, ConstData, DefWithBody, FnData, Function, HasBody, Name, Path, StructField,
+    Adt, AssocItem, ConstData, DefWithBody, FnData, Function, HasBody, Path, StructField,
 };
+macro_rules! ty_app {
+    ($ctor:pat, $param:pat) => {
+        crate::ty::Ty::Apply(crate::ty::ApplicationTy { ctor: $ctor, parameters: $param })
+    };
+    ($ctor:pat) => {
+        ty_app!($ctor, _)
+    };
+}
 mod unify;
 mod path;
+mod expr;
+mod pat;
+mod coerce;
 /// The entry point of type inference.
 pub fn infer_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<InferenceResult> {
@@ -197,15 +202,6 @@ struct InferenceContext<'a, D: HirDatabase> {
    coerce_unsized_map: FxHashMap<(TypeCtor, TypeCtor), usize>,
 }
-macro_rules! ty_app {
-    ($ctor:pat, $param:pat) => {
-        Ty::Apply(ApplicationTy { ctor: $ctor, parameters: $param })
-    };
-    ($ctor:pat) => {
-        ty_app!($ctor, _)
-    };
-}
 impl<'a, D: HirDatabase> InferenceContext<'a, D> {
    fn new(db: &'a D, body: Arc<Body>, resolver: Resolver) -> Self {
        InferenceContext {
@@ -221,45 +217,6 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
        }
    }
-    fn init_coerce_unsized_map(
-        db: &'a D,
-        resolver: &Resolver,
-    ) -> FxHashMap<(TypeCtor, TypeCtor), usize> {
-        let krate = resolver.krate().unwrap();
-        let impls = match db.lang_item(krate, "coerce_unsized".into()) {
-            Some(LangItemTarget::Trait(trait_)) => db.impls_for_trait(krate, trait_),
-            _ => return FxHashMap::default(),
-        };
-        impls
-            .iter()
-            .filter_map(|impl_block| {
-                // `CoerseUnsized` has one generic parameter for the target type.
-                let trait_ref = impl_block.target_trait_ref(db)?;
-                let cur_from_ty = trait_ref.substs.0.get(0)?;
-                let cur_to_ty = trait_ref.substs.0.get(1)?;
-                match (&cur_from_ty, cur_to_ty) {
-                    (ty_app!(ctor1, st1), ty_app!(ctor2, st2)) => {
-                        // FIXME: We return the first non-equal bound as the type parameter to coerce to unsized type.
-                        // This works for smart-pointer-like coercion, which covers all impls from std.
-                        st1.iter().zip(st2.iter()).enumerate().find_map(|(i, (ty1, ty2))| {
-                            match (ty1, ty2) {
-                                (Ty::Param { idx: p1, .. }, Ty::Param { idx: p2, .. })
-                                    if p1 != p2 =>
-                                {
-                                    Some(((*ctor1, *ctor2), i))
-                                }
-                                _ => None,
-                            }
-                        })
-                    }
-                    _ => None,
-                }
-            })
-            .collect()
-    }
    fn resolve_all(mut self) -> InferenceResult {
        // FIXME resolve obligations as well (use Guidance if necessary)
        let mut result = mem::replace(&mut self.result, InferenceResult::default());
@@ -457,7 +414,9 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                    // recursive type
                    return tv.fallback_value();
                }
-                if let Some(known_ty) = self.var_unification_table.probe_value(inner).known() {
+                if let Some(known_ty) =
+                    self.var_unification_table.inlined_probe_value(inner).known()
+                {
                    // known_ty may contain other variables that are known by now
                    tv_stack.push(inner);
                    let result = self.resolve_ty_as_possible(tv_stack, known_ty.clone());
@@ -485,7 +444,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
            match &*ty {
                Ty::Infer(tv) => {
                    let inner = tv.to_inner();
-                    match self.var_unification_table.probe_value(inner).known() {
+                    match self.var_unification_table.inlined_probe_value(inner).known() {
                        Some(known_ty) => {
                            // The known_ty can't be a type var itself
                            ty = Cow::Owned(known_ty.clone());
@@ -533,7 +492,9 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                    // recursive type
                    return tv.fallback_value();
                }
-                if let Some(known_ty) = self.var_unification_table.probe_value(inner).known() {
+                if let Some(known_ty) =
+                    self.var_unification_table.inlined_probe_value(inner).known()
+                {
                    // known_ty may contain other variables that are known by now
                    tv_stack.push(inner);
                    let result = self.resolve_ty_completely(tv_stack, known_ty.clone());
@@ -559,6 +520,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
            match resolver.resolve_path_in_type_ns_fully(self.db, &path) {
                Some(TypeNs::Adt(Adt::Struct(it))) => it.into(),
                Some(TypeNs::Adt(Adt::Union(it))) => it.into(),
+                Some(TypeNs::AdtSelfType(adt)) => adt.into(),
                Some(TypeNs::EnumVariant(it)) => it.into(),
                Some(TypeNs::TypeAlias(it)) => it.into(),
@@ -594,1080 +556,6 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
        }
    }
-    fn infer_tuple_struct_pat(
-        &mut self,
-        path: Option<&Path>,
-        subpats: &[PatId],
-        expected: &Ty,
-        default_bm: BindingMode,
-    ) -> Ty {
-        let (ty, def) = self.resolve_variant(path);
-        self.unify(&ty, expected);
-        let substs = ty.substs().unwrap_or_else(Substs::empty);
-        for (i, &subpat) in subpats.iter().enumerate() {
-            let expected_ty = def
-                .and_then(|d| d.field(self.db, &Name::new_tuple_field(i)))
-                .map_or(Ty::Unknown, |field| field.ty(self.db))
-                .subst(&substs);
-            let expected_ty = self.normalize_associated_types_in(expected_ty);
-            self.infer_pat(subpat, &expected_ty, default_bm);
-        }
-        ty
-    }
-    fn infer_record_pat(
-        &mut self,
-        path: Option<&Path>,
-        subpats: &[RecordFieldPat],
-        expected: &Ty,
-        default_bm: BindingMode,
-        id: PatId,
-    ) -> Ty {
-        let (ty, def) = self.resolve_variant(path);
-        if let Some(variant) = def {
-            self.write_variant_resolution(id.into(), variant);
-        }
-        self.unify(&ty, expected);
-        let substs = ty.substs().unwrap_or_else(Substs::empty);
-        for subpat in subpats {
-            let matching_field = def.and_then(|it| it.field(self.db, &subpat.name));
-            let expected_ty =
-                matching_field.map_or(Ty::Unknown, |field| field.ty(self.db)).subst(&substs);
-            let expected_ty = self.normalize_associated_types_in(expected_ty);
-            self.infer_pat(subpat.pat, &expected_ty, default_bm);
-        }
-        ty
-    }
-    fn infer_pat(&mut self, pat: PatId, mut expected: &Ty, mut default_bm: BindingMode) -> Ty {
-        let body = Arc::clone(&self.body); // avoid borrow checker problem
-        let is_non_ref_pat = match &body[pat] {
-            Pat::Tuple(..)
-            | Pat::TupleStruct { .. }
-            | Pat::Record { .. }
-            | Pat::Range { .. }
-            | Pat::Slice { .. } => true,
-            // FIXME: Path/Lit might actually evaluate to ref, but inference is unimplemented.
-            Pat::Path(..) | Pat::Lit(..) => true,
-            Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Missing => false,
-        };
-        if is_non_ref_pat {
-            while let Some((inner, mutability)) = expected.as_reference() {
-                expected = inner;
-                default_bm = match default_bm {
-                    BindingMode::Move => BindingMode::Ref(mutability),
-                    BindingMode::Ref(Mutability::Shared) => BindingMode::Ref(Mutability::Shared),
-                    BindingMode::Ref(Mutability::Mut) => BindingMode::Ref(mutability),
-                }
-            }
-        } else if let Pat::Ref { .. } = &body[pat] {
-            tested_by!(match_ergonomics_ref);
-            // When you encounter a `&pat` pattern, reset to Move.
-            // This is so that `w` is by value: `let (_, &w) = &(1, &2);`
-            default_bm = BindingMode::Move;
-        }
-        // Lose mutability.
-        let default_bm = default_bm;
-        let expected = expected;
-        let ty = match &body[pat] {
-            Pat::Tuple(ref args) => {
-                let expectations = match expected.as_tuple() {
-                    Some(parameters) => &*parameters.0,
-                    _ => &[],
-                };
-                let expectations_iter = expectations.iter().chain(repeat(&Ty::Unknown));
-                let inner_tys = args
-                    .iter()
-                    .zip(expectations_iter)
-                    .map(|(&pat, ty)| self.infer_pat(pat, ty, default_bm))
-                    .collect();
-                Ty::apply(TypeCtor::Tuple { cardinality: args.len() as u16 }, Substs(inner_tys))
-            }
-            Pat::Ref { pat, mutability } => {
-                let expectation = match expected.as_reference() {
-                    Some((inner_ty, exp_mut)) => {
-                        if *mutability != exp_mut {
-                            // FIXME: emit type error?
-                        }
-                        inner_ty
-                    }
-                    _ => &Ty::Unknown,
-                };
-                let subty = self.infer_pat(*pat, expectation, default_bm);
-                Ty::apply_one(TypeCtor::Ref(*mutability), subty)
-            }
-            Pat::TupleStruct { path: p, args: subpats } => {
-                self.infer_tuple_struct_pat(p.as_ref(), subpats, expected, default_bm)
-            }
-            Pat::Record { path: p, args: fields } => {
-                self.infer_record_pat(p.as_ref(), fields, expected, default_bm, pat)
-            }
-            Pat::Path(path) => {
-                // FIXME use correct resolver for the surrounding expression
-                let resolver = self.resolver.clone();
-                self.infer_path(&resolver, &path, pat.into()).unwrap_or(Ty::Unknown)
-            }
-            Pat::Bind { mode, name: _, subpat } => {
-                let mode = if mode == &BindingAnnotation::Unannotated {
-                    default_bm
-                } else {
-                    BindingMode::convert(*mode)
-                };
-                let inner_ty = if let Some(subpat) = subpat {
-                    self.infer_pat(*subpat, expected, default_bm)
-                } else {
-                    expected.clone()
-                };
-                let inner_ty = self.insert_type_vars_shallow(inner_ty);
-                let bound_ty = match mode {
-                    BindingMode::Ref(mutability) => {
-                        Ty::apply_one(TypeCtor::Ref(mutability), inner_ty.clone())
-                    }
-                    BindingMode::Move => inner_ty.clone(),
-                };
-                let bound_ty = self.resolve_ty_as_possible(&mut vec![], bound_ty);
-                self.write_pat_ty(pat, bound_ty);
-                return inner_ty;
-            }
-            _ => Ty::Unknown,
-        };
-        // use a new type variable if we got Ty::Unknown here
-        let ty = self.insert_type_vars_shallow(ty);
-        self.unify(&ty, expected);
-        let ty = self.resolve_ty_as_possible(&mut vec![], ty);
-        self.write_pat_ty(pat, ty.clone());
-        ty
-    }
-    fn substs_for_method_call(
-        &mut self,
-        def_generics: Option<Arc<GenericParams>>,
-        generic_args: Option<&GenericArgs>,
-        receiver_ty: &Ty,
-    ) -> Substs {
-        let (parent_param_count, param_count) =
-            def_generics.as_ref().map_or((0, 0), |g| (g.count_parent_params(), g.params.len()));
-        let mut substs = Vec::with_capacity(parent_param_count + param_count);
-        // Parent arguments are unknown, except for the receiver type
-        if let Some(parent_generics) = def_generics.and_then(|p| p.parent_params.clone()) {
-            for param in &parent_generics.params {
-                if param.name == name::SELF_TYPE {
-                    substs.push(receiver_ty.clone());
-                } else {
-                    substs.push(Ty::Unknown);
-                }
-            }
-        }
-        // handle provided type arguments
-        if let Some(generic_args) = generic_args {
-            // if args are provided, it should be all of them, but we can't rely on that
-            for arg in generic_args.args.iter().take(param_count) {
-                match arg {
-                    GenericArg::Type(type_ref) => {
-                        let ty = self.make_ty(type_ref);
-                        substs.push(ty);
-                    }
-                }
-            }
-        };
-        let supplied_params = substs.len();
-        for _ in supplied_params..parent_param_count + param_count {
-            substs.push(Ty::Unknown);
-        }
-        assert_eq!(substs.len(), parent_param_count + param_count);
-        Substs(substs.into())
-    }
-    fn register_obligations_for_call(&mut self, callable_ty: &Ty) {
-        if let Ty::Apply(a_ty) = callable_ty {
-            if let TypeCtor::FnDef(def) = a_ty.ctor {
-                let generic_predicates = self.db.generic_predicates(def.into());
-                for predicate in generic_predicates.iter() {
-                    let predicate = predicate.clone().subst(&a_ty.parameters);
-                    if let Some(obligation) = Obligation::from_predicate(predicate) {
-                        self.obligations.push(obligation);
-                    }
-                }
-                // add obligation for trait implementation, if this is a trait method
-                match def {
-                    CallableDef::Function(f) => {
-                        if let Some(trait_) = f.parent_trait(self.db) {
-                            // construct a TraitDef
-                            let substs = a_ty.parameters.prefix(
-                                trait_.generic_params(self.db).count_params_including_parent(),
-                            );
-                            self.obligations.push(Obligation::Trait(TraitRef { trait_, substs }));
-                        }
-                    }
-                    CallableDef::Struct(_) | CallableDef::EnumVariant(_) => {}
-                }
-            }
-        }
-    }
-    fn infer_method_call(
-        &mut self,
-        tgt_expr: ExprId,
-        receiver: ExprId,
-        args: &[ExprId],
-        method_name: &Name,
-        generic_args: Option<&GenericArgs>,
-    ) -> Ty {
-        let receiver_ty = self.infer_expr(receiver, &Expectation::none());
-        let canonicalized_receiver = self.canonicalizer().canonicalize_ty(receiver_ty.clone());
-        let resolved = method_resolution::lookup_method(
-            &canonicalized_receiver.value,
-            self.db,
-            method_name,
-            &self.resolver,
-        );
-        let (derefed_receiver_ty, method_ty, def_generics) = match resolved {
-            Some((ty, func)) => {
-                let ty = canonicalized_receiver.decanonicalize_ty(ty);
-                self.write_method_resolution(tgt_expr, func);
-                (
-                    ty,
-                    self.db.type_for_def(func.into(), Namespace::Values),
-                    Some(func.generic_params(self.db)),
-                )
-            }
-            None => (receiver_ty, Ty::Unknown, None),
-        };
-        let substs = self.substs_for_method_call(def_generics, generic_args, &derefed_receiver_ty);
-        let method_ty = method_ty.apply_substs(substs);
-        let method_ty = self.insert_type_vars(method_ty);
-        self.register_obligations_for_call(&method_ty);
-        let (expected_receiver_ty, param_tys, ret_ty) = match method_ty.callable_sig(self.db) {
-            Some(sig) => {
-                if !sig.params().is_empty() {
-                    (sig.params()[0].clone(), sig.params()[1..].to_vec(), sig.ret().clone())
-                } else {
-                    (Ty::Unknown, Vec::new(), sig.ret().clone())
-                }
-            }
-            None => (Ty::Unknown, Vec::new(), Ty::Unknown),
-        };
-        // Apply autoref so the below unification works correctly
-        // FIXME: return correct autorefs from lookup_method
-        let actual_receiver_ty = match expected_receiver_ty.as_reference() {
-            Some((_, mutability)) => Ty::apply_one(TypeCtor::Ref(mutability), derefed_receiver_ty),
-            _ => derefed_receiver_ty,
-        };
-        self.unify(&expected_receiver_ty, &actual_receiver_ty);
-        self.check_call_arguments(args, &param_tys);
-        let ret_ty = self.normalize_associated_types_in(ret_ty);
-        ret_ty
-    }
-    /// Infer type of expression with possibly implicit coerce to the expected type.
-    /// Return the type after possible coercion.
-    fn infer_expr_coerce(&mut self, expr: ExprId, expected: &Expectation) -> Ty {
-        let ty = self.infer_expr_inner(expr, &expected);
-        let ty = if !self.coerce(&ty, &expected.ty) {
-            self.result
-                .type_mismatches
-                .insert(expr, TypeMismatch { expected: expected.ty.clone(), actual: ty.clone() });
-            // Return actual type when type mismatch.
-            // This is needed for diagnostic when return type mismatch.
-            ty
-        } else if expected.ty == Ty::Unknown {
-            ty
-        } else {
-            expected.ty.clone()
-        };
-        self.resolve_ty_as_possible(&mut vec![], ty)
-    }
-    /// Merge two types from different branches, with possible implicit coerce.
-    ///
-    /// Note that it is only possible that one type are coerced to another.
-    /// Coercing both types to another least upper bound type is not possible in rustc,
-    /// which will simply result in "incompatible types" error.
-    fn coerce_merge_branch<'t>(&mut self, ty1: &Ty, ty2: &Ty) -> Ty {
-        if self.coerce(ty1, ty2) {
-            ty2.clone()
-        } else if self.coerce(ty2, ty1) {
-            ty1.clone()
-        } else {
-            tested_by!(coerce_merge_fail_fallback);
-            // For incompatible types, we use the latter one as result
-            // to be better recovery for `if` without `else`.
-            ty2.clone()
-        }
-    }
-    /// Unify two types, but may coerce the first one to the second one
-    /// using "implicit coercion rules" if needed.
-    ///
-    /// See: https://doc.rust-lang.org/nomicon/coercions.html
-    fn coerce(&mut self, from_ty: &Ty, to_ty: &Ty) -> bool {
-        let from_ty = self.resolve_ty_shallow(from_ty).into_owned();
-        let to_ty = self.resolve_ty_shallow(to_ty);
-        self.coerce_inner(from_ty, &to_ty)
-    }
-    fn coerce_inner(&mut self, mut from_ty: Ty, to_ty: &Ty) -> bool {
-        match (&from_ty, to_ty) {
-            // Never type will make type variable to fallback to Never Type instead of Unknown.
-            (ty_app!(TypeCtor::Never), Ty::Infer(InferTy::TypeVar(tv))) => {
-                let var = self.new_maybe_never_type_var();
-                self.var_unification_table.union_value(*tv, TypeVarValue::Known(var));
-                return true;
-            }
-            (ty_app!(TypeCtor::Never), _) => return true,
-            // Trivial cases, this should go after `never` check to
-            // avoid infer result type to be never
-            _ => {
-                if self.unify_inner_trivial(&from_ty, &to_ty) {
-                    return true;
-                }
-            }
-        }
-        // Pointer weakening and function to pointer
-        match (&mut from_ty, to_ty) {
-            // `*mut T`, `&mut T, `&T`` -> `*const T`
-            // `&mut T` -> `&T`
-            // `&mut T` -> `*mut T`
-            (ty_app!(c1@TypeCtor::RawPtr(_)), ty_app!(c2@TypeCtor::RawPtr(Mutability::Shared)))
-            | (ty_app!(c1@TypeCtor::Ref(_)), ty_app!(c2@TypeCtor::RawPtr(Mutability::Shared)))
-            | (ty_app!(c1@TypeCtor::Ref(_)), ty_app!(c2@TypeCtor::Ref(Mutability::Shared)))
-            | (ty_app!(c1@TypeCtor::Ref(Mutability::Mut)), ty_app!(c2@TypeCtor::RawPtr(_))) => {
-                *c1 = *c2;
-            }
-            // Illegal mutablity conversion
-            (
-                ty_app!(TypeCtor::RawPtr(Mutability::Shared)),
-                ty_app!(TypeCtor::RawPtr(Mutability::Mut)),
-            )
-            | (
-                ty_app!(TypeCtor::Ref(Mutability::Shared)),
-                ty_app!(TypeCtor::Ref(Mutability::Mut)),
-            ) => return false,
-            // `{function_type}` -> `fn()`
-            (ty_app!(TypeCtor::FnDef(_)), ty_app!(TypeCtor::FnPtr { .. })) => {
-                match from_ty.callable_sig(self.db) {
-                    None => return false,
-                    Some(sig) => {
-                        let num_args = sig.params_and_return.len() as u16 - 1;
-                        from_ty =
-                            Ty::apply(TypeCtor::FnPtr { num_args }, Substs(sig.params_and_return));
-                    }
-                }
-            }
-            _ => {}
-        }
-        if let Some(ret) = self.try_coerce_unsized(&from_ty, &to_ty) {
-            return ret;
-        }
-        // Auto Deref if cannot coerce
-        match (&from_ty, to_ty) {
-            // FIXME: DerefMut
-            (ty_app!(TypeCtor::Ref(_), st1), ty_app!(TypeCtor::Ref(_), st2)) => {
-                self.unify_autoderef_behind_ref(&st1[0], &st2[0])
-            }
-            // Otherwise, normal unify
-            _ => self.unify(&from_ty, to_ty),
-        }
-    }
-    /// Coerce a type using `from_ty: CoerceUnsized<ty_ty>`
-    ///
-    /// See: https://doc.rust-lang.org/nightly/std/marker/trait.CoerceUnsized.html
-    fn try_coerce_unsized(&mut self, from_ty: &Ty, to_ty: &Ty) -> Option<bool> {
-        let (ctor1, st1, ctor2, st2) = match (from_ty, to_ty) {
-            (ty_app!(ctor1, st1), ty_app!(ctor2, st2)) => (ctor1, st1, ctor2, st2),
-            _ => return None,
-        };
-        let coerce_generic_index = *self.coerce_unsized_map.get(&(*ctor1, *ctor2))?;
-        // Check `Unsize` first
-        match self.check_unsize_and_coerce(
-            st1.0.get(coerce_generic_index)?,
-            st2.0.get(coerce_generic_index)?,
-            0,
-        ) {
-            Some(true) => {}
-            ret => return ret,
-        }
-        let ret = st1
-            .iter()
-            .zip(st2.iter())
-            .enumerate()
-            .filter(|&(idx, _)| idx != coerce_generic_index)
-            .all(|(_, (ty1, ty2))| self.unify(ty1, ty2));
-        Some(ret)
-    }
-    /// Check if `from_ty: Unsize<to_ty>`, and coerce to `to_ty` if it holds.
-    ///
-    /// It should not be directly called. It is only used by `try_coerce_unsized`.
-    ///
-    /// See: https://doc.rust-lang.org/nightly/std/marker/trait.Unsize.html
-    fn check_unsize_and_coerce(&mut self, from_ty: &Ty, to_ty: &Ty, depth: usize) -> Option<bool> {
-        if depth > 1000 {
-            panic!("Infinite recursion in coercion");
-        }
-        match (&from_ty, &to_ty) {
-            // `[T; N]` -> `[T]`
-            (ty_app!(TypeCtor::Array, st1), ty_app!(TypeCtor::Slice, st2)) => {
-                Some(self.unify(&st1[0], &st2[0]))
-            }
-            // `T` -> `dyn Trait` when `T: Trait`
-            (_, Ty::Dyn(_)) => {
-                // FIXME: Check predicates
-                Some(true)
-            }
-            // `(..., T)` -> `(..., U)` when `T: Unsize<U>`
-            (
-                ty_app!(TypeCtor::Tuple { cardinality: len1 }, st1),
-                ty_app!(TypeCtor::Tuple { cardinality: len2 }, st2),
-            ) => {
-                if len1 != len2 || *len1 == 0 {
-                    return None;
-                }
-                match self.check_unsize_and_coerce(
-                    st1.last().unwrap(),
-                    st2.last().unwrap(),
-                    depth + 1,
-                ) {
-                    Some(true) => {}
-                    ret => return ret,
-                }
-                let ret = st1[..st1.len() - 1]
-                    .iter()
-                    .zip(&st2[..st2.len() - 1])
-                    .all(|(ty1, ty2)| self.unify(ty1, ty2));
-                Some(ret)
-            }
-            // Foo<..., T, ...> is Unsize<Foo<..., U, ...>> if:
-            // - T: Unsize<U>
-            // - Foo is a struct
-            // - Only the last field of Foo has a type involving T
-            // - T is not part of the type of any other fields
-            // - Bar<T>: Unsize<Bar<U>>, if the last field of Foo has type Bar<T>
-            (
-                ty_app!(TypeCtor::Adt(Adt::Struct(struct1)), st1),
-                ty_app!(TypeCtor::Adt(Adt::Struct(struct2)), st2),
-            ) if struct1 == struct2 => {
-                let fields = struct1.fields(self.db);
-                let (last_field, prev_fields) = fields.split_last()?;
-                // Get the generic parameter involved in the last field.
-                let unsize_generic_index = {
-                    let mut index = None;
-                    let mut multiple_param = false;
-                    last_field.ty(self.db).walk(&mut |ty| match ty {
-                        &Ty::Param { idx, .. } => {
-                            if index.is_none() {
-                                index = Some(idx);
-                            } else if Some(idx) != index {
-                                multiple_param = true;
-                            }
-                        }
-                        _ => {}
-                    });
-                    if multiple_param {
-                        return None;
-                    }
-                    index?
-                };
-                // Check other fields do not involve it.
-                let mut multiple_used = false;
-                prev_fields.iter().for_each(|field| {
-                    field.ty(self.db).walk(&mut |ty| match ty {
-                        &Ty::Param { idx, .. } if idx == unsize_generic_index => {
-                            multiple_used = true
-                        }
-                        _ => {}
-                    })
-                });
-                if multiple_used {
-                    return None;
-                }
-                let unsize_generic_index = unsize_generic_index as usize;
-                // Check `Unsize` first
-                match self.check_unsize_and_coerce(
-                    st1.get(unsize_generic_index)?,
-                    st2.get(unsize_generic_index)?,
-                    depth + 1,
-                ) {
-                    Some(true) => {}
-                    ret => return ret,
-                }
-                // Then unify other parameters
-                let ret = st1
-                    .iter()
-                    .zip(st2.iter())
-                    .enumerate()
-                    .filter(|&(idx, _)| idx != unsize_generic_index)
-                    .all(|(_, (ty1, ty2))| self.unify(ty1, ty2));
-                Some(ret)
-            }
-            _ => None,
-        }
-    }
-    /// Unify `from_ty` to `to_ty` with optional auto Deref
-    ///
-    /// Note that the parameters are already stripped the outer reference.
-    fn unify_autoderef_behind_ref(&mut self, from_ty: &Ty, to_ty: &Ty) -> bool {
-        let canonicalized = self.canonicalizer().canonicalize_ty(from_ty.clone());
-        let to_ty = self.resolve_ty_shallow(&to_ty);
-        // FIXME: Auto DerefMut
-        for derefed_ty in
-            autoderef::autoderef(self.db, &self.resolver.clone(), canonicalized.value.clone())
-        {
-            let derefed_ty = canonicalized.decanonicalize_ty(derefed_ty.value);
-            match (&*self.resolve_ty_shallow(&derefed_ty), &*to_ty) {
-                // Stop when constructor matches.
-                (ty_app!(from_ctor, st1), ty_app!(to_ctor, st2)) if from_ctor == to_ctor => {
-                    // It will not recurse to `coerce`.
-                    return self.unify_substs(st1, st2, 0);
-                }
-                _ => {}
-            }
-        }
-        false
-    }
-    fn infer_expr(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty {
-        let ty = self.infer_expr_inner(tgt_expr, expected);
-        let could_unify = self.unify(&ty, &expected.ty);
-        if !could_unify {
-            self.result.type_mismatches.insert(
-                tgt_expr,
-                TypeMismatch { expected: expected.ty.clone(), actual: ty.clone() },
-            );
-        }
-        let ty = self.resolve_ty_as_possible(&mut vec![], ty);
-        ty
-    }
-    fn infer_expr_inner(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty {
-        let body = Arc::clone(&self.body); // avoid borrow checker problem
-        let ty = match &body[tgt_expr] {
-            Expr::Missing => Ty::Unknown,
-            Expr::If { condition, then_branch, else_branch } => {
-                // if let is desugared to match, so this is always simple if
-                self.infer_expr(*condition, &Expectation::has_type(Ty::simple(TypeCtor::Bool)));
-                let then_ty = self.infer_expr_inner(*then_branch, &expected);
-                let else_ty = match else_branch {
-                    Some(else_branch) => self.infer_expr_inner(*else_branch, &expected),
-                    None => Ty::unit(),
-                };
-                self.coerce_merge_branch(&then_ty, &else_ty)
-            }
-            Expr::Block { statements, tail } => self.infer_block(statements, *tail, expected),
-            Expr::TryBlock { body } => {
-                let _inner = self.infer_expr(*body, expected);
-                // FIXME should be std::result::Result<{inner}, _>
-                Ty::Unknown
-            }
-            Expr::Loop { body } => {
-                self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
-                // FIXME handle break with value
-                Ty::simple(TypeCtor::Never)
-            }
-            Expr::While { condition, body } => {
-                // while let is desugared to a match loop, so this is always simple while
-                self.infer_expr(*condition, &Expectation::has_type(Ty::simple(TypeCtor::Bool)));
-                self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
-                Ty::unit()
-            }
-            Expr::For { iterable, body, pat } => {
-                let iterable_ty = self.infer_expr(*iterable, &Expectation::none());
-                let pat_ty = match self.resolve_into_iter_item() {
-                    Some(into_iter_item_alias) => {
-                        let pat_ty = self.new_type_var();
-                        let projection = ProjectionPredicate {
-                            ty: pat_ty.clone(),
-                            projection_ty: ProjectionTy {
-                                associated_ty: into_iter_item_alias,
-                                parameters: Substs::single(iterable_ty),
-                            },
-                        };
-                        self.obligations.push(Obligation::Projection(projection));
-                        self.resolve_ty_as_possible(&mut vec![], pat_ty)
-                    }
-                    None => Ty::Unknown,
-                };
-                self.infer_pat(*pat, &pat_ty, BindingMode::default());
-                self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
-                Ty::unit()
-            }
-            Expr::Lambda { body, args, arg_types } => {
-                assert_eq!(args.len(), arg_types.len());
-                let mut sig_tys = Vec::new();
-                for (arg_pat, arg_type) in args.iter().zip(arg_types.iter()) {
-                    let expected = if let Some(type_ref) = arg_type {
-                        self.make_ty(type_ref)
-                    } else {
-                        Ty::Unknown
-                    };
-                    let arg_ty = self.infer_pat(*arg_pat, &expected, BindingMode::default());
-                    sig_tys.push(arg_ty);
-                }
-                // add return type
-                let ret_ty = self.new_type_var();
-                sig_tys.push(ret_ty.clone());
-                let sig_ty = Ty::apply(
-                    TypeCtor::FnPtr { num_args: sig_tys.len() as u16 - 1 },
-                    Substs(sig_tys.into()),
-                );
-                let closure_ty = Ty::apply_one(
-                    TypeCtor::Closure { def: self.body.owner(), expr: tgt_expr },
-                    sig_ty,
-                );
-                // Eagerly try to relate the closure type with the expected
-                // type, otherwise we often won't have enough information to
-                // infer the body.
-                self.coerce(&closure_ty, &expected.ty);
-                self.infer_expr(*body, &Expectation::has_type(ret_ty));
-                closure_ty
-            }
-            Expr::Call { callee, args } => {
-                let callee_ty = self.infer_expr(*callee, &Expectation::none());
-                let (param_tys, ret_ty) = match callee_ty.callable_sig(self.db) {
-                    Some(sig) => (sig.params().to_vec(), sig.ret().clone()),
-                    None => {
-                        // Not callable
-                        // FIXME: report an error
-                        (Vec::new(), Ty::Unknown)
-                    }
-                };
-                self.register_obligations_for_call(&callee_ty);
-                self.check_call_arguments(args, &param_tys);
-                let ret_ty = self.normalize_associated_types_in(ret_ty);
-                ret_ty
-            }
-            Expr::MethodCall { receiver, args, method_name, generic_args } => self
-                .infer_method_call(tgt_expr, *receiver, &args, &method_name, generic_args.as_ref()),
-            Expr::Match { expr, arms } => {
-                let input_ty = self.infer_expr(*expr, &Expectation::none());
-                let mut result_ty = self.new_maybe_never_type_var();
-                for arm in arms {
-                    for &pat in &arm.pats {
-                        let _pat_ty = self.infer_pat(pat, &input_ty, BindingMode::default());
-                    }
-                    if let Some(guard_expr) = arm.guard {
-                        self.infer_expr(
-                            guard_expr,
-                            &Expectation::has_type(Ty::simple(TypeCtor::Bool)),
-                        );
-                    }
-                    let arm_ty = self.infer_expr_inner(arm.expr, &expected);
-                    result_ty = self.coerce_merge_branch(&result_ty, &arm_ty);
-                }
-                result_ty
-            }
-            Expr::Path(p) => {
-                // FIXME this could be more efficient...
-                let resolver = expr::resolver_for_expr(self.body.clone(), self.db, tgt_expr);
-                self.infer_path(&resolver, p, tgt_expr.into()).unwrap_or(Ty::Unknown)
-            }
-            Expr::Continue => Ty::simple(TypeCtor::Never),
-            Expr::Break { expr } => {
-                if let Some(expr) = expr {
-                    // FIXME handle break with value
-                    self.infer_expr(*expr, &Expectation::none());
-                }
-                Ty::simple(TypeCtor::Never)
-            }
-            Expr::Return { expr } => {
-                if let Some(expr) = expr {
-                    self.infer_expr(*expr, &Expectation::has_type(self.return_ty.clone()));
-                }
-                Ty::simple(TypeCtor::Never)
-            }
-            Expr::RecordLit { path, fields, spread } => {
-                let (ty, def_id) = self.resolve_variant(path.as_ref());
-                if let Some(variant) = def_id {
-                    self.write_variant_resolution(tgt_expr.into(), variant);
-                }
-                self.unify(&ty, &expected.ty);
-                let substs = ty.substs().unwrap_or_else(Substs::empty);
-                for (field_idx, field) in fields.iter().enumerate() {
-                    let field_ty = def_id
-                        .and_then(|it| match it.field(self.db, &field.name) {
-                            Some(field) => Some(field),
-                            None => {
-                                self.push_diagnostic(InferenceDiagnostic::NoSuchField {
-                                    expr: tgt_expr,
-                                    field: field_idx,
-                                });
-                                None
-                            }
-                        })
-                        .map_or(Ty::Unknown, |field| field.ty(self.db))
-                        .subst(&substs);
-                    self.infer_expr_coerce(field.expr, &Expectation::has_type(field_ty));
-                }
-                if let Some(expr) = spread {
-                    self.infer_expr(*expr, &Expectation::has_type(ty.clone()));
-                }
-                ty
-            }
-            Expr::Field { expr, name } => {
-                let receiver_ty = self.infer_expr(*expr, &Expectation::none());
-                let canonicalized = self.canonicalizer().canonicalize_ty(receiver_ty);
-                let ty = autoderef::autoderef(
-                    self.db,
-                    &self.resolver.clone(),
-                    canonicalized.value.clone(),
-                )
-                .find_map(|derefed_ty| match canonicalized.decanonicalize_ty(derefed_ty.value) {
-                    Ty::Apply(a_ty) => match a_ty.ctor {
-                        TypeCtor::Tuple { .. } => name
-                            .as_tuple_index()
-                            .and_then(|idx| a_ty.parameters.0.get(idx).cloned()),
-                        TypeCtor::Adt(Adt::Struct(s)) => s.field(self.db, name).map(|field| {
-                            self.write_field_resolution(tgt_expr, field);
-                            field.ty(self.db).subst(&a_ty.parameters)
-                        }),
-                        _ => None,
-                    },
-                    _ => None,
-                })
-                .unwrap_or(Ty::Unknown);
-                let ty = self.insert_type_vars(ty);
-                self.normalize_associated_types_in(ty)
-            }
-            Expr::Await { expr } => {
-                let inner_ty = self.infer_expr(*expr, &Expectation::none());
-                let ty = match self.resolve_future_future_output() {
-                    Some(future_future_output_alias) => {
-                        let ty = self.new_type_var();
-                        let projection = ProjectionPredicate {
-                            ty: ty.clone(),
-                            projection_ty: ProjectionTy {
-                                associated_ty: future_future_output_alias,
-                                parameters: Substs::single(inner_ty),
-                            },
-                        };
-                        self.obligations.push(Obligation::Projection(projection));
-                        self.resolve_ty_as_possible(&mut vec![], ty)
-                    }
-                    None => Ty::Unknown,
-                };
-                ty
-            }
-            Expr::Try { expr } => {
-                let inner_ty = self.infer_expr(*expr, &Expectation::none());
-                let ty = match self.resolve_ops_try_ok() {
-                    Some(ops_try_ok_alias) => {
-                        let ty = self.new_type_var();
-                        let projection = ProjectionPredicate {
-                            ty: ty.clone(),
-                            projection_ty: ProjectionTy {
-                                associated_ty: ops_try_ok_alias,
-                                parameters: Substs::single(inner_ty),
-                            },
-                        };
-                        self.obligations.push(Obligation::Projection(projection));
-                        self.resolve_ty_as_possible(&mut vec![], ty)
-                    }
-                    None => Ty::Unknown,
-                };
-                ty
-            }
-            Expr::Cast { expr, type_ref } => {
-                let _inner_ty = self.infer_expr(*expr, &Expectation::none());
-                let cast_ty = self.make_ty(type_ref);
-                // FIXME check the cast...
-                cast_ty
-            }
-            Expr::Ref { expr, mutability } => {
-                let expectation =
-                    if let Some((exp_inner, exp_mutability)) = &expected.ty.as_reference() {
-                        if *exp_mutability == Mutability::Mut && *mutability == Mutability::Shared {
-                            // FIXME: throw type error - expected mut reference but found shared ref,
-                            // which cannot be coerced
-                        }
-                        Expectation::has_type(Ty::clone(exp_inner))
-                    } else {
-                        Expectation::none()
-                    };
-                // FIXME reference coercions etc.
-                let inner_ty = self.infer_expr(*expr, &expectation);
-                Ty::apply_one(TypeCtor::Ref(*mutability), inner_ty)
-            }
-            Expr::Box { expr } => {
-                let inner_ty = self.infer_expr(*expr, &Expectation::none());
-                if let Some(box_) = self.resolve_boxed_box() {
-                    Ty::apply_one(TypeCtor::Adt(box_), inner_ty)
-                } else {
-                    Ty::Unknown
-                }
-            }
-            Expr::UnaryOp { expr, op } => {
-                let inner_ty = self.infer_expr(*expr, &Expectation::none());
-                match op {
-                    UnaryOp::Deref => {
-                        let canonicalized = self.canonicalizer().canonicalize_ty(inner_ty);
-                        if let Some(derefed_ty) =
-                            autoderef::deref(self.db, &self.resolver, &canonicalized.value)
-                        {
-                            canonicalized.decanonicalize_ty(derefed_ty.value)
-                        } else {
-                            Ty::Unknown
-                        }
-                    }
-                    UnaryOp::Neg => {
-                        match &inner_ty {
-                            Ty::Apply(a_ty) => match a_ty.ctor {
-                                TypeCtor::Int(primitive::UncertainIntTy::Unknown)
-                                | TypeCtor::Int(primitive::UncertainIntTy::Known(
-                                    primitive::IntTy {
-                                        signedness: primitive::Signedness::Signed,
-                                        ..
-                                    },
-                                ))
-                                | TypeCtor::Float(..) => inner_ty,
-                                _ => Ty::Unknown,
-                            },
-                            Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => {
-                                inner_ty
-                            }
-                            // FIXME: resolve ops::Neg trait
-                            _ => Ty::Unknown,
-                        }
-                    }
-                    UnaryOp::Not => {
-                        match &inner_ty {
-                            Ty::Apply(a_ty) => match a_ty.ctor {
-                                TypeCtor::Bool | TypeCtor::Int(_) => inner_ty,
-                                _ => Ty::Unknown,
-                            },
-                            Ty::Infer(InferTy::IntVar(..)) => inner_ty,
-                            // FIXME: resolve ops::Not trait for inner_ty
-                            _ => Ty::Unknown,
-                        }
-                    }
-                }
-            }
-            Expr::BinaryOp { lhs, rhs, op } => match op {
-                Some(op) => {
-                    let lhs_expectation = match op {
-                        BinaryOp::LogicOp(..) => Expectation::has_type(Ty::simple(TypeCtor::Bool)),
-                        _ => Expectation::none(),
-                    };
-                    let lhs_ty = self.infer_expr(*lhs, &lhs_expectation);
-                    // FIXME: find implementation of trait corresponding to operation
-                    // symbol and resolve associated `Output` type
-                    let rhs_expectation = op::binary_op_rhs_expectation(*op, lhs_ty);
-                    let rhs_ty = self.infer_expr(*rhs, &Expectation::has_type(rhs_expectation));
-                    // FIXME: similar as above, return ty is often associated trait type
-                    op::binary_op_return_ty(*op, rhs_ty)
-                }
-                _ => Ty::Unknown,
-            },
-            Expr::Index { base, index } => {
-                let _base_ty = self.infer_expr(*base, &Expectation::none());
-                let _index_ty = self.infer_expr(*index, &Expectation::none());
-                // FIXME: use `std::ops::Index::Output` to figure out the real return type
-                Ty::Unknown
-            }
-            Expr::Tuple { exprs } => {
-                let mut tys = match &expected.ty {
-                    ty_app!(TypeCtor::Tuple { .. }, st) => st
-                        .iter()
-                        .cloned()
-                        .chain(repeat_with(|| self.new_type_var()))
-                        .take(exprs.len())
-                        .collect::<Vec<_>>(),
-                    _ => (0..exprs.len()).map(|_| self.new_type_var()).collect(),
-                };
-                for (expr, ty) in exprs.iter().zip(tys.iter_mut()) {
-                    self.infer_expr_coerce(*expr, &Expectation::has_type(ty.clone()));
-                }
-                Ty::apply(TypeCtor::Tuple { cardinality: tys.len() as u16 }, Substs(tys.into()))
-            }
-            Expr::Array(array) => {
-                let elem_ty = match &expected.ty {
-                    ty_app!(TypeCtor::Array, st) | ty_app!(TypeCtor::Slice, st) => {
-                        st.as_single().clone()
-                    }
-                    _ => self.new_type_var(),
-                };
-                match array {
-                    Array::ElementList(items) => {
-                        for expr in items.iter() {
-                            self.infer_expr_coerce(*expr, &Expectation::has_type(elem_ty.clone()));
-                        }
-                    }
-                    Array::Repeat { initializer, repeat } => {
-                        self.infer_expr_coerce(
-                            *initializer,
-                            &Expectation::has_type(elem_ty.clone()),
-                        );
-                        self.infer_expr(
-                            *repeat,
-                            &Expectation::has_type(Ty::simple(TypeCtor::Int(
-                                primitive::UncertainIntTy::Known(primitive::IntTy::usize()),
-                            ))),
-                        );
-                    }
-                }
-                Ty::apply_one(TypeCtor::Array, elem_ty)
-            }
-            Expr::Literal(lit) => match lit {
-                Literal::Bool(..) => Ty::simple(TypeCtor::Bool),
-                Literal::String(..) => {
-                    Ty::apply_one(TypeCtor::Ref(Mutability::Shared), Ty::simple(TypeCtor::Str))
-                }
-                Literal::ByteString(..) => {
-                    let byte_type = Ty::simple(TypeCtor::Int(primitive::UncertainIntTy::Known(
-                        primitive::IntTy::u8(),
-                    )));
-                    let slice_type = Ty::apply_one(TypeCtor::Slice, byte_type);
-                    Ty::apply_one(TypeCtor::Ref(Mutability::Shared), slice_type)
-                }
-                Literal::Char(..) => Ty::simple(TypeCtor::Char),
-                Literal::Int(_v, ty) => Ty::simple(TypeCtor::Int(*ty)),
-                Literal::Float(_v, ty) => Ty::simple(TypeCtor::Float(*ty)),
-            },
-        };
-        // use a new type variable if we got Ty::Unknown here
-        let ty = self.insert_type_vars_shallow(ty);
-        let ty = self.resolve_ty_as_possible(&mut vec![], ty);
-        self.write_expr_ty(tgt_expr, ty.clone());
-        ty
-    }
-    fn infer_block(
-        &mut self,
-        statements: &[Statement],
-        tail: Option<ExprId>,
-        expected: &Expectation,
-    ) -> Ty {
-        let mut diverges = false;
-        for stmt in statements {
-            match stmt {
-                Statement::Let { pat, type_ref, initializer } => {
-                    let decl_ty =
-                        type_ref.as_ref().map(|tr| self.make_ty(tr)).unwrap_or(Ty::Unknown);
-                    // Always use the declared type when specified
-                    let mut ty = decl_ty.clone();
-                    if let Some(expr) = initializer {
-                        let actual_ty =
-                            self.infer_expr_coerce(*expr, &Expectation::has_type(decl_ty.clone()));
-                        if decl_ty == Ty::Unknown {
-                            ty = actual_ty;
-                        }
-                    }
-                    let ty = self.resolve_ty_as_possible(&mut vec![], ty);
-                    self.infer_pat(*pat, &ty, BindingMode::default());
-                }
-                Statement::Expr(expr) => {
-                    if let ty_app!(TypeCtor::Never) = self.infer_expr(*expr, &Expectation::none()) {
-                        diverges = true;
-                    }
-                }
-            }
-        }
-        let ty = if let Some(expr) = tail {
-            self.infer_expr_coerce(expr, expected)
-        } else {
-            self.coerce(&Ty::unit(), &expected.ty);
-            Ty::unit()
-        };
-        if diverges {
-            Ty::simple(TypeCtor::Never)
-        } else {
-            ty
-        }
-    }
-    fn check_call_arguments(&mut self, args: &[ExprId], param_tys: &[Ty]) {
-        // Quoting https://github.com/rust-lang/rust/blob/6ef275e6c3cb1384ec78128eceeb4963ff788dca/src/librustc_typeck/check/mod.rs#L3325 --
-        // We do this in a pretty awful way: first we type-check any arguments
-        // that are not closures, then we type-check the closures. This is so
-        // that we have more information about the types of arguments when we
-        // type-check the functions. This isn't really the right way to do this.
-        for &check_closures in &[false, true] {
-            let param_iter = param_tys.iter().cloned().chain(repeat(Ty::Unknown));
-            for (&arg, param_ty) in args.iter().zip(param_iter) {
-                let is_closure = match &self.body[arg] {
-                    Expr::Lambda { .. } => true,
-                    _ => false,
-                };
-                if is_closure != check_closures {
-                    continue;
-                }
-                let param_ty = self.normalize_associated_types_in(param_ty);
-                self.infer_expr_coerce(arg, &Expectation::has_type(param_ty.clone()));
-            }
-        }
-    }
    fn collect_const(&mut self, data: &ConstData) {
        self.return_ty = self.make_ty(data.type_ref());
    }
diff --git a/crates/ra_hir/src/ty/infer/coerce.rs b/crates/ra_hir/src/ty/infer/coerce.rs
new file mode 100644
index 000000000..0429a9866
--- /dev/null
+++ b/crates/ra_hir/src/ty/infer/coerce.rs
@@ -0,0 +1,336 @@
+//! Coercion logic. Coercions are certain type conversions that can implicitly
+//! happen in certain places, e.g. weakening `&mut` to `&` or deref coercions
+//! like going from `&Vec<T>` to `&[T]`.
+//!
+//! See: https://doc.rust-lang.org/nomicon/coercions.html
+use rustc_hash::FxHashMap;
+use test_utils::tested_by;
+use super::{InferTy, InferenceContext, TypeVarValue};
+use crate::{
+    db::HirDatabase,
+    lang_item::LangItemTarget,
+    resolve::Resolver,
+    ty::{autoderef, Substs, Ty, TypeCtor, TypeWalk},
+    type_ref::Mutability,
+    Adt,
+};
+impl<'a, D: HirDatabase> InferenceContext<'a, D> {
+    /// Unify two types, but may coerce the first one to the second one
+    /// using "implicit coercion rules" if needed.
+    pub(super) fn coerce(&mut self, from_ty: &Ty, to_ty: &Ty) -> bool {
+        let from_ty = self.resolve_ty_shallow(from_ty).into_owned();
+        let to_ty = self.resolve_ty_shallow(to_ty);
+        self.coerce_inner(from_ty, &to_ty)
+    }
+    /// Merge two types from different branches, with possible implicit coerce.
+    ///
+    /// Note that it is only possible that one type are coerced to another.
+    /// Coercing both types to another least upper bound type is not possible in rustc,
+    /// which will simply result in "incompatible types" error.
+    pub(super) fn coerce_merge_branch<'t>(&mut self, ty1: &Ty, ty2: &Ty) -> Ty {
+        if self.coerce(ty1, ty2) {
+            ty2.clone()
+        } else if self.coerce(ty2, ty1) {
+            ty1.clone()
+        } else {
+            tested_by!(coerce_merge_fail_fallback);
+            // For incompatible types, we use the latter one as result
+            // to be better recovery for `if` without `else`.
+            ty2.clone()
+        }
+    }
+    pub(super) fn init_coerce_unsized_map(
+        db: &'a D,
+        resolver: &Resolver,
+    ) -> FxHashMap<(TypeCtor, TypeCtor), usize> {
+        let krate = resolver.krate().unwrap();
+        let impls = match db.lang_item(krate, "coerce_unsized".into()) {
+            Some(LangItemTarget::Trait(trait_)) => db.impls_for_trait(krate, trait_),
+            _ => return FxHashMap::default(),
+        };
+        impls
+            .iter()
+            .filter_map(|impl_block| {
+                // `CoerseUnsized` has one generic parameter for the target type.
+                let trait_ref = impl_block.target_trait_ref(db)?;
+                let cur_from_ty = trait_ref.substs.0.get(0)?;
+                let cur_to_ty = trait_ref.substs.0.get(1)?;
+                match (&cur_from_ty, cur_to_ty) {
+                    (ty_app!(ctor1, st1), ty_app!(ctor2, st2)) => {
+                        // FIXME: We return the first non-equal bound as the type parameter to coerce to unsized type.
+                        // This works for smart-pointer-like coercion, which covers all impls from std.
+                        st1.iter().zip(st2.iter()).enumerate().find_map(|(i, (ty1, ty2))| {
+                            match (ty1, ty2) {
+                                (Ty::Param { idx: p1, .. }, Ty::Param { idx: p2, .. })
+                                    if p1 != p2 =>
+                                {
+                                    Some(((*ctor1, *ctor2), i))
+                                }
+                                _ => None,
+                            }
+                        })
+                    }
+                    _ => None,
+                }
+            })
+            .collect()
+    }
+    fn coerce_inner(&mut self, mut from_ty: Ty, to_ty: &Ty) -> bool {
+        match (&from_ty, to_ty) {
+            // Never type will make type variable to fallback to Never Type instead of Unknown.
+            (ty_app!(TypeCtor::Never), Ty::Infer(InferTy::TypeVar(tv))) => {
+                let var = self.new_maybe_never_type_var();
+                self.var_unification_table.union_value(*tv, TypeVarValue::Known(var));
+                return true;
+            }
+            (ty_app!(TypeCtor::Never), _) => return true,
+            // Trivial cases, this should go after `never` check to
+            // avoid infer result type to be never
+            _ => {
+                if self.unify_inner_trivial(&from_ty, &to_ty) {
+                    return true;
+                }
+            }
+        }
+        // Pointer weakening and function to pointer
+        match (&mut from_ty, to_ty) {
+            // `*mut T`, `&mut T, `&T`` -> `*const T`
+            // `&mut T` -> `&T`
+            // `&mut T` -> `*mut T`
+            (ty_app!(c1@TypeCtor::RawPtr(_)), ty_app!(c2@TypeCtor::RawPtr(Mutability::Shared)))
+            | (ty_app!(c1@TypeCtor::Ref(_)), ty_app!(c2@TypeCtor::RawPtr(Mutability::Shared)))
+            | (ty_app!(c1@TypeCtor::Ref(_)), ty_app!(c2@TypeCtor::Ref(Mutability::Shared)))
+            | (ty_app!(c1@TypeCtor::Ref(Mutability::Mut)), ty_app!(c2@TypeCtor::RawPtr(_))) => {
+                *c1 = *c2;
+            }
+            // Illegal mutablity conversion
+            (
+                ty_app!(TypeCtor::RawPtr(Mutability::Shared)),
+                ty_app!(TypeCtor::RawPtr(Mutability::Mut)),
+            )
+            | (
+                ty_app!(TypeCtor::Ref(Mutability::Shared)),
+                ty_app!(TypeCtor::Ref(Mutability::Mut)),
+            ) => return false,
+            // `{function_type}` -> `fn()`
+            (ty_app!(TypeCtor::FnDef(_)), ty_app!(TypeCtor::FnPtr { .. })) => {
+                match from_ty.callable_sig(self.db) {
+                    None => return false,
+                    Some(sig) => {
+                        let num_args = sig.params_and_return.len() as u16 - 1;
+                        from_ty =
+                            Ty::apply(TypeCtor::FnPtr { num_args }, Substs(sig.params_and_return));
+                    }
+                }
+            }
+            _ => {}
+        }
+        if let Some(ret) = self.try_coerce_unsized(&from_ty, &to_ty) {
+            return ret;
+        }
+        // Auto Deref if cannot coerce
+        match (&from_ty, to_ty) {
+            // FIXME: DerefMut
+            (ty_app!(TypeCtor::Ref(_), st1), ty_app!(TypeCtor::Ref(_), st2)) => {
+                self.unify_autoderef_behind_ref(&st1[0], &st2[0])
+            }
+            // Otherwise, normal unify
+            _ => self.unify(&from_ty, to_ty),
+        }
+    }
+    /// Coerce a type using `from_ty: CoerceUnsized<ty_ty>`
+    ///
+    /// See: https://doc.rust-lang.org/nightly/std/marker/trait.CoerceUnsized.html
+    fn try_coerce_unsized(&mut self, from_ty: &Ty, to_ty: &Ty) -> Option<bool> {
+        let (ctor1, st1, ctor2, st2) = match (from_ty, to_ty) {
+            (ty_app!(ctor1, st1), ty_app!(ctor2, st2)) => (ctor1, st1, ctor2, st2),
+            _ => return None,
+        };
+        let coerce_generic_index = *self.coerce_unsized_map.get(&(*ctor1, *ctor2))?;
+        // Check `Unsize` first
+        match self.check_unsize_and_coerce(
+            st1.0.get(coerce_generic_index)?,
+            st2.0.get(coerce_generic_index)?,
+            0,
+        ) {
+            Some(true) => {}
+            ret => return ret,
+        }
+        let ret = st1
+            .iter()
+            .zip(st2.iter())
+            .enumerate()
+            .filter(|&(idx, _)| idx != coerce_generic_index)
+            .all(|(_, (ty1, ty2))| self.unify(ty1, ty2));
+        Some(ret)
+    }
+    /// Check if `from_ty: Unsize<to_ty>`, and coerce to `to_ty` if it holds.
+    ///
+    /// It should not be directly called. It is only used by `try_coerce_unsized`.
+    ///
+    /// See: https://doc.rust-lang.org/nightly/std/marker/trait.Unsize.html
+    fn check_unsize_and_coerce(&mut self, from_ty: &Ty, to_ty: &Ty, depth: usize) -> Option<bool> {
+        if depth > 1000 {
+            panic!("Infinite recursion in coercion");
+        }
+        match (&from_ty, &to_ty) {
+            // `[T; N]` -> `[T]`
+            (ty_app!(TypeCtor::Array, st1), ty_app!(TypeCtor::Slice, st2)) => {
+                Some(self.unify(&st1[0], &st2[0]))
+            }
+            // `T` -> `dyn Trait` when `T: Trait`
+            (_, Ty::Dyn(_)) => {
+                // FIXME: Check predicates
+                Some(true)
+            }
+            // `(..., T)` -> `(..., U)` when `T: Unsize<U>`
+            (
+                ty_app!(TypeCtor::Tuple { cardinality: len1 }, st1),
+                ty_app!(TypeCtor::Tuple { cardinality: len2 }, st2),
+            ) => {
+                if len1 != len2 || *len1 == 0 {
+                    return None;
+                }
+                match self.check_unsize_and_coerce(
+                    st1.last().unwrap(),
+                    st2.last().unwrap(),
+                    depth + 1,
+                ) {
+                    Some(true) => {}
+                    ret => return ret,
+                }
+                let ret = st1[..st1.len() - 1]
+                    .iter()
+                    .zip(&st2[..st2.len() - 1])
+                    .all(|(ty1, ty2)| self.unify(ty1, ty2));
+                Some(ret)
+            }
+            // Foo<..., T, ...> is Unsize<Foo<..., U, ...>> if:
+            // - T: Unsize<U>
+            // - Foo is a struct
+            // - Only the last field of Foo has a type involving T
+            // - T is not part of the type of any other fields
+            // - Bar<T>: Unsize<Bar<U>>, if the last field of Foo has type Bar<T>
+            (
+                ty_app!(TypeCtor::Adt(Adt::Struct(struct1)), st1),
+                ty_app!(TypeCtor::Adt(Adt::Struct(struct2)), st2),
+            ) if struct1 == struct2 => {
+                let fields = struct1.fields(self.db);
+                let (last_field, prev_fields) = fields.split_last()?;
+                // Get the generic parameter involved in the last field.
+                let unsize_generic_index = {
+                    let mut index = None;
+                    let mut multiple_param = false;
+                    last_field.ty(self.db).walk(&mut |ty| match ty {
+                        &Ty::Param { idx, .. } => {
+                            if index.is_none() {
+                                index = Some(idx);
+                            } else if Some(idx) != index {
+                                multiple_param = true;
+                            }
+                        }
+                        _ => {}
+                    });
+                    if multiple_param {
+                        return None;
+                    }
+                    index?
+                };
+                // Check other fields do not involve it.
+                let mut multiple_used = false;
+                prev_fields.iter().for_each(|field| {
+                    field.ty(self.db).walk(&mut |ty| match ty {
+                        &Ty::Param { idx, .. } if idx == unsize_generic_index => {
+                            multiple_used = true
+                        }
+                        _ => {}
+                    })
+                });
+                if multiple_used {
+                    return None;
+                }
+                let unsize_generic_index = unsize_generic_index as usize;
+                // Check `Unsize` first
+                match self.check_unsize_and_coerce(
+                    st1.get(unsize_generic_index)?,
+                    st2.get(unsize_generic_index)?,
+                    depth + 1,
+                ) {
+                    Some(true) => {}
+                    ret => return ret,
+                }
+                // Then unify other parameters
+                let ret = st1
+                    .iter()
+                    .zip(st2.iter())
+                    .enumerate()
+                    .filter(|&(idx, _)| idx != unsize_generic_index)
+                    .all(|(_, (ty1, ty2))| self.unify(ty1, ty2));
+                Some(ret)
+            }
+            _ => None,
+        }
+    }
+    /// Unify `from_ty` to `to_ty` with optional auto Deref
+    ///
+    /// Note that the parameters are already stripped the outer reference.
+    fn unify_autoderef_behind_ref(&mut self, from_ty: &Ty, to_ty: &Ty) -> bool {
+        let canonicalized = self.canonicalizer().canonicalize_ty(from_ty.clone());
+        let to_ty = self.resolve_ty_shallow(&to_ty);
+        // FIXME: Auto DerefMut
+        for derefed_ty in
+            autoderef::autoderef(self.db, &self.resolver.clone(), canonicalized.value.clone())
+        {
+            let derefed_ty = canonicalized.decanonicalize_ty(derefed_ty.value);
+            match (&*self.resolve_ty_shallow(&derefed_ty), &*to_ty) {
+                // Stop when constructor matches.
+                (ty_app!(from_ctor, st1), ty_app!(to_ctor, st2)) if from_ctor == to_ctor => {
+                    // It will not recurse to `coerce`.
+                    return self.unify_substs(st1, st2, 0);
+                }
+                _ => {}
+            }
+        }
+        false
+    }
+}
diff --git a/crates/ra_hir/src/ty/infer/expr.rs b/crates/ra_hir/src/ty/infer/expr.rs
new file mode 100644
index 000000000..f8807c742
--- /dev/null
+++ b/crates/ra_hir/src/ty/infer/expr.rs
@@ -0,0 +1,658 @@
+//! Type inference for expressions.
+use std::iter::{repeat, repeat_with};
+use std::sync::Arc;
+use super::{BindingMode, Expectation, InferenceContext, InferenceDiagnostic, TypeMismatch};
+use crate::{
+    db::HirDatabase,
+    expr::{self, Array, BinaryOp, Expr, ExprId, Literal, Statement, UnaryOp},
+    generics::{GenericParams, HasGenericParams},
+    name,
+    nameres::Namespace,
+    path::{GenericArg, GenericArgs},
+    ty::{
+        autoderef, method_resolution, op, primitive, CallableDef, InferTy, Mutability, Obligation,
+        ProjectionPredicate, ProjectionTy, Substs, TraitRef, Ty, TypeCtor, TypeWalk,
+    },
+    Adt, Name,
+};
+impl<'a, D: HirDatabase> InferenceContext<'a, D> {
+    pub(super) fn infer_expr(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty {
+        let ty = self.infer_expr_inner(tgt_expr, expected);
+        let could_unify = self.unify(&ty, &expected.ty);
+        if !could_unify {
+            self.result.type_mismatches.insert(
+                tgt_expr,
+                TypeMismatch { expected: expected.ty.clone(), actual: ty.clone() },
+            );
+        }
+        let ty = self.resolve_ty_as_possible(&mut vec![], ty);
+        ty
+    }
+    /// Infer type of expression with possibly implicit coerce to the expected type.
+    /// Return the type after possible coercion.
+    fn infer_expr_coerce(&mut self, expr: ExprId, expected: &Expectation) -> Ty {
+        let ty = self.infer_expr_inner(expr, &expected);
+        let ty = if !self.coerce(&ty, &expected.ty) {
+            self.result
+                .type_mismatches
+                .insert(expr, TypeMismatch { expected: expected.ty.clone(), actual: ty.clone() });
+            // Return actual type when type mismatch.
+            // This is needed for diagnostic when return type mismatch.
+            ty
+        } else if expected.ty == Ty::Unknown {
+            ty
+        } else {
+            expected.ty.clone()
+        };
+        self.resolve_ty_as_possible(&mut vec![], ty)
+    }
+    fn infer_expr_inner(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty {
+        let body = Arc::clone(&self.body); // avoid borrow checker problem
+        let ty = match &body[tgt_expr] {
+            Expr::Missing => Ty::Unknown,
+            Expr::If { condition, then_branch, else_branch } => {
+                // if let is desugared to match, so this is always simple if
+                self.infer_expr(*condition, &Expectation::has_type(Ty::simple(TypeCtor::Bool)));
+                let then_ty = self.infer_expr_inner(*then_branch, &expected);
+                let else_ty = match else_branch {
+                    Some(else_branch) => self.infer_expr_inner(*else_branch, &expected),
+                    None => Ty::unit(),
+                };
+                self.coerce_merge_branch(&then_ty, &else_ty)
+            }
+            Expr::Block { statements, tail } => self.infer_block(statements, *tail, expected),
+            Expr::TryBlock { body } => {
+                let _inner = self.infer_expr(*body, expected);
+                // FIXME should be std::result::Result<{inner}, _>
+                Ty::Unknown
+            }
+            Expr::Loop { body } => {
+                self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
+                // FIXME handle break with value
+                Ty::simple(TypeCtor::Never)
+            }
+            Expr::While { condition, body } => {
+                // while let is desugared to a match loop, so this is always simple while
+                self.infer_expr(*condition, &Expectation::has_type(Ty::simple(TypeCtor::Bool)));
+                self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
+                Ty::unit()
+            }
+            Expr::For { iterable, body, pat } => {
+                let iterable_ty = self.infer_expr(*iterable, &Expectation::none());
+                let pat_ty = match self.resolve_into_iter_item() {
+                    Some(into_iter_item_alias) => {
+                        let pat_ty = self.new_type_var();
+                        let projection = ProjectionPredicate {
+                            ty: pat_ty.clone(),
+                            projection_ty: ProjectionTy {
+                                associated_ty: into_iter_item_alias,
+                                parameters: Substs::single(iterable_ty),
+                            },
+                        };
+                        self.obligations.push(Obligation::Projection(projection));
+                        self.resolve_ty_as_possible(&mut vec![], pat_ty)
+                    }
+                    None => Ty::Unknown,
+                };
+                self.infer_pat(*pat, &pat_ty, BindingMode::default());
+                self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
+                Ty::unit()
+            }
+            Expr::Lambda { body, args, arg_types } => {
+                assert_eq!(args.len(), arg_types.len());
+                let mut sig_tys = Vec::new();
+                for (arg_pat, arg_type) in args.iter().zip(arg_types.iter()) {
+                    let expected = if let Some(type_ref) = arg_type {
+                        self.make_ty(type_ref)
+                    } else {
+                        Ty::Unknown
+                    };
+                    let arg_ty = self.infer_pat(*arg_pat, &expected, BindingMode::default());
+                    sig_tys.push(arg_ty);
+                }
+                // add return type
+                let ret_ty = self.new_type_var();
+                sig_tys.push(ret_ty.clone());
+                let sig_ty = Ty::apply(
+                    TypeCtor::FnPtr { num_args: sig_tys.len() as u16 - 1 },
+                    Substs(sig_tys.into()),
+                );
+                let closure_ty = Ty::apply_one(
+                    TypeCtor::Closure { def: self.body.owner(), expr: tgt_expr },
+                    sig_ty,
+                );
+                // Eagerly try to relate the closure type with the expected
+                // type, otherwise we often won't have enough information to
+                // infer the body.
+                self.coerce(&closure_ty, &expected.ty);
+                self.infer_expr(*body, &Expectation::has_type(ret_ty));
+                closure_ty
+            }
+            Expr::Call { callee, args } => {
+                let callee_ty = self.infer_expr(*callee, &Expectation::none());
+                let (param_tys, ret_ty) = match callee_ty.callable_sig(self.db) {
+                    Some(sig) => (sig.params().to_vec(), sig.ret().clone()),
+                    None => {
+                        // Not callable
+                        // FIXME: report an error
+                        (Vec::new(), Ty::Unknown)
+                    }
+                };
+                self.register_obligations_for_call(&callee_ty);
+                self.check_call_arguments(args, &param_tys);
+                let ret_ty = self.normalize_associated_types_in(ret_ty);
+                ret_ty
+            }
+            Expr::MethodCall { receiver, args, method_name, generic_args } => self
+                .infer_method_call(tgt_expr, *receiver, &args, &method_name, generic_args.as_ref()),
+            Expr::Match { expr, arms } => {
+                let input_ty = self.infer_expr(*expr, &Expectation::none());
+                let mut result_ty = self.new_maybe_never_type_var();
+                for arm in arms {
+                    for &pat in &arm.pats {
+                        let _pat_ty = self.infer_pat(pat, &input_ty, BindingMode::default());
+                    }
+                    if let Some(guard_expr) = arm.guard {
+                        self.infer_expr(
+                            guard_expr,
+                            &Expectation::has_type(Ty::simple(TypeCtor::Bool)),
+                        );
+                    }
+                    let arm_ty = self.infer_expr_inner(arm.expr, &expected);
+                    result_ty = self.coerce_merge_branch(&result_ty, &arm_ty);
+                }
+                result_ty
+            }
+            Expr::Path(p) => {
+                // FIXME this could be more efficient...
+                let resolver = expr::resolver_for_expr(self.body.clone(), self.db, tgt_expr);
+                self.infer_path(&resolver, p, tgt_expr.into()).unwrap_or(Ty::Unknown)
+            }
+            Expr::Continue => Ty::simple(TypeCtor::Never),
+            Expr::Break { expr } => {
+                if let Some(expr) = expr {
+                    // FIXME handle break with value
+                    self.infer_expr(*expr, &Expectation::none());
+                }
+                Ty::simple(TypeCtor::Never)
+            }
+            Expr::Return { expr } => {
+                if let Some(expr) = expr {
+                    self.infer_expr(*expr, &Expectation::has_type(self.return_ty.clone()));
+                }
+                Ty::simple(TypeCtor::Never)
+            }
+            Expr::RecordLit { path, fields, spread } => {
+                let (ty, def_id) = self.resolve_variant(path.as_ref());
+                if let Some(variant) = def_id {
+                    self.write_variant_resolution(tgt_expr.into(), variant);
+                }
+                self.unify(&ty, &expected.ty);
+                let substs = ty.substs().unwrap_or_else(Substs::empty);
+                for (field_idx, field) in fields.iter().enumerate() {
+                    let field_ty = def_id
+                        .and_then(|it| match it.field(self.db, &field.name) {
+                            Some(field) => Some(field),
+                            None => {
+                                self.push_diagnostic(InferenceDiagnostic::NoSuchField {
+                                    expr: tgt_expr,
+                                    field: field_idx,
+                                });
+                                None
+                            }
+                        })
+                        .map_or(Ty::Unknown, |field| field.ty(self.db))
+                        .subst(&substs);
+                    self.infer_expr_coerce(field.expr, &Expectation::has_type(field_ty));
+                }
+                if let Some(expr) = spread {
+                    self.infer_expr(*expr, &Expectation::has_type(ty.clone()));
+                }
+                ty
+            }
+            Expr::Field { expr, name } => {
+                let receiver_ty = self.infer_expr(*expr, &Expectation::none());
+                let canonicalized = self.canonicalizer().canonicalize_ty(receiver_ty);
+                let ty = autoderef::autoderef(
+                    self.db,
+                    &self.resolver.clone(),
+                    canonicalized.value.clone(),
+                )
+                .find_map(|derefed_ty| match canonicalized.decanonicalize_ty(derefed_ty.value) {
+                    Ty::Apply(a_ty) => match a_ty.ctor {
+                        TypeCtor::Tuple { .. } => name
+                            .as_tuple_index()
+                            .and_then(|idx| a_ty.parameters.0.get(idx).cloned()),
+                        TypeCtor::Adt(Adt::Struct(s)) => s.field(self.db, name).map(|field| {
+                            self.write_field_resolution(tgt_expr, field);
+                            field.ty(self.db).subst(&a_ty.parameters)
+                        }),
+                        _ => None,
+                    },
+                    _ => None,
+                })
+                .unwrap_or(Ty::Unknown);
+                let ty = self.insert_type_vars(ty);
+                self.normalize_associated_types_in(ty)
+            }
+            Expr::Await { expr } => {
+                let inner_ty = self.infer_expr(*expr, &Expectation::none());
+                let ty = match self.resolve_future_future_output() {
+                    Some(future_future_output_alias) => {
+                        let ty = self.new_type_var();
+                        let projection = ProjectionPredicate {
+                            ty: ty.clone(),
+                            projection_ty: ProjectionTy {
+                                associated_ty: future_future_output_alias,
+                                parameters: Substs::single(inner_ty),
+                            },
+                        };
+                        self.obligations.push(Obligation::Projection(projection));
+                        self.resolve_ty_as_possible(&mut vec![], ty)
+                    }
+                    None => Ty::Unknown,
+                };
+                ty
+            }
+            Expr::Try { expr } => {
+                let inner_ty = self.infer_expr(*expr, &Expectation::none());
+                let ty = match self.resolve_ops_try_ok() {
+                    Some(ops_try_ok_alias) => {
+                        let ty = self.new_type_var();
+                        let projection = ProjectionPredicate {
+                            ty: ty.clone(),
+                            projection_ty: ProjectionTy {
+                                associated_ty: ops_try_ok_alias,
+                                parameters: Substs::single(inner_ty),
+                            },
+                        };
+                        self.obligations.push(Obligation::Projection(projection));
+                        self.resolve_ty_as_possible(&mut vec![], ty)
+                    }
+                    None => Ty::Unknown,
+                };
+                ty
+            }
+            Expr::Cast { expr, type_ref } => {
+                let _inner_ty = self.infer_expr(*expr, &Expectation::none());
+                let cast_ty = self.make_ty(type_ref);
+                // FIXME check the cast...
+                cast_ty
+            }
+            Expr::Ref { expr, mutability } => {
+                let expectation =
+                    if let Some((exp_inner, exp_mutability)) = &expected.ty.as_reference() {
+                        if *exp_mutability == Mutability::Mut && *mutability == Mutability::Shared {
+                            // FIXME: throw type error - expected mut reference but found shared ref,
+                            // which cannot be coerced
+                        }
+                        Expectation::has_type(Ty::clone(exp_inner))
+                    } else {
+                        Expectation::none()
+                    };
+                // FIXME reference coercions etc.
+                let inner_ty = self.infer_expr(*expr, &expectation);
+                Ty::apply_one(TypeCtor::Ref(*mutability), inner_ty)
+            }
+            Expr::Box { expr } => {
+                let inner_ty = self.infer_expr(*expr, &Expectation::none());
+                if let Some(box_) = self.resolve_boxed_box() {
+                    Ty::apply_one(TypeCtor::Adt(box_), inner_ty)
+                } else {
+                    Ty::Unknown
+                }
+            }
+            Expr::UnaryOp { expr, op } => {
+                let inner_ty = self.infer_expr(*expr, &Expectation::none());
+                match op {
+                    UnaryOp::Deref => {
+                        let canonicalized = self.canonicalizer().canonicalize_ty(inner_ty);
+                        if let Some(derefed_ty) =
+                            autoderef::deref(self.db, &self.resolver, &canonicalized.value)
+                        {
+                            canonicalized.decanonicalize_ty(derefed_ty.value)
+                        } else {
+                            Ty::Unknown
+                        }
+                    }
+                    UnaryOp::Neg => {
+                        match &inner_ty {
+                            Ty::Apply(a_ty) => match a_ty.ctor {
+                                TypeCtor::Int(primitive::UncertainIntTy::Unknown)
+                                | TypeCtor::Int(primitive::UncertainIntTy::Known(
+                                    primitive::IntTy {
+                                        signedness: primitive::Signedness::Signed,
+                                        ..
+                                    },
+                                ))
+                                | TypeCtor::Float(..) => inner_ty,
+                                _ => Ty::Unknown,
+                            },
+                            Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => {
+                                inner_ty
+                            }
+                            // FIXME: resolve ops::Neg trait
+                            _ => Ty::Unknown,
+                        }
+                    }
+                    UnaryOp::Not => {
+                        match &inner_ty {
+                            Ty::Apply(a_ty) => match a_ty.ctor {
+                                TypeCtor::Bool | TypeCtor::Int(_) => inner_ty,
+                                _ => Ty::Unknown,
+                            },
+                            Ty::Infer(InferTy::IntVar(..)) => inner_ty,
+                            // FIXME: resolve ops::Not trait for inner_ty
+                            _ => Ty::Unknown,
+                        }
+                    }
+                }
+            }
+            Expr::BinaryOp { lhs, rhs, op } => match op {
+                Some(op) => {
+                    let lhs_expectation = match op {
+                        BinaryOp::LogicOp(..) => Expectation::has_type(Ty::simple(TypeCtor::Bool)),
+                        _ => Expectation::none(),
+                    };
+                    let lhs_ty = self.infer_expr(*lhs, &lhs_expectation);
+                    // FIXME: find implementation of trait corresponding to operation
+                    // symbol and resolve associated `Output` type
+                    let rhs_expectation = op::binary_op_rhs_expectation(*op, lhs_ty);
+                    let rhs_ty = self.infer_expr(*rhs, &Expectation::has_type(rhs_expectation));
+                    // FIXME: similar as above, return ty is often associated trait type
+                    op::binary_op_return_ty(*op, rhs_ty)
+                }
+                _ => Ty::Unknown,
+            },
+            Expr::Index { base, index } => {
+                let _base_ty = self.infer_expr(*base, &Expectation::none());
+                let _index_ty = self.infer_expr(*index, &Expectation::none());
+                // FIXME: use `std::ops::Index::Output` to figure out the real return type
+                Ty::Unknown
+            }
+            Expr::Tuple { exprs } => {
+                let mut tys = match &expected.ty {
+                    ty_app!(TypeCtor::Tuple { .. }, st) => st
+                        .iter()
+                        .cloned()
+                        .chain(repeat_with(|| self.new_type_var()))
+                        .take(exprs.len())
+                        .collect::<Vec<_>>(),
+                    _ => (0..exprs.len()).map(|_| self.new_type_var()).collect(),
+                };
+                for (expr, ty) in exprs.iter().zip(tys.iter_mut()) {
+                    self.infer_expr_coerce(*expr, &Expectation::has_type(ty.clone()));
+                }
+                Ty::apply(TypeCtor::Tuple { cardinality: tys.len() as u16 }, Substs(tys.into()))
+            }
+            Expr::Array(array) => {
+                let elem_ty = match &expected.ty {
+                    ty_app!(TypeCtor::Array, st) | ty_app!(TypeCtor::Slice, st) => {
+                        st.as_single().clone()
+                    }
+                    _ => self.new_type_var(),
+                };
+                match array {
+                    Array::ElementList(items) => {
+                        for expr in items.iter() {
+                            self.infer_expr_coerce(*expr, &Expectation::has_type(elem_ty.clone()));
+                        }
+                    }
+                    Array::Repeat { initializer, repeat } => {
+                        self.infer_expr_coerce(
+                            *initializer,
+                            &Expectation::has_type(elem_ty.clone()),
+                        );
+                        self.infer_expr(
+                            *repeat,
+                            &Expectation::has_type(Ty::simple(TypeCtor::Int(
+                                primitive::UncertainIntTy::Known(primitive::IntTy::usize()),
+                            ))),
+                        );
+                    }
+                }
+                Ty::apply_one(TypeCtor::Array, elem_ty)
+            }
+            Expr::Literal(lit) => match lit {
+                Literal::Bool(..) => Ty::simple(TypeCtor::Bool),
+                Literal::String(..) => {
+                    Ty::apply_one(TypeCtor::Ref(Mutability::Shared), Ty::simple(TypeCtor::Str))
+                }
+                Literal::ByteString(..) => {
+                    let byte_type = Ty::simple(TypeCtor::Int(primitive::UncertainIntTy::Known(
+                        primitive::IntTy::u8(),
+                    )));
+                    let slice_type = Ty::apply_one(TypeCtor::Slice, byte_type);
+                    Ty::apply_one(TypeCtor::Ref(Mutability::Shared), slice_type)
+                }
+                Literal::Char(..) => Ty::simple(TypeCtor::Char),
+                Literal::Int(_v, ty) => Ty::simple(TypeCtor::Int(*ty)),
+                Literal::Float(_v, ty) => Ty::simple(TypeCtor::Float(*ty)),
+            },
+        };
+        // use a new type variable if we got Ty::Unknown here
+        let ty = self.insert_type_vars_shallow(ty);
+        let ty = self.resolve_ty_as_possible(&mut vec![], ty);
+        self.write_expr_ty(tgt_expr, ty.clone());
+        ty
+    }
+    fn infer_block(
+        &mut self,
+        statements: &[Statement],
+        tail: Option<ExprId>,
+        expected: &Expectation,
+    ) -> Ty {
+        let mut diverges = false;
+        for stmt in statements {
+            match stmt {
+                Statement::Let { pat, type_ref, initializer } => {
+                    let decl_ty =
+                        type_ref.as_ref().map(|tr| self.make_ty(tr)).unwrap_or(Ty::Unknown);
+                    // Always use the declared type when specified
+                    let mut ty = decl_ty.clone();
+                    if let Some(expr) = initializer {
+                        let actual_ty =
+                            self.infer_expr_coerce(*expr, &Expectation::has_type(decl_ty.clone()));
+                        if decl_ty == Ty::Unknown {
+                            ty = actual_ty;
+                        }
+                    }
+                    let ty = self.resolve_ty_as_possible(&mut vec![], ty);
+                    self.infer_pat(*pat, &ty, BindingMode::default());
+                }
+                Statement::Expr(expr) => {
+                    if let ty_app!(TypeCtor::Never) = self.infer_expr(*expr, &Expectation::none()) {
+                        diverges = true;
+                    }
+                }
+            }
+        }
+        let ty = if let Some(expr) = tail {
+            self.infer_expr_coerce(expr, expected)
+        } else {
+            self.coerce(&Ty::unit(), &expected.ty);
+            Ty::unit()
+        };
+        if diverges {
+            Ty::simple(TypeCtor::Never)
+        } else {
+            ty
+        }
+    }
+    fn infer_method_call(
+        &mut self,
+        tgt_expr: ExprId,
+        receiver: ExprId,
+        args: &[ExprId],
+        method_name: &Name,
+        generic_args: Option<&GenericArgs>,
+    ) -> Ty {
+        let receiver_ty = self.infer_expr(receiver, &Expectation::none());
+        let canonicalized_receiver = self.canonicalizer().canonicalize_ty(receiver_ty.clone());
+        let resolved = method_resolution::lookup_method(
+            &canonicalized_receiver.value,
+            self.db,
+            method_name,
+            &self.resolver,
+        );
+        let (derefed_receiver_ty, method_ty, def_generics) = match resolved {
+            Some((ty, func)) => {
+                let ty = canonicalized_receiver.decanonicalize_ty(ty);
+                self.write_method_resolution(tgt_expr, func);
+                (
+                    ty,
+                    self.db.type_for_def(func.into(), Namespace::Values),
+                    Some(func.generic_params(self.db)),
+                )
+            }
+            None => (receiver_ty, Ty::Unknown, None),
+        };
+        let substs = self.substs_for_method_call(def_generics, generic_args, &derefed_receiver_ty);
+        let method_ty = method_ty.apply_substs(substs);
+        let method_ty = self.insert_type_vars(method_ty);
+        self.register_obligations_for_call(&method_ty);
+        let (expected_receiver_ty, param_tys, ret_ty) = match method_ty.callable_sig(self.db) {
+            Some(sig) => {
+                if !sig.params().is_empty() {
+                    (sig.params()[0].clone(), sig.params()[1..].to_vec(), sig.ret().clone())
+                } else {
+                    (Ty::Unknown, Vec::new(), sig.ret().clone())
+                }
+            }
+            None => (Ty::Unknown, Vec::new(), Ty::Unknown),
+        };
+        // Apply autoref so the below unification works correctly
+        // FIXME: return correct autorefs from lookup_method
+        let actual_receiver_ty = match expected_receiver_ty.as_reference() {
+            Some((_, mutability)) => Ty::apply_one(TypeCtor::Ref(mutability), derefed_receiver_ty),
+            _ => derefed_receiver_ty,
+        };
+        self.unify(&expected_receiver_ty, &actual_receiver_ty);
+        self.check_call_arguments(args, &param_tys);
+        let ret_ty = self.normalize_associated_types_in(ret_ty);
+        ret_ty
+    }
+    fn check_call_arguments(&mut self, args: &[ExprId], param_tys: &[Ty]) {
+        // Quoting https://github.com/rust-lang/rust/blob/6ef275e6c3cb1384ec78128eceeb4963ff788dca/src/librustc_typeck/check/mod.rs#L3325 --
+        // We do this in a pretty awful way: first we type-check any arguments
+        // that are not closures, then we type-check the closures. This is so
+        // that we have more information about the types of arguments when we
+        // type-check the functions. This isn't really the right way to do this.
+        for &check_closures in &[false, true] {
+            let param_iter = param_tys.iter().cloned().chain(repeat(Ty::Unknown));
+            for (&arg, param_ty) in args.iter().zip(param_iter) {
+                let is_closure = match &self.body[arg] {
+                    Expr::Lambda { .. } => true,
+                    _ => false,
+                };
+                if is_closure != check_closures {
+                    continue;
+                }
+                let param_ty = self.normalize_associated_types_in(param_ty);
+                self.infer_expr_coerce(arg, &Expectation::has_type(param_ty.clone()));
+            }
+        }
+    }
+    fn substs_for_method_call(
+        &mut self,
+        def_generics: Option<Arc<GenericParams>>,
+        generic_args: Option<&GenericArgs>,
+        receiver_ty: &Ty,
+    ) -> Substs {
+        let (parent_param_count, param_count) =
+            def_generics.as_ref().map_or((0, 0), |g| (g.count_parent_params(), g.params.len()));
+        let mut substs = Vec::with_capacity(parent_param_count + param_count);
+        // Parent arguments are unknown, except for the receiver type
+        if let Some(parent_generics) = def_generics.and_then(|p| p.parent_params.clone()) {
+            for param in &parent_generics.params {
+                if param.name == name::SELF_TYPE {
+                    substs.push(receiver_ty.clone());
+                } else {
+                    substs.push(Ty::Unknown);
+                }
+            }
+        }
+        // handle provided type arguments
+        if let Some(generic_args) = generic_args {
+            // if args are provided, it should be all of them, but we can't rely on that
+            for arg in generic_args.args.iter().take(param_count) {
+                match arg {
+                    GenericArg::Type(type_ref) => {
+                        let ty = self.make_ty(type_ref);
+                        substs.push(ty);
+                    }
+                }
+            }
+        };
+        let supplied_params = substs.len();
+        for _ in supplied_params..parent_param_count + param_count {
+            substs.push(Ty::Unknown);
+        }
+        assert_eq!(substs.len(), parent_param_count + param_count);
+        Substs(substs.into())
+    }
+    fn register_obligations_for_call(&mut self, callable_ty: &Ty) {
+        if let Ty::Apply(a_ty) = callable_ty {
+            if let TypeCtor::FnDef(def) = a_ty.ctor {
+                let generic_predicates = self.db.generic_predicates(def.into());
+                for predicate in generic_predicates.iter() {
+                    let predicate = predicate.clone().subst(&a_ty.parameters);
+                    if let Some(obligation) = Obligation::from_predicate(predicate) {
+                        self.obligations.push(obligation);
+                    }
+                }
+                // add obligation for trait implementation, if this is a trait method
+                match def {
+                    CallableDef::Function(f) => {
+                        if let Some(trait_) = f.parent_trait(self.db) {
+                            // construct a TraitDef
+                            let substs = a_ty.parameters.prefix(
+                                trait_.generic_params(self.db).count_params_including_parent(),
+                            );
+                            self.obligations.push(Obligation::Trait(TraitRef { trait_, substs }));
+                        }
+                    }
+                    CallableDef::Struct(_) | CallableDef::EnumVariant(_) => {}
+                }
+            }
+        }
+    }
+}
diff --git a/crates/ra_hir/src/ty/infer/pat.rs b/crates/ra_hir/src/ty/infer/pat.rs
new file mode 100644
index 000000000..c125ddfbc
--- /dev/null
+++ b/crates/ra_hir/src/ty/infer/pat.rs
@@ -0,0 +1,180 @@
+//! Type inference for patterns.
+use std::iter::repeat;
+use std::sync::Arc;
+use test_utils::tested_by;
+use super::{BindingMode, InferenceContext};
+use crate::{
+    db::HirDatabase,
+    expr::{BindingAnnotation, Pat, PatId, RecordFieldPat},
+    ty::{Mutability, Substs, Ty, TypeCtor, TypeWalk},
+    Name, Path,
+};
+impl<'a, D: HirDatabase> InferenceContext<'a, D> {
+    fn infer_tuple_struct_pat(
+        &mut self,
+        path: Option<&Path>,
+        subpats: &[PatId],
+        expected: &Ty,
+        default_bm: BindingMode,
+    ) -> Ty {
+        let (ty, def) = self.resolve_variant(path);
+        self.unify(&ty, expected);
+        let substs = ty.substs().unwrap_or_else(Substs::empty);
+        for (i, &subpat) in subpats.iter().enumerate() {
+            let expected_ty = def
+                .and_then(|d| d.field(self.db, &Name::new_tuple_field(i)))
+                .map_or(Ty::Unknown, |field| field.ty(self.db))
+                .subst(&substs);
+            let expected_ty = self.normalize_associated_types_in(expected_ty);
+            self.infer_pat(subpat, &expected_ty, default_bm);
+        }
+        ty
+    }
+    fn infer_record_pat(
+        &mut self,
+        path: Option<&Path>,
+        subpats: &[RecordFieldPat],
+        expected: &Ty,
+        default_bm: BindingMode,
+        id: PatId,
+    ) -> Ty {
+        let (ty, def) = self.resolve_variant(path);
+        if let Some(variant) = def {
+            self.write_variant_resolution(id.into(), variant);
+        }
+        self.unify(&ty, expected);
+        let substs = ty.substs().unwrap_or_else(Substs::empty);
+        for subpat in subpats {
+            let matching_field = def.and_then(|it| it.field(self.db, &subpat.name));
+            let expected_ty =
+                matching_field.map_or(Ty::Unknown, |field| field.ty(self.db)).subst(&substs);
+            let expected_ty = self.normalize_associated_types_in(expected_ty);
+            self.infer_pat(subpat.pat, &expected_ty, default_bm);
+        }
+        ty
+    }
+    pub(super) fn infer_pat(
+        &mut self,
+        pat: PatId,
+        mut expected: &Ty,
+        mut default_bm: BindingMode,
+    ) -> Ty {
+        let body = Arc::clone(&self.body); // avoid borrow checker problem
+        let is_non_ref_pat = match &body[pat] {
+            Pat::Tuple(..)
+            | Pat::TupleStruct { .. }
+            | Pat::Record { .. }
+            | Pat::Range { .. }
+            | Pat::Slice { .. } => true,
+            // FIXME: Path/Lit might actually evaluate to ref, but inference is unimplemented.
+            Pat::Path(..) | Pat::Lit(..) => true,
+            Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Missing => false,
+        };
+        if is_non_ref_pat {
+            while let Some((inner, mutability)) = expected.as_reference() {
+                expected = inner;
+                default_bm = match default_bm {
+                    BindingMode::Move => BindingMode::Ref(mutability),
+                    BindingMode::Ref(Mutability::Shared) => BindingMode::Ref(Mutability::Shared),
+                    BindingMode::Ref(Mutability::Mut) => BindingMode::Ref(mutability),
+                }
+            }
+        } else if let Pat::Ref { .. } = &body[pat] {
+            tested_by!(match_ergonomics_ref);
+            // When you encounter a `&pat` pattern, reset to Move.
+            // This is so that `w` is by value: `let (_, &w) = &(1, &2);`
+            default_bm = BindingMode::Move;
+        }
+        // Lose mutability.
+        let default_bm = default_bm;
+        let expected = expected;
+        let ty = match &body[pat] {
+            Pat::Tuple(ref args) => {
+                let expectations = match expected.as_tuple() {
+                    Some(parameters) => &*parameters.0,
+                    _ => &[],
+                };
+                let expectations_iter = expectations.iter().chain(repeat(&Ty::Unknown));
+                let inner_tys = args
+                    .iter()
+                    .zip(expectations_iter)
+                    .map(|(&pat, ty)| self.infer_pat(pat, ty, default_bm))
+                    .collect();
+                Ty::apply(TypeCtor::Tuple { cardinality: args.len() as u16 }, Substs(inner_tys))
+            }
+            Pat::Ref { pat, mutability } => {
+                let expectation = match expected.as_reference() {
+                    Some((inner_ty, exp_mut)) => {
+                        if *mutability != exp_mut {
+                            // FIXME: emit type error?
+                        }
+                        inner_ty
+                    }
+                    _ => &Ty::Unknown,
+                };
+                let subty = self.infer_pat(*pat, expectation, default_bm);
+                Ty::apply_one(TypeCtor::Ref(*mutability), subty)
+            }
+            Pat::TupleStruct { path: p, args: subpats } => {
+                self.infer_tuple_struct_pat(p.as_ref(), subpats, expected, default_bm)
+            }
+            Pat::Record { path: p, args: fields } => {
+                self.infer_record_pat(p.as_ref(), fields, expected, default_bm, pat)
+            }
+            Pat::Path(path) => {
+                // FIXME use correct resolver for the surrounding expression
+                let resolver = self.resolver.clone();
+                self.infer_path(&resolver, &path, pat.into()).unwrap_or(Ty::Unknown)
+            }
+            Pat::Bind { mode, name: _, subpat } => {
+                let mode = if mode == &BindingAnnotation::Unannotated {
+                    default_bm
+                } else {
+                    BindingMode::convert(*mode)
+                };
+                let inner_ty = if let Some(subpat) = subpat {
+                    self.infer_pat(*subpat, expected, default_bm)
+                } else {
+                    expected.clone()
+                };
+                let inner_ty = self.insert_type_vars_shallow(inner_ty);
+                let bound_ty = match mode {
+                    BindingMode::Ref(mutability) => {
+                        Ty::apply_one(TypeCtor::Ref(mutability), inner_ty.clone())
+                    }
+                    BindingMode::Move => inner_ty.clone(),
+                };
+                let bound_ty = self.resolve_ty_as_possible(&mut vec![], bound_ty);
+                self.write_pat_ty(pat, bound_ty);
+                return inner_ty;
+            }
+            _ => Ty::Unknown,
+        };
+        // use a new type variable if we got Ty::Unknown here
+        let ty = self.insert_type_vars_shallow(ty);
+        self.unify(&ty, expected);
+        let ty = self.resolve_ty_as_possible(&mut vec![], ty);
+        self.write_pat_ty(pat, ty.clone());
+        ty
+    }
+}
diff --git a/crates/ra_hir/src/ty/infer/unify.rs b/crates/ra_hir/src/ty/infer/unify.rs
index d161aa6b3..ca33cc7f8 100644
--- a/crates/ra_hir/src/ty/infer/unify.rs
+++ b/crates/ra_hir/src/ty/infer/unify.rs
@@ -6,6 +6,7 @@ use crate::ty::{
    Canonical, InEnvironment, InferTy, ProjectionPredicate, ProjectionTy, Substs, TraitRef, Ty,
    TypeWalk,
 };
+use crate::util::make_mut_slice;
 impl<'a, D: HirDatabase> InferenceContext<'a, D> {
    pub(super) fn canonicalizer<'b>(&'b mut self) -> Canonicalizer<'a, 'b, D>
@@ -53,7 +54,9 @@ where
                    // recursive type
                    return tv.fallback_value();
                }
-                if let Some(known_ty) = self.ctx.var_unification_table.probe_value(inner).known() {
+                if let Some(known_ty) =
+                    self.ctx.var_unification_table.inlined_probe_value(inner).known()
+                {
                    self.var_stack.push(inner);
                    let result = self.do_canonicalize_ty(known_ty.clone());
                    self.var_stack.pop();
@@ -74,10 +77,11 @@ where
        })
    }
-    fn do_canonicalize_trait_ref(&mut self, trait_ref: TraitRef) -> TraitRef {
+    fn do_canonicalize_trait_ref(&mut self, mut trait_ref: TraitRef) -> TraitRef {
-        let substs =
+        for ty in make_mut_slice(&mut trait_ref.substs.0) {
-            trait_ref.substs.iter().map(|ty| self.do_canonicalize_ty(ty.clone())).collect();
+            *ty = self.do_canonicalize_ty(ty.clone());
-        TraitRef { trait_: trait_ref.trait_, substs: Substs(substs) }
+        }
+        trait_ref
    }
    fn into_canonicalized<T>(self, result: T) -> Canonicalized<T> {
@@ -87,10 +91,11 @@ where
        }
    }
-    fn do_canonicalize_projection_ty(&mut self, projection_ty: ProjectionTy) -> ProjectionTy {
+    fn do_canonicalize_projection_ty(&mut self, mut projection_ty: ProjectionTy) -> ProjectionTy {
-        let params =
+        for ty in make_mut_slice(&mut projection_ty.parameters.0) {
-            projection_ty.parameters.iter().map(|ty| self.do_canonicalize_ty(ty.clone())).collect();
+            *ty = self.do_canonicalize_ty(ty.clone());
-        ProjectionTy { associated_ty: projection_ty.associated_ty, parameters: Substs(params) }
+        }
+        projection_ty
    }
    fn do_canonicalize_projection_predicate(
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs
index 4b67c82e7..366556134 100644
--- a/crates/ra_hir/src/ty/lower.rs
+++ b/crates/ra_hir/src/ty/lower.rs
@@ -22,6 +22,7 @@ use crate::{
    resolve::{Resolver, TypeNs},
    ty::Adt,
    type_ref::{TypeBound, TypeRef},
+    util::make_mut_slice,
    BuiltinType, Const, Enum, EnumVariant, Function, ModuleDef, Path, Static, Struct, StructField,
    Trait, TypeAlias, Union,
 };
@@ -31,11 +32,11 @@ impl Ty {
        match type_ref {
            TypeRef::Never => Ty::simple(TypeCtor::Never),
            TypeRef::Tuple(inner) => {
-                let inner_tys =
+                let inner_tys: Arc<[Ty]> =
-                    inner.iter().map(|tr| Ty::from_hir(db, resolver, tr)).collect::<Vec<_>>();
+                    inner.iter().map(|tr| Ty::from_hir(db, resolver, tr)).collect();
                Ty::apply(
                    TypeCtor::Tuple { cardinality: inner_tys.len() as u16 },
-                    Substs(inner_tys.into()),
+                    Substs(inner_tys),
                )
            }
            TypeRef::Path(path) => Ty::from_hir_path(db, resolver, path),
@@ -57,9 +58,7 @@ impl Ty {
            }
            TypeRef::Placeholder => Ty::Unknown,
            TypeRef::Fn(params) => {
-                let inner_tys =
+                let sig = Substs(params.iter().map(|tr| Ty::from_hir(db, resolver, tr)).collect());
-                    params.iter().map(|tr| Ty::from_hir(db, resolver, tr)).collect::<Vec<_>>();
-                let sig = Substs(inner_tys.into());
                Ty::apply(TypeCtor::FnPtr { num_args: sig.len() as u16 - 1 }, sig)
            }
            TypeRef::DynTrait(bounds) => {
@@ -69,8 +68,8 @@ impl Ty {
                    .flat_map(|b| {
                        GenericPredicate::from_type_bound(db, resolver, b, self_ty.clone())
                    })
-                    .collect::<Vec<_>>();
+                    .collect();
-                Ty::Dyn(predicates.into())
+                Ty::Dyn(predicates)
            }
            TypeRef::ImplTrait(bounds) => {
                let self_ty = Ty::Bound(0);
@@ -79,8 +78,8 @@ impl Ty {
                    .flat_map(|b| {
                        GenericPredicate::from_type_bound(db, resolver, b, self_ty.clone())
                    })
-                    .collect::<Vec<_>>();
+                    .collect();
-                Ty::Opaque(predicates.into())
+                Ty::Opaque(predicates)
            }
            TypeRef::Error => Ty::Unknown,
        }
@@ -175,6 +174,7 @@ impl Ty {
                Ty::Param { idx, name }
            }
            TypeNs::SelfType(impl_block) => impl_block.target_ty(db),
+            TypeNs::AdtSelfType(adt) => adt.ty(db),
            TypeNs::Adt(it) => Ty::from_hir_path_inner(db, resolver, resolved_segment, it.into()),
            TypeNs::BuiltinType(it) => {
@@ -391,10 +391,7 @@ impl TraitRef {
    ) -> Self {
        let mut substs = TraitRef::substs_from_path(db, resolver, segment, resolved);
        if let Some(self_ty) = explicit_self_ty {
-            // FIXME this could be nicer
+            make_mut_slice(&mut substs.0)[0] = self_ty;
-            let mut substs_vec = substs.0.to_vec();
-            substs_vec[0] = self_ty;
-            substs.0 = substs_vec.into();
        }
        TraitRef { trait_: resolved, substs }
    }
@@ -557,13 +554,12 @@ pub(crate) fn generic_predicates_for_param_query(
    param_idx: u32,
 ) -> Arc<[GenericPredicate]> {
    let resolver = def.resolver(db);
-    let predicates = resolver
+    resolver
        .where_predicates_in_scope()
        // we have to filter out all other predicates *first*, before attempting to lower them
        .filter(|pred| Ty::from_hir_only_param(db, &resolver, &pred.type_ref) == Some(param_idx))
        .flat_map(|pred| GenericPredicate::from_where_predicate(db, &resolver, pred))
-        .collect::<Vec<_>>();
+        .collect()
-    predicates.into()
 }
 pub(crate) fn trait_env(
@@ -584,11 +580,10 @@ pub(crate) fn generic_predicates_query(
    def: GenericDef,
 ) -> Arc<[GenericPredicate]> {
    let resolver = def.resolver(db);
-    let predicates = resolver
+    resolver
        .where_predicates_in_scope()
        .flat_map(|pred| GenericPredicate::from_where_predicate(db, &resolver, pred))
-        .collect::<Vec<_>>();
+        .collect()
-    predicates.into()
 }
 /// Resolve the default type params from generics
@@ -602,9 +597,9 @@ pub(crate) fn generic_defaults_query(db: &impl HirDatabase, def: GenericDef) ->
        .map(|p| {
            p.default.as_ref().map_or(Ty::Unknown, |path| Ty::from_hir_path(db, &resolver, path))
        })
-        .collect::<Vec<_>>();
+        .collect();
-    Substs(defaults.into())
+    Substs(defaults)
 }
 fn fn_sig_for_fn(db: &impl HirDatabase, def: Function) -> FnSig {
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index 25dad81eb..c12326643 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -3,7 +3,6 @@ use std::sync::Arc;
 use insta::assert_snapshot;
-use ra_cfg::CfgOptions;
 use ra_db::{salsa::Database, FilePosition, SourceDatabase};
 use ra_syntax::{
    algo,
@@ -62,7 +61,7 @@ impl S {
 "#,
    );
    db.set_crate_graph_from_fixture(crate_graph! {
-        "main": ("/main.rs", ["foo"], CfgOptions::default().atom("test".into())),
+        "main": ("/main.rs", ["foo"], cfg = { "test" }),
        "foo": ("/foo.rs", []),
    });
    assert_eq!("(i32, {unknown}, i32, {unknown})", type_at_pos(&db, pos));
@@ -135,6 +134,25 @@ mod boxed {
 }
 #[test]
+fn infer_adt_self() {
+    let (db, pos) = MockDatabase::with_position(
+        r#"
+//- /main.rs
+enum Nat { Succ(Self), Demo(Nat), Zero }
+fn test() {
+    let foo: Nat = Nat::Zero;
+    if let Nat::Succ(x) = foo {
+        x<|>
+    }
+}
+"#,
+    );
+    assert_eq!("Nat", type_at_pos(&db, pos));
+}
+#[test]
 fn infer_try() {
    let (mut db, pos) = MockDatabase::with_position(
        r#"
diff --git a/crates/ra_hir/src/ty/traits.rs b/crates/ra_hir/src/ty/traits.rs
index b0f67ae50..0cb5c3798 100644
--- a/crates/ra_hir/src/ty/traits.rs
+++ b/crates/ra_hir/src/ty/traits.rs
@@ -89,7 +89,7 @@ pub(crate) fn impls_for_trait_query(
    }
    let crate_impl_blocks = db.impls_in_crate(krate);
    impls.extend(crate_impl_blocks.lookup_impl_blocks_for_trait(trait_));
-    impls.into_iter().collect::<Vec<_>>().into()
+    impls.into_iter().collect()
 }
 /// A set of clauses that we assume to be true. E.g. if we are inside this function:
diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs
index 2642a54bf..00aaf65d9 100644
--- a/crates/ra_hir/src/ty/traits/chalk.rs
+++ b/crates/ra_hir/src/ty/traits/chalk.rs
@@ -126,8 +126,7 @@ impl ToChalk for Substs {
                chalk_ir::Parameter(chalk_ir::ParameterKind::Ty(ty)) => from_chalk(db, ty),
                chalk_ir::Parameter(chalk_ir::ParameterKind::Lifetime(_)) => unimplemented!(),
            })
-            .collect::<Vec<_>>()
+            .collect();
-            .into();
        Substs(tys)
    }
 }
@@ -491,15 +490,16 @@ pub(crate) fn trait_datum_query(
            },
            associated_ty_ids: Vec::new(),
            where_clauses: Vec::new(),
-            flags: chalk_rust_ir::TraitFlags {
-                non_enumerable: true,
-                auto: false,
-                marker: false,
-                upstream: true,
-                fundamental: false,
-            },
        };
-        return Arc::new(TraitDatum { binders: make_binders(trait_datum_bound, 1) });
+        let flags = chalk_rust_ir::TraitFlags {
+            auto: false,
+            marker: false,
+            upstream: true,
+            fundamental: false,
+            non_enumerable: true,
+        };
+        return Arc::new(TraitDatum { binders: make_binders(trait_datum_bound, 1), flags });
    }
    let trait_: Trait = from_chalk(db, trait_id);
    debug!("trait {:?} = {:?}", trait_id, trait_.name(db));
@@ -525,8 +525,9 @@ pub(crate) fn trait_datum_query(
        .map(|type_alias| type_alias.to_chalk(db))
        .collect();
    let trait_datum_bound =
-        chalk_rust_ir::TraitDatumBound { trait_ref, where_clauses, flags, associated_ty_ids };
+        chalk_rust_ir::TraitDatumBound { trait_ref, where_clauses, associated_ty_ids };
-    let trait_datum = TraitDatum { binders: make_binders(trait_datum_bound, bound_vars.len()) };
+    let trait_datum =
+        TraitDatum { binders: make_binders(trait_datum_bound, bound_vars.len()), flags };
    Arc::new(trait_datum)
 }
@@ -632,18 +633,20 @@ fn impl_block_datum(
        })
        .collect();
-    let impl_datum_bound = chalk_rust_ir::ImplDatumBound {
+    let polarity = if negative {
-        trait_ref: if negative {
+        chalk_rust_ir::Polarity::Negative
-            chalk_rust_ir::PolarizedTraitRef::Negative(trait_ref)
+    } else {
-        } else {
+        chalk_rust_ir::Polarity::Positive
-            chalk_rust_ir::PolarizedTraitRef::Positive(trait_ref)
-        },
-        where_clauses,
-        associated_ty_values,
-        impl_type,
    };
+    let impl_datum_bound =
+        chalk_rust_ir::ImplDatumBound { trait_ref, where_clauses, associated_ty_values };
    debug!("impl_datum: {:?}", impl_datum_bound);
-    let impl_datum = ImplDatum { binders: make_binders(impl_datum_bound, bound_vars.len()) };
+    let impl_datum = ImplDatum {
+        binders: make_binders(impl_datum_bound, bound_vars.len()),
+        impl_type,
+        polarity,
+    };
    Arc::new(impl_datum)
 }
@@ -653,12 +656,15 @@ fn invalid_impl_datum() -> Arc<ImplDatum> {
        parameters: vec![chalk_ir::Ty::BoundVar(0).cast()],
    };
    let impl_datum_bound = chalk_rust_ir::ImplDatumBound {
-        trait_ref: chalk_rust_ir::PolarizedTraitRef::Positive(trait_ref),
+        trait_ref,
        where_clauses: Vec::new(),
        associated_ty_values: Vec::new(),
+    };
+    let impl_datum = ImplDatum {
+        binders: make_binders(impl_datum_bound, 1),
        impl_type: chalk_rust_ir::ImplType::External,
+        polarity: chalk_rust_ir::Polarity::Positive,
    };
-    let impl_datum = ImplDatum { binders: make_binders(impl_datum_bound, 1) };
    Arc::new(impl_datum)
 }
@@ -713,12 +719,15 @@ fn closure_fn_trait_impl_datum(
    let impl_type = chalk_rust_ir::ImplType::External;
    let impl_datum_bound = chalk_rust_ir::ImplDatumBound {
-        trait_ref: chalk_rust_ir::PolarizedTraitRef::Positive(trait_ref.to_chalk(db)),
+        trait_ref: trait_ref.to_chalk(db),
        where_clauses: Vec::new(),
        associated_ty_values: vec![output_ty_value],
+    };
+    let impl_datum = ImplDatum {
+        binders: make_binders(impl_datum_bound, num_args as usize + 1),
        impl_type,
+        polarity: chalk_rust_ir::Polarity::Positive,
    };
-    let impl_datum = ImplDatum { binders: make_binders(impl_datum_bound, num_args as usize + 1) };
    Some(Arc::new(impl_datum))
 }
diff --git a/crates/ra_hir/src/type_alias.rs b/crates/ra_hir/src/type_alias.rs
index 3b38c4740..674a46102 100644
--- a/crates/ra_hir/src/type_alias.rs
+++ b/crates/ra_hir/src/type_alias.rs
@@ -17,12 +17,14 @@ pub struct TypeAliasData {
    pub(crate) type_ref: Option<TypeRef>,
 }
-pub(crate) fn type_alias_data_query(
+impl TypeAliasData {
-    db: &(impl DefDatabase + AstDatabase),
+    pub(crate) fn type_alias_data_query(
-    typ: TypeAlias,
+        db: &(impl DefDatabase + AstDatabase),
-) -> Arc<TypeAliasData> {
+        typ: TypeAlias,
-    let node = typ.source(db).ast;
+    ) -> Arc<TypeAliasData> {
-    let name = node.name().map_or_else(Name::missing, |n| n.as_name());
+        let node = typ.source(db).ast;
-    let type_ref = node.type_ref().map(TypeRef::from_ast);
+        let name = node.name().map_or_else(Name::missing, |n| n.as_name());
-    Arc::new(TypeAliasData { name, type_ref })
+        let type_ref = node.type_ref().map(TypeRef::from_ast);
+        Arc::new(TypeAliasData { name, type_ref })
+    }
 }
diff --git a/crates/ra_hir/src/util.rs b/crates/ra_hir/src/util.rs
new file mode 100644
index 000000000..0095ee45d
--- /dev/null
+++ b/crates/ra_hir/src/util.rs
@@ -0,0 +1,12 @@
+//! Internal utility functions.
+use std::sync::Arc;
+/// Helper for mutating `Arc<[T]>` (i.e. `Arc::make_mut` for Arc slices).
+/// The underlying values are cloned if there are other strong references.
+pub(crate) fn make_mut_slice<T: Clone>(a: &mut Arc<[T]>) -> &mut [T] {
+    if Arc::get_mut(a).is_none() {
+        *a = a.iter().cloned().collect();
+    }
+    Arc::get_mut(a).unwrap()
+}
diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml
index f919a2d61..f9bf0c686 100644
--- a/crates/ra_ide_api/Cargo.toml
+++ b/crates/ra_ide_api/Cargo.toml
@@ -12,13 +12,14 @@ format-buf = "1.0.0"
 itertools = "0.8.0"
 join_to_string = "0.1.3"
 log = "0.4.5"
-relative-path = "0.4.0"
+relative-path = "1.0.0"
 rayon = "1.0.2"
 fst = { version = "0.3.1", default-features = false }
 rustc-hash = "1.0"
 unicase = "2.2.0"
 superslice = "1.0.0"
 rand = { version = "0.7.0", features = ["small_rng"] }
+once_cell = "1.2.0"
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
index 09913787b..050249c0e 100644
--- a/crates/ra_ide_api/src/change.rs
+++ b/crates/ra_ide_api/src/change.rs
@@ -4,7 +4,7 @@ use std::{fmt, sync::Arc, time};
 use ra_db::{
    salsa::{Database, Durability, SweepStrategy},
-    CrateGraph, CrateId, FileId, SourceDatabase, SourceRoot, SourceRootId,
+    CrateGraph, CrateId, FileId, SourceDatabase, SourceDatabaseExt, SourceRoot, SourceRootId,
 };
 use ra_prof::{memory_usage, profile, Bytes};
 use ra_syntax::SourceFile;
diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index 28c8324d0..b4df6ee2a 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -119,27 +119,28 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "foo",
+                label: "foo()",
-       ⋮        source_range: [187; 187),
+                source_range: [187; 187),
-       ⋮        delete: [187; 187),
+                delete: [187; 187),
-       ⋮        insert: "foo()$0",
+                insert: "foo()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn foo(self)",
+                lookup: "foo",
-       ⋮    },
+                detail: "fn foo(self)",
-       ⋮    CompletionItem {
+            },
-       ⋮        label: "the_field",
+            CompletionItem {
-       ⋮        source_range: [187; 187),
+                label: "the_field",
-       ⋮        delete: [187; 187),
+                source_range: [187; 187),
-       ⋮        insert: "the_field",
+                delete: [187; 187),
-       ⋮        kind: Field,
+                insert: "the_field",
-       ⋮        detail: "(u32,)",
+                kind: Field,
-       ⋮        documentation: Documentation(
+                detail: "(u32,)",
-       ⋮            "This is the_field",
+                documentation: Documentation(
-       ⋮        ),
+                    "This is the_field",
-       ⋮    },
+                ),
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -158,24 +159,25 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "foo",
+                label: "foo()",
-       ⋮        source_range: [126; 126),
+                source_range: [126; 126),
-       ⋮        delete: [126; 126),
+                delete: [126; 126),
-       ⋮        insert: "foo()$0",
+                insert: "foo()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn foo(&self)",
+                lookup: "foo",
-       ⋮    },
+                detail: "fn foo(&self)",
-       ⋮    CompletionItem {
+            },
-       ⋮        label: "the_field",
+            CompletionItem {
-       ⋮        source_range: [126; 126),
+                label: "the_field",
-       ⋮        delete: [126; 126),
+                source_range: [126; 126),
-       ⋮        insert: "the_field",
+                delete: [126; 126),
-       ⋮        kind: Field,
+                insert: "the_field",
-       ⋮        detail: "(u32, i32)",
+                kind: Field,
-       ⋮    },
+                detail: "(u32, i32)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -210,16 +212,17 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "the_method",
+                label: "the_method()",
-       ⋮        source_range: [144; 144),
+                source_range: [144; 144),
-       ⋮        delete: [144; 144),
+                delete: [144; 144),
-       ⋮        insert: "the_method()$0",
+                insert: "the_method()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn the_method(&self)",
+                lookup: "the_method",
-       ⋮    },
+                detail: "fn the_method(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -238,16 +241,17 @@ mod tests {
            ",
            ),
            @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "the_method",
+                label: "the_method()",
-       ⋮        source_range: [151; 151),
+                source_range: [151; 151),
-       ⋮        delete: [151; 151),
+                delete: [151; 151),
-       ⋮        insert: "the_method()$0",
+                insert: "the_method()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn the_method(&self)",
+                lookup: "the_method",
-       ⋮    },
+                detail: "fn the_method(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -266,16 +270,17 @@ mod tests {
            ",
            ),
            @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "the_method",
+                label: "the_method()",
-       ⋮        source_range: [155; 155),
+                source_range: [155; 155),
-       ⋮        delete: [155; 155),
+                delete: [155; 155),
-       ⋮        insert: "the_method()$0",
+                insert: "the_method()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn the_method(&self)",
+                lookup: "the_method",
-       ⋮    },
+                detail: "fn the_method(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -317,16 +322,17 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "the_method",
+                label: "the_method()",
-       ⋮        source_range: [249; 249),
+                source_range: [249; 249),
-       ⋮        delete: [249; 249),
+                delete: [249; 249),
-       ⋮        insert: "the_method()$0",
+                insert: "the_method()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "fn the_method(&self)",
+                lookup: "the_method",
-       ⋮    },
+                detail: "fn the_method(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
@@ -386,16 +392,17 @@ mod tests {
            ",
        ),
        @r###"
-       ⋮[
+        [
-       ⋮    CompletionItem {
+            CompletionItem {
-       ⋮        label: "blah",
+                label: "blah()",
-       ⋮        source_range: [299; 300),
+                source_range: [299; 300),
-       ⋮        delete: [299; 300),
+                delete: [299; 300),
-       ⋮        insert: "blah()$0",
+                insert: "blah()$0",
-       ⋮        kind: Method,
+                kind: Method,
-       ⋮        detail: "pub fn blah(&self)",
+                lookup: "blah",
-       ⋮    },
+                detail: "pub fn blah(&self)",
-       ⋮]
+            },
+        ]
        "###
        );
    }
diff --git a/crates/ra_ide_api/src/completion/complete_macro_in_item_position.rs b/crates/ra_ide_api/src/completion/complete_macro_in_item_position.rs
index d808b2357..09f743c66 100644
--- a/crates/ra_ide_api/src/completion/complete_macro_in_item_position.rs
+++ b/crates/ra_ide_api/src/completion/complete_macro_in_item_position.rs
@@ -56,6 +56,16 @@ mod tests {
            do_reference_completion(
                "
                //- /main.rs
+                /// Creates a [`Vec`] containing the arguments.
+                ///
+                /// - Create a [`Vec`] containing a given list of elements:
+                ///
+                /// ```
+                /// let v = vec![1, 2, 3];
+                /// assert_eq!(v[0], 1);
+                /// assert_eq!(v[1], 2);
+                /// assert_eq!(v[2], 3);
+                /// ```
                macro_rules! vec {
                    () => {}
                }
@@ -68,13 +78,61 @@ mod tests {
            @r##"[
    CompletionItem {
        label: "vec!",
-        source_range: [46; 46),
+        source_range: [280; 280),
-        delete: [46; 46),
+        delete: [280; 280),
        insert: "vec![$0]",
        kind: Macro,
        detail: "macro_rules! vec",
+        documentation: Documentation(
+            "Creates a [`Vec`] containing the arguments.\n\n- Create a [`Vec`] containing a given list of elements:\n\n```\nlet v = vec![1, 2, 3];\nassert_eq!(v[0], 1);\nassert_eq!(v[1], 2);\nassert_eq!(v[2], 3);\n```",
+        ),
    },
 ]"##
        );
    }
+    #[test]
+    fn completes_macros_braces_guessing() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                "
+                //- /main.rs
+                /// Foo
+                ///
+                /// Not call `fooo!()` `fooo!()`, or `_foo![]` `_foo![]`.
+                /// Call as `let _=foo!  { hello world };`
+                macro_rules! foo {
+                    () => {}
+                }
+                fn main() {
+                    <|>
+                }
+                "
+            ),
+            @r###"[
+    CompletionItem {
+        label: "foo!",
+        source_range: [163; 163),
+        delete: [163; 163),
+        insert: "foo! {$0}",
+        kind: Macro,
+        detail: "macro_rules! foo",
+        documentation: Documentation(
+            "Foo\n\nNot call `fooo!()` `fooo!()`, or `_foo![]` `_foo![]`.\nCall as `let _=foo!  { hello world };`",
+        ),
+    },
+    CompletionItem {
+        label: "main()",
+        source_range: [163; 163),
+        delete: [163; 163),
+        insert: "main()$0",
+        kind: Function,
+        lookup: "main",
+        detail: "fn main()",
+    },
+]
+        "###
+        );
+    }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index e01197fe4..23dece73c 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -375,19 +375,22 @@ mod tests {
                fn foo() { let _ = S::<|> }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "m",
+            CompletionItem {
-        source_range: [100; 100),
+                label: "m()",
-        delete: [100; 100),
+                source_range: [100; 100),
-        insert: "m()$0",
+                delete: [100; 100),
-        kind: Function,
+                insert: "m()$0",
-        detail: "fn m()",
+                kind: Function,
-        documentation: Documentation(
+                lookup: "m",
-            "An associated method",
+                detail: "fn m()",
-        ),
+                documentation: Documentation(
-    },
+                    "An associated method",
-]"###
+                ),
+            },
+        ]
+        "###
        );
    }
@@ -474,19 +477,22 @@ mod tests {
                fn foo() { let _ = S::<|> }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "m",
+            CompletionItem {
-        source_range: [100; 100),
+                label: "m()",
-        delete: [100; 100),
+                source_range: [100; 100),
-        insert: "m()$0",
+                delete: [100; 100),
-        kind: Function,
+                insert: "m()$0",
-        detail: "fn m()",
+                kind: Function,
-        documentation: Documentation(
+                lookup: "m",
-            "An associated method",
+                detail: "fn m()",
-        ),
+                documentation: Documentation(
-    },
+                    "An associated method",
-]"###
+                ),
+            },
+        ]
+        "###
        );
    }
@@ -507,19 +513,22 @@ mod tests {
                fn foo() { let _ = U::<|> }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "m",
+            CompletionItem {
-        source_range: [101; 101),
+                label: "m()",
-        delete: [101; 101),
+                source_range: [101; 101),
-        insert: "m()$0",
+                delete: [101; 101),
-        kind: Function,
+                insert: "m()$0",
-        detail: "fn m()",
+                kind: Function,
-        documentation: Documentation(
+                lookup: "m",
-            "An associated method",
+                detail: "fn m()",
-        ),
+                documentation: Documentation(
-    },
+                    "An associated method",
-]"###
+                ),
+            },
+        ]
+        "###
        );
    }
@@ -564,24 +573,28 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "bar",
+            CompletionItem {
-        source_range: [185; 185),
+                label: "bar()",
-        delete: [185; 185),
+                source_range: [185; 185),
-        insert: "bar()$0",
+                delete: [185; 185),
-        kind: Function,
+                insert: "bar()$0",
-        detail: "fn bar()",
+                kind: Function,
-    },
+                lookup: "bar",
-    CompletionItem {
+                detail: "fn bar()",
-        label: "foo",
+            },
-        source_range: [185; 185),
+            CompletionItem {
-        delete: [185; 185),
+                label: "foo()",
-        insert: "foo()$0",
+                source_range: [185; 185),
-        kind: Function,
+                delete: [185; 185),
-        detail: "fn foo()",
+                insert: "foo()$0",
-    },
+                kind: Function,
-]"###
+                lookup: "foo",
+                detail: "fn foo()",
+            },
+        ]
+        "###
        );
    }
@@ -600,24 +613,27 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "foo!",
+            CompletionItem {
-        source_range: [179; 179),
+                label: "foo!",
-        delete: [179; 179),
+                source_range: [179; 179),
-        insert: "foo!($0)",
+                delete: [179; 179),
-        kind: Macro,
+                insert: "foo!($0)",
-        detail: "#[macro_export]\nmacro_rules! foo",
+                kind: Macro,
-    },
+                detail: "#[macro_export]\nmacro_rules! foo",
-    CompletionItem {
+            },
-        label: "main",
+            CompletionItem {
-        source_range: [179; 179),
+                label: "main()",
-        delete: [179; 179),
+                source_range: [179; 179),
-        insert: "main()$0",
+                delete: [179; 179),
-        kind: Function,
+                insert: "main()$0",
-        detail: "fn main()",
+                kind: Function,
-    },
+                lookup: "main",
-]"###
+                detail: "fn main()",
+            },
+        ]
+        "###
        );
    }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_postfix.rs b/crates/ra_ide_api/src/completion/complete_postfix.rs
index 445a02676..555cecb73 100644
--- a/crates/ra_ide_api/src/completion/complete_postfix.rs
+++ b/crates/ra_ide_api/src/completion/complete_postfix.rs
@@ -8,7 +8,7 @@ use crate::{
    CompletionItem,
 };
 use hir::{Ty, TypeCtor};
-use ra_syntax::{ast::AstNode, TextRange};
+use ra_syntax::{ast::AstNode, TextRange, TextUnit};
 use ra_text_edit::TextEditBuilder;
 fn postfix_snippet(ctx: &CompletionContext, label: &str, detail: &str, snippet: &str) -> Builder {
@@ -42,7 +42,13 @@ fn is_bool_or_unknown(ty: Option<Ty>) -> bool {
 pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
    if let Some(dot_receiver) = &ctx.dot_receiver {
-        let receiver_text = dot_receiver.syntax().text().to_string();
+        let receiver_text = if ctx.dot_receiver_is_ambiguous_float_literal {
+            let text = dot_receiver.syntax().text();
+            let without_dot = ..text.len() - TextUnit::of_char('.');
+            text.slice(without_dot).to_string()
+        } else {
+            dot_receiver.syntax().text().to_string()
+        };
        let receiver_ty = ctx.analyzer.type_of(ctx.db, &dot_receiver);
        if is_bool_or_unknown(receiver_ty) {
            postfix_snippet(ctx, "if", "if expr {}", &format!("if {} {{$0}}", receiver_text))
@@ -209,4 +215,61 @@ mod tests {
 ]"###
        );
    }
+    #[test]
+    fn postfix_completion_works_for_ambiguous_float_literal() {
+        assert_debug_snapshot!(
+            do_postfix_completion(
+                r#"
+                fn main() {
+                    42.<|>
+                }
+                "#,
+            ),
+            @r###"[
+    CompletionItem {
+        label: "box",
+        source_range: [52; 52),
+        delete: [49; 52),
+        insert: "Box::new(42)",
+        detail: "Box::new(expr)",
+    },
+    CompletionItem {
+        label: "dbg",
+        source_range: [52; 52),
+        delete: [49; 52),
+        insert: "dbg!(42)",
+        detail: "dbg!(expr)",
+    },
+    CompletionItem {
+        label: "match",
+        source_range: [52; 52),
+        delete: [49; 52),
+        insert: "match 42 {\n    ${1:_} => {$0\\},\n}",
+        detail: "match expr {}",
+    },
+    CompletionItem {
+        label: "not",
+        source_range: [52; 52),
+        delete: [49; 52),
+        insert: "!42",
+        detail: "!expr",
+    },
+    CompletionItem {
+        label: "ref",
+        source_range: [52; 52),
+        delete: [49; 52),
+        insert: "&42",
+        detail: "&expr",
+    },
+    CompletionItem {
+        label: "refm",
+        source_range: [52; 52),
+        delete: [49; 52),
+        insert: "&mut 42",
+        detail: "&mut expr",
+    },
+]"###
+        );
+    }
 }
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 515a6285c..4e56de3f5 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -145,32 +145,35 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "quux",
+            CompletionItem {
-        source_range: [91; 91),
+                label: "quux(…)",
-        delete: [91; 91),
+                source_range: [91; 91),
-        insert: "quux($0)",
+                delete: [91; 91),
-        kind: Function,
+                insert: "quux($0)",
-        detail: "fn quux(x: i32)",
+                kind: Function,
-    },
+                lookup: "quux",
-    CompletionItem {
+                detail: "fn quux(x: i32)",
-        label: "x",
+            },
-        source_range: [91; 91),
+            CompletionItem {
-        delete: [91; 91),
+                label: "x",
-        insert: "x",
+                source_range: [91; 91),
-        kind: Binding,
+                delete: [91; 91),
-        detail: "i32",
+                insert: "x",
-    },
+                kind: Binding,
-    CompletionItem {
+                detail: "i32",
-        label: "y",
+            },
-        source_range: [91; 91),
+            CompletionItem {
-        delete: [91; 91),
+                label: "y",
-        insert: "y",
+                source_range: [91; 91),
-        kind: Binding,
+                delete: [91; 91),
-        detail: "i32",
+                insert: "y",
-    },
+                kind: Binding,
-]"###
+                detail: "i32",
+            },
+        ]
+        "###
        );
    }
@@ -190,31 +193,34 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "a",
+            CompletionItem {
-        source_range: [242; 242),
+                label: "a",
-        delete: [242; 242),
+                source_range: [242; 242),
-        insert: "a",
+                delete: [242; 242),
-        kind: Binding,
+                insert: "a",
-    },
+                kind: Binding,
-    CompletionItem {
+            },
-        label: "b",
+            CompletionItem {
-        source_range: [242; 242),
+                label: "b",
-        delete: [242; 242),
+                source_range: [242; 242),
-        insert: "b",
+                delete: [242; 242),
-        kind: Binding,
+                insert: "b",
-        detail: "i32",
+                kind: Binding,
-    },
+                detail: "i32",
-    CompletionItem {
+            },
-        label: "quux",
+            CompletionItem {
-        source_range: [242; 242),
+                label: "quux()",
-        delete: [242; 242),
+                source_range: [242; 242),
-        insert: "quux()$0",
+                delete: [242; 242),
-        kind: Function,
+                insert: "quux()$0",
-        detail: "fn quux()",
+                kind: Function,
-    },
+                lookup: "quux",
-]"###
+                detail: "fn quux()",
+            },
+        ]
+        "###
        );
    }
@@ -230,23 +236,26 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "quux",
+            CompletionItem {
-        source_range: [95; 95),
+                label: "quux()",
-        delete: [95; 95),
+                source_range: [95; 95),
-        insert: "quux()$0",
+                delete: [95; 95),
-        kind: Function,
+                insert: "quux()$0",
-        detail: "fn quux()",
+                kind: Function,
-    },
+                lookup: "quux",
-    CompletionItem {
+                detail: "fn quux()",
-        label: "x",
+            },
-        source_range: [95; 95),
+            CompletionItem {
-        delete: [95; 95),
+                label: "x",
-        insert: "x",
+                source_range: [95; 95),
-        kind: Binding,
+                delete: [95; 95),
-    },
+                insert: "x",
-]"###
+                kind: Binding,
+            },
+        ]
+        "###
        );
    }
@@ -260,23 +269,26 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "T",
+            CompletionItem {
-        source_range: [52; 52),
+                label: "T",
-        delete: [52; 52),
+                source_range: [52; 52),
-        insert: "T",
+                delete: [52; 52),
-        kind: TypeParam,
+                insert: "T",
-    },
+                kind: TypeParam,
-    CompletionItem {
+            },
-        label: "quux",
+            CompletionItem {
-        source_range: [52; 52),
+                label: "quux()",
-        delete: [52; 52),
+                source_range: [52; 52),
-        insert: "quux()$0",
+                delete: [52; 52),
-        kind: Function,
+                insert: "quux()$0",
-        detail: "fn quux<T>()",
+                kind: Function,
-    },
+                lookup: "quux",
-]"###
+                detail: "fn quux<T>()",
+            },
+        ]
+        "###
        );
    }
@@ -290,22 +302,56 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "T",
+            CompletionItem {
-        source_range: [54; 54),
+                label: "T",
-        delete: [54; 54),
+                source_range: [54; 54),
-        insert: "T",
+                delete: [54; 54),
-        kind: TypeParam,
+                insert: "T",
-    },
+                kind: TypeParam,
-    CompletionItem {
+            },
-        label: "X",
+            CompletionItem {
-        source_range: [54; 54),
+                label: "X<…>",
-        delete: [54; 54),
+                source_range: [54; 54),
-        insert: "X",
+                delete: [54; 54),
-        kind: Struct,
+                insert: "X<$0>",
-    },
+                kind: Struct,
-]"###
+                lookup: "X",
+            },
+        ]
+        "###
+        );
+    }
+    #[test]
+    fn completes_self_in_enum() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                enum X {
+                    Y(<|>)
+                }
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Self",
+                source_range: [48; 48),
+                delete: [48; 48),
+                insert: "Self",
+                kind: TypeParam,
+            },
+            CompletionItem {
+                label: "X",
+                source_range: [48; 48),
+                delete: [48; 48),
+                insert: "X",
+                kind: Enum,
+            },
+        ]
+        "###
        );
    }
@@ -321,30 +367,33 @@ mod tests {
                }
                "
        ),
-        @r###"[
+        @r###"
-    CompletionItem {
+        [
-        label: "Baz",
+            CompletionItem {
-        source_range: [105; 105),
+                label: "Baz",
-        delete: [105; 105),
+                source_range: [105; 105),
-        insert: "Baz",
+                delete: [105; 105),
-        kind: Enum,
+                insert: "Baz",
-    },
+                kind: Enum,
-    CompletionItem {
+            },
-        label: "Foo",
+            CompletionItem {
-        source_range: [105; 105),
+                label: "Foo",
-        delete: [105; 105),
+                source_range: [105; 105),
-        insert: "Foo",
+                delete: [105; 105),
-        kind: Struct,
+                insert: "Foo",
-    },
+                kind: Struct,
-    CompletionItem {
+            },
-        label: "quux",
+            CompletionItem {
-        source_range: [105; 105),
+                label: "quux()",
-        delete: [105; 105),
+                source_range: [105; 105),
-        insert: "quux()$0",
+                delete: [105; 105),
-        kind: Function,
+                insert: "quux()$0",
-        detail: "fn quux()",
+                kind: Function,
-    },
+                lookup: "quux",
-]"###
+                detail: "fn quux()",
+            },
+        ]
+        "###
            );
    }
@@ -384,23 +433,26 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "Bar",
+            CompletionItem {
-        source_range: [117; 117),
+                label: "Bar",
-        delete: [117; 117),
+                source_range: [117; 117),
-        insert: "Bar",
+                delete: [117; 117),
-        kind: Struct,
+                insert: "Bar",
-    },
+                kind: Struct,
-    CompletionItem {
+            },
-        label: "quux",
+            CompletionItem {
-        source_range: [117; 117),
+                label: "quux()",
-        delete: [117; 117),
+                source_range: [117; 117),
-        insert: "quux()$0",
+                delete: [117; 117),
-        kind: Function,
+                insert: "quux()$0",
-        detail: "fn quux()",
+                kind: Function,
-    },
+                lookup: "quux",
-]"###
+                detail: "fn quux()",
+            },
+        ]
+        "###
        );
    }
@@ -413,23 +465,26 @@ mod tests {
                fn x() -> <|>
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "Foo",
+            CompletionItem {
-        source_range: [55; 55),
+                label: "Foo",
-        delete: [55; 55),
+                source_range: [55; 55),
-        insert: "Foo",
+                delete: [55; 55),
-        kind: Struct,
+                insert: "Foo",
-    },
+                kind: Struct,
-    CompletionItem {
+            },
-        label: "x",
+            CompletionItem {
-        source_range: [55; 55),
+                label: "x()",
-        delete: [55; 55),
+                source_range: [55; 55),
-        insert: "x()$0",
+                delete: [55; 55),
-        kind: Function,
+                insert: "x()$0",
-        detail: "fn x()",
+                kind: Function,
-    },
+                lookup: "x",
-]"###
+                detail: "fn x()",
+            },
+        ]
+        "###
        );
    }
@@ -447,24 +502,27 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "bar",
+            CompletionItem {
-        source_range: [146; 146),
+                label: "bar",
-        delete: [146; 146),
+                source_range: [146; 146),
-        insert: "bar",
+                delete: [146; 146),
-        kind: Binding,
+                insert: "bar",
-        detail: "i32",
+                kind: Binding,
-    },
+                detail: "i32",
-    CompletionItem {
+            },
-        label: "foo",
+            CompletionItem {
-        source_range: [146; 146),
+                label: "foo()",
-        delete: [146; 146),
+                source_range: [146; 146),
-        insert: "foo()$0",
+                delete: [146; 146),
-        kind: Function,
+                insert: "foo()$0",
-        detail: "fn foo()",
+                kind: Function,
-    },
+                lookup: "foo",
-]"###
+                detail: "fn foo()",
+            },
+        ]
+        "###
        );
    }
@@ -509,30 +567,33 @@ mod tests {
                }
                "
            ),
-            @r#"[
+            @r###"
-    CompletionItem {
+        [
-        label: "Option",
+            CompletionItem {
-        source_range: [18; 18),
+                label: "Option",
-        delete: [18; 18),
+                source_range: [18; 18),
-        insert: "Option",
+                delete: [18; 18),
-        kind: Struct,
+                insert: "Option",
-    },
+                kind: Struct,
-    CompletionItem {
+            },
-        label: "foo",
+            CompletionItem {
-        source_range: [18; 18),
+                label: "foo()",
-        delete: [18; 18),
+                source_range: [18; 18),
-        insert: "foo()$0",
+                delete: [18; 18),
-        kind: Function,
+                insert: "foo()$0",
-        detail: "fn foo()",
+                kind: Function,
-    },
+                lookup: "foo",
-    CompletionItem {
+                detail: "fn foo()",
-        label: "std",
+            },
-        source_range: [18; 18),
+            CompletionItem {
-        delete: [18; 18),
+                label: "std",
-        insert: "std",
+                source_range: [18; 18),
-        kind: Module,
+                delete: [18; 18),
-    },
+                insert: "std",
-]"#
+                kind: Module,
+            },
+        ]
+        "###
        );
    }
@@ -569,54 +630,57 @@ mod tests {
                }
                "
            ),
-            @r##"[
+            @r###"
-    CompletionItem {
+        [
-        label: "bar!",
+            CompletionItem {
-        source_range: [252; 252),
+                label: "bar!",
-        delete: [252; 252),
+                source_range: [252; 252),
-        insert: "bar!($0)",
+                delete: [252; 252),
-        kind: Macro,
+                insert: "bar!($0)",
-        detail: "macro_rules! bar",
+                kind: Macro,
-    },
+                detail: "macro_rules! bar",
-    CompletionItem {
+            },
-        label: "baz!",
+            CompletionItem {
-        source_range: [252; 252),
+                label: "baz!",
-        delete: [252; 252),
+                source_range: [252; 252),
-        insert: "baz!($0)",
+                delete: [252; 252),
-        kind: Macro,
+                insert: "baz!($0)",
-        detail: "#[macro_export]\nmacro_rules! baz",
+                kind: Macro,
-    },
+                detail: "#[macro_export]\nmacro_rules! baz",
-    CompletionItem {
+            },
-        label: "foo!",
+            CompletionItem {
-        source_range: [252; 252),
+                label: "foo!",
-        delete: [252; 252),
+                source_range: [252; 252),
-        insert: "foo!($0)",
+                delete: [252; 252),
-        kind: Macro,
+                insert: "foo!($0)",
-        detail: "macro_rules! foo",
+                kind: Macro,
-    },
+                detail: "macro_rules! foo",
-    CompletionItem {
+            },
-        label: "m1",
+            CompletionItem {
-        source_range: [252; 252),
+                label: "m1",
-        delete: [252; 252),
+                source_range: [252; 252),
-        insert: "m1",
+                delete: [252; 252),
-        kind: Module,
+                insert: "m1",
-    },
+                kind: Module,
-    CompletionItem {
+            },
-        label: "m2",
+            CompletionItem {
-        source_range: [252; 252),
+                label: "m2",
-        delete: [252; 252),
+                source_range: [252; 252),
-        insert: "m2",
+                delete: [252; 252),
-        kind: Module,
+                insert: "m2",
-    },
+                kind: Module,
-    CompletionItem {
+            },
-        label: "main",
+            CompletionItem {
-        source_range: [252; 252),
+                label: "main()",
-        delete: [252; 252),
+                source_range: [252; 252),
-        insert: "main()$0",
+                delete: [252; 252),
-        kind: Function,
+                insert: "main()$0",
-        detail: "fn main()",
+                kind: Function,
-    },
+                lookup: "main",
-]"##
+                detail: "fn main()",
+            },
+        ]
+        "###
        );
    }
@@ -635,24 +699,27 @@ mod tests {
                }
                "
            ),
-            @r##"[
+            @r###"
-    CompletionItem {
+        [
-        label: "foo",
+            CompletionItem {
-        source_range: [49; 49),
+                label: "foo!",
-        delete: [49; 49),
+                source_range: [49; 49),
-        insert: "foo()$0",
+                delete: [49; 49),
-        kind: Function,
+                insert: "foo!($0)",
-        detail: "fn foo()",
+                kind: Macro,
-    },
+                detail: "macro_rules! foo",
-    CompletionItem {
+            },
-        label: "foo!",
+            CompletionItem {
-        source_range: [49; 49),
+                label: "foo()",
-        delete: [49; 49),
+                source_range: [49; 49),
-        insert: "foo!($0)",
+                delete: [49; 49),
-        kind: Macro,
+                insert: "foo()$0",
-        detail: "macro_rules! foo",
+                kind: Function,
-    },
+                lookup: "foo",
-]"##
+                detail: "fn foo()",
+            },
+        ]
+        "###
        );
    }
@@ -671,24 +738,27 @@ mod tests {
                }
                "
            ),
-            @r##"[
+            @r###"
-    CompletionItem {
+        [
-        label: "foo!",
+            CompletionItem {
-        source_range: [57; 57),
+                label: "foo!",
-        delete: [57; 57),
+                source_range: [57; 57),
-        insert: "foo!($0)",
+                delete: [57; 57),
-        kind: Macro,
+                insert: "foo!($0)",
-        detail: "macro_rules! foo",
+                kind: Macro,
-    },
+                detail: "macro_rules! foo",
-    CompletionItem {
+            },
-        label: "main",
+            CompletionItem {
-        source_range: [57; 57),
+                label: "main()",
-        delete: [57; 57),
+                source_range: [57; 57),
-        insert: "main()$0",
+                delete: [57; 57),
-        kind: Function,
+                insert: "main()$0",
-        detail: "fn main()",
+                kind: Function,
-    },
+                lookup: "main",
-]"##
+                detail: "fn main()",
+            },
+        ]
+        "###
        );
    }
@@ -707,24 +777,27 @@ mod tests {
                }
                "
            ),
-            @r##"[
+            @r###"
-    CompletionItem {
+        [
-        label: "foo!",
+            CompletionItem {
-        source_range: [50; 50),
+                label: "foo!",
-        delete: [50; 50),
+                source_range: [50; 50),
-        insert: "foo!($0)",
+                delete: [50; 50),
-        kind: Macro,
+                insert: "foo!($0)",
-        detail: "macro_rules! foo",
+                kind: Macro,
-    },
+                detail: "macro_rules! foo",
-    CompletionItem {
+            },
-        label: "main",
+            CompletionItem {
-        source_range: [50; 50),
+                label: "main()",
-        delete: [50; 50),
+                source_range: [50; 50),
-        insert: "main()$0",
+                delete: [50; 50),
-        kind: Function,
+                insert: "main()$0",
-        detail: "fn main()",
+                kind: Function,
-    },
+                lookup: "main",
-]"##
+                detail: "fn main()",
+            },
+        ]
+        "###
        );
    }
 }
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs
index e9ad06965..64cbc0f98 100644
--- a/crates/ra_ide_api/src/completion/completion_context.rs
+++ b/crates/ra_ide_api/src/completion/completion_context.rs
@@ -38,8 +38,11 @@ pub(crate) struct CompletionContext<'a> {
    pub(super) is_new_item: bool,
    /// The receiver if this is a field or method access, i.e. writing something.<|>
    pub(super) dot_receiver: Option<ast::Expr>,
+    pub(super) dot_receiver_is_ambiguous_float_literal: bool,
    /// If this is a call (method or function) in particular, i.e. the () are already there.
    pub(super) is_call: bool,
+    pub(super) is_path_type: bool,
+    pub(super) has_type_args: bool,
 }
 impl<'a> CompletionContext<'a> {
@@ -76,6 +79,9 @@ impl<'a> CompletionContext<'a> {
            is_new_item: false,
            dot_receiver: None,
            is_call: false,
+            is_path_type: false,
+            has_type_args: false,
+            dot_receiver_is_ambiguous_float_literal: false,
        };
        ctx.fill(&original_parse, position.offset);
        Some(ctx)
@@ -176,6 +182,9 @@ impl<'a> CompletionContext<'a> {
                .and_then(|it| it.syntax().parent().and_then(ast::CallExpr::cast))
                .is_some();
+            self.is_path_type = path.syntax().parent().and_then(ast::PathType::cast).is_some();
+            self.has_type_args = segment.type_arg_list().is_some();
            if let Some(mut path) = hir::Path::from_ast(path.clone()) {
                if !path.is_ident() {
                    path.segments.pop().unwrap();
@@ -228,6 +237,16 @@ impl<'a> CompletionContext<'a> {
                .expr()
                .map(|e| e.syntax().text_range())
                .and_then(|r| find_node_with_range(original_file.syntax(), r));
+            self.dot_receiver_is_ambiguous_float_literal = if let Some(ast::Expr::Literal(l)) =
+                &self.dot_receiver
+            {
+                match l.kind() {
+                    ast::LiteralKind::FloatNumber { suffix: _ } => l.token().text().ends_with('.'),
+                    _ => false,
+                }
+            } else {
+                false
+            }
        }
        if let Some(method_call_expr) = ast::MethodCallExpr::cast(parent) {
            // As above
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index b1f0390ec..3e6933bc1 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -216,6 +216,10 @@ impl Builder {
        self.lookup = Some(lookup.into());
        self
    }
+    pub(crate) fn label(mut self, label: impl Into<String>) -> Builder {
+        self.label = label.into();
+        self
+    }
    pub(crate) fn insert_text(mut self, insert_text: impl Into<String>) -> Builder {
        self.insert_text = Some(insert_text.into());
        self
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 48028a2f9..aed4ce6d4 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -1,12 +1,12 @@
 //! This modules takes care of rendering various definitions as completion items.
-use hir::{Docs, HasSource, HirDisplay, ScopeDef, Ty, TypeWalk};
+use hir::{db::HirDatabase, Docs, HasSource, HirDisplay, ScopeDef, Ty, TypeWalk};
 use join_to_string::join;
 use ra_syntax::ast::NameOwner;
 use test_utils::tested_by;
 use crate::completion::{
-    CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions,
+    db, CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions,
 };
 use crate::display::{const_label, function_label, macro_label, type_label};
@@ -44,54 +44,56 @@ impl Completions {
    ) {
        use hir::ModuleDef::*;
-        let mut completion_kind = CompletionKind::Reference;
+        let completion_kind = match resolution {
-        let (kind, docs) = match resolution {
+            ScopeDef::ModuleDef(BuiltinType(..)) => CompletionKind::BuiltinType,
-            ScopeDef::ModuleDef(Module(it)) => (CompletionItemKind::Module, it.docs(ctx.db)),
+            _ => CompletionKind::Reference,
+        };
+        let kind = match resolution {
+            ScopeDef::ModuleDef(Module(..)) => CompletionItemKind::Module,
            ScopeDef::ModuleDef(Function(func)) => {
                return self.add_function_with_name(ctx, Some(local_name), *func);
            }
-            ScopeDef::ModuleDef(Adt(hir::Adt::Struct(it))) => {
+            ScopeDef::ModuleDef(Adt(hir::Adt::Struct(_))) => CompletionItemKind::Struct,
-                (CompletionItemKind::Struct, it.docs(ctx.db))
+            // FIXME: add CompletionItemKind::Union
-            }
+            ScopeDef::ModuleDef(Adt(hir::Adt::Union(_))) => CompletionItemKind::Struct,
-            ScopeDef::ModuleDef(Adt(hir::Adt::Union(it))) => {
+            ScopeDef::ModuleDef(Adt(hir::Adt::Enum(_))) => CompletionItemKind::Enum,
-                (CompletionItemKind::Struct, it.docs(ctx.db))
-            }
+            ScopeDef::ModuleDef(EnumVariant(..)) => CompletionItemKind::EnumVariant,
-            ScopeDef::ModuleDef(Adt(hir::Adt::Enum(it))) => {
+            ScopeDef::ModuleDef(Const(..)) => CompletionItemKind::Const,
-                (CompletionItemKind::Enum, it.docs(ctx.db))
+            ScopeDef::ModuleDef(Static(..)) => CompletionItemKind::Static,
-            }
+            ScopeDef::ModuleDef(Trait(..)) => CompletionItemKind::Trait,
-            ScopeDef::ModuleDef(EnumVariant(it)) => {
+            ScopeDef::ModuleDef(TypeAlias(..)) => CompletionItemKind::TypeAlias,
-                (CompletionItemKind::EnumVariant, it.docs(ctx.db))
+            ScopeDef::ModuleDef(BuiltinType(..)) => CompletionItemKind::BuiltinType,
-            }
+            ScopeDef::GenericParam(..) => CompletionItemKind::TypeParam,
-            ScopeDef::ModuleDef(Const(it)) => (CompletionItemKind::Const, it.docs(ctx.db)),
+            ScopeDef::LocalBinding(..) => CompletionItemKind::Binding,
-            ScopeDef::ModuleDef(Static(it)) => (CompletionItemKind::Static, it.docs(ctx.db)),
+            // (does this need its own kind?)
-            ScopeDef::ModuleDef(Trait(it)) => (CompletionItemKind::Trait, it.docs(ctx.db)),
+            ScopeDef::AdtSelfType(..) | ScopeDef::ImplSelfType(..) => CompletionItemKind::TypeParam,
-            ScopeDef::ModuleDef(TypeAlias(it)) => (CompletionItemKind::TypeAlias, it.docs(ctx.db)),
-            ScopeDef::ModuleDef(BuiltinType(..)) => {
-                completion_kind = CompletionKind::BuiltinType;
-                (CompletionItemKind::BuiltinType, None)
-            }
-            ScopeDef::GenericParam(..) => (CompletionItemKind::TypeParam, None),
-            ScopeDef::LocalBinding(..) => (CompletionItemKind::Binding, None),
-            ScopeDef::SelfType(..) => (
-                CompletionItemKind::TypeParam, // (does this need its own kind?)
-                None,
-            ),
            ScopeDef::MacroDef(mac) => {
-                self.add_macro(ctx, Some(local_name), *mac);
+                return self.add_macro(ctx, Some(local_name), *mac);
-                return;
            }
            ScopeDef::Unknown => {
-                self.add(CompletionItem::new(
+                return self.add(CompletionItem::new(
                    CompletionKind::Reference,
                    ctx.source_range(),
                    local_name,
                ));
-                return;
            }
        };
+        let docs = match resolution {
+            ScopeDef::ModuleDef(Module(it)) => it.docs(ctx.db),
+            ScopeDef::ModuleDef(Adt(it)) => it.docs(ctx.db),
+            ScopeDef::ModuleDef(EnumVariant(it)) => it.docs(ctx.db),
+            ScopeDef::ModuleDef(Const(it)) => it.docs(ctx.db),
+            ScopeDef::ModuleDef(Static(it)) => it.docs(ctx.db),
+            ScopeDef::ModuleDef(Trait(it)) => it.docs(ctx.db),
+            ScopeDef::ModuleDef(TypeAlias(it)) => it.docs(ctx.db),
+            _ => None,
+        };
        let mut completion_item =
-            CompletionItem::new(completion_kind, ctx.source_range(), local_name);
+            CompletionItem::new(completion_kind, ctx.source_range(), local_name.clone());
        if let ScopeDef::LocalBinding(pat_id) = resolution {
            let ty = ctx
                .analyzer
@@ -100,6 +102,28 @@ impl Completions {
                .map(|t| t.display(ctx.db).to_string());
            completion_item = completion_item.set_detail(ty);
        };
+        // If not an import, add parenthesis automatically.
+        if ctx.is_path_type
+            && !ctx.has_type_args
+            && ctx.db.feature_flags.get("completion.insertion.add-call-parenthesis")
+        {
+            let generic_def: Option<hir::GenericDef> = match resolution {
+                ScopeDef::ModuleDef(Adt(it)) => Some((*it).into()),
+                ScopeDef::ModuleDef(TypeAlias(it)) => Some((*it).into()),
+                _ => None,
+            };
+            if let Some(def) = generic_def {
+                if has_non_default_type_params(def, ctx.db) {
+                    tested_by!(inserts_angle_brackets_for_generics);
+                    completion_item = completion_item
+                        .lookup_by(local_name.clone())
+                        .label(format!("{}<…>", local_name))
+                        .insert_snippet(format!("{}<$0>", local_name));
+                }
+            }
+        }
        completion_item.kind(kind).set_documentation(docs).add_to(self)
    }
@@ -107,6 +131,33 @@ impl Completions {
        self.add_function_with_name(ctx, None, func)
    }
+    fn guess_macro_braces(&self, macro_name: &str, docs: &str) -> &'static str {
+        let mut votes = [0, 0, 0];
+        for (idx, s) in docs.match_indices(&macro_name) {
+            let (before, after) = (&docs[..idx], &docs[idx + s.len()..]);
+            // Ensure to match the full word
+            if after.starts_with("!")
+                && before
+                    .chars()
+                    .rev()
+                    .next()
+                    .map_or(true, |c| c != '_' && !c.is_ascii_alphanumeric())
+            {
+                // It may have spaces before the braces like `foo! {}`
+                match after[1..].chars().find(|&c| !c.is_whitespace()) {
+                    Some('{') => votes[0] += 1,
+                    Some('[') => votes[1] += 1,
+                    Some('(') => votes[2] += 1,
+                    _ => {}
+                }
+            }
+        }
+        // Insert a space before `{}`.
+        // We prefer the last one when some votes equal.
+        *votes.iter().zip(&[" {$0}", "[$0]", "($0)"]).max_by_key(|&(&vote, _)| vote).unwrap().1
+    }
    pub(crate) fn add_macro(
        &mut self,
        ctx: &CompletionContext,
@@ -117,10 +168,9 @@ impl Completions {
        if let Some(name) = name {
            let detail = macro_label(&ast_node);
-            let macro_braces_to_insert = match name.as_str() {
+            let docs = macro_.docs(ctx.db);
-                "vec" => "[$0]",
+            let macro_braces_to_insert =
-                _ => "($0)",
+                self.guess_macro_braces(&name, docs.as_ref().map_or("", |s| s.as_str()));
-            };
            let macro_declaration = name + "!";
            let builder = CompletionItem::new(
@@ -129,7 +179,7 @@ impl Completions {
                &macro_declaration,
            )
            .kind(CompletionItemKind::Macro)
-            .set_documentation(macro_.docs(ctx.db))
+            .set_documentation(docs)
            .detail(detail)
            .insert_snippet(macro_declaration + macro_braces_to_insert);
@@ -148,28 +198,31 @@ impl Completions {
        let ast_node = func.source(ctx.db).ast;
        let detail = function_label(&ast_node);
-        let mut builder = CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name)
+        let mut builder =
-            .kind(if data.has_self_param() {
+            CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.clone())
-                CompletionItemKind::Method
+                .kind(if data.has_self_param() {
-            } else {
+                    CompletionItemKind::Method
-                CompletionItemKind::Function
+                } else {
-            })
+                    CompletionItemKind::Function
-            .set_documentation(func.docs(ctx.db))
+                })
-            .detail(detail);
+                .set_documentation(func.docs(ctx.db))
-        // If not an import, add parenthesis automatically.
+                .detail(detail);
+        // Add `<>` for generic types
        if ctx.use_item_syntax.is_none()
            && !ctx.is_call
            && ctx.db.feature_flags.get("completion.insertion.add-call-parenthesis")
        {
            tested_by!(inserts_parens_for_function_calls);
-            let snippet =
+            let (snippet, label) =
                if data.params().is_empty() || data.has_self_param() && data.params().len() == 1 {
-                    format!("{}()$0", data.name())
+                    (format!("{}()$0", data.name()), format!("{}()", name))
                } else {
-                    format!("{}($0)", data.name())
+                    (format!("{}($0)", data.name()), format!("{}(…)", name))
                };
-            builder = builder.insert_snippet(snippet);
+            builder = builder.lookup_by(name.clone()).label(label).insert_snippet(snippet);
        }
        self.add(builder)
    }
@@ -213,7 +266,6 @@ impl Completions {
            .separator(", ")
            .surround_with("(", ")")
            .to_string();
        CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.to_string())
            .kind(CompletionItemKind::EnumVariant)
            .set_documentation(variant.docs(ctx.db))
@@ -222,6 +274,11 @@ impl Completions {
    }
 }
+fn has_non_default_type_params(def: hir::GenericDef, db: &db::RootDatabase) -> bool {
+    let subst = db.generic_defaults(def);
+    subst.iter().any(|ty| ty == &Ty::Unknown)
+}
 #[cfg(test)]
 mod tests {
    use crate::completion::{do_completion, CompletionItem, CompletionKind};
@@ -242,24 +299,28 @@ mod tests {
                fn main() { no_<|> }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "main",
+            CompletionItem {
-        source_range: [61; 64),
+                label: "main()",
-        delete: [61; 64),
+                source_range: [61; 64),
-        insert: "main()$0",
+                delete: [61; 64),
-        kind: Function,
+                insert: "main()$0",
-        detail: "fn main()",
+                kind: Function,
-    },
+                lookup: "main",
-    CompletionItem {
+                detail: "fn main()",
-        label: "no_args",
+            },
-        source_range: [61; 64),
+            CompletionItem {
-        delete: [61; 64),
+                label: "no_args()",
-        insert: "no_args()$0",
+                source_range: [61; 64),
-        kind: Function,
+                delete: [61; 64),
-        detail: "fn no_args()",
+                insert: "no_args()$0",
-    },
+                kind: Function,
-]"###
+                lookup: "no_args",
+                detail: "fn no_args()",
+            },
+        ]
+        "###
        );
        assert_debug_snapshot!(
            do_reference_completion(
@@ -268,24 +329,28 @@ mod tests {
                fn main() { with_<|> }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "main",
+            CompletionItem {
-        source_range: [80; 85),
+                label: "main()",
-        delete: [80; 85),
+                source_range: [80; 85),
-        insert: "main()$0",
+                delete: [80; 85),
-        kind: Function,
+                insert: "main()$0",
-        detail: "fn main()",
+                kind: Function,
-    },
+                lookup: "main",
-    CompletionItem {
+                detail: "fn main()",
-        label: "with_args",
+            },
-        source_range: [80; 85),
+            CompletionItem {
-        delete: [80; 85),
+                label: "with_args(…)",
-        insert: "with_args($0)",
+                source_range: [80; 85),
-        kind: Function,
+                delete: [80; 85),
-        detail: "fn with_args(x: i32, y: String)",
+                insert: "with_args($0)",
-    },
+                kind: Function,
-]"###
+                lookup: "with_args",
+                detail: "fn with_args(x: i32, y: String)",
+            },
+        ]
+        "###
        );
        assert_debug_snapshot!(
            do_reference_completion(
@@ -299,16 +364,19 @@ mod tests {
                }
                "
            ),
-            @r###"[
+            @r###"
-    CompletionItem {
+        [
-        label: "foo",
+            CompletionItem {
-        source_range: [163; 164),
+                label: "foo()",
-        delete: [163; 164),
+                source_range: [163; 164),
-        insert: "foo()$0",
+                delete: [163; 164),
-        kind: Method,
+                insert: "foo()$0",
-        detail: "fn foo(&self)",
+                kind: Method,
-    },
+                lookup: "foo",
-]"###
+                detail: "fn foo(&self)",
+            },
+        ]
+        "###
        );
    }
@@ -389,4 +457,123 @@ mod tests {
 ]"#
        );
    }
+    #[test]
+    fn inserts_angle_brackets_for_generics() {
+        covers!(inserts_angle_brackets_for_generics);
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                struct Vec<T> {}
+                fn foo(xs: Ve<|>)
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Vec<…>",
+                source_range: [61; 63),
+                delete: [61; 63),
+                insert: "Vec<$0>",
+                kind: Struct,
+                lookup: "Vec",
+            },
+            CompletionItem {
+                label: "foo(…)",
+                source_range: [61; 63),
+                delete: [61; 63),
+                insert: "foo($0)",
+                kind: Function,
+                lookup: "foo",
+                detail: "fn foo(xs: Ve)",
+            },
+        ]
+        "###
+        );
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                type Vec<T> = (T,);
+                fn foo(xs: Ve<|>)
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Vec<…>",
+                source_range: [64; 66),
+                delete: [64; 66),
+                insert: "Vec<$0>",
+                kind: TypeAlias,
+                lookup: "Vec",
+            },
+            CompletionItem {
+                label: "foo(…)",
+                source_range: [64; 66),
+                delete: [64; 66),
+                insert: "foo($0)",
+                kind: Function,
+                lookup: "foo",
+                detail: "fn foo(xs: Ve)",
+            },
+        ]
+        "###
+        );
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                struct Vec<T = i128> {}
+                fn foo(xs: Ve<|>)
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Vec",
+                source_range: [68; 70),
+                delete: [68; 70),
+                insert: "Vec",
+                kind: Struct,
+            },
+            CompletionItem {
+                label: "foo(…)",
+                source_range: [68; 70),
+                delete: [68; 70),
+                insert: "foo($0)",
+                kind: Function,
+                lookup: "foo",
+                detail: "fn foo(xs: Ve)",
+            },
+        ]
+        "###
+        );
+        assert_debug_snapshot!(
+            do_reference_completion(
+                r"
+                struct Vec<T> {}
+                fn foo(xs: Ve<|><i128>)
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "Vec",
+                source_range: [61; 63),
+                delete: [61; 63),
+                insert: "Vec",
+                kind: Struct,
+            },
+            CompletionItem {
+                label: "foo(…)",
+                source_range: [61; 63),
+                delete: [61; 63),
+                insert: "foo($0)",
+                kind: Function,
+                lookup: "foo",
+                detail: "fn foo(xs: Ve<i128>)",
+            },
+        ]
+        "###
+        );
+    }
 }
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index ea0714add..9146b647a 100644
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -4,8 +4,10 @@ use std::sync::Arc;
 use ra_db::{
    salsa::{self, Database, Durability},
-    Canceled, CheckCanceled, CrateId, FileId, SourceDatabase, SourceRootId,
+    Canceled, CheckCanceled, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase,
+    SourceDatabaseExt, SourceRootId,
 };
+use relative_path::RelativePath;
 use rustc_hash::FxHashMap;
 use crate::{
@@ -15,6 +17,7 @@ use crate::{
 #[salsa::database(
    ra_db::SourceDatabaseStorage,
+    ra_db::SourceDatabaseExtStorage,
    LineIndexDatabaseStorage,
    symbol_index::SymbolsDatabaseStorage,
    hir::db::InternDatabaseStorage,
@@ -31,6 +34,22 @@ pub(crate) struct RootDatabase {
    pub(crate) last_gc_check: crate::wasm_shims::Instant,
 }
+impl FileLoader for RootDatabase {
+    fn file_text(&self, file_id: FileId) -> Arc<String> {
+        FileLoaderDelegate(self).file_text(file_id)
+    }
+    fn resolve_relative_path(
+        &self,
+        anchor: FileId,
+        relative_path: &RelativePath,
+    ) -> Option<FileId> {
+        FileLoaderDelegate(self).resolve_relative_path(anchor, relative_path)
+    }
+    fn relevant_crates(&self, file_id: FileId) -> Arc<Vec<CrateId>> {
+        FileLoaderDelegate(self).relevant_crates(file_id)
+    }
+}
 impl hir::debug::HirDebugHelper for RootDatabase {
    fn crate_name(&self, krate: CrateId) -> Option<String> {
        self.debug_data.crate_names.get(&krate).cloned()
@@ -39,7 +58,7 @@ impl hir::debug::HirDebugHelper for RootDatabase {
        let source_root_id = self.file_source_root(file_id);
        let source_root_path = self.debug_data.root_paths.get(&source_root_id)?;
        let file_path = self.file_relative_path(file_id);
-        Some(format!("{}/{}", source_root_path, file_path.display()))
+        Some(format!("{}/{}", source_root_path, file_path))
    }
 }
@@ -104,7 +123,7 @@ pub(crate) trait LineIndexDatabase: ra_db::SourceDatabase + CheckCanceled {
    fn line_index(&self, file_id: FileId) -> Arc<LineIndex>;
 }
-fn line_index(db: &impl ra_db::SourceDatabase, file_id: FileId) -> Arc<LineIndex> {
+fn line_index(db: &impl LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
    let text = db.file_text(file_id);
    Arc::new(LineIndex::new(&*text))
 }
diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs
index 0435188c8..8743a3a79 100644
--- a/crates/ra_ide_api/src/diagnostics.rs
+++ b/crates/ra_ide_api/src/diagnostics.rs
@@ -4,7 +4,7 @@ use std::cell::RefCell;
 use hir::diagnostics::{AstDiagnostic, Diagnostic as _, DiagnosticSink};
 use itertools::Itertools;
-use ra_db::SourceDatabase;
+use ra_db::{SourceDatabase, SourceDatabaseExt};
 use ra_prof::profile;
 use ra_syntax::{
    algo,
@@ -12,6 +12,7 @@ use ra_syntax::{
    Location, SyntaxNode, TextRange, T,
 };
 use ra_text_edit::{TextEdit, TextEditBuilder};
+use relative_path::RelativePath;
 use crate::{db::RootDatabase, Diagnostic, FileId, FileSystemEdit, SourceChange, SourceFileEdit};
@@ -47,8 +48,14 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
        })
    })
    .on::<hir::diagnostics::UnresolvedModule, _>(|d| {
-        let source_root = db.file_source_root(d.source().file_id.original_file(db));
+        let original_file = d.source().file_id.original_file(db);
-        let create_file = FileSystemEdit::CreateFile { source_root, path: d.candidate.clone() };
+        let source_root = db.file_source_root(original_file);
+        let path = db
+            .file_relative_path(original_file)
+            .parent()
+            .unwrap_or_else(|| RelativePath::new(""))
+            .join(&d.candidate);
+        let create_file = FileSystemEdit::CreateFile { source_root, path };
        let fix = SourceChange::file_system_edit("create module", create_file);
        res.borrow_mut().push(Diagnostic {
            range: d.highlight_range(),
diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs
index d0b1a8a2a..5cb67fb95 100644
--- a/crates/ra_ide_api/src/display/navigation_target.rs
+++ b/crates/ra_ide_api/src/display/navigation_target.rs
@@ -119,7 +119,7 @@ impl NavigationTarget {
    pub(crate) fn from_module(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
        let src = module.definition_source(db);
-        let file_id = src.file_id.as_original_file();
+        let file_id = src.file_id.original_file(db);
        let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
        match src.ast {
            ModuleSource::SourceFile(node) => {
@@ -139,7 +139,7 @@ impl NavigationTarget {
    pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
        let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
        if let Some(src) = module.declaration_source(db) {
-            let file_id = src.file_id.as_original_file();
+            let file_id = src.file_id.original_file(db);
            return NavigationTarget::from_syntax(
                file_id,
                name,
@@ -213,7 +213,7 @@ impl NavigationTarget {
    ) -> NavigationTarget {
        let src = impl_block.source(db);
        NavigationTarget::from_syntax(
-            src.file_id.as_original_file(),
+            src.file_id.original_file(db),
            "impl".into(),
            None,
            src.ast.syntax(),
diff --git a/crates/ra_ide_api/src/extend_selection.rs b/crates/ra_ide_api/src/extend_selection.rs
index 33fefb541..602757e92 100644
--- a/crates/ra_ide_api/src/extend_selection.rs
+++ b/crates/ra_ide_api/src/extend_selection.rs
@@ -32,6 +32,7 @@ fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option<TextRange
        PARAM_LIST,
        ARG_LIST,
        ARRAY_EXPR,
+        TUPLE_EXPR,
    ];
    if range.is_empty() {
@@ -245,6 +246,8 @@ mod tests {
        do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|>];"#, &["33", ", 33"]);
        do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|> ,];"#, &["33", ", 33"]);
+        do_check(r#"fn main() { (1, 2<|>) }"#, &["2", ", 2", "(1, 2)"]);
        do_check(
            r#"
 const FOO: [usize; 2] = [
diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index 41a88314f..1f3fa6c57 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -10,7 +10,7 @@ use ra_syntax::{
 use crate::{
    db::RootDatabase,
    display::ShortLabel,
-    name_ref_kind::{classify_name_ref, NameRefKind::*},
+    references::{classify_name_ref, NameKind::*},
    FilePosition, NavigationTarget, RangeInfo,
 };
@@ -54,13 +54,11 @@ pub(crate) fn reference_definition(
 ) -> ReferenceResult {
    use self::ReferenceResult::*;
-    let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
+    let name_kind = classify_name_ref(db, file_id, &name_ref).map(|d| d.kind);
+    match name_kind {
-    match classify_name_ref(db, &analyzer, name_ref) {
        Some(Macro(mac)) => return Exact(NavigationTarget::from_macro_def(db, mac)),
-        Some(FieldAccess(field)) => return Exact(NavigationTarget::from_field(db, field)),
+        Some(Field(field)) => return Exact(NavigationTarget::from_field(db, field)),
        Some(AssocItem(assoc)) => return Exact(NavigationTarget::from_assoc_item(db, assoc)),
-        Some(Method(func)) => return Exact(NavigationTarget::from_def_source(db, func)),
        Some(Def(def)) => match NavigationTarget::from_def(db, def) {
            Some(nav) => return Exact(nav),
            None => return Approximate(vec![]),
@@ -70,7 +68,7 @@ pub(crate) fn reference_definition(
                return Exact(NavigationTarget::from_adt_def(db, def_id));
            }
        }
-        Some(Pat(pat)) => return Exact(NavigationTarget::from_pat(db, file_id, pat)),
+        Some(Pat((_, pat))) => return Exact(NavigationTarget::from_pat(db, file_id, pat)),
        Some(SelfParam(par)) => return Exact(NavigationTarget::from_self_param(file_id, par)),
        Some(GenericParam(_)) => {
            // FIXME: go to the generic param def
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index 24b161c5c..ba328efa1 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -14,7 +14,7 @@ use crate::{
        description_from_symbol, docs_from_symbol, macro_label, rust_code_markup,
        rust_code_markup_with_doc, ShortLabel,
    },
-    name_ref_kind::{classify_name_ref, NameRefKind::*},
+    references::{classify_name_ref, NameKind::*},
    FilePosition, FileRange, RangeInfo,
 };
@@ -99,17 +99,14 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
    let mut range = None;
    if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset) {
-        let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None);
        let mut no_fallback = false;
+        let name_kind = classify_name_ref(db, position.file_id, &name_ref).map(|d| d.kind);
-        match classify_name_ref(db, &analyzer, &name_ref) {
+        match name_kind {
-            Some(Method(it)) => res.extend(from_def_source(db, it)),
            Some(Macro(it)) => {
                let src = it.source(db);
                res.extend(hover_text(src.ast.doc_comment_text(), Some(macro_label(&src.ast))));
            }
-            Some(FieldAccess(it)) => {
+            Some(Field(it)) => {
                let src = it.source(db);
                if let hir::FieldSource::Named(it) = src.ast {
                    res.extend(hover_text(it.doc_comment_text(), it.short_label()));
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 24f1b91f6..19669a7f0 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -19,7 +19,6 @@ mod feature_flags;
 mod status;
 mod completion;
 mod runnables;
-mod name_ref_kind;
 mod goto_definition;
 mod goto_type_definition;
 mod extend_selection;
@@ -52,7 +51,7 @@ use std::sync::Arc;
 use ra_cfg::CfgOptions;
 use ra_db::{
    salsa::{self, ParallelDatabase},
-    CheckCanceled, SourceDatabase,
+    CheckCanceled, FileLoader, SourceDatabase,
 };
 use ra_syntax::{SourceFile, TextRange, TextUnit};
 use ra_text_edit::TextEdit;
@@ -289,10 +288,14 @@ impl AnalysisHost {
    pub fn per_query_memory_usage(&mut self) -> Vec<(String, ra_prof::Bytes)> {
        self.db.per_query_memory_usage()
    }
-    pub fn raw_database(&self) -> &(impl hir::db::HirDatabase + salsa::Database) {
+    pub fn raw_database(
+        &self,
+    ) -> &(impl hir::db::HirDatabase + salsa::Database + ra_db::SourceDatabaseExt) {
        &self.db
    }
-    pub fn raw_database_mut(&mut self) -> &mut (impl hir::db::HirDatabase + salsa::Database) {
+    pub fn raw_database_mut(
+        &mut self,
+    ) -> &mut (impl hir::db::HirDatabase + salsa::Database + ra_db::SourceDatabaseExt) {
        &mut self.db
    }
 }
@@ -325,7 +328,8 @@ impl Analysis {
        let file_id = FileId(0);
        // FIXME: cfg options
        // Default to enable test for single file.
-        let cfg_options = CfgOptions::default().atom("test".into());
+        let mut cfg_options = CfgOptions::default();
+        cfg_options.insert_atom("test".into());
        crate_graph.add_crate_root(file_id, Edition::Edition2018, cfg_options);
        change.add_file(source_root, file_id, "main.rs".into(), Arc::new(text));
        change.set_crate_graph(crate_graph);
diff --git a/crates/ra_ide_api/src/marks.rs b/crates/ra_ide_api/src/marks.rs
index 3f4ba248b..848ae4dc7 100644
--- a/crates/ra_ide_api/src/marks.rs
+++ b/crates/ra_ide_api/src/marks.rs
@@ -1,6 +1,7 @@
 //! See test_utils/src/marks.rs
 test_utils::marks!(
+    inserts_angle_brackets_for_generics
    inserts_parens_for_function_calls
    goto_definition_works_for_macros
    goto_definition_works_for_methods
diff --git a/crates/ra_ide_api/src/name_ref_kind.rs b/crates/ra_ide_api/src/name_ref_kind.rs
deleted file mode 100644
index 149585971..000000000
--- a/crates/ra_ide_api/src/name_ref_kind.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-//! FIXME: write short doc here
-use hir::Either;
-use ra_syntax::{ast, AstNode, AstPtr};
-use test_utils::tested_by;
-use crate::db::RootDatabase;
-pub enum NameRefKind {
-    Method(hir::Function),
-    Macro(hir::MacroDef),
-    FieldAccess(hir::StructField),
-    AssocItem(hir::AssocItem),
-    Def(hir::ModuleDef),
-    SelfType(hir::Ty),
-    Pat(AstPtr<ast::BindPat>),
-    SelfParam(AstPtr<ast::SelfParam>),
-    GenericParam(u32),
-}
-pub(crate) fn classify_name_ref(
-    db: &RootDatabase,
-    analyzer: &hir::SourceAnalyzer,
-    name_ref: &ast::NameRef,
-) -> Option<NameRefKind> {
-    use NameRefKind::*;
-    // Check if it is a method
-    if let Some(method_call) = name_ref.syntax().parent().and_then(ast::MethodCallExpr::cast) {
-        tested_by!(goto_definition_works_for_methods);
-        if let Some(func) = analyzer.resolve_method_call(&method_call) {
-            return Some(Method(func));
-        }
-    }
-    // It could be a macro call
-    if let Some(macro_call) = name_ref
-        .syntax()
-        .parent()
-        .and_then(|node| node.parent())
-        .and_then(|node| node.parent())
-        .and_then(ast::MacroCall::cast)
-    {
-        tested_by!(goto_definition_works_for_macros);
-        if let Some(mac) = analyzer.resolve_macro_call(db, &macro_call) {
-            return Some(Macro(mac));
-        }
-    }
-    // It could also be a field access
-    if let Some(field_expr) = name_ref.syntax().parent().and_then(ast::FieldExpr::cast) {
-        tested_by!(goto_definition_works_for_fields);
-        if let Some(field) = analyzer.resolve_field(&field_expr) {
-            return Some(FieldAccess(field));
-        };
-    }
-    // It could also be a named field
-    if let Some(field_expr) = name_ref.syntax().parent().and_then(ast::RecordField::cast) {
-        tested_by!(goto_definition_works_for_record_fields);
-        let record_lit = field_expr.syntax().ancestors().find_map(ast::RecordLit::cast);
-        if let Some(ty) = record_lit.and_then(|lit| analyzer.type_of(db, &lit.into())) {
-            if let Some((hir::Adt::Struct(s), _)) = ty.as_adt() {
-                let hir_path = hir::Path::from_name_ref(name_ref);
-                let hir_name = hir_path.as_ident().unwrap();
-                if let Some(field) = s.field(db, hir_name) {
-                    return Some(FieldAccess(field));
-                }
-            }
-        }
-    }
-    // General case, a path or a local:
-    if let Some(path) = name_ref.syntax().ancestors().find_map(ast::Path::cast) {
-        if let Some(resolved) = analyzer.resolve_path(db, &path) {
-            return match resolved {
-                hir::PathResolution::Def(def) => Some(Def(def)),
-                hir::PathResolution::LocalBinding(Either::A(pat)) => Some(Pat(pat)),
-                hir::PathResolution::LocalBinding(Either::B(par)) => Some(SelfParam(par)),
-                hir::PathResolution::GenericParam(par) => {
-                    // FIXME: get generic param def
-                    Some(GenericParam(par))
-                }
-                hir::PathResolution::Macro(def) => Some(Macro(def)),
-                hir::PathResolution::SelfType(impl_block) => {
-                    let ty = impl_block.target_ty(db);
-                    Some(SelfType(ty))
-                }
-                hir::PathResolution::AssocItem(assoc) => Some(AssocItem(assoc)),
-            };
-        }
-    }
-    None
-}
diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs
index 84c2eb793..f35d835ac 100644
--- a/crates/ra_ide_api/src/references.rs
+++ b/crates/ra_ide_api/src/references.rs
@@ -1,13 +1,29 @@
-//! FIXME: write short doc here
+//! This module implements a reference search.
+//! First, the element at the cursor position must be either an `ast::Name`
-use hir::{Either, ModuleSource};
+//! or `ast::NameRef`. If it's a `ast::NameRef`, at the classification step we
-use ra_db::SourceDatabase;
+//! try to resolve the direct tree parent of this element, otherwise we
-use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SourceFile, SyntaxNode};
+//! already have a definition and just need to get its HIR together with
-use relative_path::{RelativePath, RelativePathBuf};
+//! some information that is needed for futher steps of searching.
+//! After that, we collect files that might contain references and look
-use crate::{
+//! for text occurrences of the identifier. If there's an `ast::NameRef`
-    db::RootDatabase, FileId, FilePosition, FileRange, FileSystemEdit, NavigationTarget, RangeInfo,
+//! at the index that the match starts at and its tree parent is
-    SourceChange, SourceFileEdit, TextRange,
+//! resolved to the search element definition, we get a reference.
+mod classify;
+mod name_definition;
+mod rename;
+mod search_scope;
+use once_cell::unsync::Lazy;
+use ra_db::{SourceDatabase, SourceDatabaseExt};
+use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SourceFile, SyntaxNode, TextUnit};
+use crate::{db::RootDatabase, FilePosition, FileRange, NavigationTarget, RangeInfo};
+pub(crate) use self::{
+    classify::{classify_name, classify_name_ref},
+    name_definition::{NameDefinition, NameKind},
+    rename::rename,
 };
 #[derive(Debug, Clone)]
@@ -52,161 +68,82 @@ pub(crate) fn find_all_refs(
    position: FilePosition,
 ) -> Option<RangeInfo<ReferenceSearchResult>> {
    let parse = db.parse(position.file_id);
-    let RangeInfo { range, info: (binding, analyzer) } = find_binding(db, &parse.tree(), position)?;
+    let syntax = parse.tree().syntax().clone();
-    let declaration = NavigationTarget::from_bind_pat(position.file_id, &binding);
+    let RangeInfo { range, info: (name, def) } = find_name(db, &syntax, position)?;
-    let references = analyzer
+    let declaration = match def.kind {
-        .find_all_refs(&binding)
+        NameKind::Macro(mac) => NavigationTarget::from_macro_def(db, mac),
-        .into_iter()
+        NameKind::Field(field) => NavigationTarget::from_field(db, field),
-        .map(move |ref_desc| FileRange { file_id: position.file_id, range: ref_desc.range })
+        NameKind::AssocItem(assoc) => NavigationTarget::from_assoc_item(db, assoc),
-        .collect::<Vec<_>>();
+        NameKind::Def(def) => NavigationTarget::from_def(db, def)?,
+        NameKind::SelfType(ref ty) => match ty.as_adt() {
-    return Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references }));
+            Some((def_id, _)) => NavigationTarget::from_adt_def(db, def_id),
+            None => return None,
-    fn find_binding<'a>(
+        },
-        db: &RootDatabase,
+        NameKind::Pat((_, pat)) => NavigationTarget::from_pat(db, position.file_id, pat),
-        source_file: &SourceFile,
+        NameKind::SelfParam(par) => NavigationTarget::from_self_param(position.file_id, par),
-        position: FilePosition,
+        NameKind::GenericParam(_) => return None,
-    ) -> Option<RangeInfo<(ast::BindPat, hir::SourceAnalyzer)>> {
+    };
-        let syntax = source_file.syntax();
-        if let Some(binding) = find_node_at_offset::<ast::BindPat>(syntax, position.offset) {
-            let range = binding.syntax().text_range();
-            let analyzer = hir::SourceAnalyzer::new(db, position.file_id, binding.syntax(), None);
-            return Some(RangeInfo::new(range, (binding, analyzer)));
-        };
-        let name_ref = find_node_at_offset::<ast::NameRef>(syntax, position.offset)?;
-        let range = name_ref.syntax().text_range();
-        let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None);
-        let resolved = analyzer.resolve_local_name(&name_ref)?;
-        if let Either::A(ptr) = resolved.ptr() {
-            if let ast::Pat::BindPat(binding) = ptr.to_node(source_file.syntax()) {
-                return Some(RangeInfo::new(range, (binding, analyzer)));
-            }
-        }
-        None
-    }
-}
-pub(crate) fn rename(
+    let references = process_definition(db, def, name);
-    db: &RootDatabase,
-    position: FilePosition,
+    Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references }))
-    new_name: &str,
-) -> Option<RangeInfo<SourceChange>> {
-    let parse = db.parse(position.file_id);
-    if let Some((ast_name, ast_module)) =
-        find_name_and_module_at_offset(parse.tree().syntax(), position)
-    {
-        let range = ast_name.syntax().text_range();
-        rename_mod(db, &ast_name, &ast_module, position, new_name)
-            .map(|info| RangeInfo::new(range, info))
-    } else {
-        rename_reference(db, position, new_name)
-    }
 }
-fn find_name_and_module_at_offset(
+fn find_name<'a>(
+    db: &RootDatabase,
    syntax: &SyntaxNode,
    position: FilePosition,
-) -> Option<(ast::Name, ast::Module)> {
+) -> Option<RangeInfo<(String, NameDefinition)>> {
-    let ast_name = find_node_at_offset::<ast::Name>(syntax, position.offset)?;
+    if let Some(name) = find_node_at_offset::<ast::Name>(&syntax, position.offset) {
-    let ast_module = ast::Module::cast(ast_name.syntax().parent()?)?;
+        let def = classify_name(db, position.file_id, &name)?;
-    Some((ast_name, ast_module))
+        let range = name.syntax().text_range();
-}
+        return Some(RangeInfo::new(range, (name.text().to_string(), def)));
-fn source_edit_from_file_id_range(
-    file_id: FileId,
-    range: TextRange,
-    new_name: &str,
-) -> SourceFileEdit {
-    SourceFileEdit {
-        file_id,
-        edit: {
-            let mut builder = ra_text_edit::TextEditBuilder::default();
-            builder.replace(range, new_name.into());
-            builder.finish()
-        },
    }
+    let name_ref = find_node_at_offset::<ast::NameRef>(&syntax, position.offset)?;
+    let def = classify_name_ref(db, position.file_id, &name_ref)?;
+    let range = name_ref.syntax().text_range();
+    Some(RangeInfo::new(range, (name_ref.text().to_string(), def)))
 }
-fn rename_mod(
+fn process_definition(db: &RootDatabase, def: NameDefinition, name: String) -> Vec<FileRange> {
-    db: &RootDatabase,
+    let pat = name.as_str();
-    ast_name: &ast::Name,
+    let scope = def.search_scope(db);
-    ast_module: &ast::Module,
+    let mut refs = vec![];
-    position: FilePosition,
-    new_name: &str,
+    for (file_id, search_range) in scope {
-) -> Option<SourceChange> {
+        let text = db.file_text(file_id);
-    let mut source_file_edits = Vec::new();
+        let parse = Lazy::new(|| SourceFile::parse(&text));
-    let mut file_system_edits = Vec::new();
-    let module_src = hir::Source { file_id: position.file_id.into(), ast: ast_module.clone() };
+        for (idx, _) in text.match_indices(pat) {
-    if let Some(module) = hir::Module::from_declaration(db, module_src) {
+            let offset = TextUnit::from_usize(idx);
-        let src = module.definition_source(db);
-        let file_id = src.file_id.as_original_file();
+            if let Some(name_ref) =
-        match src.ast {
+                find_node_at_offset::<ast::NameRef>(parse.tree().syntax(), offset)
-            ModuleSource::SourceFile(..) => {
+            {
-                let mod_path: RelativePathBuf = db.file_relative_path(file_id);
+                let range = name_ref.syntax().text_range();
-                // mod is defined in path/to/dir/mod.rs
+                if let Some(search_range) = search_range {
-                let dst_path = if mod_path.file_stem() == Some("mod") {
+                    if !range.is_subrange(&search_range) {
-                    mod_path
+                        continue;
-                        .parent()
+                    }
-                        .and_then(|p| p.parent())
+                }
-                        .or_else(|| Some(RelativePath::new("")))
+                if let Some(d) = classify_name_ref(db, file_id, &name_ref) {
-                        .map(|p| p.join(new_name).join("mod.rs"))
+                    if d == def {
-                } else {
+                        refs.push(FileRange { file_id, range });
-                    Some(mod_path.with_file_name(new_name).with_extension("rs"))
+                    }
-                };
-                if let Some(path) = dst_path {
-                    let move_file = FileSystemEdit::MoveFile {
-                        src: file_id,
-                        dst_source_root: db.file_source_root(position.file_id),
-                        dst_path: path,
-                    };
-                    file_system_edits.push(move_file);
                }
            }
-            ModuleSource::Module(..) => {}
        }
    }
+    refs
-    let edit = SourceFileEdit {
-        file_id: position.file_id,
-        edit: {
-            let mut builder = ra_text_edit::TextEditBuilder::default();
-            builder.replace(ast_name.syntax().text_range(), new_name.into());
-            builder.finish()
-        },
-    };
-    source_file_edits.push(edit);
-    Some(SourceChange::from_edits("rename", source_file_edits, file_system_edits))
-}
-fn rename_reference(
-    db: &RootDatabase,
-    position: FilePosition,
-    new_name: &str,
-) -> Option<RangeInfo<SourceChange>> {
-    let RangeInfo { range, info: refs } = find_all_refs(db, position)?;
-    let edit = refs
-        .into_iter()
-        .map(|range| source_edit_from_file_id_range(range.file_id, range.range, new_name))
-        .collect::<Vec<_>>();
-    if edit.is_empty() {
-        return None;
-    }
-    Some(RangeInfo::new(range, SourceChange::source_file_edits("rename", edit)))
 }
 #[cfg(test)]
 mod tests {
    use crate::{
-        mock_analysis::analysis_and_position, mock_analysis::single_file_with_position, FileId,
+        mock_analysis::analysis_and_position, mock_analysis::single_file_with_position,
        ReferenceSearchResult,
    };
-    use insta::assert_debug_snapshot;
-    use test_utils::assert_eq_text;
    #[test]
    fn test_find_all_refs_for_local() {
@@ -249,211 +186,144 @@ mod tests {
        assert_eq!(refs.len(), 2);
    }
-    fn get_all_refs(text: &str) -> ReferenceSearchResult {
-        let (analysis, position) = single_file_with_position(text);
-        analysis.find_all_refs(position).unwrap().unwrap()
-    }
    #[test]
-    fn test_rename_for_local() {
+    fn test_find_all_refs_field_name() {
-        test_rename(
+        let code = r#"
-            r#"
+            //- /lib.rs
-    fn main() {
+            struct Foo {
-        let mut i = 1;
+                pub spam<|>: u32,
-        let j = 1;
+            }
-        i = i<|> + j;
-        {
-            i = 0;
-        }
-        i = 5;
-    }"#,
-            "k",
-            r#"
-    fn main() {
-        let mut k = 1;
-        let j = 1;
-        k = k + j;
-        {
+            fn main(s: Foo) {
-            k = 0;
+                let f = s.spam;
-        }
+            }
+        "#;
-        k = 5;
+        let refs = get_all_refs(code);
-    }"#,
+        assert_eq!(refs.len(), 2);
-        );
    }
    #[test]
-    fn test_rename_for_param_inside() {
+    fn test_find_all_refs_impl_item_name() {
-        test_rename(
+        let code = r#"
-            r#"
+            //- /lib.rs
-    fn foo(i : u32) -> u32 {
+            struct Foo;
-        i<|>
+            impl Foo {
-    }"#,
+                fn f<|>(&self) {  }
-            "j",
+            }
-            r#"
+        "#;
-    fn foo(j : u32) -> u32 {
-        j
-    }"#,
-        );
-    }
-    #[test]
+        let refs = get_all_refs(code);
-    fn test_rename_refs_for_fn_param() {
+        assert_eq!(refs.len(), 1);
-        test_rename(
-            r#"
-    fn foo(i<|> : u32) -> u32 {
-        i
-    }"#,
-            "new_name",
-            r#"
-    fn foo(new_name : u32) -> u32 {
-        new_name
-    }"#,
-        );
    }
    #[test]
-    fn test_rename_for_mut_param() {
+    fn test_find_all_refs_enum_var_name() {
-        test_rename(
+        let code = r#"
-            r#"
+            //- /lib.rs
-    fn foo(mut i<|> : u32) -> u32 {
+            enum Foo {
-        i
+                A,
-    }"#,
+                B<|>,
-            "new_name",
+                C,
-            r#"
+            }
-    fn foo(mut new_name : u32) -> u32 {
+        "#;
-        new_name
-    }"#,
+        let refs = get_all_refs(code);
-        );
+        assert_eq!(refs.len(), 1);
    }
    #[test]
-    fn test_rename_mod() {
+    fn test_find_all_refs_two_modules() {
-        let (analysis, position) = analysis_and_position(
+        let code = r#"
-            "
            //- /lib.rs
-            mod bar;
+            pub mod foo;
+            pub mod bar;
+            fn f() {
+                let i = foo::Foo { n: 5 };
+            }
+            //- /foo.rs
+            use crate::bar;
+            pub struct Foo {
+                pub n: u32,
+            }
+            fn f() {
+                let i = bar::Bar { n: 5 };
+            }
            //- /bar.rs
+            use crate::foo;
+            pub struct Bar {
+                pub n: u32,
+            }
+            fn f() {
+                let i = foo::Foo<|> { n: 5 };
+            }
+        "#;
+        let (analysis, pos) = analysis_and_position(code);
+        let refs = analysis.find_all_refs(pos).unwrap().unwrap();
+        assert_eq!(refs.len(), 3);
+    }
+    // `mod foo;` is not in the results because `foo` is an `ast::Name`.
+    // So, there are two references: the first one is a definition of the `foo` module,
+    // which is the whole `foo.rs`, and the second one is in `use foo::Foo`.
+    #[test]
+    fn test_find_all_refs_decl_module() {
+        let code = r#"
+            //- /lib.rs
            mod foo<|>;
-            //- /bar/foo.rs
+            use foo::Foo;
-            // emtpy
-            ",
+            fn f() {
-        );
+                let i = Foo { n: 5 };
-        let new_name = "foo2";
+            }
-        let source_change = analysis.rename(position, new_name).unwrap();
-        assert_debug_snapshot!(&source_change,
+            //- /foo.rs
-@r###"
+            pub struct Foo {
-        Some(
+                pub n: u32,
-            RangeInfo {
+            }
-                range: [4; 7),
+        "#;
-                info: SourceChange {
-                    label: "rename",
+        let (analysis, pos) = analysis_and_position(code);
-                    source_file_edits: [
+        let refs = analysis.find_all_refs(pos).unwrap().unwrap();
-                        SourceFileEdit {
+        assert_eq!(refs.len(), 2);
-                            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]
-    fn test_rename_mod_in_dir() {
+    fn test_find_all_refs_super_mod_vis() {
-        let (analysis, position) = analysis_and_position(
+        let code = r#"
-            "
            //- /lib.rs
-            mod fo<|>o;
+            mod foo;
-            //- /foo/mod.rs
-            // emtpy
+            //- /foo.rs
-            ",
+            mod some;
-        );
+            use some::Foo;
-        let new_name = "foo2";
-        let source_change = analysis.rename(position, new_name).unwrap();
+            fn f() {
-        assert_debug_snapshot!(&source_change,
+                let i = Foo { n: 5 };
-        @r###"
+            }
-        Some(
-            RangeInfo {
+            //- /foo/some.rs
-                range: [4; 7),
+            pub(super) struct Foo<|> {
-                info: SourceChange {
+                pub n: u32,
-                    label: "rename",
+            }
-                    source_file_edits: [
+        "#;
-                        SourceFileEdit {
-                            file_id: FileId(
+        let (analysis, pos) = analysis_and_position(code);
-                                1,
+        let refs = analysis.find_all_refs(pos).unwrap().unwrap();
-                            ),
+        assert_eq!(refs.len(), 3);
-                            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) {
+    fn get_all_refs(text: &str) -> ReferenceSearchResult {
        let (analysis, position) = single_file_with_position(text);
-        let source_change = analysis.rename(position, new_name).unwrap();
+        analysis.find_all_refs(position).unwrap().unwrap()
-        let mut text_edit_builder = ra_text_edit::TextEditBuilder::default();
-        let mut file_id: Option<FileId> = None;
-        if let Some(change) = source_change {
-            for edit in change.info.source_file_edits {
-                file_id = Some(edit.file_id);
-                for atom in edit.edit.as_atoms() {
-                    text_edit_builder.replace(atom.delete, atom.insert.clone());
-                }
-            }
-        }
-        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/references/classify.rs b/crates/ra_ide_api/src/references/classify.rs
new file mode 100644
index 000000000..c8daff9b1
--- /dev/null
+++ b/crates/ra_ide_api/src/references/classify.rs
@@ -0,0 +1,179 @@
+//! Functions that are used to classify an element from its definition or reference.
+use hir::{Either, FromSource, Module, ModuleSource, Path, PathResolution, Source, SourceAnalyzer};
+use ra_db::FileId;
+use ra_syntax::{ast, match_ast, AstNode, AstPtr};
+use test_utils::tested_by;
+use super::{
+    name_definition::{from_assoc_item, from_module_def, from_pat, from_struct_field},
+    NameDefinition, NameKind,
+};
+use crate::db::RootDatabase;
+pub(crate) fn classify_name(
+    db: &RootDatabase,
+    file_id: FileId,
+    name: &ast::Name,
+) -> Option<NameDefinition> {
+    let parent = name.syntax().parent()?;
+    let file_id = file_id.into();
+    // FIXME: add ast::MacroCall(it)
+    match_ast! {
+        match parent {
+            ast::BindPat(it) => {
+                from_pat(db, file_id, AstPtr::new(&it))
+            },
+            ast::RecordFieldDef(it) => {
+                let ast = hir::FieldSource::Named(it);
+                let src = hir::Source { file_id, ast };
+                let field = hir::StructField::from_source(db, src)?;
+                Some(from_struct_field(db, field))
+            },
+            ast::Module(it) => {
+                let def = {
+                    if !it.has_semi() {
+                        let ast = hir::ModuleSource::Module(it);
+                        let src = hir::Source { file_id, ast };
+                        hir::Module::from_definition(db, src)
+                    } else {
+                        let src = hir::Source { file_id, ast: it };
+                        hir::Module::from_declaration(db, src)
+                    }
+                }?;
+                Some(from_module_def(db, def.into(), None))
+            },
+            ast::StructDef(it) => {
+                let src = hir::Source { file_id, ast: it };
+                let def = hir::Struct::from_source(db, src)?;
+                Some(from_module_def(db, def.into(), None))
+            },
+            ast::EnumDef(it) => {
+                let src = hir::Source { file_id, ast: it };
+                let def = hir::Enum::from_source(db, src)?;
+                Some(from_module_def(db, def.into(), None))
+            },
+            ast::TraitDef(it) => {
+                let src = hir::Source { file_id, ast: it };
+                let def = hir::Trait::from_source(db, src)?;
+                Some(from_module_def(db, def.into(), None))
+            },
+            ast::StaticDef(it) => {
+                let src = hir::Source { file_id, ast: it };
+                let def = hir::Static::from_source(db, src)?;
+                Some(from_module_def(db, def.into(), None))
+            },
+            ast::EnumVariant(it) => {
+                let src = hir::Source { file_id, ast: it };
+                let def = hir::EnumVariant::from_source(db, src)?;
+                Some(from_module_def(db, def.into(), None))
+            },
+            ast::FnDef(it) => {
+                let src = hir::Source { file_id, ast: it };
+                let def = hir::Function::from_source(db, src)?;
+                if parent.parent().and_then(ast::ItemList::cast).is_some() {
+                    Some(from_assoc_item(db, def.into()))
+                } else {
+                    Some(from_module_def(db, def.into(), None))
+                }
+            },
+            ast::ConstDef(it) => {
+                let src = hir::Source { file_id, ast: it };
+                let def = hir::Const::from_source(db, src)?;
+                if parent.parent().and_then(ast::ItemList::cast).is_some() {
+                    Some(from_assoc_item(db, def.into()))
+                } else {
+                    Some(from_module_def(db, def.into(), None))
+                }
+            },
+            ast::TypeAliasDef(it) => {
+                let src = hir::Source { file_id, ast: it };
+                let def = hir::TypeAlias::from_source(db, src)?;
+                if parent.parent().and_then(ast::ItemList::cast).is_some() {
+                    Some(from_assoc_item(db, def.into()))
+                } else {
+                    Some(from_module_def(db, def.into(), None))
+                }
+            },
+            _ => None,
+        }
+    }
+}
+pub(crate) fn classify_name_ref(
+    db: &RootDatabase,
+    file_id: FileId,
+    name_ref: &ast::NameRef,
+) -> Option<NameDefinition> {
+    use PathResolution::*;
+    let parent = name_ref.syntax().parent()?;
+    let analyzer = SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
+    if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) {
+        tested_by!(goto_definition_works_for_methods);
+        if let Some(func) = analyzer.resolve_method_call(&method_call) {
+            return Some(from_assoc_item(db, func.into()));
+        }
+    }
+    if let Some(field_expr) = ast::FieldExpr::cast(parent.clone()) {
+        tested_by!(goto_definition_works_for_fields);
+        if let Some(field) = analyzer.resolve_field(&field_expr) {
+            return Some(from_struct_field(db, field));
+        }
+    }
+    if let Some(record_field) = ast::RecordField::cast(parent.clone()) {
+        tested_by!(goto_definition_works_for_record_fields);
+        if let Some(record_lit) = record_field.syntax().ancestors().find_map(ast::RecordLit::cast) {
+            let variant_def = analyzer.resolve_record_literal(&record_lit)?;
+            let hir_path = Path::from_name_ref(name_ref);
+            let hir_name = hir_path.as_ident()?;
+            let field = variant_def.field(db, hir_name)?;
+            return Some(from_struct_field(db, field));
+        }
+    }
+    let ast = ModuleSource::from_child_node(db, file_id, &parent);
+    let file_id = file_id.into();
+    // FIXME: find correct container and visibility for each case
+    let container = Module::from_definition(db, Source { file_id, ast })?;
+    let visibility = None;
+    if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) {
+        tested_by!(goto_definition_works_for_macros);
+        if let Some(macro_def) = analyzer.resolve_macro_call(db, &macro_call) {
+            let kind = NameKind::Macro(macro_def);
+            return Some(NameDefinition { kind, container, visibility });
+        }
+    }
+    let path = name_ref.syntax().ancestors().find_map(ast::Path::cast)?;
+    let resolved = analyzer.resolve_path(db, &path)?;
+    match resolved {
+        Def(def) => Some(from_module_def(db, def, Some(container))),
+        AssocItem(item) => Some(from_assoc_item(db, item)),
+        LocalBinding(Either::A(pat)) => from_pat(db, file_id, pat),
+        LocalBinding(Either::B(par)) => {
+            let kind = NameKind::SelfParam(par);
+            Some(NameDefinition { kind, container, visibility })
+        }
+        GenericParam(par) => {
+            // FIXME: get generic param def
+            let kind = NameKind::GenericParam(par);
+            Some(NameDefinition { kind, container, visibility })
+        }
+        Macro(def) => {
+            let kind = NameKind::Macro(def);
+            Some(NameDefinition { kind, container, visibility })
+        }
+        SelfType(impl_block) => {
+            let ty = impl_block.target_ty(db);
+            let kind = NameKind::SelfType(ty);
+            let container = impl_block.module();
+            Some(NameDefinition { kind, container, visibility })
+        }
+    }
+}
diff --git a/crates/ra_ide_api/src/references/name_definition.rs b/crates/ra_ide_api/src/references/name_definition.rs
new file mode 100644
index 000000000..4580bc789
--- /dev/null
+++ b/crates/ra_ide_api/src/references/name_definition.rs
@@ -0,0 +1,113 @@
+//! `NameDefinition` keeps information about the element we want to search references for.
+//! The element is represented by `NameKind`. It's located inside some `container` and
+//! has a `visibility`, which defines a search scope.
+//! Note that the reference search is possible for not all of the classified items.
+use hir::{
+    db::AstDatabase, Adt, AssocItem, DefWithBody, FromSource, HasSource, HirFileId, MacroDef,
+    Module, ModuleDef, StructField, Ty, VariantDef,
+};
+use ra_syntax::{ast, ast::VisibilityOwner, match_ast, AstNode, AstPtr};
+use crate::db::RootDatabase;
+#[derive(Debug, PartialEq, Eq)]
+pub enum NameKind {
+    Macro(MacroDef),
+    Field(StructField),
+    AssocItem(AssocItem),
+    Def(ModuleDef),
+    SelfType(Ty),
+    Pat((DefWithBody, AstPtr<ast::BindPat>)),
+    SelfParam(AstPtr<ast::SelfParam>),
+    GenericParam(u32),
+}
+#[derive(PartialEq, Eq)]
+pub(crate) struct NameDefinition {
+    pub visibility: Option<ast::Visibility>,
+    pub container: Module,
+    pub kind: NameKind,
+}
+pub(super) fn from_pat(
+    db: &RootDatabase,
+    file_id: HirFileId,
+    pat: AstPtr<ast::BindPat>,
+) -> Option<NameDefinition> {
+    let root = db.parse_or_expand(file_id)?;
+    let def = pat.to_node(&root).syntax().ancestors().find_map(|node| {
+        match_ast! {
+            match node {
+                ast::FnDef(it) => {
+                    let src = hir::Source { file_id, ast: it };
+                    Some(hir::Function::from_source(db, src)?.into())
+                },
+                ast::ConstDef(it) => {
+                    let src = hir::Source { file_id, ast: it };
+                    Some(hir::Const::from_source(db, src)?.into())
+                },
+                ast::StaticDef(it) => {
+                    let src = hir::Source { file_id, ast: it };
+                    Some(hir::Static::from_source(db, src)?.into())
+                },
+                _ => None,
+            }
+        }
+    })?;
+    let kind = NameKind::Pat((def, pat));
+    let container = def.module(db);
+    Some(NameDefinition { kind, container, visibility: None })
+}
+pub(super) fn from_assoc_item(db: &RootDatabase, item: AssocItem) -> NameDefinition {
+    let container = item.module(db);
+    let visibility = match item {
+        AssocItem::Function(f) => f.source(db).ast.visibility(),
+        AssocItem::Const(c) => c.source(db).ast.visibility(),
+        AssocItem::TypeAlias(a) => a.source(db).ast.visibility(),
+    };
+    let kind = NameKind::AssocItem(item);
+    NameDefinition { kind, container, visibility }
+}
+pub(super) fn from_struct_field(db: &RootDatabase, field: StructField) -> NameDefinition {
+    let kind = NameKind::Field(field);
+    let parent = field.parent_def(db);
+    let container = parent.module(db);
+    let visibility = match parent {
+        VariantDef::Struct(s) => s.source(db).ast.visibility(),
+        VariantDef::EnumVariant(e) => e.source(db).ast.parent_enum().visibility(),
+    };
+    NameDefinition { kind, container, visibility }
+}
+pub(super) fn from_module_def(
+    db: &RootDatabase,
+    def: ModuleDef,
+    module: Option<Module>,
+) -> NameDefinition {
+    let kind = NameKind::Def(def);
+    let (container, visibility) = match def {
+        ModuleDef::Module(it) => {
+            let container = it.parent(db).or_else(|| Some(it)).unwrap();
+            let visibility = it.declaration_source(db).and_then(|s| s.ast.visibility());
+            (container, visibility)
+        }
+        ModuleDef::EnumVariant(it) => {
+            let container = it.module(db);
+            let visibility = it.source(db).ast.parent_enum().visibility();
+            (container, visibility)
+        }
+        ModuleDef::Function(it) => (it.module(db), it.source(db).ast.visibility()),
+        ModuleDef::Const(it) => (it.module(db), it.source(db).ast.visibility()),
+        ModuleDef::Static(it) => (it.module(db), it.source(db).ast.visibility()),
+        ModuleDef::Trait(it) => (it.module(db), it.source(db).ast.visibility()),
+        ModuleDef::TypeAlias(it) => (it.module(db), it.source(db).ast.visibility()),
+        ModuleDef::Adt(Adt::Struct(it)) => (it.module(db), it.source(db).ast.visibility()),
+        ModuleDef::Adt(Adt::Union(it)) => (it.module(db), it.source(db).ast.visibility()),
+        ModuleDef::Adt(Adt::Enum(it)) => (it.module(db), it.source(db).ast.visibility()),
+        ModuleDef::BuiltinType(..) => (module.unwrap(), None),
+    };
+    NameDefinition { kind, container, visibility }
+}
diff --git a/crates/ra_ide_api/src/references/rename.rs b/crates/ra_ide_api/src/references/rename.rs
new file mode 100644
index 000000000..0e2e088e0
--- /dev/null
+++ b/crates/ra_ide_api/src/references/rename.rs
@@ -0,0 +1,469 @@
+//! FIXME: write short doc here
+use hir::ModuleSource;
+use ra_db::{SourceDatabase, SourceDatabaseExt};
+use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SyntaxNode};
+use relative_path::{RelativePath, RelativePathBuf};
+use crate::{
+    db::RootDatabase, FileId, FilePosition, FileSystemEdit, RangeInfo, SourceChange,
+    SourceFileEdit, TextRange,
+};
+use super::find_all_refs;
+pub(crate) fn rename(
+    db: &RootDatabase,
+    position: FilePosition,
+    new_name: &str,
+) -> Option<RangeInfo<SourceChange>> {
+    let parse = db.parse(position.file_id);
+    if let Some((ast_name, ast_module)) =
+        find_name_and_module_at_offset(parse.tree().syntax(), position)
+    {
+        let range = ast_name.syntax().text_range();
+        rename_mod(db, &ast_name, &ast_module, position, new_name)
+            .map(|info| RangeInfo::new(range, info))
+    } else {
+        rename_reference(db, position, new_name)
+    }
+}
+fn find_name_and_module_at_offset(
+    syntax: &SyntaxNode,
+    position: FilePosition,
+) -> Option<(ast::Name, ast::Module)> {
+    let ast_name = find_node_at_offset::<ast::Name>(syntax, position.offset)?;
+    let ast_module = ast::Module::cast(ast_name.syntax().parent()?)?;
+    Some((ast_name, ast_module))
+}
+fn source_edit_from_file_id_range(
+    file_id: FileId,
+    range: TextRange,
+    new_name: &str,
+) -> SourceFileEdit {
+    SourceFileEdit {
+        file_id,
+        edit: {
+            let mut builder = ra_text_edit::TextEditBuilder::default();
+            builder.replace(range, new_name.into());
+            builder.finish()
+        },
+    }
+}
+fn rename_mod(
+    db: &RootDatabase,
+    ast_name: &ast::Name,
+    ast_module: &ast::Module,
+    position: FilePosition,
+    new_name: &str,
+) -> Option<SourceChange> {
+    let mut source_file_edits = Vec::new();
+    let mut file_system_edits = Vec::new();
+    let module_src = hir::Source { file_id: position.file_id.into(), ast: ast_module.clone() };
+    if let Some(module) = hir::Module::from_declaration(db, module_src) {
+        let src = module.definition_source(db);
+        let file_id = src.file_id.original_file(db);
+        match src.ast {
+            ModuleSource::SourceFile(..) => {
+                let mod_path: RelativePathBuf = db.file_relative_path(file_id);
+                // mod is defined in path/to/dir/mod.rs
+                let dst_path = if mod_path.file_stem() == Some("mod") {
+                    mod_path
+                        .parent()
+                        .and_then(|p| p.parent())
+                        .or_else(|| Some(RelativePath::new("")))
+                        .map(|p| p.join(new_name).join("mod.rs"))
+                } else {
+                    Some(mod_path.with_file_name(new_name).with_extension("rs"))
+                };
+                if let Some(path) = dst_path {
+                    let move_file = FileSystemEdit::MoveFile {
+                        src: file_id,
+                        dst_source_root: db.file_source_root(position.file_id),
+                        dst_path: path,
+                    };
+                    file_system_edits.push(move_file);
+                }
+            }
+            ModuleSource::Module(..) => {}
+        }
+    }
+    let edit = SourceFileEdit {
+        file_id: position.file_id,
+        edit: {
+            let mut builder = ra_text_edit::TextEditBuilder::default();
+            builder.replace(ast_name.syntax().text_range(), new_name.into());
+            builder.finish()
+        },
+    };
+    source_file_edits.push(edit);
+    Some(SourceChange::from_edits("rename", source_file_edits, file_system_edits))
+}
+fn rename_reference(
+    db: &RootDatabase,
+    position: FilePosition,
+    new_name: &str,
+) -> Option<RangeInfo<SourceChange>> {
+    let RangeInfo { range, info: refs } = find_all_refs(db, position)?;
+    let edit = refs
+        .into_iter()
+        .map(|range| source_edit_from_file_id_range(range.file_id, range.range, new_name))
+        .collect::<Vec<_>>();
+    if edit.is_empty() {
+        return None;
+    }
+    Some(RangeInfo::new(range, SourceChange::source_file_edits("rename", edit)))
+}
+#[cfg(test)]
+mod tests {
+    use crate::{
+        mock_analysis::analysis_and_position, mock_analysis::single_file_with_position, FileId,
+        ReferenceSearchResult,
+    };
+    use insta::assert_debug_snapshot;
+    use test_utils::assert_eq_text;
+    #[test]
+    fn test_find_all_refs_for_local() {
+        let code = r#"
+    fn main() {
+        let mut i = 1;
+        let j = 1;
+        i = i<|> + j;
+        {
+            i = 0;
+        }
+        i = 5;
+    }"#;
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 5);
+    }
+    #[test]
+    fn test_find_all_refs_for_param_inside() {
+        let code = r#"
+    fn foo(i : u32) -> u32 {
+        i<|>
+    }"#;
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 2);
+    }
+    #[test]
+    fn test_find_all_refs_for_fn_param() {
+        let code = r#"
+    fn foo(i<|> : u32) -> u32 {
+        i
+    }"#;
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 2);
+    }
+    #[test]
+    fn test_find_all_refs_field_name() {
+        let code = r#"
+            //- /lib.rs
+            struct Foo {
+                pub spam<|>: u32,
+            }
+            fn main(s: Foo) {
+                let f = s.spam;
+            }
+        "#;
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 2);
+    }
+    #[test]
+    fn test_find_all_refs_impl_item_name() {
+        let code = r#"
+            //- /lib.rs
+            struct Foo;
+            impl Foo {
+                fn f<|>(&self) {  }
+            }
+        "#;
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 1);
+    }
+    #[test]
+    fn test_find_all_refs_enum_var_name() {
+        let code = r#"
+            //- /lib.rs
+            enum Foo {
+                A,
+                B<|>,
+                C,
+            }
+        "#;
+        let refs = get_all_refs(code);
+        assert_eq!(refs.len(), 1);
+    }
+    #[test]
+    fn test_find_all_refs_modules() {
+        let code = r#"
+            //- /lib.rs
+            pub mod foo;
+            pub mod bar;
+            fn f() {
+                let i = foo::Foo { n: 5 };
+            }
+            //- /foo.rs
+            use crate::bar;
+            pub struct Foo {
+                pub n: u32,
+            }
+            fn f() {
+                let i = bar::Bar { n: 5 };
+            }
+            //- /bar.rs
+            use crate::foo;
+            pub struct Bar {
+                pub n: u32,
+            }
+            fn f() {
+                let i = foo::Foo<|> { n: 5 };
+            }
+        "#;
+        let (analysis, pos) = analysis_and_position(code);
+        let refs = analysis.find_all_refs(pos).unwrap().unwrap();
+        assert_eq!(refs.len(), 3);
+    }
+    fn get_all_refs(text: &str) -> ReferenceSearchResult {
+        let (analysis, position) = single_file_with_position(text);
+        analysis.find_all_refs(position).unwrap().unwrap()
+    }
+    #[test]
+    fn test_rename_for_local() {
+        test_rename(
+            r#"
+    fn main() {
+        let mut i = 1;
+        let j = 1;
+        i = i<|> + j;
+        {
+            i = 0;
+        }
+        i = 5;
+    }"#,
+            "k",
+            r#"
+    fn main() {
+        let mut k = 1;
+        let j = 1;
+        k = k + j;
+        {
+            k = 0;
+        }
+        k = 5;
+    }"#,
+        );
+    }
+    #[test]
+    fn test_rename_for_param_inside() {
+        test_rename(
+            r#"
+    fn foo(i : u32) -> u32 {
+        i<|>
+    }"#,
+            "j",
+            r#"
+    fn foo(j : u32) -> u32 {
+        j
+    }"#,
+        );
+    }
+    #[test]
+    fn test_rename_refs_for_fn_param() {
+        test_rename(
+            r#"
+    fn foo(i<|> : u32) -> u32 {
+        i
+    }"#,
+            "new_name",
+            r#"
+    fn foo(new_name : u32) -> u32 {
+        new_name
+    }"#,
+        );
+    }
+    #[test]
+    fn test_rename_for_mut_param() {
+        test_rename(
+            r#"
+    fn foo(mut i<|> : u32) -> u32 {
+        i
+    }"#,
+            "new_name",
+            r#"
+    fn foo(mut new_name : u32) -> u32 {
+        new_name
+    }"#,
+        );
+    }
+    #[test]
+    fn test_rename_mod() {
+        let (analysis, position) = analysis_and_position(
+            "
+            //- /lib.rs
+            mod bar;
+            //- /bar.rs
+            mod foo<|>;
+            //- /bar/foo.rs
+            // emtpy
+            ",
+        );
+        let new_name = "foo2";
+        let source_change = analysis.rename(position, new_name).unwrap();
+        assert_debug_snapshot!(&source_change,
+@r###"
+        Some(
+            RangeInfo {
+                range: [4; 7),
+                info: 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]
+    fn test_rename_mod_in_dir() {
+        let (analysis, position) = analysis_and_position(
+            "
+            //- /lib.rs
+            mod fo<|>o;
+            //- /foo/mod.rs
+            // emtpy
+            ",
+        );
+        let new_name = "foo2";
+        let source_change = analysis.rename(position, new_name).unwrap();
+        assert_debug_snapshot!(&source_change,
+        @r###"
+        Some(
+            RangeInfo {
+                range: [4; 7),
+                info: 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) {
+        let (analysis, position) = single_file_with_position(text);
+        let source_change = analysis.rename(position, new_name).unwrap();
+        let mut text_edit_builder = ra_text_edit::TextEditBuilder::default();
+        let mut file_id: Option<FileId> = None;
+        if let Some(change) = source_change {
+            for edit in change.info.source_file_edits {
+                file_id = Some(edit.file_id);
+                for atom in edit.edit.as_atoms() {
+                    text_edit_builder.replace(atom.delete, atom.insert.clone());
+                }
+            }
+        }
+        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/references/search_scope.rs b/crates/ra_ide_api/src/references/search_scope.rs
new file mode 100644
index 000000000..5cb69b8fc
--- /dev/null
+++ b/crates/ra_ide_api/src/references/search_scope.rs
@@ -0,0 +1,92 @@
+//! Generally, `search_scope` returns files that might contain references for the element.
+//! For `pub(crate)` things it's a crate, for `pub` things it's a crate and dependant crates.
+//! In some cases, the location of the references is known to within a `TextRange`,
+//! e.g. for things like local variables.
+use hir::{DefWithBody, HasSource, ModuleSource};
+use ra_db::{FileId, SourceDatabase, SourceDatabaseExt};
+use ra_syntax::{AstNode, TextRange};
+use rustc_hash::FxHashSet;
+use crate::db::RootDatabase;
+use super::{NameDefinition, NameKind};
+impl NameDefinition {
+    pub(crate) fn search_scope(&self, db: &RootDatabase) -> FxHashSet<(FileId, Option<TextRange>)> {
+        let module_src = self.container.definition_source(db);
+        let file_id = module_src.file_id.original_file(db);
+        if let NameKind::Pat((def, _)) = self.kind {
+            let mut res = FxHashSet::default();
+            let range = match def {
+                DefWithBody::Function(f) => f.source(db).ast.syntax().text_range(),
+                DefWithBody::Const(c) => c.source(db).ast.syntax().text_range(),
+                DefWithBody::Static(s) => s.source(db).ast.syntax().text_range(),
+            };
+            res.insert((file_id, Some(range)));
+            return res;
+        }
+        let vis =
+            self.visibility.as_ref().map(|v| v.syntax().to_string()).unwrap_or("".to_string());
+        if vis.as_str() == "pub(super)" {
+            if let Some(parent_module) = self.container.parent(db) {
+                let mut files = FxHashSet::default();
+                let parent_src = parent_module.definition_source(db);
+                let file_id = parent_src.file_id.original_file(db);
+                match parent_src.ast {
+                    ModuleSource::Module(m) => {
+                        let range = Some(m.syntax().text_range());
+                        files.insert((file_id, range));
+                    }
+                    ModuleSource::SourceFile(_) => {
+                        files.insert((file_id, None));
+                        files.extend(parent_module.children(db).map(|m| {
+                            let src = m.definition_source(db);
+                            (src.file_id.original_file(db), None)
+                        }));
+                    }
+                }
+                return files;
+            }
+        }
+        if vis.as_str() != "" {
+            let source_root_id = db.file_source_root(file_id);
+            let source_root = db.source_root(source_root_id);
+            let mut files =
+                source_root.walk().map(|id| (id.into(), None)).collect::<FxHashSet<_>>();
+            // FIXME: add "pub(in path)"
+            if vis.as_str() == "pub(crate)" {
+                return files;
+            }
+            if vis.as_str() == "pub" {
+                let krate = self.container.krate(db).unwrap();
+                let crate_graph = db.crate_graph();
+                for crate_id in crate_graph.iter() {
+                    let mut crate_deps = crate_graph.dependencies(crate_id);
+                    if crate_deps.any(|dep| dep.crate_id() == krate.crate_id()) {
+                        let root_file = crate_graph.crate_root(crate_id);
+                        let source_root_id = db.file_source_root(root_file);
+                        let source_root = db.source_root(source_root_id);
+                        files.extend(source_root.walk().map(|id| (id.into(), None)));
+                    }
+                }
+                return files;
+            }
+        }
+        let mut res = FxHashSet::default();
+        let range = match module_src.ast {
+            ModuleSource::Module(m) => Some(m.syntax().text_range()),
+            ModuleSource::SourceFile(_) => None,
+        };
+        res.insert((file_id, range));
+        res
+    }
+}
diff --git a/crates/ra_ide_api/src/snapshots/highlighting.html b/crates/ra_ide_api/src/snapshots/highlighting.html
index ae30ebba3..b39c4d371 100644
--- a/crates/ra_ide_api/src/snapshots/highlighting.html
+++ b/crates/ra_ide_api/src/snapshots/highlighting.html
@@ -19,7 +19,7 @@ pre                 { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
 .keyword\.unsafe   { color: #DFAF8F; }
 .keyword\.control  { color: #F0DFAF; font-weight: bold; }
 </style>
-<pre><code><span class="attribute">#</span><span class="attribute">[</span><span class="attribute text">derive</span><span class="attribute">(</span><span class="attribute">Clone</span><span class="attribute">,</span><span class="attribute"> </span><span class="attribute">Debug</span><span class="attribute">)</span><span class="attribute">]</span>
+<pre><code><span class="attribute">#</span><span class="attribute">[</span><span class="attribute">derive</span><span class="attribute">(</span><span class="attribute">Clone</span><span class="attribute">,</span><span class="attribute"> </span><span class="attribute">Debug</span><span class="attribute">)</span><span class="attribute">]</span>
 <span class="keyword">struct</span> <span class="type">Foo</span> {
    <span class="keyword">pub</span> <span class="field">x</span>: <span class="type">i32</span>,
    <span class="keyword">pub</span> <span class="field">y</span>: <span class="type">i32</span>,
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index 797e9926f..5729eb5b3 100644
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -29,7 +29,7 @@ use std::{
 use fst::{self, Streamer};
 use ra_db::{
    salsa::{self, ParallelDatabase},
-    SourceDatabase, SourceRootId,
+    SourceDatabaseExt, SourceRootId,
 };
 use ra_syntax::{
    ast::{self, NameOwner},
diff --git a/crates/ra_ide_api/src/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index 9ae2dc061..33f3caceb 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -14,7 +14,7 @@ use ra_syntax::{
 use crate::{
    db::RootDatabase,
-    name_ref_kind::{classify_name_ref, NameRefKind::*},
+    references::{classify_name_ref, NameKind::*},
    FileId,
 };
@@ -97,13 +97,14 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
            STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string",
            ATTR => "attribute",
            NAME_REF => {
+                if node.ancestors().any(|it| it.kind() == ATTR) {
+                    continue;
+                }
                if let Some(name_ref) = node.as_node().cloned().and_then(ast::NameRef::cast) {
-                    // FIXME: try to reuse the SourceAnalyzers
+                    let name_kind = classify_name_ref(db, file_id, &name_ref).map(|d| d.kind);
-                    let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
+                    match name_kind {
-                    match classify_name_ref(db, &analyzer, &name_ref) {
-                        Some(Method(_)) => "function",
                        Some(Macro(_)) => "macro",
-                        Some(FieldAccess(_)) => "field",
+                        Some(Field(_)) => "field",
                        Some(AssocItem(hir::AssocItem::Function(_))) => "function",
                        Some(AssocItem(hir::AssocItem::Const(_))) => "constant",
                        Some(AssocItem(hir::AssocItem::TypeAlias(_))) => "type",
@@ -117,7 +118,7 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
                        Some(Def(hir::ModuleDef::TypeAlias(_))) => "type",
                        Some(Def(hir::ModuleDef::BuiltinType(_))) => "type",
                        Some(SelfType(_)) => "type",
-                        Some(Pat(ptr)) => {
+                        Some(Pat((_, ptr))) => {
                            let pat = ptr.to_node(&root);
                            if let Some(name) = pat.name() {
                                let text = name.text();
@@ -127,6 +128,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
                                    Some(calc_binding_hash(file_id, &text, *shadow_count))
                            }
+                            let analyzer =
+                                hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
                            if is_variable_mutable(db, &analyzer, ptr.to_node(&root)) {
                                "variable.mut"
                            } else {
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index aedc55a95..dd4d3bf9a 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"]
 [dependencies]
 threadpool = "1.7.1"
-relative-path = "0.4.0"
+relative-path = "1.0.0"
 serde_json = "1.0.34"
 serde = { version = "1.0.83", features = ["derive"] }
 crossbeam-channel = "0.3.5"
@@ -16,10 +16,8 @@ lsp-types = { version = "0.61.0", features = ["proposed"] }
 rustc-hash = "1.0"
 parking_lot = "0.9.0"
 jod-thread = "0.1.0"
-ra_vfs = "0.4.0"
+ra_vfs = "0.5.0"
 ra_syntax = { path = "../ra_syntax" }
-ra_db = { path = "../ra_db" }
-ra_cfg = { path = "../ra_cfg" }
 ra_text_edit = { path = "../ra_text_edit" }
 ra_ide_api = { path = "../ra_ide_api" }
 lsp-server = "0.2.0"
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index 1318a1738..ee503633d 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -227,22 +227,57 @@ impl ConvWith<(&LineIndex, LineEndings)> for &AtomTextEdit {
    }
 }
-impl ConvWith<&LineIndex> for Fold {
+pub(crate) struct FoldConvCtx<'a> {
+    pub(crate) text: &'a str,
+    pub(crate) line_index: &'a LineIndex,
+    pub(crate) line_folding_only: bool,
+}
+impl ConvWith<&FoldConvCtx<'_>> for Fold {
    type Output = lsp_types::FoldingRange;
-    fn conv_with(self, line_index: &LineIndex) -> lsp_types::FoldingRange {
+    fn conv_with(self, ctx: &FoldConvCtx) -> lsp_types::FoldingRange {
-        let range = self.range.conv_with(&line_index);
+        let kind = match self.kind {
-        lsp_types::FoldingRange {
+            FoldKind::Comment => Some(lsp_types::FoldingRangeKind::Comment),
-            start_line: range.start.line,
+            FoldKind::Imports => Some(lsp_types::FoldingRangeKind::Imports),
-            start_character: Some(range.start.character),
+            FoldKind::Mods => None,
-            end_line: range.end.line,
+            FoldKind::Block => None,
-            end_character: Some(range.end.character),
+        };
-            kind: match self.kind {
-                FoldKind::Comment => Some(lsp_types::FoldingRangeKind::Comment),
+        let range = self.range.conv_with(&ctx.line_index);
-                FoldKind::Imports => Some(lsp_types::FoldingRangeKind::Imports),
-                FoldKind::Mods => None,
+        if ctx.line_folding_only {
-                FoldKind::Block => None,
+            // Clients with line_folding_only == true (such as VSCode) will fold the whole end line
-            },
+            // even if it contains text not in the folding range. To prevent that we exclude
+            // range.end.line from the folding region if there is more text after range.end
+            // on the same line.
+            let has_more_text_on_end_line = ctx.text
+                [TextRange::from_to(self.range.end(), TextUnit::of_str(ctx.text))]
+            .chars()
+            .take_while(|it| *it != '\n')
+            .any(|it| !it.is_whitespace());
+            let end_line = if has_more_text_on_end_line {
+                range.end.line.saturating_sub(1)
+            } else {
+                range.end.line
+            };
+            lsp_types::FoldingRange {
+                start_line: range.start.line,
+                start_character: None,
+                end_line,
+                end_character: None,
+                kind,
+            }
+        } else {
+            lsp_types::FoldingRange {
+                start_line: range.start.line,
+                start_character: Some(range.start.character),
+                end_line: range.end.line,
+                end_character: Some(range.end.character),
+                kind,
+            }
        }
    }
 }
@@ -512,3 +547,46 @@ where
        self.map(|it| it.try_conv_with(ctx)).collect()
    }
 }
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use test_utils::extract_ranges;
+    #[test]
+    fn conv_fold_line_folding_only_fixup() {
+        let text = r#"<fold>mod a;
+mod b;
+mod c;</fold>
+fn main() <fold>{
+    if cond <fold>{
+        a::do_a();
+    }</fold> else <fold>{
+        b::do_b();
+    }</fold>
+}</fold>"#;
+        let (ranges, text) = extract_ranges(text, "fold");
+        assert_eq!(ranges.len(), 4);
+        let folds = vec![
+            Fold { range: ranges[0], kind: FoldKind::Mods },
+            Fold { range: ranges[1], kind: FoldKind::Block },
+            Fold { range: ranges[2], kind: FoldKind::Block },
+            Fold { range: ranges[3], kind: FoldKind::Block },
+        ];
+        let line_index = LineIndex::new(&text);
+        let ctx = FoldConvCtx { text: &text, line_index: &line_index, line_folding_only: true };
+        let converted: Vec<_> = folds.into_iter().map_conv_with(&ctx).collect();
+        let expected_lines = [(0, 2), (4, 10), (5, 6), (7, 9)];
+        assert_eq!(converted.len(), expected_lines.len());
+        for (folding_range, (start_line, end_line)) in converted.iter().zip(expected_lines.iter()) {
+            assert_eq!(folding_range.start_line, *start_line);
+            assert_eq!(folding_range.start_character, None);
+            assert_eq!(folding_range.end_line, *end_line);
+            assert_eq!(folding_range.end_character, None);
+        }
+    }
+}
diff --git a/crates/ra_lsp_server/src/lib.rs b/crates/ra_lsp_server/src/lib.rs
index 7a71a90fb..0e5dbbbd5 100644
--- a/crates/ra_lsp_server/src/lib.rs
+++ b/crates/ra_lsp_server/src/lib.rs
@@ -7,7 +7,7 @@ mod conv;
 mod main_loop;
 mod markdown;
 pub mod req;
-pub mod config;
+mod config;
 mod world;
 pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 35c35d32b..0b5d9c44d 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -111,6 +111,21 @@ pub fn main_loop(
            connection.sender.send(request.into()).unwrap();
        }
+        let options = {
+            let text_document_caps = client_caps.text_document.as_ref();
+            Options {
+                publish_decorations: config.publish_decorations,
+                supports_location_link: text_document_caps
+                    .and_then(|it| it.definition)
+                    .and_then(|it| it.link_support)
+                    .unwrap_or(false),
+                line_folding_only: text_document_caps
+                    .and_then(|it| it.folding_range.as_ref())
+                    .and_then(|it| it.line_folding_only)
+                    .unwrap_or(false),
+            }
+        };
        let feature_flags = {
            let mut ff = FeatureFlags::default();
            for (flag, value) in config.feature_flags {
@@ -133,14 +148,7 @@ pub fn main_loop(
            config.lru_capacity,
            &globs,
            Watch(!config.use_client_watching),
-            Options {
+            options,
-                publish_decorations: config.publish_decorations,
-                supports_location_link: client_caps
-                    .text_document
-                    .and_then(|it| it.definition)
-                    .and_then(|it| it.link_support)
-                    .unwrap_or(false),
-            },
            feature_flags,
        )
    };
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 10e271376..307082865 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -18,7 +18,7 @@ use serde_json::to_value;
 use crate::{
    cargo_target_spec::{runnable_args, CargoTargetSpec},
-    conv::{to_location, Conv, ConvWith, MapConvWith, TryConvWith, TryConvWithToVec},
+    conv::{to_location, Conv, ConvWith, FoldConvCtx, MapConvWith, TryConvWith, TryConvWithToVec},
    req::{self, Decoration, InlayHint, InlayHintsParams, InlayKind},
    world::WorldSnapshot,
    LspError, Result,
@@ -383,8 +383,14 @@ pub fn handle_folding_range(
 ) -> Result<Option<Vec<FoldingRange>>> {
    let file_id = params.text_document.try_conv_with(&world)?;
    let folds = world.analysis().folding_ranges(file_id)?;
+    let text = world.analysis().file_text(file_id)?;
    let line_index = world.analysis().file_line_index(file_id)?;
-    let res = Some(folds.into_iter().map_conv_with(&*line_index).collect());
+    let ctx = FoldConvCtx {
+        text: &text,
+        line_index: &line_index,
+        line_folding_only: world.options.line_folding_only,
+    };
+    let res = Some(folds.into_iter().map_conv_with(&ctx).collect());
    Ok(res)
 }
@@ -475,7 +481,6 @@ 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 refs = match world.analysis().find_all_refs(position)? {
        None => return Ok(None),
@@ -484,13 +489,19 @@ pub fn handle_references(
    let locations = if params.context.include_declaration {
        refs.into_iter()
-            .filter_map(|r| to_location(r.file_id, r.range, &world, &line_index).ok())
+            .filter_map(|r| {
+                let line_index = world.analysis().file_line_index(r.file_id).ok()?;
+                to_location(r.file_id, r.range, &world, &line_index).ok()
+            })
            .collect()
    } else {
        // Only iterate over the references if include_declaration was false
        refs.references()
            .iter()
-            .filter_map(|r| to_location(r.file_id, r.range, &world, &line_index).ok())
+            .filter_map(|r| {
+                let line_index = world.analysis().file_line_index(r.file_id).ok()?;
+                to_location(r.file_id, r.range, &world, &line_index).ok()
+            })
            .collect()
    };
@@ -740,6 +751,7 @@ pub fn handle_document_highlight(
    Ok(Some(
        refs.into_iter()
+            .filter(|r| r.file_id == file_id)
            .map(|r| DocumentHighlight { range: r.range.conv_with(&line_index), kind: None })
            .collect(),
    ))
diff --git a/crates/ra_lsp_server/src/world.rs b/crates/ra_lsp_server/src/world.rs
index 27da751ab..51824e7a3 100644
--- a/crates/ra_lsp_server/src/world.rs
+++ b/crates/ra_lsp_server/src/world.rs
@@ -27,6 +27,7 @@ use crate::{
 pub struct Options {
    pub publish_decorations: bool,
    pub supports_location_link: bool,
+    pub line_folding_only: bool,
 }
 /// `WorldState` is the primary mutable state of the language server
@@ -98,8 +99,12 @@ impl WorldState {
        }
        // FIXME: Read default cfgs from config
-        let default_cfg_options =
+        let default_cfg_options = {
-            get_rustc_cfg_options().atom("test".into()).atom("debug_assertion".into());
+            let mut opts = get_rustc_cfg_options();
+            opts.insert_atom("test".into());
+            opts.insert_atom("debug_assertion".into());
+            opts
+        };
        // Create crate graph from all the workspaces
        let mut crate_graph = CrateGraph::default();
diff --git a/crates/ra_mbe/Cargo.toml b/crates/ra_mbe/Cargo.toml
index b058dde91..e8ef2457b 100644
--- a/crates/ra_mbe/Cargo.toml
+++ b/crates/ra_mbe/Cargo.toml
@@ -8,7 +8,6 @@ authors = ["rust-analyzer developers"]
 ra_syntax = { path = "../ra_syntax" }
 ra_parser = { path = "../ra_parser" }
 tt = { path = "../ra_tt", package = "ra_tt" }
-itertools = "0.8.0"
 rustc-hash = "1.0.0"
 smallvec = "0.6.9"
 log = "0.4.5"
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index 74b23e2f7..45f2e3de4 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -250,6 +250,7 @@ fn current_op(p: &Parser) -> (u8, SyntaxKind) {
        T![!] if p.at(T![!=])  => (5,  T![!=]),
        T![-] if p.at(T![-=])  => (1,  T![-=]),
        T![-]                  => (10, T![-]),
+        T![as]                 => (12, T![as]),
        _                      => NOT_AN_OP
    }
@@ -278,6 +279,14 @@ fn expr_bp(p: &mut Parser, r: Restrictions, bp: u8) -> (Option<CompletedMarker>,
        if op_bp < bp {
            break;
        }
+        // test as_precedence
+        // fn foo() {
+        //     let _ = &1 as *const i32;
+        // }
+        if p.at(T![as]) {
+            lhs = cast_expr(p, lhs);
+            continue;
+        }
        let m = lhs.precede(p);
        p.bump(op);
@@ -344,6 +353,7 @@ fn lhs(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)>
            ));
        }
    };
+    // parse the interior of the unary expression
    expr_bp(p, r, 255);
    Some((m.complete(p, kind), BlockLike::NotBlock))
 }
@@ -378,7 +388,6 @@ fn postfix_expr(
                }
            },
            T![?] => try_expr(p, lhs),
-            T![as] => cast_expr(p, lhs),
            _ => break,
        };
        allow_calls = true;
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml
index a65100031..b31c95903 100644
--- a/crates/ra_project_model/Cargo.toml
+++ b/crates/ra_project_model/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["rust-analyzer developers"]
 log = "0.4.5"
 rustc-hash = "1.0"
-cargo_metadata = "0.8.2"
+cargo_metadata = "0.9.0"
 ra_arena = { path = "../ra_arena" }
 ra_db = { path = "../ra_db" }
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 640a5ebd3..8b8663a78 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -134,13 +134,16 @@ impl ProjectWorkspace {
                            json_project::Edition::Edition2015 => Edition::Edition2015,
                            json_project::Edition::Edition2018 => Edition::Edition2018,
                        };
-                        let mut cfg_options = default_cfg_options.clone();
+                        let cfg_options = {
-                        for name in &krate.atom_cfgs {
+                            let mut opts = default_cfg_options.clone();
-                            cfg_options = cfg_options.atom(name.into());
+                            for name in &krate.atom_cfgs {
-                        }
+                                opts.insert_atom(name.into());
-                        for (key, value) in &krate.key_value_cfgs {
+                            }
-                            cfg_options = cfg_options.key_value(key.into(), value.into());
+                            for (key, value) in &krate.key_value_cfgs {
-                        }
+                                opts.insert_key_value(key.into(), value.into());
+                            }
+                            opts
+                        };
                        crates.insert(
                            crate_id,
                            crate_graph.add_crate_root(file_id, edition, cfg_options),
@@ -171,7 +174,12 @@ impl ProjectWorkspace {
                for krate in sysroot.crates() {
                    if let Some(file_id) = load(krate.root(&sysroot)) {
                        // Crates from sysroot have `cfg(test)` disabled
-                        let cfg_options = default_cfg_options.clone().remove_atom(&"test".into());
+                        let cfg_options = {
+                            let mut opts = default_cfg_options.clone();
+                            opts.remove_atom("test");
+                            opts
+                        };
                        let crate_id =
                            crate_graph.add_crate_root(file_id, Edition::Edition2018, cfg_options);
                        sysroot_crates.insert(krate, crate_id);
@@ -202,9 +210,11 @@ impl ProjectWorkspace {
                        let root = tgt.root(&cargo);
                        if let Some(file_id) = load(root) {
                            let edition = pkg.edition(&cargo);
-                            let cfg_options = default_cfg_options
+                            let cfg_options = {
-                                .clone()
+                                let mut opts = default_cfg_options.clone();
-                                .features(pkg.features(&cargo).iter().map(Into::into));
+                                opts.insert_features(pkg.features(&cargo).iter().map(Into::into));
+                                opts
+                            };
                            let crate_id =
                                crate_graph.add_crate_root(file_id, edition, cfg_options);
                            names.insert(crate_id, pkg.name(&cargo).to_string());
@@ -310,6 +320,14 @@ fn find_cargo_toml(path: &Path) -> Result<PathBuf> {
 pub fn get_rustc_cfg_options() -> CfgOptions {
    let mut cfg_options = CfgOptions::default();
+    // Some nightly-only cfgs, which are required for stdlib
+    {
+        cfg_options.insert_atom("target_thread_local".into());
+        for &target_has_atomic in ["16", "32", "64", "8", "cas", "ptr"].iter() {
+            cfg_options.insert_key_value("target_has_atomic".into(), target_has_atomic.into())
+        }
+    }
    match (|| -> Result<_> {
        // `cfg(test)` and `cfg(debug_assertion)` are handled outside, so we suppress them here.
        let output = Command::new("rustc").args(&["--print", "cfg", "-O"]).output()?;
@@ -321,11 +339,11 @@ pub fn get_rustc_cfg_options() -> CfgOptions {
        Ok(rustc_cfgs) => {
            for line in rustc_cfgs.lines() {
                match line.find('=') {
-                    None => cfg_options = cfg_options.atom(line.into()),
+                    None => cfg_options.insert_atom(line.into()),
                    Some(pos) => {
                        let key = &line[..pos];
                        let value = line[pos + 1..].trim_matches('"');
-                        cfg_options = cfg_options.key_value(key.into(), value.into());
+                        cfg_options.insert_key_value(key.into(), value.into());
                    }
                }
            }
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 9bc85404a..9c0e856e8 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -12,9 +12,10 @@ itertools = "0.8.0"
 rowan = "0.6.1"
 rustc_lexer = "0.1.0"
 rustc-hash = "1.0.1"
-arrayvec = "0.4.10"
+arrayvec = "0.5.1"
 once_cell = "1.2.0"
+# This crate transitively depends on `smol_str` via `rowan`.
 # ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here
 # to reduce number of compilations
 smol_str = { version = "0.1.12", features = ["serde"] }
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 03f3b5fbb..47bdbb81a 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -15,7 +15,7 @@ use crate::{
    },
    AstToken, Direction, InsertPosition, SmolStr, SyntaxElement,
    SyntaxKind::{ATTR, COMMENT, WHITESPACE},
-    SyntaxNode, T,
+    SyntaxNode, SyntaxToken, T,
 };
 impl ast::FnDef {
@@ -231,12 +231,92 @@ pub fn replace_descendants<N: AstNode, D: AstNode>(
    N::cast(new_syntax).unwrap()
 }
-// Note this is copy-pasted from fmt. It seems like fmt should be a separate
+#[derive(Debug, Clone, Copy)]
-// crate, but basic tree building should be this crate. However, tree building
+pub struct IndentLevel(pub u8);
-// might want to call into fmt...
+impl From<u8> for IndentLevel {
+    fn from(level: u8) -> IndentLevel {
+        IndentLevel(level)
+    }
+}
+impl IndentLevel {
+    pub fn from_node(node: &SyntaxNode) -> IndentLevel {
+        let first_token = match node.first_token() {
+            Some(it) => it,
+            None => return IndentLevel(0),
+        };
+        for ws in prev_tokens(first_token).filter_map(ast::Whitespace::cast) {
+            let text = ws.syntax().text();
+            if let Some(pos) = text.rfind('\n') {
+                let level = text[pos + 1..].chars().count() / 4;
+                return IndentLevel(level as u8);
+            }
+        }
+        IndentLevel(0)
+    }
+    pub fn increase_indent<N: AstNode>(self, node: N) -> N {
+        N::cast(self._increase_indent(node.syntax().clone())).unwrap()
+    }
+    fn _increase_indent(self, node: SyntaxNode) -> SyntaxNode {
+        let replacements: FxHashMap<SyntaxElement, SyntaxElement> = node
+            .descendants_with_tokens()
+            .filter_map(|el| el.into_token())
+            .filter_map(ast::Whitespace::cast)
+            .filter(|ws| {
+                let text = ws.syntax().text();
+                text.contains('\n')
+            })
+            .map(|ws| {
+                (
+                    ws.syntax().clone().into(),
+                    make::tokens::whitespace(&format!(
+                        "{}{:width$}",
+                        ws.syntax().text(),
+                        "",
+                        width = self.0 as usize * 4
+                    ))
+                    .into(),
+                )
+            })
+            .collect();
+        algo::replace_descendants(&node, &replacements)
+    }
+    pub fn decrease_indent<N: AstNode>(self, node: N) -> N {
+        N::cast(self._decrease_indent(node.syntax().clone())).unwrap()
+    }
+    fn _decrease_indent(self, node: SyntaxNode) -> SyntaxNode {
+        let replacements: FxHashMap<SyntaxElement, SyntaxElement> = node
+            .descendants_with_tokens()
+            .filter_map(|el| el.into_token())
+            .filter_map(ast::Whitespace::cast)
+            .filter(|ws| {
+                let text = ws.syntax().text();
+                text.contains('\n')
+            })
+            .map(|ws| {
+                (
+                    ws.syntax().clone().into(),
+                    make::tokens::whitespace(
+                        &ws.syntax()
+                            .text()
+                            .replace(&format!("\n{:1$}", "", self.0 as usize * 4), "\n"),
+                    )
+                    .into(),
+                )
+            })
+            .collect();
+        algo::replace_descendants(&node, &replacements)
+    }
+}
+// FIXME: replace usages with IndentLevel above
 fn leading_indent(node: &SyntaxNode) -> Option<SmolStr> {
-    let prev_tokens = std::iter::successors(node.first_token(), |token| token.prev_token());
+    for token in prev_tokens(node.first_token()?) {
-    for token in prev_tokens {
        if let Some(ws) = ast::Whitespace::cast(token.clone()) {
            let ws_text = ws.text();
            if let Some(pos) = ws_text.rfind('\n') {
@@ -250,6 +330,10 @@ fn leading_indent(node: &SyntaxNode) -> Option<SmolStr> {
    None
 }
+fn prev_tokens(token: SyntaxToken) -> impl Iterator<Item = SyntaxToken> {
+    iter::successors(Some(token), |token| token.prev_token())
+}
 #[must_use]
 fn insert_children<N: AstNode>(
    parent: &N,
@@ -269,3 +353,26 @@ fn replace_children<N: AstNode>(
    let new_syntax = algo::replace_children(parent.syntax(), to_replace, &mut to_insert);
    N::cast(new_syntax).unwrap()
 }
+#[test]
+fn test_increase_indent() {
+    let arm_list = {
+        let arm = make::match_arm(iter::once(make::placeholder_pat().into()), make::expr_unit());
+        make::match_arm_list(vec![arm.clone(), arm].into_iter())
+    };
+    assert_eq!(
+        arm_list.syntax().to_string(),
+        "{
+    _ => (),
+    _ => (),
+}"
+    );
+    let indented = IndentLevel(2).increase_indent(arm_list);
+    assert_eq!(
+        indented.syntax().to_string(),
+        "{
+            _ => (),
+            _ => (),
+        }"
+    );
+}
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index 287a40bee..00422ea91 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -128,6 +128,14 @@ pub fn where_clause(preds: impl Iterator<Item = ast::WherePred>) -> ast::WhereCl
    }
 }
+pub fn if_expression(condition: &ast::Expr, statement: &str) -> ast::IfExpr {
+    return ast_from_text(&format!(
+        "fn f() {{ if !{} {{\n    {}\n}}\n}}",
+        condition.syntax().text(),
+        statement
+    ));
+}
 fn ast_from_text<N: AstNode>(text: &str) -> N {
    let parse = SourceFile::parse(text);
    let res = parse.tree().syntax().descendants().find_map(N::cast).unwrap();
@@ -160,6 +168,12 @@ pub mod tokens {
            .unwrap()
    }
+    pub fn whitespace(text: &str) -> SyntaxToken {
+        assert!(text.trim().is_empty());
+        let sf = SourceFile::parse(text).ok().unwrap();
+        sf.syntax().first_child_or_token().unwrap().into_token().unwrap()
+    }
    pub fn single_newline() -> SyntaxToken {
        SOURCE_FILE
            .tree()
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index 25e6f64ce..0a8fd0612 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -1,5 +1,5 @@
 // Stores definitions which must be used in multiple places
-// See `cargo gen-syntax` (defined in crates/ra_tools/src/main.rs)
+// See `cargo xtask codegen` (defined in xtasks/src/main.rs)
 Grammar(
    punct: [
        (";", "SEMI"),
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rs b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rs
new file mode 100644
index 000000000..a06dec1fa
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rs
@@ -0,0 +1,3 @@
+fn foo() {
+    let _ = &1 as *const i32;
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.txt b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.txt
new file mode 100644
index 000000000..9e3767fb7
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.txt
@@ -0,0 +1,43 @@
+SOURCE_FILE@[0; 43)
+  FN_DEF@[0; 42)
+    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_EXPR@[9; 42)
+      BLOCK@[9; 42)
+        L_CURLY@[9; 10) "{"
+        WHITESPACE@[10; 15) "\n    "
+        LET_STMT@[15; 40)
+          LET_KW@[15; 18) "let"
+          WHITESPACE@[18; 19) " "
+          PLACEHOLDER_PAT@[19; 20)
+            UNDERSCORE@[19; 20) "_"
+          WHITESPACE@[20; 21) " "
+          EQ@[21; 22) "="
+          WHITESPACE@[22; 23) " "
+          CAST_EXPR@[23; 39)
+            REF_EXPR@[23; 25)
+              AMP@[23; 24) "&"
+              LITERAL@[24; 25)
+                INT_NUMBER@[24; 25) "1"
+            WHITESPACE@[25; 26) " "
+            AS_KW@[26; 28) "as"
+            WHITESPACE@[28; 29) " "
+            POINTER_TYPE@[29; 39)
+              STAR@[29; 30) "*"
+              CONST_KW@[30; 35) "const"
+              WHITESPACE@[35; 36) " "
+              PATH_TYPE@[36; 39)
+                PATH@[36; 39)
+                  PATH_SEGMENT@[36; 39)
+                    NAME_REF@[36; 39)
+                      IDENT@[36; 39) "i32"
+          SEMI@[39; 40) ";"
+        WHITESPACE@[40; 41) "\n"
+        R_CURLY@[41; 42) "}"
+  WHITESPACE@[42; 43) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rs b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rs
new file mode 100644
index 000000000..100fccc64
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rs
@@ -0,0 +1,7 @@
+fn foo() {
+    1 + *&2 + 3;
+    *&1 as u64;
+    *x(1);
+    &x[1];
+    -1..2;
+}
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.txt b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.txt
new file mode 100644
index 000000000..d30cb63ff
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.txt
@@ -0,0 +1,97 @@
+SOURCE_FILE@[0; 79)
+  FN_DEF@[0; 78)
+    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_EXPR@[9; 78)
+      BLOCK@[9; 78)
+        L_CURLY@[9; 10) "{"
+        WHITESPACE@[10; 15) "\n    "
+        EXPR_STMT@[15; 27)
+          BIN_EXPR@[15; 26)
+            BIN_EXPR@[15; 22)
+              LITERAL@[15; 16)
+                INT_NUMBER@[15; 16) "1"
+              WHITESPACE@[16; 17) " "
+              PLUS@[17; 18) "+"
+              WHITESPACE@[18; 19) " "
+              PREFIX_EXPR@[19; 22)
+                STAR@[19; 20) "*"
+                REF_EXPR@[20; 22)
+                  AMP@[20; 21) "&"
+                  LITERAL@[21; 22)
+                    INT_NUMBER@[21; 22) "2"
+            WHITESPACE@[22; 23) " "
+            PLUS@[23; 24) "+"
+            WHITESPACE@[24; 25) " "
+            LITERAL@[25; 26)
+              INT_NUMBER@[25; 26) "3"
+          SEMI@[26; 27) ";"
+        WHITESPACE@[27; 32) "\n    "
+        EXPR_STMT@[32; 43)
+          CAST_EXPR@[32; 42)
+            PREFIX_EXPR@[32; 35)
+              STAR@[32; 33) "*"
+              REF_EXPR@[33; 35)
+                AMP@[33; 34) "&"
+                LITERAL@[34; 35)
+                  INT_NUMBER@[34; 35) "1"
+            WHITESPACE@[35; 36) " "
+            AS_KW@[36; 38) "as"
+            WHITESPACE@[38; 39) " "
+            PATH_TYPE@[39; 42)
+              PATH@[39; 42)
+                PATH_SEGMENT@[39; 42)
+                  NAME_REF@[39; 42)
+                    IDENT@[39; 42) "u64"
+          SEMI@[42; 43) ";"
+        WHITESPACE@[43; 48) "\n    "
+        EXPR_STMT@[48; 54)
+          PREFIX_EXPR@[48; 53)
+            STAR@[48; 49) "*"
+            CALL_EXPR@[49; 53)
+              PATH_EXPR@[49; 50)
+                PATH@[49; 50)
+                  PATH_SEGMENT@[49; 50)
+                    NAME_REF@[49; 50)
+                      IDENT@[49; 50) "x"
+              ARG_LIST@[50; 53)
+                L_PAREN@[50; 51) "("
+                LITERAL@[51; 52)
+                  INT_NUMBER@[51; 52) "1"
+                R_PAREN@[52; 53) ")"
+          SEMI@[53; 54) ";"
+        WHITESPACE@[54; 59) "\n    "
+        EXPR_STMT@[59; 65)
+          REF_EXPR@[59; 64)
+            AMP@[59; 60) "&"
+            INDEX_EXPR@[60; 64)
+              PATH_EXPR@[60; 61)
+                PATH@[60; 61)
+                  PATH_SEGMENT@[60; 61)
+                    NAME_REF@[60; 61)
+                      IDENT@[60; 61) "x"
+              L_BRACK@[61; 62) "["
+              LITERAL@[62; 63)
+                INT_NUMBER@[62; 63) "1"
+              R_BRACK@[63; 64) "]"
+          SEMI@[64; 65) ";"
+        WHITESPACE@[65; 70) "\n    "
+        EXPR_STMT@[70; 76)
+          RANGE_EXPR@[70; 75)
+            PREFIX_EXPR@[70; 72)
+              MINUS@[70; 71) "-"
+              LITERAL@[71; 72)
+                INT_NUMBER@[71; 72) "1"
+            DOTDOT@[72; 74) ".."
+            LITERAL@[74; 75)
+              INT_NUMBER@[74; 75) "2"
+          SEMI@[75; 76) ";"
+        WHITESPACE@[76; 77) "\n"
+        R_CURLY@[77; 78) "}"
+  WHITESPACE@[78; 79) "\n"
diff --git a/crates/ra_tt/Cargo.toml b/crates/ra_tt/Cargo.toml
index 3328d312f..3fcc7f085 100644
--- a/crates/ra_tt/Cargo.toml
+++ b/crates/ra_tt/Cargo.toml
@@ -5,4 +5,6 @@ version = "0.1.0"
 authors = ["rust-analyzer developers"]
 [dependencies]
-smol_str = "0.1.9"
+# ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here
+# to reduce number of compilations
+smol_str = { version = "0.1.12", features = ["serde"] }
diff --git a/crates/ra_vfs_glob/Cargo.toml b/crates/ra_vfs_glob/Cargo.toml
index d1073b2be..83749675f 100644
--- a/crates/ra_vfs_glob/Cargo.toml
+++ b/crates/ra_vfs_glob/Cargo.toml
@@ -5,5 +5,5 @@ version = "0.1.0"
 authors = ["rust-analyzer developers"]
 [dependencies]
-ra_vfs = "0.4.0"
+ra_vfs = "0.5.0"
 globset = "0.4.4"
diff --git a/docs/dev/README.md b/docs/dev/README.md
index 0db3e731e..e5a7ea5f6 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -14,7 +14,7 @@ To learn more about how rust-analyzer works, see
 We also publish rustdoc docs to pages:
-https://rust-analyzer.github.io/rust-analyzer/ra_ide_api/index.html
+https://rust-analyzer.github.io/rust-analyzer/api-docs/ra_ide_api/
 Various organizational and process issues are discussed in this document.
@@ -65,8 +65,8 @@ integrating with editors. Currently, it contains plugins for VS Code (in
 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
+We have some automation infra in Rust in the `xtask` package. It contains
-stuff like formatting checking, code generation and powers `cargo install-ra`.
+stuff like formatting checking, code generation and powers `cargo xtask install`.
 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 install-ra --server --jemalloc` and
+I often just install development version with `cargo xtask install --server --jemalloc` and
 restart the host VS Code.
 See [./debugging.md](./debugging.md) for how to attach to rust-analyzer with
@@ -116,7 +116,7 @@ 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`.
+To install **only** the VS Code extension, use `cargo xtask install --client-code`.
 # Logging
@@ -153,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 install-ra --server --jemalloc`.
+  There's an alias for this: `cargo xtask install --server --jemalloc`.
 * `Rust Analyzer: Syntax Tree` shows syntax tree of the current file/selection.
diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index 1ffabc6ef..5ec5352e7 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md
@@ -45,21 +45,15 @@ can be quickly updated for small modifications.
 Some of the components of this repository are generated through automatic
 processes. These are outlined below:
- `gen-syntax`: The kinds of tokens that are reused in several places, so a generator
+- `cargo xtask codegen`: The kinds of tokens that are reused in several places, so a generator
-  is used. We use tera templates to generate the files listed below, based on
+  is used. We use `quote!` macro to generate the files listed below, based on
  the grammar described in [grammar.ron]:
-  - [ast/generated.rs][ast generated] in `ra_syntax` based on
+  - [ast/generated.rs][ast generated]
-    [ast/generated.tera.rs][ast source]
+  - [syntax_kind/generated.rs][syntax_kind generated]
-  - [syntax_kind/generated.rs][syntax_kind generated] in `ra_syntax` based on
-    [syntax_kind/generated.tera.rs][syntax_kind source]
-[tera]: https://tera.netlify.com/
 [grammar.ron]: ../../crates/ra_syntax/src/grammar.ron
 [ast generated]: ../../crates/ra_syntax/src/ast/generated.rs
-[ast source]: ../../crates/ra_syntax/src/ast/generated.rs.tera
 [syntax_kind generated]: ../../crates/ra_parser/src/syntax_kind/generated.rs
-[syntax_kind source]: ../../crates/ra_parser/src/syntax_kind/generated.rs.tera
 ## Code Walk-Through
@@ -77,7 +71,7 @@ Rust syntax tree structure and parser. See
  This is the thing that turns a flat list of events into a tree (see `EventProcessor`)
 - `ast` provides a type safe API on top of the raw `rowan` tree.
 - `grammar.ron` RON description of the grammar, which is used to
-  generate `syntax_kinds` and `ast` modules, using `cargo gen-syntax` command.
+  generate `syntax_kinds` and `ast` modules, using `cargo xtask codegen` command.
 - `algo`: generic tree algorithms, including `walk` for O(1) stack
  space tree traversal (this is cool).
diff --git a/docs/user/README.md b/docs/user/README.md
index 036b51d58..f1628d6a4 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-ra --server`, which is a shorthand for `cargo
+install lsp server, use `cargo xtask install --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-ra
+$ cargo xtask install
 ```
 The automatic installation is expected to *just work* for common cases, if it
@@ -58,9 +58,28 @@ 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.
+For updates, pull the latest changes from the master branch, run `cargo xtask install` again, and **restart** VS Code instance.
 See [microsoft/vscode#72308](https://github.com/microsoft/vscode/issues/72308) for why a full restart is needed.
+### VS Code Remote
+You can also use `rust-analyzer` with the Visual Studio Code Remote extensions
+(Remote SSH, Remote WSL, Remote Containers). In this case, however, you have to
+manually install the `.vsix` package:
+1. Build the extension on the remote host using the instructions above (ignore the
+   error if `code` cannot be found in your PATH: VSCode doesn't need to be installed
+   on the remote host).
+2. In Visual Studio Code open a connection to the remote host.
+3. Open the Extensions View (`View > Extensions`, keyboard shortcut: `Ctrl+Shift+X`).
+4. From the top-right kebab menu (`···`) select `Install from VSIX...`
+5. Inside the `rust-analyzer` directory find the `editors/code` subdirectory and choose
+   the `ra-lsp-0.0.1.vsix` file.
+6. Restart Visual Studio Code and re-establish the connection to the remote host.
+In case of errors please make sure that `~/.cargo/bin` is in your `PATH` on the remote
+host.
 ### Settings
 * `rust-analyzer.highlightingOn`: enables experimental syntax highlighting
@@ -79,6 +98,7 @@ See [microsoft/vscode#72308](https://github.com/microsoft/vscode/issues/72308) f
 * `rust-analyzer.cargo-watch.command`: `cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )
 * `rust-analyzer.cargo-watch.arguments`: cargo-watch check arguments.
  (e.g: `--features="shumway,pdf"` will run as `cargo watch -x "check --features="shumway,pdf""` )
+* `rust-analyzer.cargo-watch.ignore`: list of patterns for cargo-watch to ignore (will be passed as `--ignore`)
 * `rust-analyzer.trace.server`: enables internal logging
 * `rust-analyzer.trace.cargo-watch`: enables cargo-watch logging
 * `RUST_SRC_PATH`: environment variable that overwrites the sysroot
diff --git a/docs/user/features.md b/docs/user/features.md
index 757a02838..8b7a8d7fc 100644
--- a/docs/user/features.md
+++ b/docs/user/features.md
@@ -459,17 +459,18 @@ fn foo<T: u32, F: FnOnce(T) -> T>() {}
 fn foo<T, F>() where T: u32, F: FnOnce(T) -> T {}
 ```
- Make raw string
+- Make raw string unescaped
 ```rust
 // before:
 fn f() {
-    let s = <|>"abcd";
+    let s = <|>"ab\ncd";
 }
 // after:
 fn f() {
-    let s = <|>r"abcd";
+    let s = <|>r#"ab
+cd"#;
 }
 ```
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index e4b706ce6..e6bcbfa60 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -87,9 +87,9 @@
            "dev": true
        },
        "acorn": {
-            "version": "7.0.0",
+            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-            "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==",
+            "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
            "dev": true
        },
        "agent-base": {
@@ -1212,22 +1212,14 @@
            }
        },
        "rollup": {
-            "version": "1.21.4",
+            "version": "1.23.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.21.4.tgz",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.23.1.tgz",
-            "integrity": "sha512-Pl512XVCmVzgcBz5h/3Li4oTaoDcmpuFZ+kdhS/wLreALz//WuDAMfomD3QEYl84NkDu6Z6wV9twlcREb4qQsw==",
+            "integrity": "sha512-95C1GZQpr/NIA0kMUQmSjuMDQ45oZfPgDBcN0yZwBG7Kee//m7H68vgIyg+SPuyrTZ5PrXfyLK80OzXeKG5dAA==",
            "dev": true,
            "requires": {
-                "@types/estree": "0.0.39",
+                "@types/estree": "*",
-                "@types/node": "^12.7.5",
+                "@types/node": "*",
-                "acorn": "^7.0.0"
+                "acorn": "^7.1.0"
-            },
-            "dependencies": {
-                "@types/node": {
-                    "version": "12.7.5",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz",
-                    "integrity": "sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==",
-                    "dev": true
-                }
            }
        },
        "rollup-plugin-commonjs": {
@@ -1315,9 +1307,9 @@
            }
        },
        "safe-buffer": {
-            "version": "5.1.2",
+            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
            "dev": true
        },
        "seedrandom": {
@@ -1410,12 +1402,12 @@
            }
        },
        "string_decoder": {
-            "version": "1.2.0",
+            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
            "dev": true,
            "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "~5.2.0"
            }
        },
        "strip-ansi": {
@@ -1546,9 +1538,9 @@
            "dev": true
        },
        "vsce": {
-            "version": "1.66.0",
+            "version": "1.67.1",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.66.0.tgz",
+            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.67.1.tgz",
-            "integrity": "sha512-Zf4+WD4PhEcOr7jkU08SI9lwFqDhmhk73YOCGQ/tNLaBy+PnnX4eSdqj9LdzDLuI2dsyomJLXzDSNgxuaInxCQ==",
+            "integrity": "sha512-Y/0fnfaLs2cCfytTGmy4Cp1bf9BaxHO7020YePdUwxjAlPlZ9+lm74M9yEFEWXTIug0L0sMax1WMz0TnozIqxg==",
            "dev": true,
            "requires": {
                "azure-devops-node-api": "^7.2.0",
diff --git a/editors/code/package.json b/editors/code/package.json
index 35211bcc2..4b719aada 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -39,11 +39,11 @@
        "@types/mocha": "^5.2.7",
        "@types/node": "^10.14.13",
        "@types/seedrandom": "^2.4.28",
-        "@types/vscode": "^1.36.0",
+        "@types/vscode": "^1.37.0",
        "glob": "^7.1.4",
        "mocha": "^6.2.0",
        "prettier": "^1.18.2",
-        "rollup": "^1.21.4",
+        "rollup": "^1.23.1",
        "rollup-plugin-commonjs": "^10.1.0",
        "rollup-plugin-node-resolve": "^5.2.0",
        "rollup-plugin-typescript": "^1.0.1",
@@ -51,7 +51,7 @@
        "tslint": "^5.18.0",
        "tslint-config-prettier": "^1.18.0",
        "typescript": "^3.5.3",
-        "vsce": "^1.66.0",
+        "vsce": "^1.67.0",
        "vscode-test": "^1.2.0"
    },
    "activationEvents": [
@@ -224,6 +224,16 @@
                    "description": "`cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )",
                    "default": "check"
                },
+                "rust-analyzer.cargo-watch.ignore": {
+                    "type": "array",
+                    "description": "A list of patterns for cargo-watch to ignore (will be passed as `--ignore`)",
+                    "default": []
+                },
+                "rust-analyzer.showWorkspaceLoadedNotification": {
+                    "type": "boolean",
+                    "description": "Controls whether rust-analyzer displays a notification when a project is loaded.",
+                    "default": false
+                },
                "rust-analyzer.trace.server": {
                    "type": "string",
                    "scope": "window",
diff --git a/editors/code/src/commands/cargo_watch.ts b/editors/code/src/commands/cargo_watch.ts
index 00b24dbce..59d4ba97a 100644
--- a/editors/code/src/commands/cargo_watch.ts
+++ b/editors/code/src/commands/cargo_watch.ts
@@ -93,10 +93,15 @@ export class CargoWatchProvider implements vscode.Disposable {
            args = '"' + args + '"';
        }
+        const ignoreFlags = Server.config.cargoWatchOptions.ignore.reduce(
+            (flags, pattern) => [...flags, '--ignore', pattern],
+            [] as string[]
+        );
        // Start the cargo watch with json message
        this.cargoProcess = child_process.spawn(
            'cargo',
-            ['watch', '-x', args],
+            ['watch', '-x', args, ...ignoreFlags],
            {
                stdio: ['ignore', 'pipe', 'pipe'],
                cwd: vscode.workspace.rootPath,
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 2578bc6d1..331936b5e 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -12,6 +12,7 @@ export interface CargoWatchOptions {
    arguments: string;
    command: string;
    trace: CargoWatchTraceOptions;
+    ignore: string[];
 }
 export class Config {
@@ -30,7 +31,8 @@ export class Config {
        enableOnStartup: 'ask',
        trace: 'off',
        arguments: '',
-        command: ''
+        command: '',
+        ignore: []
    };
    private prevEnhancedTyping: null | boolean = null;
@@ -125,6 +127,13 @@ export class Config {
            );
        }
+        if (config.has('cargo-watch.ignore')) {
+            this.cargoWatchOptions.ignore = config.get<string[]>(
+                'cargo-watch.ignore',
+                []
+            );
+        }
        if (config.has('lruCapacity')) {
            this.lruCapacity = config.get('lruCapacity') as number;
        }
diff --git a/website/src/index.html b/website/src/index.html
deleted file mode 100644
index 6fe22227b..000000000
--- a/website/src/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>Hello World! Site Title</title>
-</head>
-<body>
-    <h1>rust-analyzer</h1>
-    <ul>
-        <li>
-            <a href="./api-docs/ra_ide_api/">API Docs</a>
-        </li>
-        <li>
-            <a href="./wasm-demo/">WASM Demo</a>
-        </li>
-    </ul>
-</body>
-</html>
diff --git a/website/src/wasm-demo/index.html b/website/src/wasm-demo/index.html
deleted file mode 100644
index e81ccb0f7..000000000
--- a/website/src/wasm-demo/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>Hello World! Site Title</title>
-</head>
-<body>
-    TBD
-</body>
-</html>
diff --git a/website/website-gen/Cargo.toml b/website/website-gen/Cargo.toml
deleted file mode 100644
index b471a81fd..000000000
--- a/website/website-gen/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "website-gen"
-version = "0.0.0"
-authors = ["Aleksey Kladov <[email protected]>"]
-edition = "2018"
-publish = false
-[dependencies]
-walkdir = "2.2.0"
diff --git a/website/website-gen/src/main.rs b/website/website-gen/src/main.rs
deleted file mode 100644
index 7d35a37cf..000000000
--- a/website/website-gen/src/main.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use std::{fs, path::Path, process::Command};
-type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
-/// This tool builds the github-pages website to the `./target/website` folder
-fn main() {
-    if let Err(err) = try_main() {
-        eprintln!("{}", err);
-        std::process::exit(-1);
-    }
-}
-fn try_main() -> Result<()> {
-    check_cwd()?;
-    build_scaffold()?;
-    build_docs()?;
-    println!("Finished\n./target/website/index.html");
-    Ok(())
-}
-fn cargo() -> Command {
-    Command::new("cargo")
-}
-fn check_cwd() -> Result<()> {
-    let toml = std::fs::read_to_string("./Cargo.toml")?;
-    if !toml.contains("[workspace]") {
-        Err("website-gen should be run from the root of workspace")?;
-    }
-    Ok(())
-}
-fn build_docs() -> Result<()> {
-    let status = cargo().args(&["doc", "--all", "--no-deps"]).status()?;
-    if !status.success() {
-        Err("cargo doc failed")?;
-    }
-    sync_dir("./target/doc", "./target/website/api-docs")?;
-    Ok(())
-}
-fn build_scaffold() -> Result<()> {
-    sync_dir("./website/src", "./target/website")
-}
-fn sync_dir(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> Result<()> {
-    return sync_dir(src.as_ref(), dst.as_ref());
-    fn sync_dir(src: &Path, dst: &Path) -> Result<()> {
-        let _ = fs::remove_dir_all(dst);
-        fs::create_dir_all(dst)?;
-        for entry in walkdir::WalkDir::new(src) {
-            let entry = entry?;
-            let src_path = entry.path();
-            let dst_path = dst.join(src_path.strip_prefix(src)?);
-            if src_path.is_dir() {
-                fs::create_dir_all(dst_path)?;
-            } else {
-                fs::copy(src_path, dst_path)?;
-            }
-        }
-        Ok(())
-    }
-}
diff --git a/crates/ra_tools/Cargo.toml b/xtask/Cargo.toml
index 9cceacee3..4fc1c744b 100644
--- a/crates/ra_tools/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2018"
-name = "ra_tools"
+name = "xtask"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
diff --git a/crates/ra_tools/src/bin/pre-commit.rs b/xtask/src/bin/pre-commit.rs
index 16bbf9cb2..4ee864756 100644
--- a/crates/ra_tools/src/bin/pre-commit.rs
+++ b/xtask/src/bin/pre-commit.rs
@@ -2,7 +2,7 @@
 use std::process::Command;
-use ra_tools::{project_root, run, run_rustfmt, Overwrite, Result};
+use xtask::{project_root, run, run_rustfmt, Overwrite, Result};
 fn main() -> Result<()> {
    run_rustfmt(Overwrite)?;
diff --git a/crates/ra_tools/src/boilerplate_gen.rs b/xtask/src/boilerplate_gen.rs
index 39f1cae66..39f1cae66 100644
--- a/crates/ra_tools/src/boilerplate_gen.rs
+++ b/xtask/src/boilerplate_gen.rs
diff --git a/crates/ra_tools/src/help.rs b/xtask/src/help.rs
index 72dfabacd..4c6bf6b53 100644
--- a/crates/ra_tools/src/help.rs
+++ b/xtask/src/help.rs
@@ -12,15 +12,15 @@ SUBCOMMANDS:
    format
    format-hook
    fuzz-tests
-    gen-syntax
+    codegen
    gen-tests
-    install-ra
+    install
    lint";
-pub const INSTALL_RA_HELP: &str = "ra_tools-install-ra
+pub const INSTALL_HELP: &str = "ra_tools-install
 USAGE:
-    ra_tools.exe install-ra [FLAGS]
+    ra_tools.exe install [FLAGS]
 FLAGS:
        --client-code
@@ -43,5 +43,5 @@ FLAGS:
 pub const INSTALL_RA_CONFLICT: &str =
    "error: The argument `--server` cannot be used with `--client-code`
-                    
 For more information try --help";
diff --git a/crates/ra_tools/src/lib.rs b/xtask/src/lib.rs
index aa993a38a..a8685f567 100644
--- a/crates/ra_tools/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -78,7 +78,7 @@ pub fn collect_tests(s: &str) -> Vec<(usize, Test)> {
 }
 pub fn project_root() -> PathBuf {
-    Path::new(&env!("CARGO_MANIFEST_DIR")).ancestors().nth(2).unwrap().to_path_buf()
+    Path::new(&env!("CARGO_MANIFEST_DIR")).ancestors().nth(1).unwrap().to_path_buf()
 }
 pub struct Cmd<'a> {
@@ -146,7 +146,7 @@ pub fn install_format_hook() -> Result<()> {
        "./.git/hooks/pre-commit"
    });
    if !result_path.exists() {
-        run("cargo build --package ra_tools --bin pre-commit", ".")?;
+        run("cargo build --package xtask --bin pre-commit", ".")?;
        if cfg!(windows) {
            fs::copy("./target/debug/pre-commit.exe", result_path)?;
        } else {
diff --git a/crates/ra_tools/src/main.rs b/xtask/src/main.rs
index 161871ccf..c08915aac 100644
--- a/crates/ra_tools/src/main.rs
+++ b/xtask/src/main.rs
@@ -5,11 +5,14 @@ mod help;
 use core::fmt::Write;
 use core::str;
 use pico_args::Arguments;
-use ra_tools::{
+use std::{env, path::PathBuf};
+use xtask::{
    gen_tests, generate_boilerplate, install_format_hook, run, run_clippy, run_fuzzer, run_rustfmt,
-    Cmd, Overwrite, Result,
+    run_with_output, Cmd, Overwrite, Result,
 };
-use std::{env, path::PathBuf};
+// Latest stable, feel free to send a PR if this lags behind.
+const REQUIRED_RUST_VERSION: u32 = 38;
 struct InstallOpt {
    client: Option<ClientOpt>,
@@ -35,9 +38,9 @@ fn main() -> Result<()> {
    let mut matches = Arguments::from_vec(std::env::args_os().skip(2).collect());
    let subcommand = &*subcommand.to_string_lossy();
    match subcommand {
-        "install-ra" | "install-code" => {
+        "install" => {
            if matches.contains(["-h", "--help"]) {
-                eprintln!("{}", help::INSTALL_RA_HELP);
+                eprintln!("{}", help::INSTALL_HELP);
                return Ok(());
            }
            let server = matches.contains("--server");
@@ -61,7 +64,7 @@ fn main() -> Result<()> {
            }
            gen_tests(Overwrite)?
        }
-        "gen-syntax" => {
+        "codegen" => {
            if matches.contains(["-h", "--help"]) {
                help::print_no_param_subcommand_help(&subcommand);
                return Ok(());
@@ -210,9 +213,44 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
 }
 fn install_server(opts: ServerOpt) -> Result<()> {
-    if opts.jemalloc {
+    let mut old_rust = false;
+    if let Ok(output) = run_with_output("cargo --version", ".") {
+        if let Ok(stdout) = String::from_utf8(output.stdout) {
+            if !check_version(&stdout, REQUIRED_RUST_VERSION) {
+                old_rust = true;
+            }
+        }
+    }
+    if old_rust {
+        eprintln!(
+            "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
+            REQUIRED_RUST_VERSION
+        )
+    }
+    let res = if opts.jemalloc {
        run("cargo install --path crates/ra_lsp_server --locked --force --features jemalloc", ".")
    } else {
        run("cargo install --path crates/ra_lsp_server --locked --force", ".")
+    };
+    if res.is_err() && old_rust {
+        eprintln!(
+            "\nWARNING: at least rust 1.{}.0 is required to compile rust-analyzer\n",
+            REQUIRED_RUST_VERSION
+        )
+    }
+    res
+}
+fn check_version(version_output: &str, min_minor_version: u32) -> bool {
+    // Parse second the number out of
+    //      cargo 1.39.0-beta (1c6ec66d5 2019-09-30)
+    let minor: Option<u32> = version_output.split('.').nth(1).and_then(|it| it.parse().ok());
+    match minor {
+        None => true,
+        Some(minor) => minor >= min_minor_version,
    }
 }
diff --git a/crates/ra_tools/tests/cli.rs b/xtask/tests/tidy-tests/cli.rs
index 609fd4d8b..5d8ddea83 100644
--- a/crates/ra_tools/tests/cli.rs
+++ b/xtask/tests/tidy-tests/cli.rs
@@ -1,17 +1,17 @@
-use ra_tools::{gen_tests, generate_boilerplate, project_root, run_rustfmt, Verify};
 use walkdir::WalkDir;
+use xtask::{gen_tests, generate_boilerplate, project_root, run_rustfmt, Verify};
 #[test]
 fn generated_grammar_is_fresh() {
    if let Err(error) = generate_boilerplate(Verify) {
-        panic!("{}. Please update it by running `cargo gen-syntax`", error);
+        panic!("{}. Please update it by running `cargo xtask codegen`", error);
    }
 }
 #[test]
 fn generated_tests_are_fresh() {
    if let Err(error) = gen_tests(Verify) {
-        panic!("{}. Please update tests by running `cargo gen-tests`", error);
+        panic!("{}. Please update tests by running `cargo xtask gen-tests`", error);
    }
 }
diff --git a/crates/ra_tools/tests/docs.rs b/xtask/tests/tidy-tests/docs.rs
index ea3330175..fe5852bc6 100644
--- a/crates/ra_tools/tests/docs.rs
+++ b/xtask/tests/tidy-tests/docs.rs
@@ -5,7 +5,7 @@ use std::path::Path;
 use walkdir::{DirEntry, WalkDir};
-use ra_tools::project_root;
+use xtask::project_root;
 fn is_exclude_dir(p: &Path) -> bool {
    let exclude_dirs = ["tests", "test_data"];
diff --git a/crates/ra_tools/tests/main.rs b/xtask/tests/tidy-tests/main.rs
index 56d1318d6..56d1318d6 100644
--- a/crates/ra_tools/tests/main.rs
+++ b/xtask/tests/tidy-tests/main.rs