92 files changed, 2764 insertions, 2207 deletions
diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs
index 005c17776..5b1a4680b 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/ra_assists/src/assist_context.rs
@@ -5,7 +5,7 @@ use hir::Semantics;
 use ra_db::{FileId, FileRange};
 use ra_fmt::{leading_indent, reindent};
 use ra_ide_db::{
-    source_change::{SingleFileChange, SourceChange},
+    source_change::{SourceChange, SourceFileEdit},
    RootDatabase,
 };
 use ra_syntax::{
@@ -150,11 +150,10 @@ impl Assists {
        self.add_impl(label, f)
    }
    fn add_impl(&mut self, label: Assist, f: impl FnOnce(&mut AssistBuilder)) -> Option<()> {
-        let change_label = label.label.clone();
        let source_change = if self.resolve {
            let mut builder = AssistBuilder::new(self.file);
            f(&mut builder);
-            Some(builder.finish(change_label))
+            Some(builder.finish())
        } else {
            None
        };
@@ -171,19 +170,13 @@ impl Assists {
 pub(crate) struct AssistBuilder {
    edit: TextEditBuilder,
-    cursor_position: Option<TextSize>,
    file: FileId,
    is_snippet: bool,
 }
 impl AssistBuilder {
    pub(crate) fn new(file: FileId) -> AssistBuilder {
-        AssistBuilder {
+        AssistBuilder { edit: TextEditBuilder::default(), file, is_snippet: false }
-            edit: TextEditBuilder::default(),
-            cursor_position: None,
-            file,
-            is_snippet: false,
-        }
    }
    /// Remove specified `range` of text.
@@ -241,10 +234,6 @@ impl AssistBuilder {
        algo::diff(&node, &new).into_text_edit(&mut self.edit)
    }
-    /// Specify desired position of the cursor after the assist is applied.
-    pub(crate) fn set_cursor(&mut self, offset: TextSize) {
-        self.cursor_position = Some(offset)
-    }
    // FIXME: better API
    pub(crate) fn set_file(&mut self, assist_file: FileId) {
        self.file = assist_file;
@@ -256,14 +245,10 @@ impl AssistBuilder {
        &mut self.edit
    }
-    fn finish(self, change_label: String) -> SourceChange {
+    fn finish(self) -> SourceChange {
        let edit = self.edit.finish();
-        if edit.is_empty() && self.cursor_position.is_none() {
+        let source_file_edit = SourceFileEdit { file_id: self.file, edit };
-            panic!("Only call `add_assist` if the assist can be applied")
+        let mut res: SourceChange = source_file_edit.into();
-        }
-        let mut res =
-            SingleFileChange { label: change_label, edit, cursor_position: self.cursor_position }
-                .into_source_change(self.file);
        if self.is_snippet {
            res.is_snippet = true;
        }
diff --git a/crates/ra_assists/src/handlers/add_explicit_type.rs b/crates/ra_assists/src/handlers/add_explicit_type.rs
index 770049212..ab20c6649 100644
--- a/crates/ra_assists/src/handlers/add_explicit_type.rs
+++ b/crates/ra_assists/src/handlers/add_explicit_type.rs
@@ -86,11 +86,7 @@ mod tests {
    #[test]
    fn add_explicit_type_works_for_simple_expr() {
-        check_assist(
+        check_assist(add_explicit_type, "fn f() { let a<|> = 1; }", "fn f() { let a: i32 = 1; }");
-            add_explicit_type,
-            "fn f() { let a<|> = 1; }",
-            "fn f() { let a<|>: i32 = 1; }",
-        );
    }
    #[test]
@@ -98,7 +94,7 @@ mod tests {
        check_assist(
            add_explicit_type,
            "fn f() { let a<|>: _ = 1; }",
-            "fn f() { let a<|>: i32 = 1; }",
+            "fn f() { let a: i32 = 1; }",
        );
    }
@@ -122,7 +118,7 @@ mod tests {
            }
            fn f() {
-                let a<|>: Option<i32> = Option::Some(1);
+                let a: Option<i32> = Option::Some(1);
            }"#,
        );
    }
@@ -132,7 +128,7 @@ mod tests {
        check_assist(
            add_explicit_type,
            r"macro_rules! v { () => {0u64} } fn f() { let a<|> = v!(); }",
-            r"macro_rules! v { () => {0u64} } fn f() { let a<|>: u64 = v!(); }",
+            r"macro_rules! v { () => {0u64} } fn f() { let a: u64 = v!(); }",
        );
    }
@@ -140,8 +136,8 @@ mod tests {
    fn add_explicit_type_works_for_macro_call_recursive() {
        check_assist(
            add_explicit_type,
-            "macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a<|> = v!(); }",
+            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a<|> = v!(); }"#,
-            "macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a<|>: u64 = v!(); }",
+            r#"macro_rules! u { () => {0u64} } macro_rules! v { () => {u!()} } fn f() { let a: u64 = v!(); }"#,
        );
    }
@@ -208,7 +204,7 @@ struct Test<K, T = u8> {
 }
 fn main() {
-    let test<|>: Test<i32> = Test { t: 23, k: 33 };
+    let test: Test<i32> = Test { t: 23, k: 33 };
 }"#,
        );
    }
diff --git a/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs b/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
index 5f6c8b19a..6a675e812 100644
--- a/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
+++ b/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
@@ -101,7 +101,7 @@ mod tests {
        check_assist(
            add_from_impl_for_enum,
            "enum A { <|>One(u32) }",
-            r#"enum A { <|>One(u32) }
+            r#"enum A { One(u32) }
 impl From<u32> for A {
    fn from(v: u32) -> Self {
@@ -116,7 +116,7 @@ impl From<u32> for A {
        check_assist(
            add_from_impl_for_enum,
            r#"enum A { <|>One(foo::bar::baz::Boo) }"#,
-            r#"enum A { <|>One(foo::bar::baz::Boo) }
+            r#"enum A { One(foo::bar::baz::Boo) }
 impl From<foo::bar::baz::Boo> for A {
    fn from(v: foo::bar::baz::Boo) -> Self {
@@ -178,7 +178,7 @@ impl From<String> for A {
 pub trait From<T> {
    fn from(T) -> Self;
 }"#,
-            r#"enum A { <|>One(u32), Two(String), }
+            r#"enum A { One(u32), Two(String), }
 impl From<u32> for A {
    fn from(v: u32) -> Self {
diff --git a/crates/ra_assists/src/handlers/apply_demorgan.rs b/crates/ra_assists/src/handlers/apply_demorgan.rs
index 0feba5e11..233e8fb8e 100644
--- a/crates/ra_assists/src/handlers/apply_demorgan.rs
+++ b/crates/ra_assists/src/handlers/apply_demorgan.rs
@@ -63,22 +63,22 @@ mod tests {
    #[test]
    fn demorgan_turns_and_into_or() {
-        check_assist(apply_demorgan, "fn f() { !x &&<|> !x }", "fn f() { !(x ||<|> x) }")
+        check_assist(apply_demorgan, "fn f() { !x &&<|> !x }", "fn f() { !(x || x) }")
    }
    #[test]
    fn demorgan_turns_or_into_and() {
-        check_assist(apply_demorgan, "fn f() { !x ||<|> !x }", "fn f() { !(x &&<|> x) }")
+        check_assist(apply_demorgan, "fn f() { !x ||<|> !x }", "fn f() { !(x && x) }")
    }
    #[test]
    fn demorgan_removes_inequality() {
-        check_assist(apply_demorgan, "fn f() { x != x ||<|> !x }", "fn f() { !(x == x &&<|> x) }")
+        check_assist(apply_demorgan, "fn f() { x != x ||<|> !x }", "fn f() { !(x == x && x) }")
    }
    #[test]
    fn demorgan_general_case() {
-        check_assist(apply_demorgan, "fn f() { x ||<|> x }", "fn f() { !(!x &&<|> !x) }")
+        check_assist(apply_demorgan, "fn f() { x ||<|> x }", "fn f() { !(!x && !x) }")
    }
    #[test]
diff --git a/crates/ra_assists/src/handlers/auto_import.rs b/crates/ra_assists/src/handlers/auto_import.rs
index f6d25579e..edf96d50e 100644
--- a/crates/ra_assists/src/handlers/auto_import.rs
+++ b/crates/ra_assists/src/handlers/auto_import.rs
@@ -298,7 +298,7 @@ mod tests {
            }
            ",
            r"
-            <|>use PubMod::PubStruct;
+            use PubMod::PubStruct;
            PubStruct
@@ -329,7 +329,7 @@ mod tests {
            macro_rules! foo {
                ($i:ident) => { fn foo(a: $i) {} }
            }
-            foo!(Pub<|>Struct);
+            foo!(PubStruct);
            pub mod PubMod {
                pub struct PubStruct;
@@ -360,7 +360,7 @@ mod tests {
            use PubMod::{PubStruct2, PubStruct1};
            struct Test {
-                test: Pub<|>Struct2<u8>,
+                test: PubStruct2<u8>,
            }
            pub mod PubMod {
@@ -393,7 +393,7 @@ mod tests {
            r"
            use PubMod3::PubStruct;
-            PubSt<|>ruct
+            PubStruct
            pub mod PubMod1 {
                pub struct PubStruct;
@@ -474,7 +474,7 @@ mod tests {
            r"
            use PubMod::test_function;
-            test_function<|>
+            test_function
            pub mod PubMod {
                pub fn test_function() {};
@@ -501,7 +501,7 @@ mod tests {
            r"use crate_with_macro::foo;
 fn main() {
-    foo<|>
+    foo
 }
 ",
        );
@@ -587,7 +587,7 @@ fn main() {
            }
            fn main() {
-                TestStruct::test_function<|>
+                TestStruct::test_function
            }
            ",
        );
@@ -620,7 +620,7 @@ fn main() {
            }
            fn main() {
-                TestStruct::TEST_CONST<|>
+                TestStruct::TEST_CONST
            }
            ",
        );
@@ -659,7 +659,7 @@ fn main() {
            }
            fn main() {
-                test_mod::TestStruct::test_function<|>
+                test_mod::TestStruct::test_function
            }
            ",
        );
@@ -730,7 +730,7 @@ fn main() {
            }
            fn main() {
-                test_mod::TestStruct::TEST_CONST<|>
+                test_mod::TestStruct::TEST_CONST
            }
            ",
        );
@@ -803,7 +803,7 @@ fn main() {
            fn main() {
                let test_struct = test_mod::TestStruct {};
-                test_struct.test_meth<|>od()
+                test_struct.test_method()
            }
            ",
        );
diff --git a/crates/ra_assists/src/handlers/change_visibility.rs b/crates/ra_assists/src/handlers/change_visibility.rs
index fbe459c9c..c21d75be0 100644
--- a/crates/ra_assists/src/handlers/change_visibility.rs
+++ b/crates/ra_assists/src/handlers/change_visibility.rs
@@ -118,17 +118,13 @@ mod tests {
    #[test]
    fn change_visibility_adds_pub_crate_to_items() {
-        check_assist(change_visibility, "<|>fn foo() {}", "<|>pub(crate) fn foo() {}");
+        check_assist(change_visibility, "<|>fn foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "f<|>n foo() {}", "pub(crate) f<|>n foo() {}");
+        check_assist(change_visibility, "f<|>n foo() {}", "pub(crate) fn foo() {}");
-        check_assist(change_visibility, "<|>struct Foo {}", "<|>pub(crate) struct Foo {}");
+        check_assist(change_visibility, "<|>struct Foo {}", "pub(crate) struct Foo {}");
-        check_assist(change_visibility, "<|>mod foo {}", "<|>pub(crate) mod foo {}");
+        check_assist(change_visibility, "<|>mod foo {}", "pub(crate) mod foo {}");
-        check_assist(change_visibility, "<|>trait Foo {}", "<|>pub(crate) trait Foo {}");
+        check_assist(change_visibility, "<|>trait Foo {}", "pub(crate) trait Foo {}");
-        check_assist(change_visibility, "m<|>od {}", "pub(crate) m<|>od {}");
+        check_assist(change_visibility, "m<|>od {}", "pub(crate) mod {}");
-        check_assist(
+        check_assist(change_visibility, "unsafe f<|>n foo() {}", "pub(crate) unsafe fn foo() {}");
-            change_visibility,
-            "unsafe f<|>n foo() {}",
-            "pub(crate) unsafe f<|>n foo() {}",
-        );
    }
    #[test]
@@ -136,9 +132,9 @@ mod tests {
        check_assist(
            change_visibility,
            r"struct S { <|>field: u32 }",
-            r"struct S { <|>pub(crate) field: u32 }",
+            r"struct S { pub(crate) field: u32 }",
        );
-        check_assist(change_visibility, r"struct S ( <|>u32 )", r"struct S ( <|>pub(crate) u32 )");
+        check_assist(change_visibility, r"struct S ( <|>u32 )", r"struct S ( pub(crate) u32 )");
    }
    #[test]
@@ -152,17 +148,17 @@ mod tests {
    #[test]
    fn change_visibility_pub_to_pub_crate() {
-        check_assist(change_visibility, "<|>pub fn foo() {}", "<|>pub(crate) fn foo() {}")
+        check_assist(change_visibility, "<|>pub fn foo() {}", "pub(crate) fn foo() {}")
    }
    #[test]
    fn change_visibility_pub_crate_to_pub() {
-        check_assist(change_visibility, "<|>pub(crate) fn foo() {}", "<|>pub fn foo() {}")
+        check_assist(change_visibility, "<|>pub(crate) fn foo() {}", "pub fn foo() {}")
    }
    #[test]
    fn change_visibility_const() {
-        check_assist(change_visibility, "<|>const FOO = 3u8;", "<|>pub(crate) const FOO = 3u8;");
+        check_assist(change_visibility, "<|>const FOO = 3u8;", "pub(crate) const FOO = 3u8;");
    }
    #[test]
@@ -183,7 +179,7 @@ mod tests {
            // comments
            #[derive(Debug)]
-            <|>pub(crate) struct Foo;
+            pub(crate) struct Foo;
            ",
        )
    }
diff --git a/crates/ra_assists/src/handlers/early_return.rs b/crates/ra_assists/src/handlers/early_return.rs
index 66b296081..4cc75a7ce 100644
--- a/crates/ra_assists/src/handlers/early_return.rs
+++ b/crates/ra_assists/src/handlers/early_return.rs
@@ -97,7 +97,6 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
    }
    then_block.syntax().last_child_or_token().filter(|t| t.kind() == R_CURLY)?;
-    let cursor_position = ctx.offset();
    let target = if_expr.syntax().text_range();
    acc.add(AssistId("convert_to_guarded_return"), "Convert to guarded return", target, |edit| {
@@ -148,7 +147,6 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
            }
        };
        edit.replace_ast(parent_block, ast::BlockExpr::cast(new_block).unwrap());
-        edit.set_cursor(cursor_position);
        fn replace(
            new_expr: &SyntaxNode,
@@ -207,7 +205,7 @@ mod tests {
            r#"
            fn main() {
                bar();
-                if<|> !true {
+                if !true {
                    return;
                }
                foo();
@@ -237,7 +235,7 @@ mod tests {
            r#"
            fn main(n: Option<String>) {
                bar();
-                le<|>t n = match n {
+                let n = match n {
                    Some(it) => it,
                    _ => return,
                };
@@ -263,7 +261,7 @@ mod tests {
            "#,
            r#"
            fn main() {
-                le<|>t x = match Err(92) {
+                let x = match Err(92) {
                    Ok(it) => it,
                    _ => return,
                };
@@ -291,7 +289,7 @@ mod tests {
            r#"
            fn main(n: Option<String>) {
                bar();
-                le<|>t n = match n {
+                let n = match n {
                    Ok(it) => it,
                    _ => return,
                };
@@ -321,7 +319,7 @@ mod tests {
            r#"
            fn main() {
                while true {
-                    if<|> !true {
+                    if !true {
                        continue;
                    }
                    foo();
@@ -349,7 +347,7 @@ mod tests {
            r#"
            fn main() {
                while true {
-                    le<|>t n = match n {
+                    let n = match n {
                        Some(it) => it,
                        _ => continue,
                    };
@@ -378,7 +376,7 @@ mod tests {
            r#"
            fn main() {
                loop {
-                    if<|> !true {
+                    if !true {
                        continue;
                    }
                    foo();
@@ -406,7 +404,7 @@ mod tests {
            r#"
            fn main() {
                loop {
-                    le<|>t n = match n {
+                    let n = match n {
                        Some(it) => it,
                        _ => continue,
                    };
diff --git a/crates/ra_assists/src/handlers/flip_binexpr.rs b/crates/ra_assists/src/handlers/flip_binexpr.rs
index 692ba4895..573196576 100644
--- a/crates/ra_assists/src/handlers/flip_binexpr.rs
+++ b/crates/ra_assists/src/handlers/flip_binexpr.rs
@@ -85,17 +85,13 @@ mod tests {
        check_assist(
            flip_binexpr,
            "fn f() { let res = 1 ==<|> 2; }",
-            "fn f() { let res = 2 ==<|> 1; }",
+            "fn f() { let res = 2 == 1; }",
        )
    }
    #[test]
    fn flip_binexpr_works_for_gt() {
-        check_assist(
+        check_assist(flip_binexpr, "fn f() { let res = 1 ><|> 2; }", "fn f() { let res = 2 < 1; }")
-            flip_binexpr,
-            "fn f() { let res = 1 ><|> 2; }",
-            "fn f() { let res = 2 <<|> 1; }",
-        )
    }
    #[test]
@@ -103,7 +99,7 @@ mod tests {
        check_assist(
            flip_binexpr,
            "fn f() { let res = 1 <=<|> 2; }",
-            "fn f() { let res = 2 >=<|> 1; }",
+            "fn f() { let res = 2 >= 1; }",
        )
    }
@@ -112,7 +108,7 @@ mod tests {
        check_assist(
            flip_binexpr,
            "fn f() { let res = (1 + 1) ==<|> (2 + 2); }",
-            "fn f() { let res = (2 + 2) ==<|> (1 + 1); }",
+            "fn f() { let res = (2 + 2) == (1 + 1); }",
        )
    }
@@ -132,7 +128,7 @@ mod tests {
            fn dyn_eq(&self, other: &dyn Diagnostic) -> bool {
                match other.downcast_ref::<Self>() {
                    None => false,
-                    Some(it) => self ==<|> it,
+                    Some(it) => self == it,
                }
            }
            "#,
diff --git a/crates/ra_assists/src/handlers/flip_comma.rs b/crates/ra_assists/src/handlers/flip_comma.rs
index dfe2a7fed..a57a1c463 100644
--- a/crates/ra_assists/src/handlers/flip_comma.rs
+++ b/crates/ra_assists/src/handlers/flip_comma.rs
@@ -45,7 +45,7 @@ mod tests {
        check_assist(
            flip_comma,
            "fn foo(x: i32,<|> y: Result<(), ()>) {}",
-            "fn foo(y: Result<(), ()>,<|> x: i32) {}",
+            "fn foo(y: Result<(), ()>, x: i32) {}",
        )
    }
diff --git a/crates/ra_assists/src/handlers/flip_trait_bound.rs b/crates/ra_assists/src/handlers/flip_trait_bound.rs
index 8a08702ab..0115adc8b 100644
--- a/crates/ra_assists/src/handlers/flip_trait_bound.rs
+++ b/crates/ra_assists/src/handlers/flip_trait_bound.rs
@@ -60,7 +60,7 @@ mod tests {
        check_assist(
            flip_trait_bound,
            "struct S<T> where T: A <|>+ B { }",
-            "struct S<T> where T: B <|>+ A { }",
+            "struct S<T> where T: B + A { }",
        )
    }
@@ -69,13 +69,13 @@ mod tests {
        check_assist(
            flip_trait_bound,
            "impl X for S<T> where T: A +<|> B { }",
-            "impl X for S<T> where T: B +<|> A { }",
+            "impl X for S<T> where T: B + A { }",
        )
    }
    #[test]
    fn flip_trait_bound_works_for_fn() {
-        check_assist(flip_trait_bound, "fn f<T: A <|>+ B>(t: T) { }", "fn f<T: B <|>+ A>(t: T) { }")
+        check_assist(flip_trait_bound, "fn f<T: A <|>+ B>(t: T) { }", "fn f<T: B + A>(t: T) { }")
    }
    #[test]
@@ -83,7 +83,7 @@ mod tests {
        check_assist(
            flip_trait_bound,
            "fn f<T>(t: T) where T: A +<|> B { }",
-            "fn f<T>(t: T) where T: B +<|> A { }",
+            "fn f<T>(t: T) where T: B + A { }",
        )
    }
@@ -92,7 +92,7 @@ mod tests {
        check_assist(
            flip_trait_bound,
            "fn f<T>(t: T) where T: A <|>+ 'static { }",
-            "fn f<T>(t: T) where T: 'static <|>+ A { }",
+            "fn f<T>(t: T) where T: 'static + A { }",
        )
    }
@@ -101,7 +101,7 @@ mod tests {
        check_assist(
            flip_trait_bound,
            "struct S<T> where T: A<T> <|>+ b_mod::B<T> + C<T> { }",
-            "struct S<T> where T: b_mod::B<T> <|>+ A<T> + C<T> { }",
+            "struct S<T> where T: b_mod::B<T> + A<T> + C<T> { }",
        )
    }
@@ -110,7 +110,7 @@ mod tests {
        check_assist(
            flip_trait_bound,
            "struct S<T> where T: A + B + C + D + E + F +<|> G + H + I + J { }",
-            "struct S<T> where T: A + B + C + D + E + G +<|> F + H + I + J { }",
+            "struct S<T> where T: A + B + C + D + E + G + F + H + I + J { }",
        )
    }
 }
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index 46d675a4e..d26e68847 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ra_assists/src/handlers/inline_local_variable.rs
@@ -116,7 +116,6 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
            let replacement = if should_wrap { init_in_paren.clone() } else { init_str.clone() };
            builder.replace(desc.file_range.range, replacement)
        }
-        builder.set_cursor(delete_range.start())
    })
 }
@@ -149,7 +148,7 @@ fn foo() {
            r"
 fn bar(a: usize) {}
 fn foo() {
-    <|>1 + 1;
+    1 + 1;
    if 1 > 10 {
    }
@@ -183,7 +182,7 @@ fn foo() {
            r"
 fn bar(a: usize) {}
 fn foo() {
-    <|>(1 + 1) + 1;
+    (1 + 1) + 1;
    if (1 + 1) > 10 {
    }
@@ -217,7 +216,7 @@ fn foo() {
            r"
 fn bar(a: usize) {}
 fn foo() {
-    <|>bar(1) + 1;
+    bar(1) + 1;
    if bar(1) > 10 {
    }
@@ -251,7 +250,7 @@ fn foo() {
            r"
 fn bar(a: usize): usize { a }
 fn foo() {
-    <|>(bar(1) as u64) + 1;
+    (bar(1) as u64) + 1;
    if (bar(1) as u64) > 10 {
    }
@@ -283,7 +282,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>{ 10 + 1 } + 1;
+    { 10 + 1 } + 1;
    if { 10 + 1 } > 10 {
    }
@@ -315,7 +314,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>( 10 + 1 ) + 1;
+    ( 10 + 1 ) + 1;
    if ( 10 + 1 ) > 10 {
    }
@@ -353,7 +352,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>let b = bar(10 + 1) * 10;
+    let b = bar(10 + 1) * 10;
    let c = bar(10 + 1) as usize;
 }",
        );
@@ -373,7 +372,7 @@ fn foo() {
            r"
 fn foo() {
    let x = vec![1, 2, 3];
-    <|>let b = x[0] * 10;
+    let b = x[0] * 10;
    let c = x[0] as usize;
 }",
        );
@@ -393,7 +392,7 @@ fn foo() {
            r"
 fn foo() {
    let bar = vec![1];
-    <|>let b = bar.len() * 10;
+    let b = bar.len() * 10;
    let c = bar.len() as usize;
 }",
        );
@@ -421,7 +420,7 @@ struct Bar {
 fn foo() {
    let bar = Bar { foo: 1 };
-    <|>let b = bar.foo * 10;
+    let b = bar.foo * 10;
    let c = bar.foo as usize;
 }",
        );
@@ -442,7 +441,7 @@ fn foo() -> Option<usize> {
            r"
 fn foo() -> Option<usize> {
    let bar = Some(1);
-    <|>let b = bar? * 10;
+    let b = bar? * 10;
    let c = bar? as usize;
    None
 }",
@@ -462,7 +461,7 @@ fn foo() {
            r"
 fn foo() {
    let bar = 10;
-    <|>let b = &bar * 10;
+    let b = &bar * 10;
 }",
        );
    }
@@ -478,7 +477,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>let b = (10, 20)[0];
+    let b = (10, 20)[0];
 }",
        );
    }
@@ -494,7 +493,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>let b = [1, 2, 3].len();
+    let b = [1, 2, 3].len();
 }",
        );
    }
@@ -511,7 +510,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>let b = (10 + 20) * 10;
+    let b = (10 + 20) * 10;
    let c = (10 + 20) as usize;
 }",
        );
@@ -531,7 +530,7 @@ fn foo() {
            r"
 fn foo() {
    let d = 10;
-    <|>let b = d * 10;
+    let b = d * 10;
    let c = d as usize;
 }",
        );
@@ -549,7 +548,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>let b = { 10 } * 10;
+    let b = { 10 } * 10;
    let c = { 10 } as usize;
 }",
        );
@@ -569,7 +568,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>let b = (10 + 20) * 10;
+    let b = (10 + 20) * 10;
    let c = (10 + 20, 20);
    let d = [10 + 20, 10];
    let e = (10 + 20);
@@ -588,7 +587,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>for i in vec![10, 20] {}
+    for i in vec![10, 20] {}
 }",
        );
    }
@@ -604,7 +603,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>while 1 > 0 {}
+    while 1 > 0 {}
 }",
        );
    }
@@ -622,7 +621,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>loop {
+    loop {
        break 1 + 1;
    }
 }",
@@ -640,7 +639,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>return 1 > 0;
+    return 1 > 0;
 }",
        );
    }
@@ -656,7 +655,7 @@ fn foo() {
 }",
            r"
 fn foo() {
-    <|>match 1 > 0 {}
+    match 1 > 0 {}
 }",
        );
    }
diff --git a/crates/ra_assists/src/handlers/introduce_variable.rs b/crates/ra_assists/src/handlers/introduce_variable.rs
index 56c610fed..31d6539f7 100644
--- a/crates/ra_assists/src/handlers/introduce_variable.rs
+++ b/crates/ra_assists/src/handlers/introduce_variable.rs
@@ -4,7 +4,7 @@ use ra_syntax::{
        BLOCK_EXPR, BREAK_EXPR, COMMENT, LAMBDA_EXPR, LOOP_EXPR, MATCH_ARM, PATH_EXPR, RETURN_EXPR,
        WHITESPACE,
    },
-    SyntaxNode, TextSize,
+    SyntaxNode,
 };
 use stdx::format_to;
 use test_utils::mark;
@@ -23,7 +23,7 @@ use crate::{AssistContext, AssistId, Assists};
 // ->
 // ```
 // fn main() {
-//     let var_name = (1 + 2);
+//     let $0var_name = (1 + 2);
 //     var_name * 4;
 // }
 // ```
@@ -46,14 +46,13 @@ pub(crate) fn introduce_variable(acc: &mut Assists, ctx: &AssistContext) -> Opti
    acc.add(AssistId("introduce_variable"), "Extract into variable", target, move |edit| {
        let mut buf = String::new();
-        let cursor_offset = if wrap_in_block {
+        if wrap_in_block {
            buf.push_str("{ let var_name = ");
-            TextSize::of("{ let ")
        } else {
            buf.push_str("let var_name = ");
-            TextSize::of("let ")
        };
        format_to!(buf, "{}", expr.syntax());
        let full_stmt = ast::ExprStmt::cast(anchor_stmt.clone());
        let is_full_stmt = if let Some(expr_stmt) = &full_stmt {
            Some(expr.syntax().clone()) == expr_stmt.expr().map(|e| e.syntax().clone())
@@ -65,28 +64,43 @@ pub(crate) fn introduce_variable(acc: &mut Assists, ctx: &AssistContext) -> Opti
            if full_stmt.unwrap().semicolon_token().is_none() {
                buf.push_str(";");
            }
-            edit.replace(expr.syntax().text_range(), buf);
+            let offset = expr.syntax().text_range();
-        } else {
+            match ctx.config.snippet_cap {
-            buf.push_str(";");
+                Some(cap) => {
+                    let snip = buf.replace("let var_name", "let $0var_name");
-            // We want to maintain the indent level,
+                    edit.replace_snippet(cap, offset, snip)
-            // but we do not want to duplicate possible
+                }
-            // extra newlines in the indent block
+                None => edit.replace(offset, buf),
-            let text = indent.text();
-            if text.starts_with('\n') {
-                buf.push_str("\n");
-                buf.push_str(text.trim_start_matches('\n'));
-            } else {
-                buf.push_str(text);
            }
+            return;
+        }
-            edit.replace(expr.syntax().text_range(), "var_name".to_string());
+        buf.push_str(";");
-            edit.insert(anchor_stmt.text_range().start(), buf);
-            if wrap_in_block {
+        // We want to maintain the indent level,
-                edit.insert(anchor_stmt.text_range().end(), " }");
+        // but we do not want to duplicate possible
+        // extra newlines in the indent block
+        let text = indent.text();
+        if text.starts_with('\n') {
+            buf.push_str("\n");
+            buf.push_str(text.trim_start_matches('\n'));
+        } else {
+            buf.push_str(text);
+        }
+        edit.replace(expr.syntax().text_range(), "var_name".to_string());
+        let offset = anchor_stmt.text_range().start();
+        match ctx.config.snippet_cap {
+            Some(cap) => {
+                let snip = buf.replace("let var_name", "let $0var_name");
+                edit.insert_snippet(cap, offset, snip)
            }
+            None => edit.insert(offset, buf),
+        }
+        if wrap_in_block {
+            edit.insert(anchor_stmt.text_range().end(), " }");
        }
-        edit.set_cursor(anchor_stmt.text_range().start() + cursor_offset);
    })
 }
@@ -144,15 +158,15 @@ mod tests {
    fn test_introduce_var_simple() {
        check_assist(
            introduce_variable,
-            "
+            r#"
 fn foo() {
    foo(<|>1 + 1<|>);
-}",
+}"#,
-            "
+            r#"
 fn foo() {
-    let <|>var_name = 1 + 1;
+    let $0var_name = 1 + 1;
    foo(var_name);
-}",
+}"#,
        );
    }
@@ -167,14 +181,14 @@ fn foo() {
        mark::check!(test_introduce_var_expr_stmt);
        check_assist(
            introduce_variable,
-            "
+            r#"
 fn foo() {
    <|>1 + 1<|>;
-}",
+}"#,
-            "
+            r#"
 fn foo() {
-    let <|>var_name = 1 + 1;
+    let $0var_name = 1 + 1;
-}",
+}"#,
        );
        check_assist(
            introduce_variable,
@@ -185,7 +199,7 @@ fn foo() {
 }",
            "
 fn foo() {
-    let <|>var_name = { let x = 0; x };
+    let $0var_name = { let x = 0; x };
    something_else();
 }",
        );
@@ -201,7 +215,7 @@ fn foo() {
 }",
            "
 fn foo() {
-    let <|>var_name = 1;
+    let $0var_name = 1;
    var_name + 1;
 }",
        );
@@ -218,7 +232,7 @@ fn foo() {
 }",
            "
 fn foo() {
-    let <|>var_name = 1 + 1;
+    let $0var_name = 1 + 1;
    bar(var_name)
 }",
        );
@@ -230,7 +244,7 @@ fn foo() {
 }",
            "
 fn foo() {
-    let <|>var_name = bar(1 + 1);
+    let $0var_name = bar(1 + 1);
    var_name
 }",
        )
@@ -253,7 +267,7 @@ fn main() {
 fn main() {
    let x = true;
    let tuple = match x {
-        true => { let <|>var_name = 2 + 2; (var_name, true) }
+        true => { let $0var_name = 2 + 2; (var_name, true) }
        _ => (0, false)
    };
 }
@@ -283,7 +297,7 @@ fn main() {
    let tuple = match x {
        true => {
            let y = 1;
-            let <|>var_name = 2 + y;
+            let $0var_name = 2 + y;
            (var_name, true)
        }
        _ => (0, false)
@@ -304,7 +318,7 @@ fn main() {
 ",
            "
 fn main() {
-    let lambda = |x: u32| { let <|>var_name = x * 2; var_name };
+    let lambda = |x: u32| { let $0var_name = x * 2; var_name };
 }
 ",
        );
@@ -321,7 +335,7 @@ fn main() {
 ",
            "
 fn main() {
-    let lambda = |x: u32| { let <|>var_name = x * 2; var_name };
+    let lambda = |x: u32| { let $0var_name = x * 2; var_name };
 }
 ",
        );
@@ -338,7 +352,7 @@ fn main() {
 ",
            "
 fn main() {
-    let <|>var_name = Some(true);
+    let $0var_name = Some(true);
    let o = var_name;
 }
 ",
@@ -356,7 +370,7 @@ fn main() {
 ",
            "
 fn main() {
-    let <|>var_name = bar.foo();
+    let $0var_name = bar.foo();
    let v = var_name;
 }
 ",
@@ -374,7 +388,7 @@ fn foo() -> u32 {
 ",
            "
 fn foo() -> u32 {
-    let <|>var_name = 2 + 2;
+    let $0var_name = 2 + 2;
    return var_name;
 }
 ",
@@ -396,7 +410,7 @@ fn foo() -> u32 {
 fn foo() -> u32 {
-    let <|>var_name = 2 + 2;
+    let $0var_name = 2 + 2;
    return var_name;
 }
 ",
@@ -413,7 +427,7 @@ fn foo() -> u32 {
            "
 fn foo() -> u32 {
-        let <|>var_name = 2 + 2;
+        let $0var_name = 2 + 2;
        return var_name;
 }
 ",
@@ -438,7 +452,7 @@ fn foo() -> u32 {
    // bar
-    let <|>var_name = 2 + 2;
+    let $0var_name = 2 + 2;
    return var_name;
 }
 ",
@@ -459,7 +473,7 @@ fn main() {
            "
 fn main() {
    let result = loop {
-        let <|>var_name = 2 + 2;
+        let $0var_name = 2 + 2;
        break var_name;
    };
 }
@@ -478,7 +492,7 @@ fn main() {
 ",
            "
 fn main() {
-    let <|>var_name = 0f32 as u32;
+    let $0var_name = 0f32 as u32;
    let v = var_name;
 }
 ",
diff --git a/crates/ra_assists/src/handlers/invert_if.rs b/crates/ra_assists/src/handlers/invert_if.rs
index 527c7caef..59d278eb9 100644
--- a/crates/ra_assists/src/handlers/invert_if.rs
+++ b/crates/ra_assists/src/handlers/invert_if.rs
@@ -72,7 +72,7 @@ mod tests {
        check_assist(
            invert_if,
            "fn f() { i<|>f x != 3 { 1 } else { 3 + 2 } }",
-            "fn f() { i<|>f x == 3 { 3 + 2 } else { 1 } }",
+            "fn f() { if x == 3 { 3 + 2 } else { 1 } }",
        )
    }
@@ -81,7 +81,7 @@ mod tests {
        check_assist(
            invert_if,
            "fn f() { <|>if !cond { 3 * 2 } else { 1 } }",
-            "fn f() { <|>if cond { 1 } else { 3 * 2 } }",
+            "fn f() { if cond { 1 } else { 3 * 2 } }",
        )
    }
@@ -90,7 +90,7 @@ mod tests {
        check_assist(
            invert_if,
            "fn f() { i<|>f cond { 3 * 2 } else { 1 } }",
-            "fn f() { i<|>f !cond { 1 } else { 3 * 2 } }",
+            "fn f() { if !cond { 1 } else { 3 * 2 } }",
        )
    }
diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/ra_assists/src/handlers/merge_imports.rs
index ac3e53c27..972d16241 100644
--- a/crates/ra_assists/src/handlers/merge_imports.rs
+++ b/crates/ra_assists/src/handlers/merge_imports.rs
@@ -58,8 +58,6 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<()
    let target = tree.syntax().text_range();
    acc.add(AssistId("merge_imports"), "Merge imports", target, |builder| {
        builder.rewrite(rewriter);
-        // FIXME: we only need because our diff is imprecise
-        builder.set_cursor(offset);
    })
 }
@@ -142,7 +140,7 @@ use std::fmt<|>::Debug;
 use std::fmt::Display;
 ",
            r"
-use std::fmt<|>::{Debug, Display};
+use std::fmt::{Debug, Display};
 ",
        )
    }
@@ -156,7 +154,7 @@ use std::fmt::Debug;
 use std::fmt<|>::Display;
 ",
            r"
-use std::fmt:<|>:{Display, Debug};
+use std::fmt::{Display, Debug};
 ",
        );
    }
@@ -169,7 +167,7 @@ use std::fmt:<|>:{Display, Debug};
 use std::{fmt<|>::Debug, fmt::Display};
 ",
            r"
-use std::{fmt<|>::{Debug, Display}};
+use std::{fmt::{Debug, Display}};
 ",
        );
        check_assist(
@@ -178,7 +176,7 @@ use std::{fmt<|>::{Debug, Display}};
 use std::{fmt::Debug, fmt<|>::Display};
 ",
            r"
-use std::{fmt::<|>{Display, Debug}};
+use std::{fmt::{Display, Debug}};
 ",
        );
    }
@@ -192,7 +190,7 @@ use std<|>::cell::*;
 use std::str;
 ",
            r"
-use std<|>::{cell::*, str};
+use std::{cell::*, str};
 ",
        )
    }
@@ -206,7 +204,7 @@ use std<|>::cell::*;
 use std::str::*;
 ",
            r"
-use std<|>::{cell::*, str::*};
+use std::{cell::*, str::*};
 ",
        )
    }
@@ -222,7 +220,7 @@ use foo::baz;
 /// Doc comment
 ",
            r"
-use foo<|>::{bar, baz};
+use foo::{bar, baz};
 /// Doc comment
 ",
@@ -241,7 +239,7 @@ use {
 ",
            r"
 use {
-    foo<|>::{bar, baz},
+    foo::{bar, baz},
 };
 ",
        );
@@ -255,7 +253,7 @@ use {
 ",
            r"
 use {
-    foo::{bar<|>, baz},
+    foo::{bar, baz},
 };
 ",
        );
@@ -272,7 +270,7 @@ use foo::<|>{
 };
 ",
            r"
-use foo::{<|>
+use foo::{
    FooBar,
 bar::baz};
 ",
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs
index d4e38aa6a..ca04ec671 100644
--- a/crates/ra_assists/src/handlers/merge_match_arms.rs
+++ b/crates/ra_assists/src/handlers/merge_match_arms.rs
@@ -3,7 +3,7 @@ use std::iter::successors;
 use ra_syntax::{
    algo::neighbor,
    ast::{self, AstNode},
-    Direction, TextSize,
+    Direction,
 };
 use crate::{AssistContext, AssistId, Assists, TextRange};
@@ -41,17 +41,6 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option
    let current_expr = current_arm.expr()?;
    let current_text_range = current_arm.syntax().text_range();
-    enum CursorPos {
-        InExpr(TextSize),
-        InPat(TextSize),
-    }
-    let cursor_pos = ctx.offset();
-    let cursor_pos = if current_expr.syntax().text_range().contains(cursor_pos) {
-        CursorPos::InExpr(current_text_range.end() - cursor_pos)
-    } else {
-        CursorPos::InPat(cursor_pos)
-    };
    // We check if the following match arms match this one. We could, but don't,
    // compare to the previous match arm as well.
    let arms_to_merge = successors(Some(current_arm), |it| neighbor(it, Direction::Next))
@@ -87,10 +76,6 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option
        let start = arms_to_merge.first().unwrap().syntax().text_range().start();
        let end = arms_to_merge.last().unwrap().syntax().text_range().end();
-        edit.set_cursor(match cursor_pos {
-            CursorPos::InExpr(back_offset) => start + TextSize::of(&arm) - back_offset,
-            CursorPos::InPat(offset) => offset,
-        });
        edit.replace(TextRange::new(start, end), arm);
    })
 }
@@ -132,7 +117,7 @@ mod tests {
            fn main() {
                let x = X::A;
                let y = match x {
-                    X::A | X::B => { 1i32<|> }
+                    X::A | X::B => { 1i32 }
                    X::C => { 2i32 }
                }
            }
@@ -164,7 +149,7 @@ mod tests {
            fn main() {
                let x = X::A;
                let y = match x {
-                    X::A | X::B | X::C | X::D => {<|> 1i32 },
+                    X::A | X::B | X::C | X::D => { 1i32 },
                    X::E => { 2i32 },
                }
            }
@@ -197,7 +182,7 @@ mod tests {
                let x = X::A;
                let y = match x {
                    X::A => { 1i32 },
-                    _ => { 2i<|>32 }
+                    _ => { 2i32 }
                }
            }
            "#,
@@ -226,7 +211,7 @@ mod tests {
            fn main() {
                match X::A {
-                    X::A<|> | X::B | X::C => 92,
+                    X::A | X::B | X::C => 92,
                    X::D => 62,
                    _ => panic!(),
                }
diff --git a/crates/ra_assists/src/handlers/move_bounds.rs b/crates/ra_assists/src/handlers/move_bounds.rs
index a41aacfc3..be2a7eddc 100644
--- a/crates/ra_assists/src/handlers/move_bounds.rs
+++ b/crates/ra_assists/src/handlers/move_bounds.rs
@@ -99,7 +99,7 @@ mod tests {
            fn foo<T: u32, <|>F: FnOnce(T) -> T>() {}
            "#,
            r#"
-            fn foo<T, <|>F>() where T: u32, F: FnOnce(T) -> T {}
+            fn foo<T, F>() where T: u32, F: FnOnce(T) -> T {}
            "#,
        );
    }
@@ -112,7 +112,7 @@ mod tests {
            impl<U: u32, <|>T> A<U, T> {}
            "#,
            r#"
-            impl<U, <|>T> A<U, T> where U: u32 {}
+            impl<U, T> A<U, T> where U: u32 {}
            "#,
        );
    }
@@ -125,7 +125,7 @@ mod tests {
            struct A<<|>T: Iterator<Item = u32>> {}
            "#,
            r#"
-            struct A<<|>T> where T: Iterator<Item = u32> {}
+            struct A<T> where T: Iterator<Item = u32> {}
            "#,
        );
    }
@@ -138,7 +138,7 @@ mod tests {
            struct Pair<<|>T: u32>(T, T);
            "#,
            r#"
-            struct Pair<<|>T>(T, T) where T: u32;
+            struct Pair<T>(T, T) where T: u32;
            "#,
        );
    }
diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs
index fc0335b57..7edcf0748 100644
--- a/crates/ra_assists/src/handlers/move_guard.rs
+++ b/crates/ra_assists/src/handlers/move_guard.rs
@@ -1,7 +1,6 @@
 use ra_syntax::{
-    ast,
+    ast::{AstNode, IfExpr, MatchArm},
-    ast::{AstNode, AstToken, IfExpr, MatchArm},
+    SyntaxKind::WHITESPACE,
-    TextSize,
 };
 use crate::{AssistContext, AssistId, Assists};
@@ -42,24 +41,15 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext) ->
    let target = guard.syntax().text_range();
    acc.add(AssistId("move_guard_to_arm_body"), "Move guard to arm body", target, |edit| {
-        let offseting_amount = match space_before_guard.and_then(|it| it.into_token()) {
+        match space_before_guard {
-            Some(tok) => {
+            Some(element) if element.kind() == WHITESPACE => {
-                if ast::Whitespace::cast(tok.clone()).is_some() {
+                edit.delete(element.text_range());
-                    let ele = tok.text_range();
-                    edit.delete(ele);
-                    ele.len()
-                } else {
-                    TextSize::from(0)
-                }
            }
-            _ => TextSize::from(0),
+            _ => (),
        };
        edit.delete(guard.syntax().text_range());
        edit.replace_node_and_indent(arm_expr.syntax(), buf);
-        edit.set_cursor(
-            arm_expr.syntax().text_range().start() + TextSize::from(3) - offseting_amount,
-        );
    })
 }
@@ -124,7 +114,6 @@ pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContex
            }
            edit.insert(match_pat.syntax().text_range().end(), buf);
-            edit.set_cursor(match_pat.syntax().text_range().end() + TextSize::from(1));
        },
    )
 }
@@ -172,7 +161,7 @@ mod tests {
                let t = 'a';
                let chars = "abcd";
                match t {
-                    '\r' => if chars.clone().next() == Some('\n') { <|>false },
+                    '\r' => if chars.clone().next() == Some('\n') { false },
                    _ => true
                }
            }
@@ -195,7 +184,7 @@ mod tests {
            r#"
            fn f() {
                match x {
-                    y @ 4 | y @ 5 => if y > 5 { <|>true },
+                    y @ 4 | y @ 5 => if y > 5 { true },
                    _ => false
                }
            }
@@ -222,7 +211,7 @@ mod tests {
                let t = 'a';
                let chars = "abcd";
                match t {
-                    '\r' <|>if chars.clone().next() == Some('\n') => false,
+                    '\r' if chars.clone().next() == Some('\n') => false,
                    _ => true
                }
            }
@@ -266,7 +255,7 @@ mod tests {
                let t = 'a';
                let chars = "abcd";
                match t {
-                    '\r' <|>if chars.clone().next().is_some() => {  },
+                    '\r' if chars.clone().next().is_some() => {  },
                    _ => true
                }
            }
@@ -296,7 +285,7 @@ mod tests {
                let mut t = 'a';
                let chars = "abcd";
                match t {
-                    '\r' <|>if chars.clone().next().is_some() => {
+                    '\r' if chars.clone().next().is_some() => {
                        t = 'e';
                        false
                    },
diff --git a/crates/ra_assists/src/handlers/raw_string.rs b/crates/ra_assists/src/handlers/raw_string.rs
index c20ffe0b3..16002d2ac 100644
--- a/crates/ra_assists/src/handlers/raw_string.rs
+++ b/crates/ra_assists/src/handlers/raw_string.rs
@@ -164,7 +164,7 @@ mod test {
            "#,
            r##"
            fn f() {
-                let s = <|>r#"random
+                let s = r#"random
 string"#;
            }
            "##,
@@ -182,7 +182,7 @@ string"#;
            "#,
            r##"
            fn f() {
-                format!(<|>r#"x = {}"#, 92)
+                format!(r#"x = {}"#, 92)
            }
            "##,
        )
@@ -199,7 +199,7 @@ string"#;
            "###,
            r####"
            fn f() {
-                let s = <|>r#"#random##
+                let s = r#"#random##
 string"#;
            }
            "####,
@@ -217,7 +217,7 @@ string"#;
            "###,
            r####"
            fn f() {
-                let s = <|>r###"#random"##
+                let s = r###"#random"##
 string"###;
            }
            "####,
@@ -235,7 +235,7 @@ string"###;
            "#,
            r##"
            fn f() {
-                let s = <|>r#"random string"#;
+                let s = r#"random string"#;
            }
            "##,
        )
@@ -289,7 +289,7 @@ string"###;
            "#,
            r##"
            fn f() {
-                let s = <|>r#"random string"#;
+                let s = r#"random string"#;
            }
            "##,
        )
@@ -306,7 +306,7 @@ string"###;
            "##,
            r###"
            fn f() {
-                let s = <|>r##"random"string"##;
+                let s = r##"random"string"##;
            }
            "###,
        )
@@ -348,7 +348,7 @@ string"###;
            "##,
            r#"
            fn f() {
-                let s = <|>r"random string";
+                let s = r"random string";
            }
            "#,
        )
@@ -365,7 +365,7 @@ string"###;
            "##,
            r#"
            fn f() {
-                let s = <|>r"random\"str\"ing";
+                let s = r"random\"str\"ing";
            }
            "#,
        )
@@ -382,7 +382,7 @@ string"###;
            "###,
            r##"
            fn f() {
-                let s = <|>r#"random string"#;
+                let s = r#"random string"#;
            }
            "##,
        )
@@ -436,7 +436,7 @@ string"###;
            "##,
            r#"
            fn f() {
-                let s = <|>"random string";
+                let s = "random string";
            }
            "#,
        )
@@ -453,7 +453,7 @@ string"###;
            "##,
            r#"
            fn f() {
-                let s = <|>"random\"str\"ing";
+                let s = "random\"str\"ing";
            }
            "#,
        )
@@ -470,7 +470,7 @@ string"###;
            "###,
            r##"
            fn f() {
-                let s = <|>"random string";
+                let s = "random string";
            }
            "##,
        )
diff --git a/crates/ra_assists/src/handlers/remove_dbg.rs b/crates/ra_assists/src/handlers/remove_dbg.rs
index 8eef578cf..961ee1731 100644
--- a/crates/ra_assists/src/handlers/remove_dbg.rs
+++ b/crates/ra_assists/src/handlers/remove_dbg.rs
@@ -29,26 +29,6 @@ pub(crate) fn remove_dbg(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    let macro_range = macro_call.syntax().text_range();
-    // If the cursor is inside the macro call, we'll try to maintain the cursor
-    // position by subtracting the length of dbg!( from the start of the file
-    // range, otherwise we'll default to using the start of the macro call
-    let cursor_pos = {
-        let file_range = ctx.frange.range;
-        let offset_start = file_range
-            .start()
-            .checked_sub(macro_range.start())
-            .unwrap_or_else(|| TextSize::from(0));
-        let dbg_size = TextSize::of("dbg!(");
-        if offset_start > dbg_size {
-            file_range.start() - dbg_size
-        } else {
-            macro_range.start()
-        }
-    };
    let macro_content = {
        let macro_args = macro_call.token_tree()?.syntax().clone();
@@ -58,9 +38,8 @@ pub(crate) fn remove_dbg(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    };
    let target = macro_call.syntax().text_range();
-    acc.add(AssistId("remove_dbg"), "Remove dbg!()", target, |edit| {
+    acc.add(AssistId("remove_dbg"), "Remove dbg!()", target, |builder| {
-        edit.replace(macro_range, macro_content);
+        builder.replace(macro_range, macro_content);
-        edit.set_cursor(cursor_pos);
    })
 }
@@ -94,13 +73,13 @@ mod tests {
    #[test]
    fn test_remove_dbg() {
-        check_assist(remove_dbg, "<|>dbg!(1 + 1)", "<|>1 + 1");
+        check_assist(remove_dbg, "<|>dbg!(1 + 1)", "1 + 1");
-        check_assist(remove_dbg, "dbg!<|>((1 + 1))", "<|>(1 + 1)");
+        check_assist(remove_dbg, "dbg!<|>((1 + 1))", "(1 + 1)");
-        check_assist(remove_dbg, "dbg!(1 <|>+ 1)", "1 <|>+ 1");
+        check_assist(remove_dbg, "dbg!(1 <|>+ 1)", "1 + 1");
-        check_assist(remove_dbg, "let _ = <|>dbg!(1 + 1)", "let _ = <|>1 + 1");
+        check_assist(remove_dbg, "let _ = <|>dbg!(1 + 1)", "let _ = 1 + 1");
        check_assist(
            remove_dbg,
@@ -113,7 +92,7 @@ fn foo(n: usize) {
 ",
            "
 fn foo(n: usize) {
-    if let Some(_) = n.<|>checked_sub(4) {
+    if let Some(_) = n.checked_sub(4) {
        // ...
    }
 }
@@ -122,8 +101,8 @@ fn foo(n: usize) {
    }
    #[test]
    fn test_remove_dbg_with_brackets_and_braces() {
-        check_assist(remove_dbg, "dbg![<|>1 + 1]", "<|>1 + 1");
+        check_assist(remove_dbg, "dbg![<|>1 + 1]", "1 + 1");
-        check_assist(remove_dbg, "dbg!{<|>1 + 1}", "<|>1 + 1");
+        check_assist(remove_dbg, "dbg!{<|>1 + 1}", "1 + 1");
    }
    #[test]
diff --git a/crates/ra_assists/src/handlers/remove_mut.rs b/crates/ra_assists/src/handlers/remove_mut.rs
index dce546db7..fe4eada03 100644
--- a/crates/ra_assists/src/handlers/remove_mut.rs
+++ b/crates/ra_assists/src/handlers/remove_mut.rs
@@ -26,8 +26,7 @@ pub(crate) fn remove_mut(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
    };
    let target = mut_token.text_range();
-    acc.add(AssistId("remove_mut"), "Remove `mut` keyword", target, |edit| {
+    acc.add(AssistId("remove_mut"), "Remove `mut` keyword", target, |builder| {
-        edit.set_cursor(delete_from);
+        builder.delete(TextRange::new(delete_from, delete_to));
-        edit.delete(TextRange::new(delete_from, delete_to));
    })
 }
diff --git a/crates/ra_assists/src/handlers/reorder_fields.rs b/crates/ra_assists/src/handlers/reorder_fields.rs
index 757f6406e..897da2832 100644
--- a/crates/ra_assists/src/handlers/reorder_fields.rs
+++ b/crates/ra_assists/src/handlers/reorder_fields.rs
@@ -23,7 +23,7 @@ use crate::{AssistContext, AssistId, Assists};
 // ```
 //
 pub(crate) fn reorder_fields(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    reorder::<ast::RecordLit>(acc, ctx.clone()).or_else(|| reorder::<ast::RecordPat>(acc, ctx))
+    reorder::<ast::RecordLit>(acc, ctx).or_else(|| reorder::<ast::RecordPat>(acc, ctx))
 }
 fn reorder<R: AstNode>(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
@@ -140,7 +140,7 @@ mod tests {
        "#,
            r#"
        struct Foo {foo: i32, bar: i32};
-        const test: Foo = <|>Foo {foo: 1, bar: 0}
+        const test: Foo = Foo {foo: 1, bar: 0}
        "#,
        )
    }
@@ -164,7 +164,7 @@ mod tests {
        fn f(f: Foo) -> {
            match f {
-                <|>Foo { ref mut bar, baz: 0, .. } => (),
+                Foo { ref mut bar, baz: 0, .. } => (),
                _ => ()
            }
        }
@@ -202,7 +202,7 @@ mod tests {
            impl Foo {
                fn new() -> Foo {
                    let foo = String::new();
-                    <|>Foo {
+                    Foo {
                        foo,
                        bar: foo.clone(),
                        extra: "Extra field",
diff --git a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
index 65f5fc6ab..e016f51c3 100644
--- a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
@@ -68,7 +68,6 @@ pub(crate) fn replace_if_let_with_match(acc: &mut Assists, ctx: &AssistContext)
                .indent(IndentLevel::from_node(if_expr.syntax()))
        };
-        edit.set_cursor(if_expr.syntax().text_range().start());
        edit.replace_ast::<ast::Expr>(if_expr.into(), match_expr);
    })
 }
@@ -83,7 +82,7 @@ mod tests {
    fn test_replace_if_let_with_match_unwraps_simple_expressions() {
        check_assist(
            replace_if_let_with_match,
-            "
+            r#"
 impl VariantData {
    pub fn is_struct(&self) -> bool {
        if <|>let VariantData::Struct(..) = *self {
@@ -92,16 +91,16 @@ impl VariantData {
            false
        }
    }
-}           ",
+}           "#,
-            "
+            r#"
 impl VariantData {
    pub fn is_struct(&self) -> bool {
-        <|>match *self {
+        match *self {
            VariantData::Struct(..) => true,
            _ => false,
        }
    }
-}           ",
+}           "#,
        )
    }
@@ -109,7 +108,7 @@ impl VariantData {
    fn test_replace_if_let_with_match_doesnt_unwrap_multiline_expressions() {
        check_assist(
            replace_if_let_with_match,
-            "
+            r#"
 fn foo() {
    if <|>let VariantData::Struct(..) = a {
        bar(
@@ -118,10 +117,10 @@ fn foo() {
    } else {
        false
    }
-}           ",
+}           "#,
-            "
+            r#"
 fn foo() {
-    <|>match a {
+    match a {
        VariantData::Struct(..) => {
            bar(
                123
@@ -129,7 +128,7 @@ fn foo() {
        }
        _ => false,
    }
-}           ",
+}           "#,
        )
    }
@@ -137,7 +136,7 @@ fn foo() {
    fn replace_if_let_with_match_target() {
        check_assist_target(
            replace_if_let_with_match,
-            "
+            r#"
 impl VariantData {
    pub fn is_struct(&self) -> bool {
        if <|>let VariantData::Struct(..) = *self {
@@ -146,7 +145,7 @@ impl VariantData {
            false
        }
    }
-}           ",
+}           "#,
            "if let VariantData::Struct(..) = *self {
            true
        } else {
@@ -176,7 +175,7 @@ enum Option<T> { Some(T), None }
 use Option::*;
 fn foo(x: Option<i32>) {
-    <|>match x {
+    match x {
        Some(x) => println!("{}", x),
        None => println!("none"),
    }
@@ -206,7 +205,7 @@ enum Result<T, E> { Ok(T), Err(E) }
 use Result::*;
 fn foo(x: Result<i32, ()>) {
-    <|>match x {
+    match x {
        Ok(x) => println!("{}", x),
        Err(_) => println!("none"),
    }
diff --git a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
index 482957dc6..761557ac0 100644
--- a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
@@ -58,12 +58,9 @@ pub(crate) fn replace_let_with_if_let(acc: &mut Assists, ctx: &AssistContext) ->
        let stmt = make::expr_stmt(if_);
        let placeholder = stmt.syntax().descendants().find_map(ast::PlaceholderPat::cast).unwrap();
-        let target_offset =
-            let_stmt.syntax().text_range().start() + placeholder.syntax().text_range().start();
        let stmt = stmt.replace_descendant(placeholder.into(), original_pat);
        edit.replace_ast(ast::Stmt::from(let_stmt), ast::Stmt::from(stmt));
-        edit.set_cursor(target_offset);
    })
 }
@@ -88,7 +85,7 @@ fn main() {
 enum E<T> { X(T), Y(T) }
 fn main() {
-    if let <|>x = E::X(92) {
+    if let x = E::X(92) {
    }
 }
            ",
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 d9f84208d..0197a8cf0 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
@@ -89,7 +89,7 @@ std::fmt::Debug<|>
            "
 use std::fmt::Debug;
-Debug<|>
+Debug
    ",
        );
    }
@@ -106,7 +106,7 @@ fn main() {
            "
 use std::fmt::Debug;
-Debug<|>
+Debug
 fn main() {
 }
@@ -130,7 +130,7 @@ use std::fmt::Debug;
 fn main() {
 }
-Debug<|>
+Debug
    ",
        );
    }
@@ -145,7 +145,7 @@ std::fmt<|>::Debug
            "
 use std::fmt;
-fmt<|>::Debug
+fmt::Debug
    ",
        );
    }
@@ -164,7 +164,7 @@ impl std::fmt::Debug<|> for Foo {
 use stdx;
 use std::fmt::Debug;
-impl Debug<|> for Foo {
+impl Debug for Foo {
 }
    ",
        );
@@ -181,7 +181,7 @@ impl std::fmt::Debug<|> for Foo {
            "
 use std::fmt::Debug;
-impl Debug<|> for Foo {
+impl Debug for Foo {
 }
    ",
        );
@@ -198,7 +198,7 @@ impl Debug<|> for Foo {
            "
    use std::fmt::Debug;
-    impl Debug<|> for Foo {
+    impl Debug for Foo {
    }
    ",
        );
@@ -217,7 +217,7 @@ impl std::io<|> for Foo {
            "
 use std::{io, fmt};
-impl io<|> for Foo {
+impl io for Foo {
 }
    ",
        );
@@ -236,7 +236,7 @@ impl std::fmt::Debug<|> for Foo {
            "
 use std::fmt::{self, Debug, };
-impl Debug<|> for Foo {
+impl Debug for Foo {
 }
    ",
        );
@@ -255,7 +255,7 @@ impl std::fmt<|> for Foo {
            "
 use std::fmt::{self, Debug};
-impl fmt<|> for Foo {
+impl fmt for Foo {
 }
    ",
        );
@@ -274,7 +274,7 @@ impl std::fmt::nested<|> for Foo {
            "
 use std::fmt::{Debug, nested::{Display, self}};
-impl nested<|> for Foo {
+impl nested for Foo {
 }
 ",
        );
@@ -293,7 +293,7 @@ impl std::fmt::nested<|> for Foo {
            "
 use std::fmt::{Debug, nested::{self, Display}};
-impl nested<|> for Foo {
+impl nested for Foo {
 }
 ",
        );
@@ -312,7 +312,7 @@ impl std::fmt::nested::Debug<|> for Foo {
            "
 use std::fmt::{Debug, nested::{Display, Debug}};
-impl Debug<|> for Foo {
+impl Debug for Foo {
 }
 ",
        );
@@ -331,7 +331,7 @@ impl std::fmt::nested::Display<|> for Foo {
            "
 use std::fmt::{nested::Display, Debug};
-impl Display<|> for Foo {
+impl Display for Foo {
 }
 ",
        );
@@ -350,7 +350,7 @@ impl std::fmt::Display<|> for Foo {
            "
 use std::fmt::{Display, nested::Debug};
-impl Display<|> for Foo {
+impl Display for Foo {
 }
 ",
        );
@@ -374,7 +374,7 @@ use crate::{
    AssocItem,
 };
-fn foo() { lower<|>::trait_env() }
+fn foo() { lower::trait_env() }
 ",
        );
    }
@@ -392,7 +392,7 @@ impl foo::Debug<|> for Foo {
            "
 use std::fmt as foo;
-impl Debug<|> for Foo {
+impl Debug for Foo {
 }
 ",
        );
@@ -435,7 +435,7 @@ mod foo {
    mod bar {
        use std::fmt::Debug;
-        Debug<|>
+        Debug
    }
 }
    ",
@@ -458,7 +458,7 @@ fn main() {
 use std::fmt::Debug;
 fn main() {
-    Debug<|>
+    Debug
 }
    ",
        );
diff --git a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
index b379b55a8..cff7dfb81 100644
--- a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
+++ b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
@@ -9,7 +9,10 @@ use ra_syntax::{
    AstNode,
 };
-use crate::{utils::TryEnum, AssistContext, AssistId, Assists};
+use crate::{
+    utils::{render_snippet, Cursor, TryEnum},
+    AssistContext, AssistId, Assists,
+};
 // Assist: replace_unwrap_with_match
 //
@@ -29,7 +32,7 @@ use crate::{utils::TryEnum, AssistContext, AssistId, Assists};
 //     let x: Result<i32, i32> = Result::Ok(92);
 //     let y = match x {
 //         Ok(a) => a,
-//         _ => unreachable!(),
+//         $0_ => unreachable!(),
 //     };
 // }
 // ```
@@ -43,7 +46,7 @@ pub(crate) fn replace_unwrap_with_match(acc: &mut Assists, ctx: &AssistContext)
    let ty = ctx.sema.type_of_expr(&caller)?;
    let happy_variant = TryEnum::from_ty(&ctx.sema, &ty)?.happy_case();
    let target = method_call.syntax().text_range();
-    acc.add(AssistId("replace_unwrap_with_match"), "Replace unwrap with match", target, |edit| {
+    acc.add(AssistId("replace_unwrap_with_match"), "Replace unwrap with match", target, |builder| {
        let ok_path = make::path_unqualified(make::path_segment(make::name_ref(happy_variant)));
        let it = make::bind_pat(make::name("a")).into();
        let ok_tuple = make::tuple_struct_pat(ok_path, iter::once(it)).into();
@@ -58,16 +61,30 @@ pub(crate) fn replace_unwrap_with_match(acc: &mut Assists, ctx: &AssistContext)
        let match_expr = make::expr_match(caller.clone(), match_arm_list)
            .indent(IndentLevel::from_node(method_call.syntax()));
-        edit.set_cursor(caller.syntax().text_range().start());
+        let range = method_call.syntax().text_range();
-        edit.replace_ast::<ast::Expr>(method_call.into(), match_expr);
+        match ctx.config.snippet_cap {
+            Some(cap) => {
+                let err_arm = match_expr
+                    .syntax()
+                    .descendants()
+                    .filter_map(ast::MatchArm::cast)
+                    .last()
+                    .unwrap();
+                let snippet =
+                    render_snippet(cap, match_expr.syntax(), Cursor::Before(err_arm.syntax()));
+                builder.replace_snippet(cap, range, snippet)
+            }
+            None => builder.replace(range, match_expr.to_string()),
+        }
    })
 }
 #[cfg(test)]
 mod tests {
-    use super::*;
    use crate::tests::{check_assist, check_assist_target};
+    use super::*;
    #[test]
    fn test_replace_result_unwrap_with_match() {
        check_assist(
@@ -85,9 +102,9 @@ enum Result<T, E> { Ok(T), Err(E) }
 fn i<T>(a: T) -> T { a }
 fn main() {
    let x: Result<i32, i32> = Result::Ok(92);
-    let y = <|>match i(x) {
+    let y = match i(x) {
        Ok(a) => a,
-        _ => unreachable!(),
+        $0_ => unreachable!(),
    };
 }
            ",
@@ -111,9 +128,9 @@ enum Option<T> { Some(T), None }
 fn i<T>(a: T) -> T { a }
 fn main() {
    let x = Option::Some(92);
-    let y = <|>match i(x) {
+    let y = match i(x) {
        Some(a) => a,
-        _ => unreachable!(),
+        $0_ => unreachable!(),
    };
 }
            ",
@@ -137,9 +154,9 @@ enum Result<T, E> { Ok(T), Err(E) }
 fn i<T>(a: T) -> T { a }
 fn main() {
    let x: Result<i32, i32> = Result::Ok(92);
-    let y = <|>match i(x) {
+    let y = match i(x) {
        Ok(a) => a,
-        _ => unreachable!(),
+        $0_ => unreachable!(),
    }.count_zeroes();
 }
            ",
diff --git a/crates/ra_assists/src/handlers/split_import.rs b/crates/ra_assists/src/handlers/split_import.rs
index b2757e50c..c7a874480 100644
--- a/crates/ra_assists/src/handlers/split_import.rs
+++ b/crates/ra_assists/src/handlers/split_import.rs
@@ -26,12 +26,10 @@ pub(crate) fn split_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
    if new_tree == use_tree {
        return None;
    }
-    let cursor = ctx.offset();
    let target = colon_colon.text_range();
    acc.add(AssistId("split_import"), "Split import", target, |edit| {
        edit.replace_ast(use_tree, new_tree);
-        edit.set_cursor(cursor);
    })
 }
@@ -46,7 +44,7 @@ mod tests {
        check_assist(
            split_import,
            "use crate::<|>db::RootDatabase;",
-            "use crate::<|>{db::RootDatabase};",
+            "use crate::{db::RootDatabase};",
        )
    }
@@ -55,7 +53,7 @@ mod tests {
        check_assist(
            split_import,
            "use crate:<|>:db::{RootDatabase, FileSymbol}",
-            "use crate:<|>:{db::{RootDatabase, FileSymbol}}",
+            "use crate::{db::{RootDatabase, FileSymbol}}",
        )
    }
diff --git a/crates/ra_assists/src/handlers/unwrap_block.rs b/crates/ra_assists/src/handlers/unwrap_block.rs
index b76182d79..8440c7d0f 100644
--- a/crates/ra_assists/src/handlers/unwrap_block.rs
+++ b/crates/ra_assists/src/handlers/unwrap_block.rs
@@ -62,7 +62,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
                            let range_to_del_else_if = TextRange::new(ancestor_then_branch.syntax().text_range().end(), l_curly_token.text_range().start());
                            let range_to_del_rest = TextRange::new(then_branch.syntax().text_range().end(), if_expr.syntax().text_range().end());
-                            edit.set_cursor(ancestor_then_branch.syntax().text_range().end());
                            edit.delete(range_to_del_rest);
                            edit.delete(range_to_del_else_if);
                            edit.replace(target, update_expr_string(then_branch.to_string(), &[' ', '{']));
@@ -79,7 +78,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
                                return acc.add(assist_id, assist_label, target, |edit| {
                                    let range_to_del = TextRange::new(then_branch.syntax().text_range().end(), l_curly_token.text_range().start());
-                                    edit.set_cursor(then_branch.syntax().text_range().end());
                                    edit.delete(range_to_del);
                                    edit.replace(target, update_expr_string(else_block.to_string(), &[' ', '{']));
                                });
@@ -97,8 +95,6 @@ pub(crate) fn unwrap_block(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
    let target = expr_to_unwrap.syntax().text_range();
    acc.add(assist_id, assist_label, target, |edit| {
-        edit.set_cursor(expr.syntax().text_range().start());
        edit.replace(
            expr.syntax().text_range(),
            update_expr_string(expr_to_unwrap.to_string(), &[' ', '{', '\n']),
@@ -154,7 +150,7 @@ mod tests {
            r#"
            fn main() {
                bar();
-                <|>foo();
+                foo();
                //comment
                bar();
@@ -188,7 +184,7 @@ mod tests {
                    //comment
                    bar();
-                }<|>
+                }
                println!("bar");
            }
            "#,
@@ -222,7 +218,7 @@ mod tests {
                    //comment
                    //bar();
-                }<|>
+                }
                println!("bar");
            }
            "#,
@@ -258,7 +254,7 @@ mod tests {
                    //bar();
                } else if false {
                    println!("bar");
-                }<|>
+                }
                println!("foo");
            }
            "#,
@@ -298,7 +294,7 @@ mod tests {
                    println!("bar");
                } else if true {
                    println!("foo");
-                }<|>
+                }
                println!("else");
            }
            "#,
@@ -336,7 +332,7 @@ mod tests {
                    //bar();
                } else if false {
                    println!("bar");
-                }<|>
+                }
                println!("foo");
            }
            "#,
@@ -383,7 +379,7 @@ mod tests {
            "#,
            r#"
            fn main() {
-                <|>if true {
+                if true {
                    foo();
                    //comment
@@ -417,7 +413,7 @@ mod tests {
            r#"
            fn main() {
                for i in 0..5 {
-                    <|>foo();
+                    foo();
                    //comment
                    bar();
@@ -447,7 +443,7 @@ mod tests {
            "#,
            r#"
            fn main() {
-                <|>if true {
+                if true {
                    foo();
                    //comment
@@ -480,7 +476,7 @@ mod tests {
            "#,
            r#"
            fn main() {
-                <|>if true {
+                if true {
                    foo();
                    //comment
diff --git a/crates/ra_assists/src/tests.rs b/crates/ra_assists/src/tests.rs
index 9ba3da786..62dd3547f 100644
--- a/crates/ra_assists/src/tests.rs
+++ b/crates/ra_assists/src/tests.rs
@@ -7,8 +7,7 @@ use ra_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt};
 use ra_ide_db::{symbol_index::SymbolsDatabase, RootDatabase};
 use ra_syntax::TextRange;
 use test_utils::{
-    add_cursor, assert_eq_text, extract_offset, extract_range, extract_range_or_offset,
+    assert_eq_text, extract_offset, extract_range, extract_range_or_offset, RangeOrOffset,
-    RangeOrOffset,
 };
 use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, Assists};
@@ -103,21 +102,6 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult) {
            let mut actual = db.file_text(change.file_id).as_ref().to_owned();
            change.edit.apply(&mut actual);
-            if !source_change.is_snippet {
-                match source_change.cursor_position {
-                    None => {
-                        if let RangeOrOffset::Offset(before_cursor_pos) = range_or_offset {
-                            let off = change
-                                .edit
-                                .apply_to_offset(before_cursor_pos)
-                                .expect("cursor position is affected by the edit");
-                            actual = add_cursor(&actual, off)
-                        }
-                    }
-                    Some(off) => actual = add_cursor(&actual, off.offset),
-                };
-            }
            assert_eq_text!(after, &actual);
        }
        (Some(assist), ExpectedResult::Target(target)) => {
diff --git a/crates/ra_assists/src/tests/generated.rs b/crates/ra_assists/src/tests/generated.rs
index 3e6654c17..250e56a69 100644
--- a/crates/ra_assists/src/tests/generated.rs
+++ b/crates/ra_assists/src/tests/generated.rs
@@ -443,7 +443,7 @@ fn main() {
 "#####,
        r#####"
 fn main() {
-    let var_name = (1 + 2);
+    let $0var_name = (1 + 2);
    var_name * 4;
 }
 "#####,
@@ -764,7 +764,7 @@ fn main() {
    let x: Result<i32, i32> = Result::Ok(92);
    let y = match x {
        Ok(a) => a,
-        _ => unreachable!(),
+        $0_ => unreachable!(),
    };
 }
 "#####,
diff --git a/crates/ra_cfg/src/cfg_expr.rs b/crates/ra_cfg/src/cfg_expr.rs
index 39d71851c..85b100c6a 100644
--- a/crates/ra_cfg/src/cfg_expr.rs
+++ b/crates/ra_cfg/src/cfg_expr.rs
@@ -88,13 +88,17 @@ fn next_cfg_expr(it: &mut SliceIter<tt::TokenTree>) -> Option<CfgExpr> {
 mod tests {
    use super::*;
-    use mbe::ast_to_token_tree;
+    use mbe::{ast_to_token_tree, TokenMap};
    use ra_syntax::ast::{self, AstNode};
-    fn assert_parse_result(input: &str, expected: CfgExpr) {
+    fn get_token_tree_generated(input: &str) -> (tt::Subtree, TokenMap) {
        let source_file = ast::SourceFile::parse(input).ok().unwrap();
        let tt = source_file.syntax().descendants().find_map(ast::TokenTree::cast).unwrap();
-        let (tt, _) = ast_to_token_tree(&tt).unwrap();
+        ast_to_token_tree(&tt).unwrap()
+    }
+    fn assert_parse_result(input: &str, expected: CfgExpr) {
+        let (tt, _) = get_token_tree_generated(input);
        assert_eq!(parse_cfg(&tt), expected);
    }
diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs
index f8f767091..482a2f3e6 100644
--- a/crates/ra_db/src/fixture.rs
+++ b/crates/ra_db/src/fixture.rs
@@ -63,7 +63,7 @@ use std::sync::Arc;
 use ra_cfg::CfgOptions;
 use rustc_hash::FxHashMap;
-use test_utils::{extract_offset, parse_fixture, parse_single_fixture, CURSOR_MARKER};
+use test_utils::{extract_offset, parse_fixture, parse_single_fixture, FixtureMeta, CURSOR_MARKER};
 use crate::{
    input::CrateName, CrateGraph, CrateId, Edition, Env, FileId, FilePosition, RelativePathBuf,
@@ -113,7 +113,7 @@ fn with_single_file(db: &mut dyn SourceDatabaseExt, ra_fixture: &str) -> FileId
    let fixture = parse_single_fixture(ra_fixture);
    let crate_graph = if let Some(entry) = fixture {
-        let meta = match parse_meta(&entry.meta) {
+        let meta = match ParsedMeta::from(&entry.meta) {
            ParsedMeta::File(it) => it,
            _ => panic!("with_single_file only support file meta"),
        };
@@ -170,7 +170,7 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option<FilePosit
    let mut file_position = None;
    for entry in fixture.iter() {
-        let meta = match parse_meta(&entry.meta) {
+        let meta = match ParsedMeta::from(&entry.meta) {
            ParsedMeta::Root { path } => {
                let source_root = std::mem::replace(&mut source_root, SourceRoot::new_local());
                db.set_source_root(source_root_id, Arc::new(source_root));
@@ -258,53 +258,25 @@ struct FileMeta {
    env: Env,
 }
-//- /lib.rs crate:foo deps:bar,baz cfg:foo=a,bar=b env:OUTDIR=path/to,OTHER=foo)
+impl From<&FixtureMeta> for ParsedMeta {
-fn parse_meta(meta: &str) -> ParsedMeta {
+    fn from(meta: &FixtureMeta) -> Self {
-    let components = meta.split_ascii_whitespace().collect::<Vec<_>>();
+        match meta {
+            FixtureMeta::Root { path } => {
-    if components[0] == "root" {
+                // `Self::Root` causes a false warning: 'variant is never constructed: `Root` '
-        let path: RelativePathBuf = components[1].into();
+                // see https://github.com/rust-lang/rust/issues/69018
-        assert!(path.starts_with("/") && path.ends_with("/"));
+                ParsedMeta::Root { path: path.to_owned() }
-        return ParsedMeta::Root { path };
-    }
-    let path: RelativePathBuf = components[0].into();
-    assert!(path.starts_with("/"));
-    let mut krate = None;
-    let mut deps = Vec::new();
-    let mut edition = Edition::Edition2018;
-    let mut cfg = CfgOptions::default();
-    let mut env = Env::default();
-    for component in components[1..].iter() {
-        let (key, value) = split1(component, ':').unwrap();
-        match key {
-            "crate" => krate = Some(value.to_string()),
-            "deps" => deps = value.split(',').map(|it| it.to_string()).collect(),
-            "edition" => edition = Edition::from_str(&value).unwrap(),
-            "cfg" => {
-                for key in value.split(',') {
-                    match split1(key, '=') {
-                        None => cfg.insert_atom(key.into()),
-                        Some((k, v)) => cfg.insert_key_value(k.into(), v.into()),
-                    }
-                }
-            }
-            "env" => {
-                for key in value.split(',') {
-                    if let Some((k, v)) = split1(key, '=') {
-                        env.set(k, v.into());
-                    }
-                }
            }
-            _ => panic!("bad component: {:?}", component),
+            FixtureMeta::File(f) => Self::File(FileMeta {
+                path: f.path.to_owned(),
+                krate: f.crate_name.to_owned(),
+                deps: f.deps.to_owned(),
+                cfg: f.cfg.to_owned(),
+                edition: f
+                    .edition
+                    .as_ref()
+                    .map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()),
+                env: Env::from(f.env.iter()),
+            }),
        }
    }
-    ParsedMeta::File(FileMeta { path, krate, deps, edition, cfg, env })
-}
-fn split1(haystack: &str, delim: char) -> Option<(&str, &str)> {
-    let idx = haystack.find(delim)?;
-    Some((&haystack[..idx], &haystack[idx + delim.len_utf8()..]))
 }
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index ab14e2d5e..4d2d3b48a 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -311,6 +311,21 @@ impl fmt::Display for Edition {
    }
 }
+impl<'a, T> From<T> for Env
+where
+    T: Iterator<Item = (&'a String, &'a String)>,
+{
+    fn from(iter: T) -> Self {
+        let mut result = Self::default();
+        for (k, v) in iter {
+            result.entries.insert(k.to_owned(), v.to_owned());
+        }
+        result
+    }
+}
 impl Env {
    pub fn set(&mut self, env: &str, value: String) {
        self.entries.insert(env.to_owned(), value);
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index c5df4ac24..3364a822f 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -62,6 +62,7 @@ pub use crate::{
 pub use hir_def::{
    adt::StructKind,
+    attr::Attrs,
    body::scope::ExprScopes,
    builtin_type::BuiltinType,
    docs::Documentation,
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs
index 576cd0c65..8b6c0bede 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/ra_hir_def/src/attr.rs
@@ -81,7 +81,7 @@ impl Attrs {
        }
    }
-    fn from_attrs_owner(db: &dyn DefDatabase, owner: InFile<&dyn AttrsOwner>) -> Attrs {
+    pub fn from_attrs_owner(db: &dyn DefDatabase, owner: InFile<&dyn AttrsOwner>) -> Attrs {
        let hygiene = Hygiene::new(db.upcast(), owner.file_id);
        Attrs::new(owner.value, &hygiene)
    }
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index f5a7305dc..273036cee 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -29,7 +29,7 @@ use crate::{
    AsMacroCall, DefWithBodyId, HasModule, Lookup, ModuleId,
 };
-/// A subset of Exander that only deals with cfg attributes. We only need it to
+/// A subset of Expander that only deals with cfg attributes. We only need it to
 /// avoid cyclic queries in crate def map during enum processing.
 pub(crate) struct CfgExpander {
    cfg_options: CfgOptions,
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs
index 2f71511ba..945a0025e 100644
--- a/crates/ra_hir_def/src/db.rs
+++ b/crates/ra_hir_def/src/db.rs
@@ -17,6 +17,7 @@ use crate::{
    item_scope::ItemInNs,
    lang_item::{LangItemTarget, LangItems},
    nameres::{raw::RawItems, CrateDefMap},
+    path::ModPath,
    visibility::Visibility,
    AttrDefId, ConstId, ConstLoc, DefWithBodyId, EnumId, EnumLoc, FunctionId, FunctionLoc,
    GenericDefId, ImplId, ImplLoc, ModuleId, StaticId, StaticLoc, StructId, StructLoc, TraitId,
@@ -118,6 +119,9 @@ pub trait DefDatabase: InternDatabase + AstDatabase + Upcast<dyn AstDatabase> {
        item: ItemInNs,
        krate: CrateId,
    ) -> Arc<[(ModuleId, Name, Visibility)]>;
+    #[salsa::invoke(find_path::find_path_inner_query)]
+    fn find_path_inner(&self, item: ItemInNs, from: ModuleId, max_len: usize) -> Option<ModPath>;
 }
 fn crate_def_map_wait(db: &impl DefDatabase, krate: CrateId) -> Arc<CrateDefMap> {
diff --git a/crates/ra_hir_def/src/find_path.rs b/crates/ra_hir_def/src/find_path.rs
index 68d3cde08..4db798473 100644
--- a/crates/ra_hir_def/src/find_path.rs
+++ b/crates/ra_hir_def/src/find_path.rs
@@ -20,7 +20,7 @@ use crate::{
 /// *from where* you're referring to the item, hence the `from` parameter.
 pub fn find_path(db: &dyn DefDatabase, item: ItemInNs, from: ModuleId) -> Option<ModPath> {
    let _p = profile("find_path");
-    find_path_inner(db, item, from, MAX_PATH_LEN)
+    db.find_path_inner(item, from, MAX_PATH_LEN)
 }
 const MAX_PATH_LEN: usize = 15;
@@ -49,7 +49,7 @@ impl ModPath {
    }
 }
-fn find_path_inner(
+pub(crate) fn find_path_inner_query(
    db: &dyn DefDatabase,
    item: ItemInNs,
    from: ModuleId,
@@ -140,8 +140,7 @@ fn find_path_inner(
    let mut best_path = None;
    let mut best_path_len = max_len;
    for (module_id, name) in importable_locations {
-        let mut path = match find_path_inner(
+        let mut path = match db.find_path_inner(
-            db,
            ItemInNs::Types(ModuleDefId::ModuleId(module_id)),
            from,
            best_path_len - 1,
diff --git a/crates/ra_hir_def/src/lang_item.rs b/crates/ra_hir_def/src/lang_item.rs
index d96ac8c0a..3516784b8 100644
--- a/crates/ra_hir_def/src/lang_item.rs
+++ b/crates/ra_hir_def/src/lang_item.rs
@@ -73,8 +73,8 @@ pub struct LangItems {
 }
 impl LangItems {
-    pub fn target<'a>(&'a self, item: &str) -> Option<&'a LangItemTarget> {
+    pub fn target(&self, item: &str) -> Option<LangItemTarget> {
-        self.items.get(item)
+        self.items.get(item).copied()
    }
    /// Salsa query. This will look for lang items in a specific crate.
@@ -163,9 +163,13 @@ impl LangItems {
    ) where
        T: Into<AttrDefId> + Copy,
    {
-        let attrs = db.attrs(item.into());
+        if let Some(lang_item_name) = lang_attr(db, item) {
-        if let Some(lang_item_name) = attrs.by_key("lang").string_value() {
+            self.items.entry(lang_item_name).or_insert_with(|| constructor(item));
-            self.items.entry(lang_item_name.clone()).or_insert_with(|| constructor(item));
        }
    }
 }
+pub fn lang_attr(db: &dyn DefDatabase, item: impl Into<AttrDefId> + Copy) -> Option<SmolStr> {
+    let attrs = db.attrs(item.into());
+    attrs.by_key("lang").string_value().cloned()
+}
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 5fc0ec5e3..b2de7fa34 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -27,9 +27,9 @@ test_utils = { path = "../test_utils" }
 scoped-tls = "1"
-chalk-solve =   { git = "https://github.com/rust-lang/chalk.git", rev = "3e9c2503ae9c5277c2acb74624dc267876dd89b3" }
+chalk-solve =   { git = "https://github.com/rust-lang/chalk.git", rev = "eaab84b394007d1bed15f5470409a6ea02900a96" }
-chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "3e9c2503ae9c5277c2acb74624dc267876dd89b3" }
+chalk-rust-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "eaab84b394007d1bed15f5470409a6ea02900a96" }
-chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "3e9c2503ae9c5277c2acb74624dc267876dd89b3" }
+chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "eaab84b394007d1bed15f5470409a6ea02900a96" }
 [dev-dependencies]
 insta = "0.16.0"
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs
index fdb49560b..0a8bb24ac 100644
--- a/crates/ra_hir_ty/src/db.rs
+++ b/crates/ra_hir_ty/src/db.rs
@@ -76,6 +76,8 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
    #[salsa::interned]
    fn intern_type_ctor(&self, type_ctor: TypeCtor) -> crate::TypeCtorId;
    #[salsa::interned]
+    fn intern_callable_def(&self, callable_def: CallableDef) -> crate::CallableDefId;
+    #[salsa::interned]
    fn intern_type_param_id(&self, param_id: TypeParamId) -> GlobalTypeParamId;
    #[salsa::interned]
    fn intern_chalk_impl(&self, impl_: Impl) -> crate::traits::GlobalImplId;
@@ -89,11 +91,14 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
    fn trait_datum(&self, krate: CrateId, trait_id: chalk::TraitId) -> Arc<chalk::TraitDatum>;
    #[salsa::invoke(chalk::struct_datum_query)]
-    fn struct_datum(&self, krate: CrateId, struct_id: chalk::StructId) -> Arc<chalk::StructDatum>;
+    fn struct_datum(&self, krate: CrateId, struct_id: chalk::AdtId) -> Arc<chalk::StructDatum>;
    #[salsa::invoke(crate::traits::chalk::impl_datum_query)]
    fn impl_datum(&self, krate: CrateId, impl_id: chalk::ImplId) -> Arc<chalk::ImplDatum>;
+    #[salsa::invoke(crate::traits::chalk::fn_def_datum_query)]
+    fn fn_def_datum(&self, krate: CrateId, fn_def_id: chalk::FnDefId) -> Arc<chalk::FnDefDatum>;
    #[salsa::invoke(crate::traits::chalk::associated_ty_value_query)]
    fn associated_ty_value(
        &self,
diff --git a/crates/ra_hir_ty/src/lib.rs b/crates/ra_hir_ty/src/lib.rs
index c87ee06ce..93cb45a64 100644
--- a/crates/ra_hir_ty/src/lib.rs
+++ b/crates/ra_hir_ty/src/lib.rs
@@ -155,10 +155,16 @@ pub enum TypeCtor {
 /// This exists just for Chalk, because Chalk just has a single `StructId` where
 /// we have different kinds of ADTs, primitive types and special type
 /// constructors like tuples and function pointers.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
 pub struct TypeCtorId(salsa::InternId);
 impl_intern_key!(TypeCtorId);
+/// This exists just for Chalk, because Chalk just has a single `FnDefId` where
+/// we have different IDs for struct and enum variant constructors.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
+pub struct CallableDefId(salsa::InternId);
+impl_intern_key!(CallableDefId);
 impl TypeCtor {
    pub fn num_ty_params(self, db: &dyn HirDatabase) -> usize {
        match self {
diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs
index 34f4b9039..0419bc751 100644
--- a/crates/ra_hir_ty/src/tests/traits.rs
+++ b/crates/ra_hir_ty/src/tests/traits.rs
@@ -2602,3 +2602,155 @@ fn test(x: &dyn Foo) {
    "###
    );
 }
+#[test]
+fn builtin_copy() {
+    assert_snapshot!(
+        infer_with_mismatches(r#"
+#[lang = "copy"]
+trait Copy {}
+struct IsCopy;
+impl Copy for IsCopy {}
+struct NotCopy;
+trait Test { fn test(&self) -> bool; }
+impl<T: Copy> Test for T {}
+fn test() {
+    IsCopy.test();
+    NotCopy.test();
+    (IsCopy, IsCopy).test();
+    (IsCopy, NotCopy).test();
+}
+"#, true),
+        @r###"
+    111..115 'self': &Self
+    167..268 '{     ...t(); }': ()
+    173..179 'IsCopy': IsCopy
+    173..186 'IsCopy.test()': bool
+    192..199 'NotCopy': NotCopy
+    192..206 'NotCopy.test()': {unknown}
+    212..228 '(IsCop...sCopy)': (IsCopy, IsCopy)
+    212..235 '(IsCop...test()': bool
+    213..219 'IsCopy': IsCopy
+    221..227 'IsCopy': IsCopy
+    241..258 '(IsCop...tCopy)': (IsCopy, NotCopy)
+    241..265 '(IsCop...test()': {unknown}
+    242..248 'IsCopy': IsCopy
+    250..257 'NotCopy': NotCopy
+    "###
+    );
+}
+#[test]
+fn builtin_fn_def_copy() {
+    assert_snapshot!(
+        infer_with_mismatches(r#"
+#[lang = "copy"]
+trait Copy {}
+fn foo() {}
+fn bar<T: Copy>(T) -> T {}
+struct Struct(usize);
+enum Enum { Variant(usize) }
+trait Test { fn test(&self) -> bool; }
+impl<T: Copy> Test for T {}
+fn test() {
+    foo.test();
+    bar.test();
+    Struct.test();
+    Enum::Variant.test();
+}
+"#, true),
+        // wrong result, because the built-in Copy impl for fn defs doesn't exist in Chalk yet
+        @r###"
+    42..44 '{}': ()
+    61..62 'T': {unknown}
+    69..71 '{}': ()
+    69..71: expected T, got ()
+    146..150 'self': &Self
+    202..282 '{     ...t(); }': ()
+    208..211 'foo': fn foo()
+    208..218 'foo.test()': {unknown}
+    224..227 'bar': fn bar<{unknown}>({unknown}) -> {unknown}
+    224..234 'bar.test()': {unknown}
+    240..246 'Struct': Struct(usize) -> Struct
+    240..253 'Struct.test()': {unknown}
+    259..272 'Enum::Variant': Variant(usize) -> Enum
+    259..279 'Enum::...test()': {unknown}
+    "###
+    );
+}
+#[test]
+fn builtin_fn_ptr_copy() {
+    assert_snapshot!(
+        infer_with_mismatches(r#"
+#[lang = "copy"]
+trait Copy {}
+trait Test { fn test(&self) -> bool; }
+impl<T: Copy> Test for T {}
+fn test(f1: fn(), f2: fn(usize) -> u8, f3: fn(u8, u8) -> &u8) {
+    f1.test();
+    f2.test();
+    f3.test();
+}
+"#, true),
+        @r###"
+    55..59 'self': &Self
+    109..111 'f1': fn()
+    119..121 'f2': fn(usize) -> u8
+    140..142 'f3': fn(u8, u8) -> &u8
+    163..211 '{     ...t(); }': ()
+    169..171 'f1': fn()
+    169..178 'f1.test()': bool
+    184..186 'f2': fn(usize) -> u8
+    184..193 'f2.test()': bool
+    199..201 'f3': fn(u8, u8) -> &u8
+    199..208 'f3.test()': bool
+    "###
+    );
+}
+#[test]
+fn builtin_sized() {
+    assert_snapshot!(
+        infer_with_mismatches(r#"
+#[lang = "sized"]
+trait Sized {}
+trait Test { fn test(&self) -> bool; }
+impl<T: Sized> Test for T {}
+fn test() {
+    1u8.test();
+    (*"foo").test(); // not Sized
+    (1u8, 1u8).test();
+    (1u8, *"foo").test(); // not Sized
+}
+"#, true),
+        @r###"
+    57..61 'self': &Self
+    114..229 '{     ...ized }': ()
+    120..123 '1u8': u8
+    120..130 '1u8.test()': bool
+    136..151 '(*"foo").test()': {unknown}
+    137..143 '*"foo"': str
+    138..143 '"foo"': &str
+    170..180 '(1u8, 1u8)': (u8, u8)
+    170..187 '(1u8, ...test()': bool
+    171..174 '1u8': u8
+    176..179 '1u8': u8
+    193..206 '(1u8, *"foo")': (u8, str)
+    193..213 '(1u8, ...test()': {unknown}
+    194..197 '1u8': u8
+    199..205 '*"foo"': str
+    200..205 '"foo"': &str
+    "###
+    );
+}
diff --git a/crates/ra_hir_ty/src/traits/builtin.rs b/crates/ra_hir_ty/src/traits/builtin.rs
index ccab246bf..88a422d2c 100644
--- a/crates/ra_hir_ty/src/traits/builtin.rs
+++ b/crates/ra_hir_ty/src/traits/builtin.rs
@@ -290,8 +290,7 @@ fn trait_object_unsize_impl_datum(
    let self_trait_ref = TraitRef { trait_, substs: self_substs };
    let where_clauses = vec![GenericPredicate::Implemented(self_trait_ref)];
-    let impl_substs =
+    let impl_substs = Substs::builder(2).push(self_ty).push(Ty::Dyn(target_bounds.into())).build();
-        Substs::builder(2).push(self_ty).push(Ty::Dyn(target_bounds.clone().into())).build();
    let trait_ref = TraitRef { trait_: unsize_trait, substs: impl_substs };
diff --git a/crates/ra_hir_ty/src/traits/chalk.rs b/crates/ra_hir_ty/src/traits/chalk.rs
index 5870618a0..5b0f12a3c 100644
--- a/crates/ra_hir_ty/src/traits/chalk.rs
+++ b/crates/ra_hir_ty/src/traits/chalk.rs
@@ -1,301 +1,29 @@
 //! Conversion code from/to Chalk.
-use std::{fmt, sync::Arc};
+use std::sync::Arc;
 use log::debug;
-use chalk_ir::{
+use chalk_ir::{fold::shift::Shift, GenericArg, TypeName};
-    cast::Cast, fold::shift::Shift, interner::HasInterner, Goal, GoalData, Parameter,
-    PlaceholderIndex, TypeName, UniverseIndex,
-};
-use hir_def::{AssocContainerId, AssocItemId, GenericDefId, HasModule, Lookup, TypeAliasId};
+use hir_def::{
-use ra_db::{
+    lang_item::{lang_attr, LangItemTarget},
-    salsa::{InternId, InternKey},
+    AssocContainerId, AssocItemId, HasModule, Lookup, TypeAliasId,
-    CrateId,
 };
+use ra_db::{salsa::InternKey, CrateId};
-use super::{builtin, AssocTyValue, Canonical, ChalkContext, Impl, Obligation};
+use super::{builtin, AssocTyValue, ChalkContext, Impl};
 use crate::{
    db::HirDatabase, display::HirDisplay, method_resolution::TyFingerprint, utils::generics,
-    ApplicationTy, DebruijnIndex, GenericPredicate, ProjectionTy, Substs, TraitRef, Ty, TypeCtor,
+    CallableDef, DebruijnIndex, GenericPredicate, Substs, Ty, TypeCtor,
 };
+use chalk_rust_ir::WellKnownTrait;
+use mapping::{convert_where_clauses, generic_predicate_to_inline_bound, make_binders};
-pub(super) mod tls;
+pub use self::interner::*;
-#[derive(Debug, Copy, Clone, Hash, PartialOrd, Ord, PartialEq, Eq)]
-pub struct Interner;
-impl chalk_ir::interner::Interner for Interner {
-    type InternedType = Box<chalk_ir::TyData<Self>>;
-    type InternedLifetime = chalk_ir::LifetimeData<Self>;
-    type InternedParameter = chalk_ir::ParameterData<Self>;
-    type InternedGoal = Arc<GoalData<Self>>;
-    type InternedGoals = Vec<Goal<Self>>;
-    type InternedSubstitution = Vec<Parameter<Self>>;
-    type InternedProgramClause = chalk_ir::ProgramClauseData<Self>;
-    type InternedProgramClauses = Arc<[chalk_ir::ProgramClause<Self>]>;
-    type InternedQuantifiedWhereClauses = Vec<chalk_ir::QuantifiedWhereClause<Self>>;
-    type InternedParameterKinds = Vec<chalk_ir::ParameterKind<()>>;
-    type InternedCanonicalVarKinds = Vec<chalk_ir::ParameterKind<UniverseIndex>>;
-    type Identifier = TypeAliasId;
-    type DefId = InternId;
-    fn debug_struct_id(
-        type_kind_id: StructId,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_struct_id(type_kind_id, fmt)))
-    }
-    fn debug_trait_id(type_kind_id: TraitId, fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_trait_id(type_kind_id, fmt)))
-    }
-    fn debug_assoc_type_id(id: AssocTypeId, fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_assoc_type_id(id, fmt)))
-    }
-    fn debug_alias(
-        alias: &chalk_ir::AliasTy<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_alias(alias, fmt)))
-    }
-    fn debug_projection_ty(
-        proj: &chalk_ir::ProjectionTy<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_projection_ty(proj, fmt)))
-    }
-    fn debug_opaque_ty(
-        opaque_ty: &chalk_ir::OpaqueTy<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_opaque_ty(opaque_ty, fmt)))
-    }
-    fn debug_opaque_ty_id(
-        opaque_ty_id: chalk_ir::OpaqueTyId<Self>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_opaque_ty_id(opaque_ty_id, fmt)))
-    }
-    fn debug_ty(ty: &chalk_ir::Ty<Interner>, fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_ty(ty, fmt)))
-    }
-    fn debug_lifetime(
-        lifetime: &chalk_ir::Lifetime<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_lifetime(lifetime, fmt)))
-    }
-    fn debug_parameter(
-        parameter: &Parameter<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_parameter(parameter, fmt)))
-    }
-    fn debug_goal(goal: &Goal<Interner>, fmt: &mut fmt::Formatter<'_>) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_goal(goal, fmt)))
-    }
-    fn debug_goals(
-        goals: &chalk_ir::Goals<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_goals(goals, fmt)))
-    }
-    fn debug_program_clause_implication(
-        pci: &chalk_ir::ProgramClauseImplication<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_program_clause_implication(pci, fmt)))
-    }
-    fn debug_application_ty(
-        application_ty: &chalk_ir::ApplicationTy<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_application_ty(application_ty, fmt)))
-    }
-    fn debug_substitution(
-        substitution: &chalk_ir::Substitution<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| Some(prog?.debug_substitution(substitution, fmt)))
-    }
-    fn debug_separator_trait_ref(
-        separator_trait_ref: &chalk_ir::SeparatorTraitRef<Interner>,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> Option<fmt::Result> {
-        tls::with_current_program(|prog| {
-            Some(prog?.debug_separator_trait_ref(separator_trait_ref, fmt))
-        })
-    }
-    fn intern_ty(&self, ty: chalk_ir::TyData<Self>) -> Box<chalk_ir::TyData<Self>> {
-        Box::new(ty)
-    }
-    fn ty_data<'a>(&self, ty: &'a Box<chalk_ir::TyData<Self>>) -> &'a chalk_ir::TyData<Self> {
-        ty
-    }
-    fn intern_lifetime(
-        &self,
-        lifetime: chalk_ir::LifetimeData<Self>,
-    ) -> chalk_ir::LifetimeData<Self> {
-        lifetime
-    }
-    fn lifetime_data<'a>(
-        &self,
-        lifetime: &'a chalk_ir::LifetimeData<Self>,
-    ) -> &'a chalk_ir::LifetimeData<Self> {
-        lifetime
-    }
-    fn intern_parameter(
-        &self,
-        parameter: chalk_ir::ParameterData<Self>,
-    ) -> chalk_ir::ParameterData<Self> {
-        parameter
-    }
-    fn parameter_data<'a>(
-        &self,
-        parameter: &'a chalk_ir::ParameterData<Self>,
-    ) -> &'a chalk_ir::ParameterData<Self> {
-        parameter
-    }
-    fn intern_goal(&self, goal: GoalData<Self>) -> Arc<GoalData<Self>> {
-        Arc::new(goal)
-    }
-    fn intern_goals<E>(
-        &self,
-        data: impl IntoIterator<Item = Result<Goal<Self>, E>>,
-    ) -> Result<Self::InternedGoals, E> {
-        data.into_iter().collect()
-    }
-    fn goal_data<'a>(&self, goal: &'a Arc<GoalData<Self>>) -> &'a GoalData<Self> {
-        goal
-    }
-    fn goals_data<'a>(&self, goals: &'a Vec<Goal<Interner>>) -> &'a [Goal<Interner>] {
-        goals
-    }
-    fn intern_substitution<E>(
-        &self,
-        data: impl IntoIterator<Item = Result<Parameter<Self>, E>>,
-    ) -> Result<Vec<Parameter<Self>>, E> {
-        data.into_iter().collect()
-    }
-    fn substitution_data<'a>(
-        &self,
-        substitution: &'a Vec<Parameter<Self>>,
-    ) -> &'a [Parameter<Self>] {
-        substitution
-    }
-    fn intern_program_clause(
-        &self,
-        data: chalk_ir::ProgramClauseData<Self>,
-    ) -> chalk_ir::ProgramClauseData<Self> {
-        data
-    }
-    fn program_clause_data<'a>(
-        &self,
-        clause: &'a chalk_ir::ProgramClauseData<Self>,
-    ) -> &'a chalk_ir::ProgramClauseData<Self> {
-        clause
-    }
-    fn intern_program_clauses<E>(
-        &self,
-        data: impl IntoIterator<Item = Result<chalk_ir::ProgramClause<Self>, E>>,
-    ) -> Result<Arc<[chalk_ir::ProgramClause<Self>]>, E> {
-        data.into_iter().collect()
-    }
-    fn program_clauses_data<'a>(
-        &self,
-        clauses: &'a Arc<[chalk_ir::ProgramClause<Self>]>,
-    ) -> &'a [chalk_ir::ProgramClause<Self>] {
-        &clauses
-    }
-    fn intern_quantified_where_clauses<E>(
-        &self,
-        data: impl IntoIterator<Item = Result<chalk_ir::QuantifiedWhereClause<Self>, E>>,
-    ) -> Result<Self::InternedQuantifiedWhereClauses, E> {
-        data.into_iter().collect()
-    }
-    fn quantified_where_clauses_data<'a>(
-        &self,
-        clauses: &'a Self::InternedQuantifiedWhereClauses,
-    ) -> &'a [chalk_ir::QuantifiedWhereClause<Self>] {
-        clauses
-    }
-    fn intern_parameter_kinds<E>(
-        &self,
-        data: impl IntoIterator<Item = Result<chalk_ir::ParameterKind<()>, E>>,
-    ) -> Result<Self::InternedParameterKinds, E> {
-        data.into_iter().collect()
-    }
-    fn parameter_kinds_data<'a>(
+pub(super) mod tls;
-        &self,
+mod interner;
-        parameter_kinds: &'a Self::InternedParameterKinds,
+mod mapping;
-    ) -> &'a [chalk_ir::ParameterKind<()>] {
-        &parameter_kinds
-    }
-    fn intern_canonical_var_kinds<E>(
-        &self,
-        data: impl IntoIterator<Item = Result<chalk_ir::ParameterKind<UniverseIndex>, E>>,
-    ) -> Result<Self::InternedCanonicalVarKinds, E> {
-        data.into_iter().collect()
-    }
-    fn canonical_var_kinds_data<'a>(
-        &self,
-        canonical_var_kinds: &'a Self::InternedCanonicalVarKinds,
-    ) -> &'a [chalk_ir::ParameterKind<UniverseIndex>] {
-        &canonical_var_kinds
-    }
-}
-impl chalk_ir::interner::HasInterner for Interner {
-    type Interner = Self;
-}
-pub type AssocTypeId = chalk_ir::AssocTypeId<Interner>;
-pub type AssociatedTyDatum = chalk_rust_ir::AssociatedTyDatum<Interner>;
-pub type TraitId = chalk_ir::TraitId<Interner>;
-pub type TraitDatum = chalk_rust_ir::TraitDatum<Interner>;