Merge #4131

4131: Switch to text-size r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

Cargo.lock

@@ -1180,7 +1180,7 @@ dependencies = [
 name = "ra_text_edit"
 version = "0.1.0"
 dependencies = [
- "text_unit",
+ "text-size",
 ]
 
 [[package]]
@@ -1322,13 +1322,13 @@ dependencies = [
 
 [[package]]
 name = "rowan"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea7cadf87a9d8432e85cb4eb86bd2e765ace60c24ef86e79084dcae5d1c5a19"
+checksum = "1e081ed6eacce09e243b619ab90f069c27b0cff8a6d0eb8ad2ec935b65853798"
 dependencies = [
  "rustc-hash",
  "smol_str",
- "text_unit",
+ "text-size",
  "thin-dst",
 ]
 
@@ -1620,14 +1620,14 @@ version = "0.1.0"
 dependencies = [
  "difference",
  "serde_json",
- "text_unit",
+ "text-size",
 ]
 
 [[package]]
-name = "text_unit"
-version = "0.1.10"
+name = "text-size"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20431e104bfecc1a40872578dbc390e10290a0e9c35fffe3ce6f73c15a9dbfc2"
+checksum = "f03e7efdedc3bc78cb2337f1e2785c39e45f5ef762d9e4ebb137fff7380a6d8a"
 
 [[package]]
 name = "thin-dst"

crates/ra_assists/src/assist_ctx.rs

@@ -5,7 +5,7 @@
 use ra_ide_db::RootDatabase;
 use ra_syntax::{
     algo::{self, find_covering_element, find_node_at_offset},
-    AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextUnit,
+    AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize,
     TokenAtOffset,
 };
 use ra_text_edit::TextEditBuilder;
@@ -178,7 +178,7 @@ pub(crate) fn finish(self) -> Option<Assist> {
 #[derive(Default)]
 pub(crate) struct ActionBuilder {
     edit: TextEditBuilder,
-    cursor_position: Option<TextUnit>,
+    cursor_position: Option<TextSize>,
     target: Option<TextRange>,
     file: AssistFile,
 }
@@ -211,12 +211,12 @@ pub(crate) fn delete(&mut self, range: TextRange) {
     }
 
     /// Append specified `text` at the given `offset`
-    pub(crate) fn insert(&mut self, offset: TextUnit, text: impl Into<String>) {
+    pub(crate) fn insert(&mut self, offset: TextSize, text: impl Into<String>) {
         self.edit.insert(offset, text.into())
     }
 
     /// Specify desired position of the cursor after the assist is applied.
-    pub(crate) fn set_cursor(&mut self, offset: TextUnit) {
+    pub(crate) fn set_cursor(&mut self, offset: TextSize) {
         self.cursor_position = Some(offset)
     }
 

crates/ra_assists/src/handlers/add_custom_impl.rs

@@ -2,7 +2,7 @@
     ast::{self, AstNode},
     Direction, SmolStr,
     SyntaxKind::{IDENT, WHITESPACE},
-    TextRange, TextUnit,
+    TextRange, TextSize,
 };
 use stdx::SepBy;
 
@@ -60,7 +60,6 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
             .collect::<Vec<SmolStr>>();
         let has_more_derives = !new_attr_input.is_empty();
         let new_attr_input = new_attr_input.iter().sep_by(", ").surround_with("(", ")").to_string();
-        let new_attr_input_len = new_attr_input.len();
 
         let mut buf = String::new();
         buf.push_str("\n\nimpl ");
@@ -70,8 +69,9 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
         buf.push_str(" {\n");
 
         let cursor_delta = if has_more_derives {
+            let delta = input.syntax().text_range().len() - TextSize::of(&new_attr_input);
             edit.replace(input.syntax().text_range(), new_attr_input);
-            input.syntax().text_range().len() - TextUnit::from_usize(new_attr_input_len)
+            delta
         } else {
             let attr_range = attr.syntax().text_range();
             edit.delete(attr_range);
@@ -81,13 +81,13 @@ pub(crate) fn add_custom_impl(ctx: AssistCtx) -> Option<Assist> {
                 .next_sibling_or_token()
                 .filter(|t| t.kind() == WHITESPACE)
                 .map(|t| t.text_range())
-                .unwrap_or_else(|| TextRange::from_to(TextUnit::from(0), TextUnit::from(0)));
+                .unwrap_or_else(|| TextRange::new(TextSize::from(0), TextSize::from(0)));
             edit.delete(line_break_range);
 
             attr_range.len() + line_break_range.len()
         };
 
-        edit.set_cursor(start_offset + TextUnit::of_str(&buf) - cursor_delta);
+        edit.set_cursor(start_offset + TextSize::of(&buf) - cursor_delta);
         buf.push_str("\n}");
         edit.insert(start_offset, buf);
     })

crates/ra_assists/src/handlers/add_derive.rs

@@ -1,7 +1,7 @@
 use ra_syntax::{
     ast::{self, AstNode, AttrsOwner},
     SyntaxKind::{COMMENT, WHITESPACE},
-    TextUnit,
+    TextSize,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -37,9 +37,9 @@ pub(crate) fn add_derive(ctx: AssistCtx) -> Option<Assist> {
         let offset = match derive_attr {
             None => {
                 edit.insert(node_start, "#[derive()]\n");
-                node_start + TextUnit::of_str("#[derive(")
+                node_start + TextSize::of("#[derive(")
             }
-            Some(tt) => tt.syntax().text_range().end() - TextUnit::of_char(')'),
+            Some(tt) => tt.syntax().text_range().end() - TextSize::of(')'),
         };
         edit.target(nominal.syntax().text_range());
         edit.set_cursor(offset)
@@ -47,7 +47,7 @@ pub(crate) fn add_derive(ctx: AssistCtx) -> Option<Assist> {
 }
 
 // Insert `derive` after doc comments.
-fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option<TextUnit> {
+fn derive_insertion_offset(nominal: &ast::NominalDef) -> Option<TextSize> {
     let non_ws_child = nominal
         .syntax()
         .children_with_tokens()

crates/ra_assists/src/handlers/add_explicit_type.rs

@@ -37,8 +37,8 @@ pub(crate) fn add_explicit_type(ctx: AssistCtx) -> Option<Assist> {
     let stmt_range = stmt.syntax().text_range();
     let eq_range = stmt.eq_token()?.text_range();
     // Assist should only be applicable if cursor is between 'let' and '='
-    let let_range = TextRange::from_to(stmt_range.start(), eq_range.start());
-    let cursor_in_range = ctx.frange.range.is_subrange(&let_range);
+    let let_range = TextRange::new(stmt_range.start(), eq_range.start());
+    let cursor_in_range = let_range.contains_range(ctx.frange.range);
     if !cursor_in_range {
         return None;
     }

crates/ra_assists/src/handlers/add_from_impl_for_enum.rs

@@ -1,6 +1,6 @@
 use ra_syntax::{
     ast::{self, AstNode, NameOwner},
-    TextUnit,
+    TextSize,
 };
 use stdx::format_to;
 
@@ -65,7 +65,7 @@ fn from(v: {0}) -> Self {{
                 variant_name
             );
             edit.insert(start_offset, buf);
-            edit.set_cursor(start_offset + TextUnit::of_str("\n\n"));
+            edit.set_cursor(start_offset + TextSize::of("\n\n"));
         },
     )
 }

crates/ra_assists/src/handlers/add_function.rs

@@ -1,6 +1,6 @@
 use ra_syntax::{
     ast::{self, AstNode},
-    SyntaxKind, SyntaxNode, TextUnit,
+    SyntaxKind, SyntaxNode, TextSize,
 };
 
 use crate::{Assist, AssistCtx, AssistFile, AssistId};
@@ -69,8 +69,8 @@ pub(crate) fn add_function(ctx: AssistCtx) -> Option<Assist> {
 }
 
 struct FunctionTemplate {
-    insert_offset: TextUnit,
-    cursor_offset: TextUnit,
+    insert_offset: TextSize,
+    cursor_offset: TextSize,
     fn_def: ast::SourceFile,
     file: AssistFile,
 }
@@ -129,7 +129,7 @@ fn render(self) -> Option<FunctionTemplate> {
                 let fn_def = indent_once.increase_indent(fn_def);
                 let fn_def = ast::make::add_trailing_newlines(1, fn_def);
                 let fn_def = indent.increase_indent(fn_def);
-                (fn_def, it.syntax().text_range().start() + TextUnit::from_usize(1))
+                (fn_def, it.syntax().text_range().start() + TextSize::of('{'))
             }
         };
 

crates/ra_assists/src/handlers/add_impl.rs

@@ -1,6 +1,6 @@
 use ra_syntax::{
     ast::{self, AstNode, NameOwner, TypeParamsOwner},
-    TextUnit,
+    TextSize,
 };
 use stdx::{format_to, SepBy};
 
@@ -51,7 +51,7 @@ pub(crate) fn add_impl(ctx: AssistCtx) -> Option<Assist> {
             format_to!(buf, "<{}>", generic_params)
         }
         buf.push_str(" {\n");
-        edit.set_cursor(start_offset + TextUnit::of_str(&buf));
+        edit.set_cursor(start_offset + TextSize::of(&buf));
         buf.push_str("\n}");
         edit.insert(start_offset, buf);
     })

crates/ra_assists/src/handlers/add_new.rs

@@ -3,7 +3,7 @@
     ast::{
         self, AstNode, NameOwner, StructKind, TypeAscriptionOwner, TypeParamsOwner, VisibilityOwner,
     },
-    TextUnit, T,
+    TextSize, T,
 };
 use stdx::{format_to, SepBy};
 
@@ -77,16 +77,16 @@ pub(crate) fn add_new(ctx: AssistCtx) -> Option<Assist> {
                     .text_range()
                     .end();
 
-                Some((start, TextUnit::from_usize(1)))
+                Some((start, TextSize::of("\n")))
             })
             .unwrap_or_else(|| {
                 buf = generate_impl_text(&strukt, &buf);
                 let start = strukt.syntax().text_range().end();
 
-                (start, TextUnit::from_usize(3))
+                (start, TextSize::of("\n}\n"))
             });
 
-        edit.set_cursor(start_offset + TextUnit::of_str(&buf) - end_offset);
+        edit.set_cursor(start_offset + TextSize::of(&buf) - end_offset);
         edit.insert(start_offset, buf);
     })
 }

crates/ra_assists/src/handlers/apply_demorgan.rs

@@ -26,7 +26,7 @@ pub(crate) fn apply_demorgan(ctx: AssistCtx) -> Option<Assist> {
     let op = expr.op_kind()?;
     let op_range = expr.op_token()?.text_range();
     let opposite_op = opposite_logic_op(op)?;
-    let cursor_in_range = ctx.frange.range.is_subrange(&op_range);
+    let cursor_in_range = op_range.contains_range(ctx.frange.range);
     if !cursor_in_range {
         return None;
     }

crates/ra_assists/src/handlers/change_visibility.rs

@@ -5,7 +5,7 @@
         ATTR, COMMENT, CONST_DEF, ENUM_DEF, FN_DEF, MODULE, STRUCT_DEF, TRAIT_DEF, VISIBILITY,
         WHITESPACE,
     },
-    SyntaxNode, TextUnit, T,
+    SyntaxNode, TextSize, T,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -67,7 +67,7 @@ fn add_vis(ctx: AssistCtx) -> Option<Assist> {
     })
 }
 
-fn vis_offset(node: &SyntaxNode) -> TextUnit {
+fn vis_offset(node: &SyntaxNode) -> TextSize {
     node.children_with_tokens()
         .skip_while(|it| match it.kind() {
             WHITESPACE | COMMENT | ATTR => true,

crates/ra_assists/src/handlers/flip_binexpr.rs

@@ -23,7 +23,7 @@ pub(crate) fn flip_binexpr(ctx: AssistCtx) -> Option<Assist> {
     let rhs = expr.rhs()?.syntax().clone();
     let op_range = expr.op_token()?.text_range();
     // The assist should be applied only if the cursor is on the operator
-    let cursor_in_range = ctx.frange.range.is_subrange(&op_range);
+    let cursor_in_range = op_range.contains_range(ctx.frange.range);
     if !cursor_in_range {
         return None;
     }

crates/ra_assists/src/handlers/inline_local_variable.rs

@@ -52,7 +52,7 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option<Assist> {
         .next_sibling_or_token()
         .and_then(|it| ast::Whitespace::cast(it.as_token()?.clone()))
     {
-        TextRange::from_to(
+        TextRange::new(
             let_stmt.syntax().text_range().start(),
             whitespace.syntax().text_range().end(),
         )

crates/ra_assists/src/handlers/introduce_variable.rs

@@ -4,7 +4,7 @@
         BLOCK_EXPR, BREAK_EXPR, COMMENT, LAMBDA_EXPR, LOOP_EXPR, MATCH_ARM, PATH_EXPR, RETURN_EXPR,
         WHITESPACE,
     },
-    SyntaxNode, TextUnit,
+    SyntaxNode, TextSize,
 };
 use stdx::format_to;
 use test_utils::tested_by;
@@ -47,10 +47,10 @@ pub(crate) fn introduce_variable(ctx: AssistCtx) -> Option<Assist> {
 
         let cursor_offset = if wrap_in_block {
             buf.push_str("{ let var_name = ");
-            TextUnit::of_str("{ let ")
+            TextSize::of("{ let ")
         } else {
             buf.push_str("let var_name = ");
-            TextUnit::of_str("let ")
+            TextSize::of("let ")
         };
         format_to!(buf, "{}", expr.syntax());
         let full_stmt = ast::ExprStmt::cast(anchor_stmt.clone());

crates/ra_assists/src/handlers/invert_if.rs

@@ -28,7 +28,7 @@ pub(crate) fn invert_if(ctx: AssistCtx) -> Option<Assist> {
     let if_keyword = ctx.find_token_at_offset(T![if])?;
     let expr = ast::IfExpr::cast(if_keyword.parent())?;
     let if_range = if_keyword.text_range();
-    let cursor_in_range = ctx.frange.range.is_subrange(&if_range);
+    let cursor_in_range = if_range.contains_range(ctx.frange.range);
     if !cursor_in_range {
         return None;
     }

crates/ra_assists/src/handlers/merge_match_arms.rs

@@ -3,7 +3,7 @@
 use ra_syntax::{
     algo::neighbor,
     ast::{self, AstNode},
-    Direction, TextUnit,
+    Direction, TextSize,
 };
 
 use crate::{Assist, AssistCtx, AssistId, TextRange};
@@ -42,8 +42,8 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx) -> Option<Assist> {
     let current_text_range = current_arm.syntax().text_range();
 
     enum CursorPos {
-        InExpr(TextUnit),
-        InPat(TextUnit),
+        InExpr(TextSize),
+        InPat(TextSize),
     }
     let cursor_pos = ctx.frange.range.start();
     let cursor_pos = if current_expr.syntax().text_range().contains(cursor_pos) {
@@ -89,10 +89,10 @@ enum CursorPos {
 
         edit.target(current_text_range);
         edit.set_cursor(match cursor_pos {
-            CursorPos::InExpr(back_offset) => start + TextUnit::from_usize(arm.len()) - back_offset,
+            CursorPos::InExpr(back_offset) => start + TextSize::of(&arm) - back_offset,
             CursorPos::InPat(offset) => offset,
         });
-        edit.replace(TextRange::from_to(start, end), arm);
+        edit.replace(TextRange::new(start, end), arm);
     })
 }
 

crates/ra_assists/src/handlers/move_guard.rs

@@ -1,7 +1,7 @@
 use ra_syntax::{
     ast,
     ast::{AstNode, AstToken, IfExpr, MatchArm},
-    TextUnit,
+    TextSize,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -49,16 +49,16 @@ pub(crate) fn move_guard_to_arm_body(ctx: AssistCtx) -> Option<Assist> {
                     edit.delete(ele);
                     ele.len()
                 } else {
-                    TextUnit::from(0)
+                    TextSize::from(0)
                 }
             }
-            _ => TextUnit::from(0),
+            _ => TextSize::from(0),
         };
 
         edit.delete(guard.syntax().text_range());
         edit.replace_node_and_indent(arm_expr.syntax(), buf);
         edit.set_cursor(
-            arm_expr.syntax().text_range().start() + TextUnit::from(3) - offseting_amount,
+            arm_expr.syntax().text_range().start() + TextSize::from(3) - offseting_amount,
         );
     })
 }
@@ -123,7 +123,7 @@ pub(crate) fn move_arm_cond_to_match_guard(ctx: AssistCtx) -> Option<Assist> {
             }
 
             edit.insert(match_pat.syntax().text_range().end(), buf);
-            edit.set_cursor(match_pat.syntax().text_range().end() + TextUnit::from(1));
+            edit.set_cursor(match_pat.syntax().text_range().end() + TextSize::from(1));
         },
     )
 }

crates/ra_assists/src/handlers/raw_string.rs

@@ -2,7 +2,7 @@
     ast::{self, HasStringValue},
     AstToken,
     SyntaxKind::{RAW_STRING, STRING},
-    TextUnit,
+    TextSize,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -81,7 +81,7 @@ pub(crate) fn add_hash(ctx: AssistCtx) -> Option<Assist> {
     let token = ctx.find_token_at_offset(RAW_STRING)?;
     ctx.add_assist(AssistId("add_hash"), "Add # to raw string", |edit| {
         edit.target(token.text_range());
-        edit.insert(token.text_range().start() + TextUnit::of_char('r'), "#");
+        edit.insert(token.text_range().start() + TextSize::of('r'), "#");
         edit.insert(token.text_range().end(), "#");
     })
 }

crates/ra_assists/src/handlers/remove_dbg.rs

@@ -1,6 +1,6 @@
 use ra_syntax::{
     ast::{self, AstNode},
-    TextUnit, T,
+    TextSize, T,
 };
 
 use crate::{Assist, AssistCtx, AssistId};
@@ -38,9 +38,9 @@ pub(crate) fn remove_dbg(ctx: AssistCtx) -> Option<Assist> {
         let offset_start = file_range
             .start()
             .checked_sub(macro_range.start())
-            .unwrap_or_else(|| TextUnit::from(0));
+            .unwrap_or_else(|| TextSize::from(0));
 
-        let dbg_size = TextUnit::of_str("dbg!(");
+        let dbg_size = TextSize::of("dbg!(");
 
         if offset_start > dbg_size {
             file_range.start() - dbg_size
@@ -53,7 +53,7 @@ pub(crate) fn remove_dbg(ctx: AssistCtx) -> Option<Assist> {
         let macro_args = macro_call.token_tree()?.syntax().clone();
 
         let text = macro_args.text();
-        let without_parens = TextUnit::of_char('(')..text.len() - TextUnit::of_char(')');
+        let without_parens = TextSize::of('(')..text.len() - TextSize::of(')');
         text.slice(without_parens).to_string()
     };
 

crates/ra_assists/src/handlers/remove_mut.rs

@@ -27,6 +27,6 @@ pub(crate) fn remove_mut(ctx: AssistCtx) -> Option<Assist> {
 
     ctx.add_assist(AssistId("remove_mut"), "Remove `mut` keyword", |edit| {
         edit.set_cursor(delete_from);
-        edit.delete(TextRange::from_to(delete_from, delete_to));
+        edit.delete(TextRange::new(delete_from, delete_to));
     })
 }

crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs

@@ -43,7 +43,7 @@ pub(crate) fn replace_qualified_name_with_use(ctx: AssistCtx) -> Option<Assist>
             if let Some(last) = path.segment() {
                 // Here we are assuming the assist will provide a correct use statement
                 // so we can delete the path qualifier
-                edit.delete(TextRange::from_to(
+                edit.delete(TextRange::new(
                     path.syntax().text_range().start(),
                     last.syntax().text_range().start(),
                 ));

crates/ra_assists/src/lib.rs

@@ -19,7 +19,7 @@ macro_rules! eprintln {
 
 use ra_db::{FileId, FileRange};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{TextRange, TextUnit};
+use ra_syntax::{TextRange, TextSize};
 use ra_text_edit::TextEdit;
 
 pub(crate) use crate::assist_ctx::{Assist, AssistCtx, AssistHandler};
@@ -51,7 +51,7 @@ pub(crate) fn new(label: String, id: AssistId) -> AssistLabel {
 #[derive(Debug, Clone)]
 pub struct AssistAction {
     pub edit: TextEdit,
-    pub cursor_position: Option<TextUnit>,
+    pub cursor_position: Option<TextSize>,
     // FIXME: This belongs to `AssistLabel`
     pub target: Option<TextRange>,
     pub file: AssistFile,
@@ -104,7 +104,7 @@ pub fn resolved_assists(db: &RootDatabase, range: FileRange) -> Vec<ResolvedAssi
         .flat_map(|it| it.0)
         .map(|it| it.into_resolved().unwrap())
         .collect::<Vec<_>>();
-    a.sort_by_key(|it| it.action.target.map_or(TextUnit::from(!0u32), |it| it.len()));
+    a.sort_by_key(|it| it.action.target.map_or(TextSize::from(!0u32), |it| it.len()));
     a
 }
 
@@ -308,8 +308,7 @@ fn assist_order_field_struct() {
         let before = "struct Foo { <|>bar: u32 }";
         let (before_cursor_pos, before) = extract_offset(before);
         let (db, file_id) = helpers::with_single_file(&before);
-        let frange =
-            FileRange { file_id, range: TextRange::offset_len(before_cursor_pos, 0.into()) };
+        let frange = FileRange { file_id, range: TextRange::empty(before_cursor_pos) };
         let assists = resolved_assists(&db, frange);
         let mut assists = assists.iter();
 

crates/ra_db/src/lib.rs

@@ -6,7 +6,7 @@
 use std::{panic, sync::Arc};
 
 use ra_prof::profile;
-use ra_syntax::{ast, Parse, SourceFile, TextRange, TextUnit};
+use ra_syntax::{ast, Parse, SourceFile, TextRange, TextSize};
 
 pub use crate::{
     cancellation::Canceled,
@@ -75,7 +75,7 @@ fn check_canceled(&self) {
 #[derive(Clone, Copy, Debug)]
 pub struct FilePosition {
     pub file_id: FileId,
-    pub offset: TextUnit,
+    pub offset: TextSize,
 }
 
 #[derive(Clone, Copy, Debug)]

crates/ra_hir/src/semantics.rs

@@ -14,7 +14,7 @@
 use ra_prof::profile;
 use ra_syntax::{
     algo::{find_node_at_offset, skip_trivia_token},
-    ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextUnit,
+    ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextSize,
 };
 use rustc_hash::{FxHashMap, FxHashSet};
 
@@ -95,7 +95,7 @@ pub fn descend_into_macros(&self, token: SyntaxToken) -> SyntaxToken {
         let token = successors(Some(parent.with_value(token)), |token| {
             let macro_call = token.value.ancestors().find_map(ast::MacroCall::cast)?;
             let tt = macro_call.token_tree()?;
-            if !token.value.text_range().is_subrange(&tt.syntax().text_range()) {
+            if !tt.syntax().text_range().contains_range(token.value.text_range()) {
                 return None;
             }
             let file_id = sa.expand(self.db, token.with_value(&macro_call))?;
@@ -114,7 +114,7 @@ pub fn descend_into_macros(&self, token: SyntaxToken) -> SyntaxToken {
     pub fn descend_node_at_offset<N: ast::AstNode>(
         &self,
         node: &SyntaxNode,
-        offset: TextUnit,
+        offset: TextSize,
     ) -> Option<N> {
         // Handle macro token cases
         node.token_at_offset(offset)
@@ -142,7 +142,7 @@ pub fn ancestors_with_macros(&self, node: SyntaxNode) -> impl Iterator<Item = Sy
     pub fn ancestors_at_offset_with_macros(
         &self,
         node: &SyntaxNode,
-        offset: TextUnit,
+        offset: TextSize,
     ) -> impl Iterator<Item = SyntaxNode> + '_ {
         node.token_at_offset(offset)
             .map(|token| self.ancestors_with_macros(token.parent()))
@@ -154,7 +154,7 @@ pub fn ancestors_at_offset_with_macros(
     pub fn find_node_at_offset_with_macros<N: AstNode>(
         &self,
         node: &SyntaxNode,
-        offset: TextUnit,
+        offset: TextSize,
     ) -> Option<N> {
         self.ancestors_at_offset_with_macros(node, offset).find_map(N::cast)
     }
@@ -164,7 +164,7 @@ pub fn find_node_at_offset_with_macros<N: AstNode>(
     pub fn find_node_at_offset_with_descend<N: AstNode>(
         &self,
         node: &SyntaxNode,
-        offset: TextUnit,
+        offset: TextSize,
     ) -> Option<N> {
         if let Some(it) = find_node_at_offset(&node, offset) {
             return Some(it);
@@ -255,7 +255,7 @@ pub fn scope(&self, node: &SyntaxNode) -> SemanticsScope<'db, DB> {
         SemanticsScope { db: self.db, resolver }
     }
 
-    pub fn scope_at_offset(&self, node: &SyntaxNode, offset: TextUnit) -> SemanticsScope<'db, DB> {
+    pub fn scope_at_offset(&self, node: &SyntaxNode, offset: TextSize) -> SemanticsScope<'db, DB> {
         let node = self.find_file(node.clone());
         let resolver = self.analyze2(node.as_ref(), Some(offset)).resolver;
         SemanticsScope { db: self.db, resolver }
@@ -271,7 +271,7 @@ fn analyze(&self, node: &SyntaxNode) -> SourceAnalyzer {
         self.analyze2(src.as_ref(), None)
     }
 
-    fn analyze2(&self, src: InFile<&SyntaxNode>, offset: Option<TextUnit>) -> SourceAnalyzer {
+    fn analyze2(&self, src: InFile<&SyntaxNode>, offset: Option<TextSize>) -> SourceAnalyzer {
         let _p = profile("Semantics::analyze2");
 
         let container = match self.with_ctx(|ctx| ctx.find_container(src)) {
@@ -463,7 +463,7 @@ fn original_range_opt(
             return None;
         }
 
-        Some(first.with_value(first.value.text_range().extend_to(&last.value.text_range())))
+        Some(first.with_value(first.value.text_range().cover(last.value.text_range())))
     })?)
 }
 

crates/ra_hir/src/source_analyzer.rs

@@ -23,7 +23,7 @@
 };
 use ra_syntax::{
     ast::{self, AstNode},
-    SyntaxNode, TextRange, TextUnit,
+    SyntaxNode, TextRange, TextSize,
 };
 
 use crate::{
@@ -50,7 +50,7 @@ pub(crate) fn new_for_body(
         db: &dyn HirDatabase,
         def: DefWithBodyId,
         node: InFile<&SyntaxNode>,
-        offset: Option<TextUnit>,
+        offset: Option<TextSize>,
     ) -> SourceAnalyzer {
         let (body, source_map) = db.body_with_source_map(def);
         let scopes = db.expr_scopes(def);
@@ -318,7 +318,7 @@ fn scope_for_offset(
     db: &dyn HirDatabase,
     scopes: &ExprScopes,
     source_map: &BodySourceMap,
-    offset: InFile<TextUnit>,
+    offset: InFile<TextSize>,
 ) -> Option<ScopeId> {
     scopes
         .scope_by_expr()
@@ -354,7 +354,7 @@ fn adjust(
     source_map: &BodySourceMap,
     expr_range: TextRange,
     file_id: HirFileId,
-    offset: TextUnit,
+    offset: TextSize,
 ) -> Option<ScopeId> {
     let child_scopes = scopes
         .scope_by_expr()
@@ -369,15 +369,15 @@ fn adjust(
             let node = source.value.to_node(&root);
             Some((node.syntax().text_range(), scope))
         })
-        .filter(|(range, _)| {
-            range.start() <= offset && range.is_subrange(&expr_range) && *range != expr_range
+        .filter(|&(range, _)| {
+            range.start() <= offset && expr_range.contains_range(range) && range != expr_range
         });
 
     child_scopes
-        .max_by(|(r1, _), (r2, _)| {
-            if r2.is_subrange(&r1) {
+        .max_by(|&(r1, _), &(r2, _)| {
+            if r1.contains_range(r2) {
                 std::cmp::Ordering::Greater
-            } else if r1.is_subrange(&r2) {
+            } else if r2.contains_range(r1) {
                 std::cmp::Ordering::Less
             } else {
                 r1.start().cmp(&r2.start())

crates/ra_hir_def/src/body/scope.rs

@@ -194,7 +194,7 @@ fn do_check(code: &str, expected: &[&str]) {
         let (off, code) = extract_offset(code);
         let code = {
             let mut buf = String::new();
-            let off = off.to_usize();
+            let off: usize = off.into();
             buf.push_str(&code[..off]);
             buf.push_str("marker");
             buf.push_str(&code[off..]);

crates/ra_hir_expand/src/builtin_macro.rs

@@ -2,7 +2,7 @@
 use crate::db::AstDatabase;
 use crate::{
     ast::{self, AstToken, HasStringValue},
-    name, AstId, CrateId, MacroDefId, MacroDefKind, TextUnit,
+    name, AstId, CrateId, MacroDefId, MacroDefKind, TextSize,
 };
 
 use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId};
@@ -127,7 +127,7 @@ fn stringify_expand(
         let arg = loc.kind.arg(db).ok_or_else(|| mbe::ExpandError::UnexpectedToken)?;
         let macro_args = arg;
         let text = macro_args.text();
-        let without_parens = TextUnit::of_char('(')..text.len() - TextUnit::of_char(')');
+        let without_parens = TextSize::of('(')..text.len() - TextSize::of(')');
         text.slice(without_parens).to_string()
     };
 

crates/ra_hir_expand/src/lib.rs

@@ -22,7 +22,7 @@
 use ra_syntax::{
     algo,
     ast::{self, AstNode},
-    SyntaxNode, SyntaxToken, TextUnit,
+    SyntaxNode, SyntaxToken, TextSize,
 };
 
 use crate::ast_id_map::FileAstId;
@@ -348,7 +348,7 @@ pub fn to_node(&self, db: &dyn db::AstDatabase) -> N {
 ///
 /// * `InFile<SyntaxNode>` -- syntax node in a file
 /// * `InFile<ast::FnDef>` -- ast node in a file
-/// * `InFile<TextUnit>` -- offset in a file
+/// * `InFile<TextSize>` -- offset in a file
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub struct InFile<T> {
     pub file_id: HirFileId,

crates/ra_hir_ty/src/tests.rs

@@ -117,7 +117,7 @@ fn infer_with_mismatches(content: &str, include_mismatches: bool) -> String {
             let macro_prefix = if node.file_id != file_id.into() { "!" } else { "" };
             format_to!(
                 buf,
-                "{}{} '{}': {}\n",
+                "{}{:?} '{}': {}\n",
                 macro_prefix,
                 range,
                 ellipsize(text, 15),
@@ -134,7 +134,7 @@ fn infer_with_mismatches(content: &str, include_mismatches: bool) -> String {
                 let macro_prefix = if src_ptr.file_id != file_id.into() { "!" } else { "" };
                 format_to!(
                     buf,
-                    "{}{}: expected {}, got {}\n",
+                    "{}{:?}: expected {}, got {}\n",
                     macro_prefix,
                     range,
                     mismatch.expected.display(&db),

crates/ra_hir_ty/src/tests/coercion.rs

@@ -29,10 +29,10 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 41) '{     ...4 }; }': ()
-    [21; 22) 'a': i32
-    [30; 38) '{ 1i64 }': i64
-    [32; 36) '1i64': i64
+    11..41 '{     ...4 }; }': ()
+    21..22 'a': i32
+    30..38 '{ 1i64 }': i64
+    32..36 '1i64': i64
     "###);
 }
 
@@ -63,50 +63,50 @@ fn test2() {
 }
 "#),
         @r###"
-    [31; 32) '_': &[T]
-    [45; 56) '{ loop {} }': T
-    [47; 54) 'loop {}': !
-    [52; 54) '{}': ()
-    [65; 66) '_': S<&[T]>
-    [82; 93) '{ loop {} }': T
-    [84; 91) 'loop {}': !
-    [89; 91) '{}': ()
-    [122; 133) '{ loop {} }': *mut [T; _]
-    [124; 131) 'loop {}': !
-    [129; 131) '{}': ()
-    [160; 173) '{     gen() }': *mut [U]
-    [166; 169) 'gen': fn gen<U>() -> *mut [U; _]
-    [166; 171) 'gen()': *mut [U; _]
-    [186; 420) '{     ...rr); }': ()
-    [196; 199) 'arr': &[u8; _]
-    [212; 216) '&[1]': &[u8; _]
-    [213; 216) '[1]': [u8; _]
-    [214; 215) '1': u8
-    [227; 228) 'a': &[u8]
-    [237; 240) 'arr': &[u8; _]
-    [250; 251) 'b': u8
-    [254; 255) 'f': fn f<u8>(&[u8]) -> u8
-    [254; 260) 'f(arr)': u8
-    [256; 259) 'arr': &[u8; _]
-    [270; 271) 'c': &[u8]
-    [280; 287) '{ arr }': &[u8]
-    [282; 285) 'arr': &[u8; _]
-    [297; 298) 'd': u8
-    [301; 302) 'g': fn g<u8>(S<&[u8]>) -> u8
-    [301; 316) 'g(S { a: arr })': u8
-    [303; 315) 'S { a: arr }': S<&[u8]>
-    [310; 313) 'arr': &[u8; _]
-    [326; 327) 'e': [&[u8]; _]
-    [341; 346) '[arr]': [&[u8]; _]
-    [342; 345) 'arr': &[u8; _]
-    [356; 357) 'f': [&[u8]; _]
-    [371; 379) '[arr; 2]': [&[u8]; _]
-    [372; 375) 'arr': &[u8; _]
-    [377; 378) '2': usize
-    [389; 390) 'g': (&[u8], &[u8])
-    [407; 417) '(arr, arr)': (&[u8], &[u8])
-    [408; 411) 'arr': &[u8; _]
-    [413; 416) 'arr': &[u8; _]
+    31..32 '_': &[T]
+    45..56 '{ loop {} }': T
+    47..54 'loop {}': !
+    52..54 '{}': ()
+    65..66 '_': S<&[T]>
+    82..93 '{ loop {} }': T
+    84..91 'loop {}': !
+    89..91 '{}': ()
+    122..133 '{ loop {} }': *mut [T; _]
+    124..131 'loop {}': !
+    129..131 '{}': ()
+    160..173 '{     gen() }': *mut [U]
+    166..169 'gen': fn gen<U>() -> *mut [U; _]
+    166..171 'gen()': *mut [U; _]
+    186..420 '{     ...rr); }': ()
+    196..199 'arr': &[u8; _]
+    212..216 '&[1]': &[u8; _]
+    213..216 '[1]': [u8; _]
+    214..215 '1': u8
+    227..228 'a': &[u8]
+    237..240 'arr': &[u8; _]
+    250..251 'b': u8
+    254..255 'f': fn f<u8>(&[u8]) -> u8
+    254..260 'f(arr)': u8
+    256..259 'arr': &[u8; _]
+    270..271 'c': &[u8]
+    280..287 '{ arr }': &[u8]
+    282..285 'arr': &[u8; _]
+    297..298 'd': u8
+    301..302 'g': fn g<u8>(S<&[u8]>) -> u8
+    301..316 'g(S { a: arr })': u8
+    303..315 'S { a: arr }': S<&[u8]>
+    310..313 'arr': &[u8; _]
+    326..327 'e': [&[u8]; _]
+    341..346 '[arr]': [&[u8]; _]
+    342..345 'arr': &[u8; _]
+    356..357 'f': [&[u8]; _]
+    371..379 '[arr; 2]': [&[u8]; _]
+    372..375 'arr': &[u8; _]
+    377..378 '2': usize
+    389..390 'g': (&[u8], &[u8])
+    407..417 '(arr, arr)': (&[u8], &[u8])
+    408..411 'arr': &[u8; _]
+    413..416 'arr': &[u8; _]
     "###
     );
 }
@@ -120,11 +120,11 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 40) '{     ...[1]; }': ()
-    [21; 22) 'x': &[i32]
-    [33; 37) '&[1]': &[i32; _]
-    [34; 37) '[1]': [i32; _]
-    [35; 36) '1': i32
+    11..40 '{     ...[1]; }': ()
+    21..22 'x': &[i32]
+    33..37 '&[1]': &[i32; _]
+    34..37 '[1]': [i32; _]
+    35..36 '1': i32
     "###);
 }
 
@@ -150,31 +150,31 @@ fn foo3<T>(x: C<[T]>) -> C<[T]> { x }
 }
 "#),
         @r###"
-    [258; 259) 'x': A<[T]>
-    [279; 284) '{ x }': A<[T]>
-    [281; 282) 'x': A<[T]>
-    [296; 297) 'x': B<[T]>
-    [317; 322) '{ x }': B<[T]>
-    [319; 320) 'x': B<[T]>
-    [334; 335) 'x': C<[T]>
-    [355; 360) '{ x }': C<[T]>
-    [357; 358) 'x': C<[T]>
-    [370; 371) 'a': A<[u8; _]>
-    [385; 386) 'b': B<[u8; _]>
-    [400; 401) 'c': C<[u8; _]>
-    [415; 481) '{     ...(c); }': ()
-    [425; 426) 'd': A<[{unknown}]>
-    [429; 433) 'foo1': fn foo1<{unknown}>(A<[{unknown}]>) -> A<[{unknown}]>
-    [429; 436) 'foo1(a)': A<[{unknown}]>
-    [434; 435) 'a': A<[u8; _]>
-    [446; 447) 'e': B<[u8]>
-    [450; 454) 'foo2': fn foo2<u8>(B<[u8]>) -> B<[u8]>
-    [450; 457) 'foo2(b)': B<[u8]>
-    [455; 456) 'b': B<[u8; _]>
-    [467; 468) 'f': C<[u8]>
-    [471; 475) 'foo3': fn foo3<u8>(C<[u8]>) -> C<[u8]>
-    [471; 478) 'foo3(c)': C<[u8]>
-    [476; 477) 'c': C<[u8; _]>
+    258..259 'x': A<[T]>
+    279..284 '{ x }': A<[T]>
+    281..282 'x': A<[T]>
+    296..297 'x': B<[T]>
+    317..322 '{ x }': B<[T]>
+    319..320 'x': B<[T]>
+    334..335 'x': C<[T]>
+    355..360 '{ x }': C<[T]>
+    357..358 'x': C<[T]>
+    370..371 'a': A<[u8; _]>
+    385..386 'b': B<[u8; _]>
+    400..401 'c': C<[u8; _]>
+    415..481 '{     ...(c); }': ()
+    425..426 'd': A<[{unknown}]>
+    429..433 'foo1': fn foo1<{unknown}>(A<[{unknown}]>) -> A<[{unknown}]>
+    429..436 'foo1(a)': A<[{unknown}]>
+    434..435 'a': A<[u8; _]>
+    446..447 'e': B<[u8]>
+    450..454 'foo2': fn foo2<u8>(B<[u8]>) -> B<[u8]>
+    450..457 'foo2(b)': B<[u8]>
+    455..456 'b': B<[u8; _]>
+    467..468 'f': C<[u8]>
+    471..475 'foo3': fn foo3<u8>(C<[u8]>) -> C<[u8]>
+    471..478 'foo3(c)': C<[u8]>
+    476..477 'c': C<[u8; _]>
     "###
     );
 }
@@ -193,24 +193,24 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 12) 'x': &[T]
-    [28; 39) '{ loop {} }': &[T]
-    [30; 37) 'loop {}': !
-    [35; 37) '{}': ()
-    [50; 126) '{     ...  }; }': ()
-    [60; 61) 'x': &[i32]
-    [64; 123) 'if tru...     }': &[i32]
-    [67; 71) 'true': bool
-    [72; 97) '{     ...     }': &[i32]
-    [82; 85) 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    [82; 91) 'foo(&[1])': &[i32]
-    [86; 90) '&[1]': &[i32; _]
-    [87; 90) '[1]': [i32; _]
-    [88; 89) '1': i32
-    [103; 123) '{     ...     }': &[i32; _]
-    [113; 117) '&[1]': &[i32; _]
-    [114; 117) '[1]': [i32; _]
-    [115; 116) '1': i32
+    11..12 'x': &[T]
+    28..39 '{ loop {} }': &[T]
+    30..37 'loop {}': !
+    35..37 '{}': ()
+    50..126 '{     ...  }; }': ()
+    60..61 'x': &[i32]
+    64..123 'if tru...     }': &[i32]
+    67..71 'true': bool
+    72..97 '{     ...     }': &[i32]
+    82..85 'foo': fn foo<i32>(&[i32]) -> &[i32]
+    82..91 'foo(&[1])': &[i32]
+    86..90 '&[1]': &[i32; _]
+    87..90 '[1]': [i32; _]
+    88..89 '1': i32
+    103..123 '{     ...     }': &[i32; _]
+    113..117 '&[1]': &[i32; _]
+    114..117 '[1]': [i32; _]
+    115..116 '1': i32
     "###
     );
 }
@@ -229,24 +229,24 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 12) 'x': &[T]
-    [28; 39) '{ loop {} }': &[T]
-    [30; 37) 'loop {}': !
-    [35; 37) '{}': ()
-    [50; 126) '{     ...  }; }': ()
-    [60; 61) 'x': &[i32]
-    [64; 123) 'if tru...     }': &[i32]
-    [67; 71) 'true': bool
-    [72; 92) '{     ...     }': &[i32; _]
-    [82; 86) '&[1]': &[i32; _]
-    [83; 86) '[1]': [i32; _]
-    [84; 85) '1': i32
-    [98; 123) '{     ...     }': &[i32]
-    [108; 111) 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    [108; 117) 'foo(&[1])': &[i32]
-    [112; 116) '&[1]': &[i32; _]
-    [113; 116) '[1]': [i32; _]
-    [114; 115) '1': i32
+    11..12 'x': &[T]
+    28..39 '{ loop {} }': &[T]
+    30..37 'loop {}': !
+    35..37 '{}': ()
+    50..126 '{     ...  }; }': ()
+    60..61 'x': &[i32]
+    64..123 'if tru...     }': &[i32]
+    67..71 'true': bool
+    72..92 '{     ...     }': &[i32; _]
+    82..86 '&[1]': &[i32; _]
+    83..86 '[1]': [i32; _]
+    84..85 '1': i32
+    98..123 '{     ...     }': &[i32]
+    108..111 'foo': fn foo<i32>(&[i32]) -> &[i32]
+    108..117 'foo(&[1])': &[i32]
+    112..116 '&[1]': &[i32; _]
+    113..116 '[1]': [i32; _]
+    114..115 '1': i32
     "###
     );
 }
@@ -265,31 +265,31 @@ fn test(i: i32) {
 }
 "#),
         @r###"
-    [11; 12) 'x': &[T]
-    [28; 39) '{ loop {} }': &[T]
-    [30; 37) 'loop {}': !
-    [35; 37) '{}': ()
-    [48; 49) 'i': i32
-    [56; 150) '{     ...  }; }': ()
-    [66; 67) 'x': &[i32]
-    [70; 147) 'match ...     }': &[i32]
-    [76; 77) 'i': i32
-    [88; 89) '2': i32
-    [88; 89) '2': i32
-    [93; 96) 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    [93; 102) 'foo(&[2])': &[i32]
-    [97; 101) '&[2]': &[i32; _]
-    [98; 101) '[2]': [i32; _]
-    [99; 100) '2': i32
-    [112; 113) '1': i32
-    [112; 113) '1': i32
-    [117; 121) '&[1]': &[i32; _]
-    [118; 121) '[1]': [i32; _]
-    [119; 120) '1': i32
-    [131; 132) '_': i32
-    [136; 140) '&[3]': &[i32; _]
-    [137; 140) '[3]': [i32; _]
-    [138; 139) '3': i32
+    11..12 'x': &[T]
+    28..39 '{ loop {} }': &[T]
+    30..37 'loop {}': !
+    35..37 '{}': ()
+    48..49 'i': i32
+    56..150 '{     ...  }; }': ()
+    66..67 'x': &[i32]
+    70..147 'match ...     }': &[i32]
+    76..77 'i': i32
+    88..89 '2': i32
+    88..89 '2': i32
+    93..96 'foo': fn foo<i32>(&[i32]) -> &[i32]
+    93..102 'foo(&[2])': &[i32]
+    97..101 '&[2]': &[i32; _]
+    98..101 '[2]': [i32; _]
+    99..100 '2': i32
+    112..113 '1': i32
+    112..113 '1': i32
+    117..121 '&[1]': &[i32; _]
+    118..121 '[1]': [i32; _]
+    119..120 '1': i32
+    131..132 '_': i32
+    136..140 '&[3]': &[i32; _]
+    137..140 '[3]': [i32; _]
+    138..139 '3': i32
     "###
     );
 }
@@ -308,31 +308,31 @@ fn test(i: i32) {
 }
 "#),
         @r###"
-    [11; 12) 'x': &[T]
-    [28; 39) '{ loop {} }': &[T]
-    [30; 37) 'loop {}': !
-    [35; 37) '{}': ()
-    [48; 49) 'i': i32
-    [56; 150) '{     ...  }; }': ()
-    [66; 67) 'x': &[i32]
-    [70; 147) 'match ...     }': &[i32]
-    [76; 77) 'i': i32
-    [88; 89) '1': i32
-    [88; 89) '1': i32
-    [93; 97) '&[1]': &[i32; _]
-    [94; 97) '[1]': [i32; _]
-    [95; 96) '1': i32
-    [107; 108) '2': i32
-    [107; 108) '2': i32
-    [112; 115) 'foo': fn foo<i32>(&[i32]) -> &[i32]
-    [112; 121) 'foo(&[2])': &[i32]
-    [116; 120) '&[2]': &[i32; _]
-    [117; 120) '[2]': [i32; _]
-    [118; 119) '2': i32
-    [131; 132) '_': i32
-    [136; 140) '&[3]': &[i32; _]
-    [137; 140) '[3]': [i32; _]
-    [138; 139) '3': i32
+    11..12 'x': &[T]
+    28..39 '{ loop {} }': &[T]
+    30..37 'loop {}': !
+    35..37 '{}': ()
+    48..49 'i': i32
+    56..150 '{     ...  }; }': ()
+    66..67 'x': &[i32]
+    70..147 'match ...     }': &[i32]
+    76..77 'i': i32
+    88..89 '1': i32
+    88..89 '1': i32
+    93..97 '&[1]': &[i32; _]
+    94..97 '[1]': [i32; _]
+    95..96 '1': i32
+    107..108 '2': i32
+    107..108 '2': i32
+    112..115 'foo': fn foo<i32>(&[i32]) -> &[i32]
+    112..121 'foo(&[2])': &[i32]
+    116..120 '&[2]': &[i32; _]
+    117..120 '[2]': [i32; _]
+    118..119 '2': i32
+    131..132 '_': i32
+    136..140 '&[3]': &[i32; _]
+    137..140 '[3]': [i32; _]
+    138..139 '3': i32
     "###
     );
 }
@@ -353,24 +353,24 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 145) '{     ...  }; }': ()
-    [21; 22) 't': &mut i32
-    [25; 31) '&mut 1': &mut i32
-    [30; 31) '1': i32
-    [41; 42) 'x': *const i32
-    [45; 142) 'match ...     }': *const i32
-    [51; 52) '1': i32
-    [63; 64) '1': i32
-    [63; 64) '1': i32
-    [68; 69) 't': &mut i32
-    [68; 81) 't as *mut i32': *mut i32
-    [91; 92) '2': i32
-    [91; 92) '2': i32
-    [96; 97) 't': &mut i32
-    [96; 105) 't as &i32': &i32
-    [115; 116) '_': i32
-    [120; 121) 't': &mut i32
-    [120; 135) 't as *const i32': *const i32
+    11..145 '{     ...  }; }': ()
+    21..22 't': &mut i32
+    25..31 '&mut 1': &mut i32
+    30..31 '1': i32
+    41..42 'x': *const i32
+    45..142 'match ...     }': *const i32
+    51..52 '1': i32
+    63..64 '1': i32
+    63..64 '1': i32
+    68..69 't': &mut i32
+    68..81 't as *mut i32': *mut i32
+    91..92 '2': i32
+    91..92 '2': i32
+    96..97 't': &mut i32
+    96..105 't as &i32': &i32
+    115..116 '_': i32
+    120..121 't': &mut i32
+    120..135 't as *const i32': *const i32
     "###
     );
 }
@@ -384,9 +384,9 @@ fn foo() -> u32 {
 }
 "#, true),
         @r###"
-    [17; 40) '{     ...own; }': !
-    [23; 37) 'return unknown': !
-    [30; 37) 'unknown': u32
+    17..40 '{     ...own; }': !
+    23..37 'return unknown': !
+    30..37 'unknown': u32
     "###
     );
 }
@@ -404,24 +404,24 @@ fn test() {
 }
 "#, true),
         @r###"
-    [30; 31) 'x': &Foo
-    [39; 41) '{}': ()
-    [52; 133) '{     ...oo); }': ()
-    [58; 71) 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    [58; 77) 'takes_...(&Foo)': ()
-    [72; 76) '&Foo': &Foo
-    [73; 76) 'Foo': Foo
-    [83; 96) 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    [83; 103) 'takes_...&&Foo)': ()
-    [97; 102) '&&Foo': &&Foo
-    [98; 102) '&Foo': &Foo
-    [99; 102) 'Foo': Foo
-    [109; 122) 'takes_ref_foo': fn takes_ref_foo(&Foo)
-    [109; 130) 'takes_...&&Foo)': ()
-    [123; 129) '&&&Foo': &&&Foo
-    [124; 129) '&&Foo': &&Foo
-    [125; 129) '&Foo': &Foo
-    [126; 129) 'Foo': Foo
+    30..31 'x': &Foo
+    39..41 '{}': ()
+    52..133 '{     ...oo); }': ()
+    58..71 'takes_ref_foo': fn takes_ref_foo(&Foo)
+    58..77 'takes_...(&Foo)': ()
+    72..76 '&Foo': &Foo
+    73..76 'Foo': Foo
+    83..96 'takes_ref_foo': fn takes_ref_foo(&Foo)
+    83..103 'takes_...&&Foo)': ()
+    97..102 '&&Foo': &&Foo
+    98..102 '&Foo': &Foo
+    99..102 'Foo': Foo
+    109..122 'takes_ref_foo': fn takes_ref_foo(&Foo)
+    109..130 'takes_...&&Foo)': ()
+    123..129 '&&&Foo': &&&Foo
+    124..129 '&&Foo': &&Foo
+    125..129 '&Foo': &Foo
+    126..129 'Foo': Foo
     "###
     );
 }
@@ -439,26 +439,26 @@ fn test() {
 }
 "#, true),
         @r###"
-    [29; 30) 'x': &T
-    [41; 47) '{ *x }': T
-    [43; 45) '*x': T
-    [44; 45) 'x': &T
-    [58; 127) '{     ...oo); }': ()
-    [64; 73) 'takes_ref': fn takes_ref<Foo>(&Foo) -> Foo
-    [64; 79) 'takes_ref(&Foo)': Foo
-    [74; 78) '&Foo': &Foo
-    [75; 78) 'Foo': Foo
-    [85; 94) 'takes_ref': fn takes_ref<&Foo>(&&Foo) -> &Foo
-    [85; 101) 'takes_...&&Foo)': &Foo
-    [95; 100) '&&Foo': &&Foo
-    [96; 100) '&Foo': &Foo
-    [97; 100) 'Foo': Foo
-    [107; 116) 'takes_ref': fn takes_ref<&&Foo>(&&&Foo) -> &&Foo
-    [107; 124) 'takes_...&&Foo)': &&Foo
-    [117; 123) '&&&Foo': &&&Foo
-    [118; 123) '&&Foo': &&Foo
-    [119; 123) '&Foo': &Foo
-    [120; 123) 'Foo': Foo
+    29..30 'x': &T
+    41..47 '{ *x }': T
+    43..45 '*x': T
+    44..45 'x': &T
+    58..127 '{     ...oo); }': ()
+    64..73 'takes_ref': fn takes_ref<Foo>(&Foo) -> Foo
+    64..79 'takes_ref(&Foo)': Foo
+    74..78 '&Foo': &Foo
+    75..78 'Foo': Foo
+    85..94 'takes_ref': fn takes_ref<&Foo>(&&Foo) -> &Foo
+    85..101 'takes_...&&Foo)': &Foo
+    95..100 '&&Foo': &&Foo
+    96..100 '&Foo': &Foo
+    97..100 'Foo': Foo
+    107..116 'takes_ref': fn takes_ref<&&Foo>(&&&Foo) -> &&Foo
+    107..124 'takes_...&&Foo)': &&Foo
+    117..123 '&&&Foo': &&&Foo
+    118..123 '&&Foo': &&Foo
+    119..123 '&Foo': &Foo
+    120..123 'Foo': Foo
     "###
     );
 }
@@ -478,18 +478,18 @@ fn test() {
 }
 "#, true),
         @r###"
-    [127; 128) 'x': &str
-    [136; 138) '{}': ()
-    [169; 180) '{ loop {} }': String
-    [171; 178) 'loop {}': !
-    [176; 178) '{}': ()
-    [191; 236) '{     ... }); }': ()
-    [197; 210) 'takes_ref_str': fn takes_ref_str(&str)
-    [197; 233) 'takes_...g() })': ()
-    [211; 232) '&{ ret...ng() }': &String
-    [212; 232) '{ retu...ng() }': String
-    [214; 228) 'returns_string': fn returns_string() -> String
-    [214; 230) 'return...ring()': String
+    127..128 'x': &str
+    136..138 '{}': ()
+    169..180 '{ loop {} }': String
+    171..178 'loop {}': !
+    176..178 '{}': ()
+    191..236 '{     ... }); }': ()
+    197..210 'takes_ref_str': fn takes_ref_str(&str)
+    197..233 'takes_...g() })': ()
+    211..232 '&{ ret...ng() }': &String
+    212..232 '{ retu...ng() }': String
+    214..228 'returns_string': fn returns_string() -> String
+    214..230 'return...ring()': String
     "###
     );
 }
@@ -508,19 +508,19 @@ fn foo() {
 }
 "#, true),
         @r###"
-    [10; 106) '{     ...  }; }': ()
-    [20; 21) 'x': || -> &u32
-    [24; 103) '|| {  ...     }': || -> &u32
-    [27; 103) '{     ...     }': &u32
-    [37; 82) 'if tru...     }': ()
-    [40; 44) 'true': bool
-    [45; 82) '{     ...     }': !
-    [59; 71) 'return &1u32': !
-    [66; 71) '&1u32': &u32
-    [67; 71) '1u32': u32
-    [91; 97) '&&1u32': &&u32
-    [92; 97) '&1u32': &u32
-    [93; 97) '1u32': u32
+    10..106 '{     ...  }; }': ()
+    20..21 'x': || -> &u32
+    24..103 '|| {  ...     }': || -> &u32
+    27..103 '{     ...     }': &u32
+    37..82 'if tru...     }': ()
+    40..44 'true': bool
+    45..82 '{     ...     }': !
+    59..71 'return &1u32': !
+    66..71 '&1u32': &u32
+    67..71 '1u32': u32
+    91..97 '&&1u32': &&u32
+    92..97 '&1u32': &u32
+    93..97 '1u32': u32
     "###
     );
 }
@@ -535,12 +535,12 @@ fn test() {
 }
 "#, true),
         @r###"
-    [8; 9) 'x': u32
-    [25; 30) '{ 1 }': isize
-    [27; 28) '1': isize
-    [41; 79) '{     ...foo; }': ()
-    [51; 52) 'f': fn(u32) -> isize
-    [73; 76) 'foo': fn foo(u32) -> isize
+    8..9 'x': u32
+    25..30 '{ 1 }': isize
+    27..28 '1': isize
+    41..79 '{     ...foo; }': ()
+    51..52 'f': fn(u32) -> isize
+    73..76 'foo': fn foo(u32) -> isize
     "###
     );
 }
@@ -554,12 +554,12 @@ fn test() {
 }
 "#, true),
         @r###"
-    [11; 55) '{     ...1 }; }': ()
-    [21; 22) 'f': fn(u32) -> isize
-    [43; 52) '|x| { 1 }': |u32| -> isize
-    [44; 45) 'x': u32
-    [47; 52) '{ 1 }': isize
-    [49; 50) '1': isize
+    11..55 '{     ...1 }; }': ()
+    21..22 'f': fn(u32) -> isize
+    43..52 '|x| { 1 }': |u32| -> isize
+    44..45 'x': u32
+    47..52 '{ 1 }': isize
+    49..50 '1': isize
     "###
     );
 }
@@ -577,11 +577,11 @@ fn get(&self) -> &TT {
 }
 "#, true),
         @r###"
-    [51; 55) 'self': &S<TT>
-    [64; 87) '{     ...     }': &TT
-    [74; 81) '&self.t': &TT
-    [75; 79) 'self': &S<TT>
-    [75; 81) 'self.t': TT
+    51..55 'self': &S<TT>
+    64..87 '{     ...     }': &TT
+    74..81 '&self.t': &TT
+    75..79 'self': &S<TT>
+    75..81 'self.t': TT
     "###
     );
 }
@@ -602,13 +602,13 @@ fn test() {
 }
 "#, true),
         @r###"
-    [162; 199) '{     ... 3]; }': ()
-    [172; 173) 'f': &[usize]
-    [186; 196) '&[1, 2, 3]': &[usize; _]
-    [187; 196) '[1, 2, 3]': [usize; _]
-    [188; 189) '1': usize
-    [191; 192) '2': usize
-    [194; 195) '3': usize
+    162..199 '{     ... 3]; }': ()
+    172..173 'f': &[usize]
+    186..196 '&[1, 2, 3]': &[usize; _]
+    187..196 '[1, 2, 3]': [usize; _]
+    188..189 '1': usize
+    191..192 '2': usize
+    194..195 '3': usize
     "###
     );
 }
@@ -642,19 +642,19 @@ fn test() {
 }
 "#, true),
         @r###"
-    [388; 573) '{     ...bj2; }': ()
-    [398; 401) 'obj': &dyn Baz<i8, i16>
-    [423; 425) '&S': &S<i8, i16>
-    [424; 425) 'S': S<i8, i16>
-    [435; 438) 'obj': &dyn Bar<usize, i8, i16>
-    [460; 463) 'obj': &dyn Baz<i8, i16>
-    [473; 476) 'obj': &dyn Foo<i8, usize>
-    [495; 498) 'obj': &dyn Bar<usize, i8, i16>
-    [508; 512) 'obj2': &dyn Baz<i8, i16>
-    [534; 536) '&S': &S<i8, i16>
-    [535; 536) 'S': S<i8, i16>
-    [546; 547) '_': &dyn Foo<i8, usize>
-    [566; 570) 'obj2': &dyn Baz<i8, i16>
+    388..573 '{     ...bj2; }': ()
+    398..401 'obj': &dyn Baz<i8, i16>
+    423..425 '&S': &S<i8, i16>
+    424..425 'S': S<i8, i16>
+    435..438 'obj': &dyn Bar<usize, i8, i16>
+    460..463 'obj': &dyn Baz<i8, i16>
+    473..476 'obj': &dyn Foo<i8, usize>
+    495..498 'obj': &dyn Bar<usize, i8, i16>
+    508..512 'obj2': &dyn Baz<i8, i16>
+    534..536 '&S': &S<i8, i16>
+    535..536 'S': S<i8, i16>
+    546..547 '_': &dyn Foo<i8, usize>
+    566..570 'obj2': &dyn Baz<i8, i16>
     "###
     );
 }
@@ -687,12 +687,12 @@ fn test() {
 }
 "#, true),
         @r###"
-    [292; 348) '{     ...obj; }': ()
-    [302; 305) 'obj': &dyn D
-    [316; 318) '&S': &S
-    [317; 318) 'S': S
-    [328; 331) 'obj': &dyn A
-    [342; 345) 'obj': &dyn D
+    292..348 '{     ...obj; }': ()
+    302..305 'obj': &dyn D
+    316..318 '&S': &S
+    317..318 'S': S
+    328..331 'obj': &dyn A
+    342..345 'obj': &dyn D
     "###
     );
 }

crates/ra_hir_ty/src/tests/macros.rs

@@ -67,12 +67,12 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 17) '{Foo(v...,2,])}': Foo
-    ![1; 4) 'Foo': Foo({unknown}) -> Foo
-    ![1; 16) 'Foo(vec![1,2,])': Foo
-    ![5; 15) 'vec![1,2,]': {unknown}
-    [156; 182) '{     ...,2); }': ()
-    [166; 167) 'x': Foo
+    !0..17 '{Foo(v...,2,])}': Foo
+    !1..4 'Foo': Foo({unknown}) -> Foo
+    !1..16 'Foo(vec![1,2,])': Foo
+    !5..15 'vec![1,2,]': {unknown}
+    156..182 '{     ...,2); }': ()
+    166..167 'x': Foo
     "###
     );
 }
@@ -100,14 +100,14 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 17) '{Foo(v...,2,])}': Foo
-    ![1; 4) 'Foo': Foo({unknown}) -> Foo
-    ![1; 16) 'Foo(vec![1,2,])': Foo
-    ![5; 15) 'vec![1,2,]': {unknown}
-    [195; 251) '{     ...,2); }': ()
-    [205; 206) 'x': Foo
-    [228; 229) 'y': {unknown}
-    [232; 248) 'crate:...!(1,2)': {unknown}
+    !0..17 '{Foo(v...,2,])}': Foo
+    !1..4 'Foo': Foo({unknown}) -> Foo
+    !1..16 'Foo(vec![1,2,])': Foo
+    !5..15 'vec![1,2,]': {unknown}
+    195..251 '{     ...,2); }': ()
+    205..206 'x': Foo
+    228..229 'y': {unknown}
+    232..248 'crate:...!(1,2)': {unknown}
     "###
     );
 }
@@ -131,11 +131,11 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 5) '42i32': i32
-    ![0; 5) '42i32': i32
-    [111; 164) '{     ...!(); }': ()
-    [121; 122) 'x': i32
-    [148; 149) 'y': i32
+    !0..5 '42i32': i32
+    !0..5 '42i32': i32
+    111..164 '{     ...!(); }': ()
+    121..122 'x': i32
+    148..149 'y': i32
     "###
     );
 }
@@ -172,51 +172,51 @@ fn spam() {
 }
 "#),
         @r###"
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    ![0; 6) '1isize': isize
-    [54; 457) '{     ...!(); }': !
-    [88; 109) 'spam!(...am!())': {unknown}
-    [115; 134) 'for _ ...!() {}': ()
-    [119; 120) '_': {unknown}
-    [132; 134) '{}': ()
-    [139; 149) '|| spam!()': || -> isize
-    [155; 171) 'while ...!() {}': ()
-    [169; 171) '{}': ()
-    [176; 189) 'break spam!()': !
-    [195; 209) 'return spam!()': !
-    [215; 269) 'match ...     }': isize
-    [239; 240) '_': isize
-    [274; 290) 'spam!(...am!())': {unknown}
-    [296; 318) 'Spam {...m!() }': {unknown}
-    [324; 340) 'spam!(...am!()]': {unknown}
-    [365; 381) 'spam!(... usize': usize
-    [387; 395) '&spam!()': &isize
-    [401; 409) '-spam!()': isize
-    [415; 431) 'spam!(...pam!()': {unknown}
-    [437; 454) 'spam!(...pam!()': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    !0..6 '1isize': isize
+    54..457 '{     ...!(); }': !
+    88..109 'spam!(...am!())': {unknown}
+    115..134 'for _ ...!() {}': ()
+    119..120 '_': {unknown}
+    132..134 '{}': ()
+    139..149 '|| spam!()': || -> isize
+    155..171 'while ...!() {}': ()
+    169..171 '{}': ()
+    176..189 'break spam!()': !
+    195..209 'return spam!()': !
+    215..269 'match ...     }': isize
+    239..240 '_': isize
+    274..290 'spam!(...am!())': {unknown}
+    296..318 'Spam {...m!() }': {unknown}
+    324..340 'spam!(...am!()]': {unknown}
+    365..381 'spam!(... usize': usize
+    387..395 '&spam!()': &isize
+    401..409 '-spam!()': isize
+    415..431 'spam!(...pam!()': {unknown}
+    437..454 'spam!(...pam!()': isize
     "###
     );
 }
@@ -244,9 +244,9 @@ fn foo() {
 }
 "#),
         @r###"
-    ![0; 5) '42i32': i32
-    [171; 206) '{     ...32); }': ()
-    [181; 184) 'foo': i32
+    !0..5 '42i32': i32
+    171..206 '{     ...32); }': ()
+    181..184 'foo': i32
     "###
     );
 }
@@ -357,12 +357,12 @@ fn main() {
 }
 "#),
         @r###"
-        [159; 164) '{ 0 }': u64
-        [161; 162) '0': u64
-        [175; 197) '{     ...f(); }': ()
-        [185; 187) '_a': u64
-        [191; 192) 'f': fn f() -> u64
-        [191; 194) 'f()': u64
+        159..164 '{ 0 }': u64
+        161..162 '0': u64
+        175..197 '{     ...f(); }': ()
+        185..187 '_a': u64
+        191..192 'f': fn f() -> u64
+        191..194 'f()': u64
     "###
     );
 }
@@ -379,10 +379,10 @@ macro_rules! foo {
 }
 "#),
         @r###"
-        ![0; 6) '1usize': usize
-        [11; 90) '{     ...!(); }': ()
-        [17; 66) 'macro_...     }': {unknown}
-        [75; 77) '_a': usize
+        !0..6 '1usize': usize
+        11..90 '{     ...!(); }': ()
+        17..66 'macro_...     }': {unknown}
+        75..77 '_a': usize
     "###
     );
 }
@@ -399,9 +399,9 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 1) '0': i32
-    [64; 88) '{     ...!(); }': ()
-    [74; 75) 'x': i32
+    !0..1 '0': i32
+    64..88 '{     ...!(); }': ()
+    74..75 'x': i32
     "###
     );
 }
@@ -418,9 +418,9 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 2) '""': &str
-    [64; 88) '{     ...!(); }': ()
-    [74; 75) 'x': &str
+    !0..2 '""': &str
+    64..88 '{     ...!(); }': ()
+    74..75 'x': &str
     "###
     );
 }
@@ -437,9 +437,9 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 1) '0': i32
-    [66; 92) '{     ...!(); }': ()
-    [76; 77) 'x': i32
+    !0..1 '0': i32
+    66..92 '{     ...!(); }': ()
+    76..77 'x': i32
     "###
     );
 }
@@ -456,9 +456,9 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 13) '"helloworld!"': &str
-    [66; 122) '{     ...")); }': ()
-    [76; 77) 'x': &str
+    !0..13 '"helloworld!"': &str
+    66..122 '{     ...")); }': ()
+    76..77 'x': &str
     "###
     );
 }
@@ -591,9 +591,9 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 13) '"helloworld!"': &str
-    [104; 161) '{     ...")); }': ()
-    [114; 115) 'x': &str
+    !0..13 '"helloworld!"': &str
+    104..161 '{     ...")); }': ()
+    114..115 'x': &str
     "###
     );
 }
@@ -611,9 +611,9 @@ fn main() {
 }
 "#),
         @r###"
-    ![0; 5) '"bar"': &str
-    [88; 116) '{     ...o"); }': ()
-    [98; 99) 'x': &str
+    !0..5 '"bar"': &str
+    88..116 '{     ...o"); }': ()
+    98..99 'x': &str
     "###
     );
 }
@@ -703,12 +703,12 @@ fn main() {
 }
 "#),
         @r###"
-    [52; 111) '{     ...  }; }': ()
-    [62; 63) 'x': u32
-    [66; 108) 'match ...     }': u32
-    [72; 74) '()': ()
-    [85; 92) 'unit!()': ()
-    [96; 101) '92u32': u32
+    52..111 '{     ...  }; }': ()
+    62..63 'x': u32
+    66..108 'match ...     }': u32
+    72..74 '()': ()
+    85..92 'unit!()': ()
+    96..101 '92u32': u32
     "###
     );
 }

crates/ra_hir_ty/src/tests/method_resolution.rs

@@ -22,14 +22,14 @@ fn test() {
 }
 "#),
         @r###"
-    [45; 49) 'self': &[T]
-    [56; 79) '{     ...     }': T
-    [66; 73) 'loop {}': !
-    [71; 73) '{}': ()
-    [133; 160) '{     ...o"); }': ()
-    [139; 149) '<[_]>::foo': fn foo<u8>(&[u8]) -> u8
-    [139; 157) '<[_]>:..."foo")': u8
-    [150; 156) 'b"foo"': &[u8]
+    45..49 'self': &[T]
+    56..79 '{     ...     }': T
+    66..73 'loop {}': !
+    71..73 '{}': ()
+    133..160 '{     ...o"); }': ()
+    139..149 '<[_]>::foo': fn foo<u8>(&[u8]) -> u8
+    139..157 '<[_]>:..."foo")': u8
+    150..156 'b"foo"': &[u8]
     "###
     );
 }
@@ -51,15 +51,15 @@ fn test() {
 }
 "#),
         @r###"
-    [49; 75) '{     ...     }': A
-    [59; 69) 'A { x: 0 }': A
-    [66; 67) '0': u32
-    [88; 122) '{     ...a.x; }': ()
-    [98; 99) 'a': A
-    [102; 108) 'A::new': fn new() -> A
-    [102; 110) 'A::new()': A
-    [116; 117) 'a': A
-    [116; 119) 'a.x': u32
+    49..75 '{     ...     }': A
+    59..69 'A { x: 0 }': A
+    66..67 '0': u32
+    88..122 '{     ...a.x; }': ()
+    98..99 'a': A
+    102..108 'A::new': fn new() -> A
+    102..110 'A::new()': A
+    116..117 'a': A
+    116..119 'a.x': u32
     "###
     );
 }
@@ -86,19 +86,19 @@ fn test() {
 }
 "#),
         @r###"
-    [47; 67) '{     ...     }': A
-    [57; 61) 'A::B': A
-    [88; 108) '{     ...     }': A
-    [98; 102) 'A::C': A
-    [121; 178) '{     ...  c; }': ()
-    [131; 132) 'a': A
-    [135; 139) 'A::b': fn b() -> A
-    [135; 141) 'A::b()': A
-    [147; 148) 'a': A
-    [158; 159) 'c': A
-    [162; 166) 'A::c': fn c() -> A
-    [162; 168) 'A::c()': A
-    [174; 175) 'c': A
+    47..67 '{     ...     }': A
+    57..61 'A::B': A
+    88..108 '{     ...     }': A
+    98..102 'A::C': A
+    121..178 '{     ...  c; }': ()
+    131..132 'a': A
+    135..139 'A::b': fn b() -> A
+    135..141 'A::b()': A
+    147..148 'a': A
+    158..159 'c': A
+    162..166 'A::c': fn c() -> A
+    162..168 'A::c()': A
+    174..175 'c': A
     "###
     );
 }
@@ -130,22 +130,22 @@ fn test() {
 }
 "#),
         @r###"
-    [56; 64) '{ A {} }': A
-    [58; 62) 'A {}': A
-    [126; 132) '{ 99 }': u32
-    [128; 130) '99': u32
-    [202; 210) '{ C {} }': C
-    [204; 208) 'C {}': C
-    [241; 325) '{     ...g(); }': ()
-    [251; 252) 'x': A
-    [255; 266) 'a::A::thing': fn thing() -> A
-    [255; 268) 'a::A::thing()': A
-    [278; 279) 'y': u32
-    [282; 293) 'b::B::thing': fn thing() -> u32
-    [282; 295) 'b::B::thing()': u32
-    [305; 306) 'z': C
-    [309; 320) 'c::C::thing': fn thing() -> C
-    [309; 322) 'c::C::thing()': C
+    56..64 '{ A {} }': A
+    58..62 'A {}': A
+    126..132 '{ 99 }': u32
+    128..130 '99': u32
+    202..210 '{ C {} }': C
+    204..208 'C {}': C
+    241..325 '{     ...g(); }': ()
+    251..252 'x': A
+    255..266 'a::A::thing': fn thing() -> A
+    255..268 'a::A::thing()': A
+    278..279 'y': u32
+    282..293 'b::B::thing': fn thing() -> u32
+    282..295 'b::B::thing()': u32
+    305..306 'z': C
+    309..320 'c::C::thing': fn thing() -> C
+    309..322 'c::C::thing()': C
     "###
     );
 }
@@ -169,15 +169,15 @@ fn test() {
 }
 "#),
         @r###"
-    [64; 67) 'val': T
-    [82; 109) '{     ...     }': Gen<T>
-    [92; 103) 'Gen { val }': Gen<T>
-    [98; 101) 'val': T
-    [123; 155) '{     ...32); }': ()
-    [133; 134) 'a': Gen<u32>
-    [137; 146) 'Gen::make': fn make<u32>(u32) -> Gen<u32>
-    [137; 152) 'Gen::make(0u32)': Gen<u32>
-    [147; 151) '0u32': u32
+    64..67 'val': T
+    82..109 '{     ...     }': Gen<T>
+    92..103 'Gen { val }': Gen<T>
+    98..101 'val': T
+    123..155 '{     ...32); }': ()
+    133..134 'a': Gen<u32>
+    137..146 'Gen::make': fn make<u32>(u32) -> Gen<u32>
+    137..152 'Gen::make(0u32)': Gen<u32>
+    147..151 '0u32': u32
     "###
     );
 }
@@ -201,13 +201,13 @@ fn test() {
 }
 "#),
         @r###"
-    [80; 104) '{     ...     }': Gen<T>
-    [90; 98) 'loop { }': !
-    [95; 98) '{ }': ()
-    [118; 146) '{     ...e(); }': ()
-    [128; 129) 'a': Gen<u32>
-    [132; 141) 'Gen::make': fn make<u32>() -> Gen<u32>
-    [132; 143) 'Gen::make()': Gen<u32>
+    80..104 '{     ...     }': Gen<T>
+    90..98 'loop { }': !
+    95..98 '{ }': ()
+    118..146 '{     ...e(); }': ()
+    128..129 'a': Gen<u32>
+    132..141 'Gen::make': fn make<u32>() -> Gen<u32>
+    132..143 'Gen::make()': Gen<u32>
     "###
     );
 }
@@ -255,13 +255,13 @@ fn test() {
 }
 "#),
         @r###"
-    [76; 100) '{     ...     }': Gen<T>
-    [86; 94) 'loop { }': !
-    [91; 94) '{ }': ()
-    [114; 149) '{     ...e(); }': ()
-    [124; 125) 'a': Gen<u32>
-    [128; 144) 'Gen::<...::make': fn make<u32>() -> Gen<u32>
-    [128; 146) 'Gen::<...make()': Gen<u32>
+    76..100 '{     ...     }': Gen<T>
+    86..94 'loop { }': !
+    91..94 '{ }': ()
+    114..149 '{     ...e(); }': ()
+    124..125 'a': Gen<u32>
+    128..144 'Gen::<...::make': fn make<u32>() -> Gen<u32>
+    128..146 'Gen::<...make()': Gen<u32>
     "###
     );
 }
@@ -286,13 +286,13 @@ fn test() {
 }
 "#),
         @r###"
-    [102; 126) '{     ...     }': Gen<u32, T>
-    [112; 120) 'loop { }': !
-    [117; 120) '{ }': ()
-    [140; 180) '{     ...e(); }': ()
-    [150; 151) 'a': Gen<u32, u64>
-    [154; 175) 'Gen::<...::make': fn make<u64>() -> Gen<u32, u64>
-    [154; 177) 'Gen::<...make()': Gen<u32, u64>
+    102..126 '{     ...     }': Gen<u32, T>
+    112..120 'loop { }': !
+    117..120 '{ }': ()
+    140..180 '{     ...e(); }': ()
+    150..151 'a': Gen<u32, u64>
+    154..175 'Gen::<...::make': fn make<u64>() -> Gen<u32, u64>
+    154..177 'Gen::<...make()': Gen<u32, u64>
     "###
     );
 }
@@ -340,13 +340,13 @@ fn test() {
 }
 "#),
         @r###"
-    [31; 35) 'self': &Self
-    [110; 114) 'self': &Self
-    [170; 228) '{     ...i128 }': ()
-    [176; 178) 'S1': S1
-    [176; 187) 'S1.method()': u32
-    [203; 205) 'S2': S2
-    [203; 214) 'S2.method()': i128
+    31..35 'self': &Self
+    110..114 'self': &Self
+    170..228 '{     ...i128 }': ()
+    176..178 'S1': S1
+    176..187 'S1.method()': u32
+    203..205 'S2': S2
+    203..214 'S2.method()': i128
     "###
     );
 }
@@ -387,14 +387,14 @@ fn test() {
 }
 "#),
         @r###"
-    [63; 67) 'self': &Self
-    [169; 173) 'self': &Self
-    [300; 337) '{     ...     }': ()
-    [310; 311) 'S': S
-    [310; 320) 'S.method()': u32
-    [416; 454) '{     ...     }': ()
-    [426; 427) 'S': S
-    [426; 436) 'S.method()': i128
+    63..67 'self': &Self
+    169..173 'self': &Self
+    300..337 '{     ...     }': ()
+    310..311 'S': S
+    310..320 'S.method()': u32
+    416..454 '{     ...     }': ()
+    426..427 'S': S
+    426..436 'S.method()': i128
     "###
     );
 }
@@ -414,10 +414,10 @@ fn test() {
 }
 "#),
         @r###"
-    [33; 37) 'self': &Self
-    [92; 111) '{     ...d(); }': ()
-    [98; 99) 'S': S
-    [98; 108) 'S.method()': u32
+    33..37 'self': &Self
+    92..111 '{     ...d(); }': ()
+    98..99 'S': S
+    98..108 'S.method()': u32
     "###
     );
 }
@@ -443,17 +443,17 @@ fn test() {
 }
 "#),
         @r###"
-    [43; 47) 'self': &Self
-    [82; 86) 'self': &Self
-    [210; 361) '{     ..., i8 }': ()
-    [216; 218) 'S1': S1
-    [216; 228) 'S1.method1()': (u8, u16, u32)
-    [250; 252) 'S1': S1
-    [250; 262) 'S1.method2()': (u32, u16, u8)
-    [284; 286) 'S2': S2
-    [284; 296) 'S2.method1()': (i8, i16, {unknown})
-    [324; 326) 'S2': S2
-    [324; 336) 'S2.method2()': ({unknown}, i16, i8)
+    43..47 'self': &Self
+    82..86 'self': &Self
+    210..361 '{     ..., i8 }': ()
+    216..218 'S1': S1
+    216..228 'S1.method1()': (u8, u16, u32)
+    250..252 'S1': S1
+    250..262 'S1.method2()': (u32, u16, u8)
+    284..286 'S2': S2
+    284..296 'S2.method1()': (i8, i16, {unknown})
+    324..326 'S2': S2
+    324..336 'S2.method2()': ({unknown}, i16, i8)
     "###
     );
 }
@@ -473,12 +473,12 @@ fn test() {
 }
 "#),
         @r###"
-    [33; 37) 'self': &Self
-    [102; 127) '{     ...d(); }': ()
-    [108; 109) 'S': S<u32>(u32) -> S<u32>
-    [108; 115) 'S(1u32)': S<u32>
-    [108; 124) 'S(1u32...thod()': u32
-    [110; 114) '1u32': u32
+    33..37 'self': &Self
+    102..127 '{     ...d(); }': ()
+    108..109 'S': S<u32>(u32) -> S<u32>
+    108..115 'S(1u32)': S<u32>
+    108..124 'S(1u32...thod()': u32
+    110..114 '1u32': u32
     "###
     );
 }
@@ -499,16 +499,16 @@ fn test() {
 }
 "#),
         @r###"
-    [87; 193) '{     ...t(); }': ()
-    [97; 99) 's1': S
-    [105; 121) 'Defaul...efault': fn default<S>() -> S
-    [105; 123) 'Defaul...ault()': S
-    [133; 135) 's2': S
-    [138; 148) 'S::default': fn default<S>() -> S
-    [138; 150) 'S::default()': S
-    [160; 162) 's3': S
-    [165; 188) '<S as ...efault': fn default<S>() -> S
-    [165; 190) '<S as ...ault()': S
+    87..193 '{     ...t(); }': ()
+    97..99 's1': S
+    105..121 'Defaul...efault': fn default<S>() -> S
+    105..123 'Defaul...ault()': S
+    133..135 's2': S
+    138..148 'S::default': fn default<S>() -> S
+    138..150 'S::default()': S
+    160..162 's3': S
+    165..188 '<S as ...efault': fn default<S>() -> S
+    165..190 '<S as ...ault()': S
     "###
     );
 }
@@ -531,16 +531,16 @@ fn test() {
 }
 "#),
         @r###"
-    [127; 211) '{     ...e(); }': ()
-    [137; 138) 'a': u32
-    [141; 148) 'S::make': fn make<S, u32>() -> u32
-    [141; 150) 'S::make()': u32
-    [160; 161) 'b': u64
-    [164; 178) 'G::<u64>::make': fn make<G<u64>, u64>() -> u64
-    [164; 180) 'G::<u6...make()': u64
-    [190; 191) 'c': f64
-    [199; 206) 'G::make': fn make<G<f64>, f64>() -> f64
-    [199; 208) 'G::make()': f64
+    127..211 '{     ...e(); }': ()
+    137..138 'a': u32
+    141..148 'S::make': fn make<S, u32>() -> u32
+    141..150 'S::make()': u32
+    160..161 'b': u64
+    164..178 'G::<u64>::make': fn make<G<u64>, u64>() -> u64
+    164..180 'G::<u6...make()': u64
+    190..191 'c': f64
+    199..206 'G::make': fn make<G<f64>, f64>() -> f64
+    199..208 'G::make()': f64
     "###
     );
 }
@@ -565,22 +565,22 @@ fn test() {
 }
 "#),
         @r###"
-    [135; 313) '{     ...e(); }': ()
-    [145; 146) 'a': (u32, i64)
-    [149; 163) 'S::make::<i64>': fn make<S, u32, i64>() -> (u32, i64)
-    [149; 165) 'S::mak...i64>()': (u32, i64)
-    [175; 176) 'b': (u32, i64)
-    [189; 196) 'S::make': fn make<S, u32, i64>() -> (u32, i64)
-    [189; 198) 'S::make()': (u32, i64)
-    [208; 209) 'c': (u32, i64)
-    [212; 233) 'G::<u3...:<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
-    [212; 235) 'G::<u3...i64>()': (u32, i64)
-    [245; 246) 'd': (u32, i64)
-    [259; 273) 'G::make::<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
-    [259; 275) 'G::mak...i64>()': (u32, i64)
-    [285; 286) 'e': (u32, i64)
-    [301; 308) 'G::make': fn make<G<u32>, u32, i64>() -> (u32, i64)
-    [301; 310) 'G::make()': (u32, i64)
+    135..313 '{     ...e(); }': ()
+    145..146 'a': (u32, i64)
+    149..163 'S::make::<i64>': fn make<S, u32, i64>() -> (u32, i64)
+    149..165 'S::mak...i64>()': (u32, i64)
+    175..176 'b': (u32, i64)
+    189..196 'S::make': fn make<S, u32, i64>() -> (u32, i64)
+    189..198 'S::make()': (u32, i64)
+    208..209 'c': (u32, i64)
+    212..233 'G::<u3...:<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
+    212..235 'G::<u3...i64>()': (u32, i64)
+    245..246 'd': (u32, i64)
+    259..273 'G::make::<i64>': fn make<G<u32>, u32, i64>() -> (u32, i64)
+    259..275 'G::mak...i64>()': (u32, i64)
+    285..286 'e': (u32, i64)
+    301..308 'G::make': fn make<G<u32>, u32, i64>() -> (u32, i64)
+    301..310 'G::make()': (u32, i64)
     "###
     );
 }
@@ -599,10 +599,10 @@ fn test() {
 }
 "#),
         @r###"
-    [101; 127) '{     ...e(); }': ()
-    [111; 112) 'a': (S<i32>, i64)
-    [115; 122) 'S::make': fn make<S<i32>, i64>() -> (S<i32>, i64)
-    [115; 124) 'S::make()': (S<i32>, i64)
+    101..127 '{     ...e(); }': ()
+    111..112 'a': (S<i32>, i64)
+    115..122 'S::make': fn make<S<i32>, i64>() -> (S<i32>, i64)
+    115..124 'S::make()': (S<i32>, i64)
     "###
     );
 }
@@ -623,13 +623,13 @@ fn test() {
 }
 "#),
         @r###"
-    [131; 203) '{     ...e(); }': ()
-    [141; 142) 'a': (S<u64>, i64)
-    [158; 165) 'S::make': fn make<S<u64>, i64>() -> (S<u64>, i64)
-    [158; 167) 'S::make()': (S<u64>, i64)
-    [177; 178) 'b': (S<u32>, i32)
-    [191; 198) 'S::make': fn make<S<u32>, i32>() -> (S<u32>, i32)
-    [191; 200) 'S::make()': (S<u32>, i32)
+    131..203 '{     ...e(); }': ()
+    141..142 'a': (S<u64>, i64)
+    158..165 'S::make': fn make<S<u64>, i64>() -> (S<u64>, i64)
+    158..167 'S::make()': (S<u64>, i64)
+    177..178 'b': (S<u32>, i32)
+    191..198 'S::make': fn make<S<u32>, i32>() -> (S<u32>, i32)
+    191..200 'S::make()': (S<u32>, i32)
     "###
     );
 }
@@ -649,13 +649,13 @@ fn test() {
 }
 "#),
         @r###"
-    [107; 211) '{     ...>(); }': ()
-    [117; 118) 'a': (S<u64>, i64, u8)
-    [121; 150) '<S as ...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
-    [121; 152) '<S as ...<u8>()': (S<u64>, i64, u8)
-    [162; 163) 'b': (S<u64>, i64, u8)
-    [182; 206) 'Trait:...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
-    [182; 208) 'Trait:...<u8>()': (S<u64>, i64, u8)
+    107..211 '{     ...>(); }': ()
+    117..118 'a': (S<u64>, i64, u8)
+    121..150 '<S as ...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
+    121..152 '<S as ...<u8>()': (S<u64>, i64, u8)
+    162..163 'b': (S<u64>, i64, u8)
+    182..206 'Trait:...::<u8>': fn make<S<u64>, i64, u8>() -> (S<u64>, i64, u8)
+    182..208 'Trait:...<u8>()': (S<u64>, i64, u8)
     "###
     );
 }
@@ -672,11 +672,11 @@ fn test<T: Trait>(t: T) {
 }
 "#),
         @r###"
-    [30; 34) 'self': &Self
-    [64; 65) 't': T
-    [70; 89) '{     ...d(); }': ()
-    [76; 77) 't': T
-    [76; 86) 't.method()': u32
+    30..34 'self': &Self
+    64..65 't': T
+    70..89 '{     ...d(); }': ()
+    76..77 't': T
+    76..86 't.method()': u32
     "###
     );
 }
@@ -693,11 +693,11 @@ fn test<U, T: Trait<U>>(t: T) {
 }
 "#),
         @r###"
-    [33; 37) 'self': &Self
-    [71; 72) 't': T
-    [77; 96) '{     ...d(); }': ()
-    [83; 84) 't': T
-    [83; 93) 't.method()': U
+    33..37 'self': &Self
+    71..72 't': T
+    77..96 '{     ...d(); }': ()
+    83..84 't': T
+    83..93 't.method()': U
     "###
     );
 }
@@ -719,18 +719,18 @@ fn test() {
 }
 "#),
         @r###"
-    [29; 33) 'self': Self
-    [111; 202) '{     ...(S); }': ()
-    [121; 122) 'x': u32
-    [130; 131) 'S': S
-    [130; 138) 'S.into()': u32
-    [148; 149) 'y': u64
-    [157; 158) 'S': S
-    [157; 165) 'S.into()': u64
-    [175; 176) 'z': u64
-    [179; 196) 'Into::...::into': fn into<S, u64>(S) -> u64
-    [179; 199) 'Into::...nto(S)': u64
-    [197; 198) 'S': S
+    29..33 'self': Self
+    111..202 '{     ...(S); }': ()
+    121..122 'x': u32
+    130..131 'S': S
+    130..138 'S.into()': u32
+    148..149 'y': u64
+    157..158 'S': S
+    157..165 'S.into()': u64
+    175..176 'z': u64
+    179..196 'Into::...::into': fn into<S, u64>(S) -> u64
+    179..199 'Into::...nto(S)': u64
+    197..198 'S': S
     "###
     );
 }

crates/ra_hir_ty/src/tests/patterns.rs

@@ -30,54 +30,54 @@ fn test(x: &i32) {
 }
 "#),
         @r###"
-    [9; 10) 'x': &i32
-    [18; 369) '{     ...o_x; }': ()
-    [28; 29) 'y': &i32
-    [32; 33) 'x': &i32
-    [43; 45) '&z': &i32
-    [44; 45) 'z': i32
-    [48; 49) 'x': &i32
-    [59; 60) 'a': i32
-    [63; 64) 'z': i32
-    [74; 80) '(c, d)': (i32, &str)
-    [75; 76) 'c': i32
-    [78; 79) 'd': &str
-    [83; 95) '(1, "hello")': (i32, &str)
-    [84; 85) '1': i32
-    [87; 94) '"hello"': &str
-    [102; 152) 'for (e...     }': ()
-    [106; 112) '(e, f)': ({unknown}, {unknown})
-    [107; 108) 'e': {unknown}
-    [110; 111) 'f': {unknown}
-    [116; 125) 'some_iter': {unknown}
-    [126; 152) '{     ...     }': ()
-    [140; 141) 'g': {unknown}
-    [144; 145) 'e': {unknown}
-    [158; 205) 'if let...     }': ()
-    [165; 170) '[val]': [{unknown}]
-    [166; 169) 'val': {unknown}
-    [173; 176) 'opt': [{unknown}]
-    [177; 205) '{     ...     }': ()
-    [191; 192) 'h': {unknown}
-    [195; 198) 'val': {unknown}
-    [215; 221) 'lambda': |u64, u64, i32| -> i32
-    [224; 256) '|a: u6...b; c }': |u64, u64, i32| -> i32
-    [225; 226) 'a': u64
-    [233; 234) 'b': u64
-    [236; 237) 'c': i32
-    [244; 256) '{ a + b; c }': i32
-    [246; 247) 'a': u64
-    [246; 251) 'a + b': u64
-    [250; 251) 'b': u64
-    [253; 254) 'c': i32
-    [267; 279) 'ref ref_to_x': &&i32
-    [282; 283) 'x': &i32
-    [293; 302) 'mut mut_x': &i32
-    [305; 306) 'x': &i32
-    [316; 336) 'ref mu...f_to_x': &mut &i32
-    [339; 340) 'x': &i32
-    [350; 351) 'k': &mut &i32
-    [354; 366) 'mut_ref_to_x': &mut &i32
+    9..10 'x': &i32
+    18..369 '{     ...o_x; }': ()
+    28..29 'y': &i32
+    32..33 'x': &i32
+    43..45 '&z': &i32
+    44..45 'z': i32
+    48..49 'x': &i32
+    59..60 'a': i32
+    63..64 'z': i32
+    74..80 '(c, d)': (i32, &str)
+    75..76 'c': i32
+    78..79 'd': &str
+    83..95 '(1, "hello")': (i32, &str)
+    84..85 '1': i32
+    87..94 '"hello"': &str
+    102..152 'for (e...     }': ()
+    106..112 '(e, f)': ({unknown}, {unknown})
+    107..108 'e': {unknown}
+    110..111 'f': {unknown}
+    116..125 'some_iter': {unknown}
+    126..152 '{     ...     }': ()
+    140..141 'g': {unknown}
+    144..145 'e': {unknown}
+    158..205 'if let...     }': ()
+    165..170 '[val]': [{unknown}]
+    166..169 'val': {unknown}
+    173..176 'opt': [{unknown}]
+    177..205 '{     ...     }': ()
+    191..192 'h': {unknown}
+    195..198 'val': {unknown}
+    215..221 'lambda': |u64, u64, i32| -> i32
+    224..256 '|a: u6...b; c }': |u64, u64, i32| -> i32
+    225..226 'a': u64
+    233..234 'b': u64
+    236..237 'c': i32
+    244..256 '{ a + b; c }': i32
+    246..247 'a': u64
+    246..251 'a + b': u64
+    250..251 'b': u64
+    253..254 'c': i32
+    267..279 'ref ref_to_x': &&i32
+    282..283 'x': &i32
+    293..302 'mut mut_x': &i32
+    305..306 'x': &i32
+    316..336 'ref mu...f_to_x': &mut &i32
+    339..340 'x': &i32
+    350..351 'k': &mut &i32
+    354..366 'mut_ref_to_x': &mut &i32
     "###
     );
 }
@@ -97,47 +97,47 @@ fn test(x: &i32) {
 }
 "#, true),
         @r###"
-    [18; 29) '{ loop {} }': T
-    [20; 27) 'loop {}': !
-    [25; 27) '{}': ()
-    [38; 39) 'x': &i32
-    [47; 209) '{     ...) {} }': ()
-    [53; 76) 'if let...y() {}': ()
-    [60; 65) '"foo"': &str
-    [60; 65) '"foo"': &str
-    [68; 71) 'any': fn any<&str>() -> &str
-    [68; 73) 'any()': &str
-    [74; 76) '{}': ()
-    [81; 100) 'if let...y() {}': ()
-    [88; 89) '1': i32
-    [88; 89) '1': i32
-    [92; 95) 'any': fn any<i32>() -> i32
-    [92; 97) 'any()': i32
-    [98; 100) '{}': ()
-    [105; 127) 'if let...y() {}': ()
-    [112; 116) '1u32': u32
-    [112; 116) '1u32': u32
-    [119; 122) 'any': fn any<u32>() -> u32
-    [119; 124) 'any()': u32
-    [125; 127) '{}': ()
-    [132; 154) 'if let...y() {}': ()
-    [139; 143) '1f32': f32
-    [139; 143) '1f32': f32
-    [146; 149) 'any': fn any<f32>() -> f32
-    [146; 151) 'any()': f32
-    [152; 154) '{}': ()
-    [159; 180) 'if let...y() {}': ()
-    [166; 169) '1.0': f64
-    [166; 169) '1.0': f64
-    [172; 175) 'any': fn any<f64>() -> f64
-    [172; 177) 'any()': f64
-    [178; 180) '{}': ()
-    [185; 207) 'if let...y() {}': ()
-    [192; 196) 'true': bool
-    [192; 196) 'true': bool
-    [199; 202) 'any': fn any<bool>() -> bool
-    [199; 204) 'any()': bool
-    [205; 207) '{}': ()
+    18..29 '{ loop {} }': T
+    20..27 'loop {}': !
+    25..27 '{}': ()
+    38..39 'x': &i32
+    47..209 '{     ...) {} }': ()
+    53..76 'if let...y() {}': ()
+    60..65 '"foo"': &str
+    60..65 '"foo"': &str
+    68..71 'any': fn any<&str>() -> &str
+    68..73 'any()': &str
+    74..76 '{}': ()
+    81..100 'if let...y() {}': ()
+    88..89 '1': i32
+    88..89 '1': i32
+    92..95 'any': fn any<i32>() -> i32
+    92..97 'any()': i32
+    98..100 '{}': ()
+    105..127 'if let...y() {}': ()
+    112..116 '1u32': u32
+    112..116 '1u32': u32
+    119..122 'any': fn any<u32>() -> u32
+    119..124 'any()': u32
+    125..127 '{}': ()
+    132..154 'if let...y() {}': ()
+    139..143 '1f32': f32
+    139..143 '1f32': f32
+    146..149 'any': fn any<f32>() -> f32
+    146..151 'any()': f32
+    152..154 '{}': ()
+    159..180 'if let...y() {}': ()
+    166..169 '1.0': f64
+    166..169 '1.0': f64
+    172..175 'any': fn any<f64>() -> f64
+    172..177 'any()': f64
+    178..180 '{}': ()
+    185..207 'if let...y() {}': ()
+    192..196 'true': bool
+    192..196 'true': bool
+    199..202 'any': fn any<bool>() -> bool
+    199..204 'any()': bool
+    205..207 '{}': ()
     "###
     );
 }
@@ -152,16 +152,16 @@ fn test(x: &i32) {
 }
 "#, true),
         @r###"
-    [9; 10) 'x': &i32
-    [18; 76) '{     ...2 {} }': ()
-    [24; 46) 'if let...u32 {}': ()
-    [31; 36) '1..76': u32
-    [39; 43) '2u32': u32
-    [44; 46) '{}': ()
-    [51; 74) 'if let...u32 {}': ()
-    [58; 64) '1..=76': u32
-    [67; 71) '2u32': u32
-    [72; 74) '{}': ()
+    9..10 'x': &i32
+    18..76 '{     ...2 {} }': ()
+    24..46 'if let...u32 {}': ()
+    31..36 '1..76': u32
+    39..43 '2u32': u32
+    44..46 '{}': ()
+    51..74 'if let...u32 {}': ()
+    58..64 '1..=76': u32
+    67..71 '2u32': u32
+    72..74 '{}': ()
     "###
     );
 }
@@ -178,19 +178,19 @@ fn test() {
 }
 "#),
     @r###"
-    [28; 79) '{     ...(1); }': ()
-    [38; 42) 'A(n)': A<i32>
-    [40; 41) 'n': &i32
-    [45; 50) '&A(1)': &A<i32>
-    [46; 47) 'A': A<i32>(i32) -> A<i32>
-    [46; 50) 'A(1)': A<i32>
-    [48; 49) '1': i32
-    [60; 64) 'A(n)': A<i32>
-    [62; 63) 'n': &mut i32
-    [67; 76) '&mut A(1)': &mut A<i32>
-    [72; 73) 'A': A<i32>(i32) -> A<i32>
-    [72; 76) 'A(1)': A<i32>
-    [74; 75) '1': i32
+    28..79 '{     ...(1); }': ()
+    38..42 'A(n)': A<i32>
+    40..41 'n': &i32
+    45..50 '&A(1)': &A<i32>
+    46..47 'A': A<i32>(i32) -> A<i32>
+    46..50 'A(1)': A<i32>
+    48..49 '1': i32
+    60..64 'A(n)': A<i32>
+    62..63 'n': &mut i32
+    67..76 '&mut A(1)': &mut A<i32>
+    72..73 'A': A<i32>(i32) -> A<i32>
+    72..76 'A(1)': A<i32>
+    74..75 '1': i32
     "###
     );
 }
@@ -206,18 +206,18 @@ fn test() {
 }
 "#),
     @r###"
-    [11; 57) '{     ...= v; }': ()
-    [21; 22) 'v': &(i32, &i32)
-    [25; 33) '&(1, &2)': &(i32, &i32)
-    [26; 33) '(1, &2)': (i32, &i32)
-    [27; 28) '1': i32
-    [30; 32) '&2': &i32
-    [31; 32) '2': i32
-    [43; 50) '(_, &w)': (i32, &i32)
-    [44; 45) '_': i32
-    [47; 49) '&w': &i32
-    [48; 49) 'w': i32
-    [53; 54) 'v': &(i32, &i32)
+    11..57 '{     ...= v; }': ()
+    21..22 'v': &(i32, &i32)
+    25..33 '&(1, &2)': &(i32, &i32)
+    26..33 '(1, &2)': (i32, &i32)
+    27..28 '1': i32
+    30..32 '&2': &i32
+    31..32 '2': i32
+    43..50 '(_, &w)': (i32, &i32)
+    44..45 '_': i32
+    47..49 '&w': &i32
+    48..49 'w': i32
+    53..54 'v': &(i32, &i32)
     "###
     );
 }
@@ -242,30 +242,30 @@ fn test() {
 }
 "#),
     @r###"
-    [11; 210) '{     ...   } }': ()
-    [21; 26) 'slice': &[f64]
-    [37; 43) '&[0.0]': &[f64; _]
-    [38; 43) '[0.0]': [f64; _]
-    [39; 42) '0.0': f64
-    [49; 208) 'match ...     }': ()
-    [55; 60) 'slice': &[f64]
-    [71; 74) '&[]': &[f64]
-    [72; 74) '[]': [f64]
-    [78; 80) '{}': ()
-    [90; 94) '&[a]': &[f64]
-    [91; 94) '[a]': [f64]
-    [92; 93) 'a': f64
-    [98; 124) '{     ...     }': ()
-    [112; 113) 'a': f64
-    [134; 141) '&[b, c]': &[f64]
-    [135; 141) '[b, c]': [f64]
-    [136; 137) 'b': f64
-    [139; 140) 'c': f64
-    [145; 186) '{     ...     }': ()
-    [159; 160) 'b': f64
-    [174; 175) 'c': f64
-    [195; 196) '_': &[f64]
-    [200; 202) '{}': ()
+    11..210 '{     ...   } }': ()
+    21..26 'slice': &[f64]
+    37..43 '&[0.0]': &[f64; _]
+    38..43 '[0.0]': [f64; _]
+    39..42 '0.0': f64
+    49..208 'match ...     }': ()
+    55..60 'slice': &[f64]
+    71..74 '&[]': &[f64]
+    72..74 '[]': [f64]
+    78..80 '{}': ()
+    90..94 '&[a]': &[f64]
+    91..94 '[a]': [f64]
+    92..93 'a': f64
+    98..124 '{     ...     }': ()
+    112..113 'a': f64
+    134..141 '&[b, c]': &[f64]
+    135..141 '[b, c]': [f64]
+    136..137 'b': f64
+    139..140 'c': f64
+    145..186 '{     ...     }': ()
+    159..160 'b': f64
+    174..175 'c': f64
+    195..196 '_': &[f64]
+    200..202 '{}': ()
     "###
     );
 }
@@ -288,25 +288,25 @@ fn test() {
 }
 "#),
     @r###"
-    [11; 180) '{     ...   } }': ()
-    [21; 24) 'arr': [f64; _]
-    [37; 47) '[0.0, 1.0]': [f64; _]
-    [38; 41) '0.0': f64
-    [43; 46) '1.0': f64
-    [53; 178) 'match ...     }': ()
-    [59; 62) 'arr': [f64; _]
-    [73; 81) '[1.0, a]': [f64; _]
-    [74; 77) '1.0': f64
-    [74; 77) '1.0': f64
-    [79; 80) 'a': f64
-    [85; 111) '{     ...     }': ()
-    [99; 100) 'a': f64
-    [121; 127) '[b, c]': [f64; _]
-    [122; 123) 'b': f64
-    [125; 126) 'c': f64
-    [131; 172) '{     ...     }': ()
-    [145; 146) 'b': f64
-    [160; 161) 'c': f64
+    11..180 '{     ...   } }': ()
+    21..24 'arr': [f64; _]
+    37..47 '[0.0, 1.0]': [f64; _]
+    38..41 '0.0': f64
+    43..46 '1.0': f64
+    53..178 'match ...     }': ()
+    59..62 'arr': [f64; _]
+    73..81 '[1.0, a]': [f64; _]
+    74..77 '1.0': f64
+    74..77 '1.0': f64
+    79..80 'a': f64
+    85..111 '{     ...     }': ()
+    99..100 'a': f64
+    121..127 '[b, c]': [f64; _]
+    122..123 'b': f64
+    125..126 'c': f64
+    131..172 '{     ...     }': ()
+    145..146 'b': f64
+    160..161 'c': f64
     "###
     );
 }
@@ -339,31 +339,31 @@ fn test() {
 }
 "#),
         @r###"
-    [68; 289) '{     ...  d; }': ()
-    [78; 79) 'e': E
-    [82; 95) 'E::A { x: 3 }': E
-    [92; 93) '3': usize
-    [106; 113) 'S(y, z)': S
-    [108; 109) 'y': u32
-    [111; 112) 'z': E
-    [116; 119) 'foo': S
-    [129; 148) 'E::A {..._var }': E
-    [139; 146) 'new_var': usize
-    [151; 152) 'e': E
-    [159; 245) 'match ...     }': usize
-    [165; 166) 'e': E
-    [177; 187) 'E::A { x }': E
-    [184; 185) 'x': usize
-    [191; 192) 'x': usize
-    [202; 206) 'E::B': E
-    [210; 213) 'foo': bool
-    [217; 218) '1': usize
-    [228; 232) 'E::B': E
-    [236; 238) '10': usize
-    [256; 275) 'ref d ...{ .. }': &E
-    [264; 275) 'E::A { .. }': E
-    [278; 279) 'e': E
-    [285; 286) 'd': &E
+    68..289 '{     ...  d; }': ()
+    78..79 'e': E
+    82..95 'E::A { x: 3 }': E
+    92..93 '3': usize
+    106..113 'S(y, z)': S
+    108..109 'y': u32
+    111..112 'z': E
+    116..119 'foo': S
+    129..148 'E::A {..._var }': E
+    139..146 'new_var': usize
+    151..152 'e': E
+    159..245 'match ...     }': usize
+    165..166 'e': E
+    177..187 'E::A { x }': E
+    184..185 'x': usize
+    191..192 'x': usize
+    202..206 'E::B': E
+    210..213 'foo': bool
+    217..218 '1': usize
+    228..232 'E::B': E
+    236..238 '10': usize
+    256..275 'ref d ...{ .. }': &E
+    264..275 'E::A { .. }': E
+    278..279 'e': E
+    285..286 'd': &E
     "###
     );
 }
@@ -391,23 +391,23 @@ fn test(a1: A<u32>, o: Option<u64>) {
 }
 "#),
         @r###"
-    [79; 81) 'a1': A<u32>
-    [91; 92) 'o': Option<u64>
-    [107; 244) '{     ...  }; }': ()
-    [117; 128) 'A { x: x2 }': A<u32>
-    [124; 126) 'x2': u32
-    [131; 133) 'a1': A<u32>
-    [143; 161) 'A::<i6...: x3 }': A<i64>
-    [157; 159) 'x3': i64
-    [164; 174) 'A { x: 1 }': A<i64>
-    [171; 172) '1': i64
-    [180; 241) 'match ...     }': u64
-    [186; 187) 'o': Option<u64>
-    [198; 213) 'Option::Some(t)': Option<u64>
-    [211; 212) 't': u64
-    [217; 218) 't': u64
-    [228; 229) '_': Option<u64>
-    [233; 234) '1': u64
+    79..81 'a1': A<u32>
+    91..92 'o': Option<u64>
+    107..244 '{     ...  }; }': ()
+    117..128 'A { x: x2 }': A<u32>
+    124..126 'x2': u32
+    131..133 'a1': A<u32>
+    143..161 'A::<i6...: x3 }': A<i64>
+    157..159 'x3': i64
+    164..174 'A { x: 1 }': A<i64>
+    171..172 '1': i64
+    180..241 'match ...     }': u64
+    186..187 'o': Option<u64>
+    198..213 'Option::Some(t)': Option<u64>
+    211..212 't': u64
+    217..218 't': u64
+    228..229 '_': Option<u64>
+    233..234 '1': u64
     "###
     );
 }
@@ -431,27 +431,27 @@ fn test() {
 }
 "#, true),
         @r###"
-    [74; 75) '1': usize
-    [88; 310) '{     ...atch }': ()
-    [98; 99) 'a': Option<u32>
-    [115; 119) 'None': Option<u32>
-    [129; 130) 'b': Option<i64>
-    [146; 183) 'match ...     }': Option<i64>
-    [152; 153) 'a': Option<u32>
-    [164; 168) 'None': Option<u32>
-    [172; 176) 'None': Option<i64>
-    [193; 194) '_': ()
-    [201; 224) 'match ... Foo }': Foo
-    [207; 209) '()': ()
-    [212; 215) 'Foo': Foo
-    [219; 222) 'Foo': Foo
-    [255; 256) '_': ()
-    [263; 286) 'match ... Bar }': usize
-    [269; 271) '()': ()
-    [274; 277) 'Bar': usize
-    [281; 284) 'Bar': usize
-    [201; 224): expected (), got Foo
-    [263; 286): expected (), got usize
+    74..75 '1': usize
+    88..310 '{     ...atch }': ()
+    98..99 'a': Option<u32>
+    115..119 'None': Option<u32>
+    129..130 'b': Option<i64>
+    146..183 'match ...     }': Option<i64>
+    152..153 'a': Option<u32>
+    164..168 'None': Option<u32>
+    172..176 'None': Option<i64>
+    193..194 '_': ()
+    201..224 'match ... Foo }': Foo
+    207..209 '()': ()
+    212..215 'Foo': Foo
+    219..222 'Foo': Foo
+    255..256 '_': ()
+    263..286 'match ... Bar }': usize
+    269..271 '()': ()
+    274..277 'Bar': usize
+    281..284 'Bar': usize
+    201..224: expected (), got Foo
+    263..286: expected (), got usize
     "###
     );
 }
@@ -469,15 +469,15 @@ fn main() {
     }
 }
     "#), @"
-        [28; 32) 'self': &S
-        [42; 51) '{ false }': bool
-        [44; 49) 'false': bool
-        [65; 116) '{     ...   } }': ()
-        [71; 114) 'match ...     }': ()
-        [77; 78) 'S': S
-        [89; 90) 's': S
-        [94; 95) 's': S
-        [94; 101) 's.foo()': bool
-        [105; 107) '()': ()
+        28..32 'self': &S
+        42..51 '{ false }': bool
+        44..49 'false': bool
+        65..116 '{     ...   } }': ()
+        71..114 'match ...     }': ()
+        77..78 'S': S
+        89..90 's': S
+        94..95 's': S
+        94..101 's.foo()': bool
+        105..107 '()': ()
     ")
 }

crates/ra_hir_ty/src/tests/regression.rs

@@ -14,11 +14,11 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 37) '{    l... {}; }': ()
-    [20; 21) 'x': ()
-    [24; 34) 'if true {}': ()
-    [27; 31) 'true': bool
-    [32; 34) '{}': ()
+    11..37 '{    l... {}; }': ()
+    20..21 'x': ()
+    24..34 'if true {}': ()
+    27..31 'true': bool
+    32..34 '{}': ()
     "###
     );
 }
@@ -34,10 +34,10 @@ fn test(x: X) {
 }
 "#),
         @r###"
-    [20; 21) 'x': X
-    [26; 47) '{     ...eld; }': ()
-    [32; 33) 'x': X
-    [32; 44) 'x.some_field': {unknown}
+    20..21 'x': X
+    26..47 '{     ...eld; }': ()
+    32..33 'x': X
+    32..44 'x.some_field': {unknown}
     "###
     );
 }
@@ -55,14 +55,14 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 89) '{     ...   } }': ()
-    [17; 21) 'X {}': {unknown}
-    [27; 87) 'match ...     }': ()
-    [33; 34) 'x': {unknown}
-    [45; 52) 'A::B {}': {unknown}
-    [56; 58) '()': ()
-    [68; 74) 'A::Y()': {unknown}
-    [78; 80) '()': ()
+    11..89 '{     ...   } }': ()
+    17..21 'X {}': {unknown}
+    27..87 'match ...     }': ()
+    33..34 'x': {unknown}
+    45..52 'A::B {}': {unknown}
+    56..58 '()': ()
+    68..74 'A::Y()': {unknown}
+    78..80 '()': ()
     "###
     );
 }
@@ -77,12 +77,12 @@ fn quux() {
 }
 "#),
         @r###"
-    [11; 41) '{     ...+ y; }': ()
-    [21; 22) 'y': i32
-    [25; 27) '92': i32
-    [33; 34) '1': i32
-    [33; 38) '1 + y': i32
-    [37; 38) 'y': i32
+    11..41 '{     ...+ y; }': ()
+    21..22 'y': i32
+    25..27 '92': i32
+    33..34 '1': i32
+    33..38 '1 + y': i32
+    37..38 'y': i32
     "###
     );
 }
@@ -99,13 +99,13 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 48) '{     ...&y]; }': ()
-    [21; 22) 'y': &{unknown}
-    [25; 32) 'unknown': &{unknown}
-    [38; 45) '[y, &y]': [&&{unknown}; _]
-    [39; 40) 'y': &{unknown}
-    [42; 44) '&y': &&{unknown}
-    [43; 44) 'y': &{unknown}
+    11..48 '{     ...&y]; }': ()
+    21..22 'y': &{unknown}
+    25..32 'unknown': &{unknown}
+    38..45 '[y, &y]': [&&{unknown}; _]
+    39..40 'y': &{unknown}
+    42..44 '&y': &&{unknown}
+    43..44 'y': &{unknown}
     "###
     );
 }
@@ -123,20 +123,20 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 80) '{     ...x)]; }': ()
-    [21; 22) 'x': &&{unknown}
-    [25; 32) 'unknown': &&{unknown}
-    [42; 43) 'y': &&{unknown}
-    [46; 53) 'unknown': &&{unknown}
-    [59; 77) '[(x, y..., &x)]': [(&&&{unknown}, &&&{unknown}); _]
-    [60; 66) '(x, y)': (&&&{unknown}, &&&{unknown})
-    [61; 62) 'x': &&{unknown}
-    [64; 65) 'y': &&{unknown}
-    [68; 76) '(&y, &x)': (&&&{unknown}, &&&{unknown})
-    [69; 71) '&y': &&&{unknown}
-    [70; 71) 'y': &&{unknown}
-    [73; 75) '&x': &&&{unknown}
-    [74; 75) 'x': &&{unknown}
+    11..80 '{     ...x)]; }': ()
+    21..22 'x': &&{unknown}
+    25..32 'unknown': &&{unknown}
+    42..43 'y': &&{unknown}
+    46..53 'unknown': &&{unknown}
+    59..77 '[(x, y..., &x)]': [(&&&{unknown}, &&&{unknown}); _]
+    60..66 '(x, y)': (&&&{unknown}, &&&{unknown})
+    61..62 'x': &&{unknown}
+    64..65 'y': &&{unknown}
+    68..76 '(&y, &x)': (&&&{unknown}, &&&{unknown})
+    69..71 '&y': &&&{unknown}
+    70..71 'y': &&{unknown}
+    73..75 '&x': &&&{unknown}
+    74..75 'x': &&{unknown}
     "###
     );
 }
@@ -158,12 +158,12 @@ fn write() {
 }
 "#),
         @r###"
-    [54; 139) '{     ...   } }': ()
-    [60; 137) 'match ...     }': ()
-    [66; 83) 'someth...nknown': Maybe<{unknown}>
-    [94; 124) 'Maybe:...thing)': Maybe<{unknown}>
-    [106; 123) 'ref mu...ething': &mut {unknown}
-    [128; 130) '()': ()
+    54..139 '{     ...   } }': ()
+    60..137 'match ...     }': ()
+    66..83 'someth...nknown': Maybe<{unknown}>
+    94..124 'Maybe:...thing)': Maybe<{unknown}>
+    106..123 'ref mu...ething': &mut {unknown}
+    128..130 '()': ()
     "###
     );
 }
@@ -179,13 +179,13 @@ fn test_line_buffer() {
 }
 "#),
         @r###"
-    [23; 53) '{     ...n']; }': ()
-    [29; 50) '&[0, b...b'\n']': &[u8; _]
-    [30; 50) '[0, b'...b'\n']': [u8; _]
-    [31; 32) '0': u8
-    [34; 39) 'b'\n'': u8
-    [41; 42) '1': u8
-    [44; 49) 'b'\n'': u8
+    23..53 '{     ...n']; }': ()
+    29..50 '&[0, b...b'\n']': &[u8; _]
+    30..50 '[0, b'...b'\n']': [u8; _]
+    31..32 '0': u8
+    34..39 'b'\n'': u8
+    41..42 '1': u8
+    44..49 'b'\n'': u8
     "###
     );
 }
@@ -202,14 +202,14 @@ pub fn compute() {
 }
 "#),
         @r###"
-    [18; 108) '{     ...   } }': ()
-    [24; 106) 'match ...     }': ()
-    [30; 37) 'nope!()': {unknown}
-    [48; 94) 'SizeSk...tail }': {unknown}
-    [82; 86) 'true': bool
-    [82; 86) 'true': bool
-    [88; 92) 'tail': {unknown}
-    [98; 100) '{}': ()
+    18..108 '{     ...   } }': ()
+    24..106 'match ...     }': ()
+    30..37 'nope!()': {unknown}
+    48..94 'SizeSk...tail }': {unknown}
+    82..86 'true': bool
+    82..86 'true': bool
+    88..92 'tail': {unknown}
+    98..100 '{}': ()
     "###
     );
 }
@@ -226,14 +226,14 @@ pub fn primitive_type() {
 }
 "#),
         @r###"
-    [25; 106) '{     ...   } }': ()
-    [31; 104) 'match ...     }': ()
-    [37; 42) '*self': {unknown}
-    [38; 42) 'self': {unknown}
-    [53; 91) 'Borrow...), ..}': {unknown}
-    [74; 86) 'Primitive(p)': {unknown}
-    [84; 85) 'p': {unknown}
-    [95; 97) '{}': ()
+    25..106 '{     ...   } }': ()
+    31..104 'match ...     }': ()
+    37..42 '*self': {unknown}
+    38..42 'self': {unknown}
+    53..91 'Borrow...), ..}': {unknown}
+    74..86 'Primitive(p)': {unknown}
+    84..85 'p': {unknown}
+    95..97 '{}': ()
     "###
     );
 }
@@ -260,29 +260,29 @@ fn extra_compiler_flags() {
 }
 "#),
         @r###"
-    [27; 323) '{     ...   } }': ()
-    [33; 321) 'for co...     }': ()
-    [37; 44) 'content': &{unknown}
-    [48; 61) 'doesnt_matter': {unknown}
-    [62; 321) '{     ...     }': ()
-    [76; 80) 'name': &&{unknown}
-    [83; 167) 'if doe...     }': &&{unknown}
-    [86; 99) 'doesnt_matter': bool
-    [100; 129) '{     ...     }': &&{unknown}
-    [114; 119) 'first': &&{unknown}
-    [135; 167) '{     ...     }': &&{unknown}
-    [149; 157) '&content': &&{unknown}
-    [150; 157) 'content': &{unknown}
-    [182; 189) 'content': &{unknown}
-    [192; 314) 'if ICE...     }': &{unknown}
-    [195; 232) 'ICE_RE..._VALUE': {unknown}
-    [195; 248) 'ICE_RE...&name)': bool
-    [242; 247) '&name': &&&{unknown}
-    [243; 247) 'name': &&{unknown}
-    [249; 277) '{     ...     }': &&{unknown}
-    [263; 267) 'name': &&{unknown}
-    [283; 314) '{     ...     }': &{unknown}
-    [297; 304) 'content': &{unknown}
+    27..323 '{     ...   } }': ()
+    33..321 'for co...     }': ()
+    37..44 'content': &{unknown}
+    48..61 'doesnt_matter': {unknown}
+    62..321 '{     ...     }': ()
+    76..80 'name': &&{unknown}
+    83..167 'if doe...     }': &&{unknown}
+    86..99 'doesnt_matter': bool
+    100..129 '{     ...     }': &&{unknown}
+    114..119 'first': &&{unknown}
+    135..167 '{     ...     }': &&{unknown}
+    149..157 '&content': &&{unknown}
+    150..157 'content': &{unknown}
+    182..189 'content': &{unknown}
+    192..314 'if ICE...     }': &{unknown}
+    195..232 'ICE_RE..._VALUE': {unknown}
+    195..248 'ICE_RE...&name)': bool
+    242..247 '&name': &&&{unknown}
+    243..247 'name': &&{unknown}
+    249..277 '{     ...     }': &&{unknown}
+    263..267 'name': &&{unknown}
+    283..314 '{     ...     }': &{unknown}
+    297..304 'content': &{unknown}
     "###
     );
 }
@@ -303,11 +303,11 @@ fn test<R>(query_response: Canonical<QueryResponse<R>>) {
 }
 "#),
         @r###"
-    [92; 106) 'query_response': Canonical<QueryResponse<R>>
-    [137; 167) '{     ...lue; }': ()
-    [143; 164) '&query....value': &QueryResponse<R>
-    [144; 158) 'query_response': Canonical<QueryResponse<R>>
-    [144; 164) 'query_....value': QueryResponse<R>
+    92..106 'query_response': Canonical<QueryResponse<R>>
+    137..167 '{     ...lue; }': ()
+    143..164 '&query....value': &QueryResponse<R>
+    144..158 'query_response': Canonical<QueryResponse<R>>
+    144..164 'query_....value': QueryResponse<R>
     "###
     );
 }
@@ -322,9 +322,9 @@ fn test() {
 }
 "#),
         @r###"
-    ![0; 4) '0u32': u32
-    [45; 70) '{     ...()); }': ()
-    [55; 56) 'a': u32
+    !0..4 '0u32': u32
+    45..70 '{     ...()); }': ()
+    55..56 'a': u32
         "###
     );
 }
@@ -345,10 +345,10 @@ pub fn main_loop() {
 }
 "#),
     @r###"
-    [144; 146) '{}': ()
-    [169; 198) '{     ...t(); }': ()
-    [175; 193) 'FxHash...efault': fn default<{unknown}, FxHasher>() -> HashSet<{unknown}, FxHasher>
-    [175; 195) 'FxHash...ault()': HashSet<{unknown}, FxHasher>
+    144..146 '{}': ()
+    169..198 '{     ...t(); }': ()
+    175..193 'FxHash...efault': fn default<{unknown}, FxHasher>() -> HashSet<{unknown}, FxHasher>
+    175..195 'FxHash...ault()': HashSet<{unknown}, FxHasher>
     "###
     );
 }
@@ -375,13 +375,13 @@ fn end<W: Write>() {
     }"#
         ),
         @r###"
-    [147; 262) '{     ...     }': ()
-    [161; 164) 'end': fn end<{unknown}>()
-    [161; 166) 'end()': ()
-    [199; 252) '{     ...     }': ()
-    [221; 223) '_x': !
-    [230; 237) 'loop {}': !
-    [235; 237) '{}': ()
+    147..262 '{     ...     }': ()
+    161..164 'end': fn end<{unknown}>()
+    161..166 'end()': ()
+    199..252 '{     ...     }': ()
+    221..223 '_x': !
+    230..237 'loop {}': !
+    235..237 '{}': ()
     "###
     )
 }
@@ -396,9 +396,9 @@ fn test() {
 }
 "#),
         @r###"
-    [26; 53) '{     ...oo() }': ()
-    [32; 49) '<Trait...>::foo': {unknown}
-    [32; 51) '<Trait...:foo()': ()
+    26..53 '{     ...oo() }': ()
+    32..49 '<Trait...>::foo': {unknown}
+    32..51 '<Trait...:foo()': ()
     "###
     );
 }
@@ -496,13 +496,13 @@ fn foo(params: &[usize]) {
 }
 "#),
         @r###"
-    [8; 14) 'params': &[usize]
-    [26; 81) '{     ...   } }': ()
-    [32; 79) 'match ...     }': ()
-    [38; 44) 'params': &[usize]
-    [55; 67) '[ps @ .., _]': [usize]
-    [65; 66) '_': usize
-    [71; 73) '{}': ()
+    8..14 'params': &[usize]
+    26..81 '{     ...   } }': ()
+    32..79 'match ...     }': ()
+    38..44 'params': &[usize]
+    55..67 '[ps @ .., _]': [usize]
+    65..66 '_': usize
+    71..73 '{}': ()
     "###
     );
 }
@@ -523,13 +523,13 @@ fn foo(b: Bar) {
 }
 "#),
         @r###"
-    [36; 37) 'b': Bar
-    [44; 96) '{     ...   } }': ()
-    [50; 94) 'match ...     }': ()
-    [56; 57) 'b': Bar
-    [68; 81) 'Bar { a: .. }': Bar
-    [77; 79) '..': bool
-    [85; 87) '{}': ()
+    36..37 'b': Bar
+    44..96 '{     ...   } }': ()
+    50..94 'match ...     }': ()
+    56..57 'b': Bar
+    68..81 'Bar { a: .. }': Bar
+    77..79 '..': bool
+    85..87 '{}': ()
     "###
     );
 }
@@ -564,13 +564,13 @@ fn internal_into_boxed(self) -> Self::Output {
 }
 "#),
         @r###"
-    [66; 70) 'self': Self
-    [268; 272) 'self': Self
-    [467; 471) 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
-    [489; 523) '{     ...     }': ()
-    [499; 503) 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
-    [499; 509) 'self.order': O
-    [499; 516) 'self.o...into()': dyn QueryFragment<DB>
+    66..70 'self': Self
+    268..272 'self': Self
+    467..471 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
+    489..523 '{     ...     }': ()
+    499..503 'self': SelectStatement<F, S, D, W, O, LOf, {unknown}, {unknown}>
+    499..509 'self.order': O
+    499..516 'self.o...into()': dyn QueryFragment<DB>
     "###
     );
 }

crates/ra_hir_ty/src/tests/simple.rs

@@ -64,9 +64,9 @@ fn foo() {
 }
 "#,
     ), @r###"
-    [63; 93) '{     ...     }': ()
-    [73; 86) 'Self { x: 1 }': S<u32>
-    [83; 84) '1': u32
+    63..93 '{     ...     }': ()
+    73..86 'Self { x: 1 }': S<u32>
+    83..84 '1': u32
     "###);
 }
 
@@ -85,9 +85,9 @@ fn foo() {
 
 "#,
     ), @r###"
-    [64; 84) '{     ...1 }; }': ()
-    [70; 81) 'SS { x: 1 }': S<u32>
-    [78; 79) '1': u32
+    64..84 '{     ...1 }; }': ()
+    70..81 'SS { x: 1 }': S<u32>
+    78..79 '1': u32
     "###);
 }
 
@@ -175,19 +175,19 @@ fn test(a: u32, b: isize, c: !, d: &str) {
     1.0f32;
 }"#),
         @r###"
-    [9; 10) 'a': u32
-    [17; 18) 'b': isize
-    [27; 28) 'c': !
-    [33; 34) 'd': &str
-    [42; 121) '{     ...f32; }': !
-    [48; 49) 'a': u32
-    [55; 56) 'b': isize
-    [62; 63) 'c': !
-    [69; 70) 'd': &str
-    [76; 82) '1usize': usize
-    [88; 94) '1isize': isize
-    [100; 106) '"test"': &str
-    [112; 118) '1.0f32': f32
+    9..10 'a': u32
+    17..18 'b': isize
+    27..28 'c': !
+    33..34 'd': &str
+    42..121 '{     ...f32; }': !
+    48..49 'a': u32
+    55..56 'b': isize
+    62..63 'c': !
+    69..70 'd': &str
+    76..82 '1usize': usize
+    88..94 '1isize': isize
+    100..106 '"test"': &str
+    112..118 '1.0f32': f32
     "###
     );
 }
@@ -206,17 +206,17 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 118) '{     ...= e; }': ()
-    [21; 22) 'a': isize
-    [25; 31) '1isize': isize
-    [41; 42) 'b': usize
-    [52; 53) '1': usize
-    [63; 64) 'c': usize
-    [67; 68) 'b': usize
-    [78; 79) 'd': u32
-    [94; 95) 'e': i32
-    [105; 106) 'f': i32
-    [114; 115) 'e': i32
+    11..118 '{     ...= e; }': ()
+    21..22 'a': isize
+    25..31 '1isize': isize
+    41..42 'b': usize
+    52..53 '1': usize
+    63..64 'c': usize
+    67..68 'b': usize
+    78..79 'd': u32
+    94..95 'e': i32
+    105..106 'f': i32
+    114..115 'e': i32
     "###
     );
 }
@@ -237,15 +237,15 @@ fn test() {
 }
 "#),
         @r###"
-    [15; 20) '{ 1 }': u32
-    [17; 18) '1': u32
-    [48; 53) '{ 1 }': u32
-    [50; 51) '1': u32
-    [67; 91) '{     ...c(); }': ()
-    [73; 74) 'a': fn a() -> u32
-    [73; 76) 'a()': u32
-    [82; 86) 'b::c': fn c() -> u32
-    [82; 88) 'b::c()': u32
+    15..20 '{ 1 }': u32
+    17..18 '1': u32
+    48..53 '{ 1 }': u32
+    50..51 '1': u32
+    67..91 '{     ...c(); }': ()
+    73..74 'a': fn a() -> u32
+    73..76 'a()': u32
+    82..86 'b::c': fn c() -> u32
+    82..88 'b::c()': u32
     "###
     );
 }
@@ -266,13 +266,13 @@ fn test() {
 }
 "#),
         @r###"
-    [41; 46) '{ 1 }': i32
-    [43; 44) '1': i32
-    [60; 93) '{     ...o(); }': ()
-    [66; 72) 'S::foo': fn foo() -> i32
-    [66; 74) 'S::foo()': i32
-    [80; 88) '<S>::foo': fn foo() -> i32
-    [80; 90) '<S>::foo()': i32
+    41..46 '{ 1 }': i32
+    43..44 '1': i32
+    60..93 '{     ...o(); }': ()
+    66..72 'S::foo': fn foo() -> i32
+    66..74 'S::foo()': i32
+    80..88 '<S>::foo': fn foo() -> i32
+    80..90 '<S>::foo()': i32
     "###
     );
 }
@@ -297,22 +297,22 @@ fn test() {
 }
 "#),
         @r###"
-    [72; 154) '{     ...a.c; }': ()
-    [82; 83) 'c': C
-    [86; 87) 'C': C(usize) -> C
-    [86; 90) 'C(1)': C
-    [88; 89) '1': usize
-    [96; 97) 'B': B
-    [107; 108) 'a': A
-    [114; 133) 'A { b:...C(1) }': A
-    [121; 122) 'B': B
-    [127; 128) 'C': C(usize) -> C
-    [127; 131) 'C(1)': C
-    [129; 130) '1': usize
-    [139; 140) 'a': A
-    [139; 142) 'a.b': B
-    [148; 149) 'a': A
-    [148; 151) 'a.c': C
+    72..154 '{     ...a.c; }': ()
+    82..83 'c': C
+    86..87 'C': C(usize) -> C
+    86..90 'C(1)': C
+    88..89 '1': usize
+    96..97 'B': B
+    107..108 'a': A
+    114..133 'A { b:...C(1) }': A
+    121..122 'B': B
+    127..128 'C': C(usize) -> C
+    127..131 'C(1)': C
+    129..130 '1': usize
+    139..140 'a': A
+    139..142 'a.b': B
+    148..149 'a': A
+    148..151 'a.c': C
     "###
     );
 }
@@ -330,10 +330,10 @@ fn test() {
   E::V2;
 }"#),
         @r###"
-    [48; 82) '{   E:...:V2; }': ()
-    [52; 70) 'E::V1 ...d: 1 }': E
-    [67; 68) '1': u32
-    [74; 79) 'E::V2': E
+    48..82 '{   E:...:V2; }': ()
+    52..70 'E::V1 ...d: 1 }': E
+    67..68 '1': u32
+    74..79 'E::V2': E
     "###
     );
 }
@@ -357,29 +357,29 @@ fn test(a: &u32, b: &mut u32, c: *const u32, d: *mut u32) {
 }
 "#),
         @r###"
-    [9; 10) 'a': &u32
-    [18; 19) 'b': &mut u32
-    [31; 32) 'c': *const u32
-    [46; 47) 'd': *mut u32
-    [59; 150) '{     ... *d; }': ()
-    [65; 66) 'a': &u32
-    [72; 74) '*a': u32
-    [73; 74) 'a': &u32
-    [80; 82) '&a': &&u32
-    [81; 82) 'a': &u32
-    [88; 94) '&mut a': &mut &u32
-    [93; 94) 'a': &u32
-    [100; 101) 'b': &mut u32
-    [107; 109) '*b': u32
-    [108; 109) 'b': &mut u32
-    [115; 117) '&b': &&mut u32
-    [116; 117) 'b': &mut u32
-    [123; 124) 'c': *const u32
-    [130; 132) '*c': u32
-    [131; 132) 'c': *const u32
-    [138; 139) 'd': *mut u32
-    [145; 147) '*d': u32
-    [146; 147) 'd': *mut u32
+    9..10 'a': &u32
+    18..19 'b': &mut u32
+    31..32 'c': *const u32
+    46..47 'd': *mut u32
+    59..150 '{     ... *d; }': ()
+    65..66 'a': &u32
+    72..74 '*a': u32
+    73..74 'a': &u32
+    80..82 '&a': &&u32
+    81..82 'a': &u32
+    88..94 '&mut a': &mut &u32
+    93..94 'a': &u32
+    100..101 'b': &mut u32
+    107..109 '*b': u32
+    108..109 'b': &mut u32
+    115..117 '&b': &&mut u32
+    116..117 'b': &mut u32
+    123..124 'c': *const u32
+    130..132 '*c': u32
+    131..132 'c': *const u32
+    138..139 'd': *mut u32
+    145..147 '*d': u32
+    146..147 'd': *mut u32
     "###
     );
 }
@@ -409,20 +409,20 @@ mod foo {}
 }
 "##),
         @r###"
-    [11; 221) '{     ...o"#; }': ()
-    [17; 21) '5i32': i32
-    [27; 31) '5f32': f32
-    [37; 41) '5f64': f64
-    [47; 54) '"hello"': &str
-    [60; 68) 'b"bytes"': &[u8]
-    [74; 77) ''c'': char
-    [83; 87) 'b'b'': u8
-    [93; 97) '3.14': f64
-    [103; 107) '5000': i32
-    [113; 118) 'false': bool
-    [124; 128) 'true': bool
-    [134; 202) 'r#"   ...    "#': &str
-    [208; 218) 'br#"yolo"#': &[u8]
+    11..221 '{     ...o"#; }': ()
+    17..21 '5i32': i32
+    27..31 '5f32': f32
+    37..41 '5f64': f64
+    47..54 '"hello"': &str
+    60..68 'b"bytes"': &[u8]
+    74..77 ''c'': char
+    83..87 'b'b'': u8
+    93..97 '3.14': f64
+    103..107 '5000': i32
+    113..118 'false': bool
+    124..128 'true': bool
+    134..202 'r#"   ...    "#': &str
+    208..218 'br#"yolo"#': &[u8]
     "###
     );
 }
@@ -452,47 +452,47 @@ fn test(x: SomeType) {
 }
 "#),
         @r###"
-    [27; 28) 'x': SomeType
-    [40; 272) '{     ...lo"; }': ()
-    [50; 51) 'b': bool
-    [54; 59) 'false': bool
-    [69; 70) 'c': bool
-    [73; 75) '!b': bool
-    [74; 75) 'b': bool
-    [85; 86) 'a': i128
-    [89; 92) '100': i128
-    [102; 103) 'd': i128
-    [112; 114) '-a': i128
-    [113; 114) 'a': i128
-    [124; 125) 'e': i32
-    [128; 132) '-100': i32
-    [129; 132) '100': i32
-    [142; 143) 'f': bool
-    [146; 153) '!!!true': bool
-    [147; 153) '!!true': bool
-    [148; 153) '!true': bool
-    [149; 153) 'true': bool
-    [163; 164) 'g': i32
-    [167; 170) '!42': i32
-    [168; 170) '42': i32
-    [180; 181) 'h': u32
-    [184; 190) '!10u32': u32
-    [185; 190) '10u32': u32
-    [200; 201) 'j': i128
-    [204; 206) '!a': i128
-    [205; 206) 'a': i128
-    [212; 217) '-3.14': f64
-    [213; 217) '3.14': f64
-    [223; 225) '!3': i32
-    [224; 225) '3': i32
-    [231; 233) '-x': {unknown}
-    [232; 233) 'x': SomeType
-    [239; 241) '!x': {unknown}
-    [240; 241) 'x': SomeType
-    [247; 255) '-"hello"': {unknown}
-    [248; 255) '"hello"': &str
-    [261; 269) '!"hello"': {unknown}
-    [262; 269) '"hello"': &str
+    27..28 'x': SomeType
+    40..272 '{     ...lo"; }': ()
+    50..51 'b': bool
+    54..59 'false': bool
+    69..70 'c': bool
+    73..75 '!b': bool
+    74..75 'b': bool
+    85..86 'a': i128
+    89..92 '100': i128
+    102..103 'd': i128
+    112..114 '-a': i128
+    113..114 'a': i128
+    124..125 'e': i32
+    128..132 '-100': i32
+    129..132 '100': i32
+    142..143 'f': bool
+    146..153 '!!!true': bool
+    147..153 '!!true': bool
+    148..153 '!true': bool
+    149..153 'true': bool
+    163..164 'g': i32
+    167..170 '!42': i32
+    168..170 '42': i32
+    180..181 'h': u32
+    184..190 '!10u32': u32
+    185..190 '10u32': u32
+    200..201 'j': i128
+    204..206 '!a': i128
+    205..206 'a': i128
+    212..217 '-3.14': f64
+    213..217 '3.14': f64
+    223..225 '!3': i32
+    224..225 '3': i32
+    231..233 '-x': {unknown}
+    232..233 'x': SomeType
+    239..241 '!x': {unknown}
+    240..241 'x': SomeType
+    247..255 '-"hello"': {unknown}
+    248..255 '"hello"': &str
+    261..269 '!"hello"': {unknown}
+    262..269 '"hello"': &str
     "###
     );
 }
@@ -515,26 +515,26 @@ fn test() -> &mut &f64 {
 }
 "#),
         @r###"
-    [14; 15) 'x': u32
-    [22; 24) '{}': ()
-    [78; 231) '{     ...t &c }': &mut &f64
-    [88; 89) 'a': u32
-    [92; 108) 'unknow...nction': {unknown}
-    [92; 110) 'unknow...tion()': u32
-    [116; 125) 'takes_u32': fn takes_u32(u32)
-    [116; 128) 'takes_u32(a)': ()
-    [126; 127) 'a': u32
-    [138; 139) 'b': i32
-    [142; 158) 'unknow...nction': {unknown}
-    [142; 160) 'unknow...tion()': i32
-    [166; 184) 'S { i3...d: b }': S
-    [181; 182) 'b': i32
-    [194; 195) 'c': f64
-    [198; 214) 'unknow...nction': {unknown}
-    [198; 216) 'unknow...tion()': f64
-    [222; 229) '&mut &c': &mut &f64
-    [227; 229) '&c': &f64
-    [228; 229) 'c': f64
+    14..15 'x': u32
+    22..24 '{}': ()
+    78..231 '{     ...t &c }': &mut &f64
+    88..89 'a': u32
+    92..108 'unknow...nction': {unknown}
+    92..110 'unknow...tion()': u32
+    116..125 'takes_u32': fn takes_u32(u32)
+    116..128 'takes_u32(a)': ()
+    126..127 'a': u32
+    138..139 'b': i32
+    142..158 'unknow...nction': {unknown}
+    142..160 'unknow...tion()': i32
+    166..184 'S { i3...d: b }': S
+    181..182 'b': i32
+    194..195 'c': f64
+    198..214 'unknow...nction': {unknown}
+    198..216 'unknow...tion()': f64
+    222..229 '&mut &c': &mut &f64
+    227..229 '&c': &f64
+    228..229 'c': f64
     "###
     );
 }
@@ -561,16 +561,16 @@ fn test4() -> Self {
 }
 "#),
         @r###"
-    [34; 38) 'self': &S
-    [40; 61) '{     ...     }': ()
-    [50; 54) 'self': &S
-    [75; 79) 'self': &S
-    [88; 109) '{     ...     }': ()
-    [98; 102) 'self': &S
-    [133; 153) '{     ...     }': S
-    [143; 147) 'S {}': S
-    [177; 200) '{     ...     }': S
-    [187; 194) 'Self {}': S
+    34..38 'self': &S
+    40..61 '{     ...     }': ()
+    50..54 'self': &S
+    75..79 'self': &S
+    88..109 '{     ...     }': ()
+    98..102 'self': &S
+    133..153 '{     ...     }': S
+    143..147 'S {}': S
+    177..200 '{     ...     }': S
+    187..194 'Self {}': S
     "###
     );
 }
@@ -600,56 +600,56 @@ fn test() -> bool {
 }
 "#),
         @r###"
-    [6; 7) 'x': bool
-    [22; 34) '{     0i32 }': i32
-    [28; 32) '0i32': i32
-    [54; 370) '{     ... < 3 }': bool
-    [64; 65) 'x': bool
-    [68; 69) 'a': bool
-    [68; 74) 'a && b': bool
-    [73; 74) 'b': bool
-    [84; 85) 'y': bool
-    [88; 92) 'true': bool
-    [88; 101) 'true || false': bool
-    [96; 101) 'false': bool
-    [111; 112) 'z': bool
-    [115; 116) 'x': bool
-    [115; 121) 'x == y': bool
-    [120; 121) 'y': bool
-    [131; 132) 't': bool
-    [135; 136) 'x': bool
-    [135; 141) 'x != y': bool
-    [140; 141) 'y': bool
-    [151; 162) 'minus_forty': isize
-    [172; 180) '-40isize': isize
-    [173; 180) '40isize': isize
-    [190; 191) 'h': bool
-    [194; 205) 'minus_forty': isize
-    [194; 216) 'minus_...ONST_2': bool
-    [209; 216) 'CONST_2': isize
-    [226; 227) 'c': i32
-    [230; 231) 'f': fn f(bool) -> i32
-    [230; 239) 'f(z || y)': i32
-    [230; 243) 'f(z || y) + 5': i32
-    [232; 233) 'z': bool
-    [232; 238) 'z || y': bool
-    [237; 238) 'y': bool
-    [242; 243) '5': i32
-    [253; 254) 'd': {unknown}
-    [257; 258) 'b': {unknown}
-    [268; 269) 'g': ()
-    [272; 283) 'minus_forty': isize
-    [272; 288) 'minus_...y ^= i': ()
-    [287; 288) 'i': isize
-    [298; 301) 'ten': usize
-    [311; 313) '10': usize
-    [323; 336) 'ten_is_eleven': bool
-    [339; 342) 'ten': usize
-    [339; 354) 'ten == some_num': bool
-    [346; 354) 'some_num': usize
-    [361; 364) 'ten': usize
-    [361; 368) 'ten < 3': bool
-    [367; 368) '3': usize
+    6..7 'x': bool
+    22..34 '{     0i32 }': i32
+    28..32 '0i32': i32
+    54..370 '{     ... < 3 }': bool
+    64..65 'x': bool
+    68..69 'a': bool
+    68..74 'a && b': bool
+    73..74 'b': bool
+    84..85 'y': bool
+    88..92 'true': bool
+    88..101 'true || false': bool
+    96..101 'false': bool
+    111..112 'z': bool
+    115..116 'x': bool
+    115..121 'x == y': bool
+    120..121 'y': bool
+    131..132 't': bool
+    135..136 'x': bool
+    135..141 'x != y': bool
+    140..141 'y': bool
+    151..162 'minus_forty': isize
+    172..180 '-40isize': isize
+    173..180 '40isize': isize
+    190..191 'h': bool
+    194..205 'minus_forty': isize
+    194..216 'minus_...ONST_2': bool
+    209..216 'CONST_2': isize
+    226..227 'c': i32
+    230..231 'f': fn f(bool) -> i32
+    230..239 'f(z || y)': i32
+    230..243 'f(z || y) + 5': i32
+    232..233 'z': bool
+    232..238 'z || y': bool
+    237..238 'y': bool
+    242..243 '5': i32
+    253..254 'd': {unknown}
+    257..258 'b': {unknown}
+    268..269 'g': ()
+    272..283 'minus_forty': isize
+    272..288 'minus_...y ^= i': ()
+    287..288 'i': isize
+    298..301 'ten': usize
+    311..313 '10': usize
+    323..336 'ten_is_eleven': bool
+    339..342 'ten': usize
+    339..354 'ten == some_num': bool
+    346..354 'some_num': usize
+    361..364 'ten': usize
+    361..368 'ten < 3': bool
+    367..368 '3': usize
     "###
     );
 }
@@ -664,13 +664,13 @@ fn test() {
 }
 "#),
         @r###"
-    [11; 48) '{     ...5u8; }': ()
-    [17; 21) '1u32': u32
-    [17; 28) '1u32 << 5u8': u32
-    [25; 28) '5u8': u8
-    [34; 38) '1u32': u32
-    [34; 45) '1u32 >> 5u8': u32
-    [42; 45) '5u8': u8
+    11..48 '{     ...5u8; }': ()
+    17..21 '1u32': u32
+    17..28 '1u32 << 5u8': u32
+    25..28 '5u8': u8
+    34..38 '1u32': u32
+    34..45 '1u32 >> 5u8': u32
+    42..45 '5u8': u8
     "###
     );
 }
@@ -703,49 +703,49 @@ fn test2(a1: *const A, a2: *mut A) {
 }
 "#),
         @r###"
-    [44; 45) 'a': A
-    [50; 213) '{     ...5.b; }': ()
-    [60; 62) 'a1': A
-    [65; 66) 'a': A
-    [72; 74) 'a1': A
-    [72; 76) 'a1.b': B
-    [86; 88) 'a2': &A
-    [91; 93) '&a': &A
-    [92; 93) 'a': A
-    [99; 101) 'a2': &A
-    [99; 103) 'a2.b': B
-    [113; 115) 'a3': &mut A
-    [118; 124) '&mut a': &mut A
-    [123; 124) 'a': A
-    [130; 132) 'a3': &mut A
-    [130; 134) 'a3.b': B
-    [144; 146) 'a4': &&&&&&&A
-    [149; 157) '&&&&&&&a': &&&&&&&A
-    [150; 157) '&&&&&&a': &&&&&&A
-    [151; 157) '&&&&&a': &&&&&A
-    [152; 157) '&&&&a': &&&&A
-    [153; 157) '&&&a': &&&A
-    [154; 157) '&&a': &&A
-    [155; 157) '&a': &A
-    [156; 157) 'a': A
-    [163; 165) 'a4': &&&&&&&A
-    [163; 167) 'a4.b': B
-    [177; 179) 'a5': &mut &&mut &&mut A
-    [182; 200) '&mut &...&mut a': &mut &&mut &&mut A
-    [187; 200) '&&mut &&mut a': &&mut &&mut A
-    [188; 200) '&mut &&mut a': &mut &&mut A
-    [193; 200) '&&mut a': &&mut A
-    [194; 200) '&mut a': &mut A
-    [199; 200) 'a': A
-    [206; 208) 'a5': &mut &&mut &&mut A
-    [206; 210) 'a5.b': B
-    [224; 226) 'a1': *const A
-    [238; 240) 'a2': *mut A
-    [250; 273) '{     ...2.b; }': ()
-    [256; 258) 'a1': *const A
-    [256; 260) 'a1.b': B
-    [266; 268) 'a2': *mut A
-    [266; 270) 'a2.b': B
+    44..45 'a': A
+    50..213 '{     ...5.b; }': ()
+    60..62 'a1': A
+    65..66 'a': A
+    72..74 'a1': A
+    72..76 'a1.b': B
+    86..88 'a2': &A
+    91..93 '&a': &A
+    92..93 'a': A
+    99..101 'a2': &A
+    99..103 'a2.b': B
+    113..115 'a3': &mut A
+    118..124 '&mut a': &mut A
+    123..124 'a': A
+    130..132 'a3': &mut A
+    130..134 'a3.b': B
+    144..146 'a4': &&&&&&&A
+    149..157 '&&&&&&&a': &&&&&&&A
+    150..157 '&&&&&&a': &&&&&&A
+    151..157 '&&&&&a': &&&&&A
+    152..157 '&&&&a': &&&&A
+    153..157 '&&&a': &&&A
+    154..157 '&&a': &&A
+    155..157 '&a': &A
+    156..157 'a': A
+    163..165 'a4': &&&&&&&A
+    163..167 'a4.b': B
+    177..179 'a5': &mut &&mut &&mut A
+    182..200 '&mut &...&mut a': &mut &&mut &&mut A
+    187..200 '&&mut &&mut a': &&mut &&mut A
+    188..200 '&mut &&mut a': &mut &&mut A
+    193..200 '&&mut a': &&mut A
+    194..200 '&mut a': &mut A
+    199..200 'a': A
+    206..208 'a5': &mut &&mut &&mut A
+    206..210 'a5.b': B
+    224..226 'a1': *const A
+    238..240 'a2': *mut A
+    250..273 '{     ...2.b; }': ()
+    256..258 'a1': *const A
+    256..260 'a1.b': B
+    266..268 'a2': *mut A
+    266..270 'a2.b': B
     "###
     );
 }
@@ -782,30 +782,30 @@ fn test() {
 }
 "#),
         @r###"
-    [68; 72) 'self': &Self
-    [139; 143) 'self': &A<T>
-    [151; 174) '{     ...     }': &T
-    [161; 168) '&self.0': &T
-    [162; 166) 'self': &A<T>
-    [162; 168) 'self.0': T
-    [255; 259) 'self': &B<T>
-    [278; 301) '{     ...     }': &T
-    [288; 295) '&self.0': &T
-    [289; 293) 'self': &B<T>
-    [289; 295) 'self.0': T
-    [315; 353) '{     ...))); }': ()
-    [325; 326) 't': &i32
-    [329; 335) 'A::foo': fn foo<i32>(&A<i32>) -> &i32
-    [329; 350) 'A::foo...42))))': &i32
-    [336; 349) '&&B(B(A(42)))': &&B<B<A<i32>>>
-    [337; 349) '&B(B(A(42)))': &B<B<A<i32>>>
-    [338; 339) 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
-    [338; 349) 'B(B(A(42)))': B<B<A<i32>>>
-    [340; 341) 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
-    [340; 348) 'B(A(42))': B<A<i32>>
-    [342; 343) 'A': A<i32>(i32) -> A<i32>
-    [342; 347) 'A(42)': A<i32>
-    [344; 346) '42': i32
+    68..72 'self': &Self
+    139..143 'self': &A<T>
+    151..174 '{     ...     }': &T
+    161..168 '&self.0': &T
+    162..166 'self': &A<T>
+    162..168 'self.0': T
+    255..259 'self': &B<T>
+    278..301 '{     ...     }': &T
+    288..295 '&self.0': &T
+    289..293 'self': &B<T>
+    289..295 'self.0': T
+    315..353 '{     ...))); }': ()
+    325..326 't': &i32
+    329..335 'A::foo': fn foo<i32>(&A<i32>) -> &i32
+    329..350 'A::foo...42))))': &i32
+    336..349 '&&B(B(A(42)))': &&B<B<A<i32>>>
+    337..349 '&B(B(A(42)))': &B<B<A<i32>>>
+    338..339 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
+    338..349 'B(B(A(42)))': B<B<A<i32>>>
+    340..341 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
+    340..348 'B(A(42))': B<A<i32>>
+    342..343 'A': A<i32>(i32) -> A<i32>
+    342..347 'A(42)': A<i32>
+    344..346 '42': i32
     "###
     );
 }
@@ -842,34 +842,34 @@ fn test(a: A<i32>) {
 }
 "#),
         @r###"
-    [68; 72) 'self': &Self
-    [144; 148) 'self': &A<T>
-    [150; 151) 'x': &A<T>
-    [166; 187) '{     ...     }': &T
-    [176; 181) '&*x.0': &T
-    [177; 181) '*x.0': T
-    [178; 179) 'x': &A<T>
-    [178; 181) 'x.0': *mut T
-    [268; 272) 'self': &B<T>
-    [291; 314) '{     ...     }': &T
-    [301; 308) '&self.0': &T
-    [302; 306) 'self': &B<T>
-    [302; 308) 'self.0': T
-    [326; 327) 'a': A<i32>
-    [337; 383) '{     ...))); }': ()
-    [347; 348) 't': &i32
-    [351; 352) 'A': A<i32>(*mut i32) -> A<i32>
-    [351; 365) 'A(0 as *mut _)': A<i32>
-    [351; 380) 'A(0 as...B(a)))': &i32
-    [353; 354) '0': i32
-    [353; 364) '0 as *mut _': *mut i32
-    [370; 379) '&&B(B(a))': &&B<B<A<i32>>>
-    [371; 379) '&B(B(a))': &B<B<A<i32>>>
-    [372; 373) 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
-    [372; 379) 'B(B(a))': B<B<A<i32>>>
-    [374; 375) 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
-    [374; 378) 'B(a)': B<A<i32>>
-    [376; 377) 'a': A<i32>
+    68..72 'self': &Self
+    144..148 'self': &A<T>
+    150..151 'x': &A<T>
+    166..187 '{     ...     }': &T
+    176..181 '&*x.0': &T
+    177..181 '*x.0': T
+    178..179 'x': &A<T>
+    178..181 'x.0': *mut T
+    268..272 'self': &B<T>
+    291..314 '{     ...     }': &T
+    301..308 '&self.0': &T
+    302..306 'self': &B<T>
+    302..308 'self.0': T
+    326..327 'a': A<i32>
+    337..383 '{     ...))); }': ()
+    347..348 't': &i32
+    351..352 'A': A<i32>(*mut i32) -> A<i32>
+    351..365 'A(0 as *mut _)': A<i32>
+    351..380 'A(0 as...B(a)))': &i32
+    353..354 '0': i32
+    353..364 '0 as *mut _': *mut i32
+    370..379 '&&B(B(a))': &&B<B<A<i32>>>
+    371..379 '&B(B(a))': &B<B<A<i32>>>
+    372..373 'B': B<B<A<i32>>>(B<A<i32>>) -> B<B<A<i32>>>
+    372..379 'B(B(a))': B<B<A<i32>>>
+    374..375 'B': B<A<i32>>(A<i32>) -> B<A<i32>>
+    374..378 'B(a)': B<A<i32>>
+    376..377 'a': A<i32>
     "###
     );
 }
@@ -888,16 +888,16 @@ fn main(foo: Foo) {
 }
 "#),
         @r###"
-    [35; 38) 'foo': Foo
-    [45; 109) '{     ...   } }': ()
-    [51; 107) 'if tru...     }': ()
-    [54; 58) 'true': bool
-    [59; 67) '{      }': ()
-    [73; 107) 'if fal...     }': ()
-    [76; 81) 'false': bool
-    [82; 107) '{     ...     }': i32
-    [92; 95) 'foo': Foo
-    [92; 101) 'foo.field': i32
+    35..38 'foo': Foo
+    45..109 '{     ...   } }': ()
+    51..107 'if tru...     }': ()
+    54..58 'true': bool
+    59..67 '{      }': ()
+    73..107 'if fal...     }': ()
+    76..81 'false': bool
+    82..107 '{     ...     }': i32
+    92..95 'foo': Foo
+    92..101 'foo.field': i32
     "###
     )
 }
@@ -929,38 +929,38 @@ fn foo() {
     };
 }"#),
         @r###"
-    [10; 323) '{     ...  }; }': ()
-    [20; 23) '_x1': i32
-    [26; 80) 'if tru...     }': i32
-    [29; 33) 'true': bool
-    [34; 51) '{     ...     }': i32
-    [44; 45) '1': i32
-    [57; 80) '{     ...     }': !
-    [67; 73) 'return': !
-    [90; 93) '_x2': i32
-    [96; 149) 'if tru...     }': i32
-    [99; 103) 'true': bool
-    [104; 121) '{     ...     }': i32
-    [114; 115) '2': i32
-    [127; 149) '{     ...     }': !
-    [137; 143) 'return': !
-    [159; 162) '_x3': i32
-    [165; 247) 'match ...     }': i32
-    [171; 175) 'true': bool
-    [186; 190) 'true': bool
-    [186; 190) 'true': bool
-    [194; 195) '3': i32
-    [205; 206) '_': bool
-    [210; 241) '{     ...     }': !
-    [224; 230) 'return': !
-    [257; 260) '_x4': i32
-    [263; 320) 'match ...     }': i32
-    [269; 273) 'true': bool
-    [284; 288) 'true': bool
-    [284; 288) 'true': bool
-    [292; 293) '4': i32
-    [303; 304) '_': bool
-    [308; 314) 'return': !
+    10..323 '{     ...  }; }': ()
+    20..23 '_x1': i32
+    26..80 'if tru...     }': i32
+    29..33 'true': bool
+    34..51 '{     ...     }': i32
+    44..45 '1': i32
+    57..80 '{     ...     }': !
+    67..73 'return': !
+    90..93 '_x2': i32
+    96..149 'if tru...     }': i32
+    99..103 'true': bool
+    104..121 '{     ...     }': i32
+    114..115 '2': i32
+    127..149 '{     ...     }': !
+    137..143 'return': !
+    159..162 '_x3': i32
+    165..247 'match ...     }': i32
+    171..175 'true': bool
+    186..190 'true': bool
+    186..190 'true': bool
+    194..195 '3': i32
+    205..206 '_': bool
+    210..241 '{     ...     }': !
+    224..230 'return': !
+    257..260 '_x4': i32
+    263..320 'match ...     }': i32
+    269..273 'true': bool
+    284..288 'true': bool
+    284..288 'true': bool
+    292..293 '4': i32
+    303..304 '_': bool
+    308..314 'return': !
     "###
     )
 }
@@ -988,24 +988,24 @@ fn test(a: A) {
 }
 "#),
         @r###"
-    [32; 36) 'self': A
-    [38; 39) 'x': u32
-    [53; 55) '{}': ()
-    [103; 107) 'self': &A
-    [109; 110) 'x': u64
-    [124; 126) '{}': ()
-    [144; 145) 'a': A
-    [150; 198) '{     ...(1); }': ()
-    [156; 157) 'a': A
-    [156; 164) 'a.foo(1)': i32
-    [162; 163) '1': u32
-    [170; 181) '(&a).bar(1)': i64
-    [171; 173) '&a': &A
-    [172; 173) 'a': A
-    [179; 180) '1': u64
-    [187; 188) 'a': A
-    [187; 195) 'a.bar(1)': i64
-    [193; 194) '1': u64
+    32..36 'self': A
+    38..39 'x': u32
+    53..55 '{}': ()
+    103..107 'self': &A
+    109..110 'x': u64
+    124..126 '{}': ()
+    144..145 'a': A
+    150..198 '{     ...(1); }': ()
+    156..157 'a': A
+    156..164 'a.foo(1)': i32
+    162..163 '1': u32
+    170..181 '(&a).bar(1)': i64
+    171..173 '&a': &A
+    172..173 'a': A
+    179..180 '1': u64
+    187..188 'a': A
+    187..195 'a.bar(1)': i64
+    193..194 '1': u64
     "###
     );
 }
@@ -1024,11 +1024,11 @@ fn test() {
 }
 "#),
         @r###"
-    [40; 44) 'self': &str
-    [53; 55) '{}': ()
-    [69; 89) '{     ...o(); }': ()
-    [75; 80) '"foo"': &str
-    [75; 86) '"foo".foo()': i32
+    40..44 'self': &str
+    53..55 '{}': ()
+    69..89 '{     ...o(); }': ()
+    75..80 '"foo"': &str
+    75..86 '"foo".foo()': i32
     "###
     );
 }
@@ -1047,33 +1047,33 @@ fn test(x: &str, y: isize) {
 }
 "#),
         @r###"
-    [9; 10) 'x': &str
-    [18; 19) 'y': isize
-    [28; 170) '{     ...d"); }': ()
-    [38; 39) 'a': (u32, &str)
-    [55; 63) '(1, "a")': (u32, &str)
-    [56; 57) '1': u32
-    [59; 62) '"a"': &str
-    [73; 74) 'b': ((u32, &str), &str)
-    [77; 83) '(a, x)': ((u32, &str), &str)
-    [78; 79) 'a': (u32, &str)
-    [81; 82) 'x': &str
-    [93; 94) 'c': (isize, &str)
-    [97; 103) '(y, x)': (isize, &str)
-    [98; 99) 'y': isize
-    [101; 102) 'x': &str
-    [113; 114) 'd': ((isize, &str), &str)
-    [117; 123) '(c, x)': ((isize, &str), &str)
-    [118; 119) 'c': (isize, &str)
-    [121; 122) 'x': &str
-    [133; 134) 'e': (i32, &str)
-    [137; 145) '(1, "e")': (i32, &str)
-    [138; 139) '1': i32
-    [141; 144) '"e"': &str
-    [155; 156) 'f': ((i32, &str), &str)
-    [159; 167) '(e, "d")': ((i32, &str), &str)
-    [160; 161) 'e': (i32, &str)
-    [163; 166) '"d"': &str
+    9..10 'x': &str
+    18..19 'y': isize
+    28..170 '{     ...d"); }': ()
+    38..39 'a': (u32, &str)
+    55..63 '(1, "a")': (u32, &str)
+    56..57 '1': u32
+    59..62 '"a"': &str
+    73..74 'b': ((u32, &str), &str)
+    77..83 '(a, x)': ((u32, &str), &str)
+    78..79 'a': (u32, &str)
+    81..82 'x': &str
+    93..94 'c': (isize, &str)
+    97..103 '(y, x)': (isize, &str)
+    98..99 'y': isize
+    101..102 'x': &str
+    113..114 'd': ((isize, &str), &str)
+    117..123 '(c, x)': ((isize, &str), &str)
+    118..119 'c': (isize, &str)
+    121..122 'x': &str
+    133..134 'e': (i32, &str)
+    137..145 '(1, "e")': (i32, &str)
+    138..139 '1': i32
+    141..144 '"e"': &str
+    155..156 'f': ((i32, &str), &str)
+    159..167 '(e, "d")': ((i32, &str), &str)
+    160..161 'e': (i32, &str)
+    163..166 '"d"': &str
     "###
     );
 }
@@ -1101,58 +1101,58 @@ fn test(x: &str, y: isize) {
 }
 "#),
         @r###"
-    [9; 10) 'x': &str
-    [18; 19) 'y': isize
-    [28; 293) '{     ... []; }': ()
-    [38; 39) 'a': [&str; _]
-    [42; 45) '[x]': [&str; _]
-    [43; 44) 'x': &str
-    [55; 56) 'b': [[&str; _]; _]
-    [59; 65) '[a, a]': [[&str; _]; _]
-    [60; 61) 'a': [&str; _]
-    [63; 64) 'a': [&str; _]
-    [75; 76) 'c': [[[&str; _]; _]; _]
-    [79; 85) '[b, b]': [[[&str; _]; _]; _]
-    [80; 81) 'b': [[&str; _]; _]
-    [83; 84) 'b': [[&str; _]; _]
-    [96; 97) 'd': [isize; _]
-    [100; 112) '[y, 1, 2, 3]': [isize; _]
-    [101; 102) 'y': isize
-    [104; 105) '1': isize
-    [107; 108) '2': isize
-    [110; 111) '3': isize
-    [122; 123) 'd': [isize; _]
-    [126; 138) '[1, y, 2, 3]': [isize; _]
-    [127; 128) '1': isize
-    [130; 131) 'y': isize
-    [133; 134) '2': isize
-    [136; 137) '3': isize
-    [148; 149) 'e': [isize; _]
-    [152; 155) '[y]': [isize; _]
-    [153; 154) 'y': isize
-    [165; 166) 'f': [[isize; _]; _]
-    [169; 175) '[d, d]': [[isize; _]; _]
-    [170; 171) 'd': [isize; _]
-    [173; 174) 'd': [isize; _]
-    [185; 186) 'g': [[isize; _]; _]
-    [189; 195) '[e, e]': [[isize; _]; _]
-    [190; 191) 'e': [isize; _]
-    [193; 194) 'e': [isize; _]
-    [206; 207) 'h': [i32; _]
-    [210; 216) '[1, 2]': [i32; _]
-    [211; 212) '1': i32
-    [214; 215) '2': i32
-    [226; 227) 'i': [&str; _]
-    [230; 240) '["a", "b"]': [&str; _]
-    [231; 234) '"a"': &str
-    [236; 239) '"b"': &str
-    [251; 252) 'b': [[&str; _]; _]
-    [255; 265) '[a, ["b"]]': [[&str; _]; _]
-    [256; 257) 'a': [&str; _]
-    [259; 264) '["b"]': [&str; _]
-    [260; 263) '"b"': &str
-    [275; 276) 'x': [u8; _]
-    [288; 290) '[]': [u8; _]
+    9..10 'x': &str
+    18..19 'y': isize
+    28..293 '{     ... []; }': ()
+    38..39 'a': [&str; _]
+    42..45 '[x]': [&str; _]
+    43..44 'x': &str
+    55..56 'b': [[&str; _]; _]
+    59..65 '[a, a]': [[&str; _]; _]
+    60..61 'a': [&str; _]
+    63..64 'a': [&str; _]
+    75..76 'c': [[[&str; _]; _]; _]
+    79..85 '[b, b]': [[[&str; _]; _]; _]
+    80..81 'b': [[&str; _]; _]
+    83..84 'b': [[&str; _]; _]
+    96..97 'd': [isize; _]
+    100..112 '[y, 1, 2, 3]': [isize; _]
+    101..102 'y': isize
+    104..105 '1': isize
+    107..108 '2': isize
+    110..111 '3': isize
+    122..123 'd': [isize; _]
+    126..138 '[1, y, 2, 3]': [isize; _]
+    127..128 '1': isize
+    130..131 'y': isize
+    133..134 '2': isize
+    136..137 '3': isize
+    148..149 'e': [isize; _]
+    152..155 '[y]': [isize; _]
+    153..154 'y': isize
+    165..166 'f': [[isize; _]; _]
+    169..175 '[d, d]': [[isize; _]; _]
+    170..171 'd': [isize; _]
+    173..174 'd': [isize; _]
+    185..186 'g': [[isize; _]; _]
+    189..195 '[e, e]': [[isize; _]; _]
+    190..191 'e': [isize; _]
+    193..194 'e': [isize; _]
+    206..207 'h': [i32; _]
+    210..216 '[1, 2]': [i32; _]
+    211..212 '1': i32
+    214..215 '2': i32
+    226..227 'i': [&str; _]
+    230..240 '["a", "b"]': [&str; _]
+    231..234 '"a"': &str
+    236..239 '"b"': &str
+    251..252 'b': [[&str; _]; _]
+    255..265 '[a, ["b"]]': [[&str; _]; _]
+    256..257 'a': [&str; _]
+    259..264 '["b"]': [&str; _]
+    260..263 '"b"': &str
+    275..276 'x': [u8; _]
+    288..290 '[]': [u8; _]
     "###
     );
 }
@@ -1174,21 +1174,21 @@ fn test(a1: A<u32>, i: i32) {
 }
 "#),
         @r###"
-    [36; 38) 'a1': A<u32>
-    [48; 49) 'i': i32
-    [56; 147) '{     ...3.x; }': ()
-    [62; 64) 'a1': A<u32>
-    [62; 66) 'a1.x': u32
-    [76; 78) 'a2': A<i32>
-    [81; 91) 'A { x: i }': A<i32>
-    [88; 89) 'i': i32
-    [97; 99) 'a2': A<i32>
-    [97; 101) 'a2.x': i32
-    [111; 113) 'a3': A<i128>
-    [116; 134) 'A::<i1...x: 1 }': A<i128>
-    [131; 132) '1': i128
-    [140; 142) 'a3': A<i128>
-    [140; 144) 'a3.x': i128
+    36..38 'a1': A<u32>
+    48..49 'i': i32
+    56..147 '{     ...3.x; }': ()
+    62..64 'a1': A<u32>
+    62..66 'a1.x': u32
+    76..78 'a2': A<i32>
+    81..91 'A { x: i }': A<i32>
+    88..89 'i': i32
+    97..99 'a2': A<i32>
+    97..101 'a2.x': i32
+    111..113 'a3': A<i128>
+    116..134 'A::<i1...x: 1 }': A<i128>
+    131..132 '1': i128
+    140..142 'a3': A<i128>
+    140..144 'a3.x': i128
     "###
     );
 }
@@ -1211,22 +1211,22 @@ fn test() {
 }
 "#),
         @r###"
-    [76; 184) '{     ...one; }': ()
-    [82; 83) 'A': A<i32>(i32) -> A<i32>
-    [82; 87) 'A(42)': A<i32>
-    [84; 86) '42': i32
-    [93; 94) 'A': A<u128>(u128) -> A<u128>
-    [93; 102) 'A(42u128)': A<u128>
-    [95; 101) '42u128': u128
-    [108; 112) 'Some': Some<&str>(&str) -> Option<&str>
-    [108; 117) 'Some("x")': Option<&str>
-    [113; 116) '"x"': &str
-    [123; 135) 'Option::Some': Some<&str>(&str) -> Option<&str>
-    [123; 140) 'Option...e("x")': Option<&str>
-    [136; 139) '"x"': &str
-    [146; 150) 'None': Option<{unknown}>
-    [160; 161) 'x': Option<i64>
-    [177; 181) 'None': Option<i64>
+    76..184 '{     ...one; }': ()
+    82..83 'A': A<i32>(i32) -> A<i32>
+    82..87 'A(42)': A<i32>
+    84..86 '42': i32
+    93..94 'A': A<u128>(u128) -> A<u128>
+    93..102 'A(42u128)': A<u128>
+    95..101 '42u128': u128
+    108..112 'Some': Some<&str>(&str) -> Option<&str>
+    108..117 'Some("x")': Option<&str>
+    113..116 '"x"': &str
+    123..135 'Option::Some': Some<&str>(&str) -> Option<&str>
+    123..140 'Option...e("x")': Option<&str>
+    136..139 '"x"': &str
+    146..150 'None': Option<{unknown}>
+    160..161 'x': Option<i64>
+    177..181 'None': Option<i64>
     "###
     );
 }
@@ -1244,20 +1244,20 @@ fn test() {
 }
 "#),
         @r###"
-    [10; 11) 't': T
-    [21; 26) '{ t }': T
-    [23; 24) 't': T
-    [38; 98) '{     ...(1); }': ()
-    [44; 46) 'id': fn id<u32>(u32) -> u32
-    [44; 52) 'id(1u32)': u32
-    [47; 51) '1u32': u32
-    [58; 68) 'id::<i128>': fn id<i128>(i128) -> i128
-    [58; 71) 'id::<i128>(1)': i128
-    [69; 70) '1': i128
-    [81; 82) 'x': u64
-    [90; 92) 'id': fn id<u64>(u64) -> u64
-    [90; 95) 'id(1)': u64
-    [93; 94) '1': u64
+    10..11 't': T
+    21..26 '{ t }': T
+    23..24 't': T
+    38..98 '{     ...(1); }': ()
+    44..46 'id': fn id<u32>(u32) -> u32
+    44..52 'id(1u32)': u32
+    47..51 '1u32': u32
+    58..68 'id::<i128>': fn id<i128>(i128) -> i128
+    58..71 'id::<i128>(1)': i128
+    69..70 '1': i128
+    81..82 'x': u64
+    90..92 'id': fn id<u64>(u64) -> u64
+    90..95 'id(1)': u64
+    93..94 '1': u64
     "###
     );
 }
@@ -1291,38 +1291,38 @@ fn test() -> i128 {
 }
 "#),
         @r###"
-    [74; 78) 'self': A<X, Y>
-    [85; 107) '{     ...     }': X
-    [95; 99) 'self': A<X, Y>
-    [95; 101) 'self.x': X
-    [117; 121) 'self': A<X, Y>
-    [128; 150) '{     ...     }': Y
-    [138; 142) 'self': A<X, Y>
-    [138; 144) 'self.y': Y
-    [163; 167) 'self': A<X, Y>
-    [169; 170) 't': T
-    [188; 223) '{     ...     }': (X, Y, T)
-    [198; 217) '(self.....y, t)': (X, Y, T)
-    [199; 203) 'self': A<X, Y>
-    [199; 205) 'self.x': X
-    [207; 211) 'self': A<X, Y>
-    [207; 213) 'self.y': Y
-    [215; 216) 't': T
-    [245; 342) '{     ...(1); }': ()
-    [255; 256) 'a': A<u64, i64>
-    [259; 281) 'A { x:...1i64 }': A<u64, i64>
-    [266; 270) '1u64': u64
-    [275; 279) '1i64': i64
-    [287; 288) 'a': A<u64, i64>
-    [287; 292) 'a.x()': u64
-    [298; 299) 'a': A<u64, i64>
-    [298; 303) 'a.y()': i64
-    [309; 310) 'a': A<u64, i64>
-    [309; 319) 'a.z(1i128)': (u64, i64, i128)
-    [313; 318) '1i128': i128
-    [325; 326) 'a': A<u64, i64>
-    [325; 339) 'a.z::<u128>(1)': (u64, i64, u128)
-    [337; 338) '1': u128
+    74..78 'self': A<X, Y>
+    85..107 '{     ...     }': X
+    95..99 'self': A<X, Y>
+    95..101 'self.x': X
+    117..121 'self': A<X, Y>
+    128..150 '{     ...     }': Y
+    138..142 'self': A<X, Y>
+    138..144 'self.y': Y
+    163..167 'self': A<X, Y>
+    169..170 't': T
+    188..223 '{     ...     }': (X, Y, T)
+    198..217 '(self.....y, t)': (X, Y, T)
+    199..203 'self': A<X, Y>
+    199..205 'self.x': X
+    207..211 'self': A<X, Y>
+    207..213 'self.y': Y
+    215..216 't': T
+    245..342 '{     ...(1); }': ()
+    255..256 'a': A<u64, i64>
+    259..281 'A { x:...1i64 }': A<u64, i64>
+    266..270 '1u64': u64
+    275..279 '1i64': i64
+    287..288 'a': A<u64, i64>
+    287..292 'a.x()': u64
+    298..299 'a': A<u64, i64>
+    298..303 'a.y()': i64
+    309..310 'a': A<u64, i64>
+    309..319 'a.z(1i128)': (u64, i64, i128)
+    313..318 '1i128': i128
+    325..326 'a': A<u64, i64>
+    325..339 'a.z::<u128>(1)': (u64, i64, u128)
+    337..338 '1': u128
     "###
     );
 }
@@ -1344,15 +1344,15 @@ fn test(o: Option<u32>) {
 }
 "#),
         @r###"
-    [78; 82) 'self': &Option<T>
-    [98; 100) '{}': ()
-    [111; 112) 'o': Option<u32>
-    [127; 165) '{     ...f(); }': ()
-    [133; 146) '(&o).as_ref()': Option<&u32>
-    [134; 136) '&o': &Option<u32>
-    [135; 136) 'o': Option<u32>
-    [152; 153) 'o': Option<u32>
-    [152; 162) 'o.as_ref()': Option<&u32>
+    78..82 'self': &Option<T>
+    98..100 '{}': ()
+    111..112 'o': Option<u32>
+    127..165 '{     ...f(); }': ()
+    133..146 '(&o).as_ref()': Option<&u32>
+    134..136 '&o': &Option<u32>
+    135..136 'o': Option<u32>
+    152..153 'o': Option<u32>
+    152..162 'o.as_ref()': Option<&u32>
     "###
     );
 }
@@ -1381,35 +1381,35 @@ fn test() -> i128 {
 }
 "#),
         @r###"
-    [53; 57) 'self': A<T2>
-    [65; 87) '{     ...     }': T2
-    [75; 79) 'self': A<T2>
-    [75; 81) 'self.x': T2
-    [99; 100) 't': T
-    [110; 115) '{ t }': T
-    [112; 113) 't': T
-    [135; 261) '{     ....x() }': i128
-    [146; 147) 'x': i128
-    [150; 151) '1': i128
-    [162; 163) 'y': i128
-    [166; 168) 'id': fn id<i128>(i128) -> i128
-    [166; 171) 'id(x)': i128
-    [169; 170) 'x': i128
-    [182; 183) 'a': A<i128>
-    [186; 200) 'A { x: id(y) }': A<i128>
-    [193; 195) 'id': fn id<i128>(i128) -> i128
-    [193; 198) 'id(y)': i128
-    [196; 197) 'y': i128
-    [211; 212) 'z': i128
-    [215; 217) 'id': fn id<i128>(i128) -> i128
-    [215; 222) 'id(a.x)': i128
-    [218; 219) 'a': A<i128>
-    [218; 221) 'a.x': i128
-    [233; 234) 'b': A<i128>
-    [237; 247) 'A { x: z }': A<i128>
-    [244; 245) 'z': i128
-    [254; 255) 'b': A<i128>
-    [254; 259) 'b.x()': i128
+    53..57 'self': A<T2>
+    65..87 '{     ...     }': T2
+    75..79 'self': A<T2>
+    75..81 'self.x': T2
+    99..100 't': T
+    110..115 '{ t }': T
+    112..113 't': T
+    135..261 '{     ....x() }': i128
+    146..147 'x': i128
+    150..151 '1': i128
+    162..163 'y': i128
+    166..168 'id': fn id<i128>(i128) -> i128
+    166..171 'id(x)': i128
+    169..170 'x': i128
+    182..183 'a': A<i128>
+    186..200 'A { x: id(y) }': A<i128>
+    193..195 'id': fn id<i128>(i128) -> i128
+    193..198 'id(y)': i128
+    196..197 'y': i128
+    211..212 'z': i128
+    215..217 'id': fn id<i128>(i128) -> i128
+    215..222 'id(a.x)': i128
+    218..219 'a': A<i128>
+    218..221 'a.x': i128
+    233..234 'b': A<i128>
+    237..247 'A { x: z }': A<i128>
+    244..245 'z': i128
+    254..255 'b': A<i128>
+    254..259 'b.x()': i128
     "###
     );
 }
@@ -1447,16 +1447,16 @@ fn test() {
 }
 "#),
         @r###"
-    [52; 53) '1': u32
-    [105; 106) '2': u32
-    [213; 214) '5': u32
-    [229; 307) '{     ...:ID; }': ()
-    [239; 240) 'x': u32
-    [243; 254) 'Struct::FOO': u32
-    [264; 265) 'y': u32
-    [268; 277) 'Enum::BAR': u32
-    [287; 288) 'z': u32
-    [291; 304) 'TraitTest::ID': u32
+    52..53 '1': u32
+    105..106 '2': u32
+    213..214 '5': u32
+    229..307 '{     ...:ID; }': ()
+    239..240 'x': u32
+    243..254 'Struct::FOO': u32
+    264..265 'y': u32
+    268..277 'Enum::BAR': u32
+    287..288 'z': u32
+    291..304 'TraitTest::ID': u32
     "###
     );
 }
@@ -1479,22 +1479,22 @@ fn test(x: Foo, y: Bar<&str>, z: Baz<i8, u8>) {
 }
 "#),
         @r###"
-    [116; 117) 'x': A<u32, i128>
-    [124; 125) 'y': A<&str, u128>
-    [138; 139) 'z': A<u8, i8>
-    [154; 211) '{     ...z.y; }': ()
-    [160; 161) 'x': A<u32, i128>
-    [160; 163) 'x.x': u32
-    [169; 170) 'x': A<u32, i128>
-    [169; 172) 'x.y': i128
-    [178; 179) 'y': A<&str, u128>
-    [178; 181) 'y.x': &str
-    [187; 188) 'y': A<&str, u128>
-    [187; 190) 'y.y': u128
-    [196; 197) 'z': A<u8, i8>
-    [196; 199) 'z.x': u8
-    [205; 206) 'z': A<u8, i8>
-    [205; 208) 'z.y': i8
+    116..117 'x': A<u32, i128>
+    124..125 'y': A<&str, u128>
+    138..139 'z': A<u8, i8>
+    154..211 '{     ...z.y; }': ()
+    160..161 'x': A<u32, i128>
+    160..163 'x.x': u32
+    169..170 'x': A<u32, i128>
+    169..172 'x.y': i128
+    178..179 'y': A<&str, u128>
+    178..181 'y.x': &str
+    187..188 'y': A<&str, u128>
+    187..190 'y.y': u128
+    196..197 'z': A<u8, i8>
+    196..199 'z.x': u8
+    205..206 'z': A<u8, i8>
+    205..208 'z.y': i8
     "###
     )
 }
@@ -1509,8 +1509,8 @@ struct A<X> {}
 fn test(x: Foo) {}
 "#),
         @r###"
-    [59; 60) 'x': {unknown}
-    [67; 69) '{}': ()
+    59..60 'x': {unknown}
+    67..69 '{}': ()
     "###
     )
 }
@@ -1535,26 +1535,26 @@ fn test() {
 }
 "#),
         @r###"
-    [10; 11) 'x': T
-    [21; 30) '{     x }': T
-    [27; 28) 'x': T
-    [44; 45) 'x': &T
-    [56; 66) '{     *x }': T
-    [62; 64) '*x': T
-    [63; 64) 'x': &T
-    [78; 158) '{     ...(1); }': ()
-    [88; 89) 'y': u32
-    [92; 97) '10u32': u32
-    [103; 105) 'id': fn id<u32>(u32) -> u32
-    [103; 108) 'id(y)': u32
-    [106; 107) 'y': u32
-    [118; 119) 'x': bool
-    [128; 133) 'clone': fn clone<bool>(&bool) -> bool
-    [128; 136) 'clone(z)': bool
-    [134; 135) 'z': &bool
-    [142; 152) 'id::<i128>': fn id<i128>(i128) -> i128
-    [142; 155) 'id::<i128>(1)': i128
-    [153; 154) '1': i128
+    10..11 'x': T
+    21..30 '{     x }': T
+    27..28 'x': T
+    44..45 'x': &T
+    56..66 '{     *x }': T
+    62..64 '*x': T
+    63..64 'x': &T
+    78..158 '{     ...(1); }': ()
+    88..89 'y': u32
+    92..97 '10u32': u32
+    103..105 'id': fn id<u32>(u32) -> u32
+    103..108 'id(y)': u32
+    106..107 'y': u32
+    118..119 'x': bool
+    128..133 'clone': fn clone<bool>(&bool) -> bool
+    128..136 'clone(z)': bool
+    134..135 'z': &bool
+    142..152 'id::<i128>': fn id<i128>(i128) -> i128
+    142..155 'id::<i128>(1)': i128
+    153..154 '1': i128
     "###
     );
 }
@@ -1574,16 +1574,16 @@ fn test() {
 }
 "#),
         @r###"
-    [49; 50) '0': u32
-    [80; 83) '101': u32
-    [95; 213) '{     ...NST; }': ()
-    [138; 139) 'x': u32
-    [142; 153) 'LOCAL_CONST': u32
-    [163; 164) 'z': u32
-    [167; 179) 'GLOBAL_CONST': u32
-    [189; 191) 'id': u32
-    [194; 210) 'Foo::A..._CONST': u32
-    [126; 128) '99': u32
+    49..50 '0': u32
+    80..83 '101': u32
+    95..213 '{     ...NST; }': ()
+    138..139 'x': u32
+    142..153 'LOCAL_CONST': u32
+    163..164 'z': u32
+    167..179 'GLOBAL_CONST': u32
+    189..191 'id': u32
+    194..210 'Foo::A..._CONST': u32
+    126..128 '99': u32
     "###
     );
 }
@@ -1604,19 +1604,19 @@ fn test() {
 }
 "#),
         @r###"
-    [29; 32) '101': u32
-    [70; 73) '101': u32
-    [85; 280) '{     ...MUT; }': ()
-    [173; 174) 'x': u32
-    [177; 189) 'LOCAL_STATIC': u32
-    [199; 200) 'y': u32
-    [203; 219) 'LOCAL_...IC_MUT': u32
-    [229; 230) 'z': u32
-    [233; 246) 'GLOBAL_STATIC': u32
-    [256; 257) 'w': u32
-    [260; 277) 'GLOBAL...IC_MUT': u32
-    [118; 120) '99': u32
-    [161; 163) '99': u32
+    29..32 '101': u32
+    70..73 '101': u32
+    85..280 '{     ...MUT; }': ()
+    173..174 'x': u32
+    177..189 'LOCAL_STATIC': u32
+    199..200 'y': u32
+    203..219 'LOCAL_...IC_MUT': u32
+    229..230 'z': u32
+    233..246 'GLOBAL_STATIC': u32
+    256..257 'w': u32
+    260..277 'GLOBAL...IC_MUT': u32
+    118..120 '99': u32
+    161..163 '99': u32
     "###
     );
 }
@@ -1684,12 +1684,12 @@ fn foo() -> u32 {
 }
 "#),
         @r###"
-    [17; 59) '{     ...; }; }': ()
-    [27; 28) 'x': || -> usize
-    [31; 56) '|| -> ...n 1; }': || -> usize
-    [43; 56) '{ return 1; }': !
-    [45; 53) 'return 1': !
-    [52; 53) '1': usize
+    17..59 '{     ...; }; }': ()
+    27..28 'x': || -> usize
+    31..56 '|| -> ...n 1; }': || -> usize
+    43..56 '{ return 1; }': !
+    45..53 'return 1': !
+    52..53 '1': usize
     "###
     );
 }
@@ -1703,11 +1703,11 @@ fn foo() -> u32 {
 }
 "#),
         @r###"
-    [17; 48) '{     ...; }; }': ()
-    [27; 28) 'x': || -> ()
-    [31; 45) '|| { return; }': || -> ()
-    [34; 45) '{ return; }': !
-    [36; 42) 'return': !
+    17..48 '{     ...; }; }': ()
+    27..28 'x': || -> ()
+    31..45 '|| { return; }': || -> ()
+    34..45 '{ return; }': !
+    36..42 'return': !
     "###
     );
 }
@@ -1721,11 +1721,11 @@ fn foo() -> u32 {
 }
 "#),
         @r###"
-    [17; 47) '{     ..." }; }': ()
-    [27; 28) 'x': || -> &str
-    [31; 44) '|| { "test" }': || -> &str
-    [34; 44) '{ "test" }': &str
-    [36; 42) '"test"': &str
+    17..47 '{     ..." }; }': ()
+    27..28 'x': || -> &str
+    31..44 '|| { "test" }': || -> &str
+    34..44 '{ "test" }': &str
+    36..42 '"test"': &str
     "###
     );
 }
@@ -1744,14 +1744,14 @@ fn main() {
 }
 "#),
         @r###"
-    [48; 121) '{     ...hod; }': ()
-    [58; 64) 'vtable': Vtable
-    [67; 91) 'Vtable...| {} }': Vtable
-    [84; 89) '|| {}': || -> ()
-    [87; 89) '{}': ()
-    [101; 102) 'm': fn()
-    [105; 111) 'vtable': Vtable
-    [105; 118) 'vtable.method': fn()
+    48..121 '{     ...hod; }': ()
+    58..64 'vtable': Vtable
+    67..91 'Vtable...| {} }': Vtable
+    84..89 '|| {}': || -> ()
+    87..89 '{}': ()
+    101..102 'm': fn()
+    105..111 'vtable': Vtable
+    105..118 'vtable.method': fn()
     "###
     );
 }

crates/ra_hir_ty/src/tests/traits.rs

@@ -256,16 +256,16 @@ fn test() {
 }
 "#),
         @r###"
-    [86; 87) 't': T
-    [92; 94) '{}': ()
-    [105; 144) '{     ...(s); }': ()
-    [115; 116) 's': S<u32>
-    [119; 120) 'S': S<u32>(u32) -> S<u32>
-    [119; 129) 'S(unknown)': S<u32>
-    [121; 128) 'unknown': u32
-    [135; 138) 'foo': fn foo<S<u32>>(S<u32>)
-    [135; 141) 'foo(s)': ()
-    [139; 140) 's': S<u32>
+    86..87 't': T
+    92..94 '{}': ()
+    105..144 '{     ...(s); }': ()
+    115..116 's': S<u32>
+    119..120 'S': S<u32>(u32) -> S<u32>
+    119..129 'S(unknown)': S<u32>
+    121..128 'unknown': u32
+    135..138 'foo': fn foo<S<u32>>(S<u32>)
+    135..141 'foo(s)': ()
+    139..140 's': S<u32>
     "###
     );
 }
@@ -284,17 +284,17 @@ fn test() {
 }
 "#),
         @r###"
-    [87; 88) 't': T
-    [98; 100) '{}': ()
-    [111; 163) '{     ...(s); }': ()
-    [121; 122) 's': S<u32>
-    [125; 126) 'S': S<u32>(u32) -> S<u32>
-    [125; 135) 'S(unknown)': S<u32>
-    [127; 134) 'unknown': u32
-    [145; 146) 'x': u32
-    [154; 157) 'foo': fn foo<u32, S<u32>>(S<u32>) -> u32
-    [154; 160) 'foo(s)': u32
-    [158; 159) 's': S<u32>
+    87..88 't': T
+    98..100 '{}': ()
+    111..163 '{     ...(s); }': ()
+    121..122 's': S<u32>
+    125..126 'S': S<u32>(u32) -> S<u32>
+    125..135 'S(unknown)': S<u32>
+    127..134 'unknown': u32
+    145..146 'x': u32
+    154..157 'foo': fn foo<u32, S<u32>>(S<u32>) -> u32
+    154..160 'foo(s)': u32
+    158..159 's': S<u32>
     "###
     );
 }
@@ -312,12 +312,12 @@ fn bar(&self) -> {
 }
 "#),
         @r###"
-    [27; 31) 'self': &Self
-    [53; 57) 'self': &Self
-    [62; 97) '{     ...     }': ()
-    [76; 77) 'x': i64
-    [80; 84) 'self': &Self
-    [80; 90) 'self.foo()': i64
+    27..31 'self': &Self
+    53..57 'self': &Self
+    62..97 '{     ...     }': ()
+    76..77 'x': i64
+    80..84 'self': &Self
+    80..90 'self.foo()': i64
     "###
     );
 }
@@ -337,12 +337,12 @@ fn bar(&self) -> {
 }
 "#),
         @r###"
-    [32; 36) 'self': &Self
-    [86; 90) 'self': &Self
-    [95; 130) '{     ...     }': ()
-    [109; 110) 'x': i64
-    [113; 117) 'self': &Self
-    [113; 123) 'self.foo()': i64
+    32..36 'self': &Self
+    86..90 'self': &Self
+    95..130 '{     ...     }': ()
+    109..110 'x': i64
+    113..117 'self': &Self
+    113..123 'self.foo()': i64
     "###
     );
 }
@@ -364,15 +364,15 @@ fn test<T: Iterable>() {
 }
 "#),
         @r###"
-    [108; 261) '{     ...ter; }': ()
-    [118; 119) 'x': u32
-    [145; 146) '1': u32
-    [156; 157) 'y': Iterable::Item<T>
-    [183; 192) 'no_matter': Iterable::Item<T>
-    [202; 203) 'z': Iterable::Item<T>
-    [215; 224) 'no_matter': Iterable::Item<T>
-    [234; 235) 'a': Iterable::Item<T>
-    [249; 258) 'no_matter': Iterable::Item<T>
+    108..261 '{     ...ter; }': ()
+    118..119 'x': u32
+    145..146 '1': u32
+    156..157 'y': Iterable::Item<T>
+    183..192 'no_matter': Iterable::Item<T>
+    202..203 'z': Iterable::Item<T>
+    215..224 'no_matter': Iterable::Item<T>
+    234..235 'a': Iterable::Item<T>
+    249..258 'no_matter': Iterable::Item<T>
     "###
     );
 }
@@ -396,25 +396,25 @@ fn test() {
 }
 "#),
         @r###"
-    [106; 107) 't': T
-    [123; 125) '{}': ()
-    [147; 148) 't': T
-    [178; 180) '{}': ()
-    [202; 203) 't': T
-    [221; 223) '{}': ()
-    [234; 300) '{     ...(S); }': ()
-    [244; 245) 'x': u32
-    [248; 252) 'foo1': fn foo1<S>(S) -> <S as Iterable>::Item
-    [248; 255) 'foo1(S)': u32
-    [253; 254) 'S': S
-    [265; 266) 'y': u32
-    [269; 273) 'foo2': fn foo2<S>(S) -> <S as Iterable>::Item
-    [269; 276) 'foo2(S)': u32
-    [274; 275) 'S': S
-    [286; 287) 'z': u32
-    [290; 294) 'foo3': fn foo3<S>(S) -> <S as Iterable>::Item
-    [290; 297) 'foo3(S)': u32
-    [295; 296) 'S': S
+    106..107 't': T
+    123..125 '{}': ()
+    147..148 't': T
+    178..180 '{}': ()
+    202..203 't': T
+    221..223 '{}': ()
+    234..300 '{     ...(S); }': ()
+    244..245 'x': u32
+    248..252 'foo1': fn foo1<S>(S) -> <S as Iterable>::Item
+    248..255 'foo1(S)': u32
+    253..254 'S': S
+    265..266 'y': u32
+    269..273 'foo2': fn foo2<S>(S) -> <S as Iterable>::Item
+    269..276 'foo2(S)': u32
+    274..275 'S': S
+    286..287 'z': u32
+    290..294 'foo3': fn foo3<S>(S) -> <S as Iterable>::Item
+    290..297 'foo3(S)': u32
+    295..296 'S': S
     "###
     );
 }
@@ -431,9 +431,9 @@ fn test<T: Iterable<Item=u32>>() {
 }
 "#),
         @r###"
-    [67; 100) '{     ...own; }': ()
-    [77; 78) 'y': u32
-    [90; 97) 'unknown': u32
+    67..100 '{     ...own; }': ()
+    77..78 'y': u32
+    90..97 'unknown': u32
     "###
     );
 }
@@ -446,13 +446,13 @@ fn infer_const_body() {
 static B: u64 = { let x = 1; x };
 "#),
         @r###"
-    [16; 17) '1': u32
-    [16; 21) '1 + 1': u32
-    [20; 21) '1': u32
-    [39; 55) '{ let ...1; x }': u64
-    [45; 46) 'x': u64
-    [49; 50) '1': u64
-    [52; 53) 'x': u64
+    16..17 '1': u32
+    16..21 '1 + 1': u32
+    20..21 '1': u32
+    39..55 '{ let ...1; x }': u64
+    45..46 'x': u64
+    49..50 '1': u64
+    52..53 'x': u64
     "###
     );
 }
@@ -469,17 +469,17 @@ fn test() -> u64 {
 }
 "#),
         @r###"
-    [38; 87) '{     ... a.1 }': u64
-    [48; 49) 'a': S
-    [52; 53) 'S': S(i32, u64) -> S
-    [52; 59) 'S(4, 6)': S
-    [54; 55) '4': i32
-    [57; 58) '6': u64
-    [69; 70) 'b': i32
-    [73; 74) 'a': S
-    [73; 76) 'a.0': i32
-    [82; 83) 'a': S
-    [82; 85) 'a.1': u64
+    38..87 '{     ... a.1 }': u64
+    48..49 'a': S
+    52..53 'S': S(i32, u64) -> S
+    52..59 'S(4, 6)': S
+    54..55 '4': i32
+    57..58 '6': u64
+    69..70 'b': i32
+    73..74 'a': S
+    73..76 'a.0': i32
+    82..83 'a': S
+    82..85 'a.1': u64
     "###
     );
 }
@@ -496,24 +496,24 @@ fn test() -> u64 {
 }
 "#),
         @r###"
-    [44; 102) '{     ...0(2) }': u64
-    [54; 55) 'a': S
-    [58; 59) 'S': S(fn(u32) -> u64) -> S
-    [58; 68) 'S(|i| 2*i)': S
-    [60; 67) '|i| 2*i': |u32| -> u64
-    [61; 62) 'i': u32
-    [64; 65) '2': u32
-    [64; 67) '2*i': u32
-    [66; 67) 'i': u32
-    [78; 79) 'b': u64
-    [82; 83) 'a': S
-    [82; 85) 'a.0': fn(u32) -> u64
-    [82; 88) 'a.0(4)': u64
-    [86; 87) '4': u32
-    [94; 95) 'a': S
-    [94; 97) 'a.0': fn(u32) -> u64
-    [94; 100) 'a.0(2)': u64
-    [98; 99) '2': u32
+    44..102 '{     ...0(2) }': u64
+    54..55 'a': S
+    58..59 'S': S(fn(u32) -> u64) -> S
+    58..68 'S(|i| 2*i)': S
+    60..67 '|i| 2*i': |u32| -> u64
+    61..62 'i': u32
+    64..65 '2': u32
+    64..67 '2*i': u32
+    66..67 'i': u32
+    78..79 'b': u64
+    82..83 'a': S
+    82..85 'a.0': fn(u32) -> u64
+    82..88 'a.0(4)': u64
+    86..87 '4': u32
+    94..95 'a': S
+    94..97 'a.0': fn(u32) -> u64
+    94..100 'a.0(2)': u64
+    98..99 '2': u32
     "###
     );
 }
@@ -523,12 +523,12 @@ fn indexing_arrays() {
     assert_snapshot!(
         infer("fn main() { &mut [9][2]; }"),
         @r###"
-    [10; 26) '{ &mut...[2]; }': ()
-    [12; 23) '&mut [9][2]': &mut {unknown}
-    [17; 20) '[9]': [i32; _]
-    [17; 23) '[9][2]': {unknown}
-    [18; 19) '9': i32
-    [21; 22) '2': i32
+    10..26 '{ &mut...[2]; }': ()
+    12..23 '&mut [9][2]': &mut {unknown}
+    17..20 '[9]': [i32; _]
+    17..23 '[9][2]': {unknown}
+    18..19 '9': i32
+    21..22 '2': i32
     "###
     )
 }
@@ -944,34 +944,34 @@ fn test(x: impl Trait<u64>, y: &impl Trait<u32>) {
 }
 "#, true),
         @r###"
-    [30; 34) 'self': &Self
-    [55; 59) 'self': &Self
-    [78; 79) 'x': impl Trait<u16>
-    [98; 100) '{}': ()
-    [155; 156) 'x': impl Trait<u64>
-    [175; 176) 'y': &impl Trait<u32>
-    [196; 324) '{     ...2(); }': ()
-    [202; 203) 'x': impl Trait<u64>
-    [209; 210) 'y': &impl Trait<u32>
-    [220; 221) 'z': S<u16>
-    [224; 225) 'S': S<u16>(u16) -> S<u16>
-    [224; 228) 'S(1)': S<u16>
-    [226; 227) '1': u16
-    [234; 237) 'bar': fn bar(S<u16>)
-    [234; 240) 'bar(z)': ()
-    [238; 239) 'z': S<u16>
-    [246; 247) 'x': impl Trait<u64>
-    [246; 253) 'x.foo()': u64
-    [259; 260) 'y': &impl Trait<u32>
-    [259; 266) 'y.foo()': u32
-    [272; 273) 'z': S<u16>
-    [272; 279) 'z.foo()': u16
-    [285; 286) 'x': impl Trait<u64>
-    [285; 293) 'x.foo2()': i64
-    [299; 300) 'y': &impl Trait<u32>
-    [299; 307) 'y.foo2()': i64
-    [313; 314) 'z': S<u16>
-    [313; 321) 'z.foo2()': i64
+    30..34 'self': &Self
+    55..59 'self': &Self
+    78..79 'x': impl Trait<u16>
+    98..100 '{}': ()
+    155..156 'x': impl Trait<u64>
+    175..176 'y': &impl Trait<u32>
+    196..324 '{     ...2(); }': ()
+    202..203 'x': impl Trait<u64>
+    209..210 'y': &impl Trait<u32>
+    220..221 'z': S<u16>
+    224..225 'S': S<u16>(u16) -> S<u16>
+    224..228 'S(1)': S<u16>
+    226..227 '1': u16
+    234..237 'bar': fn bar(S<u16>)
+    234..240 'bar(z)': ()
+    238..239 'z': S<u16>
+    246..247 'x': impl Trait<u64>
+    246..253 'x.foo()': u64
+    259..260 'y': &impl Trait<u32>
+    259..266 'y.foo()': u32
+    272..273 'z': S<u16>
+    272..279 'z.foo()': u16
+    285..286 'x': impl Trait<u64>
+    285..293 'x.foo2()': i64
+    299..300 'y': &impl Trait<u32>
+    299..307 'y.foo2()': i64
+    313..314 'z': S<u16>
+    313..321 'z.foo2()': i64
     "###
     );
 }
@@ -1005,39 +1005,39 @@ fn test() {
 }
 "#, true),
         @r###"
-    [156; 157) 'x': impl Trait
-    [176; 187) '{ loop {} }': T
-    [178; 185) 'loop {}': !
-    [183; 185) '{}': ()
-    [200; 201) 'x': impl Trait
-    [220; 231) '{ loop {} }': T
-    [222; 229) 'loop {}': !
-    [227; 229) '{}': ()
-    [301; 510) '{     ... i32 }': ()
-    [307; 315) 'Foo::bar': fn bar<{unknown}, {unknown}>(S) -> {unknown}
-    [307; 318) 'Foo::bar(S)': {unknown}
-    [316; 317) 'S': S
-    [324; 339) '<F as Foo>::bar': fn bar<F, {unknown}>(S) -> {unknown}
-    [324; 342) '<F as ...bar(S)': {unknown}
-    [340; 341) 'S': S
-    [348; 354) 'F::bar': fn bar<F, {unknown}>(S) -> {unknown}
-    [348; 357) 'F::bar(S)': {unknown}
-    [355; 356) 'S': S
-    [363; 378) 'Foo::bar::<u32>': fn bar<{unknown}, u32>(S) -> u32
-    [363; 381) 'Foo::b...32>(S)': u32
-    [379; 380) 'S': S
-    [387; 409) '<F as ...:<u32>': fn bar<F, u32>(S) -> u32
-    [387; 412) '<F as ...32>(S)': u32
-    [410; 411) 'S': S
-    [419; 422) 'foo': fn foo<{unknown}>(S) -> {unknown}
-    [419; 425) 'foo(S)': {unknown}
-    [423; 424) 'S': S
-    [431; 441) 'foo::<u32>': fn foo<u32>(S) -> u32
-    [431; 444) 'foo::<u32>(S)': u32
-    [442; 443) 'S': S
-    [450; 465) 'foo::<u32, i32>': fn foo<u32>(S) -> u32
-    [450; 468) 'foo::<...32>(S)': u32
-    [466; 467) 'S': S
+    156..157 'x': impl Trait
+    176..187 '{ loop {} }': T
+    178..185 'loop {}': !
+    183..185 '{}': ()
+    200..201 'x': impl Trait
+    220..231 '{ loop {} }': T
+    222..229 'loop {}': !
+    227..229 '{}': ()
+    301..510 '{     ... i32 }': ()
+    307..315 'Foo::bar': fn bar<{unknown}, {unknown}>(S) -> {unknown}
+    307..318 'Foo::bar(S)': {unknown}
+    316..317 'S': S
+    324..339 '<F as Foo>::bar': fn bar<F, {unknown}>(S) -> {unknown}
+    324..342 '<F as ...bar(S)': {unknown}
+    340..341 'S': S
+    348..354 'F::bar': fn bar<F, {unknown}>(S) -> {unknown}
+    348..357 'F::bar(S)': {unknown}
+    355..356 'S': S
+    363..378 'Foo::bar::<u32>': fn bar<{unknown}, u32>(S) -> u32
+    363..381 'Foo::b...32>(S)': u32
+    379..380 'S': S
+    387..409 '<F as ...:<u32>': fn bar<F, u32>(S) -> u32
+    387..412 '<F as ...32>(S)': u32
+    410..411 'S': S
+    419..422 'foo': fn foo<{unknown}>(S) -> {unknown}
+    419..425 'foo(S)': {unknown}
+    423..424 'S': S
+    431..441 'foo::<u32>': fn foo<u32>(S) -> u32
+    431..444 'foo::<u32>(S)': u32
+    442..443 'S': S
+    450..465 'foo::<u32, i32>': fn foo<u32>(S) -> u32
+    450..468 'foo::<...32>(S)': u32
+    466..467 'S': S
     "###
     );
 }
@@ -1062,24 +1062,24 @@ fn test() {
 }
 "#, true),
         @r###"
-    [88; 92) 'self': F<T>
-    [94; 95) 'x': impl Trait
-    [119; 130) '{ loop {} }': (T, U)
-    [121; 128) 'loop {}': !
-    [126; 128) '{}': ()
-    [144; 284) '{     ...ored }': ()
-    [150; 151) 'F': F<{unknown}>
-    [150; 158) 'F.foo(S)': ({unknown}, {unknown})
-    [156; 157) 'S': S
-    [164; 172) 'F::<u32>': F<u32>
-    [164; 179) 'F::<u32>.foo(S)': (u32, {unknown})
-    [177; 178) 'S': S
-    [185; 193) 'F::<u32>': F<u32>
-    [185; 207) 'F::<u3...32>(S)': (u32, i32)
-    [205; 206) 'S': S
-    [213; 221) 'F::<u32>': F<u32>
-    [213; 240) 'F::<u3...32>(S)': (u32, i32)
-    [238; 239) 'S': S
+    88..92 'self': F<T>
+    94..95 'x': impl Trait
+    119..130 '{ loop {} }': (T, U)
+    121..128 'loop {}': !
+    126..128 '{}': ()
+    144..284 '{     ...ored }': ()
+    150..151 'F': F<{unknown}>
+    150..158 'F.foo(S)': ({unknown}, {unknown})
+    156..157 'S': S
+    164..172 'F::<u32>': F<u32>
+    164..179 'F::<u32>.foo(S)': (u32, {unknown})
+    177..178 'S': S
+    185..193 'F::<u32>': F<u32>
+    185..207 'F::<u3...32>(S)': (u32, i32)
+    205..206 'S': S
+    213..221 'F::<u32>': F<u32>
+    213..240 'F::<u3...32>(S)': (u32, i32)
+    238..239 'S': S
     "###
     );
 }
@@ -1098,13 +1098,13 @@ fn test() {
 }
 "#, true),
         @r###"
-    [23; 24) 'x': impl Trait
-    [38; 49) '{ loop {} }': ()
-    [40; 47) 'loop {}': !
-    [45; 47) '{}': ()
-    [91; 124) '{     ...foo; }': ()
-    [101; 102) 'f': fn(S)
-    [118; 121) 'foo': fn foo(S)
+    23..24 'x': impl Trait
+    38..49 '{ loop {} }': ()
+    40..47 'loop {}': !
+    45..47 '{}': ()
+    91..124 '{     ...foo; }': ()
+    101..102 'f': fn(S)
+    118..121 'foo': fn foo(S)
     "###
     );
 }
@@ -1133,29 +1133,29 @@ fn test(x: impl Trait<u64>, y: &impl Trait<u64>) {
 }
 "#),
         @r###"
-    [30; 34) 'self': &Self
-    [55; 59) 'self': &Self
-    [99; 101) '{}': ()
-    [111; 112) 'x': impl Trait<u64>
-    [131; 132) 'y': &impl Trait<u64>
-    [152; 269) '{     ...2(); }': ()
-    [158; 159) 'x': impl Trait<u64>
-    [165; 166) 'y': &impl Trait<u64>
-    [176; 177) 'z': impl Trait<u64>
-    [180; 183) 'bar': fn bar() -> impl Trait<u64>
-    [180; 185) 'bar()': impl Trait<u64>
-    [191; 192) 'x': impl Trait<u64>
-    [191; 198) 'x.foo()': u64
-    [204; 205) 'y': &impl Trait<u64>
-    [204; 211) 'y.foo()': u64
-    [217; 218) 'z': impl Trait<u64>
-    [217; 224) 'z.foo()': u64
-    [230; 231) 'x': impl Trait<u64>
-    [230; 238) 'x.foo2()': i64
-    [244; 245) 'y': &impl Trait<u64>
-    [244; 252) 'y.foo2()': i64
-    [258; 259) 'z': impl Trait<u64>
-    [258; 266) 'z.foo2()': i64
+    30..34 'self': &Self
+    55..59 'self': &Self
+    99..101 '{}': ()
+    111..112 'x': impl Trait<u64>
+    131..132 'y': &impl Trait<u64>
+    152..269 '{     ...2(); }': ()
+    158..159 'x': impl Trait<u64>
+    165..166 'y': &impl Trait<u64>
+    176..177 'z': impl Trait<u64>
+    180..183 'bar': fn bar() -> impl Trait<u64>
+    180..185 'bar()': impl Trait<u64>
+    191..192 'x': impl Trait<u64>
+    191..198 'x.foo()': u64
+    204..205 'y': &impl Trait<u64>
+    204..211 'y.foo()': u64
+    217..218 'z': impl Trait<u64>
+    217..224 'z.foo()': u64
+    230..231 'x': impl Trait<u64>
+    230..238 'x.foo2()': i64
+    244..245 'y': &impl Trait<u64>
+    244..252 'y.foo2()': i64
+    258..259 'z': impl Trait<u64>
+    258..266 'z.foo2()': i64
     "###
     );
 }
@@ -1183,29 +1183,29 @@ fn test(x: dyn Trait<u64>, y: &dyn Trait<u64>) {
 }
 "#),
         @r###"
-    [30; 34) 'self': &Self
-    [55; 59) 'self': &Self
-    [98; 100) '{}': ()
-    [110; 111) 'x': dyn Trait<u64>
-    [129; 130) 'y': &dyn Trait<u64>
-    [149; 266) '{     ...2(); }': ()
-    [155; 156) 'x': dyn Trait<u64>
-    [162; 163) 'y': &dyn Trait<u64>
-    [173; 174) 'z': dyn Trait<u64>
-    [177; 180) 'bar': fn bar() -> dyn Trait<u64>
-    [177; 182) 'bar()': dyn Trait<u64>
-    [188; 189) 'x': dyn Trait<u64>
-    [188; 195) 'x.foo()': u64
-    [201; 202) 'y': &dyn Trait<u64>
-    [201; 208) 'y.foo()': u64
-    [214; 215) 'z': dyn Trait<u64>
-    [214; 221) 'z.foo()': u64
-    [227; 228) 'x': dyn Trait<u64>
-    [227; 235) 'x.foo2()': i64
-    [241; 242) 'y': &dyn Trait<u64>
-    [241; 249) 'y.foo2()': i64
-    [255; 256) 'z': dyn Trait<u64>
-    [255; 263) 'z.foo2()': i64
+    30..34 'self': &Self
+    55..59 'self': &Self
+    98..100 '{}': ()
+    110..111 'x': dyn Trait<u64>
+    129..130 'y': &dyn Trait<u64>
+    149..266 '{     ...2(); }': ()
+    155..156 'x': dyn Trait<u64>
+    162..163 'y': &dyn Trait<u64>
+    173..174 'z': dyn Trait<u64>
+    177..180 'bar': fn bar() -> dyn Trait<u64>
+    177..182 'bar()': dyn Trait<u64>
+    188..189 'x': dyn Trait<u64>
+    188..195 'x.foo()': u64
+    201..202 'y': &dyn Trait<u64>
+    201..208 'y.foo()': u64
+    214..215 'z': dyn Trait<u64>
+    214..221 'z.foo()': u64
+    227..228 'x': dyn Trait<u64>
+    227..235 'x.foo2()': i64
+    241..242 'y': &dyn Trait<u64>
+    241..249 'y.foo2()': i64
+    255..256 'z': dyn Trait<u64>
+    255..263 'z.foo2()': i64
     "###
     );
 }
@@ -1231,17 +1231,17 @@ fn test(s: S<u32, i32>) {
 }
 "#),
         @r###"
-    [33; 37) 'self': &Self
-    [103; 107) 'self': &S<T, U>
-    [129; 140) '{ loop {} }': &dyn Trait<T, U>
-    [131; 138) 'loop {}': !
-    [136; 138) '{}': ()
-    [176; 180) 'self': &Self
-    [252; 253) 's': S<u32, i32>
-    [268; 290) '{     ...z(); }': ()
-    [274; 275) 's': S<u32, i32>
-    [274; 281) 's.bar()': &dyn Trait<u32, i32>
-    [274; 287) 's.bar().baz()': (u32, i32)
+    33..37 'self': &Self
+    103..107 'self': &S<T, U>
+    129..140 '{ loop {} }': &dyn Trait<T, U>
+    131..138 'loop {}': !
+    136..138 '{}': ()
+    176..180 'self': &Self
+    252..253 's': S<u32, i32>
+    268..290 '{     ...z(); }': ()
+    274..275 's': S<u32, i32>
+    274..281 's.bar()': &dyn Trait<u32, i32>
+    274..287 's.bar().baz()': (u32, i32)
     "###
     );
 }
@@ -1265,22 +1265,22 @@ fn test(x: Trait, y: &Trait) -> u64 {
 }
 "#),
         @r###"
-    [27; 31) 'self': &Self
-    [61; 63) '{}': ()
-    [73; 74) 'x': dyn Trait
-    [83; 84) 'y': &dyn Trait
-    [101; 176) '{     ...o(); }': ()
-    [107; 108) 'x': dyn Trait
-    [114; 115) 'y': &dyn Trait
-    [125; 126) 'z': dyn Trait
-    [129; 132) 'bar': fn bar() -> dyn Trait
-    [129; 134) 'bar()': dyn Trait
-    [140; 141) 'x': dyn Trait
-    [140; 147) 'x.foo()': u64
-    [153; 154) 'y': &dyn Trait
-    [153; 160) 'y.foo()': u64
-    [166; 167) 'z': dyn Trait
-    [166; 173) 'z.foo()': u64
+    27..31 'self': &Self
+    61..63 '{}': ()
+    73..74 'x': dyn Trait
+    83..84 'y': &dyn Trait
+    101..176 '{     ...o(); }': ()
+    107..108 'x': dyn Trait
+    114..115 'y': &dyn Trait
+    125..126 'z': dyn Trait
+    129..132 'bar': fn bar() -> dyn Trait
+    129..134 'bar()': dyn Trait
+    140..141 'x': dyn Trait
+    140..147 'x.foo()': u64
+    153..154 'y': &dyn Trait
+    153..160 'y.foo()': u64
+    166..167 'z': dyn Trait
+    166..173 'z.foo()': u64
     "###
     );
 }
@@ -1294,13 +1294,13 @@ fn test(a: impl Trait + 'lifetime, b: impl 'lifetime, c: impl (Trait), d: impl (
 }
 "#),
         @r###"
-    [24; 25) 'a': impl Trait + {error}
-    [51; 52) 'b': impl {error}
-    [70; 71) 'c': impl Trait
-    [87; 88) 'd': impl {error}
-    [108; 109) 'e': impl {error}
-    [124; 125) 'f': impl Trait + {error}
-    [148; 151) '{ }': ()
+    24..25 'a': impl Trait + {error}
+    51..52 'b': impl {error}
+    70..71 'c': impl Trait
+    87..88 'd': impl {error}
+    108..109 'e': impl {error}
+    124..125 'f': impl Trait + {error}
+    148..151 '{ }': ()
     "###
     );
 }
@@ -1349,41 +1349,41 @@ fn test<T: Trait<Type = u32>>(x: T, y: impl Trait<Type = i64>) {
 }
 "#),
         @r###"
-    [50; 51) 't': T
-    [78; 80) '{}': ()
-    [112; 113) 't': T
-    [123; 125) '{}': ()
-    [155; 156) 't': T
-    [166; 169) '{t}': T
-    [167; 168) 't': T
-    [257; 258) 'x': T
-    [263; 264) 'y': impl Trait<Type = i64>
-    [290; 398) '{     ...r>); }': ()
-    [296; 299) 'get': fn get<T>(T) -> <T as Trait>::Type
-    [296; 302) 'get(x)': u32
-    [300; 301) 'x': T
-    [308; 312) 'get2': fn get2<u32, T>(T) -> u32
-    [308; 315) 'get2(x)': u32
-    [313; 314) 'x': T
-    [321; 324) 'get': fn get<impl Trait<Type = i64>>(impl Trait<Type = i64>) -> <impl Trait<Type = i64> as Trait>::Type
-    [321; 327) 'get(y)': i64
-    [325; 326) 'y': impl Trait<Type = i64>
-    [333; 337) 'get2': fn get2<i64, impl Trait<Type = i64>>(impl Trait<Type = i64>) -> i64
-    [333; 340) 'get2(y)': i64
-    [338; 339) 'y': impl Trait<Type = i64>
-    [346; 349) 'get': fn get<S<u64>>(S<u64>) -> <S<u64> as Trait>::Type
-    [346; 357) 'get(set(S))': u64
-    [350; 353) 'set': fn set<S<u64>>(S<u64>) -> S<u64>
-    [350; 356) 'set(S)': S<u64>
-    [354; 355) 'S': S<u64>
-    [363; 367) 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
-    [363; 375) 'get2(set(S))': u64
-    [368; 371) 'set': fn set<S<u64>>(S<u64>) -> S<u64>
-    [368; 374) 'set(S)': S<u64>
-    [372; 373) 'S': S<u64>
-    [381; 385) 'get2': fn get2<str, S<str>>(S<str>) -> str
-    [381; 395) 'get2(S::<str>)': str
-    [386; 394) 'S::<str>': S<str>
+    50..51 't': T
+    78..80 '{}': ()
+    112..113 't': T
+    123..125 '{}': ()
+    155..156 't': T
+    166..169 '{t}': T
+    167..168 't': T
+    257..258 'x': T
+    263..264 'y': impl Trait<Type = i64>
+    290..398 '{     ...r>); }': ()
+    296..299 'get': fn get<T>(T) -> <T as Trait>::Type
+    296..302 'get(x)': u32
+    300..301 'x': T
+    308..312 'get2': fn get2<u32, T>(T) -> u32
+    308..315 'get2(x)': u32
+    313..314 'x': T
+    321..324 'get': fn get<impl Trait<Type = i64>>(impl Trait<Type = i64>) -> <impl Trait<Type = i64> as Trait>::Type
+    321..327 'get(y)': i64
+    325..326 'y': impl Trait<Type = i64>
+    333..337 'get2': fn get2<i64, impl Trait<Type = i64>>(impl Trait<Type = i64>) -> i64
+    333..340 'get2(y)': i64
+    338..339 'y': impl Trait<Type = i64>
+    346..349 'get': fn get<S<u64>>(S<u64>) -> <S<u64> as Trait>::Type
+    346..357 'get(set(S))': u64
+    350..353 'set': fn set<S<u64>>(S<u64>) -> S<u64>
+    350..356 'set(S)': S<u64>
+    354..355 'S': S<u64>
+    363..367 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
+    363..375 'get2(set(S))': u64
+    368..371 'set': fn set<S<u64>>(S<u64>) -> S<u64>
+    368..374 'set(S)': S<u64>
+    372..373 'S': S<u64>
+    381..385 'get2': fn get2<str, S<str>>(S<str>) -> str
+    381..395 'get2(S::<str>)': str
+    386..394 'S::<str>': S<str>
     "###
     );
 }
@@ -1448,11 +1448,11 @@ fn test<T: Trait1<Type = u32>>(x: T) {
 }
 "#),
         @r###"
-    [62; 66) 'self': Self
-    [164; 165) 'x': T
-    [170; 186) '{     ...o(); }': ()
-    [176; 177) 'x': T
-    [176; 183) 'x.foo()': u32
+    62..66 'self': Self
+    164..165 'x': T
+    170..186 '{     ...o(); }': ()
+    176..177 'x': T
+    176..183 'x.foo()': u32
     "###
     );
 }
@@ -1494,15 +1494,15 @@ fn test<T: Trait1, U: Trait2>(x: T, y: U) {
 }
 "#),
         @r###"
-    [50; 54) 'self': &Self
-    [63; 65) '{}': ()
-    [182; 183) 'x': T
-    [188; 189) 'y': U
-    [194; 223) '{     ...o(); }': ()
-    [200; 201) 'x': T
-    [200; 207) 'x.foo()': u32
-    [213; 214) 'y': U
-    [213; 220) 'y.foo()': u32
+    50..54 'self': &Self
+    63..65 '{}': ()
+    182..183 'x': T
+    188..189 'y': U
+    194..223 '{     ...o(); }': ()
+    200..201 'x': T
+    200..207 'x.foo()': u32
+    213..214 'y': U
+    213..220 'y.foo()': u32
     "###
     );
 }
@@ -1523,12 +1523,12 @@ fn test(x: &impl Trait1) {
 }
 "#),
         @r###"
-    [50; 54) 'self': &Self
-    [63; 65) '{}': ()
-    [116; 117) 'x': &impl Trait1
-    [133; 149) '{     ...o(); }': ()
-    [139; 140) 'x': &impl Trait1
-    [139; 146) 'x.foo()': u32
+    50..54 'self': &Self
+    63..65 '{}': ()
+    116..117 'x': &impl Trait1
+    133..149 '{     ...o(); }': ()
+    139..140 'x': &impl Trait1
+    139..146 'x.foo()': u32
     "###
     );
 }
@@ -1546,10 +1546,10 @@ fn test<T: A>(x: T) {
 }
 "#),
         @r###"
-    [44; 45) 'x': T
-    [50; 66) '{     ...o(); }': ()
-    [56; 57) 'x': T
-    [56; 63) 'x.foo()': {unknown}
+    44..45 'x': T
+    50..66 '{     ...o(); }': ()
+    56..57 'x': T
+    56..63 'x.foo()': {unknown}
     "###
     );
 }
@@ -1573,17 +1573,17 @@ fn test() {
 }
 "#),
         @r###"
-    [103; 104) 't': T
-    [114; 116) '{}': ()
-    [146; 147) 't': T
-    [157; 160) '{t}': T
-    [158; 159) 't': T
-    [259; 280) '{     ...S)); }': ()
-    [265; 269) 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
-    [265; 277) 'get2(set(S))': u64
-    [270; 273) 'set': fn set<S<u64>>(S<u64>) -> S<u64>
-    [270; 276) 'set(S)': S<u64>
-    [274; 275) 'S': S<u64>
+    103..104 't': T
+    114..116 '{}': ()
+    146..147 't': T
+    157..160 '{t}': T
+    158..159 't': T
+    259..280 '{     ...S)); }': ()
+    265..269 'get2': fn get2<u64, S<u64>>(S<u64>) -> u64
+    265..277 'get2(set(S))': u64
+    270..273 'set': fn set<S<u64>>(S<u64>) -> S<u64>
+    270..276 'set(S)': S<u64>
+    274..275 'S': S<u64>
     "###
     );
 }
@@ -1603,15 +1603,15 @@ fn test<F: FnOnce(u32, u64) -> u128>(f: F) {
 }
 "#),
         @r###"
-    [57; 61) 'self': Self
-    [63; 67) 'args': Args
-    [150; 151) 'f': F
-    [156; 184) '{     ...2)); }': ()
-    [162; 163) 'f': F
-    [162; 181) 'f.call...1, 2))': u128
-    [174; 180) '(1, 2)': (u32, u64)
-    [175; 176) '1': u32
-    [178; 179) '2': u64
+    57..61 'self': Self
+    63..67 'args': Args
+    150..151 'f': F
+    156..184 '{     ...2)); }': ()
+    162..163 'f': F
+    162..181 'f.call...1, 2))': u128
+    174..180 '(1, 2)': (u32, u64)
+    175..176 '1': u32
+    178..179 '2': u64
     "###
     );
 }
@@ -1638,32 +1638,32 @@ fn test() {
 }
 "#),
         @r###"
-    [148; 152) 'self': Option<T>
-    [154; 155) 'f': F
-    [173; 175) '{}': ()
-    [189; 308) '{     ... 1); }': ()
-    [199; 200) 'x': Option<u32>
-    [203; 215) 'Option::Some': Some<u32>(u32) -> Option<u32>
-    [203; 221) 'Option...(1u32)': Option<u32>
-    [216; 220) '1u32': u32
-    [227; 228) 'x': Option<u32>
-    [227; 243) 'x.map(...v + 1)': Option<u32>
-    [233; 242) '|v| v + 1': |u32| -> u32
-    [234; 235) 'v': u32
-    [237; 238) 'v': u32
-    [237; 242) 'v + 1': u32
-    [241; 242) '1': u32
-    [249; 250) 'x': Option<u32>
-    [249; 265) 'x.map(... 1u64)': Option<u64>
-    [255; 264) '|_v| 1u64': |u32| -> u64
-    [256; 258) '_v': u32
-    [260; 264) '1u64': u64
-    [275; 276) 'y': Option<i64>
-    [292; 293) 'x': Option<u32>
-    [292; 305) 'x.map(|_v| 1)': Option<i64>
-    [298; 304) '|_v| 1': |u32| -> i64
-    [299; 301) '_v': u32
-    [303; 304) '1': i64
+    148..152 'self': Option<T>
+    154..155 'f': F
+    173..175 '{}': ()
+    189..308 '{     ... 1); }': ()
+    199..200 'x': Option<u32>
+    203..215 'Option::Some': Some<u32>(u32) -> Option<u32>
+    203..221 'Option...(1u32)': Option<u32>
+    216..220 '1u32': u32
+    227..228 'x': Option<u32>
+    227..243 'x.map(...v + 1)': Option<u32>
+    233..242 '|v| v + 1': |u32| -> u32
+    234..235 'v': u32
+    237..238 'v': u32
+    237..242 'v + 1': u32
+    241..242 '1': u32
+    249..250 'x': Option<u32>
+    249..265 'x.map(... 1u64)': Option<u64>
+    255..264 '|_v| 1u64': |u32| -> u64
+    256..258 '_v': u32
+    260..264 '1u64': u64
+    275..276 'y': Option<i64>
+    292..293 'x': Option<u32>
+    292..305 'x.map(|_v| 1)': Option<i64>
+    298..304 '|_v| 1': |u32| -> i64
+    299..301 '_v': u32
+    303..304 '1': i64
     "###
     );
 }
@@ -1684,26 +1684,26 @@ fn test<F: FnOnce(u32) -> u64>(f: F) {
 }
 "#),
         @r###"
-    [73; 74) 'f': F
-    [79; 155) '{     ...+ v; }': ()
-    [85; 86) 'f': F
-    [85; 89) 'f(1)': {unknown}
-    [87; 88) '1': i32
-    [99; 100) 'g': |u64| -> i32
-    [103; 112) '|v| v + 1': |u64| -> i32
-    [104; 105) 'v': u64
-    [107; 108) 'v': u64
-    [107; 112) 'v + 1': i32
-    [111; 112) '1': i32
-    [118; 119) 'g': |u64| -> i32
-    [118; 125) 'g(1u64)': i32
-    [120; 124) '1u64': u64
-    [135; 136) 'h': |u128| -> u128
-    [139; 152) '|v| 1u128 + v': |u128| -> u128
-    [140; 141) 'v': u128
-    [143; 148) '1u128': u128
-    [143; 152) '1u128 + v': u128
-    [151; 152) 'v': u128
+    73..74 'f': F
+    79..155 '{     ...+ v; }': ()
+    85..86 'f': F
+    85..89 'f(1)': {unknown}
+    87..88 '1': i32
+    99..100 'g': |u64| -> i32
+    103..112 '|v| v + 1': |u64| -> i32
+    104..105 'v': u64
+    107..108 'v': u64
+    107..112 'v + 1': i32
+    111..112 '1': i32
+    118..119 'g': |u64| -> i32
+    118..125 'g(1u64)': i32
+    120..124 '1u64': u64
+    135..136 'h': |u128| -> u128
+    139..152 '|v| 1u128 + v': |u128| -> u128
+    140..141 'v': u128
+    143..148 '1u128': u128
+    143..152 '1u128 + v': u128
+    151..152 'v': u128
     "###
     );
 }
@@ -1736,54 +1736,54 @@ fn test() {
 }
 "#),
         @r###"
-    [95; 96) 'x': T
-    [101; 102) 'f': F
-    [112; 114) '{}': ()
-    [148; 149) 'f': F
-    [154; 155) 'x': T
-    [165; 167) '{}': ()
-    [202; 206) 'self': S
-    [254; 258) 'self': S
-    [260; 261) 'x': T
-    [266; 267) 'f': F
-    [277; 279) '{}': ()
-    [317; 321) 'self': S
-    [323; 324) 'f': F
-    [329; 330) 'x': T
-    [340; 342) '{}': ()
-    [356; 515) '{     ... S); }': ()
-    [366; 368) 'x1': u64
-    [371; 375) 'foo1': fn foo1<S, u64, |S| -> u64>(S, |S| -> u64) -> u64
-    [371; 394) 'foo1(S...hod())': u64
-    [376; 377) 'S': S
-    [379; 393) '|s| s.method()': |S| -> u64
-    [380; 381) 's': S
-    [383; 384) 's': S
-    [383; 393) 's.method()': u64
-    [404; 406) 'x2': u64
-    [409; 413) 'foo2': fn foo2<S, u64, |S| -> u64>(|S| -> u64, S) -> u64
-    [409; 432) 'foo2(|...(), S)': u64
-    [414; 428) '|s| s.method()': |S| -> u64
-    [415; 416) 's': S
-    [418; 419) 's': S
-    [418; 428) 's.method()': u64
-    [430; 431) 'S': S
-    [442; 444) 'x3': u64
-    [447; 448) 'S': S
-    [447; 472) 'S.foo1...hod())': u64
-    [454; 455) 'S': S
-    [457; 471) '|s| s.method()': |S| -> u64
-    [458; 459) 's': S
-    [461; 462) 's': S
-    [461; 471) 's.method()': u64
-    [482; 484) 'x4': u64
-    [487; 488) 'S': S
-    [487; 512) 'S.foo2...(), S)': u64
-    [494; 508) '|s| s.method()': |S| -> u64
-    [495; 496) 's': S
-    [498; 499) 's': S
-    [498; 508) 's.method()': u64
-    [510; 511) 'S': S
+    95..96 'x': T
+    101..102 'f': F
+    112..114 '{}': ()
+    148..149 'f': F
+    154..155 'x': T
+    165..167 '{}': ()
+    202..206 'self': S
+    254..258 'self': S
+    260..261 'x': T
+    266..267 'f': F
+    277..279 '{}': ()
+    317..321 'self': S
+    323..324 'f': F
+    329..330 'x': T
+    340..342 '{}': ()
+    356..515 '{     ... S); }': ()
+    366..368 'x1': u64
+    371..375 'foo1': fn foo1<S, u64, |S| -> u64>(S, |S| -> u64) -> u64
+    371..394 'foo1(S...hod())': u64
+    376..377 'S': S
+    379..393 '|s| s.method()': |S| -> u64
+    380..381 's': S
+    383..384 's': S
+    383..393 's.method()': u64
+    404..406 'x2': u64
+    409..413 'foo2': fn foo2<S, u64, |S| -> u64>(|S| -> u64, S) -> u64
+    409..432 'foo2(|...(), S)': u64
+    414..428 '|s| s.method()': |S| -> u64
+    415..416 's': S
+    418..419 's': S
+    418..428 's.method()': u64
+    430..431 'S': S
+    442..444 'x3': u64
+    447..448 'S': S
+    447..472 'S.foo1...hod())': u64
+    454..455 'S': S
+    457..471 '|s| s.method()': |S| -> u64
+    458..459 's': S
+    461..462 's': S
+    461..471 's.method()': u64
+    482..484 'x4': u64
+    487..488 'S': S
+    487..512 'S.foo2...(), S)': u64
+    494..508 '|s| s.method()': |S| -> u64
+    495..496 's': S
+    498..499 's': S
+    498..508 's.method()': u64
+    510..511 'S': S
     "###
     );
 }
@@ -1858,18 +1858,18 @@ impl Trait for S2 {
 }
 "#,
     ), @r###"
-    [54; 58) 'self': &Self
-    [60; 61) 'x': Trait::Item<Self>
-    [140; 144) 'self': &S
-    [146; 147) 'x': u32
-    [161; 175) '{ let y = x; }': ()
-    [167; 168) 'y': u32
-    [171; 172) 'x': u32
-    [242; 246) 'self': &S2
-    [248; 249) 'x': i32
-    [265; 279) '{ let y = x; }': ()
-    [271; 272) 'y': i32
-    [275; 276) 'x': i32
+    54..58 'self': &Self
+    60..61 'x': Trait::Item<Self>
+    140..144 'self': &S
+    146..147 'x': u32
+    161..175 '{ let y = x; }': ()
+    167..168 'y': u32
+    171..172 'x': u32
+    242..246 'self': &S2
+    248..249 'x': i32
+    265..279 '{ let y = x; }': ()
+    271..272 'y': i32
+    275..276 'x': i32
     "###);
 }
 
@@ -2077,15 +2077,15 @@ fn new() -> Self::TokenStream {
 }
 "#, true),
         @r###"
-    [1115; 1126) '{ loop {} }': T
-    [1117; 1124) 'loop {}': !
-    [1122; 1124) '{}': ()
-    [1190; 1253) '{     ...     }': {unknown}
-    [1204; 1209) 'group': {unknown}
-    [1225; 1229) 'make': fn make<{unknown}>() -> {unknown}
-    [1225; 1231) 'make()': {unknown}
-    [1241; 1245) 'make': fn make<{unknown}>() -> {unknown}
-    [1241; 1247) 'make()': {unknown}
+    1115..1126 '{ loop {} }': T
+    1117..1124 'loop {}': !
+    1122..1124 '{}': ()
+    1190..1253 '{     ...     }': {unknown}
+    1204..1209 'group': {unknown}
+    1225..1229 'make': fn make<{unknown}>() -> {unknown}
+    1225..1231 'make()': {unknown}
+    1241..1245 'make': fn make<{unknown}>() -> {unknown}
+    1241..1247 'make()': {unknown}
     "###
     );
 }
@@ -2112,37 +2112,37 @@ fn test() -> impl Trait<i32> {
 }
 "#, true),
         @r###"
-    [27; 28) 'x': impl Trait<u32>
-    [47; 58) '{ loop {} }': ()
-    [49; 56) 'loop {}': !
-    [54; 56) '{}': ()
-    [69; 70) 'x': impl Trait<T>
-    [92; 103) '{ loop {} }': T
-    [94; 101) 'loop {}': !
-    [99; 101) '{}': ()
-    [172; 183) '{ loop {} }': T
-    [174; 181) 'loop {}': !
-    [179; 181) '{}': ()
-    [214; 310) '{     ...t()) }': S<{unknown}>
-    [224; 226) 's1': S<u32>
-    [229; 230) 'S': S<u32>(u32) -> S<u32>
-    [229; 241) 'S(default())': S<u32>
-    [231; 238) 'default': fn default<u32>() -> u32
-    [231; 240) 'default()': u32
-    [247; 250) 'foo': fn foo(S<u32>)
-    [247; 254) 'foo(s1)': ()
-    [251; 253) 's1': S<u32>
-    [264; 265) 'x': i32
-    [273; 276) 'bar': fn bar<i32>(S<i32>) -> i32
-    [273; 290) 'bar(S(...lt()))': i32
-    [277; 278) 'S': S<i32>(i32) -> S<i32>
-    [277; 289) 'S(default())': S<i32>
-    [279; 286) 'default': fn default<i32>() -> i32
-    [279; 288) 'default()': i32
-    [296; 297) 'S': S<{unknown}>({unknown}) -> S<{unknown}>
-    [296; 308) 'S(default())': S<{unknown}>
-    [298; 305) 'default': fn default<{unknown}>() -> {unknown}
-    [298; 307) 'default()': {unknown}
+    27..28 'x': impl Trait<u32>
+    47..58 '{ loop {} }': ()
+    49..56 'loop {}': !
+    54..56 '{}': ()
+    69..70 'x': impl Trait<T>
+    92..103 '{ loop {} }': T
+    94..101 'loop {}': !
+    99..101 '{}': ()
+    172..183 '{ loop {} }': T
+    174..181 'loop {}': !
+    179..181 '{}': ()
+    214..310 '{     ...t()) }': S<{unknown}>
+    224..226 's1': S<u32>
+    229..230 'S': S<u32>(u32) -> S<u32>
+    229..241 'S(default())': S<u32>
+    231..238 'default': fn default<u32>() -> u32
+    231..240 'default()': u32
+    247..250 'foo': fn foo(S<u32>)
+    247..254 'foo(s1)': ()
+    251..253 's1': S<u32>
+    264..265 'x': i32
+    273..276 'bar': fn bar<i32>(S<i32>) -> i32
+    273..290 'bar(S(...lt()))': i32
+    277..278 'S': S<i32>(i32) -> S<i32>
+    277..289 'S(default())': S<i32>
+    279..286 'default': fn default<i32>() -> i32
+    279..288 'default()': i32
+    296..297 'S': S<{unknown}>({unknown}) -> S<{unknown}>
+    296..308 'S(default())': S<{unknown}>
+    298..305 'default': fn default<{unknown}>() -> {unknown}
+    298..307 'default()': {unknown}
     "###
     );
 }
@@ -2176,15 +2176,15 @@ fn main() {
 }
 "#),
         @r###"
-    [147; 149) '_v': F
-    [192; 195) '{ }': ()
-    [207; 238) '{     ... }); }': ()
-    [213; 223) 'f::<(), _>': fn f<(), |&()| -> ()>(|&()| -> ())
-    [213; 235) 'f::<()... z; })': ()
-    [224; 234) '|z| { z; }': |&()| -> ()
-    [225; 226) 'z': &()
-    [228; 234) '{ z; }': ()
-    [230; 231) 'z': &()
+    147..149 '_v': F
+    192..195 '{ }': ()
+    207..238 '{     ... }); }': ()
+    213..223 'f::<(), _>': fn f<(), |&()| -> ()>(|&()| -> ())
+    213..235 'f::<()... z; })': ()
+    224..234 '|z| { z; }': |&()| -> ()
+    225..226 'z': &()
+    228..234 '{ z; }': ()
+    230..231 'z': &()
     "###
     );
 }
@@ -2337,46 +2337,46 @@ fn main() {
 }
 "#),
         @r###"
-    [240; 244) 'self': Self
-    [246; 247) 'f': F
-    [331; 342) '{ loop {} }': FilterMap<Self, F>
-    [333; 340) 'loop {}': !
-    [338; 340) '{}': ()
-    [363; 367) 'self': Self
-    [369; 370) 'f': F
-    [419; 430) '{ loop {} }': ()
-    [421; 428) 'loop {}': !
-    [426; 428) '{}': ()
-    [539; 543) 'self': Self
-    [868; 872) 'self': I
-    [879; 899) '{     ...     }': I
-    [889; 893) 'self': I
-    [958; 969) '{ loop {} }': Vec<T>
-    [960; 967) 'loop {}': !
-    [965; 967) '{}': ()
-    [1156; 1287) '{     ... }); }': ()
-    [1162; 1177) 'Vec::<i32>::new': fn new<i32>() -> Vec<i32>
-    [1162; 1179) 'Vec::<...:new()': Vec<i32>
-    [1162; 1191) 'Vec::<...iter()': IntoIter<i32>
-    [1162; 1256) 'Vec::<...one })': FilterMap<IntoIter<i32>, |i32| -> Option<u32>>
-    [1162; 1284) 'Vec::<... y; })': ()
-    [1210; 1255) '|x| if...None }': |i32| -> Option<u32>
-    [1211; 1212) 'x': i32
-    [1214; 1255) 'if x >...None }': Option<u32>
-    [1217; 1218) 'x': i32
-    [1217; 1222) 'x > 0': bool
-    [1221; 1222) '0': i32
-    [1223; 1241) '{ Some...u32) }': Option<u32>
-    [1225; 1229) 'Some': Some<u32>(u32) -> Option<u32>
-    [1225; 1239) 'Some(x as u32)': Option<u32>
-    [1230; 1231) 'x': i32
-    [1230; 1238) 'x as u32': u32
-    [1247; 1255) '{ None }': Option<u32>
-    [1249; 1253) 'None': Option<u32>
-    [1273; 1283) '|y| { y; }': |u32| -> ()
-    [1274; 1275) 'y': u32
-    [1277; 1283) '{ y; }': ()
-    [1279; 1280) 'y': u32
+    240..244 'self': Self
+    246..247 'f': F
+    331..342 '{ loop {} }': FilterMap<Self, F>
+    333..340 'loop {}': !
+    338..340 '{}': ()
+    363..367 'self': Self
+    369..370 'f': F
+    419..430 '{ loop {} }': ()
+    421..428 'loop {}': !
+    426..428 '{}': ()
+    539..543 'self': Self
+    868..872 'self': I
+    879..899 '{     ...     }': I
+    889..893 'self': I
+    958..969 '{ loop {} }': Vec<T>
+    960..967 'loop {}': !
+    965..967 '{}': ()
+    1156..1287 '{     ... }); }': ()
+    1162..1177 'Vec::<i32>::new': fn new<i32>() -> Vec<i32>
+    1162..1179 'Vec::<...:new()': Vec<i32>
+    1162..1191 'Vec::<...iter()': IntoIter<i32>
+    1162..1256 'Vec::<...one })': FilterMap<IntoIter<i32>, |i32| -> Option<u32>>
+    1162..1284 'Vec::<... y; })': ()
+    1210..1255 '|x| if...None }': |i32| -> Option<u32>
+    1211..1212 'x': i32
+    1214..1255 'if x >...None }': Option<u32>
+    1217..1218 'x': i32
+    1217..1222 'x > 0': bool
+    1221..1222 '0': i32
+    1223..1241 '{ Some...u32) }': Option<u32>
+    1225..1229 'Some': Some<u32>(u32) -> Option<u32>
+    1225..1239 'Some(x as u32)': Option<u32>
+    1230..1231 'x': i32
+    1230..1238 'x as u32': u32
+    1247..1255 '{ None }': Option<u32>
+    1249..1253 'None': Option<u32>
+    1273..1283 '|y| { y; }': |u32| -> ()
+    1274..1275 'y': u32
+    1277..1283 '{ y; }': ()
+    1279..1280 'y': u32
     "###
     );
 }
@@ -2428,13 +2428,13 @@ fn test(x: &dyn Foo) {
 }
 "#, true),
         @r###"
-    [22; 23) 'x': &dyn Foo
-    [35; 37) '{}': ()
-    [47; 48) 'x': &dyn Foo
-    [60; 75) '{     foo(x); }': ()
-    [66; 69) 'foo': fn foo(&dyn Foo)
-    [66; 72) 'foo(x)': ()
-    [70; 71) 'x': &dyn Foo
+    22..23 'x': &dyn Foo
+    35..37 '{}': ()
+    47..48 'x': &dyn Foo
+    60..75 '{     foo(x); }': ()
+    66..69 'foo': fn foo(&dyn Foo)
+    66..72 'foo(x)': ()
+    70..71 'x': &dyn Foo
     "###
     );
 }

crates/ra_ide/src/call_hierarchy.rs

@@ -183,8 +183,8 @@ fn caller() {
                 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 @@ fn caller() {
                 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 @@ fn caller() {
                 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 @@ fn caller2() {
                 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 @@ fn caller() {
             //- /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 @@ fn call<|>er() {
                 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 @@ fn call<|>er() {
             //- /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 @@ fn caller3() {
 
             }
             "#,
-            "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]"],
         );
     }
 }

crates/ra_ide/src/call_info.rs

@@ -126,7 +126,7 @@ fn with_node(syntax: &SyntaxNode) -> Option<FnCallNode> {
                     ast::CallExpr(it) => Some(FnCallNode::CallExpr(it)),
                     ast::MethodCallExpr(it) => {
                         let arg_list = it.arg_list()?;
-                        if !syntax.text_range().is_subrange(&arg_list.syntax().text_range()) {
+                        if !arg_list.syntax().text_range().contains_range(syntax.text_range()) {
                             return None;
                         }
                         Some(FnCallNode::MethodCallExpr(it))

crates/ra_ide/src/completion/complete_attribute.rs

@@ -147,190 +147,190 @@ fn test_attribute_completion() {
         [
             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 @@ fn test_inner_attribute_completion() {
         [
             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,
             },

crates/ra_ide/src/completion/complete_dot.rs

@@ -94,8 +94,8 @@ fn foo(a: A) {
         [
             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 @@ fn foo(self) {
         [
             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 @@ fn foo(self) {
             },
             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 @@ fn foo(&self) {
         [
             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 @@ fn foo(&self) {
             },
             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 @@ fn foo(a: inner::A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A<u32>) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: &A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo() {
         [
             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 @@ fn foo(&self) {
         [
             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 @@ struct A { the_field: u32 }
         [
             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 @@ pub trait Future {}
         [
             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 c {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo() {
         [
             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",

crates/ra_ide/src/completion/complete_fn_param.rs

@@ -75,8 +75,8 @@ fn baz(file<|>) {}
         [
             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 @@ fn baz(file<|>, x: i32) {}
         [
             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 @@ pub fn syntax(&self, file<|>)
         [
             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",
             },

crates/ra_ide/src/completion/complete_keyword.rs

@@ -97,7 +97,7 @@ fn is_in_loop_body(leaf: &SyntaxToken) -> bool {
             }
         };
         if let Some(body) = loop_body {
-            if leaf.text_range().is_subrange(&body.syntax().text_range()) {
+            if body.syntax().text_range().contains_range(leaf.text_range()) {
                 return true;
             }
         }
@@ -140,22 +140,22 @@ fn completes_keywords_in_use_stmt() {
         [
             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 @@ fn completes_keywords_in_use_stmt() {
         [
             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 @@ fn completes_keywords_in_use_stmt() {
         [
             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 @@ fn quux() {
         [
             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 @@ fn quux() {
         [
             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 @@ fn quux() -> i32 {
         [
             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 @@ fn quux() {
         [
             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 @@ fn quux() -> i32 {
         [
             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 @@ fn quux() -> i32 {
         [
             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 @@ fn quux() -> i32 {
         [
             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 @@ fn quux() -> i32 {
         [
             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 @@ fn quux() -> i32 {
         [
             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 @@ fn f() {
         [
             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,
             },

crates/ra_ide/src/completion/complete_macro_in_item_position.rs

@@ -42,8 +42,8 @@ fn foo() {}
         [
             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 @@ fn foo() {}
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
             },
             CompletionItem {
                 label: "main()",
-                source_range: [163; 163),
-                delete: [163; 163),
+                source_range: 163..163,
+                delete: 163..163,
                 insert: "main()$0",
                 kind: Function,
                 lookup: "main",

crates/ra_ide/src/completion/complete_pattern.rs

@@ -63,37 +63,37 @@ fn foo() {
         [
             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 @@ fn foo() {
         [
             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",

crates/ra_ide/src/completion/complete_postfix.rs

@@ -2,7 +2,7 @@
 
 use ra_syntax::{
     ast::{self, AstNode},
-    TextRange, TextUnit,
+    TextRange, TextSize,
 };
 use ra_text_edit::TextEdit;
 
@@ -115,7 +115,7 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
 fn get_receiver_text(receiver: &ast::Expr, receiver_is_ambiguous_float_literal: bool) -> String {
     if receiver_is_ambiguous_float_literal {
         let text = receiver.syntax().text();
-        let without_dot = ..text.len() - TextUnit::of_char('.');
+        let without_dot = ..text.len() - TextSize::of('.');
         text.slice(without_dot).to_string()
     } else {
         receiver.to_string()
@@ -143,7 +143,7 @@ fn postfix_snippet(
     let edit = {
         let receiver_syntax = receiver.syntax();
         let receiver_range = ctx.sema.original_range(receiver_syntax).range;
-        let delete_range = TextRange::from_to(receiver_range.start(), ctx.source_range().end());
+        let delete_range = TextRange::new(receiver_range.start(), ctx.source_range().end());
         TextEdit::replace(delete_range, snippet.to_string())
     };
     CompletionItem::new(CompletionKind::Postfix, ctx.source_range(), label)
@@ -176,57 +176,57 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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",
             },

crates/ra_ide/src/completion/complete_qualified_path.rs

@@ -162,8 +162,8 @@ mod my {
         [
             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 my {
         [
             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 m {
         [
             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 @@ fn completes_use_item_starting_with_crate() {
         [
             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 @@ fn completes_nested_use_tree() {
         [
             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 @@ pub mod baz {
         [
             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 @@ fn foo() { let _ = E::<|> }
         [
             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 @@ fn foo() { let _ = E::<|> }
             },
             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 @@ fn foo() { let _ = E::<|> }
         [
             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 @@ fn foo() { let _ = E::<|> }
             },
             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 @@ fn foo() { let _ = E::<|> }
             },
             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 @@ fn foo() { let _ = S::<|> }
         [
             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 @@ fn foo() { let _ = S::<|> }
         [
             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 @@ fn foo() { let _ = S::<|> }
         [
             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 @@ fn foo() { let _ = S::<|> }
         [
             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 @@ fn foo() { let _ = S::<|> }
         [
             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 @@ fn foo() { let _ = S::<|> }
         [
             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 @@ fn foo() { let _ = U::<|> }
         [
             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 @@ pub mod bar {
         [
             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 @@ fn foo() { let _ = Trait::<|> }
         [
             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 @@ fn foo() { let _ = S::<|> }
         [
             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 @@ fn foo() { let _ = <S as Trait>::<|> }
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
             },
             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 @@ fn main() {
         [
             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 @@ fn wrong_fn() {}
         [
             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 @@ fn foo() {}
         [
             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 @@ fn foo() {}
             },
             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 @@ pub fn z() {}
         [
             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 @@ fn foo() {
         [
             CompletionItem {
                 label: "new()",
-                source_range: [292; 292),
-                delete: [292; 292),
+                source_range: 292..292,
+                delete: 292..292,
                 insert: "new()$0",
                 kind: Function,
                 lookup: "new",

crates/ra_ide/src/completion/complete_record.rs

@@ -44,8 +44,8 @@ fn process(f: S) {
         [
             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 @@ fn process(e: E) {
         [
             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 @@ fn process(f: S) {
         [
             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 @@ fn main() {
         [
             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 @@ fn foo() {
         [
             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 @@ fn foo() {
         [
             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 @@ fn foo() {
         [
             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 @@ fn foo() {
         [
             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 @@ fn foo() {
         [
             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 @@ fn foo() {
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             CompletionItem {
                 label: "foo2",
-                source_range: [221; 221),
-                delete: [221; 221),
+                source_range: 221..221,
+                delete: 221..221,
                 insert: "foo2",
                 kind: Field,
                 detail: "u32",

crates/ra_ide/src/completion/complete_snippet.rs

@@ -67,15 +67,15 @@ fn completes_snippets_in_expressions() {
         [
             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,
             },

crates/ra_ide/src/completion/complete_trait_impl.rs

@@ -141,7 +141,7 @@ fn add_function_impl(
     } else {
         CompletionItemKind::Function
     };
-    let range = TextRange::from_to(fn_def_node.text_range().start(), ctx.source_range().end());
+    let range = TextRange::new(fn_def_node.text_range().start(), ctx.source_range().end());
 
     match ctx.config.snippet_cap {
         Some(cap) => {
@@ -167,7 +167,7 @@ fn add_type_alias_impl(
 
     let snippet = format!("type {} = ", alias_name);
 
-    let range = TextRange::from_to(type_def_node.text_range().start(), ctx.source_range().end());
+    let range = TextRange::new(type_def_node.text_range().start(), ctx.source_range().end());
 
     CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone())
         .text_edit(TextEdit::replace(range, snippet))
@@ -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::from_to(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))
@@ -216,7 +215,7 @@ fn make_const_compl_syntax(const_: &ast::ConstDef) -> String {
         .map_or(const_end, |f| f.text_range().start());
 
     let len = end - start;
-    let range = TextRange::from_to(0.into(), len);
+    let range = TextRange::new(0.into(), len);
 
     let syntax = const_.syntax().text().slice(range).to_string();
 
@@ -254,24 +253,24 @@ impl Test for T1 {
         [
             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 @@ impl Test for T1 {
         [
             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 @@ fn f<|>
         [
             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 @@ fn f<|>
         [
             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 @@ fn f<|>
         [
             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 @@ fn f<|>
         [
             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 @@ impl Test for () {
         [
             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 @@ impl Test for () {
         [
             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 @@ impl Test for () {
         [
             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",

crates/ra_ide/src/completion/complete_unqualified_path.rs

@@ -85,8 +85,8 @@ fn self_fulfilling_completion() {
             [
                 CompletionItem {
                     label: "collections",
-                    source_range: [21; 24),
-                    delete: [21; 24),
+                    source_range: 21..24,
+                    delete: 21..24,
                     insert: "collections",
                 },
             ]
@@ -157,8 +157,8 @@ fn quux(x: Option<Enum>) {
             [
                 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 @@ fn quux(x: i32) {
         [
             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 @@ fn quux(x: i32) {
             },
             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 @@ fn quux() {
         [
             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 @@ fn quux() {
         [
             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 @@ fn quux() {
             },
             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 @@ fn quux<T>() {
         [
             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 @@ struct X<T> {
         [
             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 @@ enum X {
         [
             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 @@ fn quux() {
         [
             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 @@ fn completes_extern_prelude() {
         [
             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 @@ fn quux() { <|> }
         [
             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 @@ fn x() -> <|>
         [
             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 @@ fn foo() {
         [
             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 @@ fn completes_self_in_methods() {
         [
             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 prelude {
         [
             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 prelude {
             },
             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 prelude {
         [
             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 prelude {
             },
             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 @@ fn main() {
         [
             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 @@ fn foo() {
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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 @@ fn frobnicate() {}
         [
             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 @@ fn frobnicate() {}
             },
             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 @@ fn quux(x: i32) {
         [
             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 @@ fn quux(x: i32) {
             },
             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 @@ fn quux(x: i32) {
         [
             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 @@ fn quux(x: i32) {
             },
             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 @@ fn quux(x: i32) {
         [
             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 @@ fn quux(x: i32) {
             },
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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",
@@ -1333,8 +1333,8 @@ fn f() -> m::E {
         [
             CompletionItem {
                 label: "f()",
-                source_range: [98; 99),
-                delete: [98; 99),
+                source_range: 98..99,
+                delete: 98..99,
                 insert: "f()$0",
                 kind: Function,
                 lookup: "f",
@@ -1342,15 +1342,15 @@ fn f() -> m::E {
             },
             CompletionItem {
                 label: "m",
-                source_range: [98; 99),
-                delete: [98; 99),
+                source_range: 98..99,
+                delete: 98..99,
                 insert: "m",
                 kind: Module,
             },
             CompletionItem {
                 label: "m::E::V",
-                source_range: [98; 99),
-                delete: [98; 99),
+                source_range: 98..99,
+                delete: 98..99,
                 insert: "m::E::V",
                 kind: EnumVariant,
                 detail: "()",

crates/ra_ide/src/completion/completion_context.rs

@@ -7,7 +7,7 @@
     algo::{find_covering_element, find_node_at_offset},
     ast, AstNode,
     SyntaxKind::*,
-    SyntaxNode, SyntaxToken, TextRange, TextUnit,
+    SyntaxNode, SyntaxToken, TextRange, TextSize,
 };
 use ra_text_edit::AtomTextEdit;
 
@@ -20,7 +20,7 @@ pub(crate) struct CompletionContext<'a> {
     pub(super) sema: Semantics<'a, RootDatabase>,
     pub(super) db: &'a RootDatabase,
     pub(super) config: &'a CompletionConfig,
-    pub(super) offset: TextUnit,
+    pub(super) offset: TextSize,
     /// The token before the cursor, in the original file.
     pub(super) original_token: SyntaxToken,
     /// The token before the cursor, in the macro-expanded file.
@@ -167,7 +167,7 @@ pub(crate) fn source_range(&self) -> TextRange {
         match self.token.kind() {
             // workaroud when completion is triggered by trigger characters.
             IDENT => self.original_token.text_range(),
-            _ => TextRange::offset_len(self.offset, 0.into()),
+            _ => TextRange::empty(self.offset),
         }
     }
 
@@ -190,7 +190,7 @@ fn fill(
         &mut self,
         original_file: &SyntaxNode,
         file_with_fake_ident: SyntaxNode,
-        offset: TextUnit,
+        offset: TextSize,
     ) {
         // First, let's try to complete a reference to some declaration.
         if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(&file_with_fake_ident, offset) {
@@ -224,7 +224,8 @@ fn fill(
                 }
                 if let Some(let_stmt) = bind_pat.syntax().ancestors().find_map(ast::LetStmt::cast) {
                     if let Some(pat) = let_stmt.pat() {
-                        if bind_pat.syntax().text_range().is_subrange(&pat.syntax().text_range()) {
+                        if pat.syntax().text_range().contains_range(bind_pat.syntax().text_range())
+                        {
                             self.is_pat_binding_or_const = false;
                         }
                     }
@@ -246,7 +247,7 @@ fn classify_name_ref(
         &mut self,
         original_file: &SyntaxNode,
         name_ref: ast::NameRef,
-        offset: TextUnit,
+        offset: TextSize,
     ) {
         self.name_ref_syntax =
             find_node_at_offset(&original_file, name_ref.syntax().text_range().start());

crates/ra_ide/src/completion/presentation.rs

@@ -452,8 +452,8 @@ fn main() { Foo::Fo<|> }
         [
             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 @@ fn main() { Foo::Fo<|> }
         [
             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 @@ fn main() { Foo::Fo<|> }
         [
             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 @@ fn main() { som<|> }
         [
             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 @@ fn main() { som<|> }
             },
             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 @@ fn main() { som<|> }
             },
             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 @@ fn main() { no_<|> }
         [
             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 @@ fn main() { no_<|> }
             },
             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 @@ fn main() { with_<|> }
         [
             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 @@ fn main() { with_<|> }
             },
             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 @@ fn bar(s: &S) {
         [
             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 @@ fn main() -> Option<i32> {
         [
             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 @@ fn main() -> Option<i32> {
             },
             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 @@ fn main(value: Option<i32>) {
         [
             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 @@ fn bar(s: &S) {
         [
             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 @@ fn bar(s: &S) {
         [
             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 m { pub fn foo() {} }
         [
             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 @@ fn main() {
         [
             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 @@ fn main() {
         [
             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 @@ fn foo(xs: Ve<|>)
         [
             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 @@ fn foo(xs: Ve<|>)
         [
             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 @@ fn foo(xs: Ve<|>)
         [
             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 @@ fn foo(xs: Ve<|><i128>)
         [
             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 @@ fn dont_insert_macro_call_parens_unncessary() {
         [
             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 @@ fn main() {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
             },
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
             },
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
             },
             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 @@ fn foo(a: A) {
         [
             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 @@ fn foo(a: A) {
             },
             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",

crates/ra_ide/src/diagnostics.rs

@@ -171,7 +171,7 @@ fn text_edit_for_remove_unnecessary_braces_with_self_in_use_statement(
     if single_use_tree.path()?.segment()?.syntax().first_child_or_token()?.kind() == T![self] {
         let start = use_tree_list_node.prev_sibling_or_token()?.text_range().start();
         let end = use_tree_list_node.text_range().end();
-        let range = TextRange::from_to(start, end);
+        let range = TextRange::new(start, end);
         return Some(TextEdit::delete(range));
     }
     None
@@ -277,7 +277,7 @@ fn check_apply_diagnostic_fix_from_position(fixture: &str, after: &str) {
         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 @@ fn test_unresolved_module_diagnostic() {
         [
             Diagnostic {
                 message: "unresolved module",
-                range: [0; 8),
+                range: 0..8,
                 fix: Some(
                     SourceChange {
                         label: "create module",
@@ -652,7 +652,7 @@ pub struct Foo {
         [
             Diagnostic {
                 message: "Missing structure fields:\n- b",
-                range: [224; 233),
+                range: 224..233,
                 fix: Some(
                     SourceChange {
                         label: "fill struct fields",
@@ -664,7 +664,7 @@ pub struct Foo {
                                 edit: TextEdit {
                                     atoms: [
                                         AtomTextEdit {
-                                            delete: [3; 9),
+                                            delete: 3..9,
                                             insert: "{a:42, 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()",

crates/ra_ide/src/extend_selection.rs

@@ -9,7 +9,7 @@
     ast::{self, AstNode, AstToken},
     Direction, NodeOrToken,
     SyntaxKind::{self, *},
-    SyntaxNode, SyntaxToken, TextRange, TextUnit, TokenAtOffset, T,
+    SyntaxNode, SyntaxToken, TextRange, TextSize, TokenAtOffset, T,
 };
 
 use crate::FileRange;
@@ -121,10 +121,10 @@ fn extend_tokens_from_range(
     let mut first_token = skip_trivia_token(first_token, Direction::Next)?;
     let mut last_token = skip_trivia_token(last_token, Direction::Prev)?;
 
-    while !first_token.text_range().is_subrange(&original_range) {
+    while !original_range.contains_range(first_token.text_range()) {
         first_token = skip_trivia_token(first_token.next_token()?, Direction::Next)?;
     }
-    while !last_token.text_range().is_subrange(&original_range) {
+    while !original_range.contains_range(last_token.text_range()) {
         last_token = skip_trivia_token(last_token.prev_token()?, Direction::Prev)?;
     }
 
@@ -161,8 +161,8 @@ fn extend_tokens_from_range(
     .take_while(validate)
     .last()?;
 
-    let range = first.text_range().extend_to(&last.text_range());
-    if original_range.is_subrange(&range) && original_range != range {
+    let range = first.text_range().cover(last.text_range());
+    if range.contains_range(original_range) && original_range != range {
         Some(range)
     } else {
         None
@@ -176,7 +176,7 @@ fn shallowest_node(node: &SyntaxNode) -> SyntaxNode {
 
 fn extend_single_word_in_comment_or_string(
     leaf: &SyntaxToken,
-    offset: TextUnit,
+    offset: TextSize,
 ) -> Option<TextRange> {
     let text: &str = leaf.text();
     let cursor_position: u32 = (offset - leaf.text_range().start()).into();
@@ -190,10 +190,10 @@ fn non_word_char(c: char) -> bool {
     let start_idx = before.rfind(non_word_char)? as u32;
     let end_idx = after.find(non_word_char).unwrap_or_else(|| after.len()) as u32;
 
-    let from: TextUnit = (start_idx + 1).into();
-    let to: TextUnit = (cursor_position + end_idx).into();
+    let from: TextSize = (start_idx + 1).into();
+    let to: TextSize = (cursor_position + end_idx).into();
 
-    let range = TextRange::from_to(from, to);
+    let range = TextRange::new(from, to);
     if range.is_empty() {
         None
     } else {
@@ -201,24 +201,24 @@ fn non_word_char(c: char) -> bool {
     }
 }
 
-fn extend_ws(root: &SyntaxNode, ws: SyntaxToken, offset: TextUnit) -> TextRange {
+fn extend_ws(root: &SyntaxNode, ws: SyntaxToken, offset: TextSize) -> TextRange {
     let ws_text = ws.text();
-    let suffix = TextRange::from_to(offset, ws.text_range().end()) - ws.text_range().start();
-    let prefix = TextRange::from_to(ws.text_range().start(), offset) - ws.text_range().start();
+    let suffix = TextRange::new(offset, ws.text_range().end()) - ws.text_range().start();
+    let prefix = TextRange::new(ws.text_range().start(), offset) - ws.text_range().start();
     let ws_suffix = &ws_text.as_str()[suffix];
     let ws_prefix = &ws_text.as_str()[prefix];
     if ws_text.contains('\n') && !ws_suffix.contains('\n') {
         if let Some(node) = ws.next_sibling_or_token() {
             let start = match ws_prefix.rfind('\n') {
-                Some(idx) => ws.text_range().start() + TextUnit::from((idx + 1) as u32),
+                Some(idx) => ws.text_range().start() + TextSize::from((idx + 1) as u32),
                 None => node.text_range().start(),
             };
             let end = if root.text().char_at(node.text_range().end()) == Some('\n') {
-                node.text_range().end() + TextUnit::of_char('\n')
+                node.text_range().end() + TextSize::of('\n')
             } else {
                 node.text_range().end()
             };
-            return TextRange::from_to(start, end);
+            return TextRange::new(start, end);
         }
     }
     ws.text_range()
@@ -270,13 +270,10 @@ fn nearby_delimiter(
             .filter(|node| is_single_line_ws(node))
             .unwrap_or(delimiter_node);
 
-        return Some(TextRange::from_to(node.text_range().start(), final_node.text_range().end()));
+        return Some(TextRange::new(node.text_range().start(), final_node.text_range().end()));
     }
     if let Some(delimiter_node) = nearby_delimiter(delimiter, node, Direction::Prev) {
-        return Some(TextRange::from_to(
-            delimiter_node.text_range().start(),
-            node.text_range().end(),
-        ));
+        return Some(TextRange::new(delimiter_node.text_range().start(), node.text_range().end()));
     }
 
     None
@@ -286,10 +283,7 @@ fn extend_comments(comment: ast::Comment) -> Option<TextRange> {
     let prev = adj_comments(&comment, Direction::Prev);
     let next = adj_comments(&comment, Direction::Next);
     if prev != next {
-        Some(TextRange::from_to(
-            prev.syntax().text_range().start(),
-            next.syntax().text_range().end(),
-        ))
+        Some(TextRange::new(prev.syntax().text_range().start(), next.syntax().text_range().end()))
     } else {
         None
     }
@@ -322,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 {

crates/ra_ide/src/folding_ranges.rs

@@ -141,7 +141,7 @@ fn contiguous_range_for_group_unless(
     }
 
     if first != &last {
-        Some(TextRange::from_to(first.text_range().start(), last.text_range().end()))
+        Some(TextRange::new(first.text_range().start(), last.text_range().end()))
     } else {
         // The group consists of only one element, therefore it cannot be folded
         None
@@ -187,10 +187,7 @@ fn contiguous_range_for_comment(
     }
 
     if first != last {
-        Some(TextRange::from_to(
-            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

crates/ra_ide/src/goto_definition.rs

@@ -140,7 +140,7 @@ fn goto_def_in_items() {
             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 @@ fn goto_def_at_start_of_item() {
             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 @@ enum E { X(Foo<|>) }
             //- /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 @@ fn goto_def_for_module_declaration() {
             //- /foo.rs
             // empty
             ",
-            "foo SOURCE_FILE FileId(2) [0; 10)",
+            "foo SOURCE_FILE FileId(2) 0..10",
             "// empty\n\n",
         );
 
@@ -201,7 +201,7 @@ fn goto_def_for_module_declaration() {
             //- /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 @@ fn bar() {
                 <|>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 @@ fn bar() {
             #[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 @@ fn goto_def_for_macros_in_use_tree() {
             #[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 @@ fn bar() {
                <|>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 @@ fn bar() {
                <|>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 @@ fn bar() {
                 }
             }
             ",
-            "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 @@ fn bar() {
                 }
             }
             ",
-            "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 @@ fn bar(foo: &Foo) {
                 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 @@ fn bar(foo: &Foo) {
                 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 @@ fn bar() -> Foo {
                 }
             }
             ",
-            "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 @@ fn bar(foo: Foo) -> Foo {
                 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 @@ fn bar() -> Foo {
                 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 @@ fn bar() {
                 foo.<|>0;
             }
             ",
-            "TUPLE_FIELD_DEF FileId(1) [11; 14)",
+            "TUPLE_FIELD_DEF FileId(1) 11..14",
             "u32",
         );
     }
@@ -462,7 +462,7 @@ fn bar(foo: &Foo) {
                 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 @@ fn bar() {
                 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 @@ fn bar() {
                 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 @@ pub fn new() -> Self {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [12; 73)",
+            "impl IMPL_DEF FileId(1) 12..73",
             "impl Foo {...}",
         );
 
@@ -531,7 +531,7 @@ pub fn new() -> Self<|> {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [12; 73)",
+            "impl IMPL_DEF FileId(1) 12..73",
             "impl Foo {...}",
         );
 
@@ -545,7 +545,7 @@ pub fn new() -> Self<|> {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [15; 75)",
+            "impl IMPL_DEF FileId(1) 15..75",
             "impl Foo {...}",
         );
 
@@ -558,7 +558,7 @@ pub fn thing(a: &Self<|>) {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [15; 62)",
+            "impl IMPL_DEF FileId(1) 15..62",
             "impl Foo {...}",
         );
     }
@@ -578,7 +578,7 @@ fn new() -> Self {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [49; 115)",
+            "impl IMPL_DEF FileId(1) 49..115",
             "impl Make for Foo {...}",
         );
 
@@ -595,7 +595,7 @@ fn new() -> Self<|> {
                 }
             }
             ",
-            "impl IMPL_DEF FileId(1) [49; 115)",
+            "impl IMPL_DEF FileId(1) 49..115",
             "impl Make for Foo {...}",
         );
     }
@@ -607,7 +607,7 @@ fn goto_def_when_used_on_definition_name_itself() {
             //- /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 @@ struct Foo {
                 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 @@ struct Foo {
             //- /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 @@ enum Foo<|> {
                 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 @@ enum Foo {
                 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 @@ enum Foo {
             //- /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 @@ enum Foo {
             //- /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 @@ enum Foo {
             //- /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 @@ enum Foo {
             //- /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 @@ trait Foo<|> { }
             //- /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 @@ fn bar() {
             }
             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 @@ fn test() {
                 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 @@ struct Foo<T> {
                 t: <|>T,
             }
             ",
-            "T TYPE_PARAM FileId(1) [11; 12)",
+            "T TYPE_PARAM FileId(1) 11..12",
             "T",
         );
     }
@@ -782,7 +782,7 @@ fn foo() {
                 });
             }
             ",
-            "x BIND_PAT FileId(1) [69; 70)",
+            "x BIND_PAT FileId(1) 69..70",
             "x",
         );
 
@@ -801,7 +801,7 @@ fn foo() {
                 });
             }
             ",
-            "y BIND_PAT FileId(1) [98; 99)",
+            "y BIND_PAT FileId(1) 98..99",
             "y",
         );
     }
@@ -818,7 +818,7 @@ fn foo() {
                 }
             }
             ",
-            "x BIND_PAT FileId(1) [39; 40)",
+            "x BIND_PAT FileId(1) 39..40",
             "x",
         );
     }
@@ -833,7 +833,7 @@ macro_rules! foo { () => { () } }
                 <|>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 @@ fn main() {
                 Foo { x<|> };
             }
             ",
-            "x BIND_PAT FileId(1) [42; 43)",
+            "x BIND_PAT FileId(1) 42..43",
             "x",
         )
     }

crates/ra_ide/src/goto_type_definition.rs

@@ -68,7 +68,7 @@ fn foo() {
                 f<|>
             }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
         );
     }
 
@@ -83,7 +83,7 @@ fn foo() {
                 f<|>
             }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
         );
     }
 
@@ -102,7 +102,7 @@ fn bar() {
                 }
             }
             ",
-            "Foo STRUCT_DEF FileId(1) [52; 65) [59; 62)",
+            "Foo STRUCT_DEF FileId(1) 52..65 59..62",
         );
     }
 
@@ -114,7 +114,7 @@ fn goto_type_definition_for_param() {
             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 @@ fn foo() {
                 bar.<|>0;
             }
             ",
-            "Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
+            "Foo STRUCT_DEF FileId(1) 0..11 7..10",
         );
     }
 }

crates/ra_ide/src/hover.rs

@@ -275,7 +275,7 @@ fn main() {
             ",
         );
         let hover = analysis.hover(position).unwrap().unwrap();
-        assert_eq!(hover.range, TextRange::from_to(95.into(), 100.into()));
+        assert_eq!(hover.range, TextRange::new(95.into(), 100.into()));
         assert_eq!(trim_markup_opt(hover.info.first()), Some("u32"));
     }
 

crates/ra_ide/src/impls.rs

@@ -86,7 +86,7 @@ fn goto_implementation_works() {
             struct Foo<|>;
             impl Foo {}
             ",
-            &["impl IMPL_DEF FileId(1) [12; 23)"],
+            &["impl IMPL_DEF FileId(1) 12..23"],
         );
     }
 
@@ -99,7 +99,7 @@ fn goto_implementation_works_multiple_blocks() {
             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 b {
                 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 @@ impl crate::Foo {}
             //- /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 @@ trait T<|> {}
             struct Foo;
             impl T for Foo {}
             ",
-            &["impl IMPL_DEF FileId(1) [23; 40)"],
+            &["impl IMPL_DEF FileId(1) 23..40"],
         );
     }
 
@@ -164,7 +164,7 @@ impl crate::T for crate::Foo {}
             //- /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 @@ impl T for Foo {}
             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 @@ fn goto_implementation_to_builtin_derive() {
             #[derive(Copy)]
             struct Foo<|>;
             ",
-            &["impl IMPL_DEF FileId(1) [0; 15)"],
+            &["impl IMPL_DEF FileId(1) 0..15"],
         );
     }
 }

crates/ra_ide/src/inlay_hints.rs

@@ -322,12 +322,12 @@ fn main() {
         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 @@ fn main() {
         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 @@ struct InnerStruct {}
         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>>",
             },

crates/ra_ide/src/join_lines.rs

@@ -7,7 +7,7 @@
     ast::{self, AstNode, AstToken},
     Direction, NodeOrToken, SourceFile,
     SyntaxKind::{self, WHITESPACE},
-    SyntaxNode, SyntaxToken, TextRange, TextUnit, T,
+    SyntaxNode, SyntaxToken, TextRange, TextSize, T,
 };
 use ra_text_edit::{TextEdit, TextEditBuilder};
 
@@ -19,7 +19,7 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
             None => return TextEditBuilder::default().finish(),
             Some(pos) => pos,
         };
-        TextRange::offset_len(range.start() + pos, TextUnit::of_char('\n'))
+        TextRange::at(range.start() + pos, TextSize::of('\n'))
     } else {
         range
     };
@@ -30,13 +30,13 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
     };
     let mut edit = TextEditBuilder::default();
     for token in node.descendants_with_tokens().filter_map(|it| it.into_token()) {
-        let range = match range.intersection(&token.text_range()) {
+        let range = match range.intersect(token.text_range()) {
             Some(range) => range,
             None => continue,
         } - token.text_range().start();
         let text = token.text();
         for (pos, _) in text[range].bytes().enumerate().filter(|&(_, b)| b == b'\n') {
-            let pos: TextUnit = (pos as u32).into();
+            let pos: TextSize = (pos as u32).into();
             let off = token.text_range().start() + range.start() + pos;
             if !edit.invalidates_offset(off) {
                 remove_newline(&mut edit, &token, off);
@@ -47,16 +47,16 @@ pub fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
     edit.finish()
 }
 
-fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextUnit) {
+fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextSize) {
     if token.kind() != WHITESPACE || token.text().bytes().filter(|&b| b == b'\n').count() != 1 {
         // The node is either the first or the last in the file
-        let suff = &token.text()[TextRange::from_to(
-            offset - token.text_range().start() + TextUnit::of_char('\n'),
-            TextUnit::of_str(token.text()),
+        let suff = &token.text()[TextRange::new(
+            offset - token.text_range().start() + TextSize::of('\n'),
+            TextSize::of(token.text().as_str()),
         )];
         let spaces = suff.bytes().take_while(|&b| b == b' ').count();
 
-        edit.replace(TextRange::offset_len(offset, ((spaces + 1) as u32).into()), " ".to_string());
+        edit.replace(TextRange::at(offset, ((spaces + 1) as u32).into()), " ".to_string());
         return;
     }
 
@@ -65,7 +65,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextU
     let next = token.next_sibling_or_token().unwrap();
     if is_trailing_comma(prev.kind(), next.kind()) {
         // Removes: trailing comma, newline (incl. surrounding whitespace)
-        edit.delete(TextRange::from_to(prev.text_range().start(), token.text_range().end()));
+        edit.delete(TextRange::new(prev.text_range().start(), token.text_range().end()));
         return;
     }
     if prev.kind() == T![,] && next.kind() == T!['}'] {
@@ -76,7 +76,7 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextU
             " "
         };
         edit.replace(
-            TextRange::from_to(prev.text_range().start(), token.text_range().end()),
+            TextRange::new(prev.text_range().start(), token.text_range().end()),
             space.to_string(),
         );
         return;
@@ -87,9 +87,9 @@ fn remove_newline(edit: &mut TextEditBuilder, token: &SyntaxToken, offset: TextU
         next.as_token().cloned().and_then(ast::Comment::cast),
     ) {
         // Removes: newline (incl. surrounding whitespace), start of the next comment
-        edit.delete(TextRange::from_to(
+        edit.delete(TextRange::new(
             token.text_range().start(),
-            next.syntax().text_range().start() + TextUnit::of_str(next.prefix()),
+            next.syntax().text_range().start() + TextSize::of(next.prefix()),
         ));
         return;
     }
@@ -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)
         })
@@ -420,10 +420,10 @@ fn test_join_lines_use_items_left() {
         check_join_lines(
             r"
 <|>use ra_syntax::{
-    TextUnit, TextRange,
+    TextSize, TextRange,
 };",
             r"
-<|>use ra_syntax::{TextUnit, TextRange,
+<|>use ra_syntax::{TextSize, TextRange,
 };",
         );
     }
@@ -434,11 +434,11 @@ fn test_join_lines_use_items_right() {
         check_join_lines(
             r"
 use ra_syntax::{
-<|>    TextUnit, TextRange
+<|>    TextSize, TextRange
 };",
             r"
 use ra_syntax::{
-<|>    TextUnit, TextRange};",
+<|>    TextSize, TextRange};",
         );
     }
 
@@ -448,11 +448,11 @@ fn test_join_lines_use_items_right_comma() {
         check_join_lines(
             r"
 use ra_syntax::{
-<|>    TextUnit, TextRange,
+<|>    TextSize, TextRange,
 };",
             r"
 use ra_syntax::{
-<|>    TextUnit, TextRange};",
+<|>    TextSize, TextRange};",
         );
     }
 

crates/ra_ide/src/lib.rs

@@ -60,7 +60,7 @@ macro_rules! eprintln {
     symbol_index::{self, FileSymbol},
     LineIndexDatabase,
 };
-use ra_syntax::{SourceFile, TextRange, TextUnit};
+use ra_syntax::{SourceFile, TextRange, TextSize};
 
 use crate::display::ToNav;
 
@@ -265,7 +265,7 @@ pub fn extend_selection(&self, frange: FileRange) -> Cancelable<TextRange> {
 
     /// Returns position of the matching brace (all types of braces are
     /// supported).
-    pub fn matching_brace(&self, position: FilePosition) -> Cancelable<Option<TextUnit>> {
+    pub fn matching_brace(&self, position: FilePosition) -> Cancelable<Option<TextSize>> {
         self.with_db(|db| {
             let parse = db.parse(position.file_id);
             let file = parse.tree();

crates/ra_ide/src/matching_brace.rs

@@ -1,8 +1,8 @@
 //! FIXME: write short doc here
 
-use ra_syntax::{ast::AstNode, SourceFile, SyntaxKind, TextUnit, T};
+use ra_syntax::{ast::AstNode, SourceFile, SyntaxKind, TextSize, T};
 
-pub fn matching_brace(file: &SourceFile, offset: TextUnit) -> Option<TextUnit> {
+pub fn matching_brace(file: &SourceFile, offset: TextSize) -> Option<TextSize> {
     const BRACES: &[SyntaxKind] =
         &[T!['{'], T!['}'], T!['['], T![']'], T!['('], T![')'], T![<], T![>]];
     let (brace_node, brace_idx) = file

crates/ra_ide/src/parent_module.rs

@@ -76,7 +76,7 @@ fn test_resolve_parent_module() {
             ",
         );
         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 @@ fn test_resolve_parent_module_on_module_decl() {
             ",
         );
         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 baz { <|> }
             ",
         );
         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]

crates/ra_ide/src/references.rs

@@ -214,8 +214,8 @@ fn main() {
         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 @@ fn main() {
         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 @@ fn main() {
         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 @@ fn main() {
         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 @@ fn main() {
         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 @@ fn bar() {
         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 @@ fn foo(i : u32) -> u32 {
     }"#;
 
         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 @@ fn foo(i<|> : u32) -> u32 {
     }"#;
 
         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 @@ fn main(s: Foo) {
         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 @@ fn f<|>(&self) {  }
         "#;
 
         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 @@ enum Foo {
         "#;
 
         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 @@ fn f() {
         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 @@ pub struct Foo {
 
         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 @@ pub(super) struct Foo<|> {
         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 @@ pub fn quux<|>() {}
         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 @@ fn foo() {
         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 @@ fn foo() {
         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 @@ fn foo() {
         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 @@ fn foo() {
         }"#;
 
         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 {

crates/ra_ide/src/references/rename.rs

@@ -54,15 +54,12 @@ fn source_edit_from_reference(reference: Reference, new_name: &str) -> SourceFil
         ReferenceKind::StructFieldShorthandForField => {
             replacement_text.push_str(new_name);
             replacement_text.push_str(": ");
-            TextRange::from_to(
-                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(": ");
             replacement_text.push_str(new_name);
-            TextRange::from_to(reference.file_range.range.end(), reference.file_range.range.end())
+            TextRange::new(reference.file_range.range.end(), reference.file_range.range.end())
         }
         _ => {
             replacement_text.push_str(new_name);
@@ -528,7 +525,7 @@ fn test_rename_mod() {
 @r###"
         Some(
             RangeInfo {
-                range: [4; 7),
+                range: 4..7,
                 info: SourceChange {
                     label: "rename",
                     source_file_edits: [
@@ -539,7 +536,7 @@ fn test_rename_mod() {
                             edit: TextEdit {
                                 atoms: [
                                     AtomTextEdit {
-                                        delete: [4; 7),
+                                        delete: 4..7,
                                         insert: "foo2",
                                     },
                                 ],
@@ -580,7 +577,7 @@ fn test_rename_mod_in_dir() {
         @r###"
         Some(
             RangeInfo {
-                range: [4; 7),
+                range: 4..7,
                 info: SourceChange {
                     label: "rename",
                     source_file_edits: [
@@ -591,7 +588,7 @@ fn test_rename_mod_in_dir() {
                             edit: TextEdit {
                                 atoms: [
                                     AtomTextEdit {
-                                        delete: [4; 7),
+                                        delete: 4..7,
                                         insert: "foo2",
                                     },
                                 ],
@@ -663,7 +660,7 @@ fn f() {
 @r###"
         Some(
             RangeInfo {
-                range: [8; 11),
+                range: 8..11,
                 info: SourceChange {
                     label: "rename",
                     source_file_edits: [
@@ -674,7 +671,7 @@ fn f() {
                             edit: TextEdit {
                                 atoms: [
                                     AtomTextEdit {
-                                        delete: [8; 11),
+                                        delete: 8..11,
                                         insert: "foo2",
                                     },
                                 ],
@@ -687,7 +684,7 @@ fn f() {
                             edit: TextEdit {
                                 atoms: [
                                     AtomTextEdit {
-                                        delete: [27; 30),
+                                        delete: 27..30,
                                         insert: "foo2",
                                     },
                                 ],

crates/ra_ide/src/runnables.rs

@@ -164,11 +164,11 @@ fn test_foo() {}
         @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 @@ fn test_foo() {}
                 },
             },
             Runnable {
-                range: [47; 81),
+                range: 47..81,
                 kind: Test {
                     test_id: Path(
                         "test_foo",
@@ -211,13 +211,13 @@ fn test_foo1() {}
         @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 @@ fn test_foo1() {}
         @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 @@ fn test_foo1() {}
         @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",

crates/ra_ide/src/source_change.rs

@@ -6,7 +6,7 @@
 use ra_db::RelativePathBuf;
 use ra_text_edit::TextEdit;
 
-use crate::{FileId, FilePosition, SourceRootId, TextUnit};
+use crate::{FileId, FilePosition, SourceRootId, TextSize};
 
 #[derive(Debug)]
 pub struct SourceChange {
@@ -104,7 +104,7 @@ pub enum FileSystemEdit {
 pub(crate) struct SingleFileChange {
     pub label: String,
     pub edit: TextEdit,
-    pub cursor_position: Option<TextUnit>,
+    pub cursor_position: Option<TextSize>,
 }
 
 impl SingleFileChange {

crates/ra_ide/src/syntax_highlighting.rs

@@ -61,16 +61,16 @@ fn pop(&mut self) {
         let prev = self.stack.last_mut().unwrap();
         let needs_flattening = !children.is_empty()
             && !prev.is_empty()
-            && children.first().unwrap().range.is_subrange(&prev.last().unwrap().range);
+            && prev.last().unwrap().range.contains_range(children.first().unwrap().range);
         if !needs_flattening {
             prev.extend(children);
         } else {
             let mut parent = prev.pop().unwrap();
             for ele in children {
-                assert!(ele.range.is_subrange(&parent.range));
+                assert!(parent.range.contains_range(ele.range));
                 let mut cloned = parent.clone();
-                parent.range = TextRange::from_to(parent.range.start(), ele.range.start());
-                cloned.range = TextRange::from_to(ele.range.end(), cloned.range.end());
+                parent.range = TextRange::new(parent.range.start(), ele.range.start());
+                cloned.range = TextRange::new(ele.range.end(), cloned.range.end());
                 if !parent.range.is_empty() {
                     prev.push(parent);
                 }
@@ -152,7 +152,7 @@ pub(crate) fn highlight(
         };
 
         // Element outside of the viewport, no need to highlight
-        if range_to_highlight.intersection(&event_range).is_none() {
+        if range_to_highlight.intersect(event_range).is_none() {
             continue;
         }
 
@@ -309,7 +309,7 @@ fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
         }
     }
 
-    Some(TextRange::from_to(range_start, range_end))
+    Some(TextRange::new(range_start, range_end))
 }
 
 fn highlight_element(

crates/ra_ide/src/syntax_highlighting/html.rs

@@ -1,11 +1,9 @@
 //! Renders a bit of code as HTML.
 
 use ra_db::SourceDatabase;
-use ra_syntax::{AstNode, TextUnit};
+use ra_syntax::{AstNode, TextRange, TextSize};
 
-use crate::{FileId, RootDatabase};
-
-use super::highlight;
+use crate::{syntax_highlighting::highlight, FileId, RootDatabase};
 
 pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId, rainbow: bool) -> String {
     let parse = db.parse(file_id);
@@ -23,17 +21,17 @@ fn rainbowify(seed: u64) -> String {
 
     let ranges = highlight(db, file_id, None);
     let text = parse.tree().syntax().to_string();
-    let mut prev_pos = TextUnit::from(0);
+    let mut prev_pos = TextSize::from(0);
     let mut buf = String::new();
     buf.push_str(&STYLE);
     buf.push_str("<pre><code>");
     for range in &ranges {
         if range.range.start() > prev_pos {
-            let curr = &text[prev_pos.to_usize()..range.range.start().to_usize()];
+            let curr = &text[TextRange::new(prev_pos, range.range.start())];
             let text = html_escape(curr);
             buf.push_str(&text);
         }
-        let curr = &text[range.range.start().to_usize()..range.range.end().to_usize()];
+        let curr = &text[TextRange::new(range.range.start(), range.range.end())];
 
         let class = range.highlight.to_string().replace('.', " ");
         let color = match (rainbow, range.binding_hash) {
@@ -47,7 +45,7 @@ fn rainbowify(seed: u64) -> String {
         prev_pos = range.range.end();
     }
     // Add the remaining (non-highlighted) text
-    let curr = &text[prev_pos.to_usize()..];
+    let curr = &text[TextRange::new(prev_pos, TextSize::of(&text))];
     let text = html_escape(curr);
     buf.push_str(&text);
     buf.push_str("</code></pre>");

crates/ra_ide/src/syntax_highlighting/tests.rs

@@ -126,7 +126,7 @@ struct Foo {
 
     // 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");

crates/ra_ide/src/syntax_tree.rs

@@ -5,7 +5,7 @@
 use ra_syntax::{
     algo, AstNode, NodeOrToken, SourceFile,
     SyntaxKind::{RAW_STRING, STRING},
-    SyntaxToken, TextRange, TextUnit,
+    SyntaxToken, TextRange, TextSize,
 };
 
 pub use ra_db::FileId;
@@ -66,13 +66,10 @@ 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 < TextUnit::of_str(&text) {
-        start + len
-    } else {
-        TextUnit::of_str(&text) - start
-    };
+    let end =
+        if start + len < TextSize::of(&text) { start + len } else { TextSize::of(&text) - start };
 
-    let text = &text[TextRange::from_to(start, end)];
+    let text = &text[TextRange::new(start, end)];
 
     // Remove possible extra string quotes from the start
     // and the end of the string
@@ -112,20 +109,20 @@ fn test_syntax_tree_without_range() {
         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 foo() {
         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 @@ fn test_syntax_tree_with_range() {
         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 foo() {
         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()
         );

crates/ra_ide/src/test_utils.rs

@@ -1,11 +1,11 @@
 //! FIXME: write short doc here
 
-use ra_syntax::{SourceFile, TextUnit};
+use ra_syntax::{SourceFile, TextSize};
 use ra_text_edit::TextEdit;
 
 pub use test_utils::*;
 
-pub fn check_action<F: Fn(&SourceFile, TextUnit) -> Option<TextEdit>>(
+pub fn check_action<F: Fn(&SourceFile, TextSize) -> Option<TextEdit>>(
     before: &str,
     after: &str,
     f: F,

crates/ra_ide/src/typing.rs

@@ -21,7 +21,7 @@
 use ra_syntax::{
     algo::find_node_at_offset,
     ast::{self, AstToken},
-    AstNode, SourceFile, TextRange, TextUnit,
+    AstNode, SourceFile, TextRange, TextSize,
 };
 use ra_text_edit::TextEdit;
 
@@ -45,7 +45,7 @@ pub(crate) fn on_char_typed(
 
 fn on_char_typed_inner(
     file: &SourceFile,
-    offset: TextUnit,
+    offset: TextSize,
     char_typed: char,
 ) -> Option<SingleFileChange> {
     assert!(TRIGGER_CHARS.contains(char_typed));
@@ -60,7 +60,7 @@ fn on_char_typed_inner(
 /// Returns an edit which should be applied after `=` was typed. Primarily,
 /// this works when adding `let =`.
 // FIXME: use a snippet completion instead of this hack here.
-fn on_eq_typed(file: &SourceFile, offset: TextUnit) -> Option<SingleFileChange> {
+fn on_eq_typed(file: &SourceFile, offset: TextSize) -> Option<SingleFileChange> {
     assert_eq!(file.syntax().text().char_at(offset), Some('='));
     let let_stmt: ast::LetStmt = find_node_at_offset(file.syntax(), offset)?;
     if let_stmt.semicolon_token().is_some() {
@@ -86,7 +86,7 @@ fn on_eq_typed(file: &SourceFile, offset: TextUnit) -> Option<SingleFileChange>
 }
 
 /// Returns an edit which should be applied when a dot ('.') is typed on a blank line, indenting the line appropriately.
-fn on_dot_typed(file: &SourceFile, offset: TextUnit) -> Option<SingleFileChange> {
+fn on_dot_typed(file: &SourceFile, offset: TextSize) -> Option<SingleFileChange> {
     assert_eq!(file.syntax().text().char_at(offset), Some('.'));
     let whitespace =
         file.syntax().token_at_offset(offset).left_biased().and_then(ast::Whitespace::cast)?;
@@ -96,34 +96,29 @@ fn on_dot_typed(file: &SourceFile, offset: TextUnit) -> Option<SingleFileChange>
         let newline = text.rfind('\n')?;
         &text[newline + 1..]
     };
-    let current_indent_len = TextUnit::of_str(current_indent);
+    let current_indent_len = TextSize::of(current_indent);
 
     // Make sure dot is a part of call chain
     let field_expr = ast::FieldExpr::cast(whitespace.syntax().parent())?;
     let prev_indent = leading_indent(field_expr.syntax())?;
     let target_indent = format!("    {}", prev_indent);
-    let target_indent_len = TextUnit::of_str(&target_indent);
+    let target_indent_len = TextSize::of(&target_indent);
     if current_indent_len == target_indent_len {
         return None;
     }
 
     Some(SingleFileChange {
         label: "reindent dot".to_string(),
-        edit: TextEdit::replace(
-            TextRange::from_to(offset - current_indent_len, offset),
-            target_indent,
-        ),
-        cursor_position: Some(
-            offset + target_indent_len - current_indent_len + TextUnit::of_char('.'),
-        ),
+        edit: TextEdit::replace(TextRange::new(offset - current_indent_len, offset), target_indent),
+        cursor_position: Some(offset + target_indent_len - current_indent_len + TextSize::of('.')),
     })
 }
 
 /// Adds a space after an arrow when `fn foo() { ... }` is turned into `fn foo() -> { ... }`
-fn on_arrow_typed(file: &SourceFile, offset: TextUnit) -> Option<SingleFileChange> {
+fn on_arrow_typed(file: &SourceFile, offset: TextSize) -> Option<SingleFileChange> {
     let file_text = file.syntax().text();
     assert_eq!(file_text.char_at(offset), Some('>'));
-    let after_arrow = offset + TextUnit::of_char('>');
+    let after_arrow = offset + TextSize::of('>');
     if file_text.char_at(after_arrow) != Some('{') {
         return None;
     }

crates/ra_ide/src/typing/on_enter.rs

@@ -7,7 +7,7 @@
     ast::{self, AstToken},
     AstNode, SmolStr, SourceFile,
     SyntaxKind::*,
-    SyntaxToken, TextUnit, TokenAtOffset,
+    SyntaxToken, TextSize, TokenAtOffset,
 };
 use ra_text_edit::TextEdit;
 
@@ -28,7 +28,7 @@ pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<Sour
 
     let prefix = comment.prefix();
     let comment_range = comment.syntax().text_range();
-    if position.offset < comment_range.start() + TextUnit::of_str(prefix) {
+    if position.offset < comment_range.start() + TextSize::of(prefix) {
         return None;
     }
 
@@ -39,7 +39,7 @@ pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<Sour
 
     let indent = node_indent(&file, comment.syntax())?;
     let inserted = format!("\n{}{} ", indent, prefix);
-    let cursor_position = position.offset + TextUnit::of_str(&inserted);
+    let cursor_position = position.offset + TextSize::of(&inserted);
     let edit = TextEdit::insert(position.offset, inserted);
 
     Some(

crates/ra_ide_db/src/line_index.rs

@@ -1,14 +1,14 @@
-//! `LineIndex` maps flat `TextUnit` offsets into `(Line, Column)`
+//! `LineIndex` maps flat `TextSize` offsets into `(Line, Column)`
 //! representation.
 use std::iter;
 
-use ra_syntax::{TextRange, TextUnit};
+use ra_syntax::{TextRange, TextSize};
 use rustc_hash::FxHashMap;
 use superslice::Ext;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct LineIndex {
-    pub(crate) newlines: Vec<TextUnit>,
+    pub(crate) newlines: Vec<TextSize>,
     pub(crate) utf16_lines: FxHashMap<u32, Vec<Utf16Char>>,
 }
 
@@ -22,12 +22,12 @@ pub struct LineCol {
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub(crate) struct Utf16Char {
-    pub(crate) start: TextUnit,
-    pub(crate) end: TextUnit,
+    pub(crate) start: TextSize,
+    pub(crate) end: TextSize,
 }
 
 impl Utf16Char {
-    fn len(&self) -> TextUnit {
+    fn len(&self) -> TextSize {
         self.end - self.start
     }
 }
@@ -42,7 +42,8 @@ pub fn new(text: &str) -> LineIndex {
         let mut curr_col = 0.into();
         let mut line = 0;
         for c in text.chars() {
-            curr_row += TextUnit::of_char(c);
+            let c_len = TextSize::of(c);
+            curr_row += c_len;
             if c == '\n' {
                 newlines.push(curr_row);
 
@@ -58,12 +59,11 @@ pub fn new(text: &str) -> LineIndex {
                 continue;
             }
 
-            let char_len = TextUnit::of_char(c);
-            if char_len > TextUnit::from_usize(1) {
-                utf16_chars.push(Utf16Char { start: curr_col, end: curr_col + char_len });
+            if !c.is_ascii() {
+                utf16_chars.push(Utf16Char { start: curr_col, end: curr_col + c_len });
             }
 
-            curr_col += char_len;
+            curr_col += c_len;
         }
 
         // Save any utf-16 characters seen in the last line
@@ -74,7 +74,7 @@ pub fn new(text: &str) -> LineIndex {
         LineIndex { newlines, utf16_lines }
     }
 
-    pub fn line_col(&self, offset: TextUnit) -> LineCol {
+    pub fn line_col(&self, offset: TextSize) -> LineCol {
         let line = self.newlines.upper_bound(&offset) - 1;
         let line_start_offset = self.newlines[line];
         let col = offset - line_start_offset;
@@ -82,7 +82,7 @@ pub fn line_col(&self, offset: TextUnit) -> LineCol {
         LineCol { line: line as u32, col_utf16: self.utf8_to_utf16_col(line as u32, col) as u32 }
     }
 
-    pub fn offset(&self, line_col: LineCol) -> TextUnit {
+    pub fn offset(&self, line_col: LineCol) -> TextSize {
         //FIXME: return Result
         let col = self.utf16_to_utf8_col(line_col.line, line_col.col_utf16);
         self.newlines[line_col.line as usize] + col
@@ -97,35 +97,31 @@ pub fn lines(&self, range: TextRange) -> impl Iterator<Item = TextRange> + '_ {
 
         all.clone()
             .zip(all.skip(1))
-            .map(|(lo, hi)| TextRange::from_to(lo, hi))
+            .map(|(lo, hi)| TextRange::new(lo, hi))
             .filter(|it| !it.is_empty())
     }
 
-    fn utf8_to_utf16_col(&self, line: u32, col: TextUnit) -> usize {
+    fn utf8_to_utf16_col(&self, line: u32, col: TextSize) -> usize {
+        let mut res: usize = col.into();
         if let Some(utf16_chars) = self.utf16_lines.get(&line) {
-            let mut correction = 0;
             for c in utf16_chars {
-                if col >= c.end {
-                    correction += c.len().to_usize() - 1;
+                if c.end <= col {
+                    res -= usize::from(c.len()) - 1;
                 } else {
                     // From here on, all utf16 characters come *after* the character we are mapping,
                     // so we don't need to take them into account
                     break;
                 }
             }
-
-            col.to_usize() - correction
-        } else {
-            col.to_usize()
         }
+        res
     }
 
-    fn utf16_to_utf8_col(&self, line: u32, col: u32) -> TextUnit {
-        let mut col: TextUnit = col.into();
+    fn utf16_to_utf8_col(&self, line: u32, mut col: u32) -> TextSize {
         if let Some(utf16_chars) = self.utf16_lines.get(&line) {
             for c in utf16_chars {
-                if col >= c.start {
-                    col += c.len() - TextUnit::from_usize(1);
+                if col >= u32::from(c.start) {
+                    col += u32::from(c.len()) - 1;
                 } else {
                     // From here on, all utf16 characters come *after* the character we are mapping,
                     // so we don't need to take them into account
@@ -134,12 +130,12 @@ fn utf16_to_utf8_col(&self, line: u32, col: u32) -> TextUnit {
             }
         }
 
-        col
+        col.into()
     }
 }
 
 #[cfg(test)]
-mod test_line_index {
+mod tests {
     use super::*;
 
     #[test]
@@ -200,10 +196,10 @@ fn test_single_char() {
         assert_eq!(col_index.utf8_to_utf16_col(1, 22.into()), 20);
 
         // UTF-16 to UTF-8, no changes
-        assert_eq!(col_index.utf16_to_utf8_col(1, 15), TextUnit::from(15));
+        assert_eq!(col_index.utf16_to_utf8_col(1, 15), TextSize::from(15));
 
         // UTF-16 to UTF-8
-        assert_eq!(col_index.utf16_to_utf8_col(1, 19), TextUnit::from(21));
+        assert_eq!(col_index.utf16_to_utf8_col(1, 19), TextSize::from(21));
     }
 
     #[test]
@@ -228,18 +224,18 @@ fn test_string() {
         assert!(col_index.utf8_to_utf16_col(2, 15.into()) == 15);
 
         // UTF-16 to UTF-8
-        assert_eq!(col_index.utf16_to_utf8_col(1, 15), TextUnit::from_usize(15));
+        assert_eq!(col_index.utf16_to_utf8_col(1, 15), TextSize::from(15));
 
-        assert_eq!(col_index.utf16_to_utf8_col(1, 18), TextUnit::from_usize(20));
-        assert_eq!(col_index.utf16_to_utf8_col(1, 19), TextUnit::from_usize(23));
+        assert_eq!(col_index.utf16_to_utf8_col(1, 18), TextSize::from(20));
+        assert_eq!(col_index.utf16_to_utf8_col(1, 19), TextSize::from(23));
 
-        assert_eq!(col_index.utf16_to_utf8_col(2, 15), TextUnit::from_usize(15));
+        assert_eq!(col_index.utf16_to_utf8_col(2, 15), TextSize::from(15));
     }
 
     #[test]
     fn test_splitlines() {
         fn r(lo: u32, hi: u32) -> TextRange {
-            TextRange::from_to(lo.into(), hi.into())
+            TextRange::new(lo.into(), hi.into())
         }
 
         let text = "a\nbb\nccc\n";

crates/ra_ide_db/src/line_index_utils.rs

@@ -1,20 +1,22 @@
 //! Code actions can specify desirable final position of the cursor.
 //!
-//! The position is specified as a `TextUnit` in the final file. We need to send
+//! The position is specified as a `TextSize` in the final file. We need to send
 //! it in `(Line, Column)` coordinate though. However, we only have a LineIndex
 //! for a file pre-edit!
 //!
 //! Code in this module applies this "to (Line, Column) after edit"
 //! transformation.
 
-use ra_syntax::{TextRange, TextUnit};
+use std::convert::TryInto;
+
+use ra_syntax::{TextRange, TextSize};
 use ra_text_edit::{AtomTextEdit, TextEdit};
 
 use crate::line_index::{LineCol, LineIndex, Utf16Char};
 
 pub fn translate_offset_with_edit(
     line_index: &LineIndex,
-    offset: TextUnit,
+    offset: TextSize,
     text_edit: &TextEdit,
 ) -> LineCol {
     let mut state = Edits::from_text_edit(&text_edit);
@@ -84,7 +86,7 @@ macro_rules! test_step {
 
 #[derive(Debug, Clone)]
 enum Step {
-    Newline(TextUnit),
+    Newline(TextSize),
     Utf16Char(TextRange),
 }
 
@@ -92,7 +94,7 @@ enum Step {
 struct LineIndexStepIter<'a> {
     line_index: &'a LineIndex,
     next_newline_idx: usize,
-    utf16_chars: Option<(TextUnit, std::slice::Iter<'a, Utf16Char>)>,
+    utf16_chars: Option<(TextSize, std::slice::Iter<'a, Utf16Char>)>,
 }
 
 impl LineIndexStepIter<'_> {
@@ -111,7 +113,7 @@ fn next(&mut self) -> Option<Step> {
             .as_mut()
             .and_then(|(newline, x)| {
                 let x = x.next()?;
-                Some(Step::Utf16Char(TextRange::from_to(*newline + x.start, *newline + x.end)))
+                Some(Step::Utf16Char(TextRange::new(*newline + x.start, *newline + x.end)))
             })
             .or_else(|| {
                 let next_newline = *self.line_index.newlines.get(self.next_newline_idx)?;
@@ -129,7 +131,7 @@ fn next(&mut self) -> Option<Step> {
 #[derive(Debug)]
 struct OffsetStepIter<'a> {
     text: &'a str,
-    offset: TextUnit,
+    offset: TextSize,
 }
 
 impl Iterator for OffsetStepIter<'_> {
@@ -139,16 +141,17 @@ fn next(&mut self) -> Option<Step> {
             .text
             .char_indices()
             .filter_map(|(i, c)| {
+                let i: TextSize = i.try_into().unwrap();
+                let char_len = TextSize::of(c);
                 if c == '\n' {
-                    let next_offset = self.offset + TextUnit::from_usize(i + 1);
+                    let next_offset = self.offset + i + char_len;
                     let next = Step::Newline(next_offset);
                     Some((next, next_offset))
                 } else {
-                    let char_len = TextUnit::of_char(c);
-                    if char_len > TextUnit::from_usize(1) {
-                        let start = self.offset + TextUnit::from_usize(i);
+                    if !c.is_ascii() {
+                        let start = self.offset + i;
                         let end = start + char_len;
-                        let next = Step::Utf16Char(TextRange::from_to(start, end));
+                        let next = Step::Utf16Char(TextRange::new(start, end));
                         let next_offset = end;
                         Some((next, next_offset))
                     } else {
@@ -157,7 +160,7 @@ fn next(&mut self) -> Option<Step> {
                 }
             })
             .next()?;
-        let next_idx = (next_offset - self.offset).to_usize();
+        let next_idx: usize = (next_offset - self.offset).into();
         self.text = &self.text[next_idx..];
         self.offset = next_offset;
         Some(next)
@@ -195,7 +198,7 @@ fn advance_edit(&mut self) {
         match self.edits.split_first() {
             Some((next, rest)) => {
                 let delete = self.translate_range(next.delete);
-                let diff = next.insert.len() as i64 - next.delete.len().to_usize() as i64;
+                let diff = next.insert.len() as i64 - usize::from(next.delete.len()) as i64;
                 self.current = Some(TranslatedEdit { delete, insert: &next.insert, diff });
                 self.edits = rest;
             }
@@ -244,15 +247,15 @@ fn translate_range(&self, range: TextRange) -> TextRange {
         } else {
             let start = self.translate(range.start());
             let end = self.translate(range.end());
-            TextRange::from_to(start, end)
+            TextRange::new(start, end)
         }
     }
 
-    fn translate(&self, x: TextUnit) -> TextUnit {
+    fn translate(&self, x: TextSize) -> TextSize {
         if self.acc_diff == 0 {
             x
         } else {
-            TextUnit::from((x.to_usize() as i64 + self.acc_diff) as u32)
+            TextSize::from((usize::from(x) as i64 + self.acc_diff) as u32)
         }
     }
 
@@ -271,29 +274,29 @@ fn translate_step(&self, x: &Step) -> Step {
 #[derive(Debug)]
 struct RunningLineCol {
     line: u32,
-    last_newline: TextUnit,
-    col_adjust: TextUnit,
+    last_newline: TextSize,
+    col_adjust: TextSize,
 }
 
 impl RunningLineCol {
     fn new() -> RunningLineCol {
-        RunningLineCol { line: 0, last_newline: TextUnit::from(0), col_adjust: TextUnit::from(0) }
+        RunningLineCol { line: 0, last_newline: TextSize::from(0), col_adjust: TextSize::from(0) }
     }
 
-    fn to_line_col(&self, offset: TextUnit) -> LineCol {
+    fn to_line_col(&self, offset: TextSize) -> LineCol {
         LineCol {
             line: self.line,
             col_utf16: ((offset - self.last_newline) - self.col_adjust).into(),
         }
     }
 
-    fn add_line(&mut self, newline: TextUnit) {
+    fn add_line(&mut self, newline: TextSize) {
         self.line += 1;
         self.last_newline = newline;
-        self.col_adjust = TextUnit::from(0);
+        self.col_adjust = TextSize::from(0);
     }
 
     fn adjust_col(&mut self, range: TextRange) {
-        self.col_adjust += range.len() - TextUnit::from(1);
+        self.col_adjust += range.len() - TextSize::from(1);
     }
 }

crates/ra_ide_db/src/search.rs

@@ -4,13 +4,13 @@
 //! get a super-set of matches. Then, we we confirm each match using precise
 //! name resolution.
 
-use std::mem;
+use std::{convert::TryInto, mem};
 
 use hir::{DefWithBody, HasSource, Module, ModuleSource, Semantics, Visibility};
 use once_cell::unsync::Lazy;
 use ra_db::{FileId, FileRange, SourceDatabaseExt};
 use ra_prof::profile;
-use ra_syntax::{ast, match_ast, AstNode, TextRange, TextUnit};
+use ra_syntax::{ast, match_ast, AstNode, TextRange, TextSize};
 use rustc_hash::FxHashMap;
 use test_utils::tested_by;
 
@@ -85,7 +85,7 @@ fn intersect_ranges(
             match (r1, r2) {
                 (None, r) | (r, None) => Some(r),
                 (Some(r1), Some(r2)) => {
-                    let r = r1.intersection(&r2)?;
+                    let r = r1.intersect(r2)?;
                     Some(Some(r))
                 }
             }
@@ -201,13 +201,13 @@ pub fn find_usages(
         for (file_id, search_range) in search_scope {
             let text = db.file_text(file_id);
             let search_range =
-                search_range.unwrap_or(TextRange::offset_len(0.into(), TextUnit::of_str(&text)));
+                search_range.unwrap_or(TextRange::up_to(TextSize::of(text.as_str())));
 
             let sema = Semantics::new(db);
             let tree = Lazy::new(|| sema.parse(file_id).syntax().clone());
 
             for (idx, _) in text.match_indices(pat) {
-                let offset = TextUnit::from_usize(idx);
+                let offset: TextSize = idx.try_into().unwrap();
                 if !search_range.contains_inclusive(offset) {
                     tested_by!(search_filters_by_range; force);
                     continue;

crates/ra_mbe/src/syntax_bridge.rs

@@ -5,7 +5,7 @@
     ast::{self, make::tokens::doc_comment},
     tokenize, AstToken, Parse, SmolStr, SyntaxKind,
     SyntaxKind::*,
-    SyntaxNode, SyntaxToken, SyntaxTreeBuilder, TextRange, TextUnit, Token as RawToken, T,
+    SyntaxNode, SyntaxToken, SyntaxTreeBuilder, TextRange, TextSize, Token as RawToken, T,
 };
 use rustc_hash::FxHashMap;
 use tt::buffer::{Cursor, TokenBuffer};
@@ -99,11 +99,11 @@ pub fn parse_to_token_tree(text: &str) -> Option<(tt::Subtree, TokenMap)> {
 
     let mut conv = RawConvertor {
         text,
-        offset: TextUnit::default(),
+        offset: TextSize::default(),
         inner: tokens.iter(),
         id_alloc: TokenIdAlloc {
             map: Default::default(),
-            global_offset: TextUnit::default(),
+            global_offset: TextSize::default(),
             next_id: 0,
         },
     };
@@ -227,7 +227,7 @@ fn mk_doc_literal(comment: &ast::Comment) -> tt::TokenTree {
 
 struct TokenIdAlloc {
     map: TokenMap,
-    global_offset: TextUnit,
+    global_offset: TextSize,
     next_id: u32,
 }
 
@@ -266,7 +266,7 @@ fn close_delim(&mut self, idx: usize, close_abs_range: Option<TextRange>) {
 /// A Raw Token (straightly from lexer) convertor
 struct RawConvertor<'a> {
     text: &'a str,
-    offset: TextUnit,
+    offset: TextSize,
     id_alloc: TokenIdAlloc,
     inner: std::slice::Iter<'a, RawToken>,
 }
@@ -314,7 +314,7 @@ fn collect_leaf(&mut self, result: &mut Vec<tt::TokenTree>) {
         }
 
         result.push(if k.is_punct() {
-            assert_eq!(range.len().to_usize(), 1);
+            assert_eq!(range.len(), TextSize::of('.'));
             let delim = match k {
                 T!['('] => Some((tt::DelimiterKind::Parenthesis, T![')'])),
                 T!['{'] => Some((tt::DelimiterKind::Brace, T!['}'])),
@@ -381,8 +381,8 @@ macro_rules! make_leaf {
                 k if k.is_keyword() => make_leaf!(Ident),
                 k if k.is_literal() => make_leaf!(Literal),
                 LIFETIME => {
-                    let char_unit = TextUnit::from_usize(1);
-                    let r = TextRange::offset_len(range.start(), char_unit);
+                    let char_unit = TextSize::of('\'');
+                    let r = TextRange::at(range.start(), char_unit);
                     let apostrophe = tt::Leaf::from(tt::Punct {
                         char: '\'',
                         spacing: tt::Spacing::Joint,
@@ -390,8 +390,7 @@ macro_rules! make_leaf {
                     });
                     result.push(apostrophe.into());
 
-                    let r =
-                        TextRange::offset_len(range.start() + char_unit, range.len() - char_unit);
+                    let r = TextRange::at(range.start() + char_unit, range.len() - char_unit);
                     let ident = tt::Leaf::from(tt::Ident {
                         text: SmolStr::new(&token.to_text()[1..]),
                         id: self.id_alloc().alloc(r),
@@ -440,7 +439,7 @@ fn convert_doc_comment(&self, token: &Self::Token) -> Option<Vec<tt::TokenTree>>
 
     fn bump(&mut self) -> Option<(Self::Token, TextRange)> {
         let token = self.inner.next()?;
-        let range = TextRange::offset_len(self.offset, token.len);
+        let range = TextRange::at(self.offset, token.len);
         self.offset += token.len;
 
         Some(((*token, &self.text[range]), range))
@@ -450,7 +449,7 @@ fn peek(&self) -> Option<Self::Token> {
         let token = self.inner.as_slice().get(0).cloned();
 
         token.map(|it| {
-            let range = TextRange::offset_len(self.offset, it.len);
+            let range = TextRange::at(self.offset, it.len);
             (it, &self.text[range])
         })
     }
@@ -464,11 +463,11 @@ struct Convertor {
     id_alloc: TokenIdAlloc,
     current: Option<SyntaxToken>,
     range: TextRange,
-    punct_offset: Option<(SyntaxToken, TextUnit)>,
+    punct_offset: Option<(SyntaxToken, TextSize)>,
 }
 
 impl Convertor {
-    fn new(node: &SyntaxNode, global_offset: TextUnit) -> Convertor {
+    fn new(node: &SyntaxNode, global_offset: TextSize) -> Convertor {
         Convertor {
             id_alloc: { TokenIdAlloc { map: TokenMap::default(), global_offset, next_id: 0 } },
             current: node.first_token(),
@@ -481,7 +480,7 @@ fn new(node: &SyntaxNode, global_offset: TextUnit) -> Convertor {
 #[derive(Debug)]
 enum SynToken {
     Ordiniary(SyntaxToken),
-    Punch(SyntaxToken, TextUnit),
+    Punch(SyntaxToken, TextSize),
 }
 
 impl SynToken {
@@ -500,7 +499,7 @@ fn kind(&self) -> SyntaxKind {
     fn to_char(&self) -> Option<char> {
         match self {
             SynToken::Ordiniary(_) => None,
-            SynToken::Punch(it, i) => it.text().chars().nth(i.to_usize()),
+            SynToken::Punch(it, i) => it.text().chars().nth((*i).into()),
         }
     }
     fn to_text(&self) -> SmolStr {
@@ -516,26 +515,26 @@ fn convert_doc_comment(&self, token: &Self::Token) -> Option<Vec<tt::TokenTree>>
 
     fn bump(&mut self) -> Option<(Self::Token, TextRange)> {
         if let Some((punct, offset)) = self.punct_offset.clone() {
-            if offset.to_usize() + 1 < punct.text().len() {
-                let offset = offset + TextUnit::from_usize(1);
+            if usize::from(offset) + 1 < punct.text().len() {
+                let offset = offset + TextSize::of('.');
                 let range = punct.text_range();
                 self.punct_offset = Some((punct.clone(), offset));
-                let range = TextRange::offset_len(range.start() + offset, TextUnit::from_usize(1));
+                let range = TextRange::at(range.start() + offset, TextSize::of('.'));
                 return Some((SynToken::Punch(punct, offset), range));
             }
         }
 
         let curr = self.current.clone()?;
-        if !curr.text_range().is_subrange(&self.range) {
+        if !&self.range.contains_range(curr.text_range()) {
             return None;
         }
         self.current = curr.next_token();
 
         let token = if curr.kind().is_punct() {
             let range = curr.text_range();
-            let range = TextRange::offset_len(range.start(), TextUnit::from_usize(1));
-            self.punct_offset = Some((curr.clone(), TextUnit::from_usize(0)));
-            (SynToken::Punch(curr, TextUnit::from_usize(0)), range)
+            let range = TextRange::at(range.start(), TextSize::of('.'));
+            self.punct_offset = Some((curr.clone(), 0.into()));
+            (SynToken::Punch(curr, 0.into()), range)
         } else {
             self.punct_offset = None;
             let range = curr.text_range();
@@ -547,19 +546,19 @@ fn bump(&mut self) -> Option<(Self::Token, TextRange)> {
 
     fn peek(&self) -> Option<Self::Token> {
         if let Some((punct, mut offset)) = self.punct_offset.clone() {
-            offset = offset + TextUnit::from_usize(1);
-            if offset.to_usize() < punct.text().len() {
+            offset = offset + TextSize::of('.');
+            if usize::from(offset) < punct.text().len() {
                 return Some(SynToken::Punch(punct, offset));
             }
         }
 
         let curr = self.current.clone()?;
-        if !curr.text_range().is_subrange(&self.range) {
+        if !self.range.contains_range(curr.text_range()) {
             return None;
         }
 
         let token = if curr.kind().is_punct() {
-            SynToken::Punch(curr, TextUnit::from_usize(0))
+            SynToken::Punch(curr, 0.into())
         } else {
             SynToken::Ordiniary(curr)
         };
@@ -574,8 +573,8 @@ fn id_alloc(&mut self) -> &mut TokenIdAlloc {
 struct TtTreeSink<'a> {
     buf: String,
     cursor: Cursor<'a>,
-    open_delims: FxHashMap<tt::TokenId, TextUnit>,
-    text_pos: TextUnit,
+    open_delims: FxHashMap<tt::TokenId, TextSize>,
+    text_pos: TextSize,
     inner: SyntaxTreeBuilder,
     token_map: TokenMap,
 
@@ -641,7 +640,7 @@ fn token(&mut self, kind: SyntaxKind, mut n_tokens: u8) {
                         }
                         tt::Leaf::Literal(lit) => (lit.text.clone(), lit.id),
                     };
-                    let range = TextRange::offset_len(self.text_pos, TextUnit::of_str(&text));
+                    let range = TextRange::at(self.text_pos, TextSize::of(text.as_str()));
                     self.token_map.insert(id, range);
                     self.cursor = self.cursor.bump();
                     text
@@ -658,10 +657,8 @@ fn token(&mut self, kind: SyntaxKind, mut n_tokens: u8) {
                         self.cursor = self.cursor.bump();
                         if let Some(id) = parent.delimiter.map(|it| it.id) {
                             if let Some(open_delim) = self.open_delims.get(&id) {
-                                let open_range =
-                                    TextRange::offset_len(*open_delim, TextUnit::from_usize(1));
-                                let close_range =
-                                    TextRange::offset_len(self.text_pos, TextUnit::from_usize(1));
+                                let open_range = TextRange::at(*open_delim, TextSize::of('('));
+                                let close_range = TextRange::at(self.text_pos, TextSize::of('('));
                                 self.token_map.insert_delim(id, open_range, close_range);
                             }
                         }
@@ -672,7 +669,7 @@ fn token(&mut self, kind: SyntaxKind, mut n_tokens: u8) {
                 }
             };
             self.buf += &text;
-            self.text_pos += TextUnit::of_str(&text);
+            self.text_pos += TextSize::of(text.as_str());
         }
 
         let text = SmolStr::new(self.buf.as_str());
@@ -690,7 +687,7 @@ fn token(&mut self, kind: SyntaxKind, mut n_tokens: u8) {
             // other parts of RA such that we don't add whitespace here.
             if curr.spacing == tt::Spacing::Alone && curr.char != ';' {
                 self.inner.token(WHITESPACE, " ".into());
-                self.text_pos += TextUnit::of_char(' ');
+                self.text_pos += TextSize::of(' ');
             }
         }
     }

crates/ra_mbe/src/tests.rs

@@ -257,30 +257,30 @@ macro_rules! foo {
     let dump = format!("{:#?}", expanded);
     assert_eq_text!(
         dump.trim(),
-        r#"MACRO_ITEMS@[0; 15)
-  FN_DEF@[0; 15)
-    FN_KW@[0; 2) "fn"
-    NAME@[2; 5)
-      IDENT@[2; 5) "bar"
-    PARAM_LIST@[5; 7)
-      L_PAREN@[5; 6) "("
-      R_PAREN@[6; 7) ")"
-    BLOCK_EXPR@[7; 15)
-      BLOCK@[7; 15)
-        L_CURLY@[7; 8) "{"
-        EXPR_STMT@[8; 14)
-          BIN_EXPR@[8; 13)
-            BIN_EXPR@[8; 11)
-              LITERAL@[8; 9)
-                INT_NUMBER@[8; 9) "1"
-              PLUS@[9; 10) "+"
-              LITERAL@[10; 11)
-                INT_NUMBER@[10; 11) "1"
-            STAR@[11; 12) "*"
-            LITERAL@[12; 13)
-              INT_NUMBER@[12; 13) "2"
-          SEMICOLON@[13; 14) ";"
-        R_CURLY@[14; 15) "}""#,
+        r#"MACRO_ITEMS@0..15
+  FN_DEF@0..15
+    FN_KW@0..2 "fn"
+    NAME@2..5
+      IDENT@2..5 "bar"
+    PARAM_LIST@5..7
+      L_PAREN@5..6 "("
+      R_PAREN@6..7 ")"
+    BLOCK_EXPR@7..15
+      BLOCK@7..15
+        L_CURLY@7..8 "{"
+        EXPR_STMT@8..14
+          BIN_EXPR@8..13
+            BIN_EXPR@8..11
+              LITERAL@8..9
+                INT_NUMBER@8..9 "1"
+              PLUS@9..10 "+"
+              LITERAL@10..11
+                INT_NUMBER@10..11 "1"
+            STAR@11..12 "*"
+            LITERAL@12..13
+              INT_NUMBER@12..13 "2"
+          SEMICOLON@13..14 ";"
+        R_CURLY@14..15 "}""#,
     );
 }
 
@@ -490,39 +490,39 @@ macro_rules! structs {
     assert_eq!(
         format!("{:#?}", tree).trim(),
         r#"
-MACRO_ITEMS@[0; 40)
-  STRUCT_DEF@[0; 20)
-    STRUCT_KW@[0; 6) "struct"
-    NAME@[6; 9)
-      IDENT@[6; 9) "Foo"
-    RECORD_FIELD_DEF_LIST@[9; 20)
-      L_CURLY@[9; 10) "{"
-      RECORD_FIELD_DEF@[10; 19)
-        NAME@[10; 15)
-          IDENT@[10; 15) "field"
-        COLON@[15; 16) ":"
-        PATH_TYPE@[16; 19)
-          PATH@[16; 19)
-            PATH_SEGMENT@[16; 19)
-              NAME_REF@[16; 19)
-                IDENT@[16; 19) "u32"
-      R_CURLY@[19; 20) "}"
-  STRUCT_DEF@[20; 40)
-    STRUCT_KW@[20; 26) "struct"
-    NAME@[26; 29)
-      IDENT@[26; 29) "Bar"
-    RECORD_FIELD_DEF_LIST@[29; 40)
-      L_CURLY@[29; 30) "{"
-      RECORD_FIELD_DEF@[30; 39)
-        NAME@[30; 35)
-          IDENT@[30; 35) "field"
-        COLON@[35; 36) ":"
-        PATH_TYPE@[36; 39)
-          PATH@[36; 39)
-            PATH_SEGMENT@[36; 39)
-              NAME_REF@[36; 39)
-                IDENT@[36; 39) "u32"
-      R_CURLY@[39; 40) "}""#
+MACRO_ITEMS@0..40
+  STRUCT_DEF@0..20
+    STRUCT_KW@0..6 "struct"
+    NAME@6..9
+      IDENT@6..9 "Foo"
+    RECORD_FIELD_DEF_LIST@9..20
+      L_CURLY@9..10 "{"
+      RECORD_FIELD_DEF@10..19
+        NAME@10..15
+          IDENT@10..15 "field"
+        COLON@15..16 ":"
+        PATH_TYPE@16..19
+          PATH@16..19
+            PATH_SEGMENT@16..19
+              NAME_REF@16..19
+                IDENT@16..19 "u32"
+      R_CURLY@19..20 "}"
+  STRUCT_DEF@20..40
+    STRUCT_KW@20..26 "struct"
+    NAME@26..29
+      IDENT@26..29 "Bar"
+    RECORD_FIELD_DEF_LIST@29..40
+      L_CURLY@29..30 "{"
+      RECORD_FIELD_DEF@30..39
+        NAME@30..35
+          IDENT@30..35 "field"
+        COLON@35..36 ":"
+        PATH_TYPE@36..39
+          PATH@36..39
+            PATH_SEGMENT@36..39
+              NAME_REF@36..39
+                IDENT@36..39 "u32"
+      R_CURLY@39..40 "}""#
             .trim()
     );
 }
@@ -623,37 +623,37 @@ macro_rules! foo {
 
     assert_eq!(
         format!("{:#?}", stmts).trim(),
-        r#"MACRO_STMTS@[0; 15)
-  LET_STMT@[0; 7)
-    LET_KW@[0; 3) "let"
-    BIND_PAT@[3; 4)
-      NAME@[3; 4)
-        IDENT@[3; 4) "a"
-    EQ@[4; 5) "="
-    LITERAL@[5; 6)
-      INT_NUMBER@[5; 6) "0"
-    SEMICOLON@[6; 7) ";"
-  EXPR_STMT@[7; 14)
-    BIN_EXPR@[7; 13)
-      PATH_EXPR@[7; 8)
-        PATH@[7; 8)
-          PATH_SEGMENT@[7; 8)
-            NAME_REF@[7; 8)
-              IDENT@[7; 8) "a"
-      EQ@[8; 9) "="
-      BIN_EXPR@[9; 13)
-        LITERAL@[9; 11)
-          INT_NUMBER@[9; 11) "10"
-        PLUS@[11; 12) "+"
-        LITERAL@[12; 13)
-          INT_NUMBER@[12; 13) "1"
-    SEMICOLON@[13; 14) ";"
-  EXPR_STMT@[14; 15)
-    PATH_EXPR@[14; 15)
-      PATH@[14; 15)
-        PATH_SEGMENT@[14; 15)
-          NAME_REF@[14; 15)
-            IDENT@[14; 15) "a""#,
+        r#"MACRO_STMTS@0..15
+  LET_STMT@0..7
+    LET_KW@0..3 "let"
+    BIND_PAT@3..4
+      NAME@3..4
+        IDENT@3..4 "a"
+    EQ@4..5 "="
+    LITERAL@5..6
+      INT_NUMBER@5..6 "0"
+    SEMICOLON@6..7 ";"
+  EXPR_STMT@7..14
+    BIN_EXPR@7..13
+      PATH_EXPR@7..8
+        PATH@7..8
+          PATH_SEGMENT@7..8
+            NAME_REF@7..8
+              IDENT@7..8 "a"
+      EQ@8..9 "="
+      BIN_EXPR@9..13
+        LITERAL@9..11
+          INT_NUMBER@9..11 "10"
+        PLUS@11..12 "+"
+        LITERAL@12..13
+          INT_NUMBER@12..13 "1"
+    SEMICOLON@13..14 ";"
+  EXPR_STMT@14..15
+    PATH_EXPR@14..15
+      PATH@14..15
+        PATH_SEGMENT@14..15
+          NAME_REF@14..15
+            IDENT@14..15 "a""#,
     );
 }
 
@@ -974,20 +974,20 @@ macro_rules! foo {
     let res = format!("{:#?}", &node);
     assert_eq_text!(
         res.trim(),
-        r###"MACRO_ITEMS@[0; 10)
-  MACRO_CALL@[0; 10)
-    PATH@[0; 3)
-      PATH_SEGMENT@[0; 3)
-        NAME_REF@[0; 3)
-          IDENT@[0; 3) "abs"
-    BANG@[3; 4) "!"
-    TOKEN_TREE@[4; 10)
-      L_PAREN@[4; 5) "("
-      EQ@[5; 6) "="
-      R_ANGLE@[6; 7) ">"
-      WHITESPACE@[7; 8) " "
-      POUND@[8; 9) "#"
-      R_PAREN@[9; 10) ")""###
+        r###"MACRO_ITEMS@0..10
+  MACRO_CALL@0..10
+    PATH@0..3
+      PATH_SEGMENT@0..3
+        NAME_REF@0..3
+          IDENT@0..3 "abs"
+    BANG@3..4 "!"
+    TOKEN_TREE@4..10
+      L_PAREN@4..5 "("
+      EQ@5..6 "="
+      R_ANGLE@6..7 ">"
+      WHITESPACE@7..8 " "
+      POUND@8..9 "#"
+      R_PAREN@9..10 ")""###
     );
 }
 
@@ -1113,69 +1113,69 @@ macro_rules! vec {
 
     assert_eq!(
         format!("{:#?}", tree).trim(),
-        r#"BLOCK_EXPR@[0; 45)
-  BLOCK@[0; 45)
-    L_CURLY@[0; 1) "{"
-    LET_STMT@[1; 20)
-      LET_KW@[1; 4) "let"
-      BIND_PAT@[4; 8)
-        MUT_KW@[4; 7) "mut"
-        NAME@[7; 8)
-          IDENT@[7; 8) "v"
-      EQ@[8; 9) "="
-      CALL_EXPR@[9; 19)
-        PATH_EXPR@[9; 17)
-          PATH@[9; 17)
-            PATH@[9; 12)
-              PATH_SEGMENT@[9; 12)
-                NAME_REF@[9; 12)
-                  IDENT@[9; 12) "Vec"
-            COLON2@[12; 14) "::"
-            PATH_SEGMENT@[14; 17)
-              NAME_REF@[14; 17)
-                IDENT@[14; 17) "new"
-        ARG_LIST@[17; 19)
-          L_PAREN@[17; 18) "("
-          R_PAREN@[18; 19) ")"
-      SEMICOLON@[19; 20) ";"
-    EXPR_STMT@[20; 33)
-      METHOD_CALL_EXPR@[20; 32)
-        PATH_EXPR@[20; 21)
-          PATH@[20; 21)
-            PATH_SEGMENT@[20; 21)
-              NAME_REF@[20; 21)
-                IDENT@[20; 21) "v"
-        DOT@[21; 22) "."
-        NAME_REF@[22; 26)
-          IDENT@[22; 26) "push"
-        ARG_LIST@[26; 32)
-          L_PAREN@[26; 27) "("
-          LITERAL@[27; 31)
-            INT_NUMBER@[27; 31) "1u32"
-          R_PAREN@[31; 32) ")"
-      SEMICOLON@[32; 33) ";"
-    EXPR_STMT@[33; 43)
-      METHOD_CALL_EXPR@[33; 42)
-        PATH_EXPR@[33; 34)
-          PATH@[33; 34)
-            PATH_SEGMENT@[33; 34)
-              NAME_REF@[33; 34)
-                IDENT@[33; 34) "v"
-        DOT@[34; 35) "."
-        NAME_REF@[35; 39)
-          IDENT@[35; 39) "push"
-        ARG_LIST@[39; 42)
-          L_PAREN@[39; 40) "("
-          LITERAL@[40; 41)
-            INT_NUMBER@[40; 41) "2"
-          R_PAREN@[41; 42) ")"
-      SEMICOLON@[42; 43) ";"
-    PATH_EXPR@[43; 44)
-      PATH@[43; 44)
-        PATH_SEGMENT@[43; 44)
-          NAME_REF@[43; 44)
-            IDENT@[43; 44) "v"
-    R_CURLY@[44; 45) "}""#
+        r#"BLOCK_EXPR@0..45
+  BLOCK@0..45
+    L_CURLY@0..1 "{"
+    LET_STMT@1..20
+      LET_KW@1..4 "let"
+      BIND_PAT@4..8
+        MUT_KW@4..7 "mut"
+        NAME@7..8
+          IDENT@7..8 "v"
+      EQ@8..9 "="
+      CALL_EXPR@9..19
+        PATH_EXPR@9..17
+          PATH@9..17
+            PATH@9..12
+              PATH_SEGMENT@9..12
+                NAME_REF@9..12
+                  IDENT@9..12 "Vec"
+            COLON2@12..14 "::"
+            PATH_SEGMENT@14..17
+              NAME_REF@14..17
+                IDENT@14..17 "new"
+        ARG_LIST@17..19
+          L_PAREN@17..18 "("
+          R_PAREN@18..19 ")"
+      SEMICOLON@19..20 ";"
+    EXPR_STMT@20..33
+      METHOD_CALL_EXPR@20..32
+        PATH_EXPR@20..21
+          PATH@20..21
+            PATH_SEGMENT@20..21
+              NAME_REF@20..21
+                IDENT@20..21 "v"
+        DOT@21..22 "."
+        NAME_REF@22..26
+          IDENT@22..26 "push"
+        ARG_LIST@26..32
+          L_PAREN@26..27 "("
+          LITERAL@27..31
+            INT_NUMBER@27..31 "1u32"
+          R_PAREN@31..32 ")"
+      SEMICOLON@32..33 ";"
+    EXPR_STMT@33..43
+      METHOD_CALL_EXPR@33..42
+        PATH_EXPR@33..34
+          PATH@33..34
+            PATH_SEGMENT@33..34
+              NAME_REF@33..34
+                IDENT@33..34 "v"
+        DOT@34..35 "."
+        NAME_REF@35..39
+          IDENT@35..39 "push"
+        ARG_LIST@39..42
+          L_PAREN@39..40 "("
+          LITERAL@40..41
+            INT_NUMBER@40..41 "2"
+          R_PAREN@41..42 ")"
+      SEMICOLON@42..43 ";"
+    PATH_EXPR@43..44
+      PATH@43..44
+        PATH_SEGMENT@43..44
+          NAME_REF@43..44
+            IDENT@43..44 "v"
+    R_CURLY@44..45 "}""#
     );
 }
 
@@ -1798,45 +1798,45 @@ macro_rules! with_std { ($($i:item)*) => ($(#[cfg(feature = "std")]$i)*) }
     let dump = format!("{:#?}", expanded);
     assert_eq_text!(
         dump.trim(),
-        r###"MACRO_ITEMS@[0; 52)
-  MODULE@[0; 26)
-    ATTR@[0; 21)
-      POUND@[0; 1) "#"
-      L_BRACK@[1; 2) "["
-      PATH@[2; 5)
-        PATH_SEGMENT@[2; 5)
-          NAME_REF@[2; 5)
-            IDENT@[2; 5) "cfg"
-      TOKEN_TREE@[5; 20)
-        L_PAREN@[5; 6) "("
-        IDENT@[6; 13) "feature"
-        EQ@[13; 14) "="
-        STRING@[14; 19) "\"std\""
-        R_PAREN@[19; 20) ")"
-      R_BRACK@[20; 21) "]"
-    MOD_KW@[21; 24) "mod"
-    NAME@[24; 25)
-      IDENT@[24; 25) "m"
-    SEMICOLON@[25; 26) ";"
-  MODULE@[26; 52)
-    ATTR@[26; 47)
-      POUND@[26; 27) "#"
-      L_BRACK@[27; 28) "["
-      PATH@[28; 31)
-        PATH_SEGMENT@[28; 31)
-          NAME_REF@[28; 31)
-            IDENT@[28; 31) "cfg"
-      TOKEN_TREE@[31; 46)
-        L_PAREN@[31; 32) "("
-        IDENT@[32; 39) "feature"
-        EQ@[39; 40) "="
-        STRING@[40; 45) "\"std\""
-        R_PAREN@[45; 46) ")"
-      R_BRACK@[46; 47) "]"
-    MOD_KW@[47; 50) "mod"
-    NAME@[50; 51)
-      IDENT@[50; 51) "f"
-    SEMICOLON@[51; 52) ";""###,
+        r###"MACRO_ITEMS@0..52
+  MODULE@0..26
+    ATTR@0..21
+      POUND@0..1 "#"
+      L_BRACK@1..2 "["
+      PATH@2..5
+        PATH_SEGMENT@2..5
+          NAME_REF@2..5
+            IDENT@2..5 "cfg"
+      TOKEN_TREE@5..20
+        L_PAREN@5..6 "("
+        IDENT@6..13 "feature"
+        EQ@13..14 "="
+        STRING@14..19 "\"std\""
+        R_PAREN@19..20 ")"
+      R_BRACK@20..21 "]"
+    MOD_KW@21..24 "mod"
+    NAME@24..25
+      IDENT@24..25 "m"
+    SEMICOLON@25..26 ";"
+  MODULE@26..52
+    ATTR@26..47
+      POUND@26..27 "#"
+      L_BRACK@27..28 "["
+      PATH@28..31
+        PATH_SEGMENT@28..31
+          NAME_REF@28..31
+            IDENT@28..31 "cfg"
+      TOKEN_TREE@31..46
+        L_PAREN@31..32 "("
+        IDENT@32..39 "feature"
+        EQ@39..40 "="
+        STRING@40..45 "\"std\""
+        R_PAREN@45..46 ")"
+      R_BRACK@46..47 "]"
+    MOD_KW@47..50 "mod"
+    NAME@50..51
+      IDENT@50..51 "f"
+    SEMICOLON@51..52 ";""###,
     );
 }
 

crates/ra_syntax/Cargo.toml

@@ -12,7 +12,7 @@ doctest = false
 
 [dependencies]
 itertools = "0.9.0"
-rowan = "0.9.1"
+rowan = "0.10.0"
 rustc_lexer = { version = "652.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.5.1"

crates/ra_syntax/src/algo.rs

@@ -11,7 +11,7 @@
 
 use crate::{
     AstNode, Direction, NodeOrToken, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxNodePtr,
-    SyntaxToken, TextRange, TextUnit,
+    SyntaxToken, TextRange, TextSize,
 };
 
 /// Returns ancestors of the node at the offset, sorted by length. This should
@@ -21,7 +21,7 @@
 /// t.parent().ancestors())`.
 pub fn ancestors_at_offset(
     node: &SyntaxNode,
-    offset: TextUnit,
+    offset: TextSize,
 ) -> impl Iterator<Item = SyntaxNode> {
     node.token_at_offset(offset)
         .map(|token| token.parent().ancestors())
@@ -37,7 +37,7 @@ pub fn ancestors_at_offset(
 /// ```
 ///
 /// then the shorter node will be silently preferred.
-pub fn find_node_at_offset<N: AstNode>(syntax: &SyntaxNode, offset: TextUnit) -> Option<N> {
+pub fn find_node_at_offset<N: AstNode>(syntax: &SyntaxNode, offset: TextSize) -> Option<N> {
     ancestors_at_offset(syntax, offset).find_map(N::cast)
 }
 
@@ -180,7 +180,7 @@ fn _insert_children(
     position: InsertPosition<SyntaxElement>,
     to_insert: &mut dyn Iterator<Item = SyntaxElement>,
 ) -> SyntaxNode {
-    let mut delta = TextUnit::default();
+    let mut delta = TextSize::default();
     let to_insert = to_insert.map(|element| {
         delta += element.text_range().len();
         to_green_element(element)
@@ -347,7 +347,7 @@ fn with_children(
     parent: &SyntaxNode,
     new_children: Vec<NodeOrToken<rowan::GreenNode, rowan::GreenToken>>,
 ) -> SyntaxNode {
-    let len = new_children.iter().map(|it| it.text_len()).sum::<TextUnit>();
+    let len = new_children.iter().map(|it| it.text_len()).sum::<TextSize>();
     let new_node = rowan::GreenNode::new(rowan::SyntaxKind(parent.kind() as u16), new_children);
     let new_root_node = parent.replace_with(new_node);
     let new_root_node = SyntaxNode::new_root(new_root_node);
@@ -355,7 +355,7 @@ fn with_children(
     // FIXME: use a more elegant way to re-fetch the node (#1185), make
     // `range` private afterwards
     let mut ptr = SyntaxNodePtr::new(parent);
-    ptr.range = TextRange::offset_len(ptr.range.start(), len);
+    ptr.range = TextRange::at(ptr.range.start(), len);
     ptr.to_node(&new_root_node)
 }
 

crates/ra_syntax/src/ast/tokens.rs

@@ -1,8 +1,10 @@
 //! There are many AstNodes, but only a few tokens, so we hand-write them here.
 
+use std::convert::{TryFrom, TryInto};
+
 use crate::{
     ast::{AstToken, Comment, RawString, String, Whitespace},
-    TextRange, TextUnit,
+    TextRange, TextSize,
 };
 
 impl Comment {
@@ -94,14 +96,14 @@ fn new(literal: &str) -> Option<QuoteOffsets> {
             return None;
         }
 
-        let start = TextUnit::from(0);
-        let left_quote = TextUnit::from_usize(left_quote) + TextUnit::of_char('"');
-        let right_quote = TextUnit::from_usize(right_quote);
-        let end = TextUnit::of_str(literal);
+        let start = TextSize::from(0);
+        let left_quote = TextSize::try_from(left_quote).unwrap() + TextSize::of('"');
+        let right_quote = TextSize::try_from(right_quote).unwrap();
+        let end = TextSize::of(literal);
 
         let res = QuoteOffsets {
-            quotes: [TextRange::from_to(start, left_quote), TextRange::from_to(right_quote, end)],
-            contents: TextRange::from_to(left_quote, right_quote),
+            quotes: [TextRange::new(start, left_quote), TextRange::new(right_quote, end)],
+            contents: TextRange::new(left_quote, right_quote),
         };
         Some(res)
     }
@@ -168,7 +170,7 @@ fn value(&self) -> Option<std::string::String> {
 impl RawString {
     pub fn map_range_up(&self, range: TextRange) -> Option<TextRange> {
         let contents_range = self.text_range_between_quotes()?;
-        assert!(range.is_subrange(&TextRange::offset_len(0.into(), contents_range.len())));
+        assert!(TextRange::up_to(contents_range.len()).contains_range(range));
         Some(range + contents_range.start())
     }
 }
@@ -459,7 +461,7 @@ fn read_integer<'a, I, F>(chars: &mut std::iter::Peekable<I>, callback: &mut F)
             while let Some((r, Ok(next_char))) = chars.peek() {
                 if next_char.is_ascii_digit() {
                     chars.next();
-                    range = range.extend_to(r);
+                    range = range.cover(*r);
                 } else {
                     break;
                 }
@@ -477,7 +479,7 @@ fn read_identifier<'a, I, F>(chars: &mut std::iter::Peekable<I>, callback: &mut
             while let Some((r, Ok(next_char))) = chars.peek() {
                 if *next_char == '_' || next_char.is_ascii_digit() || next_char.is_alphabetic() {
                     chars.next();
-                    range = range.extend_to(r);
+                    range = range.cover(*r);
                 } else {
                     break;
                 }
@@ -498,10 +500,8 @@ fn char_ranges(
         let mut res = Vec::with_capacity(text.len());
         rustc_lexer::unescape::unescape_str(text, &mut |range, unescaped_char| {
             res.push((
-                TextRange::from_to(
-                    TextUnit::from_usize(range.start),
-                    TextUnit::from_usize(range.end),
-                ) + offset,
+                TextRange::new(range.start.try_into().unwrap(), range.end.try_into().unwrap())
+                    + offset,
                 unescaped_char,
             ))
         });
@@ -520,13 +520,7 @@ fn char_ranges(
 
         let mut res = Vec::with_capacity(text.len());
         for (idx, c) in text.char_indices() {
-            res.push((
-                TextRange::from_to(
-                    TextUnit::from_usize(idx),
-                    TextUnit::from_usize(idx + c.len_utf8()),
-                ) + offset,
-                Ok(c),
-            ));
+            res.push((TextRange::at(idx.try_into().unwrap(), TextSize::of(c)) + offset, Ok(c)));
         }
         Some(res)
     }

crates/ra_syntax/src/fuzz.rs

@@ -1,8 +1,13 @@
 //! FIXME: write short doc here
 
-use crate::{validation, AstNode, SourceFile, TextRange, TextUnit};
+use std::{
+    convert::TryInto,
+    str::{self, FromStr},
+};
+
 use ra_text_edit::AtomTextEdit;
-use std::str::{self, FromStr};
+
+use crate::{validation, AstNode, SourceFile, TextRange};
 
 fn check_file_invariants(file: &SourceFile) {
     let root = file.syntax();
@@ -34,10 +39,8 @@ pub fn from_data(data: &[u8]) -> Option<Self> {
         let text = lines.collect::<Vec<_>>().join("\n");
         let text = format!("{}{}{}", PREFIX, text, SUFFIX);
         text.get(delete_start..delete_start.checked_add(delete_len)?)?; // make sure delete is a valid range
-        let delete = TextRange::offset_len(
-            TextUnit::from_usize(delete_start),
-            TextUnit::from_usize(delete_len),
-        );
+        let delete =
+            TextRange::at(delete_start.try_into().unwrap(), delete_len.try_into().unwrap());
         let edited_text =
             format!("{}{}{}", &text[..delete_start], &insert, &text[delete_start + delete_len..]);
         let edit = AtomTextEdit { delete, insert };

crates/ra_syntax/src/lib.rs

@@ -55,7 +55,7 @@ macro_rules! eprintln {
     },
 };
 pub use ra_parser::{SyntaxKind, T};
-pub use rowan::{SmolStr, SyntaxText, TextRange, TextUnit, TokenAtOffset, WalkEvent};
+pub use rowan::{SmolStr, SyntaxText, TextRange, TextSize, TokenAtOffset, WalkEvent};
 
 /// `Parse` is the result of the parsing: a syntax tree and a collection of
 /// errors.
@@ -266,7 +266,7 @@ fn foo() {
     assert_eq!(expr_syntax.kind(), SyntaxKind::BIN_EXPR);
 
     // And text range:
-    assert_eq!(expr_syntax.text_range(), TextRange::from_to(32.into(), 37.into()));
+    assert_eq!(expr_syntax.text_range(), TextRange::new(32.into(), 37.into()));
 
     // You can get node's text as a `SyntaxText` object, which will traverse the
     // tree collecting token's text:

crates/ra_syntax/src/parsing/lexer.rs

@@ -1,10 +1,12 @@
 //! Lexer analyzes raw input string and produces lexemes (tokens).
 //! It is just a bridge to `rustc_lexer`.
 
+use std::convert::TryInto;
+
 use crate::{
     SyntaxError,
     SyntaxKind::{self, *},
-    TextRange, TextUnit, T,
+    TextRange, TextSize, T,
 };
 
 /// A token of Rust source.
@@ -13,7 +15,7 @@ pub struct Token {
     /// The kind of token.
     pub kind: SyntaxKind,
     /// The length of the token.
-    pub len: TextUnit,
+    pub len: TextSize,
 }
 
 /// Break a string up into its component tokens.
@@ -28,18 +30,19 @@ pub fn tokenize(text: &str) -> (Vec<Token>, Vec<SyntaxError>) {
     let mut tokens = Vec::new();
     let mut errors = Vec::new();
 
-    let mut offset: usize = rustc_lexer::strip_shebang(text)
-        .map(|shebang_len| {
-            tokens.push(Token { kind: SHEBANG, len: TextUnit::from_usize(shebang_len) });
+    let mut offset = match rustc_lexer::strip_shebang(text) {
+        Some(shebang_len) => {
+            tokens.push(Token { kind: SHEBANG, len: shebang_len.try_into().unwrap() });
             shebang_len
-        })
-        .unwrap_or(0);
+        }
+        None => 0,
+    };
 
     let text_without_shebang = &text[offset..];
 
     for rustc_token in rustc_lexer::tokenize(text_without_shebang) {
-        let token_len = TextUnit::from_usize(rustc_token.len);
-        let token_range = TextRange::offset_len(TextUnit::from_usize(offset), token_len);
+        let token_len: TextSize = rustc_token.len.try_into().unwrap();
+        let token_range = TextRange::at(offset.try_into().unwrap(), token_len);
 
         let (syntax_kind, err_message) =
             rustc_token_kind_to_syntax_kind(&rustc_token.kind, &text[token_range]);
@@ -65,7 +68,7 @@ pub fn tokenize(text: &str) -> (Vec<Token>, Vec<SyntaxError>) {
 /// Beware that unescape errors are not checked at tokenization time.
 pub fn lex_single_syntax_kind(text: &str) -> Option<(SyntaxKind, Option<SyntaxError>)> {
     lex_first_token(text)
-        .filter(|(token, _)| token.len == TextUnit::of_str(text))
+        .filter(|(token, _)| token.len == TextSize::of(text))
         .map(|(token, error)| (token.kind, error))
 }
 
@@ -75,7 +78,7 @@ pub fn lex_single_syntax_kind(text: &str) -> Option<(SyntaxKind, Option<SyntaxEr
 /// Beware that unescape errors are not checked at tokenization time.
 pub fn lex_single_valid_syntax_kind(text: &str) -> Option<SyntaxKind> {
     lex_first_token(text)
-        .filter(|(token, error)| !error.is_some() && token.len == TextUnit::of_str(text))
+        .filter(|(token, error)| !error.is_some() && token.len == TextSize::of(text))
         .map(|(token, _error)| token.kind)
 }
 
@@ -96,10 +99,9 @@ fn lex_first_token(text: &str) -> Option<(Token, Option<SyntaxError>)> {
     let rustc_token = rustc_lexer::first_token(text);
     let (syntax_kind, err_message) = rustc_token_kind_to_syntax_kind(&rustc_token.kind, text);
 
-    let token = Token { kind: syntax_kind, len: TextUnit::from_usize(rustc_token.len) };
-    let optional_error = err_message.map(|err_message| {
-        SyntaxError::new(err_message, TextRange::from_to(0.into(), TextUnit::of_str(text)))
-    });
+    let token = Token { kind: syntax_kind, len: rustc_token.len.try_into().unwrap() };
+    let optional_error = err_message
+        .map(|err_message| SyntaxError::new(err_message, TextRange::up_to(TextSize::of(text))));
 
     Some((token, optional_error))
 }

crates/ra_syntax/src/parsing/reparsing.rs

@@ -19,7 +19,7 @@
     syntax_node::{GreenNode, GreenToken, NodeOrToken, SyntaxElement, SyntaxNode},
     SyntaxError,
     SyntaxKind::*,
-    TextRange, TextUnit, T,
+    TextRange, TextSize, T,
 };
 
 pub(crate) fn incremental_reparse(
@@ -176,7 +176,7 @@ fn merge_errors(
         if old_err_range.end() <= range_before_reparse.start() {
             res.push(old_err);
         } else if old_err_range.start() >= range_before_reparse.end() {
-            let inserted_len = TextUnit::of_str(&edit.insert);
+            let inserted_len = TextSize::of(&edit.insert);
             res.push(old_err.with_range((old_err_range + inserted_len) - edit.delete.len()));
             // Note: extra parens are intentional to prevent uint underflow, HWAB (here was a bug)
         }

crates/ra_syntax/src/parsing/text_token_source.rs

@@ -3,7 +3,7 @@
 use ra_parser::Token as PToken;
 use ra_parser::TokenSource;
 
-use crate::{parsing::lexer::Token, SyntaxKind::EOF, TextRange, TextUnit};
+use crate::{parsing::lexer::Token, SyntaxKind::EOF, TextRange, TextSize};
 
 pub(crate) struct TextTokenSource<'t> {
     text: &'t str,
@@ -15,7 +15,7 @@ pub(crate) struct TextTokenSource<'t> {
     /// 0      7  10
     /// ```
     /// (token, start_offset): `[(struct, 0), (Foo, 7), (;, 10)]`
-    start_offsets: Vec<TextUnit>,
+    start_offsets: Vec<TextSize>,
     /// non-whitespace/comment tokens
     /// ```non-rust
     /// struct Foo {}
@@ -51,12 +51,12 @@ fn is_keyword(&self, kw: &str) -> bool {
         if pos >= self.tokens.len() {
             return false;
         }
-        let range = TextRange::offset_len(self.start_offsets[pos], self.tokens[pos].len);
+        let range = TextRange::at(self.start_offsets[pos], self.tokens[pos].len);
         self.text[range] == *kw
     }
 }
 
-fn mk_token(pos: usize, start_offsets: &[TextUnit], tokens: &[Token]) -> PToken {
+fn mk_token(pos: usize, start_offsets: &[TextSize], tokens: &[Token]) -> PToken {
     let kind = tokens.get(pos).map(|t| t.kind).unwrap_or(EOF);
     let is_jointed_to_next = if pos + 1 < start_offsets.len() {
         start_offsets[pos] + tokens[pos].len == start_offsets[pos + 1]

crates/ra_syntax/src/parsing/text_tree_sink.rs

@@ -9,7 +9,7 @@
     syntax_node::GreenNode,
     SmolStr, SyntaxError,
     SyntaxKind::{self, *},
-    SyntaxTreeBuilder, TextRange, TextUnit,
+    SyntaxTreeBuilder, TextRange, TextSize,
 };
 
 /// Bridges the parser with our specific syntax tree representation.
@@ -18,7 +18,7 @@
 pub(crate) struct TextTreeSink<'a> {
     text: &'a str,
     tokens: &'a [Token],
-    text_pos: TextUnit,
+    text_pos: TextSize,
     token_pos: usize,
     state: State,
     inner: SyntaxTreeBuilder,
@@ -42,7 +42,7 @@ fn token(&mut self, kind: SyntaxKind, n_tokens: u8) {
         let len = self.tokens[self.token_pos..self.token_pos + n_tokens]
             .iter()
             .map(|it| it.len)
-            .sum::<TextUnit>();
+            .sum::<TextSize>();
         self.do_token(kind, len, n_tokens);
     }
 
@@ -62,12 +62,12 @@ fn start_node(&mut self, kind: SyntaxKind) {
             self.tokens[self.token_pos..].iter().take_while(|it| it.kind.is_trivia()).count();
         let leading_trivias = &self.tokens[self.token_pos..self.token_pos + n_trivias];
         let mut trivia_end =
-            self.text_pos + leading_trivias.iter().map(|it| it.len).sum::<TextUnit>();
+            self.text_pos + leading_trivias.iter().map(|it| it.len).sum::<TextSize>();
 
         let n_attached_trivias = {
             let leading_trivias = leading_trivias.iter().rev().map(|it| {
                 let next_end = trivia_end - it.len;
-                let range = TextRange::from_to(next_end, trivia_end);
+                let range = TextRange::new(next_end, trivia_end);
                 trivia_end = next_end;
                 (it.kind, &self.text[range])
             });
@@ -132,8 +132,8 @@ fn eat_n_trivias(&mut self, n: usize) {
         }
     }
 
-    fn do_token(&mut self, kind: SyntaxKind, len: TextUnit, n_tokens: usize) {
-        let range = TextRange::offset_len(self.text_pos, len);
+    fn do_token(&mut self, kind: SyntaxKind, len: TextSize, n_tokens: usize) {
+        let range = TextRange::at(self.text_pos, len);
         let text: SmolStr = self.text[range].into();
         self.text_pos += len;
         self.token_pos += n_tokens;

crates/ra_syntax/src/ptr.rs

@@ -24,7 +24,7 @@ pub fn new(node: &SyntaxNode) -> SyntaxNodePtr {
     pub fn to_node(&self, root: &SyntaxNode) -> SyntaxNode {
         assert!(root.parent().is_none());
         successors(Some(root.clone()), |node| {
-            node.children().find(|it| self.range.is_subrange(&it.text_range()))
+            node.children().find(|it| it.text_range().contains_range(self.range))
         })
         .find(|it| it.text_range() == self.range && it.kind() == self.kind)
         .unwrap_or_else(|| panic!("can't resolve local ptr to SyntaxNode: {:?}", self))

crates/ra_syntax/src/syntax_error.rs

@@ -2,7 +2,7 @@
 
 use std::fmt;
 
-use crate::{TextRange, TextUnit};
+use crate::{TextRange, TextSize};
 
 /// Represents the result of unsuccessful tokenization, parsing
 /// or tree validation.
@@ -23,8 +23,8 @@ impl SyntaxError {
     pub fn new(message: impl Into<String>, range: TextRange) -> Self {
         Self(message.into(), range)
     }
-    pub fn new_at_offset(message: impl Into<String>, offset: TextUnit) -> Self {
-        Self(message.into(), TextRange::offset_len(offset, 0.into()))
+    pub fn new_at_offset(message: impl Into<String>, offset: TextSize) -> Self {
+        Self(message.into(), TextRange::empty(offset))
     }
 
     pub fn range(&self) -> TextRange {

crates/ra_syntax/src/syntax_node.rs

@@ -8,7 +8,7 @@
 
 use rowan::{GreenNodeBuilder, Language};
 
-use crate::{Parse, SmolStr, SyntaxError, SyntaxKind, TextUnit};
+use crate::{Parse, SmolStr, SyntaxError, SyntaxKind, TextSize};
 
 pub(crate) use rowan::{GreenNode, GreenToken};
 
@@ -69,7 +69,7 @@ pub fn finish_node(&mut self) {
         self.inner.finish_node()
     }
 
-    pub fn error(&mut self, error: ra_parser::ParseError, text_pos: TextUnit) {
+    pub fn error(&mut self, error: ra_parser::ParseError, text_pos: TextSize) {
         self.errors.push(SyntaxError::new_at_offset(error.0, text_pos))
     }
 }

crates/ra_syntax/src/tests.rs

@@ -5,7 +5,7 @@
 
 use test_utils::{collect_rust_files, dir_tests, project_dir, read_text};
 
-use crate::{fuzz, tokenize, SourceFile, SyntaxError, TextRange, TextUnit, Token};
+use crate::{fuzz, tokenize, SourceFile, SyntaxError, TextRange, TextSize, Token};
 
 #[test]
 fn lexer_tests() {
@@ -121,12 +121,12 @@ fn assert_errors_are_absent(errors: &[SyntaxError], path: &Path) {
 
 fn dump_tokens_and_errors(tokens: &[Token], errors: &[SyntaxError], text: &str) -> String {
     let mut acc = String::new();
-    let mut offset = TextUnit::from_usize(0);
+    let mut offset: TextSize = 0.into();
     for token in tokens {
         let token_len = token.len;
-        let token_text = &text[TextRange::offset_len(offset, token.len)];
+        let token_text = &text[TextRange::at(offset, token.len)];
         offset += token.len;
-        writeln!(acc, "{:?} {} {:?}", token.kind, token_len, token_text).unwrap();
+        writeln!(acc, "{:?} {:?} {:?}", token.kind, token_len, token_text).unwrap();
     }
     for err in errors {
         writeln!(acc, "> error{:?} token({:?}) msg({})", err.range(), &text[err.range()], err)

crates/ra_syntax/src/validation.rs

@@ -2,12 +2,14 @@
 
 mod block;
 
+use std::convert::TryFrom;
+
 use rustc_lexer::unescape;
 
 use crate::{
     ast, match_ast, AstNode, SyntaxError,
     SyntaxKind::{BYTE, BYTE_STRING, CHAR, CONST_DEF, FN_DEF, INT_NUMBER, STRING, TYPE_ALIAS_DEF},
-    SyntaxNode, SyntaxToken, TextUnit, T,
+    SyntaxNode, SyntaxToken, TextSize, T,
 };
 
 fn rustc_unescape_error_to_string(err: unescape::EscapeError) -> &'static str {
@@ -112,7 +114,7 @@ fn unquote(text: &str, prefix_len: usize, end_delimiter: char) -> Option<&str> {
 
     // FIXME: lift this lambda refactor to `fn` (https://github.com/rust-analyzer/rust-analyzer/pull/2834#discussion_r366199205)
     let mut push_err = |prefix_len, (off, err): (usize, unescape::EscapeError)| {
-        let off = token.text_range().start() + TextUnit::from_usize(off + prefix_len);
+        let off = token.text_range().start() + TextSize::try_from(off + prefix_len).unwrap();
         acc.push(SyntaxError::new_at_offset(rustc_unescape_error_to_string(err), off));
     };
 

crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt

@@ -1,2 +1,2 @@
 CHAR 1 "\'"
-> error[0; 1) token("\'") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..1 token("\'") msg(Missing trailing `'` symbol to terminate the character literal)

crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt

@@ -1,2 +1,2 @@
 CHAR 5 "\'🦀"
-> error[0; 5) token("\'🦀") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..5 token("\'🦀") msg(Missing trailing `'` symbol to terminate the character literal)

crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt

@@ -1,2 +1,2 @@
 CHAR 5 "\'\\x7f"
-> error[0; 5) token("\'\\x7f") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..5 token("\'\\x7f") msg(Missing trailing `'` symbol to terminate the character literal)

crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt

@@ -1,2 +1,2 @@
 CHAR 9 "\'\\u{20AA}"
-> error[0; 9) token("\'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..9 token("\'\\u{20AA}") msg(Missing trailing `'` symbol to terminate the character literal)

crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt

@@ -1,2 +1,2 @@
 CHAR 2 "\' "
-> error[0; 2) token("\' ") msg(Missing trailing `'` symbol to terminate the character literal)
+> error0..2 token("\' ") msg(Missing trailing `'` symbol to terminate the character literal)