Convert tests to text-size

30 files changed, 1190 insertions, 1221 deletions

diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs
index b00b6d431..85d1f0cb1 100644
--- a/crates/ra_ide/src/call_hierarchy.rs
+++ b/crates/ra_ide/src/call_hierarchy.rs
@@ -183,8 +183,8 @@ mod tests {
                 call<|>ee();
             }
             "#,
-            "callee FN_DEF FileId(1) [0; 14) [3; 9)",
-            &["caller FN_DEF FileId(1) [15; 44) [18; 24) : [[33; 39)]"],
+            "callee FN_DEF FileId(1) 0..14 3..9",
+            &["caller FN_DEF FileId(1) 15..44 18..24 : [33..39]"],
             &[],
         );
     }
@@ -199,8 +199,8 @@ mod tests {
                 callee();
             }
             "#,
-            "callee FN_DEF FileId(1) [0; 14) [3; 9)",
-            &["caller FN_DEF FileId(1) [15; 44) [18; 24) : [[33; 39)]"],
+            "callee FN_DEF FileId(1) 0..14 3..9",
+            &["caller FN_DEF FileId(1) 15..44 18..24 : [33..39]"],
             &[],
         );
     }
@@ -216,8 +216,8 @@ mod tests {
                 callee();
             }
             "#,
-            "callee FN_DEF FileId(1) [0; 14) [3; 9)",
-            &["caller FN_DEF FileId(1) [15; 58) [18; 24) : [[33; 39), [47; 53)]"],
+            "callee FN_DEF FileId(1) 0..14 3..9",
+            &["caller FN_DEF FileId(1) 15..58 18..24 : [33..39, 47..53]"],
             &[],
         );
     }
@@ -236,10 +236,10 @@ mod tests {
                 callee();
             }
             "#,
-            "callee FN_DEF FileId(1) [0; 14) [3; 9)",
+            "callee FN_DEF FileId(1) 0..14 3..9",
             &[
-                "caller1 FN_DEF FileId(1) [15; 45) [18; 25) : [[34; 40)]",
-                "caller2 FN_DEF FileId(1) [46; 76) [49; 56) : [[65; 71)]",
+                "caller1 FN_DEF FileId(1) 15..45 18..25 : [34..40]",
+                "caller2 FN_DEF FileId(1) 46..76 49..56 : [65..71]",
             ],
             &[],
         );
@@ -260,8 +260,8 @@ mod tests {
             //- /foo/mod.rs
             pub fn callee() {}
             "#,
-            "callee FN_DEF FileId(2) [0; 18) [7; 13)",
-            &["caller FN_DEF FileId(1) [26; 55) [29; 35) : [[44; 50)]"],
+            "callee FN_DEF FileId(2) 0..18 7..13",
+            &["caller FN_DEF FileId(1) 26..55 29..35 : [44..50]"],
             &[],
         );
     }
@@ -277,9 +277,9 @@ mod tests {
                 callee();
             }
             "#,
-            "caller FN_DEF FileId(1) [15; 58) [18; 24)",
+            "caller FN_DEF FileId(1) 15..58 18..24",
             &[],
-            &["callee FN_DEF FileId(1) [0; 14) [3; 9) : [[33; 39), [47; 53)]"],
+            &["callee FN_DEF FileId(1) 0..14 3..9 : [33..39, 47..53]"],
         );
     }
 
@@ -298,9 +298,9 @@ mod tests {
             //- /foo/mod.rs
             pub fn callee() {}
             "#,
-            "caller FN_DEF FileId(1) [26; 55) [29; 35)",
+            "caller FN_DEF FileId(1) 26..55 29..35",
             &[],
-            &["callee FN_DEF FileId(2) [0; 18) [7; 13) : [[44; 50)]"],
+            &["callee FN_DEF FileId(2) 0..18 7..13 : [44..50]"],
         );
     }
 
@@ -321,9 +321,9 @@ mod tests {
 
             }
             "#,
-            "caller2 FN_DEF FileId(1) [32; 63) [35; 42)",
-            &["caller1 FN_DEF FileId(1) [0; 31) [3; 10) : [[19; 26)]"],
-            &["caller3 FN_DEF FileId(1) [64; 80) [67; 74) : [[51; 58)]"],
+            "caller2 FN_DEF FileId(1) 32..63 35..42",
+            &["caller1 FN_DEF FileId(1) 0..31 3..10 : [19..26]"],
+            &["caller3 FN_DEF FileId(1) 64..80 67..74 : [51..58]"],
         );
     }
 }
