22 files changed, 1036 insertions, 946 deletions

diff --git a/Cargo.lock b/Cargo.lock
index c58c3035c..90a9f3822 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,15 +26,6 @@ dependencies = [
 
 [[package]]
 name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ansi_term"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
@@ -111,9 +102,9 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 
 [[package]]
 name = "cargo_metadata"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8de60b887edf6d74370fc8eb177040da4847d971d6234c7b13a6da324ef0caf"
+checksum = "052dbdd9db69a339d5fa9ac87bfe2e1319f709119f0345988a597af82bb1011c"
 dependencies = [
  "semver",
  "serde",
@@ -135,9 +126,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "chalk-derive"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9396f12a23b1a40d5019aa81bc0cbd7ccd2c9736d6bc4afc95868533c2346dcb"
+checksum = "eea3a22f0c30b2504ac4ab58934dac0d00b92a4d7788df32795cabca24c3f929"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -147,9 +138,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-ir"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e9c67d500717d65ede27affb7ae40efe240d86fbefff1006fe0ffb62d4caf9"
+checksum = "fb617b643e145e3b151502799e91a9625dd5daf1cf05dc2cb821bc75ae0c9cbd"
 dependencies = [
  "chalk-derive",
  "lazy_static",
@@ -157,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-recursive"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fd2ac0fc06c857b95614d229bbe8ea317d1d94a7e8b9442a3f05c9a2c2d5f4"
+checksum = "d280565c8eefbf9b2bc615df49c7dfd971faad37774bf65734e626fd23864bd6"
 dependencies = [
  "chalk-derive",
  "chalk-ir",
@@ -170,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-solve"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a79166f2405c1e51eadcc1344f5ee833c7b391532dd78f64a0731a9a123cc58"
+checksum = "be906fbca3f3077dce0e76d9864771d0f450c946af0d86b569fb9504148a065a"
 dependencies = [
  "chalk-derive",
  "chalk-ir",
@@ -470,6 +461,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "hashbrown"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
 name = "heck"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -509,11 +509,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe"
+checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
 dependencies = [
  "autocfg",
+ "hashbrown",
 ]
 
 [[package]]
@@ -642,9 +643,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "libc"
-version = "0.2.72"
+version = "0.2.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
+checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
 
 [[package]]
 name = "libloading"
@@ -984,9 +985,9 @@ checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
+checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
 dependencies = [
  "unicode-xid",
 ]
@@ -1505,9 +1506,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_lexer"
-version = "666.0.0"
+version = "669.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e00c526f9f8430ea4cd2178d25b02bfc7debe6677350c57292f92f50e65d2fe"
+checksum = "456af5f09c006cf6c22c1a433ee0232c4bb74bdc6c647a010166a47c94ed2a63"
 dependencies = [
  "unicode-xid",
 ]
@@ -1602,9 +1603,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
 dependencies = [
  "semver-parser",
  "serde",
@@ -1712,9 +1713,9 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f"
 
 [[package]]
 name = "syn"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b"
+checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1886,11 +1887,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c72c8cf3ec4ed69fef614d011a5ae4274537a8a8c59133558029bd731eb71659"
+checksum = "cafe899b943f5433c6cab468d75a17ea92948fe9fe60b00f41e13d5e0d4fd054"
 dependencies = [
- "ansi_term 0.11.0",
+ "ansi_term",
  "chrono",
  "lazy_static",
  "matchers",
@@ -1910,7 +1911,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37ee7f0f53ed2093971a698db799ef56a2dfd89b32e3aeb5165f0e637a02be04"
 dependencies = [
- "ansi_term 0.12.1",
+ "ansi_term",
  "atty",
  "chrono",
  "termcolor",
diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index 6804d9bda..ad376ad18 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@@ -22,6 +22,7 @@ pub use cargo_metadata::diagnostic::{
 pub enum FlycheckConfig {
     CargoCommand {
         command: String,
+        target_triple: Option<String>,
         all_targets: bool,
         all_features: bool,
         features: Vec<String>,
@@ -178,6 +179,7 @@ impl FlycheckActor {
         let mut cmd = match &self.config {
             FlycheckConfig::CargoCommand {
                 command,
+                target_triple,
                 all_targets,
                 all_features,
                 extra_args,
@@ -187,6 +189,10 @@ impl FlycheckActor {
                 cmd.arg(command);
                 cmd.args(&["--workspace", "--message-format=json", "--manifest-path"])
                     .arg(self.workspace_root.join("Cargo.toml"));
+
+                if let Some(target) = target_triple {
+                    cmd.args(&["--target", target.as_str()]);
+                }
                 if *all_targets {
                     cmd.arg("--all-targets");
                 }
diff --git a/crates/ra_assists/src/handlers/raw_string.rs b/crates/ra_assists/src/handlers/raw_string.rs
index ba1dcb610..4e8a0c2db 100644
--- a/crates/ra_assists/src/handlers/raw_string.rs
+++ b/crates/ra_assists/src/handlers/raw_string.rs
@@ -131,7 +131,7 @@ pub(crate) fn remove_hash(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
     let token = ctx.find_token_at_offset(RAW_STRING).and_then(ast::RawString::cast)?;
 
     let text = token.text().as_str();
-    if !text.starts_with("r#") && text.ends_with("#") {
+    if !text.starts_with("r#") && text.ends_with('#') {
         return None;
     }
 
diff --git a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
index dfd314abf..3d51faa54 100644
--- a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
@@ -106,7 +106,7 @@ fn maybe_replace_path(
     path: ast::Path,
     target: ast::Path,
 ) -> Option<()> {
-    if !path_eq(path.clone(), target.clone()) {
+    if !path_eq(path.clone(), target) {
         return None;
     }
 
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
index b279bdeef..5a9de3d3e 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/ra_hir_def/src/nameres.rs
@@ -229,12 +229,11 @@ impl CrateDefMap {
     // even), as this should be a great debugging aid.
     pub fn dump(&self) -> String {
         let mut buf = String::new();
-        go(&mut buf, self, "\ncrate", self.root);
-        return buf.trim().to_string();
+        go(&mut buf, self, "crate", self.root);
+        return buf;
 
         fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: LocalModuleId) {
-            *buf += path;
-            *buf += "\n";
+            format_to!(buf, "{}\n", path);
 
             let mut entries: Vec<_> = map.modules[module].scope.resolutions().collect();
             entries.sort_by_key(|(name, _)| name.clone());
@@ -243,23 +242,24 @@ impl CrateDefMap {
                 format_to!(buf, "{}:", name);
 
                 if def.types.is_some() {
-                    *buf += " t";
+                    buf.push_str(" t");
                 }
                 if def.values.is_some() {
-                    *buf += " v";
+                    buf.push_str(" v");
                 }
                 if def.macros.is_some() {
-                    *buf += " m";
+                    buf.push_str(" m");
                 }
                 if def.is_none() {
-                    *buf += " _";
+                    buf.push_str(" _");
                 }
 
-                *buf += "\n";
+                buf.push_str("\n");
             }
 
             for (name, child) in map.modules[module].children.iter() {
-                let path = &format!("{}::{}", path, name);
+                let path = format!("{}::{}", path, name);
+                buf.push('\n');
                 go(buf, map, &path, *child);
             }
         }
diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/ra_hir_def/src/nameres/tests.rs
index 02dca80c2..205d3528b 100644
--- a/crates/ra_hir_def/src/nameres/tests.rs
+++ b/crates/ra_hir_def/src/nameres/tests.rs
@@ -21,7 +21,7 @@ fn compute_crate_def_map(fixture: &str) -> Arc<CrateDefMap> {
 fn check(ra_fixture: &str, expect: Expect) {
     let db = TestDB::with_files(ra_fixture);
     let krate = db.crate_graph().iter().next().unwrap();
-    let actual = db.crate_def_map(krate).dump() + "\n";
+    let actual = db.crate_def_map(krate).dump();
     expect.assert_eq(&actual);
 }
 
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 78f5e55bb..548a3fc1f 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -28,9 +28,9 @@ test_utils = { path = "../test_utils" }
 
 scoped-tls = "1"
 
-chalk-solve = { version = "0.17.0" }
-chalk-ir = { version = "0.17.0" }
-chalk-recursive = { version = "0.17.0" }
+chalk-solve = { version = "0.18.0" }
+chalk-ir = { version = "0.18.0" }
+chalk-recursive = { version = "0.18.0" }
 
 [dev-dependencies]
 insta = "0.16.0"
diff --git a/crates/ra_hir_ty/src/display.rs b/crates/ra_hir_ty/src/display.rs
index 758d5f5ac..19770e609 100644
--- a/crates/ra_hir_ty/src/display.rs
+++ b/crates/ra_hir_ty/src/display.rs
@@ -257,7 +257,12 @@ impl HirDisplay for ApplicationTy {
                 write!(f, ")")?;
                 let ret = sig.ret();
                 if *ret != Ty::unit() {
-                    write!(f, " -> {}", ret.display(f.db))?;
+                    let ret_display = if f.omit_verbose_types() {
+                        ret.display_truncated(f.db, f.max_size)
+                    } else {
+                        ret.display(f.db)
+                    };
+                    write!(f, " -> {}", ret_display)?;
                 }
             }
             TypeCtor::FnDef(def) => {
@@ -288,7 +293,12 @@ impl HirDisplay for ApplicationTy {
                 write!(f, ")")?;
                 let ret = sig.ret();
                 if *ret != Ty::unit() {
-                    write!(f, " -> {}", ret.display(f.db))?;
+                    let ret_display = if f.omit_verbose_types() {
+                        ret.display_truncated(f.db, f.max_size)
+                    } else {
+                        ret.display(f.db)
+                    };
+                    write!(f, " -> {}", ret_display)?;
                 }
             }
             TypeCtor::Adt(def_id) => {
@@ -397,7 +407,13 @@ impl HirDisplay for ApplicationTy {
                         f.write_joined(sig.params(), ", ")?;
                         write!(f, "|")?;
                     };
-                    write!(f, " -> {}", sig.ret().display(f.db))?;
+
+                    let ret_display = if f.omit_verbose_types() {
+                        sig.ret().display_truncated(f.db, f.max_size)
+                    } else {
+                        sig.ret().display(f.db)
+                    };
+                    write!(f, " -> {}", ret_display)?;
                 } else {
                     write!(f, "{{closure}}")?;
                 }
diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs
index f274579ea..1eacc6f95 100644
--- a/crates/ra_hir_ty/src/lower.rs
+++ b/crates/ra_hir_ty/src/lower.rs
@@ -341,7 +341,7 @@ impl Ty {
                     let segment = remaining_segments.first().unwrap();
                     let found = associated_type_by_name_including_super_traits(
                         ctx.db,
-                        trait_ref.clone(),
+                        trait_ref,
                         &segment.name,
                     );
                     match found {
diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs
index c972bf845..59a21092e 100644
--- a/crates/ra_hir_ty/src/tests.rs
+++ b/crates/ra_hir_ty/src/tests.rs
@@ -10,6 +10,7 @@ mod display_source_code;
 
 use std::sync::Arc;
 
+use expect::Expect;
 use hir_def::{
     body::{BodySourceMap, SyntheticSyntax},
     child_by_source::ChildBySource,
@@ -344,3 +345,15 @@ fn typing_whitespace_inside_a_function_should_not_invalidate_types() {
         assert!(!format!("{:?}", events).contains("infer"), "{:#?}", events)
     }
 }
+
+fn check_infer(ra_fixture: &str, expect: Expect) {
+    let mut actual = infer(ra_fixture);
+    actual.push('\n');
+    expect.assert_eq(&actual);
+}
+
+fn check_infer_with_mismatches(ra_fixture: &str, expect: Expect) {
+    let mut actual = infer_with_mismatches(ra_fixture, true);
+    actual.push('\n');
+    expect.assert_eq(&actual);
+}
diff --git a/crates/ra_hir_ty/src/tests/coercion.rs b/crates/ra_hir_ty/src/tests/coercion.rs
index d7fb6a962..17efd75cb 100644
--- a/crates/ra_hir_ty/src/tests/coercion.rs
+++ b/crates/ra_hir_ty/src/tests/coercion.rs
@@ -1,345 +1,381 @@
-use insta::assert_snapshot;
+use expect::expect;
 use test_utils::mark;
 
-use super::infer_with_mismatches;
-
-// Infer with some common definitions and impls.
-fn infer(source: &str) -> String {
-    let defs = r#"
-        #[lang = "sized"]
-        pub trait Sized {}
-        #[lang = "unsize"]
-        pub trait Unsize<T: ?Sized> {}
-        #[lang = "coerce_unsized"]
-        pub trait CoerceUnsized<T> {}
-
-        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
-        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
-    "#;
-
-    // Append to the end to keep positions unchanged.
-    super::infer(&format!("{}{}", source, defs))
-}
+use super::{check_infer, check_infer_with_mismatches};
 
 #[test]
 fn infer_block_expr_type_mismatch() {
-    assert_snapshot!(
-        infer(r#"
-fn test() {
-    let a: i32 = { 1i64 };
-}
-"#),
-        @r###"
-    10..40 '{     ...4 }; }': ()
-    20..21 'a': i32
-    29..37 '{ 1i64 }': i64
-    31..35 '1i64': i64
-    "###);
+    check_infer(
+        r"
+        fn test() {
+            let a: i32 = { 1i64 };
+        }
+        ",
+        expect![[r"
+            10..40 '{     ...4 }; }': ()
+            20..21 'a': i32
+            29..37 '{ 1i64 }': i64
+            31..35 '1i64': i64
+        "]],
+    );
 }
 
 #[test]
 fn coerce_places() {
-    assert_snapshot!(
-        infer(r#"
-struct S<T> { a: T }
+    check_infer(
+        r#"
+        struct S<T> { a: T }
 
-fn f<T>(_: &[T]) -> T { loop {} }
-fn g<T>(_: S<&[T]>) -> T { loop {} }
+        fn f<T>(_: &[T]) -> T { loop {} }
+        fn g<T>(_: S<&[T]>) -> T { loop {} }
 
-fn gen<T>() -> *mut [T; 2] { loop {} }
-fn test1<U>() -> *mut [U] {
-    gen()
-}
+        fn gen<T>() -> *mut [T; 2] { loop {} }
+        fn test1<U>() -> *mut [U] {
+            gen()
+        }
 
-fn test2() {
-    let arr: &[u8; 1] = &[1];
+        fn test2() {
+            let arr: &[u8; 1] = &[1];
 
-    let a: &[_] = arr;
-    let b = f(arr);
-    let c: &[_] = { arr };
-    let d = g(S { a: arr });
-    let e: [&[_]; 1] = [arr];
-    let f: [&[_]; 2] = [arr; 2];
-    let g: (&[_], &[_]) = (arr, arr);
-}
-"#),
-        @r###"
-    30..31 '_': &[T]
-    44..55 '{ loop {} }': T
-    46..53 'loop {}': !
-    51..53 '{}': ()
-    64..65 '_': S<&[T]>
-    81..92 '{ loop {} }': T
-    83..90 'loop {}': !
-    88..90 '{}': ()
-    121..132 '{ loop {} }': *mut [T; _]
-    123..130 'loop {}': !
-    128..130 '{}': ()
-    159..172 '{     gen() }': *mut [U]
-    165..168 'gen': fn gen<U>() -> *mut [U; _]
-    165..170 'gen()': *mut [U; _]
-    185..419 '{     ...rr); }': ()
-    195..198 'arr': &[u8; _]
-    211..215 '&[1]': &[u8; _]
-    212..215 '[1]': [u8; _]
-    213..214 '1': u8
-    226..227 'a': &[u8]
-    236..239 'arr': &[u8; _]
-    249..250 'b': u8
-    253..254 'f': fn f<u8>(&[u8]) -> u8
-    253..259 'f(arr)': u8
-    255..258 'arr': &[u8; _]
-    269..270 'c': &[u8]
-    279..286 '{ arr }': &[u8]
-    281..284 'arr': &[u8; _]
-    296..297 'd': u8
-    300..301 'g': fn g<u8>(S<&[u8]>) -> u8
-    300..315 'g(S { a: arr })': u8
-    302..314 'S { a: arr }': S<&[u8]>
-    309..312 'arr': &[u8; _]
-    325..326 'e': [&[u8]; _]
-    340..345 '[arr]': [&[u8]; _]
-    341..344 'arr': &[u8; _]
-    355..356 'f': [&[u8]; _]
-    370..378 '[arr; 2]': [&[u8]; _]
-    371..374 'arr': &[u8; _]
-    376..377 '2': usize
-    388..389 'g': (&[u8], &[u8])
-    406..416 '(arr, arr)': (&[u8], &[u8])
-    407..410 'arr': &[u8; _]
-    412..415 'arr': &[u8; _]
-    "###
+            let a: &[_] = arr;
+            let b = f(arr);
+            let c: &[_] = { arr };
+            let d = g(S { a: arr });
+            let e: [&[_]; 1] = [arr];
+            let f: [&[_]; 2] = [arr; 2];
+            let g: (&[_], &[_]) = (arr, arr);
+        }
+
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T: ?Sized> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
+
+        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
+        "#,
+        expect![[r"
+            30..31 '_': &[T]
+            44..55 '{ loop {} }': T
+            46..53 'loop {}': !
+            51..53 '{}': ()
+            64..65 '_': S<&[T]>
+            81..92 '{ loop {} }': T
+            83..90 'loop {}': !
+            88..90 '{}': ()
+            121..132 '{ loop {} }': *mut [T; _]
+            123..130 'loop {}': !
+            128..130 '{}': ()
+            159..172 '{     gen() }': *mut [U]
+            165..168 'gen': fn gen<U>() -> *mut [U; _]
+            165..170 'gen()': *mut [U; _]
+            185..419 '{     ...rr); }': ()
+            195..198 'arr': &[u8; _]
+            211..215 '&[1]': &[u8; _]
+            212..215 '[1]': [u8; _]
+            213..214 '1': u8
+            226..227 'a': &[u8]
+            236..239 'arr': &[u8; _]
+            249..250 'b': u8
+            253..254 'f': fn f<u8>(&[u8]) -> u8
+            253..259 'f(arr)': u8
+            255..258 'arr': &[u8; _]
+            269..270 'c': &[u8]
+            279..286 '{ arr }': &[u8]
+            281..284 'arr': &[u8; _]
+            296..297 'd': u8
+            300..301 'g': fn g<u8>(S<&[u8]>) -> u8
+            300..315 'g(S { a: arr })': u8
+            302..314 'S { a: arr }': S<&[u8]>
+            309..312 'arr': &[u8; _]
+            325..326 'e': [&[u8]; _]
+            340..345 '[arr]': [&[u8]; _]
+            341..344 'arr': &[u8; _]
+            355..356 'f': [&[u8]; _]
+            370..378 '[arr; 2]': [&[u8]; _]
+            371..374 'arr': &[u8; _]
+            376..377 '2': usize
+            388..389 'g': (&[u8], &[u8])
+            406..416 '(arr, arr)': (&[u8], &[u8])
+            407..410 'arr': &[u8; _]
+            412..415 'arr': &[u8; _]
+        "]],
     );
 }
 
 #[test]
 fn infer_let_stmt_coerce() {
-    assert_snapshot!(
-        infer(r#"
-fn test() {
-    let x: &[isize] = &[1];
-    let x: *const [isize] = &[1];
-}
-"#),
-        @r###"
-    10..75 '{     ...[1]; }': ()
-    20..21 'x': &[isize]
-    34..38 '&[1]': &[isize; _]
-    35..38 '[1]': [isize; _]
-    36..37 '1': isize
-    48..49 'x': *const [isize]
-    68..72 '&[1]': &[isize; _]
-    69..72 '[1]': [isize; _]
-    70..71 '1': isize
-    "###);
+    check_infer(
+        r"
+        fn test() {
+            let x: &[isize] = &[1];
+            let x: *const [isize] = &[1];
+        }
+        ",
+        expect![[r"
+            10..75 '{     ...[1]; }': ()
+            20..21 'x': &[isize]
+            34..38 '&[1]': &[isize; _]
+            35..38 '[1]': [isize; _]
+            36..37 '1': isize
+            48..49 'x': *const [isize]
+            68..72 '&[1]': &[isize; _]
+            69..72 '[1]': [isize; _]
+            70..71 '1': isize
+        "]],
+    );
 }
 
 #[test]
 fn infer_custom_coerce_unsized() {
-    assert_snapshot!(
-        infer(r#"
-struct A<T: ?Sized>(*const T);
-struct B<T: ?Sized>(*const T);
-struct C<T: ?Sized> { inner: *const T }
-
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<B<U>> for B<T> {}
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<C<U>> for C<T> {}
-
-fn foo1<T>(x: A<[T]>) -> A<[T]> { x }
-fn foo2<T>(x: B<[T]>) -> B<[T]> { x }
-fn foo3<T>(x: C<[T]>) -> C<[T]> { x }
-
-fn test(a: A<[u8; 2]>, b: B<[u8; 2]>, c: C<[u8; 2]>) {
-    let d = foo1(a);
-    let e = foo2(b);
-    let f = foo3(c);
-}
-"#),
-        @r###"
-    257..258 'x': A<[T]>
-    278..283 '{ x }': A<[T]>
-    280..281 'x': A<[T]>
-    295..296 'x': B<[T]>
-    316..321 '{ x }': B<[T]>
-    318..319 'x': B<[T]>
-    333..334 'x': C<[T]>
-    354..359 '{ x }': C<[T]>
-    356..357 'x': C<[T]>
-    369..370 'a': A<[u8; _]>
-    384..385 'b': B<[u8; _]>
-    399..400 'c': C<[u8; _]>
-    414..480 '{     ...(c); }': ()
-    424..425 'd': A<[{unknown}]>
-    428..432 'foo1': fn foo1<{unknown}>(A<[{unknown}]>) -> A<[{unknown}]>
-    428..435 'foo1(a)': A<[{unknown}]>
-    433..434 'a': A<[u8; _]>
-    445..446 'e': B<[u8]>
-    449..453 'foo2': fn foo2<u8>(B<[u8]>) -> B<[u8]>
-    449..456 'foo2(b)': B<[u8]>
-    454..455 'b': B<[u8; _]>
-    466..467 'f': C<[u8]>
-    470..474 'foo3': fn foo3<u8>(C<[u8]>) -> C<[u8]>
-    470..477 'foo3(c)': C<[u8]>
-    475..476 'c': C<[u8; _]>
-    "###
+    check_infer(
+        r#"
+        struct A<T: ?Sized>(*const T);
+        struct B<T: ?Sized>(*const T);
+        struct C<T: ?Sized> { inner: *const T }
+
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<B<U>> for B<T> {}
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<C<U>> for C<T> {}
+
+        fn foo1<T>(x: A<[T]>) -> A<[T]> { x }
+        fn foo2<T>(x: B<[T]>) -> B<[T]> { x }
+        fn foo3<T>(x: C<[T]>) -> C<[T]> { x }
+
+        fn test(a: A<[u8; 2]>, b: B<[u8; 2]>, c: C<[u8; 2]>) {
+            let d = foo1(a);
+            let e = foo2(b);
+            let f = foo3(c);
+        }
+
+
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T: ?Sized> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
+
+        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
+        "#,
+        expect![[r"
+            257..258 'x': A<[T]>
+            278..283 '{ x }': A<[T]>
+            280..281 'x': A<[T]>
+            295..296 'x': B<[T]>
+            316..321 '{ x }': B<[T]>
+            318..319 'x': B<[T]>
+            333..334 'x': C<[T]>
+            354..359 '{ x }': C<[T]>
+            356..357 'x': C<[T]>
+            369..370 'a': A<[u8; _]>
+            384..385 'b': B<[u8; _]>
+            399..400 'c': C<[u8; _]>
+            414..480 '{     ...(c); }': ()
+            424..425 'd': A<[{unknown}]>
+            428..432 'foo1': fn foo1<{unknown}>(A<[{unknown}]>) -> A<[{unknown}]>
+            428..435 'foo1(a)': A<[{unknown}]>
+            433..434 'a': A<[u8; _]>
+            445..446 'e': B<[u8]>
+            449..453 'foo2': fn foo2<u8>(B<[u8]>) -> B<[u8]>
+            449..456 'foo2(b)': B<[u8]>
+            454..455 'b': B<[u8; _]>
+            466..467 'f': C<[u8]>
+            470..474 'foo3': fn foo3<u8>(C<[u8]>) -> C<[u8]>
+            470..477 'foo3(c)': C<[u8]>
+            475..476 'c': C<[u8; _]>
+        "]],
     );
 }
 
 #[test]
 fn infer_if_coerce() {
-    assert_snapshot!(
-        infer(r#"
-fn foo<T>(x: &[T]) -> &[T] { loop {} }
-fn test() {
-    let x = if true {
-        foo(&[1])
-    } else {
-        &[1]
-    };
-}
-"#),
-        @r###"
-    10..11 'x': &[T]
-    27..38 '{ loop {} }': &[T]
-    29..36 'loop {}': !
-    34..36 '{}': ()
-    49..125 '{     ...  }; }': ()
-    59..60 'x': &[i32]
-    63..122 'if tru...     }': &[i32]
-    66..70 'true': bool
-    71..96 '{     ...     }': &[i32]
-    81..84 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    81..90 'foo(&[1])': &[i32]
-    85..89 '&[1]': &[i32; _]
-    86..89 '[1]': [i32; _]
-    87..88 '1': i32
-    102..122 '{     ...     }': &[i32; _]
-    112..116 '&[1]': &[i32; _]
-    113..116 '[1]': [i32; _]
-    114..115 '1': i32
-    "###
+    check_infer(
+        r#"
+        fn foo<T>(x: &[T]) -> &[T] { loop {} }
+        fn test() {
+            let x = if true {
+                foo(&[1])
+            } else {
+                &[1]
+            };
+        }
+
+
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T: ?Sized> {}
+        "#,
+        expect![[r"
+            10..11 'x': &[T]
+            27..38 '{ loop {} }': &[T]
+            29..36 'loop {}': !
+            34..36 '{}': ()
+            49..125 '{     ...  }; }': ()
+            59..60 'x': &[i32]
+            63..122 'if tru...     }': &[i32]
+            66..70 'true': bool
+            71..96 '{     ...     }': &[i32]
+            81..84 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            81..90 'foo(&[1])': &[i32]
+            85..89 '&[1]': &[i32; _]
+            86..89 '[1]': [i32; _]
+            87..88 '1': i32
+            102..122 '{     ...     }': &[i32; _]
+            112..116 '&[1]': &[i32; _]
+            113..116 '[1]': [i32; _]
+            114..115 '1': i32
+        "]],
     );
 }
 
 #[test]
 fn infer_if_else_coerce() {
-    assert_snapshot!(
-        infer(r#"
-fn foo<T>(x: &[T]) -> &[T] { loop {} }
-fn test() {
-    let x = if true {
-        &[1]
-    } else {
-        foo(&[1])
-    };
-}
-"#),
-        @r###"
-    10..11 'x': &[T]
-    27..38 '{ loop {} }': &[T]
-    29..36 'loop {}': !
-    34..36 '{}': ()
-    49..125 '{     ...  }; }': ()
-    59..60 'x': &[i32]
-    63..122 'if tru...     }': &[i32]
-    66..70 'true': bool
-    71..91 '{     ...     }': &[i32; _]
-    81..85 '&[1]': &[i32; _]
-    82..85 '[1]': [i32; _]
-    83..84 '1': i32
-    97..122 '{     ...     }': &[i32]
-    107..110 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    107..116 'foo(&[1])': &[i32]
-    111..115 '&[1]': &[i32; _]
-    112..115 '[1]': [i32; _]
-    113..114 '1': i32
-    "###
-    );
+    check_infer(
+        r#"
+        fn foo<T>(x: &[T]) -> &[T] { loop {} }
+        fn test() {
+            let x = if true {
+                &[1]
+            } else {
+                foo(&[1])
+            };
+        }
+
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T: ?Sized> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
+
+        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
+        "#,
+        expect![[r"
+            10..11 'x': &[T]
+            27..38 '{ loop {} }': &[T]
+            29..36 'loop {}': !
+            34..36 '{}': ()
+            49..125 '{     ...  }; }': ()
+            59..60 'x': &[i32]
+            63..122 'if tru...     }': &[i32]
+            66..70 'true': bool
+            71..91 '{     ...     }': &[i32; _]
+            81..85 '&[1]': &[i32; _]
+            82..85 '[1]': [i32; _]
+            83..84 '1': i32
+            97..122 '{     ...     }': &[i32]
+            107..110 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            107..116 'foo(&[1])': &[i32]
+            111..115 '&[1]': &[i32; _]
+            112..115 '[1]': [i32; _]
+            113..114 '1': i32
+        "]],
+    )
 }
 
 #[test]
 fn infer_match_first_coerce() {
-    assert_snapshot!(
-        infer(r#"
-fn foo<T>(x: &[T]) -> &[T] { loop {} }
-fn test(i: i32) {
-    let x = match i {
-        2 => foo(&[2]),
-        1 => &[1],
-        _ => &[3],
-    };
-}
-"#),
-        @r###"
-    10..11 'x': &[T]
-    27..38 '{ loop {} }': &[T]
-    29..36 'loop {}': !
-    34..36 '{}': ()
-    47..48 'i': i32
-    55..149 '{     ...  }; }': ()
-    65..66 'x': &[i32]
-    69..146 'match ...     }': &[i32]
-    75..76 'i': i32
-    87..88 '2': i32
-    87..88 '2': i32
-    92..95 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    92..101 'foo(&[2])': &[i32]
-    96..100 '&[2]': &[i32; _]
-    97..100 '[2]': [i32; _]
-    98..99 '2': i32
-    111..112 '1': i32
-    111..112 '1': i32
-    116..120 '&[1]': &[i32; _]
-    117..120 '[1]': [i32; _]
-    118..119 '1': i32
-    130..131 '_': i32
-    135..139 '&[3]': &[i32; _]
-    136..139 '[3]': [i32; _]
-    137..138 '3': i32
-    "###
+    check_infer(
+        r#"
+        fn foo<T>(x: &[T]) -> &[T] { loop {} }
+        fn test(i: i32) {
+            let x = match i {
+                2 => foo(&[2]),
+                1 => &[1],
+                _ => &[3],
+            };
+        }
+
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T: ?Sized> {}
+        "#,
+        expect![[r"
+            10..11 'x': &[T]
+            27..38 '{ loop {} }': &[T]
+            29..36 'loop {}': !
+            34..36 '{}': ()
+            47..48 'i': i32
+            55..149 '{     ...  }; }': ()
+            65..66 'x': &[i32]
+            69..146 'match ...     }': &[i32]
+            75..76 'i': i32
+            87..88 '2': i32
+            87..88 '2': i32
+            92..95 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            92..101 'foo(&[2])': &[i32]
+            96..100 '&[2]': &[i32; _]
+            97..100 '[2]': [i32; _]
+            98..99 '2': i32
+            111..112 '1': i32
+            111..112 '1': i32
+            116..120 '&[1]': &[i32; _]
+            117..120 '[1]': [i32; _]
+            118..119 '1': i32
+            130..131 '_': i32
+            135..139 '&[3]': &[i32; _]
+            136..139 '[3]': [i32; _]
+            137..138 '3': i32
+    "]],
     );
 }
 
 #[test]
 fn infer_match_second_coerce() {
-    assert_snapshot!(
-        infer(r#"
-fn foo<T>(x: &[T]) -> &[T] { loop {} }
-fn test(i: i32) {
-    let x = match i {
-        1 => &[1],
-        2 => foo(&[2]),
-        _ => &[3],
-    };
-}
-"#),
-        @r###"
-    10..11 'x': &[T]
-    27..38 '{ loop {} }': &[T]
-    29..36 'loop {}': !
-    34..36 '{}': ()
-    47..48 'i': i32
-    55..149 '{     ...  }; }': ()
-    65..66 'x': &[i32]
-    69..146 'match ...     }': &[i32]
-    75..76 'i': i32
-    87..88 '1': i32
-    87..88 '1': i32
-    92..96 '&[1]': &[i32; _]
-    93..96 '[1]': [i32; _]
-    94..95 '1': i32
-    106..107 '2': i32
-    106..107 '2': i32
-    111..114 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    111..120 'foo(&[2])': &[i32]
-    115..119 '&[2]': &[i32; _]
-    116..119 '[2]': [i32; _]
-    117..118 '2': i32
-    130..131 '_': i32
-    135..139 '&[3]': &[i32; _]
-    136..139 '[3]': [i32; _]
-    137..138 '3': i32
-    "###
+    check_infer(
+        r#"
+        fn foo<T>(x: &[T]) -> &[T] { loop {} }
+        fn test(i: i32) {
+            let x = match i {
+                1 => &[1],
+                2 => foo(&[2]),
+                _ => &[3],
+            };
+        }
+
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T: ?Sized> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
+
+        impl<'a, 'b: 'a, T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {}
+        impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {}
+        "#,
+        expect![[r"
+            10..11 'x': &[T]
+            27..38 '{ loop {} }': &[T]
+            29..36 'loop {}': !
+            34..36 '{}': ()
+            47..48 'i': i32
+            55..149 '{     ...  }; }': ()
+            65..66 'x': &[i32]
+            69..146 'match ...     }': &[i32]
+            75..76 'i': i32
+            87..88 '1': i32
+            87..88 '1': i32
+            92..96 '&[1]': &[i32; _]
+            93..96 '[1]': [i32; _]
+            94..95 '1': i32
+            106..107 '2': i32
+            106..107 '2': i32
+            111..114 'foo': fn foo<i32>(&[i32]) -> &[i32]
+            111..120 'foo(&[2])': &[i32]
+            115..119 '&[2]': &[i32; _]
+            116..119 '[2]': [i32; _]
+            117..118 '2': i32
+            130..131 '_': i32
+            135..139 '&[3]': &[i32; _]
+            136..139 '[3]': [i32; _]
+            137..138 '3': i32
+    "]],
     );
 }
 
@@ -347,360 +383,361 @@ fn test(i: i32) {
 fn coerce_merge_one_by_one1() {
     mark::check!(coerce_merge_fail_fallback);
 
-    assert_snapshot!(
-        infer(r#"
-fn test() {
-    let t = &mut 1;
-    let x = match 1 {
-        1 => t as *mut i32,
-        2 => t as &i32,
-        _ => t as *const i32,
-    };
-}
-"#),
-        @r###"
-    10..144 '{     ...  }; }': ()
-    20..21 't': &mut i32
-    24..30 '&mut 1': &mut i32
-    29..30 '1': i32
-    40..41 'x': *const i32
-    44..141 'match ...     }': *const i32
-    50..51 '1': i32
-    62..63 '1': i32
-    62..63 '1': i32
-    67..68 't': &mut i32
-    67..80 't as *mut i32': *mut i32
-    90..91 '2': i32
-    90..91 '2': i32
-    95..96 't': &mut i32
-    95..104 't as &i32': &i32
-    114..115 '_': i32
-    119..120 't': &mut i32
-    119..134 't as *const i32': *const i32
-    "###
+    check_infer(
+        r"
+        fn test() {
+            let t = &mut 1;
+            let x = match 1 {
+                1 => t as *mut i32,
+                2 => t as &i32,
+                _ => t as *const i32,
+            };
+        }
+        ",
+        expect![[r"
+            10..144 '{     ...  }; }': ()
+            20..21 't': &mut i32
+            24..30 '&mut 1': &mut i32
+            29..30 '1': i32
+            40..41 'x': *const i32
+            44..141 'match ...     }': *const i32
+            50..51 '1': i32
+            62..63 '1': i32
+            62..63 '1': i32
+            67..68 't': &mut i32
+            67..80 't as *mut i32': *mut i32
+            90..91 '2': i32
+            90..91 '2': i32
+            95..96 't': &mut i32
+            95..104 't as &i32': &i32
+            114..115 '_': i32
+            119..120 't': &mut i32
+            119..134 't as *const i32': *const i32
+    "]],
     );
 }
 
 #[test]
 fn return_coerce_unknown() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-fn foo() -> u32 {
-    return unknown;
-}
-"#, true),
-        @r###"
-    16..39 '{     ...own; }': u32
-    22..36 'return unknown': !
-    29..36 'unknown': u32
-    "###
+    check_infer_with_mismatches(
+        r"
+        fn foo() -> u32 {
+            return unknown;
+        }
+        ",
+        expect![[r"
+            16..39 '{     ...own; }': u32
+            22..36 'return unknown': !
+            29..36 'unknown': u32
+        "]],
     );
 }
 
 #[test]
 fn coerce_autoderef() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-struct Foo;
-fn takes_ref_foo(x: &Foo) {}
-fn test() {
-    takes_ref_foo(&Foo);
-    takes_ref_foo(&&Foo);
-    takes_ref_foo(&&&Foo);
-}
-"#, true),
-        @r###"
-    29..30 'x': &Foo
-    38..40 '{}': ()
-    51..132 '{     ...oo); }': ()
-    57..70 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    57..76 'takes_...(&Foo)': ()
-    71..75 '&Foo': &Foo
-    72..75 'Foo': Foo
-    82..95 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    82..102 'takes_...&&Foo)': ()
-    96..101 '&&Foo': &&Foo
-    97..101 '&Foo': &Foo
-    98..101 'Foo': Foo
-    108..121 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    108..129 'takes_...&&Foo)': ()
-    122..128 '&&&Foo': &&&Foo
-    123..128 '&&Foo': &&Foo
-    124..128 '&Foo': &Foo
-    125..128 'Foo': Foo
-    "###
+    check_infer_with_mismatches(
+        r"
+        struct Foo;
+        fn takes_ref_foo(x: &Foo) {}
+        fn test() {
+            takes_ref_foo(&Foo);
+            takes_ref_foo(&&Foo);
+            takes_ref_foo(&&&Foo);
+        }
+        ",
+        expect![[r"
+            29..30 'x': &Foo
+            38..40 '{}': ()
+            51..132 '{     ...oo); }': ()
+            57..70 'takes_ref_foo': fn takes_ref_foo(&Foo)
+            57..76 'takes_...(&Foo)': ()
+            71..75 '&Foo': &Foo
+            72..75 'Foo': Foo
+            82..95 'takes_ref_foo': fn takes_ref_foo(&Foo)
+            82..102 'takes_...&&Foo)': ()
+            96..101 '&&Foo': &&Foo
+            97..101 '&Foo': &Foo
+            98..101 'Foo': Foo
+            108..121 'takes_ref_foo': fn takes_ref_foo(&Foo)
+            108..129 'takes_...&&Foo)': ()
+            122..128 '&&&Foo': &&&Foo
+            123..128 '&&Foo': &&Foo
+            124..128 '&Foo': &Foo
+            125..128 'Foo': Foo
+        "]],
     );
 }
 
 #[test]
 fn coerce_autoderef_generic() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-struct Foo;
-fn takes_ref<T>(x: &T) -> T { *x }
-fn test() {
-    takes_ref(&Foo);
-    takes_ref(&&Foo);
-    takes_ref(&&&Foo);
-}
-"#, true),
-        @r###"
-    28..29 'x': &T
-    40..46 '{ *x }': T
-    42..44 '*x': T
-    43..44 'x': &T
-    57..126 '{     ...oo); }': ()
-    63..72 'takes_ref': fn takes_ref<Foo>(&Foo) -> Foo
-    63..78 'takes_ref(&Foo)': Foo
-    73..77 '&Foo': &Foo
-    74..77 'Foo': Foo
-    84..93 'takes_ref': fn takes_ref<&Foo>(&&Foo) -> &Foo
-    84..100 'takes_...&&Foo)': &Foo
-    94..99 '&&Foo': &&Foo
-    95..99 '&Foo': &Foo
-    96..99 'Foo': Foo
-    106..115 'takes_ref': fn takes_ref<&&Foo>(&&&Foo) -> &&Foo
-    106..123 'takes_...&&Foo)': &&Foo
-    116..122 '&&&Foo': &&&Foo
-    117..122 '&&Foo': &&Foo
-    118..122 '&Foo': &Foo
-    119..122 'Foo': Foo
-    "###
+    check_infer_with_mismatches(
+        r"
+        struct Foo;
+        fn takes_ref<T>(x: &T) -> T { *x }
+        fn test() {
+            takes_ref(&Foo);
+            takes_ref(&&Foo);
+            takes_ref(&&&Foo);
+        }
+        ",
+        expect![[r"
+            28..29 'x': &T
+            40..46 '{ *x }': T
+            42..44 '*x': T
+            43..44 'x': &T
+            57..126 '{     ...oo); }': ()
+            63..72 'takes_ref': fn takes_ref<Foo>(&Foo) -> Foo
+            63..78 'takes_ref(&Foo)': Foo
+            73..77 '&Foo': &Foo
+            74..77 'Foo': Foo
+            84..93 'takes_ref': fn takes_ref<&Foo>(&&Foo) -> &Foo
+            84..100 'takes_...&&Foo)': &Foo
+            94..99 '&&Foo': &&Foo
+            95..99 '&Foo': &Foo
+            96..99 'Foo': Foo
+            106..115 'takes_ref': fn takes_ref<&&Foo>(&&&Foo) -> &&Foo
+            106..123 'takes_...&&Foo)': &&Foo
+            116..122 '&&&Foo': &&&Foo
+            117..122 '&&Foo': &&Foo
+            118..122 '&Foo': &Foo
+            119..122 'Foo': Foo
+        "]],
     );
 }
 
 #[test]
 fn coerce_autoderef_block() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-struct String {}
-#[lang = "deref"]
-trait Deref { type Target; }
-impl Deref for String { type Target = str; }
-fn takes_ref_str(x: &str) {}
-fn returns_string() -> String { loop {} }
-fn test() {
-    takes_ref_str(&{ returns_string() });
-}
-"#, true),
-        @r###"
-    126..127 'x': &str
-    135..137 '{}': ()
-    168..179 '{ loop {} }': String
-    170..177 'loop {}': !
-    175..177 '{}': ()
-    190..235 '{     ... }); }': ()
-    196..209 'takes_ref_str': fn takes_ref_str(&str)
-    196..232 'takes_...g() })': ()
-    210..231 '&{ ret...ng() }': &String
-    211..231 '{ retu...ng() }': String
-    213..227 'returns_string': fn returns_string() -> String
-    213..229 'return...ring()': String
-    "###
+    check_infer_with_mismatches(
+        r#"
+        struct String {}
+        #[lang = "deref"]
+        trait Deref { type Target; }
+        impl Deref for String { type Target = str; }
+        fn takes_ref_str(x: &str) {}
+        fn returns_string() -> String { loop {} }
+        fn test() {
+            takes_ref_str(&{ returns_string() });
+        }
+        "#,
+        expect![[r"
+            126..127 'x': &str
+            135..137 '{}': ()
+            168..179 '{ loop {} }': String
+            170..177 'loop {}': !
+            175..177 '{}': ()
+            190..235 '{     ... }); }': ()
+            196..209 'takes_ref_str': fn takes_ref_str(&str)
+            196..232 'takes_...g() })': ()
+            210..231 '&{ ret...ng() }': &String
+            211..231 '{ retu...ng() }': String
+            213..227 'returns_string': fn returns_string() -> String
+            213..229 'return...ring()': String
+        "]],
     );
 }
 
 #[test]
 fn closure_return_coerce() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-fn foo() {
-    let x = || {
-        if true {
-            return &1u32;
+    check_infer_with_mismatches(
+        r"
+        fn foo() {
+            let x = || {
+                if true {
+                    return &1u32;
+                }
+                &&1u32
+            };
         }
-        &&1u32
-    };
-}
-"#, true),
-        @r###"
-    9..105 '{     ...  }; }': ()
-    19..20 'x': || -> &u32
-    23..102 '|| {  ...     }': || -> &u32
-    26..102 '{     ...     }': &u32
-    36..81 'if tru...     }': ()
-    39..43 'true': bool
-    44..81 '{     ...     }': ()
-    58..70 'return &1u32': !
-    65..70 '&1u32': &u32
-    66..70 '1u32': u32
-    90..96 '&&1u32': &&u32
-    91..96 '&1u32': &u32
-    92..96 '1u32': u32
-    "###
+        ",
+        expect![[r"
+            9..105 '{     ...  }; }': ()
+            19..20 'x': || -> &u32
+            23..102 '|| {  ...     }': || -> &u32
+            26..102 '{     ...     }': &u32
+            36..81 'if tru...     }': ()
+            39..43 'true': bool
+            44..81 '{     ...     }': ()
+            58..70 'return &1u32': !
+            65..70 '&1u32': &u32
+            66..70 '1u32': u32
+            90..96 '&&1u32': &&u32
+            91..96 '&1u32': &u32
+            92..96 '1u32': u32
+        "]],
     );
 }
 
 #[test]
 fn coerce_fn_item_to_fn_ptr() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-fn foo(x: u32) -> isize { 1 }
-fn test() {
-    let f: fn(u32) -> isize = foo;
-}
-"#, true),
-        @r###"
-    7..8 'x': u32
-    24..29 '{ 1 }': isize
-    26..27 '1': isize
-    40..78 '{     ...foo; }': ()
-    50..51 'f': fn(u32) -> isize
-    72..75 'foo': fn foo(u32) -> isize
-    "###
+    check_infer_with_mismatches(
+        r"
+        fn foo(x: u32) -> isize { 1 }
+        fn test() {
+            let f: fn(u32) -> isize = foo;
+        }
+        ",
+        expect![[r"
+            7..8 'x': u32
+            24..29 '{ 1 }': isize
+            26..27 '1': isize
+            40..78 '{     ...foo; }': ()
+            50..51 'f': fn(u32) -> isize
+            72..75 'foo': fn foo(u32) -> isize
+        "]],
     );
 }
 
 #[test]
 fn coerce_fn_items_in_match_arms() {
     mark::check!(coerce_fn_reification);
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-fn foo1(x: u32) -> isize { 1 }
-fn foo2(x: u32) -> isize { 2 }
-fn foo3(x: u32) -> isize { 3 }
-fn test() {
-    let x = match 1 {
-        1 => foo1,
-        2 => foo2,
-        _ => foo3,
-    };
-}
-"#, true),
-        @r###"
-    8..9 'x': u32
-    25..30 '{ 1 }': isize
-    27..28 '1': isize
-    39..40 'x': u32
-    56..61 '{ 2 }': isize
-    58..59 '2': isize
-    70..71 'x': u32
-    87..92 '{ 3 }': isize
-    89..90 '3': isize
-    103..192 '{     ...  }; }': ()
-    113..114 'x': fn(u32) -> isize
-    117..189 'match ...     }': fn(u32) -> isize
-    123..124 '1': i32
-    135..136 '1': i32
-    135..136 '1': i32
-    140..144 'foo1': fn foo1(u32) -> isize
-    154..155 '2': i32
-    154..155 '2': i32
-    159..163 'foo2': fn foo2(u32) -> isize
-    173..174 '_': i32
-    178..182 'foo3': fn foo3(u32) -> isize
-    "###
+
+    check_infer_with_mismatches(
+        r"
+        fn foo1(x: u32) -> isize { 1 }
+        fn foo2(x: u32) -> isize { 2 }
+        fn foo3(x: u32) -> isize { 3 }
+        fn test() {
+            let x = match 1 {
+                1 => foo1,
+                2 => foo2,
+                _ => foo3,
+            };
+        }
+        ",
+        expect![[r"
+            8..9 'x': u32
+            25..30 '{ 1 }': isize
+            27..28 '1': isize
+            39..40 'x': u32
+            56..61 '{ 2 }': isize
+            58..59 '2': isize
+            70..71 'x': u32
+            87..92 '{ 3 }': isize
+            89..90 '3': isize
+            103..192 '{     ...  }; }': ()
+            113..114 'x': fn(u32) -> isize
+            117..189 'match ...     }': fn(u32) -> isize
+            123..124 '1': i32
+            135..136 '1': i32
+            135..136 '1': i32
+            140..144 'foo1': fn foo1(u32) -> isize
+            154..155 '2': i32
+            154..155 '2': i32
+            159..163 'foo2': fn foo2(u32) -> isize
+            173..174 '_': i32
+            178..182 'foo3': fn foo3(u32) -> isize
+        "]],
     );
 }
 
 #[test]
 fn coerce_closure_to_fn_ptr() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-fn test() {
-    let f: fn(u32) -> isize = |x| { 1 };
-}
-"#, true),
-        @r###"
-    10..54 '{     ...1 }; }': ()
-    20..21 'f': fn(u32) -> isize
-    42..51 '|x| { 1 }': |u32| -> isize
-    43..44 'x': u32
-    46..51 '{ 1 }': isize
-    48..49 '1': isize
-    "###
+    check_infer_with_mismatches(
+        r"
+        fn test() {
+            let f: fn(u32) -> isize = |x| { 1 };
+        }
+        ",
+        expect![[r"
+            10..54 '{     ...1 }; }': ()
+            20..21 'f': fn(u32) -> isize
+            42..51 '|x| { 1 }': |u32| -> isize
+            43..44 'x': u32
+            46..51 '{ 1 }': isize
+            48..49 '1': isize
+        "]],
     );
 }
 
 #[test]
 fn coerce_placeholder_ref() {
     // placeholders should unify, even behind references
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-struct S<T> { t: T }
-impl<TT> S<TT> {
-    fn get(&self) -> &TT {
-        &self.t
-    }
-}
-"#, true),
-        @r###"
-    50..54 'self': &S<TT>
-    63..86 '{     ...     }': &TT
-    73..80 '&self.t': &TT
-    74..78 'self': &S<TT>
-    74..80 'self.t': TT
-    "###
+    check_infer_with_mismatches(
+        r"
+        struct S<T> { t: T }
+        impl<TT> S<TT> {
+            fn get(&self) -> &TT {
+                &self.t
+            }
+        }
+        ",
+        expect![[r"
+            50..54 'self': &S<TT>
+            63..86 '{     ...     }': &TT
+            73..80 '&self.t': &TT
+            74..78 'self': &S<TT>
+            74..80 'self.t': TT
+        "]],
     );
 }
 
 #[test]
 fn coerce_unsize_array() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-#[lang = "unsize"]
-pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
+    check_infer_with_mismatches(
+        r#"
+        #[lang = "unsize"]
+        pub trait Unsize<T> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
 
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
 
-fn test() {
-    let f: &[usize] = &[1, 2, 3];
-}
-"#, true),
-        @r###"
-    161..198 '{     ... 3]; }': ()
-    171..172 'f': &[usize]
-    185..195 '&[1, 2, 3]': &[usize; _]
-    186..195 '[1, 2, 3]': [usize; _]
-    187..188 '1': usize
-    190..191 '2': usize
-    193..194 '3': usize
-    "###
+        fn test() {
+            let f: &[usize] = &[1, 2, 3];
+        }
+        "#,
+        expect![[r"
+            161..198 '{     ... 3]; }': ()
+            171..172 'f': &[usize]
+            185..195 '&[1, 2, 3]': &[usize; _]
+            186..195 '[1, 2, 3]': [usize; _]
+            187..188 '1': usize
+            190..191 '2': usize
+            193..194 '3': usize
+        "]],
     );
 }
 
 #[test]
 fn coerce_unsize_trait_object_simple() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-#[lang = "sized"]
-pub trait Sized {}
-#[lang = "unsize"]
-pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
-
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
-
-trait Foo<T, U> {}
-trait Bar<U, T, X>: Foo<T, U> {}
-trait Baz<T, X>: Bar<usize, T, X> {}
-
-struct S<T, X>;
-impl<T, X> Foo<T, usize> for S<T, X> {}
-impl<T, X> Bar<usize, T, X> for S<T, X> {}
-impl<T, X> Baz<T, X> for S<T, X> {}
-
-fn test() {
-    let obj: &dyn Baz<i8, i16> = &S;
-    let obj: &dyn Bar<_, i8, i16> = &S;
-    let obj: &dyn Foo<i8, _> = &S;
-}
-"#, true),
-        @r###"
-    424..539 '{     ... &S; }': ()
-    434..437 'obj': &dyn Baz<i8, i16>
-    459..461 '&S': &S<i8, i16>
-    460..461 'S': S<i8, i16>
-    471..474 'obj': &dyn Bar<usize, i8, i16>
-    499..501 '&S': &S<i8, i16>
-    500..501 'S': S<i8, i16>
-    511..514 'obj': &dyn Foo<i8, usize>
-    534..536 '&S': &S<i8, {unknown}>
-    535..536 'S': S<i8, {unknown}>
-    "###
+    check_infer_with_mismatches(
+        r#"
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
+
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+
+        trait Foo<T, U> {}
+        trait Bar<U, T, X>: Foo<T, U> {}
+        trait Baz<T, X>: Bar<usize, T, X> {}
+
+        struct S<T, X>;
+        impl<T, X> Foo<T, usize> for S<T, X> {}
+        impl<T, X> Bar<usize, T, X> for S<T, X> {}
+        impl<T, X> Baz<T, X> for S<T, X> {}
+
+        fn test() {
+            let obj: &dyn Baz<i8, i16> = &S;
+            let obj: &dyn Bar<_, i8, i16> = &S;
+            let obj: &dyn Foo<i8, _> = &S;
+        }
+        "#,
+        expect![[r"
+            424..539 '{     ... &S; }': ()
+            434..437 'obj': &dyn Baz<i8, i16>
+            459..461 '&S': &S<i8, i16>
+            460..461 'S': S<i8, i16>
+            471..474 'obj': &dyn Bar<usize, i8, i16>
+            499..501 '&S': &S<i8, i16>
+            500..501 'S': S<i8, i16>
+            511..514 'obj': &dyn Foo<i8, usize>
+            534..536 '&S': &S<i8, {unknown}>
+            535..536 'S': S<i8, {unknown}>
+        "]],
     );
 }
 
@@ -709,90 +746,90 @@ fn test() {
 // it. We used to support it, but Chalk doesn't.
 #[ignore]
 fn coerce_unsize_trait_object_to_trait_object() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-#[lang = "sized"]
-pub trait Sized {}
-#[lang = "unsize"]
-pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
-
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
-
-trait Foo<T, U> {}
-trait Bar<U, T, X>: Foo<T, U> {}
-trait Baz<T, X>: Bar<usize, T, X> {}
-
-struct S<T, X>;
-impl<T, X> Foo<T, usize> for S<T, X> {}
-impl<T, X> Bar<usize, T, X> for S<T, X> {}
-impl<T, X> Baz<T, X> for S<T, X> {}
-
-fn test() {
-    let obj: &dyn Baz<i8, i16> = &S;
-    let obj: &dyn Bar<_, _, _> = obj;
-    let obj: &dyn Foo<_, _> = obj;
-    let obj2: &dyn Baz<i8, i16> = &S;
-    let _: &dyn Foo<_, _> = obj2;
-}
-"#, true),
-        @r###"
-    424..609 '{     ...bj2; }': ()
-    434..437 'obj': &dyn Baz<i8, i16>
-    459..461 '&S': &S<i8, i16>
-    460..461 'S': S<i8, i16>
-    471..474 'obj': &dyn Bar<usize, i8, i16>
-    496..499 'obj': &dyn Baz<i8, i16>
-    509..512 'obj': &dyn Foo<i8, usize>
-    531..534 'obj': &dyn Bar<usize, i8, i16>
-    544..548 'obj2': &dyn Baz<i8, i16>
-    570..572 '&S': &S<i8, i16>
-    571..572 'S': S<i8, i16>
-    582..583 '_': &dyn Foo<i8, usize>
-    602..606 'obj2': &dyn Baz<i8, i16>
-    "###
+    check_infer_with_mismatches(
+        r#"
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
+
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+
+        trait Foo<T, U> {}
+        trait Bar<U, T, X>: Foo<T, U> {}
+        trait Baz<T, X>: Bar<usize, T, X> {}
+
+        struct S<T, X>;
+        impl<T, X> Foo<T, usize> for S<T, X> {}
+        impl<T, X> Bar<usize, T, X> for S<T, X> {}
+        impl<T, X> Baz<T, X> for S<T, X> {}
+
+        fn test() {
+            let obj: &dyn Baz<i8, i16> = &S;
+            let obj: &dyn Bar<_, _, _> = obj;
+            let obj: &dyn Foo<_, _> = obj;
+            let obj2: &dyn Baz<i8, i16> = &S;
+            let _: &dyn Foo<_, _> = obj2;
+        }
+        "#,
+        expect![[r"
+            424..609 '{     ...bj2; }': ()
+            434..437 'obj': &dyn Baz<i8, i16>
+            459..461 '&S': &S<i8, i16>
+            460..461 'S': S<i8, i16>
+            471..474 'obj': &dyn Bar<usize, i8, i16>
+            496..499 'obj': &dyn Baz<i8, i16>
+            509..512 'obj': &dyn Foo<i8, usize>
+            531..534 'obj': &dyn Bar<usize, i8, i16>
+            544..548 'obj2': &dyn Baz<i8, i16>
+            570..572 '&S': &S<i8, i16>
+            571..572 'S': S<i8, i16>
+            582..583 '_': &dyn Foo<i8, usize>
+            602..606 'obj2': &dyn Baz<i8, i16>
+        "]],
     );
 }
 
 #[test]
 fn coerce_unsize_super_trait_cycle() {
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-#[lang = "sized"]
-pub trait Sized {}
-#[lang = "unsize"]
-pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
-
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
-
-trait A {}
-trait B: C + A {}
-trait C: B {}
-trait D: C
-
-struct S;
-impl A for S {}
-impl B for S {}
-impl C for S {}
-impl D for S {}
-
-fn test() {
-    let obj: &dyn D = &S;
-    let obj: &dyn A = &S;
-}
-"#, true),
-        @r###"
-    328..383 '{     ... &S; }': ()
-    338..341 'obj': &dyn D
-    352..354 '&S': &S
-    353..354 'S': S
-    364..367 'obj': &dyn A
-    378..380 '&S': &S
-    379..380 'S': S
-    "###
+    check_infer_with_mismatches(
+        r#"
+        #[lang = "sized"]
+        pub trait Sized {}
+        #[lang = "unsize"]
+        pub trait Unsize<T> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
+
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+
+        trait A {}
+        trait B: C + A {}
+        trait C: B {}
+        trait D: C
+
+        struct S;
+        impl A for S {}
+        impl B for S {}
+        impl C for S {}
+        impl D for S {}
+
+        fn test() {
+            let obj: &dyn D = &S;
+            let obj: &dyn A = &S;
+        }
+        "#,
+        expect![[r"
+            328..383 '{     ... &S; }': ()
+            338..341 'obj': &dyn D
+            352..354 '&S': &S
+            353..354 'S': S
+            364..367 'obj': &dyn A
+            378..380 '&S': &S
+            379..380 'S': S
+        "]],
     );
 }
 
@@ -801,24 +838,24 @@ fn test() {
 fn coerce_unsize_generic() {
     // FIXME: Implement this
     // https://doc.rust-lang.org/reference/type-coercions.html#unsized-coercions
-    assert_snapshot!(
-        infer_with_mismatches(r#"
-#[lang = "unsize"]
-pub trait Unsize<T> {}
-#[lang = "coerce_unsized"]
-pub trait CoerceUnsized<T> {}
+    check_infer_with_mismatches(
+        r#"
+        #[lang = "unsize"]
+        pub trait Unsize<T> {}
+        #[lang = "coerce_unsized"]
+        pub trait CoerceUnsized<T> {}
 
-impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
+        impl<T: Unsize<U>, U> CoerceUnsized<&U> for &T {}
 
-struct Foo<T> { t: T };
-struct Bar<T>(Foo<T>);
+        struct Foo<T> { t: T };
+        struct Bar<T>(Foo<T>);
 
-fn test() {
-    let _: &Foo<[usize]> = &Foo { t: [1, 2, 3] };
-    let _: &Bar<[usize]> = &Bar(Foo { t: [1, 2, 3] });
-}
-"#, true),
-        @r###"
-    "###
+        fn test() {
+            let _: &Foo<[usize]> = &Foo { t: [1, 2, 3] };
+            let _: &Bar<[usize]> = &Bar(Foo { t: [1, 2, 3] });
+        }
+        "#,
+        expect![[r"
+        "]],
     );
 }
diff --git a/crates/ra_hir_ty/src/tests/never_type.rs b/crates/ra_hir_ty/src/tests/never_type.rs
index 64d421d40..49538b572 100644
--- a/crates/ra_hir_ty/src/tests/never_type.rs
+++ b/crates/ra_hir_ty/src/tests/never_type.rs
@@ -1,6 +1,6 @@
-use insta::assert_snapshot;
+use expect::expect;
 
-use super::{check_types, infer_with_mismatches};
+use super::{check_infer_with_mismatches, check_types};
 
 #[test]
 fn infer_never1() {
@@ -240,173 +240,170 @@ fn test(a: i32) {
 
 #[test]
 fn diverging_expression_1() {
-    let t = infer_with_mismatches(
-        r#"
-//- /main.rs
-fn test1() {
-    let x: u32 = return;
-}
-fn test2() {
-    let x: u32 = { return; };
-}
-fn test3() {
-    let x: u32 = loop {};
-}
-fn test4() {
-    let x: u32 = { loop {} };
-}
-fn test5() {
-    let x: u32 = { if true { loop {}; } else { loop {}; } };
-}
-fn test6() {
-    let x: u32 = { let y: u32 = { loop {}; }; };
-}
-"#,
-        true,
+    check_infer_with_mismatches(
+        r"
+        //- /main.rs
+        fn test1() {
+            let x: u32 = return;
+        }
+        fn test2() {
+            let x: u32 = { return; };
+        }
+        fn test3() {
+            let x: u32 = loop {};
+        }
+        fn test4() {
+            let x: u32 = { loop {} };
+        }
+        fn test5() {
+            let x: u32 = { if true { loop {}; } else { loop {}; } };
+        }
+        fn test6() {
+            let x: u32 = { let y: u32 = { loop {}; }; };
+        }
+        ",
+        expect![[r"
+            11..39 '{     ...urn; }': ()
+            21..22 'x': u32
+            30..36 'return': !
+            51..84 '{     ...; }; }': ()
+            61..62 'x': u32
+            70..81 '{ return; }': u32
+            72..78 'return': !
+            96..125 '{     ... {}; }': ()
+            106..107 'x': u32
+            115..122 'loop {}': !
+            120..122 '{}': ()
+            137..170 '{     ...} }; }': ()
+            147..148 'x': u32
+            156..167 '{ loop {} }': u32
+            158..165 'loop {}': !
+            163..165 '{}': ()
+            182..246 '{     ...} }; }': ()
+            192..193 'x': u32
+            201..243 '{ if t...}; } }': u32
+            203..241 'if tru... {}; }': u32
+            206..210 'true': bool
+            211..223 '{ loop {}; }': u32
+            213..220 'loop {}': !
+            218..220 '{}': ()
+            229..241 '{ loop {}; }': u32
+            231..238 'loop {}': !
+            236..238 '{}': ()
+            258..310 '{     ...; }; }': ()
+            268..269 'x': u32
+            277..307 '{ let ...; }; }': u32
+            283..284 'y': u32
+            292..304 '{ loop {}; }': u32
+            294..301 'loop {}': !
+            299..301 '{}': ()
+        "]],
     );
-    assert_snapshot!(t, @r###"
-    11..39 '{     ...urn; }': ()
-    21..22 'x': u32
-    30..36 'return': !
-    51..84 '{     ...; }; }': ()
-    61..62 'x': u32
-    70..81 '{ return; }': u32
-    72..78 'return': !
-    96..125 '{     ... {}; }': ()
-    106..107 'x': u32
-    115..122 'loop {}': !
-    120..122 '{}': ()
-    137..170 '{     ...} }; }': ()
-    147..148 'x': u32
-    156..167 '{ loop {} }': u32
-    158..165 'loop {}': !
-    163..165 '{}': ()
-    182..246 '{     ...} }; }': ()
-    192..193 'x': u32
-    201..243 '{ if t...}; } }': u32
-    203..241 'if tru... {}; }': u32
-    206..210 'true': bool
-    211..223 '{ loop {}; }': u32
-    213..220 'loop {}': !
-    218..220 '{}': ()
-    229..241 '{ loop {}; }': u32
-    231..238 'loop {}': !
-    236..238 '{}': ()
-    258..310 '{     ...; }; }': ()
-    268..269 'x': u32
-    277..307 '{ let ...; }; }': u32
-    283..284 'y': u32
-    292..304 '{ loop {}; }': u32
-    294..301 'loop {}': !
-    299..301 '{}': ()
-    "###);
 }
 
 #[test]
 fn diverging_expression_2() {
-    let t = infer_with_mismatches(
+    check_infer_with_mismatches(
         r#"
-//- /main.rs
-fn test1() {
-    // should give type mismatch
-    let x: u32 = { loop {}; "foo" };
-}
-"#,
-        true,
+        //- /main.rs
+        fn test1() {
+            // should give type mismatch
+            let x: u32 = { loop {}; "foo" };
+        }
+        "#,
+        expect![[r#"
+            11..84 '{     ..." }; }': ()
+            54..55 'x': u32
+            63..81 '{ loop...foo" }': &str
+            65..72 'loop {}': !
+            70..72 '{}': ()
+            74..79 '"foo"': &str
+            63..81: expected u32, got &str
+            74..79: expected u32, got &str
+        "#]],
     );
-    assert_snapshot!(t, @r###"
-    11..84 '{     ..." }; }': ()
-    54..55 'x': u32
-    63..81 '{ loop...foo" }': &str
-    65..72 'loop {}': !
-    70..72 '{}': ()
-    74..79 '"foo"': &str
-    63..81: expected u32, got &str
-    74..79: expected u32, got &str
-    "###);
 }
 
 #[test]
 fn diverging_expression_3_break() {
-    let t = infer_with_mismatches(
-        r#"
-//- /main.rs
-fn test1() {
-    // should give type mismatch
-    let x: u32 = { loop { break; } };
-}
-fn test2() {
-    // should give type mismatch
-    let x: u32 = { for a in b { break; }; };
-    // should give type mismatch as well
-    let x: u32 = { for a in b {}; };
-    // should give type mismatch as well
-    let x: u32 = { for a in b { return; }; };
-}
-fn test3() {
-    // should give type mismatch
-    let x: u32 = { while true { break; }; };
-    // should give type mismatch as well -- there's an implicit break, even if it's never hit
-    let x: u32 = { while true {}; };
-    // should give type mismatch as well
-    let x: u32 = { while true { return; }; };
-}
-"#,
-        true,
+    check_infer_with_mismatches(
+        r"
+        //- /main.rs
+        fn test1() {
+            // should give type mismatch
+            let x: u32 = { loop { break; } };
+        }
+        fn test2() {
+            // should give type mismatch
+            let x: u32 = { for a in b { break; }; };
+            // should give type mismatch as well
+            let x: u32 = { for a in b {}; };
+            // should give type mismatch as well
+            let x: u32 = { for a in b { return; }; };
+        }
+        fn test3() {
+            // should give type mismatch
+            let x: u32 = { while true { break; }; };
+            // should give type mismatch as well -- there's an implicit break, even if it's never hit
+            let x: u32 = { while true {}; };
+            // should give type mismatch as well
+            let x: u32 = { while true { return; }; };
+        }
+        ",
+        expect![[r"
+            11..85 '{     ...} }; }': ()
+            54..55 'x': u32
+            63..82 '{ loop...k; } }': ()
+            65..80 'loop { break; }': ()
+            70..80 '{ break; }': ()
+            72..77 'break': !
+            63..82: expected u32, got ()
+            65..80: expected u32, got ()
+            97..343 '{     ...; }; }': ()
+            140..141 'x': u32
+            149..175 '{ for ...; }; }': ()
+            151..172 'for a ...eak; }': ()
+            155..156 'a': {unknown}
+            160..161 'b': {unknown}
+            162..172 '{ break; }': ()
+            164..169 'break': !
+            226..227 'x': u32
+            235..253 '{ for ... {}; }': ()
+            237..250 'for a in b {}': ()
+            241..242 'a': {unknown}
+            246..247 'b': {unknown}
+            248..250 '{}': ()
+            304..305 'x': u32
+            313..340 '{ for ...; }; }': ()
+            315..337 'for a ...urn; }': ()
+            319..320 'a': {unknown}
+            324..325 'b': {unknown}
+            326..337 '{ return; }': ()
+            328..334 'return': !
+            149..175: expected u32, got ()
+            235..253: expected u32, got ()
+            313..340: expected u32, got ()
+            355..654 '{     ...; }; }': ()
+            398..399 'x': u32
+            407..433 '{ whil...; }; }': ()
+            409..430 'while ...eak; }': ()
+            415..419 'true': bool
+            420..430 '{ break; }': ()
+            422..427 'break': !
+            537..538 'x': u32
+            546..564 '{ whil... {}; }': ()
+            548..561 'while true {}': ()
+            554..558 'true': bool
+            559..561 '{}': ()
+            615..616 'x': u32
+            624..651 '{ whil...; }; }': ()
+            626..648 'while ...urn; }': ()
+            632..636 'true': bool
+            637..648 '{ return; }': ()
+            639..645 'return': !
+            407..433: expected u32, got ()
+            546..564: expected u32, got ()
+            624..651: expected u32, got ()
+        "]],
     );
-    assert_snapshot!(t, @r###"
-    11..85 '{     ...} }; }': ()
-    54..55 'x': u32
-    63..82 '{ loop...k; } }': ()
-    65..80 'loop { break; }': ()
-    70..80 '{ break; }': ()
-    72..77 'break': !
-    63..82: expected u32, got ()
-    65..80: expected u32, got ()
-    97..343 '{     ...; }; }': ()
-    140..141 'x': u32
-    149..175 '{ for ...; }; }': ()
-    151..172 'for a ...eak; }': ()
-    155..156 'a': {unknown}
-    160..161 'b': {unknown}
-    162..172 '{ break; }': ()
-    164..169 'break': !
-    226..227 'x': u32
-    235..253 '{ for ... {}; }': ()
-    237..250 'for a in b {}': ()
-    241..242 'a': {unknown}
-    246..247 'b': {unknown}
-    248..250 '{}': ()
-    304..305 'x': u32
-    313..340 '{ for ...; }; }': ()
-    315..337 'for a ...urn; }': ()
-    319..320 'a': {unknown}
-    324..325 'b': {unknown}
-    326..337 '{ return; }': ()
-    328..334 'return': !
-    149..175: expected u32, got ()
-    235..253: expected u32, got ()
-    313..340: expected u32, got ()
-    355..654 '{     ...; }; }': ()
-    398..399 'x': u32
-    407..433 '{ whil...; }; }': ()
-    409..430 'while ...eak; }': ()
-    415..419 'true': bool
-    420..430 '{ break; }': ()
-    422..427 'break': !
-    537..538 'x': u32
-    546..564 '{ whil... {}; }': ()
-    548..561 'while true {}': ()
-    554..558 'true': bool
-    559..561 '{}': ()
-    615..616 'x': u32
-    624..651 '{ whil...; }; }': ()
-    626..648 'while ...urn; }': ()
-    632..636 'true': bool
-    637..648 '{ return; }': ()
-    639..645 'return': !
-    407..433: expected u32, got ()
-    546..564: expected u32, got ()
-    624..651: expected u32, got ()
-    "###);
 }
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 9e82d6854..c84d43d77 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -215,7 +215,7 @@ impl<'a> CompletionContext<'a> {
 
     fn fill_keyword_patterns(&mut self, file_with_fake_ident: &SyntaxNode, offset: TextSize) {
         let fake_ident_token = file_with_fake_ident.token_at_offset(offset).right_biased().unwrap();
-        let syntax_element = NodeOrToken::Token(fake_ident_token.clone());
+        let syntax_element = NodeOrToken::Token(fake_ident_token);
         self.block_expr_parent = has_block_expr_parent(syntax_element.clone());
         self.unsafe_is_prev = unsafe_is_prev(syntax_element.clone());
         self.if_is_prev = if_is_prev(syntax_element.clone());
@@ -228,7 +228,7 @@ impl<'a> CompletionContext<'a> {
         self.trait_as_prev_sibling = has_trait_as_prev_sibling(syntax_element.clone());
         self.is_match_arm = is_match_arm(syntax_element.clone());
         self.has_item_list_or_source_file_parent =
-            has_item_list_or_source_file_parent(syntax_element.clone());
+            has_item_list_or_source_file_parent(syntax_element);
     }
 
     fn fill(
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs
index fe75f4b2c..e029af0dc 100644
--- a/crates/ra_ide/src/diagnostics.rs
+++ b/crates/ra_ide/src/diagnostics.rs
@@ -183,7 +183,7 @@ fn missing_struct_field_fix(
     }
     new_field = format!("\n{}{}", indent, new_field);
 
-    let needs_comma = !last_field_syntax.to_string().ends_with(",");
+    let needs_comma = !last_field_syntax.to_string().ends_with(',');
     if needs_comma {
         new_field = format!(",{}", new_field);
     }
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 43a5e29b5..f2e4f7ee5 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -171,7 +171,7 @@ fn get_param_name_hints(
         .map(|(param_name, arg)| InlayHint {
             range: arg.syntax().text_range(),
             kind: InlayKind::ParameterHint,
-            label: param_name.to_string().into(),
+            label: param_name.into(),
         });
 
     acc.extend(hints);
@@ -425,6 +425,8 @@ fn main() {
       //^^ Test<i32>
     let zz_ref = &zz;
       //^^^^^^ &Test<i32>
+    let test = || zz;
+      //^^^^ || -> Test<i32>
 }"#,
         );
     }
diff --git a/crates/ra_project_model/src/project_json.rs b/crates/ra_project_model/src/project_json.rs
index b96227949..778cc84ef 100644
--- a/crates/ra_project_model/src/project_json.rs
+++ b/crates/ra_project_model/src/project_json.rs
@@ -34,6 +34,7 @@ pub struct Crate {
     pub(crate) target: Option<String>,
     pub(crate) out_dir: Option<AbsPathBuf>,
     pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>,
+    pub(crate) is_workspace_member: bool,
 }
 
 impl ProjectJson {
@@ -43,32 +44,42 @@ impl ProjectJson {
             crates: data
                 .crates
                 .into_iter()
-                .map(|crate_data| Crate {
-                    root_module: base.join(crate_data.root_module),
-                    edition: crate_data.edition.into(),
-                    deps: crate_data
-                        .deps
-                        .into_iter()
-                        .map(|dep_data| Dependency {
-                            crate_id: CrateId(dep_data.krate as u32),
-                            name: dep_data.name,
-                        })
-                        .collect::<Vec<_>>(),
-                    cfg: {
-                        let mut cfg = CfgOptions::default();
-                        for entry in &crate_data.cfg {
-                            match split_delim(entry, '=') {
-                                Some((key, value)) => {
-                                    cfg.insert_key_value(key.into(), value.into());
+                .map(|crate_data| {
+                    let is_workspace_member = crate_data.is_workspace_member.unwrap_or_else(|| {
+                        crate_data.root_module.is_relative()
+                            && !crate_data.root_module.starts_with("..")
+                            || crate_data.root_module.starts_with(base)
+                    });
+                    Crate {
+                        root_module: base.join(crate_data.root_module),
+                        edition: crate_data.edition.into(),
+                        deps: crate_data
+                            .deps
+                            .into_iter()
+                            .map(|dep_data| Dependency {
+                                crate_id: CrateId(dep_data.krate as u32),
+                                name: dep_data.name,
+                            })
+                            .collect::<Vec<_>>(),
+                        cfg: {
+                            let mut cfg = CfgOptions::default();
+                            for entry in &crate_data.cfg {
+                                match split_delim(entry, '=') {
+                                    Some((key, value)) => {
+                                        cfg.insert_key_value(key.into(), value.into());
+                                    }
+                                    None => cfg.insert_atom(entry.into()),
                                 }
-                                None => cfg.insert_atom(entry.into()),
                             }
-                        }
-                        cfg
-                    },
-                    target: crate_data.target,
-                    out_dir: crate_data.out_dir.map(|it| base.join(it)),
-                    proc_macro_dylib_path: crate_data.proc_macro_dylib_path.map(|it| base.join(it)),
+                            cfg
+                        },
+                        target: crate_data.target,
+                        out_dir: crate_data.out_dir.map(|it| base.join(it)),
+                        proc_macro_dylib_path: crate_data
+                            .proc_macro_dylib_path
+                            .map(|it| base.join(it)),
+                        is_workspace_member,
+                    }
                 })
                 .collect::<Vec<_>>(),
         }
@@ -91,6 +102,7 @@ struct CrateData {
     target: Option<String>,
     out_dir: Option<PathBuf>,
     proc_macro_dylib_path: Option<PathBuf>,
+    is_workspace_member: Option<bool>,
 }
 
 #[derive(Deserialize)]
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 57cc09854..670f04578 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 [dependencies]
 itertools = "0.9.0"
 rowan = "0.10.0"
-rustc_lexer = { version = "666.0.0", package = "rustc-ap-rustc_lexer" }
+rustc_lexer = { version = "669.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.5.1"
 once_cell = "1.3.1"
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 68b2a2abd..8947ccf07 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -148,6 +148,7 @@ impl Config {
             rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
             flycheck: Some(FlycheckConfig::CargoCommand {
                 command: "check".to_string(),
+                target_triple: None,
                 all_targets: true,
                 all_features: false,
                 extra_args: Vec::new(),
@@ -177,6 +178,11 @@ impl Config {
 
     pub fn update(&mut self, json: serde_json::Value) {
         log::info!("Config::update({:#})", json);
+
+        if json.is_null() || json.as_object().map_or(false, |it| it.is_empty()) {
+            return;
+        }
+
         let data = ConfigData::from_json(json);
 
         self.with_sysroot = data.withSysroot;
@@ -198,7 +204,7 @@ impl Config {
             all_features: data.cargo_allFeatures,
             features: data.cargo_features.clone(),
             load_out_dirs_from_check: data.cargo_loadOutDirsFromCheck,
-            target: data.cargo_target,
+            target: data.cargo_target.clone(),
         };
 
         self.proc_macro_srv = if data.procMacro_enable {
@@ -223,6 +229,7 @@ impl Config {
                 }
                 Some(_) | None => FlycheckConfig::CargoCommand {
                     command: data.checkOnSave_command,
+                    target_triple: data.checkOnSave_target.or(data.cargo_target),
                     all_targets: data.checkOnSave_allTargets,
                     all_features: data.checkOnSave_allFeatures.unwrap_or(data.cargo_allFeatures),
                     features: data.checkOnSave_features.unwrap_or(data.cargo_features),
@@ -384,10 +391,11 @@ config_data! {
         cargo_noDefaultFeatures: bool    = false,
         cargo_target: Option<String>     = None,
 
+        checkOnSave_enable: bool                         = false,
         checkOnSave_allFeatures: Option<bool>            = None,
         checkOnSave_allTargets: bool                     = true,
         checkOnSave_command: String                      = "check".into(),
-        checkOnSave_enable: bool                         = false,
+        checkOnSave_target: Option<String>               = None,
         checkOnSave_extraArgs: Vec<String>               = Vec::new(),
         checkOnSave_features: Option<Vec<String>>        = None,
         checkOnSave_overrideCommand: Option<Vec<String>> = None,
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index a41f7f564..bb7c4c0c6 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -468,6 +468,8 @@ impl GlobalState {
                             }
                             (None, Some(mut configs)) => {
                                 if let Some(json) = configs.get_mut(0) {
+                                    // Note that json can be null according to the spec if the client can't
+                                    // provide a configuration. This is handled in Config::update below.
                                     let mut config = this.config.clone();
                                     config.update(json.take());
                                     this.update_configuration(config);
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 3f4dbdd8c..d7ae00b07 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -242,7 +242,7 @@ impl GlobalState {
             })
             .map(move |cargo| {
                 let cargo_project_root = cargo.workspace_root().to_path_buf();
-                FlycheckHandle::spawn(sender, config.clone(), cargo_project_root.into())
+                FlycheckHandle::spawn(sender, config, cargo_project_root.into())
             })
     }
 }
diff --git a/crates/vfs/src/loader.rs b/crates/vfs/src/loader.rs
index 9c6e4b6a7..04e257f53 100644
--- a/crates/vfs/src/loader.rs
+++ b/crates/vfs/src/loader.rs
@@ -83,11 +83,11 @@ impl Directories {
         self.includes_path(path)
     }
     fn includes_path(&self, path: &AbsPath) -> bool {
-        let mut include = None;
+        let mut include: Option<&AbsPathBuf> = None;
         for incl in &self.include {
-            if is_prefix(incl, path) {
+            if path.starts_with(incl) {
                 include = Some(match include {
-                    Some(prev) if is_prefix(incl, prev) => prev,
+                    Some(prev) if prev.starts_with(incl) => prev,
                     _ => incl,
                 })
             }
@@ -97,15 +97,11 @@ impl Directories {
             None => return false,
         };
         for excl in &self.exclude {
-            if is_prefix(excl, path) && is_prefix(include, excl) {
+            if path.starts_with(excl) && excl.starts_with(include) {
                 return false;
             }
         }
-        return true;
-
-        fn is_prefix(short: &AbsPath, long: &AbsPath) -> bool {
-            long.strip_prefix(short).is_some()
-        }
+        true
     }
 }
 
diff --git a/xtask/src/release.rs b/xtask/src/release.rs
index 530bd8205..7fa0966aa 100644
--- a/xtask/src/release.rs
+++ b/xtask/src/release.rs
@@ -37,7 +37,7 @@ Release: release:{}[]
 
 == Sponsors
 
-**Become a sponsor:** https://opencollective.com/rust-analyzer/[opecollective.com/rust-analyzer]
+**Become a sponsor:** https://opencollective.com/rust-analyzer/[opencollective.com/rust-analyzer]
 
 == New Features