diff --git a/crates/ra_ide/src/completion/complete_attribute.rs b/crates/ra_ide/src/completion/complete_attribute.rs
index b405042e8..8bf952798 100644
--- a/crates/ra_ide/src/completion/complete_attribute.rs
+++ b/crates/ra_ide/src/completion/complete_attribute.rs
@@ -147,190 +147,190 @@ mod tests {
         [
             CompletionItem {
                 label: "allow",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "allow(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "cfg",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "cfg(${0:predicate})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "cfg_attr",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "cfg_attr(${1:predicate}, ${0:attr})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "deny",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "deny(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "deprecated",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "deprecated = \"${0:reason}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "derive",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "derive(${0:Debug})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "doc",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "doc = \"${0:docs}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "forbid",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "forbid(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "ignore",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "ignore(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "inline",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "inline(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "link",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "link",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "link_name",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "link_name = \"${0:symbol_name}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "macro_export",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "macro_export",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "macro_use",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "macro_use",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "must_use",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "must_use = \"${0:reason}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "no_mangle",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "no_mangle",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "non_exhaustive",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "non_exhaustive",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "path",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "path =\"${0:path}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "proc_macro",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro_attribute",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "proc_macro_attribute",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro_derive",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "proc_macro_derive(${0:Trait})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "repr",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "repr(${0:C})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "should_panic",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "expected = \"${0:reason}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "target_feature",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "target_feature = \"${0:feature}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "test",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "test",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "used",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "used",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "warn",
-                source_range: [19; 19),
-                delete: [19; 19),
+                source_range: 19..19,
+                delete: 19..19,
                 insert: "warn(${0:lint})",
                 kind: Attribute,
             },
@@ -351,232 +351,232 @@ mod tests {
         [
             CompletionItem {
                 label: "allow",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "allow(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "cfg",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "cfg(${0:predicate})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "cfg_attr",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "cfg_attr(${1:predicate}, ${0:attr})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "deny",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "deny(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "deprecated",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "deprecated = \"${0:reason}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "derive",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "derive(${0:Debug})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "doc",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "doc = \"${0:docs}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "feature",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "feature(${0:flag})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "forbid",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "forbid(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "global_allocator",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "global_allocator",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "ignore",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "ignore(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "inline",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "inline(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "link",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "link",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "link_name",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "link_name = \"${0:symbol_name}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "macro_export",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "macro_export",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "macro_use",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "macro_use",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "must_use",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "must_use = \"${0:reason}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "no_mangle",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "no_mangle",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "no_std",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "no_std",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "non_exhaustive",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "non_exhaustive",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "panic_handler",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "panic_handler",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "path",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "path =\"${0:path}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "proc_macro",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro_attribute",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "proc_macro_attribute",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "proc_macro_derive",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "proc_macro_derive(${0:Trait})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "recursion_limit",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "recursion_limit = ${0:128}",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "repr",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "repr(${0:C})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "should_panic",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "expected = \"${0:reason}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "target_feature",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "target_feature = \"${0:feature}\"",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "test",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "test",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "used",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "used",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "warn",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "warn(${0:lint})",
                 kind: Attribute,
             },
             CompletionItem {
                 label: "windows_subsystem",
-                source_range: [20; 20),
-                delete: [20; 20),
+                source_range: 20..20,
+                delete: 20..20,
                 insert: "windows_subsystem = \"${0:subsystem}\"",
                 kind: Attribute,
             },
diff --git a/crates/ra_ide/src/completion/complete_dot.rs b/crates/ra_ide/src/completion/complete_dot.rs
index b93153b48..814354ffa 100644
--- a/crates/ra_ide/src/completion/complete_dot.rs
+++ b/crates/ra_ide/src/completion/complete_dot.rs
@@ -94,8 +94,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [94; 94),
-                delete: [94; 94),
+                source_range: 94..94,
+                delete: 94..94,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -125,8 +125,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo()",
-                source_range: [187; 187),
-                delete: [187; 187),
+                source_range: 187..187,
+                delete: 187..187,
                 insert: "foo()$0",
                 kind: Method,
                 lookup: "foo",
@@ -134,8 +134,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: [187; 187),
-                delete: [187; 187),
+                source_range: 187..187,
+                delete: 187..187,
                 insert: "the_field",
                 kind: Field,
                 detail: "(u32,)",
@@ -165,8 +165,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo()",
-                source_range: [126; 126),
-                delete: [126; 126),
+                source_range: 126..126,
+                delete: 126..126,
                 insert: "foo()$0",
                 kind: Method,
                 lookup: "foo",
@@ -174,8 +174,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: [126; 126),
-                delete: [126; 126),
+                source_range: 126..126,
+                delete: 126..126,
                 insert: "the_field",
                 kind: Field,
                 detail: "(u32, i32)",
@@ -222,24 +222,24 @@ mod tests {
         [
             CompletionItem {
                 label: "crate_field",
-                source_range: [313; 313),
-                delete: [313; 313),
+                source_range: 313..313,
+                delete: 313..313,
                 insert: "crate_field",
                 kind: Field,
                 detail: "u32",
             },
             CompletionItem {
                 label: "pub_field",
-                source_range: [313; 313),
-                delete: [313; 313),
+                source_range: 313..313,
+                delete: 313..313,
                 insert: "pub_field",
                 kind: Field,
                 detail: "u32",
             },
             CompletionItem {
                 label: "super_field",
-                source_range: [313; 313),
-                delete: [313; 313),
+                source_range: 313..313,
+                delete: 313..313,
                 insert: "super_field",
                 kind: Field,
                 detail: "u32",
@@ -267,8 +267,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: [144; 144),
-                delete: [144; 144),
+                source_range: 144..144,
+                delete: 144..144,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -300,8 +300,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: [243; 243),
-                delete: [243; 243),
+                source_range: 243..243,
+                delete: 243..243,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -333,8 +333,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: [256; 256),
-                delete: [256; 256),
+                source_range: 256..256,
+                delete: 256..256,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -362,8 +362,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: [151; 151),
-                delete: [151; 151),
+                source_range: 151..151,
+                delete: 151..151,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -391,8 +391,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: [155; 155),
-                delete: [155; 155),
+                source_range: 155..155,
+                delete: 155..155,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -423,8 +423,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: [219; 219),
-                delete: [219; 219),
+                source_range: 219..219,
+                delete: 219..219,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -475,8 +475,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: [249; 249),
-                delete: [249; 249),
+                source_range: 249..249,
+                delete: 249..249,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
@@ -502,16 +502,16 @@ mod tests {
         [
             CompletionItem {
                 label: "0",
-                source_range: [75; 75),
-                delete: [75; 75),
+                source_range: 75..75,
+                delete: 75..75,
                 insert: "0",
                 kind: Field,
                 detail: "i32",
             },
             CompletionItem {
                 label: "1",
-                source_range: [75; 75),
-                delete: [75; 75),
+                source_range: 75..75,
+                delete: 75..75,
                 insert: "1",
                 kind: Field,
                 detail: "f64",
@@ -545,8 +545,8 @@ mod tests {
         [
             CompletionItem {
                 label: "blah()",
-                source_range: [299; 300),
-                delete: [299; 300),
+                source_range: 299..300,
+                delete: 299..300,
                 insert: "blah()$0",
                 kind: Method,
                 lookup: "blah",
@@ -572,8 +572,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [106; 106),
-                delete: [106; 106),
+                source_range: 106..106,
+                delete: 106..106,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -606,8 +606,8 @@ mod tests {
         [
             CompletionItem {
                 label: "await",
-                source_range: [74; 74),
-                delete: [74; 74),
+                source_range: 74..74,
+                delete: 74..74,
                 insert: "await",
                 detail: "expr.await",
             },
@@ -638,15 +638,15 @@ mod tests {
         [
             CompletionItem {
                 label: "A",
-                source_range: [217; 217),
-                delete: [217; 217),
+                source_range: 217..217,
+                delete: 217..217,
                 insert: "A",
                 kind: Const,
             },
             CompletionItem {
                 label: "b",
-                source_range: [217; 217),
-                delete: [217; 217),
+                source_range: 217..217,
+                delete: 217..217,
                 insert: "b",
                 kind: Module,
             },
@@ -671,8 +671,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [156; 157),
-                delete: [156; 157),
+                source_range: 156..157,
+                delete: 156..157,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -698,8 +698,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [156; 157),
-                delete: [156; 157),
+                source_range: 156..157,
+                delete: 156..157,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -726,8 +726,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [156; 156),
-                delete: [156; 156),
+                source_range: 156..156,
+                delete: 156..156,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -753,8 +753,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [162; 163),
-                delete: [162; 163),
+                source_range: 162..163,
+                delete: 162..163,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -790,8 +790,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [552; 552),
-                delete: [552; 552),
+                source_range: 552..552,
+                delete: 552..552,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -820,8 +820,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_method()",
-                source_range: [201; 201),
-                delete: [201; 201),
+                source_range: 201..201,
+                delete: 201..201,
                 insert: "the_method()$0",
                 kind: Method,
                 lookup: "the_method",
diff --git a/crates/ra_ide/src/completion/complete_fn_param.rs b/crates/ra_ide/src/completion/complete_fn_param.rs
index f84b559fc..a661932a3 100644
--- a/crates/ra_ide/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide/src/completion/complete_fn_param.rs
@@ -75,8 +75,8 @@ mod tests {
         [
             CompletionItem {
                 label: "file_id: FileId",
-                source_range: [110; 114),
-                delete: [110; 114),
+                source_range: 110..114,
+                delete: 110..114,
                 insert: "file_id: FileId",
                 lookup: "file_id",
             },
@@ -99,8 +99,8 @@ mod tests {
         [
             CompletionItem {
                 label: "file_id: FileId",
-                source_range: [110; 114),
-                delete: [110; 114),
+                source_range: 110..114,
+                delete: 110..114,
                 insert: "file_id: FileId",
                 lookup: "file_id",
             },
@@ -126,8 +126,8 @@ mod tests {
         [
             CompletionItem {
                 label: "file_id: FileId",
-                source_range: [289; 293),
-                delete: [289; 293),
+                source_range: 289..293,
+                delete: 289..293,
                 insert: "file_id: FileId",
                 lookup: "file_id",
             },
diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs
index 306ce96dc..fd95bc410 100644
--- a/crates/ra_ide/src/completion/complete_keyword.rs
+++ b/crates/ra_ide/src/completion/complete_keyword.rs
@@ -140,22 +140,22 @@ mod tests {
         [
             CompletionItem {
                 label: "crate",
-                source_range: [21; 21),
-                delete: [21; 21),
+                source_range: 21..21,
+                delete: 21..21,
                 insert: "crate::",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "self",
-                source_range: [21; 21),
-                delete: [21; 21),
+                source_range: 21..21,
+                delete: 21..21,
                 insert: "self",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "super",
-                source_range: [21; 21),
-                delete: [21; 21),
+                source_range: 21..21,
+                delete: 21..21,
                 insert: "super::",
                 kind: Keyword,
             },
@@ -173,15 +173,15 @@ mod tests {
         [
             CompletionItem {
                 label: "self",
-                source_range: [24; 24),
-                delete: [24; 24),
+                source_range: 24..24,
+                delete: 24..24,
                 insert: "self",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "super",
-                source_range: [24; 24),
-                delete: [24; 24),
+                source_range: 24..24,
+                delete: 24..24,
                 insert: "super::",
                 kind: Keyword,
             },
@@ -199,15 +199,15 @@ mod tests {
         [
             CompletionItem {
                 label: "self",
-                source_range: [28; 28),
-                delete: [28; 28),
+                source_range: 28..28,
+                delete: 28..28,
                 insert: "self",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "super",
-                source_range: [28; 28),
-                delete: [28; 28),
+                source_range: 28..28,
+                delete: 28..28,
                 insert: "super::",
                 kind: Keyword,
             },
@@ -230,36 +230,36 @@ mod tests {
         [
             CompletionItem {
                 label: "if",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "return;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -284,50 +284,50 @@ mod tests {
         [
             CompletionItem {
                 label: "else",
-                source_range: [108; 108),
-                delete: [108; 108),
+                source_range: 108..108,
+                delete: 108..108,
                 insert: "else {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "else if",
-                source_range: [108; 108),
-                delete: [108; 108),
+                source_range: 108..108,
+                delete: 108..108,
                 insert: "else if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "if",
-                source_range: [108; 108),
-                delete: [108; 108),
+                source_range: 108..108,
+                delete: 108..108,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [108; 108),
-                delete: [108; 108),
+                source_range: 108..108,
+                delete: 108..108,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [108; 108),
-                delete: [108; 108),
+                source_range: 108..108,
+                delete: 108..108,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [108; 108),
-                delete: [108; 108),
+                source_range: 108..108,
+                delete: 108..108,
                 insert: "return;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [108; 108),
-                delete: [108; 108),
+                source_range: 108..108,
+                delete: 108..108,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -351,36 +351,36 @@ mod tests {
         [
             CompletionItem {
                 label: "if",
-                source_range: [56; 56),
-                delete: [56; 56),
+                source_range: 56..56,
+                delete: 56..56,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [56; 56),
-                delete: [56; 56),
+                source_range: 56..56,
+                delete: 56..56,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [56; 56),
-                delete: [56; 56),
+                source_range: 56..56,
+                delete: 56..56,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [56; 56),
-                delete: [56; 56),
+                source_range: 56..56,
+                delete: 56..56,
                 insert: "return $0;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [56; 56),
-                delete: [56; 56),
+                source_range: 56..56,
+                delete: 56..56,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -400,36 +400,36 @@ mod tests {
         [
             CompletionItem {
                 label: "if",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "return;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -454,36 +454,36 @@ mod tests {
         [
             CompletionItem {
                 label: "if",
-                source_range: [97; 97),
-                delete: [97; 97),
+                source_range: 97..97,
+                delete: 97..97,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [97; 97),
-                delete: [97; 97),
+                source_range: 97..97,
+                delete: 97..97,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [97; 97),
-                delete: [97; 97),
+                source_range: 97..97,
+                delete: 97..97,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [97; 97),
-                delete: [97; 97),
+                source_range: 97..97,
+                delete: 97..97,
                 insert: "return $0",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [97; 97),
-                delete: [97; 97),
+                source_range: 97..97,
+                delete: 97..97,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -508,36 +508,36 @@ mod tests {
         [
             CompletionItem {
                 label: "if",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "return $0;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -560,36 +560,36 @@ mod tests {
         [
             CompletionItem {
                 label: "if",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "return $0;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -612,50 +612,50 @@ mod tests {
         [
             CompletionItem {
                 label: "break",
-                source_range: [63; 63),
-                delete: [63; 63),
+                source_range: 63..63,
+                delete: 63..63,
                 insert: "break;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "continue",
-                source_range: [63; 63),
-                delete: [63; 63),
+                source_range: 63..63,
+                delete: 63..63,
                 insert: "continue;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "if",
-                source_range: [63; 63),
-                delete: [63; 63),
+                source_range: 63..63,
+                delete: 63..63,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [63; 63),
-                delete: [63; 63),
+                source_range: 63..63,
+                delete: 63..63,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [63; 63),
-                delete: [63; 63),
+                source_range: 63..63,
+                delete: 63..63,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [63; 63),
-                delete: [63; 63),
+                source_range: 63..63,
+                delete: 63..63,
                 insert: "return $0;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [63; 63),
-                delete: [63; 63),
+                source_range: 63..63,
+                delete: 63..63,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -676,36 +676,36 @@ mod tests {
         [
             CompletionItem {
                 label: "if",
-                source_range: [68; 68),
-                delete: [68; 68),
+                source_range: 68..68,
+                delete: 68..68,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [68; 68),
-                delete: [68; 68),
+                source_range: 68..68,
+                delete: 68..68,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [68; 68),
-                delete: [68; 68),
+                source_range: 68..68,
+                delete: 68..68,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [68; 68),
-                delete: [68; 68),
+                source_range: 68..68,
+                delete: 68..68,
                 insert: "return $0;",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [68; 68),
-                delete: [68; 68),
+                source_range: 68..68,
+                delete: 68..68,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
@@ -732,50 +732,50 @@ mod tests {
         [
             CompletionItem {
                 label: "break",
-                source_range: [122; 124),
-                delete: [122; 124),
+                source_range: 122..124,
+                delete: 122..124,
                 insert: "break",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "continue",
-                source_range: [122; 124),
-                delete: [122; 124),
+                source_range: 122..124,
+                delete: 122..124,
                 insert: "continue",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "if",
-                source_range: [122; 124),
-                delete: [122; 124),
+                source_range: 122..124,
+                delete: 122..124,
                 insert: "if $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "loop",
-                source_range: [122; 124),
-                delete: [122; 124),
+                source_range: 122..124,
+                delete: 122..124,
                 insert: "loop {$0}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "match",
-                source_range: [122; 124),
-                delete: [122; 124),
+                source_range: 122..124,
+                delete: 122..124,
                 insert: "match $0 {}",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "return",
-                source_range: [122; 124),
-                delete: [122; 124),
+                source_range: 122..124,
+                delete: 122..124,
                 insert: "return",
                 kind: Keyword,
             },
             CompletionItem {
                 label: "while",
-                source_range: [122; 124),
-                delete: [122; 124),
+                source_range: 122..124,
+                delete: 122..124,
                 insert: "while $0 {}",
                 kind: Keyword,
             },
diff --git a/crates/ra_ide/src/completion/complete_macro_in_item_position.rs b/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
index 6000106d0..d9bb5fd25 100644
--- a/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
+++ b/crates/ra_ide/src/completion/complete_macro_in_item_position.rs
@@ -42,8 +42,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo!(…)",
-                source_range: [46; 46),
-                delete: [46; 46),
+                source_range: 46..46,
+                delete: 46..46,
                 insert: "foo!($0)",
                 kind: Macro,
                 detail: "macro_rules! foo",
@@ -82,8 +82,8 @@ mod tests {
         [
             CompletionItem {
                 label: "vec![…]",
-                source_range: [280; 280),
-                delete: [280; 280),
+                source_range: 280..280,
+                delete: 280..280,
                 insert: "vec![$0]",
                 kind: Macro,
                 detail: "macro_rules! vec",
@@ -119,8 +119,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo! {…}",
-                source_range: [163; 163),
-                delete: [163; 163),
+                source_range: 163..163,
+                delete: 163..163,
                 insert: "foo! {$0}",
                 kind: Macro,
                 detail: "macro_rules! foo",
@@ -130,8 +130,8 @@ mod tests {
             },
             CompletionItem {
                 label: "main()",
-                source_range: [163; 163),
-                delete: [163; 163),
+                source_range: 163..163,
+                delete: 163..163,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
diff --git a/crates/ra_ide/src/completion/complete_pattern.rs b/crates/ra_ide/src/completion/complete_pattern.rs
index 218829b10..fdd9e928b 100644
--- a/crates/ra_ide/src/completion/complete_pattern.rs
+++ b/crates/ra_ide/src/completion/complete_pattern.rs
@@ -63,37 +63,37 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar",
-                source_range: [246; 246),
-                delete: [246; 246),
+                source_range: 246..246,
+                delete: 246..246,
                 insert: "Bar",
                 kind: Struct,
             },
             CompletionItem {
                 label: "E",
-                source_range: [246; 246),
-                delete: [246; 246),
+                source_range: 246..246,
+                delete: 246..246,
                 insert: "E",
                 kind: Enum,
             },
             CompletionItem {
                 label: "X",
-                source_range: [246; 246),
-                delete: [246; 246),
+                source_range: 246..246,
+                delete: 246..246,
                 insert: "X",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Z",
-                source_range: [246; 246),
-                delete: [246; 246),
+                source_range: 246..246,
+                delete: 246..246,
                 insert: "Z",
                 kind: Const,
             },
             CompletionItem {
                 label: "m",
-                source_range: [246; 246),
-                delete: [246; 246),
+                source_range: 246..246,
+                delete: 246..246,
                 insert: "m",
                 kind: Module,
             },
@@ -119,15 +119,15 @@ mod tests {
         [
             CompletionItem {
                 label: "E",
-                source_range: [151; 151),
-                delete: [151; 151),
+                source_range: 151..151,
+                delete: 151..151,
                 insert: "E",
                 kind: Enum,
             },
             CompletionItem {
                 label: "m!(…)",
-                source_range: [151; 151),
-                delete: [151; 151),
+                source_range: 151..151,
+                delete: 151..151,
                 insert: "m!($0)",
                 kind: Macro,
                 detail: "macro_rules! m",
diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs
index d6a37d720..6a0f0c72e 100644
--- a/crates/ra_ide/src/completion/complete_postfix.rs
+++ b/crates/ra_ide/src/completion/complete_postfix.rs
@@ -176,57 +176,57 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: [89; 89),
-                delete: [85; 89),
+                source_range: 89..89,
+                delete: 85..89,
                 insert: "Box::new(bar)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: [89; 89),
-                delete: [85; 89),
+                source_range: 89..89,
+                delete: 85..89,
                 insert: "dbg!(bar)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "if",
-                source_range: [89; 89),
-                delete: [85; 89),
+                source_range: 89..89,
+                delete: 85..89,
                 insert: "if bar {$0}",
                 detail: "if expr {}",
             },
             CompletionItem {
                 label: "match",
-                source_range: [89; 89),
-                delete: [85; 89),
+                source_range: 89..89,
+                delete: 85..89,
                 insert: "match bar {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: [89; 89),
-                delete: [85; 89),
+                source_range: 89..89,
+                delete: 85..89,
                 insert: "!bar",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: [89; 89),
-                delete: [85; 89),
+                source_range: 89..89,
+                delete: 85..89,
                 insert: "&bar",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: [89; 89),
-                delete: [85; 89),
+                source_range: 89..89,
+                delete: 85..89,
                 insert: "&mut bar",
                 detail: "&mut expr",
             },
             CompletionItem {
                 label: "while",
-                source_range: [89; 89),
-                delete: [85; 89),
+                source_range: 89..89,
+                delete: 85..89,
                 insert: "while bar {\n$0\n}",
                 detail: "while expr {}",
             },
@@ -250,43 +250,43 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: [91; 91),
-                delete: [87; 91),
+                source_range: 91..91,
+                delete: 87..91,
                 insert: "Box::new(bar)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: [91; 91),
-                delete: [87; 91),
+                source_range: 91..91,
+                delete: 87..91,
                 insert: "dbg!(bar)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "match",
-                source_range: [91; 91),
-                delete: [87; 91),
+                source_range: 91..91,
+                delete: 87..91,
                 insert: "match bar {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: [91; 91),
-                delete: [87; 91),
+                source_range: 91..91,
+                delete: 87..91,
                 insert: "!bar",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: [91; 91),
-                delete: [87; 91),
+                source_range: 91..91,
+                delete: 87..91,
                 insert: "&bar",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: [91; 91),
-                delete: [87; 91),
+                source_range: 91..91,
+                delete: 87..91,
                 insert: "&mut bar",
                 detail: "&mut expr",
             },
@@ -309,43 +309,43 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: [52; 52),
-                delete: [49; 52),
+                source_range: 52..52,
+                delete: 49..52,
                 insert: "Box::new(42)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: [52; 52),
-                delete: [49; 52),
+                source_range: 52..52,
+                delete: 49..52,
                 insert: "dbg!(42)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "match",
-                source_range: [52; 52),
-                delete: [49; 52),
+                source_range: 52..52,
+                delete: 49..52,
                 insert: "match 42 {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: [52; 52),
-                delete: [49; 52),
+                source_range: 52..52,
+                delete: 49..52,
                 insert: "!42",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: [52; 52),
-                delete: [49; 52),
+                source_range: 52..52,
+                delete: 49..52,
                 insert: "&42",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: [52; 52),
-                delete: [49; 52),
+                source_range: 52..52,
+                delete: 49..52,
                 insert: "&mut 42",
                 detail: "&mut expr",
             },
@@ -370,43 +370,43 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: [149; 150),
-                delete: [145; 150),
+                source_range: 149..150,
+                delete: 145..150,
                 insert: "Box::new(bar)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: [149; 150),
-                delete: [145; 150),
+                source_range: 149..150,
+                delete: 145..150,
                 insert: "dbg!(bar)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "match",
-                source_range: [149; 150),
-                delete: [145; 150),
+                source_range: 149..150,
+                delete: 145..150,
                 insert: "match bar {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: [149; 150),
-                delete: [145; 150),
+                source_range: 149..150,
+                delete: 145..150,
                 insert: "!bar",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: [149; 150),
-                delete: [145; 150),
+                source_range: 149..150,
+                delete: 145..150,
                 insert: "&bar",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: [149; 150),
-                delete: [145; 150),
+                source_range: 149..150,
+                delete: 145..150,
                 insert: "&mut bar",
                 detail: "&mut expr",
             },
@@ -429,43 +429,43 @@ mod tests {
         [
             CompletionItem {
                 label: "box",
-                source_range: [56; 56),
-                delete: [49; 56),
+                source_range: 56..56,
+                delete: 49..56,
                 insert: "Box::new(&&&&42)",
                 detail: "Box::new(expr)",
             },
             CompletionItem {
                 label: "dbg",
-                source_range: [56; 56),
-                delete: [49; 56),
+                source_range: 56..56,
+                delete: 49..56,
                 insert: "dbg!(&&&&42)",
                 detail: "dbg!(expr)",
             },
             CompletionItem {
                 label: "match",
-                source_range: [56; 56),
-                delete: [49; 56),
+                source_range: 56..56,
+                delete: 49..56,
                 insert: "match &&&&42 {\n    ${1:_} => {$0\\},\n}",
                 detail: "match expr {}",
             },
             CompletionItem {
                 label: "not",
-                source_range: [56; 56),
-                delete: [53; 56),
+                source_range: 56..56,
+                delete: 53..56,
                 insert: "!42",
                 detail: "!expr",
             },
             CompletionItem {
                 label: "ref",
-                source_range: [56; 56),
-                delete: [53; 56),
+                source_range: 56..56,
+                delete: 53..56,
                 insert: "&42",
                 detail: "&expr",
             },
             CompletionItem {
                 label: "refm",
-                source_range: [56; 56),
-                delete: [53; 56),
+                source_range: 56..56,
+                delete: 53..56,
                 insert: "&mut 42",
                 detail: "&mut expr",
             },
diff --git a/crates/ra_ide/src/completion/complete_qualified_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs
index 5a5139e14..dd10f74e6 100644
--- a/crates/ra_ide/src/completion/complete_qualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_qualified_path.rs
@@ -162,8 +162,8 @@ mod tests {
         [
             CompletionItem {
                 label: "my",
-                source_range: [27; 29),
-                delete: [27; 29),
+                source_range: 27..29,
+                delete: 27..29,
                 insert: "my",
                 kind: Module,
                 documentation: Documentation(
@@ -193,15 +193,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: [31; 31),
-                delete: [31; 31),
+                source_range: 31..31,
+                delete: 31..31,
                 insert: "Foo",
                 kind: Struct,
             },
             CompletionItem {
                 label: "PublicBar",
-                source_range: [31; 31),
-                delete: [31; 31),
+                source_range: 31..31,
+                delete: 31..31,
                 insert: "PublicBar",
                 kind: Struct,
             },
@@ -226,8 +226,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar",
-                source_range: [30; 30),
-                delete: [30; 30),
+                source_range: 30..30,
+                delete: 30..30,
                 insert: "Bar",
                 kind: Struct,
             },
@@ -252,15 +252,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Spam",
-                source_range: [11; 13),
-                delete: [11; 13),
+                source_range: 11..13,
+                delete: 11..13,
                 insert: "Spam",
                 kind: Struct,
             },
             CompletionItem {
                 label: "foo",
-                source_range: [11; 13),
-                delete: [11; 13),
+                source_range: 11..13,
+                delete: 11..13,
                 insert: "foo",
                 kind: Module,
             },
@@ -285,15 +285,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Spam",
-                source_range: [12; 14),
-                delete: [12; 14),
+                source_range: 12..14,
+                delete: 12..14,
                 insert: "Spam",
                 kind: Struct,
             },
             CompletionItem {
                 label: "foo",
-                source_range: [12; 14),
-                delete: [12; 14),
+                source_range: 12..14,
+                delete: 12..14,
                 insert: "foo",
                 kind: Module,
             },
@@ -322,8 +322,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Spam",
-                source_range: [23; 25),
-                delete: [23; 25),
+                source_range: 23..25,
+                delete: 23..25,
                 insert: "Spam",
                 kind: Struct,
             },
@@ -352,8 +352,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar(…)",
-                source_range: [116; 116),
-                delete: [116; 116),
+                source_range: 116..116,
+                delete: 116..116,
                 insert: "Bar($0)",
                 kind: EnumVariant,
                 lookup: "Bar",
@@ -365,8 +365,8 @@ mod tests {
             },
             CompletionItem {
                 label: "Foo",
-                source_range: [116; 116),
-                delete: [116; 116),
+                source_range: 116..116,
+                delete: 116..116,
                 insert: "Foo",
                 kind: EnumVariant,
                 detail: "()",
@@ -402,8 +402,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar(…)",
-                source_range: [180; 180),
-                delete: [180; 180),
+                source_range: 180..180,
+                delete: 180..180,
                 insert: "Bar($0)",
                 kind: EnumVariant,
                 lookup: "Bar",
@@ -415,8 +415,8 @@ mod tests {
             },
             CompletionItem {
                 label: "Foo",
-                source_range: [180; 180),
-                delete: [180; 180),
+                source_range: 180..180,
+                delete: 180..180,
                 insert: "Foo",
                 kind: EnumVariant,
                 detail: "()",
@@ -426,8 +426,8 @@ mod tests {
             },
             CompletionItem {
                 label: "S(…)",
-                source_range: [180; 180),
-                delete: [180; 180),
+                source_range: 180..180,
+                delete: 180..180,
                 insert: "S($0)",
                 kind: EnumVariant,
                 lookup: "S",
@@ -463,8 +463,8 @@ mod tests {
         [
             CompletionItem {
                 label: "m()",
-                source_range: [100; 100),
-                delete: [100; 100),
+                source_range: 100..100,
+                delete: 100..100,
                 insert: "m()$0",
                 kind: Function,
                 lookup: "m",
@@ -499,8 +499,8 @@ mod tests {
         [
             CompletionItem {
                 label: "m()",
-                source_range: [105; 105),
-                delete: [105; 105),
+                source_range: 105..105,
+                delete: 105..105,
                 insert: "m()$0",
                 kind: Method,
                 lookup: "m",
@@ -535,8 +535,8 @@ mod tests {
         [
             CompletionItem {
                 label: "C",
-                source_range: [107; 107),
-                delete: [107; 107),
+                source_range: 107..107,
+                delete: 107..107,
                 insert: "C",
                 kind: Const,
                 detail: "const C: i32 = 42;",
@@ -570,8 +570,8 @@ mod tests {
         [
             CompletionItem {
                 label: "T",
-                source_range: [101; 101),
-                delete: [101; 101),
+                source_range: 101..101,
+                delete: 101..101,
                 insert: "T",
                 kind: TypeAlias,
                 detail: "type T = i32;",
@@ -610,24 +610,24 @@ mod tests {
         [
             CompletionItem {
                 label: "PUBLIC_CONST",
-                source_range: [302; 302),
-                delete: [302; 302),
+                source_range: 302..302,
+                delete: 302..302,
                 insert: "PUBLIC_CONST",
                 kind: Const,
                 detail: "pub(super) const PUBLIC_CONST: u32 = 1;",
             },
             CompletionItem {
                 label: "PublicType",
-                source_range: [302; 302),
-                delete: [302; 302),
+                source_range: 302..302,
+                delete: 302..302,
                 insert: "PublicType",
                 kind: TypeAlias,
                 detail: "pub(super) type PublicType = u32;",
             },
             CompletionItem {
                 label: "public_method()",
-                source_range: [302; 302),
-                delete: [302; 302),
+                source_range: 302..302,
+                delete: 302..302,
                 insert: "public_method()$0",
                 kind: Function,
                 lookup: "public_method",
@@ -659,8 +659,8 @@ mod tests {
         [
             CompletionItem {
                 label: "m()",
-                source_range: [100; 100),
-                delete: [100; 100),
+                source_range: 100..100,
+                delete: 100..100,
                 insert: "m()$0",
                 kind: Function,
                 lookup: "m",
@@ -695,8 +695,8 @@ mod tests {
         [
             CompletionItem {
                 label: "m()",
-                source_range: [101; 101),
-                delete: [101; 101),
+                source_range: 101..101,
+                delete: 101..101,
                 insert: "m()$0",
                 kind: Function,
                 lookup: "m",
@@ -728,8 +728,8 @@ mod tests {
         [
             CompletionItem {
                 label: "bar",
-                source_range: [9; 9),
-                delete: [9; 9),
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "bar",
                 kind: Module,
             },
@@ -756,8 +756,8 @@ mod tests {
         [
             CompletionItem {
                 label: "m()",
-                source_range: [73; 73),
-                delete: [73; 73),
+                source_range: 73..73,
+                delete: 73..73,
                 insert: "m()$0",
                 kind: Function,
                 lookup: "m",
@@ -792,8 +792,8 @@ mod tests {
         [
             CompletionItem {
                 label: "m()",
-                source_range: [99; 99),
-                delete: [99; 99),
+                source_range: 99..99,
+                delete: 99..99,
                 insert: "m()$0",
                 kind: Function,
                 lookup: "m",
@@ -828,8 +828,8 @@ mod tests {
         [
             CompletionItem {
                 label: "m()",
-                source_range: [110; 110),
-                delete: [110; 110),
+                source_range: 110..110,
+                delete: 110..110,
                 insert: "m()$0",
                 kind: Function,
                 lookup: "m",
@@ -862,8 +862,8 @@ mod tests {
         [
             CompletionItem {
                 label: "bar()",
-                source_range: [185; 185),
-                delete: [185; 185),
+                source_range: 185..185,
+                delete: 185..185,
                 insert: "bar()$0",
                 kind: Function,
                 lookup: "bar",
@@ -871,8 +871,8 @@ mod tests {
             },
             CompletionItem {
                 label: "foo()",
-                source_range: [185; 185),
-                delete: [185; 185),
+                source_range: 185..185,
+                delete: 185..185,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -902,16 +902,16 @@ mod tests {
         [
             CompletionItem {
                 label: "foo!(…)",
-                source_range: [179; 179),
-                delete: [179; 179),
+                source_range: 179..179,
+                delete: 179..179,
                 insert: "foo!($0)",
                 kind: Macro,
                 detail: "#[macro_export]\nmacro_rules! foo",
             },
             CompletionItem {
                 label: "main()",
-                source_range: [179; 179),
-                delete: [179; 179),
+                source_range: 179..179,
+                delete: 179..179,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -947,22 +947,22 @@ mod tests {
         [
             CompletionItem {
                 label: "RIGHT_CONST",
-                source_range: [57; 57),
-                delete: [57; 57),
+                source_range: 57..57,
+                delete: 57..57,
                 insert: "RIGHT_CONST",
                 kind: Const,
             },
             CompletionItem {
                 label: "RightType",
-                source_range: [57; 57),
-                delete: [57; 57),
+                source_range: 57..57,
+                delete: 57..57,
                 insert: "RightType",
                 kind: Struct,
             },
             CompletionItem {
                 label: "right_fn()",
-                source_range: [57; 57),
-                delete: [57; 57),
+                source_range: 57..57,
+                delete: 57..57,
                 insert: "right_fn()$0",
                 kind: Function,
                 lookup: "right_fn",
@@ -986,8 +986,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo()",
-                source_range: [93; 94),
-                delete: [93; 94),
+                source_range: 93..94,
+                delete: 93..94,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -995,8 +995,8 @@ mod tests {
             },
             CompletionItem {
                 label: "main()",
-                source_range: [93; 94),
-                delete: [93; 94),
+                source_range: 93..94,
+                delete: 93..94,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -1025,15 +1025,15 @@ mod tests {
         [
             CompletionItem {
                 label: "z",
-                source_range: [57; 57),
-                delete: [57; 57),
+                source_range: 57..57,
+                delete: 57..57,
                 insert: "z",
                 kind: Module,
             },
             CompletionItem {
                 label: "z()",
-                source_range: [57; 57),
-                delete: [57; 57),
+                source_range: 57..57,
+                delete: 57..57,
                 insert: "z()$0",
                 kind: Function,
                 lookup: "z",
@@ -1064,8 +1064,8 @@ mod tests {
         [
             CompletionItem {
                 label: "new()",
-                source_range: [292; 292),
-                delete: [292; 292),
+                source_range: 292..292,
+                delete: 292..292,
                 insert: "new()$0",
                 kind: Function,
                 lookup: "new",
diff --git a/crates/ra_ide/src/completion/complete_record.rs b/crates/ra_ide/src/completion/complete_record.rs
index 83a553155..b7ab654c5 100644
--- a/crates/ra_ide/src/completion/complete_record.rs
+++ b/crates/ra_ide/src/completion/complete_record.rs
@@ -44,8 +44,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo",
-                source_range: [117; 118),
-                delete: [117; 118),
+                source_range: 117..118,
+                delete: 117..118,
                 insert: "foo",
                 kind: Field,
                 detail: "u32",
@@ -73,16 +73,16 @@ mod tests {
         [
             CompletionItem {
                 label: "bar",
-                source_range: [161; 161),
-                delete: [161; 161),
+                source_range: 161..161,
+                delete: 161..161,
                 insert: "bar",
                 kind: Field,
                 detail: "()",
             },
             CompletionItem {
                 label: "foo",
-                source_range: [161; 161),
-                delete: [161; 161),
+                source_range: 161..161,
+                delete: 161..161,
                 insert: "foo",
                 kind: Field,
                 detail: "u32",
@@ -109,8 +109,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo",
-                source_range: [171; 172),
-                delete: [171; 172),
+                source_range: 171..172,
+                delete: 171..172,
                 insert: "foo",
                 kind: Field,
                 detail: "u32",
@@ -145,16 +145,16 @@ mod tests {
         [
             CompletionItem {
                 label: "bar",
-                source_range: [372; 372),
-                delete: [372; 372),
+                source_range: 372..372,
+                delete: 372..372,
                 insert: "bar",
                 kind: Field,
                 detail: "u32",
             },
             CompletionItem {
                 label: "baz",
-                source_range: [372; 372),
-                delete: [372; 372),
+                source_range: 372..372,
+                delete: 372..372,
                 insert: "baz",
                 kind: Field,
                 detail: "u32",
@@ -190,8 +190,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [142; 145),
-                delete: [142; 145),
+                source_range: 142..145,
+                delete: 142..145,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -215,8 +215,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [83; 86),
-                delete: [83; 86),
+                source_range: 83..86,
+                delete: 83..86,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -241,8 +241,8 @@ mod tests {
         [
             CompletionItem {
                 label: "a",
-                source_range: [119; 119),
-                delete: [119; 119),
+                source_range: 119..119,
+                delete: 119..119,
                 insert: "a",
                 kind: Field,
                 detail: "u32",
@@ -267,8 +267,8 @@ mod tests {
         [
             CompletionItem {
                 label: "b",
-                source_range: [119; 119),
-                delete: [119; 119),
+                source_range: 119..119,
+                delete: 119..119,
                 insert: "b",
                 kind: Field,
                 detail: "u32",
@@ -292,8 +292,8 @@ mod tests {
         [
             CompletionItem {
                 label: "a",
-                source_range: [93; 93),
-                delete: [93; 93),
+                source_range: 93..93,
+                delete: 93..93,
                 insert: "a",
                 kind: Field,
                 detail: "u32",
@@ -317,8 +317,8 @@ mod tests {
         [
             CompletionItem {
                 label: "the_field",
-                source_range: [137; 140),
-                delete: [137; 140),
+                source_range: 137..140,
+                delete: 137..140,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -352,16 +352,16 @@ mod tests {
         [
             CompletionItem {
                 label: "bar",
-                source_range: [302; 302),
-                delete: [302; 302),
+                source_range: 302..302,
+                delete: 302..302,
                 insert: "bar",
                 kind: Field,
                 detail: "u32",
             },
             CompletionItem {
                 label: "baz",
-                source_range: [302; 302),
-                delete: [302; 302),
+                source_range: 302..302,
+                delete: 302..302,
                 insert: "baz",
                 kind: Field,
                 detail: "u32",
@@ -393,8 +393,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo2",
-                source_range: [221; 221),
-                delete: [221; 221),
+                source_range: 221..221,
+                delete: 221..221,
                 insert: "foo2",
                 kind: Field,
                 detail: "u32",
diff --git a/crates/ra_ide/src/completion/complete_snippet.rs b/crates/ra_ide/src/completion/complete_snippet.rs
index 4bccfbfed..a3f5d1b6a 100644
--- a/crates/ra_ide/src/completion/complete_snippet.rs
+++ b/crates/ra_ide/src/completion/complete_snippet.rs
@@ -67,15 +67,15 @@ mod tests {
         [
             CompletionItem {
                 label: "pd",
-                source_range: [17; 17),
-                delete: [17; 17),
+                source_range: 17..17,
+                delete: 17..17,
                 insert: "eprintln!(\"$0 = {:?}\", $0);",
                 kind: Snippet,
             },
             CompletionItem {
                 label: "ppd",
-                source_range: [17; 17),
-                delete: [17; 17),
+                source_range: 17..17,
+                delete: 17..17,
                 insert: "eprintln!(\"$0 = {:#?}\", $0);",
                 kind: Snippet,
             },
@@ -111,23 +111,23 @@ mod tests {
         [
             CompletionItem {
                 label: "Test function",
-                source_range: [78; 78),
-                delete: [78; 78),
+                source_range: 78..78,
+                delete: 78..78,
                 insert: "#[test]\nfn ${1:feature}() {\n    $0\n}",
                 kind: Snippet,
                 lookup: "tfn",
             },
             CompletionItem {
                 label: "macro_rules",
-                source_range: [78; 78),
-                delete: [78; 78),
+                source_range: 78..78,
+                delete: 78..78,
                 insert: "macro_rules! $1 {\n\t($2) => {\n\t\t$0\n\t};\n}",
                 kind: Snippet,
             },
             CompletionItem {
                 label: "pub(crate)",
-                source_range: [78; 78),
-                delete: [78; 78),
+                source_range: 78..78,
+                delete: 78..78,
                 insert: "pub(crate) $0",
                 kind: Snippet,
             },
diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index e2a8c59cd..ee32d1ff6 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -188,8 +188,7 @@ fn add_const_impl(
     if let Some(const_name) = const_name {
         let snippet = make_const_compl_syntax(&const_.source(ctx.db).value);
 
-        let range =
-            TextRange::new(const_def_node.text_range().start(), ctx.source_range().end());
+        let range = TextRange::new(const_def_node.text_range().start(), ctx.source_range().end());
 
         CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone())
             .text_edit(TextEdit::replace(range, snippet))
@@ -254,24 +253,24 @@ mod tests {
         [
             CompletionItem {
                 label: "const TEST_CONST: u16 = ",
-                source_range: [209; 210),
-                delete: [209; 210),
+                source_range: 209..210,
+                delete: 209..210,
                 insert: "const TEST_CONST: u16 = ",
                 kind: Const,
                 lookup: "TEST_CONST",
             },
             CompletionItem {
                 label: "fn test()",
-                source_range: [209; 210),
-                delete: [209; 210),
+                source_range: 209..210,
+                delete: 209..210,
                 insert: "fn test() {\n    $0\n}",
                 kind: Function,
                 lookup: "test",
             },
             CompletionItem {
                 label: "type TestType = ",
-                source_range: [209; 210),
-                delete: [209; 210),
+                source_range: 209..210,
+                delete: 209..210,
                 insert: "type TestType = ",
                 kind: TypeAlias,
                 lookup: "TestType",
@@ -320,8 +319,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn test()",
-                source_range: [139; 140),
-                delete: [139; 140),
+                source_range: 139..140,
+                delete: 139..140,
                 insert: "fn test() {\n    $0\n}",
                 kind: Function,
                 lookup: "test",
@@ -349,8 +348,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn foo()",
-                source_range: [141; 142),
-                delete: [138; 142),
+                source_range: 141..142,
+                delete: 138..142,
                 insert: "fn foo() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
@@ -381,8 +380,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn foo_bar()",
-                source_range: [200; 201),
-                delete: [197; 201),
+                source_range: 200..201,
+                delete: 197..201,
                 insert: "fn foo_bar() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo_bar",
@@ -432,8 +431,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn foo()",
-                source_range: [144; 145),
-                delete: [141; 145),
+                source_range: 144..145,
+                delete: 141..145,
                 insert: "fn foo<T>() {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
@@ -461,8 +460,8 @@ mod tests {
         [
             CompletionItem {
                 label: "fn foo()",
-                source_range: [166; 167),
-                delete: [163; 167),
+                source_range: 166..167,
+                delete: 163..167,
                 insert: "fn foo<T>()\nwhere T: Into<String> {\n    $0\n}",
                 kind: Function,
                 lookup: "foo",
@@ -488,8 +487,8 @@ mod tests {
         [
             CompletionItem {
                 label: "type SomeType = ",
-                source_range: [124; 125),
-                delete: [119; 125),
+                source_range: 124..125,
+                delete: 119..125,
                 insert: "type SomeType = ",
                 kind: TypeAlias,
                 lookup: "SomeType",
@@ -515,8 +514,8 @@ mod tests {
         [
             CompletionItem {
                 label: "const SOME_CONST: u16 = ",
-                source_range: [133; 134),
-                delete: [127; 134),
+                source_range: 133..134,
+                delete: 127..134,
                 insert: "const SOME_CONST: u16 = ",
                 kind: Const,
                 lookup: "SOME_CONST",
@@ -542,8 +541,8 @@ mod tests {
         [
             CompletionItem {
                 label: "const SOME_CONST: u16 = ",
-                source_range: [138; 139),
-                delete: [132; 139),
+                source_range: 138..139,
+                delete: 132..139,
                 insert: "const SOME_CONST: u16 = ",
                 kind: Const,
                 lookup: "SOME_CONST",
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index 8e3dcf96e..b2af81ae5 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -85,8 +85,8 @@ mod tests {
             [
                 CompletionItem {
                     label: "collections",
-                    source_range: [21; 24),
-                    delete: [21; 24),
+                    source_range: 21..24,
+                    delete: 21..24,
                     insert: "collections",
                 },
             ]
@@ -157,8 +157,8 @@ mod tests {
             [
                 CompletionItem {
                     label: "Enum",
-                    source_range: [231; 233),
-                    delete: [231; 233),
+                    source_range: 231..233,
+                    delete: 231..233,
                     insert: "Enum",
                     kind: Enum,
                 },
@@ -183,8 +183,8 @@ mod tests {
         [
             CompletionItem {
                 label: "quux(…)",
-                source_range: [91; 91),
-                delete: [91; 91),
+                source_range: 91..91,
+                delete: 91..91,
                 insert: "quux(${1:x})$0",
                 kind: Function,
                 lookup: "quux",
@@ -193,16 +193,16 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: [91; 91),
-                delete: [91; 91),
+                source_range: 91..91,
+                delete: 91..91,
                 insert: "x",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "y",
-                source_range: [91; 91),
-                delete: [91; 91),
+                source_range: 91..91,
+                delete: 91..91,
                 insert: "y",
                 kind: Binding,
                 detail: "i32",
@@ -232,23 +232,23 @@ mod tests {
         [
             CompletionItem {
                 label: "a",
-                source_range: [242; 242),
-                delete: [242; 242),
+                source_range: 242..242,
+                delete: 242..242,
                 insert: "a",
                 kind: Binding,
             },
             CompletionItem {
                 label: "b",
-                source_range: [242; 242),
-                delete: [242; 242),
+                source_range: 242..242,
+                delete: 242..242,
                 insert: "b",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "quux()",
-                source_range: [242; 242),
-                delete: [242; 242),
+                source_range: 242..242,
+                delete: 242..242,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -275,8 +275,8 @@ mod tests {
         [
             CompletionItem {
                 label: "quux()",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -284,8 +284,8 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: [95; 95),
-                delete: [95; 95),
+                source_range: 95..95,
+                delete: 95..95,
                 insert: "x",
                 kind: Binding,
             },
@@ -308,15 +308,15 @@ mod tests {
         [
             CompletionItem {
                 label: "T",
-                source_range: [52; 52),
-                delete: [52; 52),
+                source_range: 52..52,
+                delete: 52..52,
                 insert: "T",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "quux()",
-                source_range: [52; 52),
-                delete: [52; 52),
+                source_range: 52..52,
+                delete: 52..52,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -341,22 +341,22 @@ mod tests {
         [
             CompletionItem {
                 label: "Self",
-                source_range: [54; 54),
-                delete: [54; 54),
+                source_range: 54..54,
+                delete: 54..54,
                 insert: "Self",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "T",
-                source_range: [54; 54),
-                delete: [54; 54),
+                source_range: 54..54,
+                delete: 54..54,
                 insert: "T",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "X<…>",
-                source_range: [54; 54),
-                delete: [54; 54),
+                source_range: 54..54,
+                delete: 54..54,
                 insert: "X<$0>",
                 kind: Struct,
                 lookup: "X",
@@ -380,15 +380,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Self",
-                source_range: [48; 48),
-                delete: [48; 48),
+                source_range: 48..48,
+                delete: 48..48,
                 insert: "Self",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "X",
-                source_range: [48; 48),
-                delete: [48; 48),
+                source_range: 48..48,
+                delete: 48..48,
                 insert: "X",
                 kind: Enum,
             },
@@ -413,22 +413,22 @@ mod tests {
         [
             CompletionItem {
                 label: "Baz",
-                source_range: [105; 105),
-                delete: [105; 105),
+                source_range: 105..105,
+                delete: 105..105,
                 insert: "Baz",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Foo",
-                source_range: [105; 105),
-                delete: [105; 105),
+                source_range: 105..105,
+                delete: 105..105,
                 insert: "Foo",
                 kind: Struct,
             },
             CompletionItem {
                 label: "quux()",
-                source_range: [105; 105),
-                delete: [105; 105),
+                source_range: 105..105,
+                delete: 105..105,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -455,8 +455,8 @@ mod tests {
         [
             CompletionItem {
                 label: "other_crate",
-                source_range: [4; 4),
-                delete: [4; 4),
+                source_range: 4..4,
+                delete: 4..4,
                 insert: "other_crate",
                 kind: Module,
             },
@@ -481,15 +481,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Bar",
-                source_range: [117; 117),
-                delete: [117; 117),
+                source_range: 117..117,
+                delete: 117..117,
                 insert: "Bar",
                 kind: Struct,
             },
             CompletionItem {
                 label: "quux()",
-                source_range: [117; 117),
-                delete: [117; 117),
+                source_range: 117..117,
+                delete: 117..117,
                 insert: "quux()$0",
                 kind: Function,
                 lookup: "quux",
@@ -513,15 +513,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: [55; 55),
-                delete: [55; 55),
+                source_range: 55..55,
+                delete: 55..55,
                 insert: "Foo",
                 kind: Struct,
             },
             CompletionItem {
                 label: "x()",
-                source_range: [55; 55),
-                delete: [55; 55),
+                source_range: 55..55,
+                delete: 55..55,
                 insert: "x()$0",
                 kind: Function,
                 lookup: "x",
@@ -550,16 +550,16 @@ mod tests {
         [
             CompletionItem {
                 label: "bar",
-                source_range: [146; 146),
-                delete: [146; 146),
+                source_range: 146..146,
+                delete: 146..146,
                 insert: "bar",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "foo()",
-                source_range: [146; 146),
-                delete: [146; 146),
+                source_range: 146..146,
+                delete: 146..146,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -578,15 +578,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Self",
-                source_range: [25; 25),
-                delete: [25; 25),
+                source_range: 25..25,
+                delete: 25..25,
                 insert: "Self",
                 kind: TypeParam,
             },
             CompletionItem {
                 label: "self",
-                source_range: [25; 25),
-                delete: [25; 25),
+                source_range: 25..25,
+                delete: 25..25,
                 insert: "self",
                 kind: Binding,
                 detail: "&{unknown}",
@@ -617,15 +617,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Option",
-                source_range: [18; 18),
-                delete: [18; 18),
+                source_range: 18..18,
+                delete: 18..18,
                 insert: "Option",
                 kind: Struct,
             },
             CompletionItem {
                 label: "foo()",
-                source_range: [18; 18),
-                delete: [18; 18),
+                source_range: 18..18,
+                delete: 18..18,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -633,8 +633,8 @@ mod tests {
             },
             CompletionItem {
                 label: "std",
-                source_range: [18; 18),
-                delete: [18; 18),
+                source_range: 18..18,
+                delete: 18..18,
                 insert: "std",
                 kind: Module,
             },
@@ -672,22 +672,22 @@ mod tests {
         [
             CompletionItem {
                 label: "String",
-                source_range: [18; 18),
-                delete: [18; 18),
+                source_range: 18..18,
+                delete: 18..18,
                 insert: "String",
                 kind: Struct,
             },
             CompletionItem {
                 label: "core",
-                source_range: [18; 18),
-                delete: [18; 18),
+                source_range: 18..18,
+                delete: 18..18,
                 insert: "core",
                 kind: Module,
             },
             CompletionItem {
                 label: "foo()",
-                source_range: [18; 18),
-                delete: [18; 18),
+                source_range: 18..18,
+                delete: 18..18,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -695,8 +695,8 @@ mod tests {
             },
             CompletionItem {
                 label: "std",
-                source_range: [18; 18),
-                delete: [18; 18),
+                source_range: 18..18,
+                delete: 18..18,
                 insert: "std",
                 kind: Module,
             },
@@ -742,46 +742,46 @@ mod tests {
         [
             CompletionItem {
                 label: "bar!(…)",
-                source_range: [252; 252),
-                delete: [252; 252),
+                source_range: 252..252,
+                delete: 252..252,
                 insert: "bar!($0)",
                 kind: Macro,
                 detail: "macro_rules! bar",
             },
             CompletionItem {
                 label: "baz!(…)",
-                source_range: [252; 252),
-                delete: [252; 252),
+                source_range: 252..252,
+                delete: 252..252,
                 insert: "baz!($0)",
                 kind: Macro,
                 detail: "#[macro_export]\nmacro_rules! baz",
             },
             CompletionItem {
                 label: "foo!(…)",
-                source_range: [252; 252),
-                delete: [252; 252),
+                source_range: 252..252,
+                delete: 252..252,
                 insert: "foo!($0)",
                 kind: Macro,
                 detail: "macro_rules! foo",
             },
             CompletionItem {
                 label: "m1",
-                source_range: [252; 252),
-                delete: [252; 252),
+                source_range: 252..252,
+                delete: 252..252,
                 insert: "m1",
                 kind: Module,
             },
             CompletionItem {
                 label: "m2",
-                source_range: [252; 252),
-                delete: [252; 252),
+                source_range: 252..252,
+                delete: 252..252,
                 insert: "m2",
                 kind: Module,
             },
             CompletionItem {
                 label: "main()",
-                source_range: [252; 252),
-                delete: [252; 252),
+                source_range: 252..252,
+                delete: 252..252,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -811,16 +811,16 @@ mod tests {
         [
             CompletionItem {
                 label: "foo!(…)",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "foo!($0)",
                 kind: Macro,
                 detail: "macro_rules! foo",
             },
             CompletionItem {
                 label: "foo()",
-                source_range: [49; 49),
-                delete: [49; 49),
+                source_range: 49..49,
+                delete: 49..49,
                 insert: "foo()$0",
                 kind: Function,
                 lookup: "foo",
@@ -850,16 +850,16 @@ mod tests {
         [
             CompletionItem {
                 label: "foo!(…)",
-                source_range: [57; 57),
-                delete: [57; 57),
+                source_range: 57..57,
+                delete: 57..57,
                 insert: "foo!($0)",
                 kind: Macro,
                 detail: "macro_rules! foo",
             },
             CompletionItem {
                 label: "main()",
-                source_range: [57; 57),
-                delete: [57; 57),
+                source_range: 57..57,
+                delete: 57..57,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -889,16 +889,16 @@ mod tests {
         [
             CompletionItem {
                 label: "foo!(…)",
-                source_range: [50; 50),
-                delete: [50; 50),
+                source_range: 50..50,
+                delete: 50..50,
                 insert: "foo!($0)",
                 kind: Macro,
                 detail: "macro_rules! foo",
             },
             CompletionItem {
                 label: "main()",
-                source_range: [50; 50),
-                delete: [50; 50),
+                source_range: 50..50,
+                delete: 50..50,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -925,8 +925,8 @@ mod tests {
         [
             CompletionItem {
                 label: "frobnicate()",
-                source_range: [23; 24),
-                delete: [23; 24),
+                source_range: 23..24,
+                delete: 23..24,
                 insert: "frobnicate()$0",
                 kind: Function,
                 lookup: "frobnicate",
@@ -934,8 +934,8 @@ mod tests {
             },
             CompletionItem {
                 label: "main()",
-                source_range: [23; 24),
-                delete: [23; 24),
+                source_range: 23..24,
+                delete: 23..24,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -962,16 +962,16 @@ mod tests {
         [
             CompletionItem {
                 label: "m!(…)",
-                source_range: [145; 145),
-                delete: [145; 145),
+                source_range: 145..145,
+                delete: 145..145,
                 insert: "m!($0)",
                 kind: Macro,
                 detail: "macro_rules! m",
             },
             CompletionItem {
                 label: "quux(…)",
-                source_range: [145; 145),
-                delete: [145; 145),
+                source_range: 145..145,
+                delete: 145..145,
                 insert: "quux(${1:x})$0",
                 kind: Function,
                 lookup: "quux",
@@ -980,16 +980,16 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: [145; 145),
-                delete: [145; 145),
+                source_range: 145..145,
+                delete: 145..145,
                 insert: "x",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "y",
-                source_range: [145; 145),
-                delete: [145; 145),
+                source_range: 145..145,
+                delete: 145..145,
                 insert: "y",
                 kind: Binding,
                 detail: "i32",
@@ -1015,16 +1015,16 @@ mod tests {
         [
             CompletionItem {
                 label: "m!(…)",
-                source_range: [145; 146),
-                delete: [145; 146),
+                source_range: 145..146,
+                delete: 145..146,
                 insert: "m!($0)",
                 kind: Macro,
                 detail: "macro_rules! m",
             },
             CompletionItem {
                 label: "quux(…)",
-                source_range: [145; 146),
-                delete: [145; 146),
+                source_range: 145..146,
+                delete: 145..146,
                 insert: "quux(${1:x})$0",
                 kind: Function,
                 lookup: "quux",
@@ -1033,16 +1033,16 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: [145; 146),
-                delete: [145; 146),
+                source_range: 145..146,
+                delete: 145..146,
                 insert: "x",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "y",
-                source_range: [145; 146),
-                delete: [145; 146),
+                source_range: 145..146,
+                delete: 145..146,
                 insert: "y",
                 kind: Binding,
                 detail: "i32",
@@ -1068,16 +1068,16 @@ mod tests {
         [
             CompletionItem {
                 label: "m!(…)",
-                source_range: [145; 146),
-                delete: [145; 146),
+                source_range: 145..146,
+                delete: 145..146,
                 insert: "m!($0)",
                 kind: Macro,
                 detail: "macro_rules! m",
             },
             CompletionItem {
                 label: "quux(…)",
-                source_range: [145; 146),
-                delete: [145; 146),
+                source_range: 145..146,
+                delete: 145..146,
                 insert: "quux(${1:x})$0",
                 kind: Function,
                 lookup: "quux",
@@ -1086,16 +1086,16 @@ mod tests {
             },
             CompletionItem {
                 label: "x",
-                source_range: [145; 146),
-                delete: [145; 146),
+                source_range: 145..146,
+                delete: 145..146,
                 insert: "x",
                 kind: Binding,
                 detail: "i32",
             },
             CompletionItem {
                 label: "y",
-                source_range: [145; 146),
-                delete: [145; 146),
+                source_range: 145..146,
+                delete: 145..146,
                 insert: "y",
                 kind: Binding,
                 detail: "i32",
@@ -1121,14 +1121,14 @@ mod tests {
         [
             CompletionItem {
                 label: "Quux",
-                source_range: [82; 82),
-                delete: [82; 82),
+                source_range: 82..82,
+                delete: 82..82,
                 insert: "Quux",
             },
             CompletionItem {
                 label: "main()",
-                source_range: [82; 82),
-                delete: [82; 82),
+                source_range: 82..82,
+                delete: 82..82,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -1162,31 +1162,31 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: [248; 250),
-                delete: [248; 250),
+                source_range: 248..250,
+                delete: 248..250,
                 insert: "Foo",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Foo::Bar",
-                source_range: [248; 250),
-                delete: [248; 250),
+                source_range: 248..250,
+                delete: 248..250,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Foo::Baz",
-                source_range: [248; 250),
-                delete: [248; 250),
+                source_range: 248..250,
+                delete: 248..250,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Foo::Quux",
-                source_range: [248; 250),
-                delete: [248; 250),
+                source_range: 248..250,
+                delete: 248..250,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
                 detail: "()",
@@ -1220,31 +1220,31 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: [219; 221),
-                delete: [219; 221),
+                source_range: 219..221,
+                delete: 219..221,
                 insert: "Foo",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Foo::Bar",
-                source_range: [219; 221),
-                delete: [219; 221),
+                source_range: 219..221,
+                delete: 219..221,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Foo::Baz",
-                source_range: [219; 221),
-                delete: [219; 221),
+                source_range: 219..221,
+                delete: 219..221,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Foo::Quux",
-                source_range: [219; 221),
-                delete: [219; 221),
+                source_range: 219..221,
+                delete: 219..221,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
                 detail: "()",
@@ -1274,39 +1274,39 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: [185; 186),
-                delete: [185; 186),
+                source_range: 185..186,
+                delete: 185..186,
                 insert: "Foo",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Foo::Bar",
-                source_range: [185; 186),
-                delete: [185; 186),
+                source_range: 185..186,
+                delete: 185..186,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Foo::Baz",
-                source_range: [185; 186),
-                delete: [185; 186),
+                source_range: 185..186,
+                delete: 185..186,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Foo::Quux",
-                source_range: [185; 186),
-                delete: [185; 186),
+                source_range: 185..186,
+                delete: 185..186,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "main()",
-                source_range: [185; 186),
-                delete: [185; 186),
+                source_range: 185..186,
+                delete: 185..186,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 6a6ddc7bd..9f9f06bf0 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -452,8 +452,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: [121; 123),
-                delete: [121; 123),
+                source_range: 121..123,
+                delete: 121..123,
                 insert: "Foo",
                 kind: EnumVariant,
                 detail: "{ x: i32, y: i32 }",
@@ -478,8 +478,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo(…)",
-                source_range: [115; 117),
-                delete: [115; 117),
+                source_range: 115..117,
+                delete: 115..117,
                 insert: "Foo($0)",
                 kind: EnumVariant,
                 lookup: "Foo",
@@ -506,8 +506,8 @@ mod tests {
         [
             CompletionItem {
                 label: "Foo",
-                source_range: [104; 106),
-                delete: [104; 106),
+                source_range: 104..106,
+                delete: 104..106,
                 insert: "Foo",
                 kind: EnumVariant,
                 detail: "()",
@@ -534,8 +534,8 @@ mod tests {
         [
             CompletionItem {
                 label: "main()",
-                source_range: [203; 206),
-                delete: [203; 206),
+                source_range: 203..206,
+                delete: 203..206,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -543,8 +543,8 @@ mod tests {
             },
             CompletionItem {
                 label: "something_deprecated()",
-                source_range: [203; 206),
-                delete: [203; 206),
+                source_range: 203..206,
+                delete: 203..206,
                 insert: "something_deprecated()$0",
                 kind: Function,
                 lookup: "something_deprecated",
@@ -553,8 +553,8 @@ mod tests {
             },
             CompletionItem {
                 label: "something_else_deprecated()",
-                source_range: [203; 206),
-                delete: [203; 206),
+                source_range: 203..206,
+                delete: 203..206,
                 insert: "something_else_deprecated()$0",
                 kind: Function,
                 lookup: "something_else_deprecated",
@@ -580,8 +580,8 @@ mod tests {
         [
             CompletionItem {
                 label: "main()",
-                source_range: [61; 64),
-                delete: [61; 64),
+                source_range: 61..64,
+                delete: 61..64,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -589,8 +589,8 @@ mod tests {
             },
             CompletionItem {
                 label: "no_args()",
-                source_range: [61; 64),
-                delete: [61; 64),
+                source_range: 61..64,
+                delete: 61..64,
                 insert: "no_args()$0",
                 kind: Function,
                 lookup: "no_args",
@@ -610,8 +610,8 @@ mod tests {
         [
             CompletionItem {
                 label: "main()",
-                source_range: [80; 85),
-                delete: [80; 85),
+                source_range: 80..85,
+                delete: 80..85,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -619,8 +619,8 @@ mod tests {
             },
             CompletionItem {
                 label: "with_args(…)",
-                source_range: [80; 85),
-                delete: [80; 85),
+                source_range: 80..85,
+                delete: 80..85,
                 insert: "with_args(${1:x}, ${2:y})$0",
                 kind: Function,
                 lookup: "with_args",
@@ -646,8 +646,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo()",
-                source_range: [163; 164),
-                delete: [163; 164),
+                source_range: 163..164,
+                delete: 163..164,
                 insert: "foo()$0",
                 kind: Method,
                 lookup: "foo",
@@ -674,23 +674,23 @@ mod tests {
         [
             CompletionItem {
                 label: "None",
-                source_range: [144; 147),
-                delete: [144; 147),
+                source_range: 144..147,
+                delete: 144..147,
                 insert: "None",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Option",
-                source_range: [144; 147),
-                delete: [144; 147),
+                source_range: 144..147,
+                delete: 144..147,
                 insert: "Option",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Some(…)",
-                source_range: [144; 147),
-                delete: [144; 147),
+                source_range: 144..147,
+                delete: 144..147,
                 insert: "Some($0)",
                 kind: EnumVariant,
                 lookup: "Some",
@@ -699,8 +699,8 @@ mod tests {
             },
             CompletionItem {
                 label: "main()",
-                source_range: [144; 147),
-                delete: [144; 147),
+                source_range: 144..147,
+                delete: 144..147,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -725,23 +725,23 @@ mod tests {
         [
             CompletionItem {
                 label: "None",
-                source_range: [185; 188),
-                delete: [185; 188),
+                source_range: 185..188,
+                delete: 185..188,
                 insert: "None",
                 kind: EnumVariant,
                 detail: "()",
             },
             CompletionItem {
                 label: "Option",
-                source_range: [185; 188),
-                delete: [185; 188),
+                source_range: 185..188,
+                delete: 185..188,
                 insert: "Option",
                 kind: Enum,
             },
             CompletionItem {
                 label: "Some(…)",
-                source_range: [185; 188),
-                delete: [185; 188),
+                source_range: 185..188,
+                delete: 185..188,
                 insert: "Some($0)",
                 kind: EnumVariant,
                 lookup: "Some",
@@ -771,8 +771,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo(…)",
-                source_range: [171; 172),
-                delete: [171; 172),
+                source_range: 171..172,
+                delete: 171..172,
                 insert: "foo(${1:x})$0",
                 kind: Method,
                 lookup: "foo",
@@ -806,8 +806,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo(…)",
-                source_range: [171; 172),
-                delete: [171; 172),
+                source_range: 171..172,
+                delete: 171..172,
                 insert: "foo($0)",
                 kind: Method,
                 lookup: "foo",
@@ -833,8 +833,8 @@ mod tests {
         [
             CompletionItem {
                 label: "foo",
-                source_range: [40; 41),
-                delete: [40; 41),
+                source_range: 40..41,
+                delete: 40..41,
                 insert: "foo",
                 kind: Function,
                 detail: "pub fn foo()",
@@ -860,16 +860,16 @@ mod tests {
         [
             CompletionItem {
                 label: "frobnicate",
-                source_range: [35; 39),
-                delete: [35; 39),
+                source_range: 35..39,
+                delete: 35..39,
                 insert: "frobnicate",
                 kind: Function,
                 detail: "fn frobnicate()",
             },
             CompletionItem {
                 label: "main",
-                source_range: [35; 39),
-                delete: [35; 39),
+                source_range: 35..39,
+                delete: 35..39,
                 insert: "main",
                 kind: Function,
                 detail: "fn main()",
@@ -892,8 +892,8 @@ mod tests {
         [
             CompletionItem {
                 label: "new",
-                source_range: [67; 69),
-                delete: [67; 69),
+                source_range: 67..69,
+                delete: 67..69,
                 insert: "new",
                 kind: Function,
                 detail: "fn new() -> Foo",
@@ -917,16 +917,16 @@ mod tests {
         [
             CompletionItem {
                 label: "Vec<…>",
-                source_range: [61; 63),
-                delete: [61; 63),
+                source_range: 61..63,
+                delete: 61..63,
                 insert: "Vec<$0>",
                 kind: Struct,
                 lookup: "Vec",
             },
             CompletionItem {
                 label: "foo(…)",
-                source_range: [61; 63),
-                delete: [61; 63),
+                source_range: 61..63,
+                delete: 61..63,
                 insert: "foo(${1:xs})$0",
                 kind: Function,
                 lookup: "foo",
@@ -947,16 +947,16 @@ mod tests {
         [
             CompletionItem {
                 label: "Vec<…>",
-                source_range: [64; 66),
-                delete: [64; 66),
+                source_range: 64..66,
+                delete: 64..66,
                 insert: "Vec<$0>",
                 kind: TypeAlias,
                 lookup: "Vec",
             },
             CompletionItem {
                 label: "foo(…)",
-                source_range: [64; 66),
-                delete: [64; 66),
+                source_range: 64..66,
+                delete: 64..66,
                 insert: "foo(${1:xs})$0",
                 kind: Function,
                 lookup: "foo",
@@ -977,15 +977,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Vec",
-                source_range: [68; 70),
-                delete: [68; 70),
+                source_range: 68..70,
+                delete: 68..70,
                 insert: "Vec",
                 kind: Struct,
             },
             CompletionItem {
                 label: "foo(…)",
-                source_range: [68; 70),
-                delete: [68; 70),
+                source_range: 68..70,
+                delete: 68..70,
                 insert: "foo(${1:xs})$0",
                 kind: Function,
                 lookup: "foo",
@@ -1006,15 +1006,15 @@ mod tests {
         [
             CompletionItem {
                 label: "Vec",
-                source_range: [61; 63),
-                delete: [61; 63),
+                source_range: 61..63,
+                delete: 61..63,
                 insert: "Vec",
                 kind: Struct,
             },
             CompletionItem {
                 label: "foo(…)",
-                source_range: [61; 63),
-                delete: [61; 63),
+                source_range: 61..63,
+                delete: 61..63,
                 insert: "foo(${1:xs})$0",
                 kind: Function,
                 lookup: "foo",
@@ -1046,8 +1046,8 @@ mod tests {
         [
             CompletionItem {
                 label: "frobnicate!",
-                source_range: [9; 9),
-                delete: [9; 9),
+                source_range: 9..9,
+                delete: 9..9,
                 insert: "frobnicate",
                 kind: Macro,
                 detail: "#[macro_export]\nmacro_rules! frobnicate",
@@ -1072,16 +1072,16 @@ mod tests {
         [
             CompletionItem {
                 label: "frobnicate!",
-                source_range: [56; 60),
-                delete: [56; 60),
+                source_range: 56..60,
+                delete: 56..60,
                 insert: "frobnicate",
                 kind: Macro,
                 detail: "macro_rules! frobnicate",
             },
             CompletionItem {
                 label: "main()",
-                source_range: [56; 60),
-                delete: [56; 60),
+                source_range: 56..60,
+                delete: 56..60,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",
@@ -1109,24 +1109,24 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: [201; 201),
-                delete: [201; 201),
+                source_range: 201..201,
+                delete: 201..201,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
             },
             CompletionItem {
                 label: "my_string",
-                source_range: [201; 201),
-                delete: [201; 201),
+                source_range: 201..201,
+                delete: 201..201,
                 insert: "my_string",
                 kind: Field,
                 detail: "{unknown}",
             },
             CompletionItem {
                 label: "the_field",
-                source_range: [201; 201),
-                delete: [201; 201),
+                source_range: 201..201,
+                delete: 201..201,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1153,16 +1153,16 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: [208; 208),
-                delete: [208; 208),
+                source_range: 208..208,
+                delete: 208..208,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
             },
             CompletionItem {
                 label: "another_good_type",
-                source_range: [208; 208),
-                delete: [208; 208),
+                source_range: 208..208,
+                delete: 208..208,
                 insert: "another_good_type",
                 kind: Field,
                 detail: "u32",
@@ -1170,8 +1170,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: [208; 208),
-                delete: [208; 208),
+                source_range: 208..208,
+                delete: 208..208,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1201,16 +1201,16 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: [270; 270),
-                delete: [270; 270),
+                source_range: 270..270,
+                delete: 270..270,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
             },
             CompletionItem {
                 label: "another_good_type",
-                source_range: [270; 270),
-                delete: [270; 270),
+                source_range: 270..270,
+                delete: 270..270,
                 insert: "another_good_type",
                 kind: Field,
                 detail: "u32",
@@ -1218,8 +1218,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: [270; 270),
-                delete: [270; 270),
+                source_range: 270..270,
+                delete: 270..270,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1249,8 +1249,8 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: [336; 336),
-                delete: [336; 336),
+                source_range: 336..336,
+                delete: 336..336,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
@@ -1258,16 +1258,16 @@ mod tests {
             },
             CompletionItem {
                 label: "another_good_type",
-                source_range: [336; 336),
-                delete: [336; 336),
+                source_range: 336..336,
+                delete: 336..336,
                 insert: "another_good_type",
                 kind: Field,
                 detail: "u32",
             },
             CompletionItem {
                 label: "the_field",
-                source_range: [336; 336),
-                delete: [336; 336),
+                source_range: 336..336,
+                delete: 336..336,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
@@ -1296,16 +1296,16 @@ mod tests {
         [
             CompletionItem {
                 label: "another_field",
-                source_range: [328; 328),
-                delete: [328; 328),
+                source_range: 328..328,
+                delete: 328..328,
                 insert: "another_field",
                 kind: Field,
                 detail: "i64",
             },
             CompletionItem {
                 label: "another_good_type",
-                source_range: [328; 328),
-                delete: [328; 328),
+                source_range: 328..328,
+                delete: 328..328,
                 insert: "another_good_type",
                 kind: Field,
                 detail: "u32",
@@ -1313,8 +1313,8 @@ mod tests {
             },
             CompletionItem {
                 label: "the_field",
-                source_range: [328; 328),
-                delete: [328; 328),
+                source_range: 328..328,
+                delete: 328..328,
                 insert: "the_field",
                 kind: Field,
                 detail: "u32",
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs
index adfb1b9b2..a6b4c2c28 100644
--- a/crates/ra_ide/src/diagnostics.rs
+++ b/crates/ra_ide/src/diagnostics.rs
@@ -277,7 +277,7 @@ mod tests {
         assert!(
             diagnostic.range.start() <= file_position.offset
                 && diagnostic.range.end() >= file_position.offset,
-            "diagnostic range {} does not touch cursor position {}",
+            "diagnostic range {:?} does not touch cursor position {:?}",
             diagnostic.range,
             file_position.offset
         );
@@ -603,7 +603,7 @@ mod tests {
         [
             Diagnostic {
                 message: "unresolved module",
-                range: [0; 8),
+                range: 0..8,
                 fix: Some(
                     SourceChange {
                         label: "create module",
@@ -652,7 +652,7 @@ mod tests {
         [
             Diagnostic {
                 message: "Missing structure fields:\n- b",
-                range: [224; 233),
+                range: 224..233,
                 fix: Some(
                     SourceChange {
                         label: "fill struct fields",
@@ -664,7 +664,7 @@ mod tests {
                                 edit: TextEdit {
                                     atoms: [
                                         AtomTextEdit {
-                                            delete: [3; 9),
+                                            delete: 3..9,
                                             insert: "{a:42, b: ()}",
                                         },
                                     ],
diff --git a/crates/ra_ide/src/display/structure.rs b/crates/ra_ide/src/display/structure.rs
index 7a774785c..967eee5d2 100644
--- a/crates/ra_ide/src/display/structure.rs
+++ b/crates/ra_ide/src/display/structure.rs
@@ -224,8 +224,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "Foo",
-                navigation_range: [8; 11),
-                node_range: [1; 26),
+                navigation_range: 8..11,
+                node_range: 1..26,
                 kind: STRUCT_DEF,
                 detail: None,
                 deprecated: false,
@@ -235,8 +235,8 @@ fn very_obsolete() {}
                     0,
                 ),
                 label: "x",
-                navigation_range: [18; 19),
-                node_range: [18; 24),
+                navigation_range: 18..19,
+                node_range: 18..24,
                 kind: RECORD_FIELD_DEF,
                 detail: Some(
                     "i32",
@@ -246,8 +246,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "m",
-                navigation_range: [32; 33),
-                node_range: [28; 158),
+                navigation_range: 32..33,
+                node_range: 28..158,
                 kind: MODULE,
                 detail: None,
                 deprecated: false,
@@ -257,8 +257,8 @@ fn very_obsolete() {}
                     2,
                 ),
                 label: "bar1",
-                navigation_range: [43; 47),
-                node_range: [40; 52),
+                navigation_range: 43..47,
+                node_range: 40..52,
                 kind: FN_DEF,
                 detail: Some(
                     "fn()",
@@ -270,8 +270,8 @@ fn very_obsolete() {}
                     2,
                 ),
                 label: "bar2",
-                navigation_range: [60; 64),
-                node_range: [57; 81),
+                navigation_range: 60..64,
+                node_range: 57..81,
                 kind: FN_DEF,
                 detail: Some(
                     "fn<T>(t: T) -> T",
@@ -283,8 +283,8 @@ fn very_obsolete() {}
                     2,
                 ),
                 label: "bar3",
-                navigation_range: [89; 93),
-                node_range: [86; 156),
+                navigation_range: 89..93,
+                node_range: 86..156,
                 kind: FN_DEF,
                 detail: Some(
                     "fn<A, B>(a: A, b: B) -> Vec< u32 >",
@@ -294,8 +294,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "E",
-                navigation_range: [165; 166),
-                node_range: [160; 180),
+                navigation_range: 165..166,
+                node_range: 160..180,
                 kind: ENUM_DEF,
                 detail: None,
                 deprecated: false,
@@ -305,8 +305,8 @@ fn very_obsolete() {}
                     6,
                 ),
                 label: "X",
-                navigation_range: [169; 170),
-                node_range: [169; 170),
+                navigation_range: 169..170,
+                node_range: 169..170,
                 kind: ENUM_VARIANT,
                 detail: None,
                 deprecated: false,
@@ -316,8 +316,8 @@ fn very_obsolete() {}
                     6,
                 ),
                 label: "Y",
-                navigation_range: [172; 173),
-                node_range: [172; 178),
+                navigation_range: 172..173,
+                node_range: 172..178,
                 kind: ENUM_VARIANT,
                 detail: None,
                 deprecated: false,
@@ -325,8 +325,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "T",
-                navigation_range: [186; 187),
-                node_range: [181; 193),
+                navigation_range: 186..187,
+                node_range: 181..193,
                 kind: TYPE_ALIAS_DEF,
                 detail: Some(
                     "()",
@@ -336,8 +336,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "S",
-                navigation_range: [201; 202),
-                node_range: [194; 213),
+                navigation_range: 201..202,
+                node_range: 194..213,
                 kind: STATIC_DEF,
                 detail: Some(
                     "i32",
@@ -347,8 +347,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "C",
-                navigation_range: [220; 221),
-                node_range: [214; 232),
+                navigation_range: 220..221,
+                node_range: 214..232,
                 kind: CONST_DEF,
                 detail: Some(
                     "i32",
@@ -358,8 +358,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "impl E",
-                navigation_range: [239; 240),
-                node_range: [234; 243),
+                navigation_range: 239..240,
+                node_range: 234..243,
                 kind: IMPL_DEF,
                 detail: None,
                 deprecated: false,
@@ -367,8 +367,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "impl fmt::Debug for E",
-                navigation_range: [265; 266),
-                node_range: [245; 269),
+                navigation_range: 265..266,
+                node_range: 245..269,
                 kind: IMPL_DEF,
                 detail: None,
                 deprecated: false,
@@ -376,8 +376,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "mc",
-                navigation_range: [284; 286),
-                node_range: [271; 303),
+                navigation_range: 284..286,
+                node_range: 271..303,
                 kind: MACRO_CALL,
                 detail: None,
                 deprecated: false,
@@ -385,8 +385,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "mcexp",
-                navigation_range: [334; 339),
-                node_range: [305; 356),
+                navigation_range: 334..339,
+                node_range: 305..356,
                 kind: MACRO_CALL,
                 detail: None,
                 deprecated: false,
@@ -394,8 +394,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "mcexp",
-                navigation_range: [387; 392),
-                node_range: [358; 409),
+                navigation_range: 387..392,
+                node_range: 358..409,
                 kind: MACRO_CALL,
                 detail: None,
                 deprecated: false,
@@ -403,8 +403,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "obsolete",
-                navigation_range: [428; 436),
-                node_range: [411; 441),
+                navigation_range: 428..436,
+                node_range: 411..441,
                 kind: FN_DEF,
                 detail: Some(
                     "fn()",
@@ -414,8 +414,8 @@ fn very_obsolete() {}
             StructureNode {
                 parent: None,
                 label: "very_obsolete",
-                navigation_range: [481; 494),
-                node_range: [443; 499),
+                navigation_range: 481..494,
+                node_range: 443..499,
                 kind: FN_DEF,
                 detail: Some(
                     "fn()",
diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs
index 9f329b5d3..554594a43 100644
--- a/crates/ra_ide/src/extend_selection.rs
+++ b/crates/ra_ide/src/extend_selection.rs
@@ -316,7 +316,7 @@ mod tests {
     fn do_check(before: &str, afters: &[&str]) {
         let (cursor, before) = extract_offset(before);
         let (analysis, file_id) = single_file(&before);
-        let range = TextRange::offset_len(cursor, 0.into());
+        let range = TextRange::empty(cursor);
         let mut frange = FileRange { file_id, range };
 
         for &after in afters {
diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index 034c4c7d4..4379005aa 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/crates/ra_ide/src/folding_ranges.rs
@@ -187,10 +187,7 @@ fn contiguous_range_for_comment(
     }
 
     if first != last {
-        Some(TextRange::new(
-            first.syntax().text_range().start(),
-            last.syntax().text_range().end(),
-        ))
+        Some(TextRange::new(first.syntax().text_range().start(), last.syntax().text_range().end()))
     } else {
         // The group consists of only one element, therefore it cannot be folded
         None
diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs
index 9998ca5a3..1dfca819d 100644
--- a/crates/ra_ide/src/goto_definition.rs
+++ b/crates/ra_ide/src/goto_definition.rs
@@ -140,7 +140,7 @@ mod tests {
             struct Foo;
             enum E { X(Foo<|>) }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
             "struct Foo;|Foo",
         );
     }
@@ -153,7 +153,7 @@ mod tests {
             struct Foo;
             enum E { X(<|>Foo) }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
             "struct Foo;|Foo",
         );
     }
@@ -174,7 +174,7 @@ mod tests {
             //- /b.rs
             struct Foo;
             ",
-            "Foo STRUCT_DEF FileId(2) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(2) 0..11 7..10",
             "struct Foo;|Foo",
         );
     }
@@ -189,7 +189,7 @@ mod tests {
             //- /foo.rs
             // empty
             ",
-            "foo SOURCE_FILE FileId(2) [0; 10)",
+            "foo SOURCE_FILE FileId(2) 0..10",
             "// empty\n\n",
         );
 
@@ -201,7 +201,7 @@ mod tests {
             //- /foo/mod.rs
             // empty
             ",
-            "foo SOURCE_FILE FileId(2) [0; 10)",
+            "foo SOURCE_FILE FileId(2) 0..10",
             "// empty\n\n",
         );
     }
@@ -218,7 +218,7 @@ mod tests {
                 <|>foo!();
             }
             ",
-            "foo MACRO_CALL FileId(1) [0; 33) [13; 16)",
+            "foo MACRO_CALL FileId(1) 0..33 13..16",
             "macro_rules! foo { () => { () } }|foo",
         );
     }
@@ -238,7 +238,7 @@ mod tests {
             #[macro_export]
             macro_rules! foo { () => { () } }
             ",
-            "foo MACRO_CALL FileId(2) [0; 49) [29; 32)",
+            "foo MACRO_CALL FileId(2) 0..49 29..32",
             "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
         );
     }
@@ -254,7 +254,7 @@ mod tests {
             #[macro_export]
             macro_rules! foo { () => { () } }
             ",
-            "foo MACRO_CALL FileId(2) [0; 49) [29; 32)",
+            "foo MACRO_CALL FileId(2) 0..49 29..32",
             "#[macro_export]\nmacro_rules! foo { () => { () } }|foo",
         );
     }
@@ -274,7 +274,7 @@ mod tests {
                <|>foo();
             }
             ",
-            "foo FN_DEF FileId(1) [64; 80) [75; 78)",
+            "foo FN_DEF FileId(1) 64..80 75..78",
             "define_fn!(foo);|foo",
         );
     }
@@ -294,7 +294,7 @@ mod tests {
                <|>foo();
             }
             ",
-            "foo FN_DEF FileId(1) [51; 64) [51; 64)",
+            "foo FN_DEF FileId(1) 51..64 51..64",
             "define_fn!();|define_fn!();",
         );
     }
@@ -312,7 +312,7 @@ mod tests {
                 }
             }
             ",
-            "foo MACRO_CALL FileId(1) [0; 28) [13; 16)",
+            "foo MACRO_CALL FileId(1) 0..28 13..16",
             "macro_rules! foo {() => {0}}|foo",
         );
     }
@@ -330,7 +330,7 @@ mod tests {
                 }
             }
             ",
-            "foo MACRO_CALL FileId(1) [0; 28) [13; 16)",
+            "foo MACRO_CALL FileId(1) 0..28 13..16",
             "macro_rules! foo {() => {0}}|foo",
         );
     }
@@ -350,7 +350,7 @@ mod tests {
                 foo.frobnicate<|>();
             }
             ",
-            "frobnicate FN_DEF FileId(1) [27; 51) [30; 40)",
+            "frobnicate FN_DEF FileId(1) 27..51 30..40",
             "fn frobnicate(&self) { }|frobnicate",
         );
     }
@@ -369,7 +369,7 @@ mod tests {
                 foo.spam<|>;
             }
             ",
-            "spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)",
+            "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
             "spam: u32|spam",
         );
     }
@@ -390,7 +390,7 @@ mod tests {
                 }
             }
             ",
-            "spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)",
+            "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
             "spam: u32|spam",
         );
     }
@@ -409,7 +409,7 @@ mod tests {
                 let Foo { spam<|>: _, } = foo
             }
             ",
-            "spam RECORD_FIELD_DEF FileId(1) [17; 26) [17; 21)",
+            "spam RECORD_FIELD_DEF FileId(1) 17..26 17..21",
             "spam: u32|spam",
         );
     }
@@ -426,7 +426,7 @@ mod tests {
                 Foo { spam<|>: m!() }
             }
             ",
-            "spam RECORD_FIELD_DEF FileId(1) [45; 54) [45; 49)",
+            "spam RECORD_FIELD_DEF FileId(1) 45..54 45..49",
             "spam: u32|spam",
         );
     }
@@ -443,7 +443,7 @@ mod tests {
                 foo.<|>0;
             }
             ",
-            "TUPLE_FIELD_DEF FileId(1) [11; 14)",
+            "TUPLE_FIELD_DEF FileId(1) 11..14",
             "u32",
         );
     }
@@ -462,7 +462,7 @@ mod tests {
                 Foo::frobnicate<|>();
             }
             ",
-            "frobnicate FN_DEF FileId(1) [27; 46) [30; 40)",
+            "frobnicate FN_DEF FileId(1) 27..46 30..40",
             "fn frobnicate() { }|frobnicate",
         );
     }
@@ -480,7 +480,7 @@ mod tests {
                 Foo::frobnicate<|>();
             }
             ",
-            "frobnicate FN_DEF FileId(1) [16; 32) [19; 29)",
+            "frobnicate FN_DEF FileId(1) 16..32 19..29",
             "fn frobnicate();|frobnicate",
         );
     }
@@ -500,7 +500,7 @@ mod tests {
                 Foo::frobnicate<|>();
             }
             ",
-            "frobnicate FN_DEF FileId(1) [30; 46) [33; 43)",
+            "frobnicate FN_DEF FileId(1) 30..46 33..43",
             "fn frobnicate();|frobnicate",
         );
     }
@@ -517,7 +517,7 @@ mod tests {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [12; 73)",
+            "impl IMPL_DEF FileId(1) 12..73",
             "impl Foo {...}",
         );
 
@@ -531,7 +531,7 @@ mod tests {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [12; 73)",
+            "impl IMPL_DEF FileId(1) 12..73",
             "impl Foo {...}",
         );
 
@@ -545,7 +545,7 @@ mod tests {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [15; 75)",
+            "impl IMPL_DEF FileId(1) 15..75",
             "impl Foo {...}",
         );
 
@@ -558,7 +558,7 @@ mod tests {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [15; 62)",
+            "impl IMPL_DEF FileId(1) 15..62",
             "impl Foo {...}",
         );
     }
@@ -578,7 +578,7 @@ mod tests {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [49; 115)",
+            "impl IMPL_DEF FileId(1) 49..115",
             "impl Make for Foo {...}",
         );
 
@@ -595,7 +595,7 @@ mod tests {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [49; 115)",
+            "impl IMPL_DEF FileId(1) 49..115",
             "impl Make for Foo {...}",
         );
     }
@@ -607,7 +607,7 @@ mod tests {
             //- /lib.rs
             struct Foo<|> { value: u32 }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 25) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..25 7..10",
             "struct Foo { value: u32 }|Foo",
         );
 
@@ -618,7 +618,7 @@ mod tests {
                 field<|>: string,
             }
             "#,
-            "field RECORD_FIELD_DEF FileId(1) [17; 30) [17; 22)",
+            "field RECORD_FIELD_DEF FileId(1) 17..30 17..22",
             "field: string|field",
         );
 
@@ -627,7 +627,7 @@ mod tests {
             //- /lib.rs
             fn foo_test<|>() { }
             ",
-            "foo_test FN_DEF FileId(1) [0; 17) [3; 11)",
+            "foo_test FN_DEF FileId(1) 0..17 3..11",
             "fn foo_test() { }|foo_test",
         );
 
@@ -638,7 +638,7 @@ mod tests {
                 Variant,
             }
             ",
-            "Foo ENUM_DEF FileId(1) [0; 25) [5; 8)",
+            "Foo ENUM_DEF FileId(1) 0..25 5..8",
             "enum Foo {...}|Foo",
         );
 
@@ -651,7 +651,7 @@ mod tests {
                 Variant3,
             }
             ",
-            "Variant2 ENUM_VARIANT FileId(1) [29; 37) [29; 37)",
+            "Variant2 ENUM_VARIANT FileId(1) 29..37 29..37",
             "Variant2|Variant2",
         );
 
@@ -660,7 +660,7 @@ mod tests {
             //- /lib.rs
             static INNER<|>: &str = "";
             "#,
-            "INNER STATIC_DEF FileId(1) [0; 24) [7; 12)",
+            "INNER STATIC_DEF FileId(1) 0..24 7..12",
             "static INNER: &str = \"\";|INNER",
         );
 
@@ -669,7 +669,7 @@ mod tests {
             //- /lib.rs
             const INNER<|>: &str = "";
             "#,
-            "INNER CONST_DEF FileId(1) [0; 23) [6; 11)",
+            "INNER CONST_DEF FileId(1) 0..23 6..11",
             "const INNER: &str = \"\";|INNER",
         );
 
@@ -678,7 +678,7 @@ mod tests {
             //- /lib.rs
             type Thing<|> = Option<()>;
             "#,
-            "Thing TYPE_ALIAS_DEF FileId(1) [0; 24) [5; 10)",
+            "Thing TYPE_ALIAS_DEF FileId(1) 0..24 5..10",
             "type Thing = Option<()>;|Thing",
         );
 
@@ -687,7 +687,7 @@ mod tests {
             //- /lib.rs
             trait Foo<|> { }
             "#,
-            "Foo TRAIT_DEF FileId(1) [0; 13) [6; 9)",
+            "Foo TRAIT_DEF FileId(1) 0..13 6..9",
             "trait Foo { }|Foo",
         );
 
@@ -696,7 +696,7 @@ mod tests {
             //- /lib.rs
             mod bar<|> { }
             "#,
-            "bar MODULE FileId(1) [0; 11) [4; 7)",
+            "bar MODULE FileId(1) 0..11 4..7",
             "mod bar { }|bar",
         );
     }
@@ -717,7 +717,7 @@ mod tests {
             }
             mod confuse_index { fn foo(); }
             ",
-            "foo FN_DEF FileId(1) [52; 63) [55; 58)",
+            "foo FN_DEF FileId(1) 52..63 55..58",
             "fn foo() {}|foo",
         );
     }
@@ -746,7 +746,7 @@ mod tests {
                 format!(\"{}\", fo<|>o())
             }
             ",
-            "foo FN_DEF FileId(1) [398; 415) [401; 404)",
+            "foo FN_DEF FileId(1) 398..415 401..404",
             "fn foo() -> i8 {}|foo",
         );
     }
@@ -760,7 +760,7 @@ mod tests {
                 t: <|>T,
             }
             ",
-            "T TYPE_PARAM FileId(1) [11; 12)",
+            "T TYPE_PARAM FileId(1) 11..12",
             "T",
         );
     }
@@ -782,7 +782,7 @@ mod tests {
                 });
             }
             ",
-            "x BIND_PAT FileId(1) [69; 70)",
+            "x BIND_PAT FileId(1) 69..70",
             "x",
         );
 
@@ -801,7 +801,7 @@ mod tests {
                 });
             }
             ",
-            "y BIND_PAT FileId(1) [98; 99)",
+            "y BIND_PAT FileId(1) 98..99",
             "y",
         );
     }
@@ -818,7 +818,7 @@ mod tests {
                 }
             }
             ",
-            "x BIND_PAT FileId(1) [39; 40)",
+            "x BIND_PAT FileId(1) 39..40",
             "x",
         );
     }
@@ -833,7 +833,7 @@ mod tests {
                 <|>foo!();
             }
             ",
-            "foo MACRO_CALL FileId(1) [15; 48) [28; 31)",
+            "foo MACRO_CALL FileId(1) 15..48 28..31",
             "macro_rules! foo { () => { () } }|foo",
         );
     }
@@ -850,7 +850,7 @@ mod tests {
                 Foo { x<|> };
             }
             ",
-            "x BIND_PAT FileId(1) [42; 43)",
+            "x BIND_PAT FileId(1) 42..43",
             "x",
         )
     }
diff --git a/crates/ra_ide/src/goto_type_definition.rs b/crates/ra_ide/src/goto_type_definition.rs
index bd2688df1..a84637489 100644
--- a/crates/ra_ide/src/goto_type_definition.rs
+++ b/crates/ra_ide/src/goto_type_definition.rs
@@ -68,7 +68,7 @@ mod tests {
                 f<|>
             }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
         );
     }
 
@@ -83,7 +83,7 @@ mod tests {
                 f<|>
             }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
         );
     }
 
@@ -102,7 +102,7 @@ mod tests {
                 }
             }
             ",
-            "Foo STRUCT_DEF FileId(1) [52; 65) [59; 62)",
+            "Foo STRUCT_DEF FileId(1) 52..65 59..62",
         );
     }
 
@@ -114,7 +114,7 @@ mod tests {
             struct Foo;
             fn foo(<|>f: Foo) {}
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
         );
     }
 
@@ -130,7 +130,7 @@ mod tests {
                 bar.<|>0;
             }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
         );
     }
 }
diff --git a/crates/ra_ide/src/impls.rs b/crates/ra_ide/src/impls.rs
index 68529c8a5..ea2225f70 100644
--- a/crates/ra_ide/src/impls.rs
+++ b/crates/ra_ide/src/impls.rs
@@ -86,7 +86,7 @@ mod tests {
             struct Foo<|>;
             impl Foo {}
             ",
-            &["impl IMPL_DEF FileId(1) [12; 23)"],
+            &["impl IMPL_DEF FileId(1) 12..23"],
         );
     }
 
@@ -99,7 +99,7 @@ mod tests {
             impl Foo {}
             impl Foo {}
             ",
-            &["impl IMPL_DEF FileId(1) [12; 23)", "impl IMPL_DEF FileId(1) [24; 35)"],
+            &["impl IMPL_DEF FileId(1) 12..23", "impl IMPL_DEF FileId(1) 24..35"],
         );
     }
 
@@ -116,7 +116,7 @@ mod tests {
                 impl super::Foo {}
             }
             ",
-            &["impl IMPL_DEF FileId(1) [24; 42)", "impl IMPL_DEF FileId(1) [57; 75)"],
+            &["impl IMPL_DEF FileId(1) 24..42", "impl IMPL_DEF FileId(1) 57..75"],
         );
     }
 
@@ -133,7 +133,7 @@ mod tests {
             //- /b.rs
             impl crate::Foo {}
             ",
-            &["impl IMPL_DEF FileId(2) [0; 18)", "impl IMPL_DEF FileId(3) [0; 18)"],
+            &["impl IMPL_DEF FileId(2) 0..18", "impl IMPL_DEF FileId(3) 0..18"],
         );
     }
 
@@ -146,7 +146,7 @@ mod tests {
             struct Foo;
             impl T for Foo {}
             ",
-            &["impl IMPL_DEF FileId(1) [23; 40)"],
+            &["impl IMPL_DEF FileId(1) 23..40"],
         );
     }
 
@@ -164,7 +164,7 @@ mod tests {
             //- /b.rs
             impl crate::T for crate::Foo {}
             ",
-            &["impl IMPL_DEF FileId(2) [0; 31)", "impl IMPL_DEF FileId(3) [0; 31)"],
+            &["impl IMPL_DEF FileId(2) 0..31", "impl IMPL_DEF FileId(3) 0..31"],
         );
     }
 
@@ -180,9 +180,9 @@ mod tests {
             impl T for &Foo {}
             ",
             &[
-                "impl IMPL_DEF FileId(1) [23; 34)",
-                "impl IMPL_DEF FileId(1) [35; 52)",
-                "impl IMPL_DEF FileId(1) [53; 71)",
+                "impl IMPL_DEF FileId(1) 23..34",
+                "impl IMPL_DEF FileId(1) 35..52",
+                "impl IMPL_DEF FileId(1) 53..71",
             ],
         );
     }
@@ -195,7 +195,7 @@ mod tests {
             #[derive(Copy)]
             struct Foo<|>;
             ",
-            &["impl IMPL_DEF FileId(1) [0; 15)"],
+            &["impl IMPL_DEF FileId(1) 0..15"],
         );
     }
 }
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 0774fa0a1..98483df32 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -322,12 +322,12 @@ mod tests {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: true, type_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: [106; 107),
+                range: 106..107,
                 kind: ParameterHint,
                 label: "a",
             },
             InlayHint {
-                range: [109; 110),
+                range: 109..110,
                 kind: ParameterHint,
                 label: "b",
             },
@@ -358,7 +358,7 @@ mod tests {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ type_hints: true, parameter_hints: false, chaining_hints: false, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: [97; 99),
+                range: 97..99,
                 kind: TypeHint,
                 label: "i32",
             },
@@ -382,12 +382,12 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: [69; 71),
+                range: 69..71,
                 kind: TypeHint,
                 label: "Test<i32>",
             },
             InlayHint {
-                range: [105; 111),
+                range: 105..111,
                 kind: TypeHint,
                 label: "&Test<i32>",
             },
@@ -439,57 +439,57 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: [193; 197),
+                range: 193..197,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [236; 244),
+                range: 236..244,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [275; 279),
+                range: 275..279,
                 kind: TypeHint,
                 label: "&str",
             },
             InlayHint {
-                range: [539; 543),
+                range: 539..543,
                 kind: TypeHint,
                 label: "(i32, char)",
             },
             InlayHint {
-                range: [566; 567),
+                range: 566..567,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [570; 571),
+                range: 570..571,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [573; 574),
+                range: 573..574,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [577; 578),
+                range: 577..578,
                 kind: TypeHint,
                 label: "f64",
             },
             InlayHint {
-                range: [580; 581),
+                range: 580..581,
                 kind: TypeHint,
                 label: "f64",
             },
             InlayHint {
-                range: [584; 585),
+                range: 584..585,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [627; 628),
+                range: 627..628,
                 kind: TypeHint,
                 label: "i32",
             },
@@ -519,47 +519,47 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: [21; 30),
+                range: 21..30,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [57; 66),
+                range: 57..66,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [115; 123),
+                range: 115..123,
                 kind: TypeHint,
                 label: "|…| -> i32",
             },
             InlayHint {
-                range: [127; 128),
+                range: 127..128,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [130; 131),
+                range: 130..131,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [133; 134),
+                range: 133..134,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [136; 137),
+                range: 136..137,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [201; 213),
+                range: 201..213,
                 kind: TypeHint,
                 label: "&|…| -> i32",
             },
             InlayHint {
-                range: [236; 245),
+                range: 236..245,
                 kind: TypeHint,
                 label: "|| -> i32",
             },
@@ -583,12 +583,12 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: [21; 30),
+                range: 21..30,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [44; 53),
+                range: 44..53,
                 kind: TypeHint,
                 label: "i32",
             },
@@ -633,57 +633,57 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: [188; 192),
+                range: 188..192,
                 kind: TypeHint,
                 label: "CustomOption<Test>",
             },
             InlayHint {
-                range: [267; 271),
+                range: 267..271,
                 kind: TypeHint,
                 label: "&CustomOption<Test>",
             },
             InlayHint {
-                range: [300; 304),
+                range: 300..304,
                 kind: TypeHint,
                 label: "&Test",
             },
             InlayHint {
-                range: [341; 342),
+                range: 341..342,
                 kind: TypeHint,
                 label: "&CustomOption<u32>",
             },
             InlayHint {
-                range: [344; 345),
+                range: 344..345,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: [387; 388),
+                range: 387..388,
                 kind: TypeHint,
                 label: "&CustomOption<u32>",
             },
             InlayHint {
-                range: [393; 394),
+                range: 393..394,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: [441; 442),
+                range: 441..442,
                 kind: TypeHint,
                 label: "&u32",
             },
             InlayHint {
-                range: [448; 449),
+                range: 448..449,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: [500; 501),
+                range: 500..501,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: [543; 544),
+                range: 543..544,
                 kind: TypeHint,
                 label: "&u8",
             },
@@ -728,57 +728,57 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: [188; 192),
+                range: 188..192,
                 kind: TypeHint,
                 label: "CustomOption<Test>",
             },
             InlayHint {
-                range: [273; 277),
+                range: 273..277,
                 kind: TypeHint,
                 label: "&CustomOption<Test>",
             },
             InlayHint {
-                range: [309; 313),
+                range: 309..313,
                 kind: TypeHint,
                 label: "&Test",
             },
             InlayHint {
-                range: [353; 354),
+                range: 353..354,
                 kind: TypeHint,
                 label: "&CustomOption<u32>",
             },
             InlayHint {
-                range: [356; 357),
+                range: 356..357,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: [402; 403),
+                range: 402..403,
                 kind: TypeHint,
                 label: "&CustomOption<u32>",
             },
             InlayHint {
-                range: [408; 409),
+                range: 408..409,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: [459; 460),
+                range: 459..460,
                 kind: TypeHint,
                 label: "&u32",
             },
             InlayHint {
-                range: [466; 467),
+                range: 466..467,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: [521; 522),
+                range: 521..522,
                 kind: TypeHint,
                 label: "&u8",
             },
             InlayHint {
-                range: [567; 568),
+                range: 567..568,
                 kind: TypeHint,
                 label: "&u8",
             },
@@ -823,52 +823,52 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: [252; 256),
+                range: 252..256,
                 kind: TypeHint,
                 label: "CustomOption<Test>",
             },
             InlayHint {
-                range: [277; 281),
+                range: 277..281,
                 kind: TypeHint,
                 label: "Test",
             },
             InlayHint {
-                range: [310; 311),
+                range: 310..311,
                 kind: TypeHint,
                 label: "CustomOption<u32>",
             },
             InlayHint {
-                range: [313; 314),
+                range: 313..314,
                 kind: TypeHint,
                 label: "u8",
             },
             InlayHint {
-                range: [348; 349),
+                range: 348..349,
                 kind: TypeHint,
                 label: "CustomOption<u32>",
             },
             InlayHint {
-                range: [354; 355),
+                range: 354..355,
                 kind: TypeHint,
                 label: "u8",
             },
             InlayHint {
-                range: [394; 395),
+                range: 394..395,
                 kind: TypeHint,
                 label: "u32",
             },
             InlayHint {
-                range: [401; 402),
+                range: 401..402,
                 kind: TypeHint,
                 label: "u8",
             },
             InlayHint {
-                range: [445; 446),
+                range: 445..446,
                 kind: TypeHint,
                 label: "u8",
             },
             InlayHint {
-                range: [480; 481),
+                range: 480..481,
                 kind: TypeHint,
                 label: "u8",
             },
@@ -895,17 +895,17 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig { max_length: Some(8), ..Default::default() }).unwrap(), @r###"
         [
             InlayHint {
-                range: [74; 75),
+                range: 74..75,
                 kind: TypeHint,
                 label: "Smol<u32>",
             },
             InlayHint {
-                range: [98; 99),
+                range: 98..99,
                 kind: TypeHint,
                 label: "VeryLongOuterName<…>",
             },
             InlayHint {
-                range: [137; 138),
+                range: 137..138,
                 kind: TypeHint,
                 label: "Smol<Smol<…>>",
             },
@@ -983,77 +983,77 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig::default()).unwrap(), @r###"
         [
             InlayHint {
-                range: [798; 809),
+                range: 798..809,
                 kind: TypeHint,
                 label: "i32",
             },
             InlayHint {
-                range: [842; 843),
+                range: 842..843,
                 kind: ParameterHint,
                 label: "foo",
             },
             InlayHint {
-                range: [845; 846),
+                range: 845..846,
                 kind: ParameterHint,
                 label: "bar",
             },
             InlayHint {
-                range: [848; 855),
+                range: 848..855,
                 kind: ParameterHint,
                 label: "msg",
             },
             InlayHint {
-                range: [860; 871),
+                range: 860..871,
                 kind: ParameterHint,
                 label: "last",
             },
             InlayHint {
-                range: [914; 917),
+                range: 914..917,
                 kind: ParameterHint,
                 label: "param",
             },
             InlayHint {
-                range: [937; 939),
+                range: 937..939,
                 kind: ParameterHint,
                 label: "&self",
             },
             InlayHint {
-                range: [941; 945),
+                range: 941..945,
                 kind: ParameterHint,
                 label: "param",
             },
             InlayHint {
-                range: [980; 989),
+                range: 980..989,
                 kind: ParameterHint,
                 label: "file_id",
             },
             InlayHint {
-                range: [999; 1012),
+                range: 999..1012,
                 kind: ParameterHint,
                 label: "name",
             },
             InlayHint {
-                range: [1022; 1026),
+                range: 1022..1026,
                 kind: ParameterHint,
                 label: "focus_range",
             },
             InlayHint {
-                range: [1036; 1048),
+                range: 1036..1048,
                 kind: ParameterHint,
                 label: "full_range",
             },
             InlayHint {
-                range: [1058; 1071),
+                range: 1058..1071,
                 kind: ParameterHint,
                 label: "kind",
             },
             InlayHint {
-                range: [1081; 1085),
+                range: 1081..1085,
                 kind: ParameterHint,
                 label: "docs",
             },
             InlayHint {
-                range: [1095; 1099),
+                range: 1095..1099,
                 kind: ParameterHint,
                 label: "description",
             },
@@ -1184,12 +1184,12 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: [232; 269),
+                range: 232..269,
                 kind: ChainingHint,
                 label: "B",
             },
             InlayHint {
-                range: [232; 239),
+                range: 232..239,
                 kind: ChainingHint,
                 label: "A",
             },
@@ -1238,12 +1238,12 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: [252; 323),
+                range: 252..323,
                 kind: ChainingHint,
                 label: "C",
             },
             InlayHint {
-                range: [252; 300),
+                range: 252..300,
                 kind: ChainingHint,
                 label: "B",
             },
@@ -1276,12 +1276,12 @@ fn main() {
         assert_debug_snapshot!(analysis.inlay_hints(file_id, &InlayHintsConfig{ parameter_hints: false, type_hints: false, chaining_hints: true, max_length: None}).unwrap(), @r###"
         [
             InlayHint {
-                range: [403; 452),
+                range: 403..452,
                 kind: ChainingHint,
                 label: "B<X<i32, bool>>",
             },
             InlayHint {
-                range: [403; 422),
+                range: 403..422,
                 kind: ChainingHint,
                 label: "A<X<i32, bool>>",
             },
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index 040846ec3..fde0bfa98 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -170,7 +170,7 @@ mod tests {
 
     fn check_join_lines(before: &str, after: &str) {
         check_action(before, after, |file, offset| {
-            let range = TextRange::offset_len(offset, 0.into());
+            let range = TextRange::empty(offset);
             let res = join_lines(file, range);
             Some(res)
         })
diff --git a/crates/ra_ide/src/parent_module.rs b/crates/ra_ide/src/parent_module.rs
index 958b92bed..aaf4460df 100644
--- a/crates/ra_ide/src/parent_module.rs
+++ b/crates/ra_ide/src/parent_module.rs
@@ -76,7 +76,7 @@ mod tests {
             ",
         );
         let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
-        nav.assert_match("foo MODULE FileId(1) [0; 8)");
+        nav.assert_match("foo MODULE FileId(1) 0..8");
     }
 
     #[test]
@@ -95,7 +95,7 @@ mod tests {
             ",
         );
         let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
-        nav.assert_match("foo MODULE FileId(1) [0; 8)");
+        nav.assert_match("foo MODULE FileId(1) 0..8");
     }
 
     #[test]
@@ -111,7 +111,7 @@ mod tests {
             ",
         );
         let nav = analysis.parent_module(pos).unwrap().pop().unwrap();
-        nav.assert_match("baz MODULE FileId(1) [32; 44)");
+        nav.assert_match("baz MODULE FileId(1) 32..44");
     }
 
     #[test]
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index 7d0544ff4..a3970bf83 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -214,8 +214,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(1) [5; 39) [12; 15) Other",
-            &["FileId(1) [138; 141) StructLiteral"],
+            "Foo STRUCT_DEF FileId(1) 5..39 12..15 Other",
+            &["FileId(1) 138..141 StructLiteral"],
         );
     }
 
@@ -231,8 +231,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(1) [5; 18) [12; 15) Other",
-            &["FileId(1) [54; 57) Other", "FileId(1) [71; 74) StructLiteral"],
+            "Foo STRUCT_DEF FileId(1) 5..18 12..15 Other",
+            &["FileId(1) 54..57 Other", "FileId(1) 71..74 StructLiteral"],
         );
     }
 
@@ -248,8 +248,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(1) [5; 21) [12; 15) Other",
-            &["FileId(1) [81; 84) StructLiteral"],
+            "Foo STRUCT_DEF FileId(1) 5..21 12..15 Other",
+            &["FileId(1) 81..84 StructLiteral"],
         );
     }
 
@@ -266,8 +266,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(1) [5; 21) [12; 15) Other",
-            &["FileId(1) [71; 74) StructLiteral"],
+            "Foo STRUCT_DEF FileId(1) 5..21 12..15 Other",
+            &["FileId(1) 71..74 StructLiteral"],
         );
     }
 
@@ -289,12 +289,12 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "i BIND_PAT FileId(1) [33; 34) Other Write",
+            "i BIND_PAT FileId(1) 33..34 Other Write",
             &[
-                "FileId(1) [67; 68) Other Write",
-                "FileId(1) [71; 72) Other Read",
-                "FileId(1) [101; 102) Other Write",
-                "FileId(1) [127; 128) Other Write",
+                "FileId(1) 67..68 Other Write",
+                "FileId(1) 71..72 Other Read",
+                "FileId(1) 101..102 Other Write",
+                "FileId(1) 127..128 Other Write",
             ],
         );
     }
@@ -315,8 +315,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "spam BIND_PAT FileId(1) [44; 48) Other",
-            &["FileId(1) [71; 75) Other Read", "FileId(1) [78; 82) Other Read"],
+            "spam BIND_PAT FileId(1) 44..48 Other",
+            &["FileId(1) 71..75 Other Read", "FileId(1) 78..82 Other Read"],
         );
     }
 
@@ -328,11 +328,7 @@ mod tests {
     }"#;
 
         let refs = get_all_refs(code);
-        check_result(
-            refs,
-            "i BIND_PAT FileId(1) [12; 13) Other",
-            &["FileId(1) [38; 39) Other Read"],
-        );
+        check_result(refs, "i BIND_PAT FileId(1) 12..13 Other", &["FileId(1) 38..39 Other Read"]);
     }
 
     #[test]
@@ -343,11 +339,7 @@ mod tests {
     }"#;
 
         let refs = get_all_refs(code);
-        check_result(
-            refs,
-            "i BIND_PAT FileId(1) [12; 13) Other",
-            &["FileId(1) [38; 39) Other Read"],
-        );
+        check_result(refs, "i BIND_PAT FileId(1) 12..13 Other", &["FileId(1) 38..39 Other Read"]);
     }
 
     #[test]
@@ -366,8 +358,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "spam RECORD_FIELD_DEF FileId(1) [66; 79) [70; 74) Other",
-            &["FileId(1) [152; 156) Other Read"],
+            "spam RECORD_FIELD_DEF FileId(1) 66..79 70..74 Other",
+            &["FileId(1) 152..156 Other Read"],
         );
     }
 
@@ -382,7 +374,7 @@ mod tests {
         "#;
 
         let refs = get_all_refs(code);
-        check_result(refs, "f FN_DEF FileId(1) [88; 104) [91; 92) Other", &[]);
+        check_result(refs, "f FN_DEF FileId(1) 88..104 91..92 Other", &[]);
     }
 
     #[test]
@@ -397,7 +389,7 @@ mod tests {
         "#;
 
         let refs = get_all_refs(code);
-        check_result(refs, "B ENUM_VARIANT FileId(1) [83; 84) [83; 84) Other", &[]);
+        check_result(refs, "B ENUM_VARIANT FileId(1) 83..84 83..84 Other", &[]);
     }
 
     #[test]
@@ -438,8 +430,8 @@ mod tests {
         let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(2) [16; 50) [27; 30) Other",
-            &["FileId(1) [52; 55) StructLiteral", "FileId(3) [77; 80) StructLiteral"],
+            "Foo STRUCT_DEF FileId(2) 16..50 27..30 Other",
+            &["FileId(1) 52..55 StructLiteral", "FileId(3) 77..80 StructLiteral"],
         );
     }
 
@@ -466,11 +458,7 @@ mod tests {
 
         let (analysis, pos) = analysis_and_position(code);
         let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
-        check_result(
-            refs,
-            "foo SOURCE_FILE FileId(2) [0; 35) Other",
-            &["FileId(1) [13; 16) Other"],
-        );
+        check_result(refs, "foo SOURCE_FILE FileId(2) 0..35 Other", &["FileId(1) 13..16 Other"]);
     }
 
     #[test]
@@ -497,8 +485,8 @@ mod tests {
         let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
         check_result(
             refs,
-            "Foo STRUCT_DEF FileId(3) [0; 41) [18; 21) Other",
-            &["FileId(2) [20; 23) Other", "FileId(2) [46; 49) StructLiteral"],
+            "Foo STRUCT_DEF FileId(3) 0..41 18..21 Other",
+            &["FileId(2) 20..23 Other", "FileId(2) 46..49 StructLiteral"],
         );
     }
 
@@ -525,16 +513,16 @@ mod tests {
         let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
         check_result(
             refs,
-            "quux FN_DEF FileId(1) [18; 34) [25; 29) Other",
-            &["FileId(2) [16; 20) StructLiteral", "FileId(3) [16; 20) StructLiteral"],
+            "quux FN_DEF FileId(1) 18..34 25..29 Other",
+            &["FileId(2) 16..20 StructLiteral", "FileId(3) 16..20 StructLiteral"],
         );
 
         let refs =
             analysis.find_all_refs(pos, Some(SearchScope::single_file(bar))).unwrap().unwrap();
         check_result(
             refs,
-            "quux FN_DEF FileId(1) [18; 34) [25; 29) Other",
-            &["FileId(3) [16; 20) StructLiteral"],
+            "quux FN_DEF FileId(1) 18..34 25..29 Other",
+            &["FileId(3) 16..20 StructLiteral"],
         );
     }
 
@@ -552,8 +540,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "m1 MACRO_CALL FileId(1) [9; 63) [46; 48) Other",
-            &["FileId(1) [96; 98) StructLiteral", "FileId(1) [114; 116) StructLiteral"],
+            "m1 MACRO_CALL FileId(1) 9..63 46..48 Other",
+            &["FileId(1) 96..98 StructLiteral", "FileId(1) 114..116 StructLiteral"],
         );
     }
 
@@ -568,8 +556,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "i BIND_PAT FileId(1) [40; 41) Other Write",
-            &["FileId(1) [59; 60) Other Write", "FileId(1) [63; 64) Other Read"],
+            "i BIND_PAT FileId(1) 40..41 Other Write",
+            &["FileId(1) 59..60 Other Write", "FileId(1) 63..64 Other Read"],
         );
     }
 
@@ -588,8 +576,8 @@ mod tests {
         let refs = get_all_refs(code);
         check_result(
             refs,
-            "f RECORD_FIELD_DEF FileId(1) [32; 38) [32; 33) Other",
-            &["FileId(1) [96; 97) Other Read", "FileId(1) [117; 118) Other Write"],
+            "f RECORD_FIELD_DEF FileId(1) 32..38 32..33 Other",
+            &["FileId(1) 96..97 Other Read", "FileId(1) 117..118 Other Write"],
         );
     }
 
@@ -602,11 +590,7 @@ mod tests {
         }"#;
 
         let refs = get_all_refs(code);
-        check_result(
-            refs,
-            "i BIND_PAT FileId(1) [36; 37) Other",
-            &["FileId(1) [51; 52) Other Write"],
-        );
+        check_result(refs, "i BIND_PAT FileId(1) 36..37 Other", &["FileId(1) 51..52 Other Write"]);
     }
 
     fn get_all_refs(text: &str) -> ReferenceSearchResult {
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index 1c64b3eb9..a8f320e2f 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -54,10 +54,7 @@ fn source_edit_from_reference(reference: Reference, new_name: &str) -> SourceFil
         ReferenceKind::StructFieldShorthandForField => {
             replacement_text.push_str(new_name);
             replacement_text.push_str(": ");
-            TextRange::new(
-                reference.file_range.range.start(),
-                reference.file_range.range.start(),
-            )
+            TextRange::new(reference.file_range.range.start(), reference.file_range.range.start())
         }
         ReferenceKind::StructFieldShorthandForLocal => {
             replacement_text.push_str(": ");
@@ -528,7 +525,7 @@ mod tests {
 @r###"
         Some(
             RangeInfo {
-                range: [4; 7),
+                range: 4..7,
                 info: SourceChange {
                     label: "rename",
                     source_file_edits: [
@@ -539,7 +536,7 @@ mod tests {
                             edit: TextEdit {
                                 atoms: [
                                     AtomTextEdit {
-                                        delete: [4; 7),
+                                        delete: 4..7,
                                         insert: "foo2",
                                     },
                                 ],
@@ -580,7 +577,7 @@ mod tests {
         @r###"
         Some(
             RangeInfo {
-                range: [4; 7),
+                range: 4..7,
                 info: SourceChange {
                     label: "rename",
                     source_file_edits: [
@@ -591,7 +588,7 @@ mod tests {
                             edit: TextEdit {
                                 atoms: [
                                     AtomTextEdit {
-                                        delete: [4; 7),
+                                        delete: 4..7,
                                         insert: "foo2",
                                     },
                                 ],
@@ -663,7 +660,7 @@ mod tests {
 @r###"
         Some(
             RangeInfo {
-                range: [8; 11),
+                range: 8..11,
                 info: SourceChange {
                     label: "rename",
                     source_file_edits: [
@@ -674,7 +671,7 @@ mod tests {
                             edit: TextEdit {
                                 atoms: [
                                     AtomTextEdit {
-                                        delete: [8; 11),
+                                        delete: 8..11,
                                         insert: "foo2",
                                     },
                                 ],
@@ -687,7 +684,7 @@ mod tests {
                             edit: TextEdit {
                                 atoms: [
                                     AtomTextEdit {
-                                        delete: [27; 30),
+                                        delete: 27..30,
                                         insert: "foo2",
                                     },
                                 ],
diff --git a/crates/ra_ide/src/runnables.rs b/crates/ra_ide/src/runnables.rs
index 05a66e03c..38637c19c 100644
--- a/crates/ra_ide/src/runnables.rs
+++ b/crates/ra_ide/src/runnables.rs
@@ -164,11 +164,11 @@ mod tests {
         @r###"
         [
             Runnable {
-                range: [1; 21),
+                range: 1..21,
                 kind: Bin,
             },
             Runnable {
-                range: [22; 46),
+                range: 22..46,
                 kind: Test {
                     test_id: Path(
                         "test_foo",
@@ -179,7 +179,7 @@ mod tests {
                 },
             },
             Runnable {
-                range: [47; 81),
+                range: 47..81,
                 kind: Test {
                     test_id: Path(
                         "test_foo",
@@ -211,13 +211,13 @@ mod tests {
         @r###"
         [
             Runnable {
-                range: [1; 59),
+                range: 1..59,
                 kind: TestMod {
                     path: "test_mod",
                 },
             },
             Runnable {
-                range: [28; 57),
+                range: 28..57,
                 kind: Test {
                     test_id: Path(
                         "test_mod::test_foo1",
@@ -251,13 +251,13 @@ mod tests {
         @r###"
         [
             Runnable {
-                range: [23; 85),
+                range: 23..85,
                 kind: TestMod {
                     path: "foo::test_mod",
                 },
             },
             Runnable {
-                range: [46; 79),
+                range: 46..79,
                 kind: Test {
                     test_id: Path(
                         "foo::test_mod::test_foo1",
@@ -293,13 +293,13 @@ mod tests {
         @r###"
         [
             Runnable {
-                range: [41; 115),
+                range: 41..115,
                 kind: TestMod {
                     path: "foo::bar::test_mod",
                 },
             },
             Runnable {
-                range: [68; 105),
+                range: 68..105,
                 kind: Test {
                     test_id: Path(
                         "foo::bar::test_mod::test_foo1",
diff --git a/crates/ra_ide/src/syntax_highlighting/tests.rs b/crates/ra_ide/src/syntax_highlighting/tests.rs
index a9aae957f..d2926ba78 100644
--- a/crates/ra_ide/src/syntax_highlighting/tests.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tests.rs
@@ -126,7 +126,7 @@ fn test_ranges() {
 
     // The "x"
     let highlights = &analysis
-        .highlight_range(FileRange { file_id, range: TextRange::offset_len(82.into(), 1.into()) })
+        .highlight_range(FileRange { file_id, range: TextRange::at(82.into(), 1.into()) })
         .unwrap();
 
     assert_eq!(&highlights[0].highlight.to_string(), "field.declaration");
diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs
index a8a97a69f..bf97f8c56 100644
--- a/crates/ra_ide/src/syntax_tree.rs
+++ b/crates/ra_ide/src/syntax_tree.rs
@@ -66,11 +66,8 @@ fn syntax_tree_for_token(node: &SyntaxToken, text_range: TextRange) -> Option<St
     let len = len.min(node_len);
 
     // Ensure our slice is inside the actual string
-    let end = if start + len < TextSize::of(&text) {
-        start + len
-    } else {
-        TextSize::of(&text) - start
-    };
+    let end =
+        if start + len < TextSize::of(&text) { start + len } else { TextSize::of(&text) - start };
 
     let text = &text[TextRange::new(start, end)];
 
@@ -112,20 +109,20 @@ mod tests {
         assert_eq_text!(
             syn.trim(),
             r#"
-SOURCE_FILE@[0; 11)
-  FN_DEF@[0; 11)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    PARAM_LIST@[6; 8)
-      L_PAREN@[6; 7) "("
-      R_PAREN@[7; 8) ")"
-    WHITESPACE@[8; 9) " "
-    BLOCK_EXPR@[9; 11)
-      BLOCK@[9; 11)
-        L_CURLY@[9; 10) "{"
-        R_CURLY@[10; 11) "}"
+SOURCE_FILE@0..11
+  FN_DEF@0..11
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    PARAM_LIST@6..8
+      L_PAREN@6..7 "("
+      R_PAREN@7..8 ")"
+    WHITESPACE@8..9 " "
+    BLOCK_EXPR@9..11
+      BLOCK@9..11
+        L_CURLY@9..10 "{"
+        R_CURLY@10..11 "}"
 "#
             .trim()
         );
@@ -145,37 +142,37 @@ fn test() {
         assert_eq_text!(
             syn.trim(),
             r#"
-SOURCE_FILE@[0; 60)
-  FN_DEF@[0; 60)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 7)
-      IDENT@[3; 7) "test"
-    PARAM_LIST@[7; 9)
-      L_PAREN@[7; 8) "("
-      R_PAREN@[8; 9) ")"
-    WHITESPACE@[9; 10) " "
-    BLOCK_EXPR@[10; 60)
-      BLOCK@[10; 60)
-        L_CURLY@[10; 11) "{"
-        WHITESPACE@[11; 16) "\n    "
-        EXPR_STMT@[16; 58)
-          MACRO_CALL@[16; 57)
-            PATH@[16; 22)
-              PATH_SEGMENT@[16; 22)
-                NAME_REF@[16; 22)
-                  IDENT@[16; 22) "assert"
-            BANG@[22; 23) "!"
-            TOKEN_TREE@[23; 57)
-              L_PAREN@[23; 24) "("
-              STRING@[24; 52) "\"\n    fn foo() {\n     ..."
-              COMMA@[52; 53) ","
-              WHITESPACE@[53; 54) " "
-              STRING@[54; 56) "\"\""
-              R_PAREN@[56; 57) ")"
-          SEMICOLON@[57; 58) ";"
-        WHITESPACE@[58; 59) "\n"
-        R_CURLY@[59; 60) "}"
+SOURCE_FILE@0..60
+  FN_DEF@0..60
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..7
+      IDENT@3..7 "test"
+    PARAM_LIST@7..9
+      L_PAREN@7..8 "("
+      R_PAREN@8..9 ")"
+    WHITESPACE@9..10 " "
+    BLOCK_EXPR@10..60
+      BLOCK@10..60
+        L_CURLY@10..11 "{"
+        WHITESPACE@11..16 "\n    "
+        EXPR_STMT@16..58
+          MACRO_CALL@16..57
+            PATH@16..22
+              PATH_SEGMENT@16..22
+                NAME_REF@16..22
+                  IDENT@16..22 "assert"
+            BANG@22..23 "!"
+            TOKEN_TREE@23..57
+              L_PAREN@23..24 "("
+              STRING@24..52 "\"\n    fn foo() {\n     ..."
+              COMMA@52..53 ","
+              WHITESPACE@53..54 " "
+              STRING@54..56 "\"\""
+              R_PAREN@56..57 ")"
+          SEMICOLON@57..58 ";"
+        WHITESPACE@58..59 "\n"
+        R_CURLY@59..60 "}"
 "#
             .trim()
         );
@@ -189,19 +186,19 @@ SOURCE_FILE@[0; 60)
         assert_eq_text!(
             syn.trim(),
             r#"
-FN_DEF@[0; 11)
-  FN_KW@[0; 2) "fn"
-  WHITESPACE@[2; 3) " "
-  NAME@[3; 6)
-    IDENT@[3; 6) "foo"
-  PARAM_LIST@[6; 8)
-    L_PAREN@[6; 7) "("
-    R_PAREN@[7; 8) ")"
-  WHITESPACE@[8; 9) " "
-  BLOCK_EXPR@[9; 11)
-    BLOCK@[9; 11)
-      L_CURLY@[9; 10) "{"
-      R_CURLY@[10; 11) "}"
+FN_DEF@0..11
+  FN_KW@0..2 "fn"
+  WHITESPACE@2..3 " "
+  NAME@3..6
+    IDENT@3..6 "foo"
+  PARAM_LIST@6..8
+    L_PAREN@6..7 "("
+    R_PAREN@7..8 ")"
+  WHITESPACE@8..9 " "
+  BLOCK_EXPR@9..11
+    BLOCK@9..11
+      L_CURLY@9..10 "{"
+      R_CURLY@10..11 "}"
 "#
             .trim()
         );
@@ -220,21 +217,21 @@ FN_DEF@[0; 11)
         assert_eq_text!(
             syn.trim(),
             r#"
-EXPR_STMT@[16; 58)
-  MACRO_CALL@[16; 57)
-    PATH@[16; 22)
-      PATH_SEGMENT@[16; 22)
-        NAME_REF@[16; 22)
-          IDENT@[16; 22) "assert"
-    BANG@[22; 23) "!"
-    TOKEN_TREE@[23; 57)
-      L_PAREN@[23; 24) "("
-      STRING@[24; 52) "\"\n    fn foo() {\n     ..."
-      COMMA@[52; 53) ","
-      WHITESPACE@[53; 54) " "
-      STRING@[54; 56) "\"\""
-      R_PAREN@[56; 57) ")"
-  SEMICOLON@[57; 58) ";"
+EXPR_STMT@16..58
+  MACRO_CALL@16..57
+    PATH@16..22
+      PATH_SEGMENT@16..22
+        NAME_REF@16..22
+          IDENT@16..22 "assert"
+    BANG@22..23 "!"
+    TOKEN_TREE@23..57
+      L_PAREN@23..24 "("
+      STRING@24..52 "\"\n    fn foo() {\n     ..."
+      COMMA@52..53 ","
+      WHITESPACE@53..54 " "
+      STRING@54..56 "\"\""
+      R_PAREN@56..57 ")"
+  SEMICOLON@57..58 ";"
 "#
             .trim()
         );
@@ -257,21 +254,21 @@ fn bar() {
         assert_eq_text!(
             syn.trim(),
             r#"
-SOURCE_FILE@[0; 12)
-  FN_DEF@[0; 12)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    PARAM_LIST@[6; 8)
-      L_PAREN@[6; 7) "("
-      R_PAREN@[7; 8) ")"
-    WHITESPACE@[8; 9) " "
-    BLOCK_EXPR@[9; 12)
-      BLOCK@[9; 12)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 11) "\n"
-        R_CURLY@[11; 12) "}"
+SOURCE_FILE@0..12
+  FN_DEF@0..12
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    PARAM_LIST@6..8
+      L_PAREN@6..7 "("
+      R_PAREN@7..8 ")"
+    WHITESPACE@8..9 " "
+    BLOCK_EXPR@9..12
+      BLOCK@9..12
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..11 "\n"
+        R_CURLY@11..12 "}"
 "#
             .trim()
         );
@@ -292,21 +289,21 @@ fn bar() {
         assert_eq_text!(
             syn.trim(),
             r#"
-SOURCE_FILE@[0; 12)
-  FN_DEF@[0; 12)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    PARAM_LIST@[6; 8)
-      L_PAREN@[6; 7) "("
-      R_PAREN@[7; 8) ")"
-    WHITESPACE@[8; 9) " "
-    BLOCK_EXPR@[9; 12)
-      BLOCK@[9; 12)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 11) "\n"
-        R_CURLY@[11; 12) "}"
+SOURCE_FILE@0..12
+  FN_DEF@0..12
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    PARAM_LIST@6..8
+      L_PAREN@6..7 "("
+      R_PAREN@7..8 ")"
+    WHITESPACE@8..9 " "
+    BLOCK_EXPR@9..12
+      BLOCK@9..12
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..11 "\n"
+        R_CURLY@11..12 "}"
 "#
             .trim()
         );
@@ -326,36 +323,36 @@ fn bar() {
         assert_eq_text!(
             syn.trim(),
             r#"
-SOURCE_FILE@[0; 25)
-  FN_DEF@[0; 12)
-    FN_KW@[0; 2) "fn"
-    WHITESPACE@[2; 3) " "
-    NAME@[3; 6)
-      IDENT@[3; 6) "foo"
-    PARAM_LIST@[6; 8)
-      L_PAREN@[6; 7) "("
-      R_PAREN@[7; 8) ")"
-    WHITESPACE@[8; 9) " "
-    BLOCK_EXPR@[9; 12)
-      BLOCK@[9; 12)
-        L_CURLY@[9; 10) "{"
-        WHITESPACE@[10; 11) "\n"
-        R_CURLY@[11; 12) "}"
-  WHITESPACE@[12; 13) "\n"
-  FN_DEF@[13; 25)
-    FN_KW@[13; 15) "fn"
-    WHITESPACE@[15; 16) " "
-    NAME@[16; 19)
-      IDENT@[16; 19) "bar"
-    PARAM_LIST@[19; 21)
-      L_PAREN@[19; 20) "("
-      R_PAREN@[20; 21) ")"
-    WHITESPACE@[21; 22) " "
-    BLOCK_EXPR@[22; 25)
-      BLOCK@[22; 25)
-        L_CURLY@[22; 23) "{"
-        WHITESPACE@[23; 24) "\n"
-        R_CURLY@[24; 25) "}"
+SOURCE_FILE@0..25
+  FN_DEF@0..12
+    FN_KW@0..2 "fn"
+    WHITESPACE@2..3 " "
+    NAME@3..6
+      IDENT@3..6 "foo"
+    PARAM_LIST@6..8
+      L_PAREN@6..7 "("
+      R_PAREN@7..8 ")"
+    WHITESPACE@8..9 " "
+    BLOCK_EXPR@9..12
+      BLOCK@9..12
+        L_CURLY@9..10 "{"
+        WHITESPACE@10..11 "\n"
+        R_CURLY@11..12 "}"
+  WHITESPACE@12..13 "\n"
+  FN_DEF@13..25
+    FN_KW@13..15 "fn"
+    WHITESPACE@15..16 " "
+    NAME@16..19
+      IDENT@16..19 "bar"
+    PARAM_LIST@19..21
+      L_PAREN@19..20 "("
+      R_PAREN@20..21 ")"
+    WHITESPACE@21..22 " "
+    BLOCK_EXPR@22..25
+      BLOCK@22..25
+        L_CURLY@22..23 "{"
+        WHITESPACE@23..24 "\n"
+        R_CURLY@24..25 "}"
 "#
             .trim()
         );
diff --git a/crates/ra_ide/src/typing.rs b/crates/ra_ide/src/typing.rs
index 98af79dff..2a8b4327f 100644
--- a/crates/ra_ide/src/typing.rs
+++ b/crates/ra_ide/src/typing.rs
@@ -109,13 +109,8 @@ fn on_dot_typed(file: &SourceFile, offset: TextSize) -> Option<SingleFileChange>
 
     Some(SingleFileChange {
         label: "reindent dot".to_string(),
-        edit: TextEdit::replace(
-            TextRange::new(offset - current_indent_len, offset),
-            target_indent,
-        ),
-        cursor_position: Some(
-            offset + target_indent_len - current_indent_len + TextSize::of('.'),
-        ),
+        edit: TextEdit::replace(TextRange::new(offset - current_indent_len, offset), target_indent),
+        cursor_position: Some(offset + target_indent_len - current_indent_len + TextSize::of('.')),
     })
 }